Pass tabIngest upon native upload
#46
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Enhanced the File model by adding detailed descriptions and aliases to its fields using Pydantic's Field parameters. This improves code readability and provides better documentation for each attribute.
Simplifies metadata construction by using model_dump with explicit field inclusion and removes manual forceReplace handling. Improves code readability and consistency in file categorization and metadata update logic.
Introduces TestPrepareRegistration to verify correct handling of tab_ingest, restrict, and categories attributes in the _prepare_registration function. Ensures registration output matches expected values for various File configurations.
JR-1991
added
bug
JR-1991
changed the title
tabIngest upon native upload
Updated dvuploader.py and nativeupload.py to properly construct file paths when directory_label is missing, falling back to file_name or raising a ValueError if neither is present. This improves robustness when processing files with incomplete metadata.
Simplifies the file comparison logic in TestParseYAMLConfig by building the actual_files list with explicit handling of directory_label, improving readability and maintainability.
github-project-automation
bot
moved this from Ready for Review
to Done
in PyDataverse Working Group
JR-1991
deleted the
31-is-tab_ingest-setting-missing-in-_get_json_data
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request addresses issue #31, which accurately pointed out that
tabIngestis not passed as an argument to the_get_json_dataprivate function. This PR introduces a generic solution that aligns with the direct-upload mechanism. In this approach, themodel_dumpof the underlying PyDantic object is utilized. This way, manualjsonDatasetup is eliminated and controlled by theFileclass.Upload logic and metadata handling:
_get_json_datafunction indvuploader/nativeupload.pyto usemodel_dumpwith a defined set of fields, replacing manual dictionary construction and ensuring only relevant metadata is included.forceReplacefield from the metadata payload in_update_single_metadata.Test coverage:
TestPrepareRegistrationintests/unit/test_directupload.pyto verify that thetab_ingestand other metadata fields are set correctly when preparing file registration, ensuring correct model behavior. [1] [2]Closes issues