tagreader 6.0.2__tar.gz → 6.0.3__tar.gz

{tagreader-6.0.2 → tagreader-6.0.3}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: tagreader
-Version: 6.0.2
+Version: 6.0.3
 Summary: Tagreader is a Python package for reading trend data from the OSIsoft PI and Aspen Infoplus.21 IMS systems.
 License: MIT
 Keywords: Aspen InfoPlus.21,OSIsoft PI
 Author: Einar S. Idsø
 Author-email: eiids@equinor.com
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.9.2,<4.0.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
@@ -16,20 +16,20 @@ Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 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.8
+Classifier: Programming Language :: Python :: 3.9
 Classifier: Topic :: Scientific/Engineering :: Interface Engine/Protocol Translator
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Provides-Extra: notebooks
-Requires-Dist: certifi (>=2024.12.14,<2025.0.0)
+Requires-Dist: certifi (>=2024.12.14,<2026.0.0)
 Requires-Dist: diskcache (>=5.6.1,<6.0.0)
 Requires-Dist: matplotlib (>=3.7.5,<4.0.0) ; extra == "notebooks"
-Requires-Dist: msal-bearer (>=0.2.1,<1.2.0)
+Requires-Dist: msal-bearer (>=1.3.0,<2.0.0)
 Requires-Dist: notebook (>=7.2.2,<8.0.0) ; extra == "notebooks"
 Requires-Dist: pandas (>=1)
 Requires-Dist: pycryptodome (>=3.20.0,<4.0.0)
