ClearML/clearml-server
1
0
Fork 0
mirror of https://github.com/clearml/clearml-server synced 2025-03-03 18:54:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add report_assets field to report tasks

Browse Source
This commit is contained in:
allegroai 2023-03-23 19:09:03 +02:00
parent cfbb37238f
commit 9739eb2d5a
5 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apiserver/apimodels/reports.py
View File

@ -14,6 +14,7 @@ class UpdateReportRequest(Base):
tags = ListField(items_types=[str])
comment = StringField()
report = StringField()
report_assets = ListField(items_types=[str])
class CreateReportRequest(Base):
@ -22,6 +23,7 @@ class CreateReportRequest(Base):
comment = StringField()
report = StringField()
project = StringField()
report_assets = ListField(items_types=[str])
class PublishReportRequest(Base):

1
apiserver/database/model/task/task.py
View File

@ -249,6 +249,7 @@ class Task(AttributedDocument):
status_changed = DateTimeField()
comment = StringField(user_set_allowed=True)
report = StringField()
report_assets = ListField(StringField())
created = DateTimeField(required=True, user_set_allowed=True)
started = DateTimeField()
completed = DateTimeField()

19
apiserver/schema/services/reports.conf
View File

@ -55,6 +55,11 @@ _definitions {
description: "Report template"
type: string
}
report_assets {
description: "List of the external report assets"
type: array
items { type: string }
}
created {
description: "Report creation time (UTC) "
type: string
@ -146,6 +151,13 @@ create {
}
}
}
"999.0": ${create."2.23"} {
request.properties.report_assets {
description: "List of the external report assets"
type: array
items { type: string }
}
}
}
update {
"2.23" {
@ -181,6 +193,13 @@ update {
}
response: ${_definitions.update_response}
}
"999.0": ${update."2.23"} {
request.properties.report_assets {
description: "List of the external report assets"
type: array
items { type: string }
}
}
}
move {
"2.23" {

1
apiserver/services/reports.py
View File

@ -48,6 +48,7 @@ update_fields = {
"tags",
"comment",
"report",
"report_assets",
}

11
apiserver/tests/automated/test_reports.py
View File

@ -46,7 +46,12 @@ class TestReports(TestService):
# update is working on draft reports
new_comment = "My new comment"
res = self.api.reports.update(task=task_id, comment=new_comment, tags=[])
res = self.api.reports.update(
task=task_id,
comment=new_comment,
tags=[],
report_assets=["file://test.jpg"],
)
self.assertEqual(res.updated, 1)
task = self.api.tasks.get_all_ex(id=[task_id]).tasks[0]
self.assertEqual(task.name, task_name)
@ -54,6 +59,7 @@ class TestReports(TestService):
self.assertEqual(task.tags, [])
ret = self.api.reports.get_tags()
self.assertEqual(ret.tags, [])
self.assertEqual(task.report_assets, ["file://test.jpg"])
self.api.reports.publish(task=task_id)
with self.api.raises(errors.bad_request.InvalidTaskStatus):
self.api.reports.update(task=task_id, report="New report text")
@ -135,8 +141,7 @@ class TestReports(TestService):
self.send_batch([*debug_image_events, *plot_events])
res = self.api.reports.get_task_data(
id=[non_report_task],
only_fields=["name"],
id=[non_report_task], only_fields=["name"],
)
self.assertEqual(len(res.tasks), 1)
self.assertEqual(res.tasks[0].id, non_report_task)