Gen3SchemaDev 2.3.5__tar.gz → 2.3.6__tar.gz

{gen3schemadev-2.3.5 → gen3schemadev-2.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Gen3SchemaDev
-Version: 2.3.5
+Version: 2.3.6
 Summary: Tool for data modelling in Gen3
 License: Apache 2.0
 License-File: LICENSE

{gen3schemadev-2.3.5 → gen3schemadev-2.3.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Gen3SchemaDev"
-version = "2.3.5"
+version = "2.3.6"
 description = "Tool for data modelling in Gen3"
 authors = [
     {name = "JoshuaHarris391",email = "harjo391@gmail.com"}

{gen3schemadev-2.3.5 → gen3schemadev-2.3.6}/src/gen3schemadev/converter.py

@@ -632,21 +632,20 @@ def construct_props(node_name: str, data: DataSourceProtocol) -> dict:
 
     # if it's an Enum, add the enum values
     if category == "data_file":
-        props_dict['core_metadata_collections'] = {"$ref": "_definitions.yaml#/to_one"}
         props_dict['$ref'] = "_definitions.yaml#/data_file_properties"
-
-        props_dict['data_category'] = {
+        props_dict.setdefault('core_metadata_collections', {"$ref": "_definitions.yaml#/to_one"})
+        props_dict.setdefault('data_category', {
             "description": "Broad categorization of the contents of the data file.",
             "enum": ['data_category_1', 'data_category_2', 'data_category_3']
-        }
-        props_dict['data_format'] = {
+        })
+        props_dict.setdefault('data_format', {
             "description": "The format of the data in this data file",
             "enum": ['data_format_1', 'data_format_2', 'data_format_3']
-        }
-        props_dict['data_type'] = {
+        })
+        props_dict.setdefault('data_type', {
             "description": "The type of data in this data file",
             "enum": ['data_type_1', 'data_type_2', 'data_type_3']
-        }
+        })
 
     return props_dict