@@ -48,25 +48,17 @@ Description-Content-Type: text/markdown
 [![Downloads](https://pepy.tech/badge/tagreader)](https://pepy.tech/project/tagreader)
 
 Tagreader is a Python package for reading timeseries data from the OSIsoft PI and Aspen Infoplus.21
-Information Manufacturing Systems (IMS) systems. It is intended to be easy to use, and present as similar interfaces
-as possible to the backend historians.
+Information Management Systems (IMS). It is intended to be easy to use, and present as similar interfaces
+as possible to the backend plant historians.
 
 ## Installation
 You can install tagreader directly into your project from pypi by using pip
-or another package manager. The only requirement is Python version 3.8 or above.
+or another package manager. Supports Python version 3.9.2 and above.
 
 ```shell
 pip install tagreader
 ```
 
-The following are required and will be installed:
-
-* pandas
-* requests
-* requests-kerberos
-* certifi
-* diskcache
-
 ## Usage
 Tagreader is easy to use for both Equinor internal IMS services, and non-internal usage. For non-internal usage
 you simply need to provide the corresponding IMS service URLs and IMSType.

{tagreader-6.0.2 → tagreader-6.0.3}/README.md

@@ -6,25 +6,17 @@
 [![Downloads](https://pepy.tech/badge/tagreader)](https://pepy.tech/project/tagreader)
 
 Tagreader is a Python package for reading timeseries data from the OSIsoft PI and Aspen Infoplus.21
-Information Manufacturing Systems (IMS) systems. It is intended to be easy to use, and present as similar interfaces
-as possible to the backend historians.
+Information Management Systems (IMS). It is intended to be easy to use, and present as similar interfaces
+as possible to the backend plant historians.
 
 ## Installation
 You can install tagreader directly into your project from pypi by using pip
-or another package manager. The only requirement is Python version 3.8 or above.
+or another package manager. Supports Python version 3.9.2 and above.
 
 ```shell
 pip install tagreader
 ```
 
-The following are required and will be installed:
-
-* pandas
-* requests
-* requests-kerberos
-* certifi
-* diskcache
-
 ## Usage
 Tagreader is easy to use for both Equinor internal IMS services, and non-internal usage. For non-internal usage
 you simply need to provide the corresponding IMS service URLs and IMSType.

{tagreader-6.0.2 → tagreader-6.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tagreader"
-version = "6.0.2"
+version = "6.0.3"
 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"
@@ -28,19 +28,18 @@ classifiers=[
 ]
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.9.2"
 pandas = ">=1"
-certifi = "^2024.12.14"
+certifi = ">=2024.12.14,<2026.0.0"
 requests = "^2"
 requests-kerberos = "^0"
-msal-bearer = ">=0.2.1,<1.2.0"
+msal-bearer = "^1.3.0"
 notebook = { version = "^7.2.2", optional = true }
 matplotlib = { version = "^3.7.5", optional = true }
 diskcache = "^5.6.1"
 pycryptodome = "^3.20.0"
 requests-ntlm = ">=1.1,<=2.0"
 
-
 [tool.poetry.group.dev.dependencies]
 pre-commit = "^3"
 pytest = ">=7,<9"

{tagreader-6.0.2 → tagreader-6.0.3}/tagreader/clients.py

@@ -1,5 +1,5 @@
 import os
-from datetime import datetime, timedelta, tzinfo
+from datetime import datetime, timedelta, timezone, tzinfo
 from itertools import groupby
 from operator import itemgetter
 from typing import Any, Dict, List, Optional, Tuple, Union
@@ -128,6 +128,8 @@ def get_server_address_aspen(datasource: str) -> Optional[Tuple[str, int]]:
     host and port based on the path above and the UUID.
     """
 
+    # todo: is obsolete after removing ODBC
+
     if not is_windows():
         return None
     import winreg
@@ -168,6 +170,7 @@ def get_server_address_pi(datasource: str) -> Optional[Tuple[str, int]]:
     :return: host, port
     :type: tuple(string, int)
     """
+    # todo: is obsolete after removing ODBC
 
     if not is_windows():
         return None
@@ -557,7 +560,7 @@ class IMSClient:
             except ValueError:
                 start = convert_to_pydatetime(start)
         if end is None:
-            end = datetime.utcnow()
+            end = datetime.now(timezone.utc)
         elif isinstance(end, (str, pd.Timestamp)):
             end = convert_to_pydatetime(end)
 

{tagreader-6.0.2 → tagreader-6.0.3}/tagreader/web_handlers.py

@@ -72,7 +72,7 @@ def get_auth_aspen(use_internal: bool = True):
     if use_internal:
         return HTTPKerberosAuth(mutual_authentication=OPTIONAL)
 
-    from msal_bearer.BearerAuth import BearerAuth
+    from msal_bearer import BearerAuth
 
     tenantID = "3aa4a235-b6e2-48d5-9195-7fcf05b459b0"
     clientID = "7adaaa99-897f-428c-8a5f-4053db565b32"
@@ -260,6 +260,7 @@ class AspenHandlerWeb(BaseHandlerWeb):
 
     @staticmethod
     def generate_connection_string(host, *_, **__):
+        # todo: is obsolete after removing ODBC
         raise NotImplementedError
 
     @staticmethod
@@ -670,11 +671,13 @@ class AspenHandlerWeb(BaseHandlerWeb):
         return connection_string
 
     def initialize_connection_string(
+        # todo: is obsolete after removing ODBC
         self,
         host: Optional[str] = None,
         port: int = 10014,
         connection_string: Optional[str] = None,
     ):
+        # todo: is obsolete after removing ODBC
         if connection_string:
             self._connection_string = connection_string
         else:
@@ -712,16 +715,17 @@ class AspenHandlerWeb(BaseHandlerWeb):
             parsed_dict = res.json()["data"][0]
 
             cols = []
-            for i in parsed_dict["cols"]:
-                cols.append(i["n"])
+            if "cols" in parsed_dict.keys():
+                for i in parsed_dict["cols"]:
+                    cols.append(i["n"])
 
             rows = []
-
-            for i in parsed_dict["rows"]:
-                element = []
-                for j in i["fld"]:
-                    element.append(j["v"])
-                rows.append(element)
+            if "rows" in parsed_dict.keys():
+                for i in parsed_dict["rows"]:
+                    element = []
+                    for j in i["fld"]:
+                        element.append(j["v"])
+                    rows.append(element)
             return pd.DataFrame(data=rows, columns=cols)
         return res.text
 
@@ -756,6 +760,7 @@ class PIHandlerWeb(BaseHandlerWeb):
 
     @staticmethod
     def generate_connection_string(host, *_, **__):
+        # todo: is obsolete after removing ODBC
         raise NotImplementedError
 
     @staticmethod