commonlib-reader 1.0.6__tar.gz → 1.0.7__tar.gz

{commonlib_reader-1.0.6 → commonlib_reader-1.0.7}/PKG-INFO

@@ -1,18 +1,18 @@
 Metadata-Version: 2.3
 Name: commonlib-reader
-Version: 1.0.6
+Version: 1.0.7
 Summary: Reader for Equinor commonlib api.
 License: MIT
 Author: Åsmund Våge Fannemel
 Author-email: asmf@equinor.com
-Requires-Python: >=3.9.2,<4.0.0
+Requires-Python: >=3.10,<4.0.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: msal_bearer (>=1.3.3,<2.0.0)
+Requires-Dist: eq-api-connector (>=0.1.7,<0.2.0)
 Requires-Dist: pandas (>=2.1.4)
 Requires-Dist: requests (>=2.32.4)
 Requires-Dist: urllib3 (>=2.5.0)

{commonlib_reader-1.0.6 → commonlib_reader-1.0.7}/commonlib_reader/facility.py

@@ -41,14 +41,23 @@ class Facility:
         self.name = self._data["name"]
         self.description = self._data["description"]
 
-        common_attributes = ["SAPPlant", "Field", "ParentFacility", "NPDID"]
-        for attr in common_attributes:
-            self.__setattr__(attr, "")
+        self.SAPPlant = ""
+        self.Field = ""
+        self.ParentFacility = ""
+        self.NPDID = ""
 
         for key, val in self._attributes.items():
-            if key in common_attributes:
+            if key in self.__getattribute__("__dict__").keys():
                 self.__setattr__(key, val)
 
+        self.STID = self.identity  # Alias for identity
+        self.instCode = self.identity  # Alias for identity
+        try:
+            self.SAP = int(self.SAPPlant)  # Alias for SAPPlant as integer
+        except (TypeError, ValueError):
+            pass
+
+
     def isSTID(self):
         """
         Checks if the facility is marked for STID.
@@ -61,6 +70,9 @@ class Facility:
                 return True
 
         return False
+    
+    def __str__(self):
+        return f"Facility: {self.identity}, Name: {self.name}, Description: {self.description}"
 
     @classmethod
     def get_all_facilities(cls) -> List["Facility"]:
@@ -92,7 +104,7 @@ class Facility:
         Retrieves the facility data for the given code.
 
         Parameters:
-            code (str): The STID plant code corresponding to the facility.
+            code (str): The STID plant code corresponding to the facility. NB! SAP codes and governmental facility names can also be used.
 
         Returns:
             dict: A dictionary containing data related to the facility.

{commonlib_reader-1.0.6 → commonlib_reader-1.0.7}/commonlib_reader/ims.py

@@ -1,4 +1,5 @@
 from typing import List, Union
+from commonlib_reader.facility import Facility
 from commonlib_reader.utils import attributes_list_to_dict, get_code
 
 
@@ -23,7 +24,7 @@ class IMS:
         Raises:
             ValueError: If input data is not a dict.
         """
-        if isinstance(data, str):
+        if isinstance(data, str) or isinstance(data, int):
             data = IMS.from_facility(data)._data
 
         if not isinstance(data, dict):
@@ -42,11 +43,11 @@ class IMS:
             self.__setattr__(attr["definitionName"], attr["displayValue"])
 
     @staticmethod
-    def from_facility(facility: str) -> "IMS":
+    def from_facility(facility: Union[Facility, str, int]) -> "IMS":
         """Get IMS instance from STID code.
 
         Args:
-            facility (str): Facility code
+            facility (str): Facility inst code (STID) or SAP code.
 
         Raises:
             ValueError: Not able to instantiate IMS object from input facility code.
@@ -54,10 +55,15 @@ class IMS:
         Returns:
             IMS: IMS instance
         """
-        if facility is None or len(facility) == 0:
-            raise ValueError(
-                "Facility must be provided. Empty strings are not allowed."
-            )
+        if isinstance(facility, int):
+            facility = Facility(facility).identity
+
+        if isinstance(facility, Facility):
+            facility = facility.identity
+
+        if not isinstance(facility, str) or len(facility) == 0:
+            raise ValueError("Not able to detect facility from input {facility}.")
+
         ims = IMS.get_ims_list(facility=facility)
         if len(ims) == 1:
             return ims[0]

{commonlib_reader-1.0.6 → commonlib_reader-1.0.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "commonlib-reader"
-version = "1.0.6"
+version = "1.0.7"
 description = "Reader for Equinor commonlib api."
 authors = [
 	{ name = "Åsmund Våge Fannemel", email = "asmf@equinor.com" }
@@ -8,12 +8,12 @@ authors = [
 readme = "README.md"
 license = { text = "MIT" }
 urls = {"Repository" = "https://github.com/equinor/commonlib-reader.git"}
-requires-python = ">=3.9.2,<4.0.0"
+requires-python = ">=3.10,<4.0.0"
 dependencies = [
-	"msal_bearer>=1.3.3,<2.0.0",
 	"pandas>=2.1.4",
 	"requests>=2.32.4",
-	"urllib3>=2.5.0" # Pinned to avoid security issues in some older versions
+	"urllib3>=2.5.0", # Pinned to avoid security issues in some older versions
+	"eq-api-connector (>=0.1.7,<0.2.0)"
 ]
 
 [tool.poetry.group.test.dependencies]