tagreader 5.4.0__tar.gz → 5.5.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tagreader
-Version: 5.4.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: matplotlib (>=3.7.0,<4.0.0) ; 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: 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-5.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tagreader"
-version = "5.4.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,<1.1.0"
-notebook = { version = "^7.0.3", optional = true }
-matplotlib = { version = "^3", optional = true }
+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-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
@@ -744,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: