-
Notifications
You must be signed in to change notification settings - Fork 1
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
Export current extract parquet files over FTPS #264
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Couple of suggestions 🎉
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I fixed the problem with the FTP_HOST
key not being found. I think what happened is that by moving the FTP uploading functionality into export_patient_data()
, the unit tests would try to run this but then fail because it can't find that environment variable. Further on that, it also needs an actual FTP server to be up and running, so added that to the docker-compose.yml
as well (though this will need to be updated after merging #268).
The CI is currently still failing because of some missing files, so I think there is still a wrongly configured file path somewhere.
That being said, I don't see any actual unit tests that check wether the parquet files have been uploaded to the FTP server, like we're doing in pixl_core/tests/test_upload.py
for the DICOM images. So probably still need to add that?
Are they not also in I'm confused though, why are we testing in ehr, when all of this functionality that we care about is in core (which already covers the test)? |
👌 second option is to create a separte function |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Think it's looking good now! Just the osimis/orthanc
docker image seems to have some problems upstream. Just re-running the CI might work 🤷♂️
@@ -346,7 +346,6 @@ async def test_radiology_export_multiple_projects(example_messages, tmp_path) -> | |||
await process_message(mess) | |||
|
|||
# ACT |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this test is still calling export_radiology_as_parquet
below and not export_patient_data
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👌 second option is to create a separte function
export_reports_to_parquet
and test that instead of testing the REST API call. That feels like less faffing around but I'm easy
I assumed this is what you meant by having export_radiology_as_parquet
and send_via_ftps
as separate functions called in a single API endpoint i.e. export_patient_data
but testing just export_radiology_as_parquet
in test_processing
since send via ftps is tested elsewhere
System test is failing now because of the call to I think we can leave this for now and wait until #268 is fixed and merged and then merge |
Will want final review after system tests are merged in
`pixl_ehr` tests should not be running any `FTPS` connecting code
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking good! Can you add in a check for the parquet files existing in the system test?
System test currently failing because we're missing the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎉
Ensures that `radiology.parquet` is also included when uploading the files over FTP.
Closes #192
Changes: