tricc-oo 1.4.8__tar.gz → 1.4.10__tar.gz

{tricc_oo-1.4.8 → tricc_oo-1.4.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tricc-oo
-Version: 1.4.8
+Version: 1.4.10
 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.4.8 → tricc_oo-1.4.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tricc-oo"
-version = "1.4.8"
+version = "1.4.10"
 description = "Python library that converts CDSS L2 in L3"
 readme = "README.md"
 license-files = ["LICENSE"]

{tricc_oo-1.4.8 → tricc_oo-1.4.10}/tricc_oo/converters/utils.py

@@ -1,4 +1,5 @@
 import logging
+import re
 import random
 import string
 import hashlib
@@ -48,5 +49,24 @@ def get_rand_name(name=None, length=8):
 
 # the soup.text strips off the html formatting also
 def remove_html(string):
-    text = md(string, strip=["img", "table", "a"])
+    placeholders = {}
+
+    def replace_placeholders(match):
+        key = f"__PLACEHOLDER_{len(placeholders)}__"
+        placeholders[key] = match.group(0)
+        return key
+
+    protected_text = re.sub(r"\${.*?\}", replace_placeholders, string)
+
+    text = md(
+        protected_text,
+        strip=["img", "table", "a"],
+        strong_em_symbol="*",
+        escape_underscores=False,
+        escape_asterisks=False,
+        bullets=["-", "*"],
+    )
+
+    for key, original in placeholders.items():
+        text = text.replace(key, original)
     return text

{tricc_oo-1.4.8 → tricc_oo-1.4.10}/tricc_oo/converters/xml_to_tricc.py

@@ -186,7 +186,7 @@ def process_edges(diagram, media_path, activity, nodes):
             if image is not None:
                 images.append({"file_path": enriched, "image_content": image})
 
-        elif isinstance(nodes[edge.target], (TriccNodeActivityEnd, TriccNodeEnd)):
+        elif isinstance(nodes[edge.target], (TriccNodeActivityEnd)) or (isinstance(nodes[edge.target], (TriccNodeEnd)) and isinstance(activity.root, TriccNodeMainStart )):
             end_found = True
         if (
             edge.target in nodes
@@ -240,7 +240,7 @@ def process_edges(diagram, media_path, activity, nodes):
                     )
                 )
     if not end_found:
-        fake_end = TriccNodeActivityEnd(id=generate_id(), activity=activity, group=activity)
+        fake_end = TriccNodeActivityEnd(id=generate_id(f"e{activity.name}"), activity=activity, group=activity)
         last_nodes = [
             n for n in list(activity.nodes.values())
             if (
@@ -490,8 +490,9 @@ def get_max_named_version(calculates, name):
 
 
 def inject_bridge_path(node, nodes):
-    calc_id = generate_id()
-    calc_name = "path_" + calc_id
+    calc_name = "p" + node.id
+    calc_id = generate_id(calc_name)
+    
     data = {
         "id": calc_id,
         "group": node.group,

{tricc_oo-1.4.8 → tricc_oo-1.4.10}/tricc_oo/models/base.py

@@ -116,7 +116,7 @@ class TriccBaseModel(BaseModel):
     def make_instance(self, nb_instance, **kwargs):
         instance = self.copy()
         # change the id to avoid collision of name
-        instance.id = generate_id()
+        instance.id = generate_id(f"{self.id}{nb_instance}")
         instance.instance = int(nb_instance)
         instance.base_instance = self
 
@@ -149,7 +149,7 @@ class TriccBaseModel(BaseModel):
     
     def __init__(self, **data):
         if 'id' not in data:
-            data['id'] = generate_id()
+            data['id'] = generate_id(str(data))
         super().__init__(**data)
 
 
@@ -181,7 +181,7 @@ class TriccGroup(TriccBaseModel):
     def __init__(self, **data):
         super().__init__(**data)
         if self.name is None:
-            self.name = generate_id()
+            self.name = generate_id(str(data))
 
     def get_name(self):
         result = str(super().get_name())

{tricc_oo-1.4.8 → tricc_oo-1.4.10}/tricc_oo/models/calculate.py

@@ -102,7 +102,7 @@ class TriccRhombusMixIn():
                     exit(1)
         instance.reference = reference
         instance.expression_reference = expression_reference
-        instance.name = get_rand_name()
+        instance.name = get_rand_name(self.id)
         return instance
 
 

{tricc_oo-1.4.8 → tricc_oo-1.4.10}/tricc_oo/models/tricc.py

@@ -224,7 +224,7 @@ class TriccNodeActivity(TriccNodeBaseModel):
             TriccNodeEnd,
             TriccNodeActivityEnd,
         )
-        return  list(filter(lambda x:  issubclass(x.__class__, (TriccNodeEnd,TriccNodeActivityEnd)), self.nodes.values()))
+        return  list(filter(lambda x:  isinstance(x, (TriccNodeActivityEnd)) or (isinstance(x, (TriccNodeEnd)) and isinstance(self.root, TriccNodeMainStart )), self.nodes.values()))
 
 
 

{tricc_oo-1.4.8 → tricc_oo-1.4.10}/tricc_oo/strategies/input/base_input_strategy.py

@@ -53,14 +53,14 @@ class BaseInputStrategy:
                     project.start_pages['determine-diagnosis'] = diags_activity
             root_process = sorted_pages[list(sorted_pages.keys())[0]][0].root
             root = TriccNodeMainStart(
-                id=generate_id(),
+                id=generate_id('s-determine-diagnosis'),
                 form_id=root_process.form_id,
                 label=root_process.label
             )
             nodes = {}
             nodes[root.id] = root
             app = TriccNodeActivity(
-                id=generate_id(),
+                id=generate_id('a-determine-diagnosis'),
                 name=root_process.name,
                 root=root,
                 nodes=nodes

{tricc_oo-1.4.8 → tricc_oo-1.4.10}/tricc_oo/visitors/tricc.py

@@ -162,7 +162,7 @@ def process_calculate(node,processed_nodes, stashed_nodes, calculates, used_calc
                     
                     
                     calc = TriccNodeCalculate(
-                        id=generate_id(),
+                        id=generate_id(f"save{node.id}"),
                         name=node.name,
                         path_len=node.path_len+1,
                         version=last_version.version + 2,
@@ -304,7 +304,7 @@ def get_max_named_version(calculates,name):
     return max
 
 def get_count_node(node):
-    count_id = generate_id()
+    count_id = generate_id(f"count{node.id}")
     count_name = "cnt_"+count_id
     return TriccNodeCount(
         id = count_id,
@@ -331,7 +331,7 @@ def get_activity_wait(prev_nodes, nodes_to_wait, next_nodes, replaced_node = Non
  
     activity = activity or prev_node.activity
     calc_node = TriccNodeWait(
-            id = "ar_"+generate_id(),
+            id = generate_id(f"ar{''.join([x.id for x in nodes_to_wait])}{activity.id}"),
             reference = nodes_to_wait,
             activity = activity,
             group = activity,
@@ -359,7 +359,7 @@ def get_bridge_path(prev_nodes, node=None,edge_only=False):
     p_p_node = next(iterator)    
     if node is None:
         node = p_p_node
-    calc_id  = generate_id()
+    calc_id  = generate_id(f"br{''.join([x.id for x in prev_nodes])}{node.id}")
     calc_name = "path_"+calc_id
     data = {
         'id': calc_id,
@@ -478,7 +478,7 @@ def generate_calculates(node,calculates, used_calculates,processed_nodes):
             calc_node.name=calculate_name
             calc_node.label =  "save select: " +node.get_name()        
         else:
-            calc_id = generate_id()
+            calc_id = generate_id(f"autosave{node.id}")
             calc_node = TriccNodeCalculate(
                 name=calculate_name,
                 id = calc_id,
@@ -735,7 +735,7 @@ def add_used_calculate(node, prev_node, calculates, used_calculates, processed_n
         
 def get_select_not_available_options(node,group,label):
     return {0:TriccNodeSelectOption(
-                id = generate_id(),
+                id = generate_id(f"notavaialble{node.id}"),
                 name="1",
                 label=label,
                 select = node,
@@ -745,7 +745,7 @@ def get_select_not_available_options(node,group,label):
         
 def get_select_yes_no_options(node, group):
     yes = TriccNodeSelectOption(
-                id = generate_id(),
+                id = generate_id(f'yes{node.id}'),
                 name=f"{TRICC_TRUE_VALUE}",
                 label="Yes",
                 select = node,
@@ -753,7 +753,7 @@ def get_select_yes_no_options(node, group):
                 list_name = node.list_name
             )
     no = TriccNodeSelectOption(
-                id = generate_id(),
+                id = generate_id(f'no{node.id}'),
                 name=f"{TRICC_FALSE_VALUE}",
                 label="No",
                 select = node,
@@ -1584,7 +1584,7 @@ def export_proposed_diags(activity, diags=None, **kwargs):
 
 def get_accept_diagnostic_node(code, display, severity, activity):
     node = TriccNodeAcceptDiagnostic(
-        id=generate_id(),
+        id=generate_id("pre_final." + code),
         name="pre_final." + code,
         label=display,
         list_name="acc_rej",
@@ -1597,7 +1597,7 @@ def get_accept_diagnostic_node(code, display, severity, activity):
 
 def get_diagnostic_node(code, display, severity, activity):
     node = TriccNodeAcceptDiagnostic(
-        id=generate_id(),
+        id=generate_id("final." + code),
         name="final." + code,
         label=display,
         list_name="acc_rej",
@@ -1610,7 +1610,7 @@ def get_diagnostic_node(code, display, severity, activity):
 
 def get_select_accept_reject_options(node, group):
     yes = TriccNodeSelectOption(
-                id = generate_id(),
+                id = generate_id(f'accept{node.id}'),
                 name=f"{TRICC_TRUE_VALUE}",
                 label="Accept",
                 select = node,
@@ -1618,7 +1618,7 @@ def get_select_accept_reject_options(node, group):
                 list_name = node.list_name
             )
     no = TriccNodeSelectOption(
-                id = generate_id(),
+                id = generate_id(f'reject{node.id}'),
                 name=f"{TRICC_FALSE_VALUE}",
                 label="Reject",
                 select = node,
@@ -1629,13 +1629,13 @@ def get_select_accept_reject_options(node, group):
 
 def create_determine_diagnosis_activity(diags):
     start = TriccNodeActivityStart(
-        id=generate_id(),
+        id=generate_id('start.determine-diagnosis'),
         name="start.determine-diagnosis"
     )
 
     
     activity = TriccNodeActivity(
-        id=generate_id(),
+        id=generate_id('activity-determine-diagnosis'),
         name='determine-diagnosis',
         label='Diagnosis',
         root=start,
@@ -1647,7 +1647,7 @@ def create_determine_diagnosis_activity(diags):
     diags_conf = []
     r_diags_conf = []
     end = TriccNodeActivityEnd(
-        id=generate_id(),
+        id=generate_id("end.determine-diagnosis"),
         name="end.determine-diagnosis",
         activity=activity,
         group=activity,
@@ -1657,7 +1657,7 @@ def create_determine_diagnosis_activity(diags):
         d = get_diagnostic_node(proposed.name, proposed.label, proposed.severity, activity)
         diags_conf.append(d)
         r = TriccNodeRhombus(
-            id=generate_id(),
+            id=generate_id(f"proposed-rhombus{proposed.id}"),
             expression_reference=TriccOperation(
                 TriccOperator.ISTRUE,
                 [TriccReference(proposed.name)]

{tricc_oo-1.4.8 → tricc_oo-1.4.10}/tricc_oo.egg-info/PKG-INFO

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