Refactor build script and update requirements; remove unused package references and streamline log reading methods

Author: grongierisc

build-dist.sh

@@ -2,14 +2,6 @@
 
 rm -rf ./build
 
-packages=("intersystems_iris" "irisnative")
-for package in ${packages[@]};
-do
-    rm -f ./src/$package
-    package_path=`python -c "import importlib.util; print(importlib.util.find_spec('${package}').submodule_search_locations[0])"`
-    ln -s $package_path ./src/$package
-done
-
 set -eo pipefail
 
 PYTHON_BIN=${PYTHON_BIN:-python3}
@@ -21,9 +13,4 @@ set -x
 cd "$PROJECT"
 $PYTHON_BIN setup.py sdist bdist_wheel
 
-for package in ${packages[@]};
-do
-    rm -f ./src/$package
-done
-
 set +x

requirements-dev.txt

@@ -1,7 +1,6 @@
 pytest
 pytest-asyncio
 xmltodict
-intersystems_iris @ https://github.com/intersystems-community/intersystems-irispython/releases/download/3.8.1/intersystems_iris-3.8.1-py3-none-any.whl
 requests
 dataclasses-json
 wheel

src/iop/_director.py

@@ -2,7 +2,6 @@
 import datetime
 import functools
 from . import _iris
-import intersystems_iris.dbapi._DBAPI as irisdbapi
 import signal
 from dataclasses import dataclass
 
@@ -178,21 +177,22 @@ def format_log(row: list) -> str:
         return str(row[9]) + ' ' + typ + ' ' + str(row[1]) + ' ' + str(row[2]) + ' ' + str(row[3]) + ' ' + str(row[4]) + ' ' + str(row[5]) + ' ' + str(row[6]) + ' ' + str(row[8])
 
     @staticmethod
-    def read_top_log(cursor,top) -> list:
+    def read_top_log(top) -> list:
         sql = """
         SELECT top ?
         ID, ConfigName, Job, MessageId, SessionId, SourceClass, SourceMethod, Stack, Text, TimeLogged, TraceCat, Type
         FROM Ens_Util.Log
         order by id desc
         """
         result = []
-        cursor.execute(sql, top)
-        for row in cursor:
+        stmt = _iris.get_iris().sql.prepare(sql)
+        rs = stmt.execute(top)
+        for row in rs:
             result.append(_Director.format_log(row))
         return result
 
     @staticmethod
-    def read_log(cursor) -> list:
+    def read_log() -> list:
         sql = """
         SELECT 
         ID, ConfigName, Job, MessageId, SessionId, SourceClass, SourceMethod, Stack, Text, TimeLogged, TraceCat, Type
@@ -201,8 +201,12 @@ def read_log(cursor) -> list:
         order by id desc
         """
         result = []
-        cursor.execute(sql, (datetime.datetime.now() - datetime.timedelta(seconds=1),))
-        for row in cursor:
+        stmt = _iris.get_iris().sql.prepare(sql)
+        time = datetime.datetime.now() - datetime.timedelta(seconds=1)
+        # convert to utc time
+        time = time.astimezone(datetime.timezone.utc)
+        rs = stmt.execute(time.isoformat(sep=' '))
+        for row in rs:
             result.append(_Director.format_log(row))
         return result
 
@@ -211,14 +215,12 @@ async def _log_production_async(handler):
         """ Log production 
             if ctrl+c is pressed, the log is stopped
         """
-        with irisdbapi.connect(embedded=True) as conn:
-            with conn.cursor() as cursor:
-                while True:
-                    for row in reversed(_Director.read_log(cursor)):
-                        print(row)
-                    if handler.sigint_log:
-                        break
-                    await asyncio.sleep(1)
+        while True:
+            for row in reversed(_Director.read_log()):
+                print(row)
+            if handler.sigint_log:
+                break
+            await asyncio.sleep(1)
 
     @staticmethod
     def log_production_top(top=10):
@@ -227,10 +229,8 @@ def log_production_top(top=10):
         Parameters:
         top: the number of log to display
         """
-        with irisdbapi.connect(embedded=True) as conn:
-            with conn.cursor() as cursor:
-                for row in reversed(_Director.read_top_log(cursor, top)):
-                    print(row)
+        for row in reversed(_Director.read_top_log(top)):
+            print(row)
 
     @staticmethod
     def log_production():
@@ -240,10 +240,10 @@ def log_production():
         loop = asyncio.get_event_loop()
         handler = SigintHandler(log_only=True)
         loop.add_signal_handler(signal.SIGINT, functools.partial(handler.signal_handler, signal.SIGINT, loop))
-        with irisdbapi.connect(embedded=True) as conn:
-            with conn.cursor() as cursor:
-                for row in reversed(_Director.read_top_log(cursor, 10)):
-                    print(row)
+
+        for row in reversed(_Director.read_top_log( 10)):
+            print(row)
+    
         loop.run_until_complete(_Director._log_production_async(handler))
         loop.close()
 

src/tests/test_commun.py

@@ -4,7 +4,6 @@
 import random
 import string
 import pytest
-import intersystems_iris.dbapi._DBAPI as irisdbapi
 from iop._message_validator import is_iris_object_instance, is_message_class, is_pickle_message_class
 from registerFilesIop.message import SimpleMessage, SimpleMessageNotMessage, PickledMessage
 from iop._common import _Common
@@ -49,7 +48,8 @@ class TestLogging:
     def test_log_info_loggger(self, common, random_string):
         common.logger.info(random_string)
         rs = self._check_log_entry(random_string, 'test_log_info_loggger')
-        assert len(rs) == 1
+        for entry in rs:
+            assert random_string in entry[9]
 
     def test_log_info_loggger_to_console(self, common, random_string):
         common.log_to_console = True
@@ -82,20 +82,23 @@ def _check_log_entry(self, message, method_name):
             AND Text = ? 
             ORDER BY id DESC
         """
-        with irisdbapi.connect(embedded=True) as conn:
-            with conn.cursor() as cursor:
-                cursor.execute(sql, (method_name, message))
-                return cursor.fetchall()
+        stmt = iris.sql.prepare(sql)
+        rs = stmt.execute(method_name, message)
+        if rs is None:
+            return []
+        return rs
 
     def test_log_info(self, common, random_string):
         common.log_info(random_string)
         rs = self._check_log_entry(random_string, 'test_log_info')
-        assert len(rs) == 1
+        for entry in rs:
+            assert random_string in entry[9]
 
     def test_log_info_japanese(self, common, random_japanese):
         common.log_info(random_japanese)
         rs = self._check_log_entry(random_japanese, 'test_log_info_japanese')
-        assert len(rs) == 1
+        for entry in rs:
+            assert random_japanese in entry[9]
 
 class TestBusinessService:
     def test_get_info(self):