Skip to content

Commit

Permalink
Merge pull request #572 from sennetconsortium/maxsibilla/issue-570
Browse files Browse the repository at this point in the history
Maxsibilla/issue 570
  • Loading branch information
maxsibilla authored Jan 9, 2025
2 parents 567f63e + 402d579 commit ddb7a2a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
3 changes: 3 additions & 0 deletions src/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -5517,6 +5517,9 @@ def verify_ubkg_properties(json_data_dict):
if 'intended_organ' in json_data_dict:
compare_property_against_ubkg(ORGAN_TYPES, json_data_dict, 'intended_organ')

if 'intended_source_type' in json_data_dict:
compare_property_against_ubkg(SOURCE_TYPES, json_data_dict, 'intended_source_type')

def compare_property_list_against_ubkg(ubkg_dict, json_data_dict, field):
good_fields = []
passes_ubkg_validation = True
Expand Down
4 changes: 2 additions & 2 deletions src/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ nested-lookup==0.2.22

# The commons package requires requests>=2.22.0 and PyYAML>=5.3.1
requests==2.32.3
PyYAML==5.4.1
PyYAML==6.0

# Pinning specific version of neo4j
neo4j==5.22.0
Expand All @@ -21,6 +21,6 @@ neo4j==5.22.0
# Default is main branch specified in docker-compose.development.yml if not set
# git+https://github.com/hubmapconsortium/commons.git@${COMMONS_BRANCH}#egg=hubmap-commons
hubmap-commons==2.1.18
atlas-consortia-commons==1.0.10
atlas-consortia-commons==1.1.0

deepdiff~=6.6.0
5 changes: 5 additions & 0 deletions src/schema/provenance_schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1290,6 +1290,11 @@ ENTITIES:
type: string
description: 'The organ code representing the organ type that the data contained in the upload will be registered/associated with.'
required_on_create: true
intended_source_type:
type: string
description: 'The source type that the data contained in the upload will be registered/associated with.'
required_on_create: true


############################################# EPICollection #############################################
Epicollection:
Expand Down

0 comments on commit ddb7a2a

Please sign in to comment.