Skip to content

Conversation

@nadove-ucsc
Copy link
Contributor

@nadove-ucsc nadove-ucsc commented Dec 12, 2025

Linked issues: #7624

Checklist

Author

  • PR is assigned to the author
  • Status of PR is In progress
  • PR is a draft
  • Target branch is develop
  • Name of PR branch matches issues/<GitHub handle of author>/<issue#>-<slug>
  • PR is linked to all issues it (partially) resolves
  • Status of linked issues is In progress
  • PR description links to linked issues
  • PR title matches1 that of a linked issue or comment in PR explains why they're different
  • PR title references all linked issues
  • For each linked issue, there is at least one commit whose title references that issue

1 when the issue title describes a problem, the corresponding PR
title is Fix: followed by the issue title

Author (partiality)

  • Added p tag to titles of partial commits
  • This PR is labeled partial or completely resolves all linked issues
  • This PR partially resolves each of the linked issues or does not have the partial label

Author (reindex)

  • Added r tag to commit title or the changes introduced by this PR will not require reindexing of any deployment
  • This PR is labeled reindex:dev or the changes introduced by it will not require reindexing of dev
  • This PR is labeled reindex:anvildev or the changes introduced by it will not require reindexing of anvildev
  • This PR is labeled reindex:anvilprod or the changes introduced by it will not require reindexing of anvilprod
  • This PR is labeled reindex:prod or the changes introduced by it will not require reindexing of prod
  • This PR is labeled reindex:partial and its description documents the specific reindexing procedure for dev, anvildev, anvilprod and prod or requires a full reindex or carries none of the labels reindex:dev, reindex:anvildev, reindex:anvilprod and reindex:prod

Author (API changes)

  • This PR and its linked issues are labeled API or this PR does not modify a REST API
  • Added a (A) tag to commit title for backwards (in)compatible changes or this PR does not modify a REST API
  • Updated REST API version number in app.py or this PR does not modify a REST API

Author (upgrading deployments)

  • Ran make docker_images.json and committed the resulting changes or this PR does not modify azul_docker_images, or any other variables referenced in the definition of that variable
  • Documented upgrading of deployments in UPGRADING.rst or this PR does not require upgrading deployments
  • Added u tag to commit title or this PR does not require upgrading deployments
  • This PR is labeled upgrade or does not require upgrading deployments
  • This PR is labeled deploy:shared or does not modify docker_images.json, and does not require deploying the shared component for any other reason
  • This PR is labeled deploy:gitlab or does not require deploying the gitlab component
  • This PR is labeled deploy:runner or does not require deploying the runner image

Author (hotfixes)

  • Added F tag to main commit title or this PR does not include permanent fix for a temporary hotfix
  • Reverted the temporary hotfixes for any linked issues or the none of the stable branches (anvilprod and prod) have temporary hotfixes for any of the issues linked to this PR

Author (before every review)

  • Rebased PR branch on develop, squashed fixups from prior reviews
  • Ran make requirements_update or this PR does not modify Dockerfile, environment, requirements*.txt, common.mk, Makefile or environment.boot
  • Added R tag to commit title or this PR does not modify requirements*.txt
  • This PR is labeled reqs or does not modify requirements*.txt
  • make integration_test passes in personal deployment or this PR does not modify functionality that could affect the IT outcome
  • PR is awaiting requested review from a peer
  • Status of PR is Review requested
  • PR is assigned to only the peer and the author

Peer reviewer (after approval)

Note that after requesting changes, the PR must be assigned to only the author.

  • Actually approved the PR
  • PR is not a draft
  • PR is awaiting requested review from system administrator
  • Status of PR is Review requested
  • PR is assigned to only the system administrator and the author

System administrator (after approval)

  • Actually approved the PR
  • Labeled linked issues as demo or no demo
  • Commented on linked issues about demo expectations or all linked issues are labeled no demo
  • Decided if PR can be labeled no sandbox
  • A comment to this PR details the completed security design review
  • PR title is appropriate as title of merge commit
  • N reviews label is accurate
  • Status of PR is Approved
  • PR is assigned to only the operator and the author

