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

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

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

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

{tricc_oo-1.5.18 → tricc_oo-1.5.20}/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.18 → tricc_oo-1.5.20}/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")
@@ -216,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
@@ -287,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.18 → tricc_oo-1.5.20}/tricc_oo/models/base.py

@@ -203,7 +203,11 @@ class TriccGroup(TriccBaseModel):
         super().__init__(**data)
         if self.name is None:
             self.name = generate_id(str(data))
-
+    
+    def gen_name(self):
+        if self.name is None:
+            self.name = get_rand_name(self.id)
+            
     def get_name(self):
         result = str(super().get_name())
         name =  getattr(self, 'name', None) 
@@ -336,7 +340,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 
@@ -675,6 +680,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.18 → tricc_oo-1.5.20}/tricc_oo.egg-info/PKG-INFO

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