Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM python:3.11
LABEL org.opencontainers.image.authors="[email protected]"

# Set Work Directory
WORKDIR /app
WORKDIR /

# Copy source code
COPY ./app /app/
Expand All @@ -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", "app.main:app", "--host", "0.0.0.0", "--port", "8001"]
2 changes: 2 additions & 0 deletions app/api/models/resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
8 changes: 7 additions & 1 deletion app/api/resources/templates/shared/id_content.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,13 @@
<span class="genome-detail-margin-left">{{ item.assembly.name }},</span>
{% endif %}
{% if item.assembly.accession_id %}
<span class="genome-detail-margin-left">{{ item.assembly.accession_id }}</span>
<span class="genome-detail-margin-left">{{ item.assembly.accession_id }},</span>
{% endif %}
{% if item.release_type %}
<span class="genome-detail-margin-left"><span class="light">Release type</span> {{ item.release_type }},</span>
{% endif %}
{% if item.release_name %}
<span class="genome-detail-margin-left"><span class="light">Release</span> {{ item.release_name }}</span>
{% endif %}
</a>
</div>
Expand Down
2 changes: 2 additions & 0 deletions app/api/utils/commons.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down