Operator

  • Checked reindex:… labels and r commit title tag
  • Checked that demo expectations are clear or all linked issues are labeled no demo
  • Squashed PR branch and rebased onto develop
  • Sanity-checked history
  • Pushed PR branch to GitHub

Operator (deploy .shared and .gitlab components)

  • Ran _select dev.shared && CI_COMMIT_REF_NAME=develop make -C terraform/shared apply_keep_unused or this PR is not labeled deploy:shared
  • Ran _select dev.gitlab && CI_COMMIT_REF_NAME=develop make -C terraform/gitlab apply or this PR is not labeled deploy:gitlab
  • Ran _select anvildev.shared && CI_COMMIT_REF_NAME=develop make -C terraform/shared apply_keep_unused or this PR is not labeled deploy:shared
  • Ran _select anvildev.gitlab && CI_COMMIT_REF_NAME=develop make -C terraform/gitlab apply or this PR is not labeled deploy:gitlab
  • Checked the items in the next section or this PR is labeled deploy:gitlab
  • PR is assigned to only the system administrator and the author or this PR is not labeled deploy:gitlab

System administrator (post-deploy of .gitlab component)

  • Background migrations for dev.gitlab are complete or this PR is not labeled deploy:gitlab
  • Background migrations for anvildev.gitlab are complete or this PR is not labeled deploy:gitlab
  • PR is assigned to only the operator and the author

Operator (deploy runner image)

  • Ran _select dev.gitlab && make -C terraform/gitlab/runner or this PR is not labeled deploy:runner
  • Ran _select anvildev.gitlab && make -C terraform/gitlab/runner or this PR is not labeled deploy:runner

Operator (sandbox build)

  • Added sandbox label or PR is labeled no sandbox
  • Pushed PR branch to GitLab dev or PR is labeled no sandbox
  • Pushed PR branch to GitLab anvildev or PR is labeled no sandbox
  • Build passes in sandbox deployment or PR is labeled no sandbox
  • Build passes in anvilbox deployment or PR is labeled no sandbox
  • Reviewed build logs for anomalies in sandbox deployment or PR is labeled no sandbox
  • Reviewed build logs for anomalies in anvilbox deployment or PR is labeled no sandbox
  • Deleted unreferenced indices in sandbox or this PR does not remove catalogs or otherwise causes unreferenced indices in dev
  • Deleted unreferenced indices in anvilbox or this PR does not remove catalogs or otherwise causes unreferenced indices in anvildev
  • Started reindex in sandbox or this PR is not labeled reindex:dev
  • Started reindex in anvilbox or this PR is not labeled reindex:anvildev
  • Checked for failures in sandbox or this PR is not labeled reindex:dev
  • Checked for failures in anvilbox or this PR is not labeled reindex:anvildev

Operator (merge the branch)

  • All status checks passed and the PR is mergeable
  • The title of the merge commit starts with the title of this PR
  • Added PR # reference to merge commit title
  • Collected commit title tags in merge commit title but only included p if the PR is also labeled partial
  • Pushed merge commit to GitHub
  • Status of PR is Merged lower
  • Status of blocked issues is Triage or no issues are blocked on the linked issues

Operator (main build)

  • Pushed merge commit to GitLab dev
  • Pushed merge commit to GitLab anvildev
  • Build passes on GitLab dev
  • Reviewed build logs for anomalies on GitLab dev
  • Build passes on GitLab anvildev
  • Reviewed build logs for anomalies on GitLab anvildev
  • Ran _select dev.shared && make -C terraform/shared apply or this PR is not labeled deploy:shared
  • Ran _select anvildev.shared && make -C terraform/shared apply or this PR is not labeled deploy:shared
  • Deleted PR branch from GitHub
  • PR is assigned to only the operator
  • Deleted PR branch from GitLab dev
  • Deleted PR branch from GitLab anvildev
  • Status of linked issues is Lower, or Triage, if PR is partial

