From 4df7da51e07b254f67e15385c13959e4c0092fd9 Mon Sep 17 00:00:00 2001 From: Shashank Budhanuru Ramaraju Date: Mon, 15 Sep 2025 15:32:21 +0100 Subject: [PATCH 1/3] add release type and release name --- Dockerfile | 7 ++----- app/api/models/resolver.py | 2 ++ app/api/resources/templates/shared/id_content.html | 8 +++++++- app/api/utils/commons.py | 2 ++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index db2030d..465a4db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ FROM python:3.11 LABEL org.opencontainers.image.authors="ensembl-webteam@ebi.ac.uk" # Set Work Directory -WORKDIR /app +WORKDIR / # Copy source code COPY ./app /app/ @@ -18,7 +18,4 @@ RUN pip install -r requirements.txt ENV PORT 8001 EXPOSE 8001 -# Run uvicorn server -# CMD ["fastapi", "run", "main.py", "--port", "8001"] -CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8001", "--reload"] - +CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8001"] 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) From 6c631be99564bd5a44d55355872954d1d1fd508a Mon Sep 17 00:00:00 2001 From: Shashank Budhanuru Ramaraju Date: Mon, 15 Sep 2025 15:39:01 +0100 Subject: [PATCH 2/3] fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 465a4db..8638078 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,4 +18,4 @@ RUN pip install -r requirements.txt ENV PORT 8001 EXPOSE 8001 -CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8001"] +CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8001"] From e22abf451c2f45ca8d16bf4ec1e2da79cceed268 Mon Sep 17 00:00:00 2001 From: Shashank Budhanuru Ramaraju Date: Tue, 16 Sep 2025 11:03:51 +0100 Subject: [PATCH 3/3] undo dockerfile changes --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8638078..45fe38e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ FROM python:3.11 LABEL org.opencontainers.image.authors="ensembl-webteam@ebi.ac.uk" # Set Work Directory -WORKDIR / +WORKDIR /app # Copy source code COPY ./app /app/ @@ -18,4 +18,6 @@ RUN pip install -r requirements.txt ENV PORT 8001 EXPOSE 8001 -CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8001"] +# Run uvicorn server +# CMD ["fastapi", "run", "main.py", "--port", "8001"] +CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8001", "--reload"]