tagreader 6.1.0__tar.gz → 6.2.0__tar.gz

{tagreader-6.1.0 → tagreader-6.2.0}/PKG-INFO

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: tagreader
-Version: 6.1.0
+Version: 6.2.0
 Summary: Tagreader is a Python package for reading trend data from the OSIsoft PI and Aspen Infoplus.21 IMS systems.
-License: MIT
+License-Expression: MIT
+License-File: LICENSE
 Keywords: Aspen InfoPlus.21,OSIsoft PI
 Author: Einar S. Idsø
 Author-email: eiids@equinor.com

{tagreader-6.1.0 → tagreader-6.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tagreader"
-version = "6.1.0"
+version = "6.2.0"
 description = "Tagreader is a Python package for reading trend data from the OSIsoft PI and Aspen Infoplus.21 IMS systems."
 authors = [
     { name = "Einar S. Idsø", email = "eiids@equinor.com" },

{tagreader-6.1.0 → tagreader-6.2.0}/tagreader/utils.py

@@ -117,7 +117,7 @@ def add_equinor_root_certificate() -> bool:
         logger.debug(
             "Unable to locate Equinor Root CA certificate on this host. Downloading from Equinor server."
         )
-        response = requests.get("http://pki.equinor.com/aia/ecpr.crt")
+        response = requests.get("http://pki.equinor.com/aia/ecpr.crt", timeout=20)
 
         if response.status_code != 200:
             logger.error(
@@ -230,7 +230,8 @@ def is_equinor() -> bool:
         if hostname.lower().startswith("eqdev") or hostname.lower().startswith("eqpc"):
             return True
         with winreg.OpenKey(  # type: ignore
-            winreg.HKEY_LOCAL_MACHINE, r"SYSTEM\ControlSet001\Services\Tcpip\Parameters"  # type: ignore
+            winreg.HKEY_LOCAL_MACHINE,
+            r"SYSTEM\ControlSet001\Services\Tcpip\Parameters",  # type: ignore
         ) as key:
             domain = winreg.QueryValueEx(key, "Domain")  # type: ignore
             if "statoil" in domain[0] or "equinor" in domain[0]:
@@ -282,7 +283,7 @@ def is_equinor() -> bool:
                 return True
 
             s = subprocess.run(
-                ["security", "find-certificate", "-a", "-c" "client.statoil.net"],
+                ["security", "find-certificate", "-a", "-cclient.statoil.net"],
                 stdout=subprocess.PIPE,
             ).stdout
 

{tagreader-6.1.0 → tagreader-6.2.0}/tagreader/web_handlers.py

@@ -107,7 +107,7 @@ def list_aspenone_sources(
     url_ = urljoin(url, "DataSources")
     params = {"service": "ProcessData", "allQuotes": 1}
 
-    res = requests.get(url_, params=params, auth=auth, verify=verify_ssl)
+    res = requests.get(url_, params=params, auth=auth, verify=verify_ssl, timeout=300)
     res.raise_for_status()
     try:
         source_list = [r["n"] for r in res.json()["data"] if r["t"] == "IP21"]
@@ -134,7 +134,7 @@ def list_piwebapi_sources(
         urllib3.disable_warnings(InsecureRequestWarning)
 
     url_ = urljoin(url, "dataservers")
-    res = requests.get(url_, auth=auth, verify=verify_ssl)
+    res = requests.get(url_, auth=auth, verify=verify_ssl, timeout=300)
 
     res.raise_for_status()
     try:
@@ -162,7 +162,7 @@ def get_piwebapi_source_to_webid_dict(
         urllib3.disable_warnings(InsecureRequestWarning)
 
     url_ = urljoin(url, "dataservers")
-    res = requests.get(url_, auth=auth, verify=verify_ssl)
+    res = requests.get(url_, auth=auth, verify=verify_ssl, timeout=300)
 
     res.raise_for_status()
     try:
@@ -316,12 +316,12 @@ class AspenHandlerWeb(BaseHandlerWeb):
         else:
             query = '<Q f="d" allQuotes="1">'
 
-        query += "<Tag>" f"<N><![CDATA[{tagname}]]></N>"
+        query += f"<Tag><N><![CDATA[{tagname}]]></N>"
 
         if mapname:
             query += f"<M><![CDATA[{mapname}]]></M>"
 
-        query += f"<D><![CDATA[{self.datasource}]]></D>" "<F><![CDATA[VAL]]></F>"
+        query += f"<D><![CDATA[{self.datasource}]]></D><F><![CDATA[VAL]]></F>"
 
         if read_type == ReaderType.SNAPSHOT:
             query += "<VS>1</VS>"
@@ -843,10 +843,10 @@ class PIHandlerWeb(BaseHandlerWeb):
         if self._is_summary(read_type):
             params["selectedFields"] = "Links;Items.Value.Timestamp;Items.Value.Value"
             if get_status:
-                params["selectedFields"] += (
-                    ";Items.Value.Good"
-                    ";Items.Value.Questionable"
-                    ";Items.Value.Substituted"
+                params[
+                    "selectedFields"
+                ] += (
+                    ";Items.Value.Good;Items.Value.Questionable;Items.Value.Substituted"
                 )
         elif read_type in [ReaderType.INT, ReaderType.RAW, ReaderType.SHAPEPRESERVING]:
             params["selectedFields"] = "Links;Items.Timestamp;Items.Value"