Operator (reindex)

  • Deindexed all unreferenced catalogs in dev or this PR is neither labeled reindex:partial nor reindex:dev
  • Deindexed all unreferenced catalogs in anvildev or this PR is neither labeled reindex:partial nor reindex:anvildev
  • Deindexed specific sources in dev or this PR is neither labeled reindex:partial nor reindex:dev
  • Deindexed specific sources in anvildev or this PR is neither labeled reindex:partial nor reindex:anvildev
  • Indexed specific sources in dev or this PR is neither labeled reindex:partial nor reindex:dev
  • Indexed specific sources in anvildev or this PR is neither labeled reindex:partial nor reindex:anvildev
  • Started reindex in dev or this PR does not require reindexing dev
  • Started reindex in anvildev or this PR does not require reindexing anvildev
  • Checked for, triaged and possibly requeued messages in both fail queues in dev or this PR does not require reindexing dev
  • Checked for, triaged and possibly requeued messages in both fail queues in anvildev or this PR does not require reindexing anvildev
  • Emptied fail queues in dev or this PR does not require reindexing dev
  • Emptied fail queues in anvildev or this PR does not require reindexing anvildev
  • Restarted the Data Browser pipeline for the ucsc/hca/dev branch on GitLab in dev or this PR does not require reindexing dev
  • Restarted the Data Browser pipeline for the ucsc/lungmap/dev branch on GitLab in dev or this PR does not require reindexing dev
  • Restarted deploy_browser job in the GitLab pipeline for this PR in dev or this PR does not require reindexing dev
  • Restarted the Data Browser pipeline for the ucsc/anvil/anvildev branch on GitLab in anvildev or this PR does not require reindexing anvildev
  • Restarted deploy_browser job in the GitLab pipeline for this PR in anvildev or this PR does not require reindexing anvildev

Operator (mirroring)

  • Started mirroring in dev or this PR does not require mirroring dev
  • Started mirroring in anvildev or this PR does not require mirroring anvildev
  • Checked for, triaged and possibly requeued messages in mirror fail queue in dev or this PR does not require mirroring dev
  • Checked for, triaged and possibly requeued messages in mirror fail queue in anvildev or this PR does not require mirroring anvildev
  • Emptied mirror fail queue in dev or this PR does not require mirroring dev
  • Emptied mirror fail queue in anvildev or this PR does not require mirroring anvildev

Operator

  • Propagated the deploy:shared, deploy:gitlab, deploy:runner, API, reindex:partial, reindex:anvilprod and reindex:prod labels to the next promotion PRs or this PR carries none of these labels
  • Propagated any specific instructions related to the deploy:shared, deploy:gitlab, deploy:runner, API, reindex:partial, reindex:anvilprod and reindex:prod labels, from the description of this PR to that of the next promotion PRs or this PR carries none of these labels
  • PR is assigned to no one

Shorthand for review comments

  • L line is too long
  • W line wrapping is wrong
  • Q bad quotes
  • F other formatting problem

@nadove-ucsc nadove-ucsc self-assigned this Dec 12, 2025
@nadove-ucsc nadove-ucsc added the API API change affecting callers label Dec 12, 2025
@nadove-ucsc nadove-ucsc linked an issue Dec 12, 2025 that may be closed by this pull request
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/7624-add-mirror-uri-to-service-response branch 3 times, most recently from 5e0b949 to a2b36c7 Compare December 16, 2025 03:30
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/7624-add-mirror-uri-to-service-response branch from ca3897b to ae76487 Compare December 16, 2025 03:39
@coveralls
Copy link

coveralls commented Dec 16, 2025

Coverage Status

coverage: 85.063% (+0.002%) from 85.061%
when pulling ead7d3c on issues/nadove-ucsc/7624-add-mirror-uri-to-service-response
into 0817583 on develop.

@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/7624-add-mirror-uri-to-service-response branch from a782efd to 5ca7b74 Compare December 16, 2025 04:15
@codecov
Copy link

codecov bot commented Dec 16, 2025

Codecov Report

❌ Patch coverage is 91.16279% with 19 lines in your changes missing coverage. Please review.
✅ Project coverage is 84.88%. Comparing base (0817583) to head (ead7d3c).

