malac-utils 1.3.2__tar.gz → 1.4.0__tar.gz

{malac_utils-1.3.2/malac_utils.egg-info → malac_utils-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: malac-utils
-Version: 1.3.2
+Version: 1.4.0
 Summary: Mapping Language Compiler Utils
 Author-email: cdeHealth-Team <contact-project+cdehealth-malac-hd-52276676-issue-@incoming.gitlab.com>
 Project-URL: Homepage, https://gitlab.com/cdehealth/malac-hd

malac_utils-1.4.0/malac/utils/__init__.py

@@ -0,0 +1,2 @@
+
+__version__ = "1.4.0"

{malac_utils-1.3.2 → malac_utils-1.4.0}/malac/utils/date.py

@@ -8,6 +8,9 @@ class PartialDate:
 
     def isoformat(self):
         return self.value
+    
+    def __repr__(self):
+        return self.value
 
 def parse(datestr):
     datestr = getattr(datestr, "value", datestr)

malac_utils-1.4.0/malac/utils/exceptions.py

@@ -0,0 +1,10 @@
+"""
+Exception hierarchy for MaLaC-HD-generated code
+"""
+
+class MappingExecutionError(Exception):
+    """Base class for errors raised while executing a mapping."""
+
+    
+class CheckFailedError(MappingExecutionError):
+    """Error in case a check clause failed."""

{malac_utils-1.3.2 → malac_utils-1.4.0}/malac/utils/fhirpath.py

@@ -7,6 +7,7 @@ import math
 from urllib.parse import urlparse
 
 from . import date as dateutil
+from . import html
 
 time_units = ["year", "years", "month", "months", "week", "weeks", "day", "days", "hour", "hours", "minute", "minutes", "second", "seconds", "millisecond", "milliseconds"]
 
@@ -100,6 +101,8 @@ class FHIRPathUtils(object):
         }
 
     def get(self, val, *attrs, **options):
+        if len(attrs) == 1 and options.get("strip", False):
+            return [html.strip_tags(val)]
         attr = attrs[0]
         try:
             result = getattr(val, attr) or []
@@ -119,10 +122,6 @@ class FHIRPathUtils(object):
                         prefix = getattr(val, key)
                         if prefix and attr.lower() == (prefix + key[:-10]).lower():
                             result = getattr(val, key[:-10]) or []
-        if result != [] and len(attrs) == 1 and options.get("strip", False):
-            result = str(result).strip()
-            if result == "":
-                result = []
         result = result if isinstance(result, list) else [result]
         if len(attrs) == 1:
             return result
@@ -563,6 +562,14 @@ class FHIRPathUtils(object):
         else:
             return [-1]
 
+    def lastIndexOf(self, val, other):
+        val = self.string_value(val)
+        other = self.string_value(self.single_value(other, str, self.model.string))
+        if val == [] or other == []:
+            return []
+        else:
+            return [val.rfind(other)]
+
     def concat(self, val, other):
         val = self.string_value(self.single_value(val))
         other = self.string_value(self.single_value(other))
@@ -1018,12 +1025,12 @@ class FHIRPathUtils(object):
             result = "true" if self.boolean_value(val) else "false"
         elif isinstance(val, self.model.integer) or isinstance(val, int):
             if isinstance(val, self.model.integer):
-                result = val.value
+                result = str(val.value)
             else:
                 result = str(val)
         elif isinstance(val, self.model.decimal) or isinstance(val, decimal.Decimal):
             if isinstance(val, self.model.decimal):
-                result = val.value
+                result = str(val.value)
             else:
                 result = str(val)
         elif isinstance(val, dateutil.PartialDate):

malac_utils-1.4.0/malac/utils/html.py

@@ -0,0 +1,176 @@
+import io
+import logging
+from html import escape as html_escape
+from html.parser import HTMLParser
+
+logger = logging.getLogger(__name__)
+
+def _attr(name, value):
+    return f' {name}="{html_escape(str(value))}"'
+
+def _handle_tr(tr):
+    html = ""
+    attrs = ""
+    if tr.ID:
+        attrs += _attr("id", tr.ID)
+    if tr.styleCode:
+        attrs += _attr("class", tr.styleCode)
+    html += "<tr %s>" % attrs
+    for th in tr.th:
+        html += _handle_tdh(th, "th")
+    for td in tr.td:
+        html += _handle_tdh(td, "td")
+    html += "</tr>"
+    return html
+
+def _handle_tdh(tdh, tag):
+    html = ""
+    attrs = ""
+    if tdh.ID:
+        attrs += _attr("id", tdh.ID)
+    if tdh.styleCode:
+        attrs += _attr("class", tdh.styleCode)
+    html += f"<{tag}%s>" % attrs
+    html += _handle_content(tdh)
+    html += f"</{tag}>"
+    return html
+
+def _handle_content(elem):
+    html = ""
+    for content in elem.content_:
+        if content.category == 1:
+            html += html_escape(content.value)
+        elif content.category == 2:
+            if content.name == "br":
+                html += f'<br />'
+            else:
+                logger.warning("Skipping unhandled simple narrative content '%s'", content.name)
+        elif content.category == 3:
+            attrs = ""
+            if getattr(content.value, "ID", None):
+                attrs += _attr("id", content.value.ID)
+            if content.name == "table":
+                html += "<table%s>" % attrs
+                if content.value.thead:
+                    html += "<thead>"
+                    for tr in content.value.thead.tr:
+                        html += _handle_tr(tr)
+                    html += "</thead>"
+                if content.value.tfoot:
+                    html += "<tfoot>"
+                    for tr in content.value.tfoot.tr:
+                        html += _handle_tr(tr)
+                    html += "</tfoot>"
+                for tbody in content.value.tbody or [None]:
+                    html += "<tbody>"
+                    for tr in (tbody.tr if tbody else []):
+                        html += _handle_tr(tr)
+                    html += "</tbody>"
+                html += "</table>"
+            elif content.name == "content":
+                if content.value.styleCode == "Italics":
+                    attrs += ' class="italics"'
+                elif content.value.styleCode:
+                    attrs += _attr("class", content.value.styleCode)
+                html += "<span%s>" % attrs
+                html += _handle_content(content.value)
+                html += "</span>"
+            elif content.name == "paragraph":
+                if content.value.styleCode:
+                    attrs += _attr("class", content.value.styleCode)
+                html += "<p%s>" % attrs
+                html += _handle_content(content.value)
+                html += "</p>"
+            elif content.name == "sup":
+                html += "<sup%s>" % attrs
+                html += _handle_content(content.value)
+                html += "</sup>"
+            elif content.name == "footnote":
+                html += '<span class="footnote"%s>' % attrs
+                html += _handle_content(content.value)
+                html += "</span>"
+            elif content.name == "renderMultiMedia":
+                html += '<img%s%s />' % (_attr("src", content.value.referencedObject), attrs)
+            elif content.name == "br":
+                html += f'<br />'
+            elif content.name == "caption":
+                html += "<caption%s>" % attrs
+                html += _handle_content(content.value)
+                html += "</caption>"
+            elif content.name == "list":
+                if content.value.listType in [None, "unordered"]:
+                    if content.value.styleCode:
+                        attrs += _attr("style", f"list-style-type:{content.value.styleCode.lower()}")
+                    html += "<ul%s>" % attrs
+                    for item in content.value.item:
+                        html += "<li>"
+                        html += _handle_content(item)
+                        html += "</li>"
+                    html += "</ul>"
+                elif content.value.listType == "ordered":
+                    styleCodeTrans = {"LittleRoman": "i", "BigRoman": "I", "LittleAlpha": "a", "BigAlpha": "A", "Arabic": "1"}
+                    listType = styleCodeTrans.get(content.value.styleCode)
+                    if listType:
+                        attrs += f' type="{listType}"'
+                    html += "<ol%s>" % attrs
+                    for item in content.value.item:
+                        html += "<li>"
+                        html += _handle_content(item)
+                        html += "</li>"
+                    html += "</ol>"
+            else:
+                html += _handle_content(content.value)
+        else:
+            logger.warning("Skipping unhandled narrative content category %s", content.category)
+    return html
+
+def strucdoctext2html(module, strucdoctext):
+    html = _handle_content(strucdoctext)
+    div = module.Flow(content_=[module.MixedContainer(1, 0, "", html)])
+    div.original_tagname_ = "div"
+    div.valueOf_ = ""
+    return div
+
+def ed2html(module, ed):
+    # TODO: improve
+    div = module.Flow(content_=[module.MixedContainer(1, 0, "", f"<v3:reference>{ed.reference.value}</v3:reference>")])
+    div.original_tagname_ = "div"
+    div.valueOf_ = ""
+    return div
+
+def ed2markdown(module, ed):
+    # TODO: improve
+    return module.markdown(value=f"<v3:reference>{ed.reference.value}</v3:reference>")
+
+def strucdoctext2markdown(module, strucdoctext):
+    # TODO: implement properly
+    return module.markdown(value=strip_tags(strucdoctext))
+
+
+def strip_tags(val):
+    class MLStripper(HTMLParser):
+        def __init__(self):
+            super().__init__()
+            self.reset()
+            self.strict = False
+            self.convert_charrefs= True
+            self.text = io.StringIO()
+        def handle_data(self, d):
+            self.text.write(d)
+            self.text.write(" ")
+        def get_data(self):
+            return self.text.getvalue()
+
+    html = _handle_content(val)
+    s = MLStripper()
+    s.feed(html)
+    text = s.get_data()
+    text = " ".join(text.split())
+    return text
+
+
+def builddiv(module, content):
+    div = module.Flow(content_=[module.MixedContainer(1, 0, "", content)])
+    div.original_tagname_ = "div"
+    div.valueOf_ = ""
+    return div

{malac_utils-1.3.2 → malac_utils-1.4.0/malac_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: malac-utils
-Version: 1.3.2
+Version: 1.4.0
 Summary: Mapping Language Compiler Utils
 Author-email: cdeHealth-Team <contact-project+cdehealth-malac-hd-52276676-issue-@incoming.gitlab.com>
 Project-URL: Homepage, https://gitlab.com/cdehealth/malac-hd

{malac_utils-1.3.2 → malac_utils-1.4.0}/malac_utils.egg-info/SOURCES.txt

@@ -3,7 +3,9 @@ README.md
 pyproject.toml
 malac/utils/__init__.py
 malac/utils/date.py
+malac/utils/exceptions.py
 malac/utils/fhirpath.py
+malac/utils/html.py
 malac_utils.egg-info/PKG-INFO
 malac_utils.egg-info/SOURCES.txt
 malac_utils.egg-info/dependency_links.txt

malac_utils-1.3.2/malac/utils/__init__.py

@@ -1,2 +0,0 @@
-
-__version__ = "1.3.2"