tricc-oo 1.5.16__tar.gz → 1.5.19__tar.gz

{tricc_oo-1.5.16 → tricc_oo-1.5.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.5.16
+Version: 1.5.19
 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.16 → tricc_oo-1.5.19}/pyproject.toml

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

{tricc_oo-1.5.16 → tricc_oo-1.5.19}/tests/test_cql.py

@@ -11,13 +11,8 @@ class TestCql(unittest.TestCase):
             operator=TriccOperator.AND,
             reference=[
                 TriccOperation(
-                    operator=TriccOperator.NOT,
-                    reference=[
-                        TriccOperation(
-                            operator=TriccOperator.ISNULL,
-                            reference=[TriccReference("p_weight")]
-                        )
-                    ]
+                    operator=TriccOperator.ISNOTNULL,
+                    reference=[TriccReference("p_weight")]
                 ),
                 TriccOperation(
                     operator=TriccOperator.MORE,
@@ -46,6 +41,21 @@ class TestCql(unittest.TestCase):
         )
         self.assertEqual(str(dg_operation), str(dg_expected))
     
+    def test_implied_concat(self):
+        if_cql = "'A' & \"B\" & 'C'"
+        cc_operation = transform_cql_to_operation(if_cql)
+        cc_expected = TriccOperation(
+            operator=TriccOperator.CONCATENATE,
+            reference=[
+                TriccStatic(value='A'),
+                TriccReference("B"),
+                TriccStatic(value='C')
+            ]
+        )
+        self.assertEqual(str(cc_operation), str(cc_expected))
+    
+    
+    
     def test_if(self):
         if_cql = "if AgeInDays() < 60 then 'newborn' else 'child'"
         if_operation = transform_cql_to_operation(if_cql)

{tricc_oo-1.5.16 → tricc_oo-1.5.19}/tricc_oo/converters/cql_to_operation.py

@@ -3,7 +3,7 @@ from tricc_oo.converters.cql.cqlLexer import cqlLexer
 from tricc_oo.converters.cql.cqlParser import cqlParser
 from tricc_oo.converters.cql.cqlVisitor import cqlVisitor
 from tricc_oo.converters.utils import clean_name
-from tricc_oo.models.base import  TriccOperator, TriccOperation, TriccStatic, TriccReference, not_clean, or_join, and_join
+from tricc_oo.models.base import  TriccOperator, TriccOperation, TriccStatic, TriccReference, not_clean, or_join, and_join, string_join
 import logging
 
 logger = logging.getLogger("default")
@@ -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
@@ -214,7 +216,11 @@ class cqlToXlsFormVisitor(cqlVisitor):
         if  operator == TriccOperator.AND:
             return and_join([left, right])
         elif  operator == TriccOperator.OR:
-            return or_join([left, right])  
+            return or_join([left, right])
+        elif operator == TriccOperator.CONCATENATE:
+            left = "" if left is None else left
+            right = "" if right is None else right
+            return string_join(left, right)
         else:
             op = TriccOperation(operator, [left, right])
             return op
@@ -285,10 +291,10 @@ class cqlToXlsFormVisitor(cqlVisitor):
         op_map = {
             '+': TriccOperator.PLUS,
             '-': TriccOperator.MINUS,
-            '&': TriccOperator.AND
+            '&': TriccOperator.CONCATENATE
         }
         return self.__std_operator(op_map.get(op_text), ctx)
-
+        
     
     def visitTypeExpression(self, ctx):
         to_type = ctx.getChild(2).getText()

{tricc_oo-1.5.16 → tricc_oo-1.5.19}/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.16 → tricc_oo-1.5.19}/tricc_oo/models/base.py

@@ -336,7 +336,8 @@ class TriccReference(TriccStatic):
 
 class TriccOperator(StrEnum):    
     AND = 'and' # and between left and rights
-    ADD_OR =  'and_or' # left and one of the righs  
+    ADD_OR =  'and_or' # left and one of the righs 
+    #ADD_STRING: 'add_string'
     OR = 'or' # or between left and rights
     NATIVE = 'native' #default left is native expression
     ISTRUE = 'istrue' # left is right 
@@ -357,6 +358,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)
@@ -364,7 +366,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
@@ -383,6 +384,7 @@ class TriccOperator(StrEnum):
     CAST_DATE = 'cast_date'
     PARENTHESIS = 'parenthesis'
     CONCATENATE = 'concatenate'
+    DATETIME_TO_DECIMAL = 'datetime_to_decimal'
 
 RETURNS_BOOLEAN =[
     TriccOperator.ADD_OR,
@@ -414,6 +416,8 @@ RETURNS_NUMBER = [
     TriccOperator.AGE_YEAR,
     TriccOperator.ZSCORE,
     TriccOperator.IZSCORE,
+    TriccOperator.ROUND,
+    TriccOperator.DATETIME_TO_DECIMAL,
     TriccOperator.PLUS,
     TriccOperator.MINUS,
     TriccOperator.DIVIDED,
@@ -456,7 +460,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)
@@ -658,7 +663,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)
@@ -671,6 +676,30 @@ def and_join(argv):
             TriccOperator.AND,
             argv
         )
+        
+        
+def string_join(left: Union[str, TriccOperation], right: Union[str, TriccOperation]) -> TriccOperation:
+    """
+    Concatenates two arguments (strings or TriccOperation) into a TriccOperation with CONCATENATE operator.
+    If either argument is a TriccOperation with CONCATENATE operator, its operands are merged into the result.
+    """
+    # Initialize operands list for the new TriccOperation
+    operands: List[Union[str, TriccOperation]] = []
+
+    # Check if left is a TriccOperation with CONCATENATE
+    if isinstance(left, TriccOperation) and left.operator == TriccOperator.CONCATENATE:
+        operands.extend(left.reference)  # Merge left's operands
+    else:
+        operands.append(left)  # Add left as-is
+
+    # Check if right is a TriccOperation with CONCATENATE
+    if isinstance(right, TriccOperation) and right.operator == TriccOperator.CONCATENATE:
+        operands.extend(right.reference)  # Merge right's operands
+    else:
+        operands.append(right)  # Add right as-is
+
+    # Return a new TriccOperation with the merged operands
+    return TriccOperation(operator=TriccOperator.CONCATENATE, reference=operands)
 
 # function that make a 2 part and
 # @param left part

{tricc_oo-1.5.16 → tricc_oo-1.5.19}/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.16 → tricc_oo-1.5.19}/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.16 → tricc_oo-1.5.19}/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.16 → tricc_oo-1.5.19}/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.16 → tricc_oo-1.5.19}/tricc_oo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.5.16
+Version: 1.5.19
 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