Files with missing lines Patch % Lines
src/azul/service/download_controller.py 92.51% 11 Missing ⚠️
src/azul/__init__.py 25.00% 6 Missing ⚠️
src/azul/indexer/mirror_service.py 71.42% 2 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #7637      +/-   ##
===========================================
+ Coverage    84.84%   84.88%   +0.04%     
===========================================
  Files          156      157       +1     
  Lines        22896    22943      +47     
===========================================
+ Hits         19425    19476      +51     
+ Misses        3471     3467       -4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

dsotirho-ucsc
dsotirho-ucsc previously approved these changes Dec 16, 2025
Copy link
Contributor

@dsotirho-ucsc dsotirho-ucsc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved.

@dsotirho-ucsc dsotirho-ucsc marked this pull request as ready for review December 16, 2025 18:33
response = self.service.search(catalog=catalog,
entity_type=entity_type,
file_url_func=self.file_url_func,
file_mirror_uri_func=self.mirror_service(catalog).mirror_uri,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure this indirection is necessary. For the file URL it is, because only the app/controller layer know the scheme, hostname, port and path components of that URL. But for a URI that is minted by the service, the stage should be able to reach directly into the service.

@hannes-ucsc hannes-ucsc added the 0 reviews [process] Lead didn't request any changes label Dec 16, 2025
@hannes-ucsc hannes-ucsc removed their assignment Dec 16, 2025
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/7624-add-mirror-uri-to-service-response branch 3 times, most recently from 3ed9dcc to 18d59b0 Compare December 17, 2025 02:23
@hannes-ucsc hannes-ucsc force-pushed the issues/nadove-ucsc/7624-add-mirror-uri-to-service-response branch from 18d59b0 to 6813d8b Compare December 18, 2025 07:21
...

def cache[_T](f: Callable[..., _T], /) -> CacheWrapper[_T]:
...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.
@hannes-ucsc hannes-ucsc force-pushed the issues/nadove-ucsc/7624-add-mirror-uri-to-service-response branch from 6813d8b to c31ae10 Compare December 18, 2025 17:43
@hannes-ucsc hannes-ucsc force-pushed the issues/nadove-ucsc/7624-add-mirror-uri-to-service-response branch from c31ae10 to ec9fd0b Compare December 18, 2025 18:43
@hannes-ucsc hannes-ucsc force-pushed the issues/nadove-ucsc/7624-add-mirror-uri-to-service-response branch from ec9fd0b to 6a5ae2e Compare December 19, 2025 00:40
@hannes-ucsc hannes-ucsc force-pushed the issues/nadove-ucsc/7624-add-mirror-uri-to-service-response branch 2 times, most recently from a2237f7 to 1e28b1e Compare January 8, 2026 06:14
@hannes-ucsc hannes-ucsc force-pushed the issues/nadove-ucsc/7624-add-mirror-uri-to-service-response branch from a2237f7 to 2f02a60 Compare January 8, 2026 07:39
nadove-ucsc and others added 4 commits January 8, 2026 08:27
Consolidate conditional URI emission as a service method. Consider the file's source when deciding whether to emit a URI in the /index/file response. Previously, the source of a file was only considered when emitting the URI in manifests.
Move split-off class to its own module
@hannes-ucsc hannes-ucsc force-pushed the issues/nadove-ucsc/7624-add-mirror-uri-to-service-response branch from cb4bde4 to b08ddd9 Compare January 8, 2026 16:58
@hannes-ucsc hannes-ucsc removed their assignment Jan 8, 2026
Copy link
Member

@hannes-ucsc hannes-ucsc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please test this in a personal deployment (IT and sanity checking the manifest and service response with a no_mirror source).

@nadove-ucsc
Copy link
Contributor Author

IT passed in HCA and AnVIl deployments. Observed both null and non-null mirror URIs in service response, and empty and non-empty mirror URIs in compact manifest, from non-mirrored and mirrored sources respectively.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0 reviews [process] Lead didn't request any changes API API change affecting callers

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add mirror URI to service /index/file response

5 participants