tagreader 5.3.0__tar.gz → 5.5.0__tar.gz

{tagreader-5.3.0 → tagreader-5.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tagreader
-Version: 5.3.0
+Version: 5.5.0
 Summary: Tagreader is a Python package for reading trend data from the OSIsoft PI and Aspen Infoplus.21 IMS systems.
 Home-page: https://github.com/equinor/tagreader-python
 License: MIT
@@ -26,11 +26,11 @@ Classifier: Topic :: Scientific/Engineering :: Interface Engine/Protocol Transla
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Provides-Extra: notebooks
-Requires-Dist: certifi (>=2023.7.22,<2024.0.0)
+Requires-Dist: certifi (>=2024.7.4,<2025.0.0)
 Requires-Dist: diskcache (>=5.6.1,<6.0.0)
-Requires-Dist: matplotlib (>=3,<4) ; extra == "notebooks"
-Requires-Dist: msal-bearer (>=0.2.1,<0.3.0)
-Requires-Dist: notebook (>=7.0.3,<8.0.0) ; extra == "notebooks"
+Requires-Dist: matplotlib (>=3.7.0,<4.0.0) ; extra == "notebooks"
+Requires-Dist: msal-bearer (>=0.2.1,<1.1.0)
+Requires-Dist: notebook (>=7.2.0,<8.0.0) ; extra == "notebooks"
 Requires-Dist: pandas (>=1)
 Requires-Dist: pycryptodome (>=3.20.0,<4.0.0)
 Requires-Dist: requests (>=2,<3)

{tagreader-5.3.0 → tagreader-5.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tagreader"
-version = "5.3.0"
+version = "5.5.0"
 description = "Tagreader is a Python package for reading trend data from the OSIsoft PI and Aspen Infoplus.21 IMS systems."
 authors = ["Einar S. Idsø <eiids@equinor.com>", "Morten Dæhli Aslesen <masl@equinor.com"]
 license = "MIT"
@@ -30,12 +30,12 @@ classifiers=[
 [tool.poetry.dependencies]
 python = "^3.8"
 pandas = ">=1"
-certifi = "^2023.7.22"
+certifi = "^2024.7.4"
 requests = "^2"
 requests-kerberos = "^0"
-msal-bearer = "^0.2.1"
-notebook = { version = "^7.0.3", optional = true }
-matplotlib = { version = "^3", optional = true }
+msal-bearer = ">=0.2.1,<1.1.0"
+notebook = { version = "^7.2.0", optional = true }
+matplotlib = { version = "^3.7.0", optional = true }
 diskcache = "^5.6.1"
 pycryptodome = "^3.20.0"
 requests-ntlm = ">=1.1,<=2.0"
@@ -43,7 +43,7 @@ requests-ntlm = ">=1.1,<=2.0"
 
 [tool.poetry.group.dev.dependencies]
 pre-commit = "^3"
-pytest = "^7"
+pytest = ">=7,<9"
 
 [tool.poetry.extras]
 notebooks = ["notebook", "matplotlib"]

{tagreader-5.3.0 → tagreader-5.5.0}/tagreader/__init__.py

@@ -2,13 +2,13 @@ from tagreader.clients import IMSClient, list_sources
 from tagreader.utils import (
     IMSType,
     ReaderType,
-    add_statoil_root_certificate,
+    add_equinor_root_certificate,
     is_equinor,
     is_mac,
     is_windows,
 )
 
 if is_equinor():
-    add_statoil_root_certificate()
+    add_equinor_root_certificate()
 
 from tagreader.__version__ import version as __version__

{tagreader-5.3.0 → tagreader-5.5.0}/tagreader/utils.py

@@ -129,11 +129,7 @@ class ReaderType(enum.IntEnum):
     SNAPSHOT = FINAL = LAST = enum.auto()  # Last sampled value
 
 
-def add_statoil_root_certificate() -> bool:
-    return add_equinor_root_certificate(True) and add_equinor_root_certificate(False)
-
-
-def add_equinor_root_certificate(get_equinor: bool = True) -> bool:
+def add_equinor_root_certificate() -> bool:
     """
     This is a utility function for Equinor employees on Equinor managed machines.
 
@@ -152,15 +148,8 @@ def add_equinor_root_certificate(get_equinor: bool = True) -> bool:
 
     import certifi
 
-    STATOIL_ROOT_PEM_HASH = "ce7bb185ab908d2fea28c7d097841d9d5bbf2c76"
     EQUINOR_root_PEM_HASH = "5A206332CE73CED1D44C8A99C4C43B7CEE03DF5F"
-
-    if get_equinor:
-        used_hash = EQUINOR_root_PEM_HASH.upper()
-        ca_search = "Equinor Root CA"
-    else:
-        used_hash = STATOIL_ROOT_PEM_HASH.upper()
-        ca_search = "Statoil Root CA"
+    ca_search = "Equinor Root CA"
 
     found = False
     der = None
@@ -172,7 +161,7 @@ def add_equinor_root_certificate(get_equinor: bool = True) -> bool:
         for cert in ssl.enum_certificates("CA"):
             der = cert[0]
             # deepcode ignore InsecureHash: <Only hashes to compare with known hash>
-            if hashlib.sha1(der).hexdigest().upper() == used_hash:
+            if hashlib.sha1(der).hexdigest().upper() == EQUINOR_root_PEM_HASH:
                 found = True
                 logger.debug("CA certificate found!")
                 break
@@ -182,11 +171,11 @@ def add_equinor_root_certificate(get_equinor: bool = True) -> bool:
             stdout=subprocess.PIPE,
         ).stdout
 
-        if used_hash in str(macos_ca_certs).upper():
+        if EQUINOR_root_PEM_HASH in str(macos_ca_certs).upper():
             c = get_macos_equinor_certificates()
             for cert in c:
                 # deepcode ignore InsecureHash: <Only hashes to compare with known hash>
-                if hashlib.sha1(cert).hexdigest().upper() == used_hash:
+                if hashlib.sha1(cert).hexdigest().upper() == EQUINOR_root_PEM_HASH:
                     der = cert
                     found = True
                     break
@@ -209,14 +198,11 @@ def add_equinor_root_certificate(get_equinor: bool = True) -> bool:
     return found
 
 
-def get_macos_equinor_certificates(get_equinor: bool = True):
+def get_macos_equinor_certificates():
     import ssl
     import tempfile
 
-    if get_equinor:
-        ca_search = "Equinor Root CA"
-    else:
-        ca_search = "Statoil Root CA"
+    ca_search = "Equinor Root CA"
 
     ctx = ssl.create_default_context()
     macos_ca_certs = subprocess.run(

{tagreader-5.3.0 → tagreader-5.5.0}/tagreader/web_handlers.py

@@ -242,12 +242,13 @@ class AspenHandlerWeb(BaseHandlerWeb):
         tag: Optional[str],
         desc: Optional[str],
         datasource: Optional[str],
+        max: Optional[int] = 100000,
     ) -> Dict[str, Any]:
         if not datasource:
             raise ValueError("Data source is required argument")
         # Aspen Web API expects single space instead of consecutive spaces.
         tag = " ".join(tag.split())
-        params = {"datasource": datasource, "tag": tag, "max": 100, "getTrendable": 0}
+        params = {"datasource": datasource, "tag": tag, "max": max, "getTrendable": 0}
         return params
 
     def generate_read_query(
@@ -450,7 +451,7 @@ class AspenHandlerWeb(BaseHandlerWeb):
         desc = desc.replace("*", ".*") if isinstance(desc, str) else None
 
         params = self.generate_search_query(
-            tag=tag, desc=desc, datasource=self.datasource
+            tag=tag, desc=desc, datasource=self.datasource, max=100000
         )
         # Ensure space is encoded as "%20" instead of default "+" and leave asterisks
         # unencoded. Otherwise, searches for tags containing spaces break, as do wildcard
@@ -523,11 +524,13 @@ class AspenHandlerWeb(BaseHandlerWeb):
     def _get_tag_description(self, tag: str):
         query = self.generate_get_description_query(tag)
         url = urljoin(self.base_url, "TagInfo")
-        data = self.fetch(url, params=query)
         try:
+            data = self.fetch(url, params=query)
             desc = data["data"]["tags"][0]["attrData"][0]["samples"][0]["v"]
         except KeyError:
             desc = ""
+        except JSONDecodeError:
+            desc = ""
         return desc
 
     def read_tag(
@@ -742,6 +745,7 @@ class PIHandlerWeb(BaseHandlerWeb):
         tag: Optional[str],
         desc: Optional[str],
         datasource: Optional[str],
+        max: Optional[int] = 100,
     ) -> Dict[str, str]:
         q = []
         if tag is not None: