tricc-oo 1.5.13__py3-none-any.whl → 1.6.8__py3-none-any.whl

tricc_oo/converters/drawio_type_map.py

@@ -1,38 +1,67 @@
-from strenum import StrEnum
-from tricc_oo.models.base import *
-from tricc_oo.models.calculate import *
+from tricc_oo.models.base import (
+    TriccNodeType
+)
 
+from tricc_oo.models.calculate import (
+    TriccNodeBridge,
+    TriccNodeActivityEnd,
+    TriccNodeActivityStart,
+    TriccNodeEnd,
+    TriccNodeAdd,
+    TriccNodeCount,
+    TriccNodeWait,
+    TriccNodeCalculate,
+    TriccNodeRhombus,
+    TriccNodeExclusive,
+    TriccNodeProposedDiagnosis,
+    TriccNodeDiagnosis,
+    TriccNodeInput,
+)
 
+from tricc_oo.models.tricc import (
+    TriccNodeMainStart,
+    TriccNodeLinkIn,
+    TriccNodeGoTo,
+    TriccNodeSelectMultiple,
+    TriccNodeSelectNotAvailable,
+    TriccNodeText,
+    TriccNodeDecimal,
+    TriccNodeInteger,
+    TriccNodeDate,
+    TriccNodeSelectOne,
+    TriccNodeSelectYesNo,
+    TriccNodeNote,
+)
 TYPE_MAP = {
     TriccNodeType.start: {
         "objects": ["UserObject", "object"],
-        "attributes": ['process', 'parent', 'form_id','relevance',"priority"],
+        "attributes": ["process", "parent", "form_id", "relevance", "priority"],
         "mandatory_attributes": ["label"],
-        "model": TriccNodeMainStart
+        "model": TriccNodeMainStart,
     },
     TriccNodeType.activity_start: {
         "objects": ["UserObject", "object"],
-        "attributes": ['parent', 'parent', 'instance', 'relevance',"priority"],
+        "attributes": ["parent", "parent", "instance", "relevance", "priority"],
         "mandatory_attributes": ["label", "name"],
-        "model": TriccNodeActivityStart
+        "model": TriccNodeActivityStart,
     },
     TriccNodeType.note: {
         "objects": ["UserObject", "object"],
-        "attributes": ['relevance',"priority"],
+        "attributes": ["relevance", "priority", "context_type"],
         "mandatory_attributes": ["label", "name"],
-        "model": TriccNodeNote
+        "model": TriccNodeNote,
     },
     TriccNodeType.hint: {
         "objects": ["UserObject", "object"],
         "attributes": [],
         "mandatory_attributes": ["label"],
-        "model": None
+        "model": None,
     },
     TriccNodeType.help: {
         "objects": ["UserObject", "object"],
         "attributes": [],
         "mandatory_attributes": ["label"],
-        "model": None
+        "model": None,
     },
     TriccNodeType.select_one: {
         "has_options": True,
@@ -44,11 +73,13 @@ TYPE_MAP = {
             "constraint",
             "constraint_message",
             "relevance",
-            "priority"
-
+            "priority",
+            "trigger",
+            "default",
+            "context_type",
         ],
         "mandatory_attributes": ["label", "name", "list_name"],
-        "model": TriccNodeSelectOne
+        "model": TriccNodeSelectOne,
     },
     TriccNodeType.select_multiple: {
         "has_options": True,
@@ -60,10 +91,13 @@ TYPE_MAP = {
             "constraint",
             "constraint_message",
             "relevance",
-            "priority"
+            "priority",
+            "trigger",
+            "default",
+            "context_type",
         ],
         "mandatory_attributes": ["label", "name", "list_name"],
-        "model": TriccNodeSelectMultiple
+        "model": TriccNodeSelectMultiple,
     },
     TriccNodeType.decimal: {
         "objects": ["UserObject", "object"],
@@ -75,10 +109,13 @@ TYPE_MAP = {
             "constraint_message",
             "required",
             "relevance",
-            "priority"
+            "priority",
+            "trigger",
+            "default",
+            "context_type",
         ],
         "mandatory_attributes": ["label", "name"],
-        "model": TriccNodeDecimal
+        "model": TriccNodeDecimal,
     },
     TriccNodeType.integer: {
         "objects": ["UserObject", "object"],
@@ -90,66 +127,99 @@ TYPE_MAP = {
             "constraint_message",
             "required",
             "relevance",
-            "priority"
-            
+            "priority",
+            "trigger",
+            "default",
+            "context_type",
         ],
         "mandatory_attributes": ["label", "name"],
-        "model": TriccNodeInteger
+        "model": TriccNodeInteger,
     },
-
     TriccNodeType.text: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "relevance","priority"],
