Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

367: Remove Canonical path and format Cloud path #375

Open
wants to merge 4 commits into
base: feature/368-use-local-file-path-annotation
Choose a base branch
from

Conversation

pgarrison
Copy link
Contributor

@pgarrison pgarrison commented Dec 20, 2024

Purpose

With the new cloud-first FMS backend features, the file_path from FMS is a cloud path like staging.files.allencell.org/c18/726/e93/ea3/804/468/34d/873/d6c/435/c6/aicsfiles-test-8c85cfec-bdc3-11ef-9089-0242ac110004.czi. This PR renders this as: File Path (Cloud) https://s3.us-west-2.amazonaws.com/staging.files.allencell.org/c18/726/e93/ea3/804/468/34d/873/d6c/435/c6/aicsfiles-test-8c85cfec-bdc3-11ef-9089-0242ac110004.czi.

In addition, this PR removes the File Path (Canonical). Along with #370, this completes the move from:

File Path (Canonical) /allen/aics/software/apps/staging/fss/data/7fb/6fb/b0f/6bd/7d5/1db/a4c/1e4/2a6/2a5/c7/aicsfiles-test-a4cb9af6-bcfa-11ef-8fe8-0242ac110002.czi
File Path (Cloud) https://s3.us-west-2.amazonaws.com/staging.files.allencell.org/c18/726/e93/ea3/804/468/34d/873/d6c/435/c6/aicsfiles-test-8c85cfec-bdc3-11ef-9089-0242ac110004.czi
File Path (Local) /mypath/aics/software/apps/staging/fss/data/7fb/6fb/b0f/6bd/7d5/1db/a4c/1e4/2a6/2a5/c7/aicsfiles-test-a4cb9af6-bcfa-11ef-8fe8-0242ac110002.czi

To:

File Path (Cloud) https://s3.us-west-2.amazonaws.com/staging.files.allencell.org/c18/726/e93/ea3/804/468/34d/873/d6c/435/c6/aicsfiles-test-8c85cfec-bdc3-11ef-9089-0242ac110004.czi
File Path (Vast) /mypath/aics/software/apps/staging/fss/data/7fb/6fb/b0f/6bd/7d5/1db/a4c/1e4/2a6/2a5/c7/aicsfiles-test-a4cb9af6-bcfa-11ef-8fe8-0242ac110002.czi

Closes #367

Changes

  • Rename (Canonical) to (Cloud)
  • Add the prefix https://s3.us-west-2.amazonaws.com/ to cloud paths

Testing

  • Updated both FileAnnotationList tests.
  • Manual test in staging:
    Screenshot 2024-12-20 at 8 48 29 AM

@pgarrison pgarrison changed the title 367 Remove Canonical path and format Cloud path 367: Remove Canonical path and format Cloud path Dec 20, 2024
packages/core/entity/FileDetail/index.ts Outdated Show resolved Hide resolved
@@ -79,7 +81,11 @@ export default class FileDetail {
const pathWithoutDrive = path.replace("/allen/programs/allencell/data/proj0", "");
// Should probably record this somewhere we can dynamically adjust to, or perhaps just in the file
Copy link
Contributor

Choose a reason for hiding this comment

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

agree with comment

packages/core/entity/FileDetail/index.ts Outdated Show resolved Hide resolved
@pgarrison
Copy link
Contributor Author

pgarrison commented Dec 21, 2024

@BrianWhitneyAI This PR is ready to merge once #370 is merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants