Gen3SchemaDev 2.3.5__tar.gz → 2.4.0__tar.gz

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

@@ -1,14 +1,17 @@
 Metadata-Version: 2.4
 Name: Gen3SchemaDev
-Version: 2.3.5
+Version: 2.4.0
 Summary: Tool for data modelling in Gen3
 License: Apache 2.0
 License-File: LICENSE
 Author: JoshuaHarris391
 Author-email: harjo391@gmail.com
-Requires-Python: >=3.12.10,<4.0
+Requires-Python: >=3.9.5,<4.0
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: check-jsonschema (>=0.34.1,<0.35.0)

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

@@ -1,13 +1,13 @@
 [project]
 name = "Gen3SchemaDev"
-version = "2.3.5"
+version = "2.4.0"
 description = "Tool for data modelling in Gen3"
 authors = [
     {name = "JoshuaHarris391",email = "harjo391@gmail.com"}
 ]
 license = {text = "Apache 2.0"}
 readme = "README.md"
-requires-python = ">=3.12.10,<4.0"
+requires-python = ">=3.9.5,<4.0"
 dependencies = [
     "setuptools>=70.0",
     "gen3-validator (>=2.0.0,<3.0.0)",

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

@@ -11,6 +11,8 @@ Expected Data Structure:
     - links: List of link objects with attributes: child, parent, multiplicity
 """
 
+from __future__ import annotations
+
 from dataclasses import dataclass, asdict
 from typing import Protocol, runtime_checkable, Dict, Any, List
 import logging
@@ -632,21 +634,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