chore: update cryptography to >= 44.0.0 (#410)

asmfstatoil · web-flow · commit 9651de725dd2 · 2025-03-20T11:02:25.000+01:00
* chore: support newer versions of msal_bearer

* chore: python 3.9 to use cryptography &gt; 44.0.0

* fix: aspen query_sql with parsing

* fix: tests

* chore: update README.md

* fix: build

* Update web_handlers.py

* chore: poetry update

* chore: mark obsolete functions

* chore: update poetry.lock
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11"]
         os: [windows-latest, ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -19,7 +19,7 @@ jobs:
       - name: Install required Linux library for pykerberos
         if: matrix.os == 'ubuntu-latest'
         run: |
-          sudo apt-get install libkrb5-dev
+          sudo apt-get update && sudo apt-get install libkrb5-dev
 
       - name: Install Poetry
         run: |
diff --git a/README.md b/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.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -28,19 +28,18 @@ classifiers=[
 ]
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.9.2"
 pandas = ">=1"
 certifi = "^2024.12.14"
 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"
diff --git a/tagreader/clients.py b/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 @@ def read(
             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)
 
diff --git a/tagreader/web_handlers.py b/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 @@ def __init__(
 
     @staticmethod
     def generate_connection_string(host, *_, **__):
+        # todo: is obsolete after removing ODBC
         raise NotImplementedError
 
     @staticmethod
@@ -670,11 +671,13 @@ def generate_sql_query(
         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 @@ def query_sql(self, query: str, parse: bool = True) -> Union[str, pd.DataFrame]:
             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 @@ def _time_to_UTC_string(time: datetime) -> str:
 
     @staticmethod
     def generate_connection_string(host, *_, **__):
+        # todo: is obsolete after removing ODBC
         raise NotImplementedError
 
     @staticmethod
diff --git a/tests/test_AspenHandlerREST.py b/tests/test_AspenHandlerREST.py
@@ -235,6 +235,7 @@ def test_generate_sql_query(aspen_handler: AspenHandlerWeb) -> None:
 
 
 def test_initialize_connection_string(aspen_handler: AspenHandlerWeb) -> None:
+    # todo: is obsolete after removing ODBC
     aspen_handler.initialize_connection_string(
         host="my_host", port=999, connection_string="my_connection_string"
     )
diff --git a/tests/test_AspenHandlerREST_connect.py b/tests/test_AspenHandlerREST_connect.py
@@ -2,8 +2,8 @@
 from datetime import datetime, timedelta
 from typing import Generator
 
+import pandas as pd
 import pytest
-from pytest import raises
 
 from tagreader.clients import IMSClient, list_sources
 from tagreader.utils import IMSType
@@ -137,18 +137,17 @@ def test_query_sql(client: IMSClient) -> None:
     # The % causes WC_E_SYNTAX error in result. Tried "everything" but no go.
     # Leaving it for now.
     # query = "SELECT name, ip_description FROM ip_analogdef WHERE name LIKE 'ATC%'"
-    query = "Select name, ip_description from ip_analogdef where name = 'atcai'"
+    query = "Select name, ip_description from ip_analogdef where name = 'atc'"
     res = client.query_sql(query=query, parse=False)
-    print(res)
+    # print(res)
     assert isinstance(res, str)
-    with raises(NotImplementedError):
-        res = client.query_sql(query=query, parse=True)
-        assert isinstance(res, str)
-    client.handler.initialize_connection_string()
-    query = "Select name, ip_description from ip_analogdef where name = 'atcai'"
-    res = client.query_sql(query=query, parse=False)
-    print(res)
-    assert isinstance(res, str)
-    with raises(NotImplementedError):
-        res = client.query_sql(query=query, parse=True)
-        assert isinstance(res, str)
+
+    res = client.query_sql(query=query, parse=True)
+    assert isinstance(res, pd.DataFrame)
+    assert res.empty
+
+    query = "Select name, ip_description from ip_analogdef where name = 'AverageCPUTimeVals'"
+    res = client.query_sql(query=query, parse=True)
+    assert isinstance(res, pd.DataFrame)
+    assert len(res.index.values) == 1
+    assert res.index.values[0] == 0

Original file line number	Diff line number	Diff line change
`@@ -235,6 +235,7 @@ def test_generate_sql_query(aspen_handler: AspenHandlerWeb) -> None:`
`235`	`235`
`236`	`236`
`237`	`237`	`def test_initialize_connection_string(aspen_handler: AspenHandlerWeb) -> None:`
	`238`	`+ # todo: is obsolete after removing ODBC`
`238`	`239`	`aspen_handler.initialize_connection_string(`
`239`	`240`	`host="my_host", port=999, connection_string="my_connection_string"`
`240`	`241`	`)`