diff --git a/Dockerfile b/Dockerfile index db2030d..45fe38e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,4 +21,3 @@ EXPOSE 8001 # Run uvicorn server # CMD ["fastapi", "run", "main.py", "--port", "8001"] CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8001", "--reload"] - diff --git a/app/api/models/resolver.py b/app/api/models/resolver.py index 844e1e7..7507822 100644 --- a/app/api/models/resolver.py +++ b/app/api/models/resolver.py @@ -77,6 +77,8 @@ def model_dump_json(self, *args, **kwargs): class StableIdResolverContent(MetadataResult): entity_viewer_url: str | None = None genome_browser_url: str | None = None + release_type: str | None = None + release_name: str | None = None class StableIdResolverResponse(BaseModel): diff --git a/app/api/resources/templates/shared/id_content.html b/app/api/resources/templates/shared/id_content.html index c101bcf..6ab5134 100644 --- a/app/api/resources/templates/shared/id_content.html +++ b/app/api/resources/templates/shared/id_content.html @@ -36,7 +36,13 @@ {{ item.assembly.name }}, {% endif %} {% if item.assembly.accession_id %} - {{ item.assembly.accession_id }} + {{ item.assembly.accession_id }}, + {% endif %} + {% if item.release_type %} + Release type {{ item.release_type }}, + {% endif %} + {% if item.release_name %} + Release {{ item.release_name }} {% endif %} diff --git a/app/api/utils/commons.py b/app/api/utils/commons.py index 4cbad3e..cf997df 100644 --- a/app/api/utils/commons.py +++ b/app/api/utils/commons.py @@ -14,6 +14,8 @@ def build_stable_id_resolver_content(metadata_results) -> list[StableIdResolverC content = StableIdResolverContent( entity_viewer_url=build_entity_viewer_url(genome_id, metadata['unversioned_stable_id']), genome_browser_url=build_genome_browser_url(genome_id, metadata['unversioned_stable_id']), + release_type=metadata.get("release", {}).get("type", ""), + release_name=metadata.get("release", {}).get("name", ""), **metadata, ) results.append(content)