malac-utils 1.1.1__tar.gz → 1.3.0__tar.gz

{malac-utils-1.1.1/malac_utils.egg-info → malac_utils-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: malac-utils
-Version: 1.1.1
+Version: 1.3.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
@@ -24,6 +24,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: python-dateutil>=2.8.2
+Dynamic: license-file
 
 # MaLaC Utils
 

malac_utils-1.3.0/malac/utils/__init__.py

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

malac_utils-1.3.0/malac/utils/date.py

@@ -0,0 +1,22 @@
+import re
+import dateutil.parser
+
+class PartialDate:
+
+    def __init__(self, value):
+        self.value = value
+
+    def isoformat(self):
+        return self.value
+
+def parse(datestr):
+    datestr = getattr(datestr, "value", datestr)
+    if re.search("^[0-9]{1,6}$", datestr):
+        if len(datestr) > 4:
+            return PartialDate(datestr[0:4] + "-" + datestr[4:])
+        else:
+            return PartialDate(datestr)
+    elif len(datestr.split("-")) == 2:
+        return PartialDate(datestr)
+    else:
+        return dateutil.parser.parse(datestr)

{malac-utils-1.1.1 → malac_utils-1.3.0}/malac/utils/fhirpath.py

@@ -1,5 +1,4 @@
 import datetime
-import dateutil
 import inspect
 import io
 import re
@@ -7,7 +6,7 @@ import decimal
 import math
 from urllib.parse import urlparse
 
-import dateutil.parser
+from . import date as dateutil
 
 time_units = ["year", "years", "month", "months", "week", "weeks", "day", "days", "hour", "hours", "minute", "minutes", "second", "seconds", "millisecond", "milliseconds"]
 
@@ -122,6 +121,8 @@ class FHIRPathUtils(object):
                             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
@@ -131,7 +132,7 @@ class FHIRPathUtils(object):
     def string_value(self, val):
         if isinstance(val, str):
             return val
-        elif isinstance(val, self.model.string) or isinstance(val, self.model.uri):
+        elif isinstance(val, self.model.string) or isinstance(val, self.model.uri) or isinstance(val, self.model.code) or isinstance(val, self.model.canonical) or isinstance(val, self.model.id):
             return val.value
         elif isinstance(val, self.model.div):
             tmp = io.StringIO()
@@ -321,10 +322,8 @@ class FHIRPathUtils(object):
             return []
         else:
             if isinstance(val_a, (str, self.model.string)) or isinstance(val_b, (str, self.model.string)):
-                if isinstance(val_a, self.model.string):
-                    val_a = val_a.value
-                elif isinstance(val_b, self.model.string):
-                    val_b = val_b.value
+                val_a = self.string_value(val_a)
+                val_b = self.string_value(val_b)
             return [val_a + val_b] # TODO check types and add support for quantity 
 
     def subtract(self, val_a, val_b):
@@ -508,7 +507,7 @@ class FHIRPathUtils(object):
         if val == [] or regex == []:
             return []
         else:
-            return [re.fullmatch(val, regex)]
+            return [re.fullmatch(regex, val) is not None]
 
     def contains(self, val, other):
         val = self.string_value(val)
@@ -518,6 +517,24 @@ class FHIRPathUtils(object):
         else:
             return [other in val]
 
+    def replace(self, val, pattern, substitution):
+        val = self.string_value(val)
+        pattern = self.string_value(self.single_value(pattern, str, self.model.string))
+        substitution = self.string_value(self.single_value(substitution, str, self.model.string))
+        if val == [] or pattern == [] or substitution == []:
+            return []
+        else:
+            return [val.replace(pattern, substitution)]
+
+    def replaceMatches(self, val, regex, substitution):
+        val = self.string_value(val)
+        regex = self.string_value(self.single_value(regex, str, self.model.string))
+        substitution = self.string_value(self.single_value(substitution, str, self.model.string))
+        if val == [] or regex == [] or substitution == []:
+            return []
+        else:
+            return [re.sub(regex, substitution, val)]
+
     def startswith(self, val, other):
         val = self.string_value(val)
         other = self.string_value(self.single_value(other, str, self.model.string))
@@ -547,13 +564,20 @@ class FHIRPathUtils(object):
             return [-1]
 
     def concat(self, val, other):
-        val = self.string_value(self.single_value(val, str, self.model.string))
-        other = self.string_value(self.single_value(other, str, self.model.string))
+        val = self.string_value(self.single_value(val))
+        other = self.string_value(self.single_value(other))
         if val == []:
             val = ""
         if other == []:
             other = ""
         return [val + other]
+    
+    def split(self, val, separator):
+        val = self.string_value(self.single_value(val))
+        separator = self.string_value(self.single_value(separator))
+        if val == [] or separator == []:
+            return []
+        return val.split(separator)
 
     def skip(self, val, count):
         count = self.single_value(count, int, self.model.integer)
@@ -740,7 +764,7 @@ class FHIRPathUtils(object):
                 key = val
         elif isinstance(val, self.model.dateTime) or isinstance(val, datetime.datetime):
             val = val.value if isinstance(val, self.model.dateTime) else val
-            key = dateutil.parser.parse(val) if isinstance(val, str) else val
+            key = dateutil.parse(val) if isinstance(val, str) else val
             if isinstance(val, str):
                 prec = -1 * len(val.split(":"))
                 if key.tzinfo:
@@ -755,7 +779,7 @@ class FHIRPathUtils(object):
             if isinstance(key, str):
                 prec = len(key.split("-"))
                 if prec == 3:
-                    key = dateutil.parser.parse(key).date()
+                    key = dateutil.parse(key).date()
             else:
                 prec = 3
             type_ = "date"
@@ -1107,7 +1131,7 @@ class FHIRPathUtils(object):
             return []
         elif isinstance(val, self.model.dateTime) or isinstance(val, datetime.datetime):
             if isinstance(val, self.model.dateTime):
-                result = self.model.date(value=dateutil.parser.parse(val.value).date().isoformat())
+                result = self.model.date(value=dateutil.parse(val.value).date().isoformat())
             else:
                 result = self.model.date(value=val.date().isoformat())
             return [result]
@@ -1142,7 +1166,7 @@ class FHIRPathUtils(object):
         elif isinstance(val, self.model.string) or isinstance(val, str):
             try:
                 if "T" in val or not "-" in val: # support for CDA dates
-                    return [self.model.dateTime(value=dateutil.parser.parse(val).isoformat())]
+                    return [self.model.dateTime(value=dateutil.parse(val).isoformat())]
                 else:
                     return [self.model.dateTime(value=datetime.datetime.strptime(val,"-".join("%Y-%m-%d".split("-")[:len(val.split("-"))])).isoformat())]
             except:

{malac-utils-1.1.1 → malac_utils-1.3.0/malac_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: malac-utils
-Version: 1.1.1
+Version: 1.3.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
@@ -24,6 +24,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: python-dateutil>=2.8.2
+Dynamic: license-file
 
 # MaLaC Utils
 

{malac-utils-1.1.1 → malac_utils-1.3.0}/malac_utils.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE
 README.md
 pyproject.toml
 malac/utils/__init__.py
+malac/utils/date.py
 malac/utils/fhirpath.py
 malac_utils.egg-info/PKG-INFO
 malac_utils.egg-info/SOURCES.txt

{malac-utils-1.1.1 → malac_utils-1.3.0}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=61.0.0,<69.3.0"]
+requires = ["setuptools>=72.10"]
 build-backend = "setuptools.build_meta"
 
 [project]

malac-utils-1.1.1/malac/utils/__init__.py

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