tricc-oo 1.5.15__tar.gz → 1.5.18__tar.gz

{tricc_oo-1.5.15 → tricc_oo-1.5.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.5.15
+Version: 1.5.18
 Summary: Python library that converts CDSS L2 in L3
 Project-URL: Homepage, https://github.com/SwissTPH/tricc
 Project-URL: Issues, https://github.com/SwissTPH/tricc/issues

{tricc_oo-1.5.15 → tricc_oo-1.5.18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tricc-oo"
-version = "1.5.15"
+version = "1.5.18"
 description = "Python library that converts CDSS L2 in L3"
 readme = "README.md"
 requires-python = ">=3.8"

{tricc_oo-1.5.15 → tricc_oo-1.5.18}/tricc_oo/converters/cql_to_operation.py

@@ -21,8 +21,10 @@ FUNCTION_MAP = {
     'Concatenate': TriccOperator.CONCATENATE,
     'Izscore': TriccOperator.IZSCORE,
     'Zscore': TriccOperator.ZSCORE,
+    'Round': TriccOperator.ROUND,
     'DrugDosage':  TriccOperator.DRUG_DOSAGE,
     'HasQualifier': TriccOperator.HAS_QUALIFIER,
+    'DateTimeToDecimal' : TriccOperator.DATETIME_TO_DECIMAL
 }
 # TODO
 # Min

{tricc_oo-1.5.15 → tricc_oo-1.5.18}/tricc_oo/converters/drawio_type_map.py

@@ -45,7 +45,6 @@ TYPE_MAP = {
             "constraint_message",
             "relevance",
             "priority", "trigger", "default"
-
         ],
         "mandatory_attributes": ["label", "name", "list_name"],
         "model": TriccNodeSelectOne
@@ -99,13 +98,13 @@ TYPE_MAP = {
 
     TriccNodeType.text: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "relevance","priority", "trigger", "default"],
+        "attributes": ["save", "relevance","priority", "trigger", "default", "constraint", "constraint_message"],
         "mandatory_attributes": ["label", 'name'],
         "model": TriccNodeText
     },
     TriccNodeType.date: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "relevance","priority", "trigger", "default"],
+        "attributes": ["save", "relevance","priority", "trigger", "default", "constraint", "constraint_message"],
         "mandatory_attributes": ["label", "name"],
         "model": TriccNodeDate
     },

{tricc_oo-1.5.15 → tricc_oo-1.5.18}/tricc_oo/converters/xml_to_tricc.py

@@ -774,15 +774,15 @@ def clean_link(link):
         return link_parts[1]
 
 
-def get_groups(diagram, nodes, parent_group):
+def get_groups(diagram, nodes, activity):
     groups = {}
     list = get_tricc_type_list(diagram, "object", TriccNodeType.page)
     for elm in list:
-        add_group(elm, diagram, nodes, groups, parent_group)
+        add_group(elm, diagram, nodes, groups, activity, activity)
     return groups
 
 
-def add_group(elm, diagram, nodes, groups, parent_group):
+def add_group(elm, diagram, nodes, groups, parent_group, activity):
     external_id = elm.attrib.get("id")
     id = get_id(external_id, diagram.attrib.get("id"))
     if id not in groups:
@@ -792,6 +792,7 @@ def add_group(elm, diagram, nodes, groups, parent_group):
             id=id,
             external_id=external_id,
             group=parent_group,
+            activity=activity
         )
         # get elememt witn parent = id and tricc_type defiend
         list_child = get_tricc_type_list(

{tricc_oo-1.5.15 → tricc_oo-1.5.18}/tricc_oo/models/base.py

@@ -192,6 +192,7 @@ class TriccEdge(TriccBaseModel):
 class TriccGroup(TriccBaseModel):
     tricc_type: TriccNodeType = TriccNodeType.page
     group: Optional[TriccBaseModel] = None
+    activity: TriccBaseModel
     name: Optional[str] = None
     export_name:Optional[str] = None
     label: Optional[Union[str, Dict[str,str]]] = None
@@ -356,6 +357,7 @@ class TriccOperator(StrEnum):
     NOT = 'not'
     ISNULL = 'isnull'
     ISNOTNULL= 'isnotnull'
+    ROUND = 'round'
 
     CASE = 'case' # ref (equal value, res), (equal value,res)
     IFS = 'ifs' #(cond, res), (cond,res)
@@ -363,7 +365,6 @@ class TriccOperator(StrEnum):
     
     # CDSS Specific
     HAS_QUALIFIER = 'has_qualifier'
-    
     ZSCORE = 'zscore' # left table_name, right Y, gender give Z
     IZSCORE = 'izscore' #left table_name, right Z, gender give Y
     AGE_DAY = 'age_day' # age from dob
@@ -382,6 +383,7 @@ class TriccOperator(StrEnum):
     CAST_DATE = 'cast_date'
     PARENTHESIS = 'parenthesis'
     CONCATENATE = 'concatenate'
+    DATETIME_TO_DECIMAL = 'datetime_to_decimal'
 
 RETURNS_BOOLEAN =[
     TriccOperator.ADD_OR,
@@ -413,6 +415,8 @@ RETURNS_NUMBER = [
     TriccOperator.AGE_YEAR,
     TriccOperator.ZSCORE,
     TriccOperator.IZSCORE,
+    TriccOperator.ROUND,
+    TriccOperator.DATETIME_TO_DECIMAL,
     TriccOperator.PLUS,
     TriccOperator.MINUS,
     TriccOperator.DIVIDED,
@@ -455,7 +459,8 @@ class TriccOperation(BaseModel):
         return hash(self.__repr__())
 
     def __repr__(self):
-        return "TriccOperation:"+self.__str__()
+        str_ref = map(repr, self.reference)
+        return f"TriccOperation:{self.operator}({', '.join(map(str, str_ref))})"
     
     def __eq__(self, other):
         return self.__str__() == str(other)
@@ -657,7 +662,7 @@ def clean_or_list(list_or, elm_and=None):
     if len(list_or) == 0:
         return []
 
-    return sorted(list(set(list_or)), key=str)
+    return sorted(list(set(list_or)), key=repr)
 
 def and_join(argv):
     argv=clean_and_list(argv)

{tricc_oo-1.5.15 → tricc_oo-1.5.18}/tricc_oo/serializers/xls_form.py

@@ -264,7 +264,7 @@ def get_xfrom_trad(strategy, node, column, mapping, clean_html=False):
         issubclass(node.__class__, TriccNodeDisplayCalculateBase)
         and column == "calculation"
         and isinstance(value, str)
-        and not value.startswith("number")
+        and not (value.startswith("number") or value.startswith("round"))
         and getattr(node, "expression", None)
         and node.expression.get_datatype() in ("number", "boolean")
     ):

{tricc_oo-1.5.15 → tricc_oo-1.5.18}/tricc_oo/strategies/output/base_output_strategy.py

@@ -131,6 +131,10 @@ class BaseOutPutStrategy:
         raise NotImplementedError(f"This type of opreration  is not supported in this strategy")
     def tricc_operation_zscore(self, ref_expressions):
         raise NotImplementedError(f"This type of opreration  is not supported in this strategy")
+    def tricc_operation_datetime_to_decimal(self, ref_expressions):
+        raise NotImplementedError(f"This type of opreration  is not supported in this strategy")
+    def tricc_operation_round(self, ref_expressions):
+        raise NotImplementedError(f"This type of opreration  is not supported in this strategy")
     def tricc_operation_izscore(self, ref_expressions):
         raise NotImplementedError(f"This type of opreration  is not supported in this strategy")
     def tricc_operation_age_day(self, ref_expressions):

{tricc_oo-1.5.15 → tricc_oo-1.5.18}/tricc_oo/strategies/output/xls_form.py

@@ -569,6 +569,13 @@ class XLSFormStrategy(BaseOutPutStrategy):
         #  return ((Math.pow((y / m), l) - 1) / (s * l));
         return f"(pow({y} div ({m}), {ll}) -1) div (({s}) div ({ll}))"
    
+    def tricc_operation_datetime_to_decimal(self, ref_expressions):
+        return f"decimal-date-time({ref_expressions[0]})"
+    
+    def tricc_operation_round(self, ref_expressions):
+        return f"round({ref_expressions[0]})"
+   
+       
     
     def tricc_operation_izscore(self, ref_expressions):
         z, ll, m, s = self.get_zscore_params(ref_expressions)
@@ -671,7 +678,7 @@ class XLSFormStrategy(BaseOutPutStrategy):
         if isinstance(r, TriccOperation):
             return self.get_tricc_operation_expression(r) 
         elif isinstance(r, TriccReference):
-            logger.warning(f"reference still used in the calculate {r.value}")
+            logger.warning(f"reference `{r.value}` still used in a calculate")
             return f"${{{get_export_name(r.value)}}}" 
         elif isinstance(r, TriccStatic):
             if isinstance(r.value, bool) :#or r.value in ('true', 'false')

{tricc_oo-1.5.15 → tricc_oo-1.5.18}/tricc_oo/visitors/tricc.py

@@ -607,6 +607,21 @@ def process_reference(node, processed_nodes, calculates, used_calculates=None,
             return False
         elif modified_expression and replace_reference:
             node.trigger = modified_expression
+    if isinstance(getattr(node, 'constraint', None), (TriccOperation, TriccReference)):
+        modified_expression = process_operation_reference(
+            node.constraint, 
+            node, 
+            processed_nodes=processed_nodes,
+            calculates=calculates, 
+            used_calculates=used_calculates, 
+            replace_reference=replace_reference,
+            warn=warn, 
+            codesystems=codesystems
+        )
+        if modified_expression is False:
+            return False
+        elif modified_expression and replace_reference:
+            node.constraint = modified_expression
     
     if isinstance(getattr(node, 'default', None), (TriccOperation, TriccReference)):
         modified_expression = process_operation_reference(
@@ -1675,26 +1690,32 @@ def get_prev_instance_skip_expression(node, processed_nodes, process, expression
 
 # end def
 def get_process_skip_expression(node, processed_nodes, process, expression=None):
-    
-    end_expressions = []
-    f_end_expression = get_end_expression(processed_nodes)
-    if f_end_expression:
-        end_expressions.append(f_end_expression)
-    b_end_expression = get_end_expression(processed_nodes, 'pause')
-    if b_end_expression:
-        end_expressions.append(b_end_expression)        
-    if process[0] in PROCESSES:
-        for p in PROCESSES[PROCESSES.index(process[0])+1:]:
-            p_end_expression = get_end_expression(processed_nodes, p)
-            if p_end_expression:
-                end_expressions.append(p_end_expression)
-    if end_expressions:
-        if expression:
-            end_expressions.append(expression)
-        if len(end_expressions) == 1:
-            expression = end_expressions[0]
-        else:
-            expression = and_join(end_expressions)
+    list_ends = OrderedSet(
+                filter(
+                    lambda x: issubclass(x.__class__, TriccNodeEnd),
+                    processed_nodes
+                )
+            )
+    if list_ends:
+        end_expressions = []
+        f_end_expression = get_end_expression(list_ends)
+        if f_end_expression:
+            end_expressions.append(f_end_expression)
+        b_end_expression = get_end_expression(list_ends, 'pause')
+        if b_end_expression:
+            end_expressions.append(b_end_expression)        
+        if process[0] in PROCESSES:
+            for p in PROCESSES[PROCESSES.index(process[0])+1:]:
+                p_end_expression = get_end_expression(list_ends, p)
+                if p_end_expression:
+                    end_expressions.append(p_end_expression)
+        if end_expressions:
+            if expression:
+                end_expressions.append(expression)
+            if len(end_expressions) == 1:
+                expression = end_expressions[0]
+            else:
+                expression = and_join(end_expressions)
     return expression
         
 def get_end_expression(processed_nodes, process=None):

{tricc_oo-1.5.15 → tricc_oo-1.5.18}/tricc_oo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.5.15
+Version: 1.5.18
 Summary: Python library that converts CDSS L2 in L3
 Project-URL: Homepage, https://github.com/SwissTPH/tricc
 Project-URL: Issues, https://github.com/SwissTPH/tricc/issues