Skip to content

Comments

Update/versions#2

Merged
matthewpeterkort merged 6 commits intomainfrom
update/versions
May 15, 2025
Merged

Update/versions#2
matthewpeterkort merged 6 commits intomainfrom
update/versions

Conversation

@matthewpeterkort
Copy link
Collaborator

No description provided.

Copy link

@quinnwai quinnwai left a comment

Choose a reason for hiding this comment

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

Couple comments, what do I need to test?

RUN git clone https://github.com/bmeg/iceberg.git && \
cd iceberg && \
git checkout feature/FHIR-resource-type
git checkout 7f6cfdb558d05370fc645b5ab894b98b38a01e1b

Choose a reason for hiding this comment

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

Why not just main or the most recent commit in iceberg? If there's a tendency to not do main then we should have a development branch or something in iceberg to pin it to

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

because the server is setup to use a very specific version of iceberg. See gen3-helm/helm/grip/templates/post-something.yaml

I want to match what I know the server is using.

Copy link

Choose a reason for hiding this comment

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

ok

project_str_dict = f'{{"auth_resource_path":"/programs/{program}/projects/{project}"}}'
print(f"Using project: {project_str_dict}")
result = subprocess.run(
["jsonschemagraph", "gen-dir", "iceberg/schemas/graph", f"{temp_dir}", f"{temp_dir}/OUT", "--extraArgs", project_str_dict, "--gzip_files"],

Choose a reason for hiding this comment

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

Wanted to build jsonschemagraph from main branch but when building jsonschemagraph from source, running into...

graphql/griptographql.go:29:8: v.Gid undefined (type *gripql.Vertex has no field or method Gid)

feature/update-grip-structs branch at least compiled and had the --extraArgs flag, how to proceed?

Copy link
Collaborator Author

@matthewpeterkort matthewpeterkort May 7, 2025

Choose a reason for hiding this comment

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

Yeah that's because grip was using a shadow branch. See:

bmeg/jsonschemagraph#16 try with go install github.com/bmeg/jsonschemagraph@b88905d8d65d858be9b52e04632dde309f033a3e

which is referencing the version from bmeg/jsonschemagraph@b88905d

But for this PR I believe it's using a executable from this release https://github.com/bmeg/jsonschemagraph/releases/tag/v0.0.3 if you check the Dockerfile

Copy link

Choose a reason for hiding this comment

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

okay so to confirm: all dockerfile dependencies point to merged branches for iceberg and jsonschema?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

forgot about this repo. Had to make a new PR now that you mentioned it. bmeg/jsonschemagraph#16. Since it's working, if you want to review it you can, but not going to make any changes to it that impact this release since it's working.

Copy link

@quinnwai quinnwai May 7, 2025

Choose a reason for hiding this comment

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

eems like there's at least one other dependency github.com/bmeg/grip v0.0.0-20250421161012-b9b392fc8721 that is from an open PR.

Since it's statically compiled in Go, I'm less worried about updates to the PR causing breaking changes but I want us to be more stringent in future releases: all dependencies should point to merged code if it's a feature in the release.

I'm good to proceed if we start enforcing this rule in future releases. How do I test these changes?

Copy link
Collaborator Author

@matthewpeterkort matthewpeterkort May 7, 2025

Choose a reason for hiding this comment

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

grip is using this jsonschemagraph directly as a package. if jsonschemagraph doesn't work you will know it in downstream code repositories, and ultimately in the g3t end to end test

Kyle had approved this PR in grip, that requires this dependency. You test these changes using the g3t end to end test like what is specified int he release notes

server_errors.append(res[0]["message"])
else:
print(f"jsonschemagraph failed with exit code: {result.returncode}")
print("Stdout:")

Choose a reason for hiding this comment

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

just confirming, the stdout gets logged to the FHIR server pod logs?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Any error logs will come as a https response message. Any more in depth logs can be checked by checking the fhir server logs in k8s.

Copy link

@quinnwai quinnwai left a comment

Choose a reason for hiding this comment

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

looks good just dunno how to test it. What are the steps to do so?

@matthewpeterkort matthewpeterkort requested a review from quinnwai May 7, 2025 20:13
Copy link

@quinnwai quinnwai left a comment

Choose a reason for hiding this comment

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

Tested fhir server integration tests work as expected. Also tested deleting a file by sending a bundle created by meta init and seeing it be removed from the Explorer.

Once you merge this, could you update the tag on prod and dev? Thanks

@matthewpeterkort
Copy link
Collaborator Author

matthewpeterkort commented May 12, 2025

calypr.ohsu.edu should be updated already iirc

@quinnwai
Copy link

Oh yeah you're right that is' on update/versions but I meant you should update it to main once you merge this.

@matthewpeterkort matthewpeterkort merged commit dab2f60 into main May 15, 2025
1 check passed
@matthewpeterkort matthewpeterkort deleted the update/versions branch May 15, 2025 21:35
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.

2 participants