Merge pull request #3900 from pypeclub/bugfix/fix_links_query_on_hero_version

General: Fix links query on hero version
This commit is contained in:
Jakub Trllo 2022-10-10 11:32:07 +02:00 committed by GitHub
commit 1421b7891f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions

View file

@ -2,6 +2,7 @@ from .mongo import get_project_connection
from .entities import (
get_assets,
get_asset_by_id,
get_version_by_id,
get_representation_by_id,
convert_id,
)
@ -127,12 +128,20 @@ def get_linked_representation_id(
if not version_id:
return []
version_doc = get_version_by_id(
project_name, version_id, fields=["type", "version_id"]
)
if version_doc["type"] == "hero_version":
version_id = version_doc["version_id"]
if max_depth is None:
max_depth = 0
match = {
"_id": version_id,
"type": {"$in": ["version", "hero_version"]}
# Links are not stored to hero versions at this moment so filter
# is limited to just versions
"type": "version"
}
graph_lookup = {
@ -187,7 +196,7 @@ def _process_referenced_pipeline_result(result, link_type):
referenced_version_ids = set()
correctly_linked_ids = set()
for item in result:
input_links = item["data"].get("inputLinks")
input_links = item.get("data", {}).get("inputLinks")
if not input_links:
continue
@ -203,7 +212,7 @@ def _process_referenced_pipeline_result(result, link_type):
continue
for output in sorted(outputs_recursive, key=lambda o: o["depth"]):
output_links = output["data"].get("inputLinks")
output_links = output.get("data", {}).get("inputLinks")
if not output_links:
continue

View file

@ -1256,7 +1256,11 @@ class RepresentationWidget(QtWidgets.QWidget):
repre_doc["parent"]
for repre_doc in repre_docs
]
version_docs = get_versions(project_name, version_ids=version_ids)
version_docs = get_versions(
project_name,
version_ids=version_ids,
hero=True
)
version_docs_by_id = {}
version_docs_by_subset_id = collections.defaultdict(list)