-        "mandatory_attributes": ["label", 'name'],
-        "model": TriccNodeText
+        "attributes": [
+            "save",
+            "relevance",
+            "priority",
+            "trigger",
+            "default",
+            "constraint",
+            "constraint_message",
+            "context_type",
+        ],
+        "mandatory_attributes": ["label", "name"],
+        "model": TriccNodeText,
     },
     TriccNodeType.date: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "relevance","priority"],
+        "attributes": [
+            "save",
+            "relevance",
+            "priority",
+            "trigger",
+            "default",
+            "constraint",
+            "constraint_message",
+            "context_type",
+        ],
         "mandatory_attributes": ["label", "name"],
-        "model": TriccNodeDate
+        "model": TriccNodeDate,
     },
     TriccNodeType.add: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "expression"],
-        "mandatory_attributes": ['label', "name"],
-        "model": TriccNodeAdd
+        "attributes": ["save", "expression", "trigger"],
+        "mandatory_attributes": ["label", "name"],
+        "model": TriccNodeAdd,
     },
     TriccNodeType.count: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "expression"],
-        "mandatory_attributes": ['label', "name"],
-        "model": TriccNodeCount
+        "attributes": ["save", "expression", "trigger"],
+        "mandatory_attributes": ["label", "name"],
+        "model": TriccNodeCount,
     },
     TriccNodeType.calculate: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "reference"],
-        "mandatory_attributes": [ "name", 'label'],
-        "model": TriccNodeCalculate
+        "attributes": [
+            "save",
+            "reference",
+            "trigger",
+            "context_type",
+            "remote_reference",
+        ],
+        "mandatory_attributes": ["name", "label"],
+        "model": TriccNodeCalculate,
     },
+    # TODO: Make either reference or remote_reference mandatory
     TriccNodeType.rhombus: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "expression", 'label','priority'],
+        "attributes": [
+            "save",
+            "expression",
+            "remote_reference",
+            "label",
+            "priority",
+            "trigger",
+        ],
         "mandatory_attributes": ["reference"],
-        "model": TriccNodeRhombus
+        "model": TriccNodeRhombus,
     },
     TriccNodeType.wait: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "expression"],
