commonlib-reader 1.1.2__tar.gz → 1.2.0__tar.gz

commonlib_reader-1.2.0/PKG-INFO

@@ -0,0 +1,39 @@
+Metadata-Version: 2.3
+Name: commonlib-reader
+Version: 1.2.0
+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: 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
+Connector package for Equinor [Commonlib](https://commonlib.equinor.com/) [api](https://commonlibapi.equinor.com/swagger/index.html). 
+
+Current features:
+- Reading code tables
+- Getting facility data using the [Facility](commonlib_reader/facility.py) class
+- [IMS source ](commonlib_reader/ims.py) lookup tables for facilities
+- Getting Tag category, Tag type, Tag format, and Tag format element data. See [tag.py](commonlib_reader/tag.py)
+- Getting [units of measure](commonlib_reader/ims.py) definitions.
+
+
+## Use
+Try it out by running the [demo](examples/demo.py).
+
+## Installing
+
+Install package from pypi using `pip install commonlib_reader`
+
+
+## Developing / testing
+
+uv is preferred for developers. Clone and install with required packages for testing and coverage:
+`uv sync`
+
+For testing with coverage run:
+`uv run pytest --cov --cov-report=html`

{commonlib_reader-1.1.2 → commonlib_reader-1.2.0}/README.md

@@ -1,4 +1,4 @@
-# commonlib-reader [![SNYK dependency check](https://github.com/equinor/commonlib-reader/actions/workflows/snyk.yml/badge.svg)](https://github.com/equinor/commonlib-reader/actions/workflows/snyk.yml)
+# commonlib-reader
 Connector package for Equinor [Commonlib](https://commonlib.equinor.com/) [api](https://commonlibapi.equinor.com/swagger/index.html). 
 
 Current features:
@@ -19,8 +19,8 @@ Install package from pypi using `pip install commonlib_reader`
 
 ## Developing / testing
 
-Poetry is preferred for developers. Clone and install with required packages for testing and coverage:  
-`poetry install`
+uv is preferred for developers. Clone and install with required packages for testing and coverage:
+`uv sync`
 
-For testing with coverage run:  
-`poetry run pytest --cov --cov-report=html`
+For testing with coverage run:
+`uv run pytest --cov --cov-report=html`

{commonlib_reader-1.1.2 → commonlib_reader-1.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "commonlib-reader"
-version = "1.1.2"
+version = "1.2.0"
 description = "Reader for Equinor commonlib api."
 authors = [
 	{ name = "Åsmund Våge Fannemel", email = "asmf@equinor.com" }
@@ -11,18 +11,16 @@ 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)"
 ]
 
-[tool.poetry.group.test.dependencies]
-pytest = "^7.4.4"
-pytest-cov = "^6.0.0"
-
-[tool.poetry.group.dev.dependencies]
-black = "^24.1.1"
+[dependency-groups]
+dev = [
+	"pytest>=7.4.4,<10.0.0",
+	"pytest-cov>=7.0.0,<8.0.0",
+	"black>=24.1.1,<27.0.0"
+]
 
 [build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+requires = ["uv_build>=0.11.16,<0.12"]
+build-backend = "uv_build"

{commonlib_reader-1.1.2 → commonlib_reader-1.2.0/src}/commonlib_reader/connector.py

@@ -1,6 +1,6 @@
 from eq_api_connector import APIConnector
 
-_connector = None
+_connector: APIConnector | None = None
 
 
 def get_connector() -> APIConnector:
@@ -13,17 +13,23 @@ def get_connector() -> APIConnector:
     if _connector is None:
         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 = APIConnector(client_id=clientID, scope=scopes)
+        connector.set_url_prod("https://commonlibapi.equinor.com/")
+        _connector = connector
 
     return _connector
 
 
-def set_connector(connector: APIConnector):
+def set_connector(connector: APIConnector) -> None:
     """Set the singleton instance of the APIConnector.
 
     Args:
         connector (APIConnector): An instance of the APIConnector class.
     """
     global _connector
+
+    if not isinstance(connector, APIConnector):
+        raise TypeError(
+            f"Connector must be an instance of APIConnector, got {type(connector).__name__}."
+        )
     _connector = connector

{commonlib_reader-1.1.2 → commonlib_reader-1.2.0/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},

commonlib_reader-1.1.2/PKG-INFO

@@ -1,49 +0,0 @@
-Metadata-Version: 2.4
-Name: commonlib-reader
-Version: 1.1.2
-Summary: Reader for Equinor commonlib api.
-License: MIT
-Author: Åsmund Våge Fannemel
-Author-email: asmf@equinor.com
-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
-Classifier: Programming Language :: Python :: 3.14
-Requires-Dist: eq-api-connector (>=1.0.0,<2.0.0)
-Requires-Dist: pandas (>=2.1.4)
-Requires-Dist: requests (>=2.32.4)
-Requires-Dist: urllib3 (>=2.5.0)
-Project-URL: Repository, https://github.com/equinor/commonlib-reader.git
-Description-Content-Type: text/markdown
-
-# commonlib-reader [![SNYK dependency check](https://github.com/equinor/commonlib-reader/actions/workflows/snyk.yml/badge.svg)](https://github.com/equinor/commonlib-reader/actions/workflows/snyk.yml)
-Connector package for Equinor [Commonlib](https://commonlib.equinor.com/) [api](https://commonlibapi.equinor.com/swagger/index.html). 
-
-Current features:
-- Reading code tables
-- Getting facility data using the [Facility](commonlib_reader/facility.py) class
-- [IMS source ](commonlib_reader/ims.py) lookup tables for facilities
-- Getting Tag category, Tag type, Tag format, and Tag format element data. See [tag.py](commonlib_reader/tag.py)
-- Getting [units of measure](commonlib_reader/ims.py) definitions.
-
-
-## Use
-Try it out by running the [demo](examples/demo.py).
-
-## Installing
-
-Install package from pypi using `pip install commonlib_reader`
-
-
-## Developing / testing
-
-Poetry is preferred for developers. Clone and install with required packages for testing and coverage:  
-`poetry install`
-
-For testing with coverage run:  
-`poetry run pytest --cov --cov-report=html`
-