tricc-oo 1.5.8__py3-none-any.whl → 1.5.10__py3-none-any.whl

tricc_oo/converters/drawio_type_map.py

@@ -129,7 +129,7 @@ TYPE_MAP = {
     },
     TriccNodeType.rhombus: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "expression", 'label'],
+        "attributes": ["save", "expression", 'label','priority'],
         "mandatory_attributes": ["reference"],
         "model": TriccNodeRhombus
     },

tricc_oo/converters/xml_to_tricc.py

@@ -475,17 +475,6 @@ def get_max_version(dict):
     return max_version
 
 
-def update_calc_version(calculates, name):
-    if name in calculates and len(calculates[name]) > 1:
-        ordered_list = sorted(list(calculates[name].values()), key=lambda x: x.path_len)
-        i = 1
-        len_max = len(calculates[name])
-        for elm in ordered_list:
-            elm.version = i
-            elm.last = (i == len_max)
-            i += 1
-
-
 def get_max_named_version(calculates, name):
     max = 0
     if name in calculates:

tricc_oo/models/base.py

@@ -106,7 +106,7 @@ class TriccBaseModel(BaseModel):
     external_id: triccId = None
     tricc_type: TriccNodeType
     datatype: str = None
-    instance: int = 1
+    instance: int = 0
     base_instance: Optional[TriccBaseModel] = None
     last: bool = None
     version: int = 1
@@ -123,7 +123,9 @@ class TriccBaseModel(BaseModel):
     def to_dict(self):
         return {key: value for key, value in vars(self).items() if not key.startswith('_')}
 
-    def make_instance(self, nb_instance, **kwargs):
+    def make_instance(self, nb_instance=None, **kwargs):
+        if nb_instance == None:
+            nb_instance = self.get_next_instance()
         instance = self.copy()
         attr_dict = self.to_dict()
         for attr, value in attr_dict.items():
@@ -257,7 +259,7 @@ class TriccNodeBaseModel(TriccBaseModel):
         
 
 
-    def make_instance(self, instance_nb, activity=None):
+    def make_instance(self, instance_nb=None, activity=None):
         instance = super().make_instance(instance_nb)
         instance.group = activity
         if hasattr(self, 'activity') and activity is not None:
@@ -630,6 +632,8 @@ def not_clean(a):
 # @param list_or
 # @param and elm use upstream
 def clean_or_list(list_or, elm_and=None):
+    if len(list_or) == 1:
+        return list(list_or)
     if TriccStatic(True) in list_or:
         return [TriccStatic(True)]
     for a in list(list_or):

tricc_oo/models/calculate.py

@@ -53,7 +53,7 @@ class TriccNodeCount(TriccNodeDisplayCalculateBase):
 class TriccNodeProposedDiagnosis(TriccNodeDisplayCalculateBase):
     tricc_type: TriccNodeType = TriccNodeType.proposed_diagnosis
     severity: str = None
-    priority: Union[float, int, None] = None
+    
     
 class TriccNodeFakeCalculateBase(TriccNodeCalculateBase):
     ...
@@ -131,7 +131,6 @@ class TriccNodeRhombus(TriccNodeCalculateBase,TriccRhombusMixIn):
 class TriccNodeDiagnosis(TriccNodeDisplayCalculateBase):
     tricc_type: TriccNodeType = TriccNodeType.diagnosis
     severity: str = None
-    priority: Union[float, int, None] = None
     def __init__(self, **data):
         data['reference'] = f'"final.{data["name"]}" is true'
         super().__init__(**data)

tricc_oo/models/tricc.py

@@ -18,6 +18,7 @@ class TriccNodeCalculateBase(TriccNodeBaseModel):
     expression_reference: Union[str, TriccOperation] = None
     last: bool = None
     datatype: str = 'boolean'
+    priority: Union[float, int, None] = None
     # to use the enum value of the TriccNodeType
     class Config:
         use_enum_values = True  # <--
@@ -32,8 +33,8 @@ class TriccNodeCalculateBase(TriccNodeBaseModel):
             instance.reference = [e.copy() if isinstance(e, (TriccReference, TriccOperation)) else (TriccReference(e.name) if hasattr(e, 'name') else e) for e in self.reference]
         else:
             instance.reference = None
-        version = self.version + 1
-        instance.version = version
+        if instance.base_instance != self:
+            instance.version = self.version + 1
         return instance
 
     def __init__(self, **data):
@@ -85,7 +86,7 @@ class TriccNodeActivity(TriccNodeBaseModel):
     applicability: Optional[Union[Expression, TriccOperation]] = None
 
     # redefine 
-    def make_instance(self, instance_nb, **kwargs):
+    def make_instance(self, instance_nb=None, **kwargs):
         from tricc_oo.models.calculate import (
             TriccNodeDisplayBridge,
             TriccNodeBridge,

tricc_oo/serializers/xls_form.py

@@ -305,14 +305,14 @@ def gen_operation_hash(op):
 
 
 def generate_choice_filter(strategy, node):
-    if isinstance(node, TriccNodeSelectOption) and node.relevance:
+    if isinstance(node, TriccNodeSelectOption) and node.relevance and node.relevance != TriccStatic(True):
         return gen_operation_hash(node.relevance)
     if not isinstance(node, (TriccNodeSelectMultiple, TriccNodeSelectOne)):
         return
     relevances = {}
     option_filter = {}
     for o in node.options.values():
-        if o.relevance:
+        if o.relevance and o.relevance != TriccStatic(True):
             key = gen_operation_hash(o.relevance)
             if key not in relevances:
                 relevances[key] = o.relevance

tricc_oo/strategies/input/drawio.py

@@ -230,7 +230,7 @@ class DrawioStrategy(BaseInputStrategy):
                     if int(other_page.instance) > int(max_instance):
                         max_instance = other_page.instance
                 # auto instance starts at 101
-                next_page = next_page.make_instance(max(100, max_instance) + 1)
+                next_page = next_page.make_instance()
             else:
                 # return existing instance if any
                 next_page = next_page.make_instance(node.instance)