commonlib-reader 1.1.3__tar.gz → 1.2.1__tar.gz

{commonlib_reader-1.1.3 → commonlib_reader-1.2.1}/PKG-INFO

@@ -1,14 +1,12 @@
 Metadata-Version: 2.3
 Name: commonlib-reader
-Version: 1.1.3
+Version: 1.2.1
 Summary: Reader for Equinor commonlib api.
 Author: Åsmund Våge Fannemel
 Author-email: Åsmund Våge Fannemel <asmf@equinor.com>
 License: MIT
 Requires-Dist: pandas>=2.1.4
-Requires-Dist: requests>=2.32.4
-Requires-Dist: urllib3>=2.5.0
-Requires-Dist: eq-api-connector>=1.0.0,<2.0.0
+Requires-Dist: eq-api-connector>=1.1.0,<2.0.0
 Requires-Python: >=3.10, <4.0.0
 Project-URL: Repository, https://github.com/equinor/commonlib-reader.git
 Description-Content-Type: text/markdown

{commonlib_reader-1.1.3 → commonlib_reader-1.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "commonlib-reader"
-version = "1.1.3"
+version = "1.2.1"
 description = "Reader for Equinor commonlib api."
 authors = [
 	{ name = "Åsmund Våge Fannemel", email = "asmf@equinor.com" }
@@ -11,14 +11,12 @@ urls = {"Repository" = "https://github.com/equinor/commonlib-reader.git"}
 requires-python = ">=3.10,<4.0.0"
 dependencies = [
 	"pandas>=2.1.4",
-	"requests>=2.32.4",
-	"urllib3>=2.5.0", # Pinned to avoid security issues in some older versions
-	"eq-api-connector (>=1.0.0,<2.0.0)"
+	"eq-api-connector (>=1.1.0,<2.0.0)"
 ]
 
 [dependency-groups]
 dev = [
-	"pytest>=7.4.4,<8.0.0",
+	"pytest>=7.4.4,<10.0.0",
 	"pytest-cov>=7.0.0,<8.0.0",
 	"black>=24.1.1,<27.0.0"
 ]

{commonlib_reader-1.1.3 → commonlib_reader-1.2.1}/src/commonlib_reader/connector.py

@@ -14,7 +14,7 @@ def get_connector() -> APIConnector:
         clientID = "728cfddd-b8e9-4ed7-b9a3-8f2fd5b8e79a"
         scopes = ["37d598fc-da0f-46bd-949f-7107918d47a5/user_impersonation"]
         connector = APIConnector(client_id=clientID, scope=scopes)
-        connector.set_url_prod("https://commonlibapi.equinor.com/")
+        connector.url_prod = "https://commonlibapi.equinor.com/"
         _connector = connector
 
     return _connector

{commonlib_reader-1.1.3 → commonlib_reader-1.2.1}/src/commonlib_reader/facility.py

@@ -46,6 +46,14 @@ class Facility:
         except (TypeError, ValueError):
             pass
 
+    def __eq__(self, other):
+        if isinstance(other, Facility):
+            return self.identity == other.identity and self._data == other._data
+        return False
+
+    def __str__(self):
+        return f"Facility(identity={self.identity}, name={self.description})"
+
     @property
     def identity(self) -> str:
         return self._data.get("identity", "")
@@ -226,7 +234,7 @@ class Facility:
     @classmethod
     def get_sap_facilities(cls) -> List["Facility"]:
         fac = cls.get_all_facilities()
-        return [f for f in fac if len(f.sap) > 0]
+        return [f for f in fac if len(f.sap) > 0 and f.sap.isdigit()]
 
     @classmethod
     def get_ioc_facilities(cls) -> List["Facility"]:

{commonlib_reader-1.1.3 → commonlib_reader-1.2.1}/src/commonlib_reader/ims.py

@@ -60,9 +60,10 @@ class IMS:
     @staticmethod
     def from_facility(facility: Union[Facility, str, int]) -> "IMS":
         """Get IMS instance from STID code.
+        If no IMS instance is found for the input facility, will try to find IMS instance for parent facility recursively.
 
         Args:
-            facility (str): Facility inst code (STID) or SAP code.
+            facility (Facility, str, int): Facility object, inst code (STID) or SAP code.
 
         Raises:
             ValueError: Not able to instantiate IMS object from input facility code.
@@ -70,18 +71,15 @@ class IMS:
         Returns:
             IMS: IMS instance
         """
-        if isinstance(facility, int):
+        if not isinstance(facility, Facility):
             facility = Facility(facility)
 
-        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]
+        if len(ims) == 0:
+            if facility.parent_facility:
+                return IMS.from_facility(facility.parent_facility)
 
         raise ValueError(f"Not able to get IMS object for facility {facility}")
 
@@ -98,7 +96,7 @@ class IMS:
         return [IMS(x) for x in cls._ims_codes]
 
     @staticmethod
-    def get_ims_list(facility: str = "") -> List["IMS"]:
+    def get_ims_list(facility: Union[str, Facility] = "") -> List["IMS"]:
         """Get list of IMS objects.
 
         Args:
@@ -107,6 +105,10 @@ class IMS:
         Returns:
             List[IMS]: list of IMS objects
         """
+
+        if isinstance(facility, Facility):
+            facility = facility.identity
+
         i = IMS._get_ims_codes()
         if len(facility) > 0:
             return [x for x in i if x.facility == facility]

{commonlib_reader-1.1.3 → commonlib_reader-1.2.1}/src/commonlib_reader/utils.py

@@ -60,7 +60,7 @@ def post_sql(sql: str, take: int = 100, skip: int = 0) -> list:
         list: List of response from api
     """
 
-    url = urljoin(get_connector().get_url(), "api/sql")
+    url = urljoin(get_connector().url, "api/sql")
     response = requests.post(
         url=url,
         json={"query": sql, "take": take, "skip": skip},