-        "mandatory_attributes": ["reference", "name", 'label'],
-        "model": TriccNodeWait
+        "attributes": ["save", "expression", "trigger"],
+        "mandatory_attributes": ["reference", "name", "label"],
+        "model": TriccNodeWait,
     },
     TriccNodeType.exclusive: {
         "objects": ["UserObject", "object"],
         "attributes": [],
         "mandatory_attributes": [],
-        "model": TriccNodeExclusive
+        "model": TriccNodeExclusive,
     },
     TriccNodeType.not_available: {
         "objects": ["UserObject", "object"],
-        "attributes": [],
+        "attributes": ["context_type"],
         "mandatory_attributes": ["label", "name", "list_name"],
-        "model": TriccNodeSelectNotAvailable
+        "model": TriccNodeSelectNotAvailable,
     },
     TriccNodeType.select_yesno: {
         "objects": ["UserObject", "object"],
@@ -159,66 +229,77 @@ TYPE_MAP = {
             "filter",
             "constraint",
             "constraint_message",
-            "relevance","priority"
+            "relevance",
+            "priority",
+            "trigger",
+            "default",
+            "context_type",
         ],
         "mandatory_attributes": ["label", "name", "list_name"],
-        "model": TriccNodeSelectYesNo
+        "model": TriccNodeSelectYesNo,
     },
     TriccNodeType.link_out: {
         "objects": ["UserObject", "object"],
         "attributes": [],
         "mandatory_attributes": ["reference", "label", "name"],
-        "model": TriccNodeNote
+        "model": TriccNodeNote,
     },
     TriccNodeType.link_in: {
         "objects": ["UserObject", "object"],
         "attributes": [],
         "mandatory_attributes": ["label", "name"],
-        "model": TriccNodeLinkIn
+        "model": TriccNodeLinkIn,
     },
     TriccNodeType.goto: {
         "objects": ["UserObject", "object"],
-        "attributes": ["instance","priority"],
+        "attributes": ["instance", "priority"],
         "mandatory_attributes": ["link", "label", "name"],
-        "model": TriccNodeGoTo
+        "model": TriccNodeGoTo,
     },
     TriccNodeType.end: {
         "objects": ["UserObject", "object"],
-        "attributes": ['process', 'name', 'label', 'hint'],
-        "mandatory_attributes": ['label'],
-        "model": TriccNodeEnd
+        "attributes": ["process", "name", "label", "hint"],
+        "mandatory_attributes": ["label"],
+        "model": TriccNodeEnd,
     },
     TriccNodeType.activity_end: {
         "objects": ["UserObject", "object"],
         "attributes": [],
         "mandatory_attributes": [],
-        "model": TriccNodeActivityEnd
+        "model": TriccNodeActivityEnd,
     },
     TriccNodeType.bridge: {
         "objects": ["UserObject", "object"],
-        "attributes": ["label","priority"],
+        "attributes": ["label", "priority"],
         "mandatory_attributes": [],
-        "model": TriccNodeBridge
+        "model": TriccNodeBridge,
     },
     TriccNodeType.diagnosis: {
         "objects": ["UserObject", "object"],
         "attributes": ["save", "reference", "priority"],
-        "mandatory_attributes": [ "name", 'label'],
-        "model": TriccNodeDiagnosis
+        "mandatory_attributes": ["name", "label"],
+        "model": TriccNodeDiagnosis,
     },
     TriccNodeType.proposed_diagnosis: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "reference", "severity", "priority"],
-        "mandatory_attributes": [ "name", 'label'],
-        "model": TriccNodeProposedDiagnosis
+        "attributes": [
+            "save",
+            "remote_reference",
+            "reference",
+            "severity",
+            "priority",
+            "trigger",
+        ],
+        "mandatory_attributes": ["name", "label"],
+        "model": TriccNodeProposedDiagnosis,
     },
     TriccNodeType.input: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "reference","datatype"],
-        "mandatory_attributes": [ "name", 'label'],
-        "model": TriccNodeInput
+        "attributes": ["save", "reference", "datatype", "context_type"],
+        "mandatory_attributes": ["name", "label"],
+        "model": TriccNodeInput,
     },
-        # TriccNodeType.number: {
+    # TriccNodeType.number: {
     #     "objects": ["UserObject", "object"],
     #     "attributes": ["constraint", "save", "constraint_message", "required"],
     #     "mandatory_attributes": [],

tricc_oo/converters/tricc_to_xls_form.py

@@ -1,9 +1,8 @@
-from operator import attrgetter
-import re
-
-from tricc_oo.converters.utils import clean_str,clean_name
-from tricc_oo.models import *
-from tricc_oo.visitors.tricc import clean_or_list, negate_term
+import logging
+from tricc_oo.converters.utils import clean_name
+from tricc_oo.models.tricc import TriccNodeSelectOption, TRICC_TRUE_VALUE, TRICC_FALSE_VALUE, TriccNodeActivity
+from tricc_oo.models.calculate import TriccNodeInput
+from tricc_oo.models.base import TriccNodeBaseModel, TriccStatic, TriccReference
 
 # from babel import _
 
@@ -18,10 +17,13 @@ from tricc_oo.visitors.tricc import clean_or_list, negate_term
 TRICC_NEGATE = "not({})"
 # TRICC_NUMBER = "number({})"
 # TRICC_AND_EXPRESSION = '{0} and {1}'
-VERSION_SEPARATOR = '_Vv_'
+VERSION_SEPARATOR = "_Vv_"
 INSTANCE_SEPARATOR = "_Ii_"
+BOOLEAN_MAP = {
+    str(TRICC_TRUE_VALUE): 1,
+    str(TRICC_FALSE_VALUE): 0,
+}
 
-import logging
 
 logger = logging.getLogger("default")
 
@@ -29,30 +31,58 @@ logger = logging.getLogger("default")
 
 
 def get_export_name(node, replace_dots=True):
