tricc-oo 1.5.13__py3-none-any.whl → 1.6.8__py3-none-any.whl

tricc_oo/__init__.py

@@ -5,9 +5,3 @@ Collect easy.
 """
 
 __version__ = "1.0.2"
-
-from .models.base import *
-from .models.calculate import *
-from .models.tricc import *
-from .serializers import *
-

tricc_oo/converters/codesystem_to_ocl.py

@@ -1,5 +1,4 @@
 from typing import Dict, List, Any
-import json
 from fhir.resources.codesystem import CodeSystem
 from tricc_oo.models.ocl import (
     OCLConcept,
@@ -7,15 +6,16 @@ from tricc_oo.models.ocl import (
     OCLDetailedName,
     OCLDetailedDescription,
     OclConstants,
-    get_data_type
 )
 
+
 def extract_properties_metadata(fhir_cs: CodeSystem) -> Dict[str, Dict]:
     """
-    Extracts property definitions from FHIR CodeSystem and converts them to OCL attribute types
+    Extracts property definitions from FHIR CodeSystem and converts them
+    to OCL attribute types
     """
     property_types = {}
-    if hasattr(fhir_cs, 'property') and fhir_cs.property:
+    if hasattr(fhir_cs, "property") and fhir_cs.property:
         for prop in fhir_cs.property:
             # Map FHIR property types to OCL datatypes
             fhir_type = prop.type
@@ -26,76 +26,85 @@ def extract_properties_metadata(fhir_cs: CodeSystem) -> Dict[str, Dict]:
                 "decimal": "Numeric",
                 "integer": "Numeric",
                 "dateTime": "DateTime",
-                "string": "Text"
+                "string": "Text",
             }.get(fhir_type, "Text")
-            
+
             property_types[prop.code] = {
                 "name": prop.code,
                 "datatype": ocl_type,
-                "description": prop.description if hasattr(prop, 'description') else ""
+                "description": prop.description if hasattr(prop, "description") else "",
             }
     return property_types
 
+
 def get_fhir_concept_datatype(concept):
-    
-    datatype = extract_concept_properties(concept, ['datatype'])
+    datatype = extract_concept_properties(concept, ["datatype"])
     if datatype:
-        return datatype['datatype']
+        return datatype["datatype"]
     else:
         return OclConstants.DATA_TYPE_NONE
 
+
 def extract_concept_properties(concept, property_types: List) -> List[Dict]:
     """
     Extracts properties from a FHIR concept and converts them to OCL attributes
     """
     properties = {}
-    if hasattr(concept, 'property') and concept.property:
+    if hasattr(concept, "property") and concept.property:
         for prop in concept.property:
             if prop.code in property_types:
                 # Handle different property value types
-                if getattr(prop, 'valueCode', None):
+                if getattr(prop, "valueCode", None):
                     value = prop.valueCode
-                elif getattr(prop, 'valueCoding', None):
+                elif getattr(prop, "valueCoding", None):
                     value = prop.valueCoding.code
-                elif getattr(prop, 'valueString', None):
+                elif getattr(prop, "valueString", None):
                     value = prop.valueString
-                elif getattr(prop, 'valueBoolean', None):
+                elif getattr(prop, "valueBoolean", None):
                     value = prop.valueBoolean
-                elif getattr(prop, 'valueInteger', None):
+                elif getattr(prop, "valueInteger", None):
                     value = prop.valueInteger
-                elif getattr(prop, 'valueDecimal', None):
+                elif getattr(prop, "valueDecimal", None):
                     value = prop.valueDecimal
-                elif getattr(prop, 'valueDateTime', None):
+                elif getattr(prop, "valueDateTime", None):
                     value = prop.valueDateTime
                 else:
                     continue
                 if value:
                     properties[prop.code] = value
     return properties
-                
-                
+
+
 def get_attributes_from_concept_properties(concept, property_types: Dict) -> List[Dict]:
     attributes = []
     properties = extract_concept_properties(concept, property_types=list(property_types))
     for code, value in properties.items():
-        attributes.append({
-            "type": "Attribute",
-            "attribute_type": code,
-            "value": value,
-            "value_type": property_types[code]["datatype"]
-        })
+        attributes.append(
+            {
+                "type": "Attribute",
+                "attribute_type": code,
+                "value": value,
+                "value_type": property_types[code]["datatype"],
+            }
+        )
     return attributes
 
-def transform_fhir_to_ocl(fhir_codesystem_json: Dict, source_name: str, source_owner: str, source_owner_type: str) -> List[Dict[str, Any]]:
+
+def transform_fhir_to_ocl(
+    fhir_codesystem_json: Dict,
+    source_name: str,
+    source_owner: str,
+    source_owner_type: str,
+) -> List[Dict[str, Any]]:
     """
     Transforms a FHIR CodeSystem resource into an OCL bulk upload JSON payload.
