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

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

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

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

{malac-utils-1.2.0 → malac_utils-1.3.1}/malac/utils/date.py

@@ -10,6 +10,7 @@ class PartialDate:
         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:])
@@ -18,4 +19,4 @@ def parse(datestr):
     elif len(datestr.split("-")) == 2:
         return PartialDate(datestr)
     else:
-        return dateutil.parser.parse(datestr)
+        return dateutil.parser.parse(datestr)

{malac-utils-1.2.0 → malac_utils-1.3.1}/malac/utils/fhirpath.py

@@ -121,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
@@ -130,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) or isinstance(val, self.model.code):
+        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()
@@ -505,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)
@@ -515,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))
@@ -551,6 +571,13 @@ class FHIRPathUtils(object):
         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)
@@ -999,6 +1026,8 @@ class FHIRPathUtils(object):
                 result = val.value
             else:
                 result = str(val)
+        elif isinstance(val, dateutil.PartialDate):
+            result = val.isoformat()
         else:
             result = False
         return [result]

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: malac-utils
-Version: 1.2.0
+Version: 1.3.1
 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.2.0 → malac_utils-1.3.1}/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.2.0/malac/utils/__init__.py

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