-    if isinstance(node, str):
-        return clean_name(node, replace_dots=replace_dots)
-    if node.export_name is None:
-        node.gen_name()
+    if hasattr(node, 'export_name') and node.export_name is not None:
+        return node.export_name
+    elif isinstance(node, bool):
+        return BOOLEAN_MAP[str(TRICC_TRUE_VALUE)] if node else BOOLEAN_MAP[str(TRICC_FALSE_VALUE)]
+    elif isinstance(node, TriccReference):
+        logger.warning(f"Reference {node.value} use in export, bad serialiuation probable")
+        return str(node.value)
+    elif isinstance(node, (str, TriccStatic, TriccNodeSelectOption)):
         if isinstance(node, TriccNodeSelectOption):
-                node.export_name = node.name
-        elif node.last == False:
-            node.export_name = clean_name(node.name + VERSION_SEPARATOR + str(node.version), replace_dots=replace_dots)
-        # elif node.activity.instance>1:
-        #     if node.version:
-        #         node.export_name = clean_name(node.name + VERSION_SEPARATOR + str(node.version), replace_dots=replace_dots)
-        #     else:
-        #         node.export_name =  clean_name(node.name +  INSTANCE_SEPARATOR + str(node.activity.instance), replace_dots=replace_dots)
-            
+            value = node.name
+        elif isinstance(node, TriccStatic):
+            value = node.value
+            if isinstance(value, TriccNodeSelectOption):
+                value = value.name
+        else:
+            value = node
+        if isinstance(value, bool):  # or r.value in ('true', 'false')
+            export_name = BOOLEAN_MAP[str(TRICC_TRUE_VALUE)] if value else BOOLEAN_MAP[str(TRICC_FALSE_VALUE)]
+        elif value == TRICC_TRUE_VALUE:
+            export_name = BOOLEAN_MAP[str(TRICC_TRUE_VALUE)]
+        elif value == TRICC_FALSE_VALUE:
+            export_name = BOOLEAN_MAP[str(TRICC_FALSE_VALUE)]
+        elif value == '$this':
+            export_name = '.'
+        elif isinstance(value, str) and not isinstance(node, str):
+            export_name = f"'{value}'"
+        else:
+            export_name = value
+        if hasattr(node, 'export_name'):
+            node.export_name = export_name
+        return export_name
+    elif not hasattr(node, 'export_name'):
+        return node
+    else:
+        node.gen_name()
+        if isinstance(node, TriccNodeActivity) and getattr(node, 'instance', 1) > 1:
+            node.export_name = clean_name(
+                node.name + INSTANCE_SEPARATOR + str(node.instance),
+                replace_dots=replace_dots,
+            )
+        elif isinstance(node, TriccNodeSelectOption):
+            node.export_name = node.name
+        elif node.last is False:
+            node.export_name = clean_name(
+                node.name + VERSION_SEPARATOR + str(node.version),
+                replace_dots=replace_dots,
+            )
         elif isinstance(node, TriccNodeInput):
-            node.export_name = clean_name('load.' +node.name, replace_dots=replace_dots)
+            node.export_name = clean_name("load." + node.name, replace_dots=replace_dots)
         else:
             node.export_name = clean_name(node.name, replace_dots=replace_dots)
-            
-    return node.export_name
-
-
-
-
+        return node.export_name
 
 
 def get_list_names(list):

tricc_oo/converters/utils.py

@@ -1,11 +1,11 @@
 import logging
-import re
 import random
 import string
 import hashlib
 from markdownify import markdownify as md
 import warnings
 from bs4 import MarkupResemblesLocatorWarning
+
 warnings.filterwarnings("ignore", category=MarkupResemblesLocatorWarning)
 logger = logging.getLogger("default")
 
@@ -23,7 +23,7 @@ def clean_str(name, replace_dots=False):
 
 def clean_name(name, prefix="", replace_dots=False):
     name = clean_str(name, replace_dots)
-    if name[0].isdigit():
+    if name and name[0].isdigit():
         name = "id_" + name
     elif name[0].isdigit() == "_":
         name = name[1:]
@@ -50,8 +50,8 @@ def get_rand_name(name=None, length=8):
 
 # the soup.text strips off the html formatting also
 def remove_html(string):
-    
-    if ' ' in string:
+
+    if " " in string:
         text = md(
             string,
             strip=["img", "table", "a"],