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

Fix archived projects handling

Browse Source
This commit is contained in:
allegroai 2022-07-08 17:55:02 +03:00
parent b058770af1
commit ab495ae586
1 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -463,25 +463,39 @@ class ProjectBLL:
) )
group_step[f"{state.value}_max_task_started"] = max_started_subquery(cond) group_step[f"{state.value}_max_task_started"] = max_started_subquery(cond)
def get_state_filter() -> dict: def add_state_to_filter(f: Mapping[str, Any]) -> Mapping[str, Any]:
if not specific_state: if not specific_state:
return {} return f
f = f or {}
new_f = {k: v for k, v in f.items() if k != "system_tags"}
system_tags = [
tag
for tag in f.get("system_tags", [])
if tag
not in (
EntityVisibility.archived.value,
f"-{EntityVisibility.archived.value}",
)
]
if specific_state == EntityVisibility.archived: if specific_state == EntityVisibility.archived:
return {"system_tags": {"$eq": EntityVisibility.archived.value}} system_tags.append(EntityVisibility.archived.value)
return {"system_tags": {"$ne": EntityVisibility.archived.value}} else:
system_tags.append(f"-{EntityVisibility.archived.value}")
new_f["system_tags"] = system_tags
return new_f
runtime_pipeline = [ runtime_pipeline = [
# only count run time for these types of tasks # only count run time for these types of tasks
{ {
"$match": { "$match": cls.get_match_conditions(
**cls.get_match_conditions( company=company_id,
company=company_id, project_ids=project_ids,
project_ids=project_ids, filter_=add_state_to_filter(filter_),
filter_=filter_, users=users,
users=users, )
),
**get_state_filter(),
}
}, },
ensure_valid_fields(), ensure_valid_fields(),
{ {
@ -518,10 +532,7 @@ class ProjectBLL:
@classmethod @classmethod
def get_dataset_stats( def get_dataset_stats(
cls, cls, company: str, project_ids: Sequence[str], users: Sequence[str] = None,
company: str,
project_ids: Sequence[str],
users: Sequence[str] = None,
) -> Dict[str, dict]: ) -> Dict[str, dict]:
if not project_ids: if not project_ids:
return {} return {}
@ -533,23 +544,16 @@ class ProjectBLL:
company=company, company=company,
project_ids=project_ids, project_ids=project_ids,
users=users, users=users,
filter_={"system_tags": [f"-{EntityVisibility.archived.value}"]} filter_={
"system_tags": [f"-{EntityVisibility.archived.value}"]
},
), ),
"runtime": {"$exists": True, "$gt": {}}, "runtime": {"$exists": True, "$gt": {}},
} }
}, },
{ {"$project": {"project": 1, "runtime": 1, "last_update": 1}},
"$project": {"project": 1, "runtime": 1, "last_update": 1} {"$sort": {"project": 1, "last_update": 1}},
}, {"$group": {"_id": "$project", "runtime": {"$last": "$runtime"}}},
{
"$sort": {"project": 1, "last_update": 1}
},
{
"$group": {
"_id": "$project",
"runtime": {"$last": "$runtime"},
}
},
] ]
return { return {