-    
+
     Args:
         fhir_codesystem_json: JSON representation of the FHIR CodeSystem resource
         source_name: Name of the OCL Source
         source_owner: Owner of the OCL Source (organization or user)
         source_owner_type : User or Organization
-    
+
     Returns:
         List of dictionaries representing OCL bulk upload format
     """
@@ -109,8 +118,7 @@ def transform_fhir_to_ocl(fhir_codesystem_json: Dict, source_name: str, source_o
     ocl_payload = []
 
     # Add source metadata
-
-    
+    source_extras = {}
     # Add property definitions to extras
     if property_types:
         source_extras["attribute_types"] = list(property_types.values())
@@ -123,16 +131,17 @@ def transform_fhir_to_ocl(fhir_codesystem_json: Dict, source_name: str, source_o
             owner=source_owner,
             owner_type=source_owner_type,
             name=fhir_cs.name or "Unnamed Source",
-            full_name=fhir_cs.title if hasattr(fhir_cs, 'title') else fhir_cs.name,
+            full_name=fhir_cs.title if hasattr(fhir_cs, "title") else fhir_cs.name,
             description=fhir_cs.description or "",
             source_type="Dictionary",
             default_locale="en",
             supported_locales=["en"],
+            extras=source_extras,
         )
-      )
+    )
 
     # Transform concepts
-    if hasattr(fhir_cs, 'concept') and fhir_cs.concept:
+    if hasattr(fhir_cs, "concept") and fhir_cs.concept:
         for concept in fhir_cs.concept:
             datatype = get_fhir_concept_datatype(concept)
             ocl_concept = OCLConcept(
@@ -149,15 +158,17 @@ def transform_fhir_to_ocl(fhir_codesystem_json: Dict, source_name: str, source_o
                         name_type=OclConstants.NAME_TYPE_FULLY_SPECIFIED,
                     )
                 ],
-                descriptions=[]
+                descriptions=[],
             )
 
             # Add definition if present
-            if hasattr(concept, 'definition') and concept.definition:
-                ocl_concept.descriptions.append(OCLDetailedDescription(
-                    description=concept.definition,
-                    locale="en",
-                ))
+            if hasattr(concept, "definition") and concept.definition:
+                ocl_concept.descriptions.append(
+                    OCLDetailedDescription(
+                        description=concept.definition,
+                        locale="en",
+                    )
+                )
 
             # Extract and add properties as attributes
             attributes = get_attributes_from_concept_properties(concept, property_types)

tricc_oo/converters/cql/cqlLexer.py

@@ -1,3 +1,4 @@
+# flake8: noqa
 # Generated from cql.g4 by ANTLR 4.13.2
 from antlr4 import *
 from io import StringIO

tricc_oo/converters/cql/cqlListener.py

@@ -1,3 +1,4 @@
+# flake8: noqa
 # Generated from cql.g4 by ANTLR 4.13.2
 from antlr4 import *
 if "." in __name__:

tricc_oo/converters/cql/cqlParser.py

@@ -1,3 +1,4 @@
+# flake8: noqa
 # Generated from cql.g4 by ANTLR 4.13.2
 # encoding: utf-8
 from antlr4 import *

tricc_oo/converters/cql/cqlVisitor.py

@@ -1,3 +1,4 @@
+# flake8: noqa
 # Generated from cql.g4 by ANTLR 4.13.2
 from antlr4 import *
 if "." in __name__: