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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: malac-utils
-Version: 1.1.1
+Version: 1.2.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.2.0/malac/utils/__init__.py

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

malac-utils-1.2.0/malac/utils/date.py

@@ -0,0 +1,21 @@
+import re
+import dateutil.parser
+
+class PartialDate:
+
+    def __init__(self, value):
+        self.value = value
+
+    def isoformat(self):
+        return self.value
+
+def parse(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.2.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"]
 
@@ -131,7 +130,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):
             return val.value
         elif isinstance(val, self.model.div):
             tmp = io.StringIO()
@@ -321,10 +320,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):
@@ -547,8 +544,8 @@ 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 == []:
@@ -740,7 +737,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 +752,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 +1104,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 +1139,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.2.0/malac_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: malac-utils
-Version: 1.1.1
+Version: 1.2.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.1.1 → malac-utils-1.2.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/__init__.py

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