ClearML/clearml-server
1
0
Fork 0
mirror of https://github.com/clearml/clearml-server synced 2025-01-31 02:46:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix child tasks count for top level pipeline and dataset projects

Browse Source
This commit is contained in:
allegroai 2023-07-26 18:49:12 +03:00
parent 1e51e2e221
commit 5950b81f0b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apiserver/bll/project/project_bll.py
View File

@ -960,7 +960,7 @@ class ProjectBLL:
for cls_, query_ in child_queries.items():
res |= set(
cls_.objects(query_).distinct(
field="parent" if cls_ is Project else "project"
field="id" if cls_ is Project else "project"
)
)

16
apiserver/tests/automated/test_subprojects.py
View File

@ -141,9 +141,7 @@ class TestSubProjects(TestService):
for p in projects:
self.assertEqual(
p.stats.active.total_tasks,
2
if p.basename in ("Project1", "Project2")
else 1
2 if p.basename in ("Project1", "Project2") else 1,
)
for i, type_ in enumerate(("dataset", "pipeline", "report")):
@ -164,9 +162,7 @@ class TestSubProjects(TestService):
else:
self.assertEqual(p.own_tasks, 0)
self.assertIsNone(p.get("own_datasets"))
self.assertEqual(
p.stats.active.total_tasks, 1 if p.basename != "Project2" else 0
)
self.assertEqual(p.stats.active.total_tasks, 1)
def test_project_aggregations(self):
"""This test requires user with user_auth_only... credentials in db"""
@ -365,7 +361,9 @@ class TestSubProjects(TestService):
self.assertEqual(len(res), 2)
res = self.api.tasks.get_all(project=project1).tasks
self.assertEqual(len(res), 2)
res = self.api.tasks.get_all_ex(project=project1, include_subprojects=True).tasks
res = self.api.tasks.get_all_ex(
project=project1, include_subprojects=True
).tasks
self.assertEqual(len(res), 4)
res = self.api.tasks.get_all(project=project1, include_subprojects=True).tasks
self.assertEqual(len(res), 4)
@ -375,7 +373,9 @@ class TestSubProjects(TestService):
self.assertEqual(len(res), 1)
res = self.api.models.get_all(project=project1).models
self.assertEqual(len(res), 1)
res = self.api.models.get_all_ex(project=project1, include_subprojects=True).models
res = self.api.models.get_all_ex(
project=project1, include_subprojects=True
).models
self.assertEqual(len(res), 2)
res = self.api.models.get_all(project=project1, include_subprojects=True).models
self.assertEqual(len(res), 2)