Refactor debug images response, model ORM

This commit is contained in:
allegroai 2022-02-13 19:21:07 +02:00
parent a377a7e315
commit 446bd35006
2 changed files with 47 additions and 24 deletions

View File

@ -1,7 +1,6 @@
from typing import Sequence from typing import Sequence
from mongoengine import ( from mongoengine import (
Document,
StringField, StringField,
DateTimeField, DateTimeField,
BooleanField, BooleanField,
@ -14,17 +13,15 @@ from apiserver.database.fields import (
SafeDictField, SafeDictField,
SafeSortedListField, SafeSortedListField,
) )
from apiserver.database.model import DbModelMixin from apiserver.database.model import AttributedDocument
from apiserver.database.model.base import GetMixin from apiserver.database.model.base import GetMixin
from apiserver.database.model.metadata import MetadataItem from apiserver.database.model.metadata import MetadataItem
from apiserver.database.model.model_labels import ModelLabels from apiserver.database.model.model_labels import ModelLabels
from apiserver.database.model.company import Company
from apiserver.database.model.project import Project from apiserver.database.model.project import Project
from apiserver.database.model.task.task import Task from apiserver.database.model.task.task import Task
from apiserver.database.model.user import User
class Model(DbModelMixin, Document): class Model(AttributedDocument):
meta = { meta = {
"db_alias": Database.backend, "db_alias": Database.backend,
"strict": strict, "strict": strict,
@ -73,8 +70,6 @@ class Model(DbModelMixin, Document):
id = StringField(primary_key=True) id = StringField(primary_key=True)
name = StrippedStringField(user_set_allowed=True, min_length=3) name = StrippedStringField(user_set_allowed=True, min_length=3)
parent = StringField(reference_field="Model", required=False) parent = StringField(reference_field="Model", required=False)
user = StringField(required=True, reference_field=User)
company = StringField(required=True, reference_field=Company)
project = StringField(reference_field=Project, user_set_allowed=True) project = StringField(reference_field=Project, user_set_allowed=True)
created = DateTimeField(required=True, user_set_allowed=True) created = DateTimeField(required=True, user_set_allowed=True)
task = StringField(reference_field=Task) task = StringField(reference_field=Task)

View File

@ -261,7 +261,48 @@
} }
} }
} }
debug_image_sample_reposnse { debug_images_response {
type: object
properties {
scroll_id {
type: string
description: "Scroll ID for getting more results"
}
metrics {
type: array
description: "Debug image events grouped by tasks and iterations"
items {
type: object
properties {
task {
type: string
description: Task ID
}
iterations {
type: array
items {
type: object
properties {
iter {
type: integer
description: Iteration number
}
events {
type: array
items {
type: object
description: Debug image event
}
}
}
}
}
}
}
}
}
}
debug_image_sample_response {
type: object type: object
properties { properties {
scroll_id { scroll_id {
@ -431,20 +472,7 @@
} }
} }
} }
response { response {"$ref": "#/definitions/debug_images_response"}
type: object
properties {
metrics {
type: array
items: { type: object }
description: "Debug image events grouped by task metrics and iterations"
}
scroll_id {
type: string
description: "Scroll ID for getting more results"
}
}
}
} }
"2.14": ${debug_images."2.7"} { "2.14": ${debug_images."2.7"} {
request { request {
@ -491,7 +519,7 @@
} }
} }
} }
response {"$ref": "#/definitions/debug_image_sample_reposnse"} response {"$ref": "#/definitions/debug_image_sample_response"}
} }
} }
next_debug_image_sample { next_debug_image_sample {
@ -516,7 +544,7 @@
} }
} }
} }
response {"$ref": "#/definitions/debug_image_sample_reposnse"} response {"$ref": "#/definitions/debug_image_sample_response"}
} }
} }
get_task_metrics{ get_task_metrics{