tagreader 5.4.0__tar.gz → 6.0.0__tar.gz

{tagreader-5.4.0 → tagreader-6.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tagreader
-Version: 5.4.0
+Version: 6.0.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,<1.1.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.2.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.4.0 → tagreader-6.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tagreader"
-version = "5.4.0"
+version = "6.0.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,<1.1.0"
-notebook = { version = "^7.0.3", optional = true }
-matplotlib = { version = "^3", optional = true }
+msal-bearer = ">=0.2.1,<1.2.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"

{tagreader-5.4.0 → tagreader-6.0.0}/tagreader/web_handlers.py

@@ -19,7 +19,7 @@ from urllib3.exceptions import InsecureRequestWarning
 
 from tagreader.cache import BucketCache, SmartCache
 from tagreader.logger import logger
-from tagreader.utils import ReaderType, is_mac, is_windows, urljoin
+from tagreader.utils import IMSType, ReaderType, is_mac, is_windows, urljoin
 
 
 class MD4:
@@ -144,6 +144,33 @@ def list_piwebapi_sources(
         logger.error(f"Could not decode JSON response: {e}")
 
 
+def get_piwebapi_source_to_webid_dict(
+    url: Optional[str] = None,
+    auth: Optional[Any] = None,
+    verify_ssl: Optional[bool] = True,
+) -> List[str]:
+    if url is None:
+        url = get_url_pi()
+
+    if auth is None:
+        auth = get_auth_pi()
+
+    if verify_ssl is None:
+        verify_ssl = get_verify_ssl()
+
+    if verify_ssl is False:
+        urllib3.disable_warnings(InsecureRequestWarning)
+
+    url_ = urljoin(url, "dataservers")
+    res = requests.get(url_, auth=auth, verify=verify_ssl)
+
+    res.raise_for_status()
+    try:
+        return {item["Name"]: item["WebId"] for item in res.json()["Items"]}
+    except JSONDecodeError as e:
+        logger.error(f"Could not decode JSON response: {e}")
+
+
 class BaseHandlerWeb(ABC):
     def __init__(
         self,
@@ -242,12 +269,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 +478,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
@@ -740,7 +768,7 @@ class PIHandlerWeb(BaseHandlerWeb):
         )
 
     @staticmethod
-    def generate_search_query(
+    def generate_search_params(
         tag: Optional[str],
         desc: Optional[str],
         datasource: Optional[str],
@@ -751,10 +779,12 @@ class PIHandlerWeb(BaseHandlerWeb):
         if desc is not None:
             q.extend([f"description:{PIHandlerWeb.escape(desc)}"])
         query = " AND ".join(q)
-        params = {"q": f"{query}"}
+        params = {"query": f"{query}"}
 
         if datasource is not None:
-            params["scope"] = f"pi:{datasource}"
+            params["dataserverwebid"] = (
+                f"{get_piwebapi_source_to_webid_dict()[datasource]}"
+            )
 
         return params
 
@@ -864,23 +894,23 @@ class PIHandlerWeb(BaseHandlerWeb):
         timeout: Optional[int] = None,
         return_desc: bool = True,
     ) -> Union[List[Tuple[str, str]], List[str]]:
-        params = self.generate_search_query(
+        params = self.generate_search_params(
             tag=tag, desc=desc, datasource=self.datasource
         )
-        url = urljoin(self.base_url, "search", "query")
+        url = urljoin(self.base_url, "points", "search")
         done = False
         ret = []
         while not done:
             data = self.fetch(url, params=params, timeout=timeout)
 
             for item in data["Items"]:
-                description = item["Description"] if "Description" in item else ""
+                description = item["Descriptor"] if "Descriptor" in item else ""
                 ret.append((item["Name"], description))
-            next_start = int(data["Links"]["Next"].split("=")[-1])
-            if int(data["Links"]["Last"].split("=")[-1]) >= next_start:
-                params["start"] = next_start  # noqa
-            else:
-                done = True
+            # next_start = int(data["Links"]["Next"].split("=")[-1])
+            # if int(data["Links"]["Last"].split("=")[-1]) >= next_start:
+            #     params["start"] = next_start  # noqa
+            # else:
+            done = True
 
         if not return_desc:
             ret = [x[0] for x in ret]
@@ -920,17 +950,12 @@ class PIHandlerWeb(BaseHandlerWeb):
         if self.web_id_cache and tag in self.web_id_cache:
             return self.web_id_cache[tag]
 
-        params = self.generate_search_query(
+        params = self.generate_search_params(
             tag=tag, datasource=self.datasource, desc=None
         )
-        params["fields"] = "name;webid"
-        url = urljoin(self.base_url, "search", "query")
+        url = urljoin(self.base_url, "points", "search")
         data = self.fetch(url, params=params)
 
-        if len(data["Errors"]) > 0:
-            msg = f"Received error from server when searching for WebId for {tag}: {data['Errors']}"
-            raise ValueError(msg)
-
         if len(data["Items"]) > 1:
             # Compare elements and if same, return the first
             first = data["Items"][0]