commonlib-reader 1.0.1__tar.gz → 1.0.3__tar.gz

{commonlib_reader-1.0.1 → commonlib_reader-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: commonlib-reader
-Version: 1.0.1
+Version: 1.0.3
 Summary: Reader for Equinor commonlibapi.
 Home-page: https://github.com/equinor/commonlib-reader.git
 Author: Åsmund Våge Fannemel

{commonlib_reader-1.0.1 → commonlib_reader-1.0.3}/commonlib_reader/facility.py

@@ -103,17 +103,25 @@ class Facility:
         if isinstance(code, str):
             for f in cls._get_all_facility_data():
                 if (
-                    f["identity"] == code
-                    or f["name"] == code
-                    or f["description"] == code
+                    f["identity"].upper() == code.upper()
+                    or f["name"].upper() == code.upper()
+                    or f["description"].upper() == code.upper()
                 ):
                     return f
 
         for f in cls._get_all_facility_data():
+            check_sap = False
+            check_gov_fac_name = False
             for a in f["attributes"]:
                 if a["definitionName"] == "SAPPlant":
                     if a["displayValue"] == str(code):
                         return f
+                    check_sap = True
+                elif a["definitionName"] == "GovernmentalName":
+                    if a["displayValue"].upper() == str(code).upper():
+                        return f
+                    check_gov_fac_name = True
+                if check_sap and check_gov_fac_name:
                     break
 
         raise ValueError(f"No data found for {code}")

{commonlib_reader-1.0.1 → commonlib_reader-1.0.3}/commonlib_reader/tag.py

@@ -22,7 +22,7 @@ class TagFormatElement:
 
     """
 
-    def __init__(self, data):
+    def __init__(self, data: dict):
         """
         Initializes a TagFormatElement object.
 
@@ -134,14 +134,26 @@ class TagFormat:
 
         return self._tfe
 
-    def split_tag(self, tagNo: str) -> dict:
-        # Change naming pattern for groups to match python re format
-        py_pattern = re.sub(r"\(\?<(\w+)>", r"(?P<\1>", self.regex_grouped)
+    def get_regex_grouped_named(self) -> str:
+        """Substitute codes with descriptions in grouped regex
 
-        # Change group number with group description
+        Returns:
+            str: Regex grouped string where generic regex group names are replaced with tag format element description.
+        """
+        regex_group_named = self.regex_grouped
+        for e in self.get_tagformat_elements():
+            regex_group_named = regex_group_named.replace(
+                f"?<e{e.name}>", f"?<{e.description}>"
+            )
+
+        return regex_group_named
 
+    def split_tag(self, tagNo: str) -> dict:
+        # Change naming pattern for groups in commonlib-regex to match python re format
+        py_pattern = re.sub(r"\(\?<(\w+)>", r"(?P<\1>", self.regex_grouped)
         matches = re.match(py_pattern, tagNo)
 
+        # Tag format element descriptions may contain space and can not be used as group name in regex. Instead create dict where description is key.
         d = {}
         for e in self.get_tagformat_elements():
             group_name = f"e{e.name}"
@@ -458,7 +470,7 @@ class TagCategory:
         return f"{self.TagCategoryId}:{self.name} - {self.description}"
 
     @staticmethod
-    def get_category(inst_code, name="") -> List["TagCategory"]:
+    def get_category(inst_code: str, name="") -> List["TagCategory"]:
         categories = _get_category_data(inst_code=inst_code)
         tc = [TagCategory(x, inst_code=inst_code) for x in categories]
         tc.sort(key=lambda x: x.TagCategoryId)
@@ -470,7 +482,7 @@ class TagCategory:
         return tc
 
 
-def _get_category_data(inst_code) -> List[dict]:
+def _get_category_data(inst_code: str) -> List[dict]:
     """Get code table of tag categories for a facility from commonlibapi.
 
     Args:

{commonlib_reader-1.0.1 → commonlib_reader-1.0.3}/commonlib_reader/unit.py

@@ -6,7 +6,7 @@ from commonlib_reader.utils import get_code
 class Unit:
     _units = []
 
-    def __init__(self, data):
+    def __init__(self, data: dict):
         self.name = ""
         self.description = ""
 

{commonlib_reader-1.0.1 → commonlib_reader-1.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "commonlib-reader"
-version = "1.0.1"
+version = "1.0.3"
 description = "Reader for Equinor commonlibapi."
 authors = ["Åsmund Våge Fannemel <asmf@equinor.com>"]
 readme = "README.md"