Removing instantiations from flowcept.commons.__init__

.github/workflows/run-tests-py11.yml

@@ -0,0 +1,91 @@
+name: Tests on py11
+on: [pull_request]
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 40
+    if: "!contains(github.event.head_commit.message, 'CI Bot')"
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+          cache: "pip"
+
+      - name: Show OS Info
+        run: '[[ "$OSTYPE" == "linux-gnu"* ]] && { echo "OS Type: Linux"; (command -v lsb_release &> /dev/null && lsb_release -a) || cat /etc/os-release; uname -r; } || [[ "$OSTYPE" == "darwin"* ]] && { echo "OS Type: macOS"; sw_vers; uname -r; } || echo "Unsupported OS type: $OSTYPE"'
+
+      - name: Start docker compose with redis
+        run: make services
+
+      - name: Upgrade pip
+        run: python -m pip install --upgrade pip
+
+      - name: Show Python version
+        run: python --version && pip --version
+
+      - name: Install default dependencies and run simple test
+        run: |          
+          pip install .
+          python examples/simple_instrumented_script.py
+
+      - name: Install Dask dependencies alone and run a simple Dask test
+        run: |          
+          pip uninstall flowcept -y
+          pip install .[dask]
+          python examples/dask_example.py          
+
+      - name: Install MLFlow dependencies alone and run a simple MLFlow test
+        run: |          
+          pip uninstall flowcept -y
+          pip install .[mlflow]
+          python examples/mlflow_example.py    
+
+      - name: Install Tensorboard dependencies alone and run a simple Tensorboard test
+        run: |          
+          pip uninstall flowcept -y
+          pip install .[tensorboard]
+          python examples/tensorboard_example.py              
+
+      - name: Install all dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install .[all]
+
+      - name: List installed packages
+        run: pip list
+
+      - name: Test with pytest and redis
+        run: |
+          make tests
+
+      - name: Test notebooks with pytest and redis
+        run: make tests-notebooks
+
+      - name: Shut down docker compose
+        run: make services-stop
+
+      - name: Start docker compose with kafka
+        run: docker compose -f deployment/compose-kafka.yml up -d
+
+      - name: Wait for one minute
+        run: sleep 60
+
+      - name: Check liveness
+        run: |
+          export MQ_TYPE=kafka
+          export MQ_PORT=9092
+          python -c 'from flowcept.configs import MQ_TYPE, MQ_PORT; print(f"MQ_TYPE={MQ_TYPE}"); print(f"MQ_PORT={MQ_PORT}")'
+          python -c 'from flowcept import Flowcept; assert Flowcept.services_alive()'
+
+      - name: Run tests with kafka
+        run: |
+          export MQ_TYPE=kafka
+          export MQ_PORT=9092
+          # Ignoring heavy tests. They are executed with Kafka in another GH Action.
+          pytest --ignore=tests/decorator_tests/ml_tests --ignore=tests/adapters/test_tensorboard.py

.github/workflows/run-tests.yml

@@ -1,5 +1,8 @@
 name: Unit, integration, and notebook tests
-on: [push]
+on:
+  push:
+  schedule:
+    - cron: '0 12 * * *'  # Runs every day at 12 PM UTC (7 AM EST)
 
 jobs:
 
@@ -21,15 +24,15 @@ jobs:
         run: '[[ "$OSTYPE" == "linux-gnu"* ]] && { echo "OS Type: Linux"; (command -v lsb_release &> /dev/null && lsb_release -a) || cat /etc/os-release; uname -r; } || [[ "$OSTYPE" == "darwin"* ]] && { echo "OS Type: macOS"; sw_vers; uname -r; } || echo "Unsupported OS type: $OSTYPE"'
 
       - name: Start docker compose with redis
-        run: docker compose -f deployment/compose.yml up -d
+        run: make services
 
       - name: Upgrade pip
         run: python -m pip install --upgrade pip
 
       - name: Install default dependencies and run simple test
         run: |
           pip install .
-          python examples/instrumentation/simple_script.py
+          python examples/simple_instrumented_script.py
 
       - name: Install Dask dependencies alone and run a simple Dask test
         run: |
@@ -59,13 +62,13 @@ jobs:
 
       - name: Test with pytest and redis
         run: |
-          pytest --ignore=tests/decorator_tests/ml_tests/llm_tests
+          make tests
 
       - name: Test notebooks with pytest and redis
-        run: pytest --nbmake "notebooks/" --nbmake-timeout=600 --ignore=notebooks/dask_from_CLI.ipynb
+        run: make tests-notebooks
 
       - name: Shut down docker compose
-        run: docker compose -f deployment/compose.yml down
+        run: make services-stop
 
       - name: Start docker compose with kafka
         run: docker compose -f deployment/compose-kafka.yml up -d
@@ -84,5 +87,4 @@ jobs:
         run: |
           export MQ_TYPE=kafka
           export MQ_PORT=9092
-          # Ignoring heavy tests. They are executed with Kafka in another GH Action.
-          pytest --ignore=tests/decorator_tests/ml_tests --ignore=tests/adapters/test_tensorboard.py
+          make tests

Makefile

@@ -2,18 +2,25 @@
 help:
 	@printf "\nCommands:\n"
 	@printf "\033[32mchecks\033[0m          run ruff linter and formatter checks\n"
+	@printf "\033[32mreformat\033[0m        run ruff linter and formatter\n"
 	@printf "\033[32mclean\033[0m           remove cache directories and Sphinx build output\n"
 	@printf "\033[32mdocs\033[0m            build HTML documentation using Sphinx\n"
 	@printf "\033[32mservices\033[0m        run services using Docker\n"
 	@printf "\033[32mservices-stop\033[0m   stop the running Docker services\n"
 	@printf "\033[32mtests\033[0m           run unit tests with pytest\n"
+	@printf "\033[32mtests-all\033[0m       run all unit tests with pytest, including very long-running ones\n"
+	@printf "\033[32mtests-notebooks\033[0m tests the notebooks, using pytest\n"
 
 
 # Run linter and formatter checks using ruff
 checks:
 	ruff check src
 	ruff format --check src
 
+reformat:
+	ruff check src
+	ruff format src
+
 # Remove cache directories and Sphinx build output
 clean:
 	rm -rf .ruff_cache
@@ -44,3 +51,11 @@ services-stop:
 .PHONY: tests
 tests:
 	pytest --ignore=tests/decorator_tests/ml_tests/llm_tests
+
+.PHONY: tests-notebooks
+tests-notebooks:
+	pytest --nbmake "notebooks/" --nbmake-timeout=600 --ignore=notebooks/dask_from_CLI.ipynb
+
+.PHONY: tests-all
+tests-all:
+	pytest

examples/dask_example.py

@@ -23,6 +23,8 @@ def sum_list(values):
     scheduler = cluster.scheduler
     client = Client(scheduler.address)
 
+    client.forward_logging()
+
     # Registering Flowcept's worker and scheduler adapters
     scheduler.add_plugin(FlowceptDaskSchedulerAdapter(scheduler))
     client.register_plugin(FlowceptDaskWorkerAdapter())
@@ -32,29 +34,37 @@ def sum_list(values):
     print(f"workflow_id={wf_id}")
 
     # Start Flowcept's Dask observer
-    flowcept = Flowcept("dask").start()
-    t1 = client.submit(add, 1, 2)
-    t2 = client.submit(multiply, 3, 4)
-    t3 = client.submit(add, t1.result(), t2.result())
-    t4 = client.submit(sum_list, [t1, t2, t3])
-    result = t4.result()
-    print("Result:", result)
-
-    # Closing Dask and Flowcept
-    client.close()
-    cluster.close()
-    flowcept.stop()
+
+    with Flowcept("dask"):  # Optionally: Flowcept("dask").start()
+
+        t1 = client.submit(add, 1, 2)
+        t2 = client.submit(multiply, 3, 4)
+        t3 = client.submit(add, t1.result(), t2.result())
+        t4 = client.submit(sum_list, [t1, t2, t3])
+        result = t4.result()
+        print("Result:", result)
+        assert result == 30
+
+        # Closing Dask and Flowcept
+        client.close()   # This is to avoid generating errors
+        cluster.close()  # This calls are needed closeouts to inform of workflow conclusion.
+
+    # Optionally: flowcept.stop()
 
     # Querying Flowcept's database about this run
     print(f"t1_key={t1.key}")
     print("Getting first task only:")
     task1 = Flowcept.db.query(filter={"task_id": t1.key})[0]
     assert task1["workflow_id"] == wf_id
     print(task1)
+    print("\n\n")
     print("Getting all tasks from this workflow:")
     all_tasks = Flowcept.db.query(filter={"workflow_id": wf_id})
     assert len(all_tasks) == 4
+    assert all(t.get("finished") is True for t in all_tasks)
+    assert all_tasks[-1]["generated"]["arg0"] == 30, "Checking if the last result was saved."
     print(all_tasks)
+    print("\n\n")
     print("Getting workflow info:")
     wf_info = Flowcept.db.query(filter={"workflow_id": wf_id}, type="workflow")[0]
     assert wf_info["workflow_id"] == wf_id

src/flowcept/commons/__init__.py

@@ -1,5 +1 @@
 """Commons subpackage."""
-
-from flowcept.commons.flowcept_logger import FlowceptLogger
-
-logger = FlowceptLogger()

src/flowcept/commons/utils.py

@@ -10,11 +10,9 @@
 import types
 import numpy as np
 
-import flowcept.commons
 from flowcept import configs
-from flowcept.configs import (
-    PERF_LOG,
-)
+from flowcept.commons.flowcept_logger import FlowceptLogger
+from flowcept.configs import PERF_LOG
 from flowcept.commons.flowcept_dataclasses.task_object import Status
 
 
@@ -42,11 +40,11 @@ def get_utc_minutes_ago(minutes_ago=1):
     return rounded.timestamp()
 
 
-def perf_log(func_name, t0: float):
+def perf_log(func_name, t0: float, logger=FlowceptLogger()):
     """Configure the performance log."""
     if PERF_LOG:
         t1 = time()
-        flowcept.commons.logger.debug(f"[PERFEVAL][{func_name}]={t1 - t0}")
+        logger.debug(f"[PERFEVAL][{func_name}]={t1 - t0}")
         return t1
     return None
 
@@ -71,6 +69,7 @@ def assert_by_querying_tasks_until(
     """Assert by query."""
     from flowcept.flowcept_api.task_query_api import TaskQueryAPI
 
+    logger = FlowceptLogger()
     query_api = TaskQueryAPI()
     start_time = time()
     trials = 0
@@ -79,24 +78,20 @@ def assert_by_querying_tasks_until(
         docs = query_api.query(filter)
         if condition_to_evaluate is None:
             if docs is not None and len(docs):
-                flowcept.commons.logger.debug("Query conditions have been met! :D")
+                logger.debug("Query conditions have been met! :D")
                 return True
         else:
             try:
                 if condition_to_evaluate(docs):
-                    flowcept.commons.logger.debug("Query conditions have been met! :D")
+                    logger.debug("Query conditions have been met! :D")
                     return True
             except Exception:
                 pass
 
         trials += 1
-        flowcept.commons.logger.debug(
-            f"Task Query condition not yet met. Trials={trials}/{max_trials}."
-        )
+        logger.debug(f"Task Query condition not yet met. Trials={trials}/{max_trials}.")
         sleep(1)
-    flowcept.commons.logger.debug(
-        "We couldn't meet the query conditions after all trials or timeout! :("
-    )
+    logger.debug("We couldn't meet the query conditions after all trials or timeout! :(")
     return False
 
 
@@ -109,6 +104,7 @@ def chunked(iterable, size):
 # TODO: consider reusing this function in the function assert_by_querying_task_collections_until
 def evaluate_until(evaluation_condition: Callable, max_trials=30, max_time=60, msg=""):
     """Evaluate something."""
+    logger = FlowceptLogger()
     start_time = time()
     trials = 0
 
@@ -117,7 +113,7 @@ def evaluate_until(evaluation_condition: Callable, max_trials=30, max_time=60, m
             return True  # Condition met
 
         trials += 1
-        flowcept.commons.logger.debug(f"Condition not yet met. Trials={trials}/{max_trials}. {msg}")
+        logger.debug(f"Condition not yet met. Trials={trials}/{max_trials}. {msg}")
         sleep(1)
 
     return False  # Condition not met within max_trials or max_time

src/flowcept/flowcept_api/flowcept_controller.py

@@ -7,15 +7,14 @@
     WorkflowObject,
 )
 
-import flowcept.instrumentation.decorators
-from flowcept.commons import logger
 from flowcept.commons.daos.document_db_dao import DocumentDBDao
 from flowcept.commons.daos.mq_dao.mq_dao_base import MQDao
 from flowcept.configs import (
     MQ_INSTANCES,
     INSTRUMENTATION_ENABLED,
 )
 from flowcept.flowcept_api.db_api import DBAPI
+from flowcept.flowceptor.adapters.instrumentation_interceptor import InstrumentationInterceptor
 from flowcept.flowceptor.consumers.document_inserter import DocumentInserter
 from flowcept.commons.flowcept_logger import FlowceptLogger
 from flowcept.flowceptor.adapters.base_interceptor import BaseInterceptor
@@ -77,7 +76,7 @@ def __init__(
                 if not INSTRUMENTATION_ENABLED:
                     self.enabled = False
                     return
-                interceptors = [flowcept.instrumentation.decorators.instrumentation_interceptor]
+                interceptors = [InstrumentationInterceptor.get_instance()]
             elif not isinstance(interceptors, list):
                 interceptors = [interceptors]
             self._interceptors: List[BaseInterceptor] = interceptors
@@ -179,14 +178,10 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         """Run the stop function."""
         self.stop()
 
-    @staticmethod
-    def start_instrumentation_interceptor():
-        """Start it."""
-        flowcept.instrumentation.decorators.instrumentation_interceptor.start(None)
-
     @staticmethod
     def services_alive() -> bool:
         """Get alive services."""
+        logger = FlowceptLogger()
         if not MQDao.build().liveness_test():
             logger.error("MQ Not Ready!")
             return False

src/flowcept/flowceptor/adapters/base_interceptor.py

@@ -1,6 +1,7 @@
 """Base module."""
 
 from abc import abstractmethod
+from time import time
 from uuid import uuid4
 
 from flowcept.commons.flowcept_dataclasses.workflow_object import (
@@ -29,6 +30,8 @@ class BaseInterceptor(object):
 
     def __init__(self, plugin_key=None, kind=None):
         self.logger = FlowceptLogger()
+        self.logger.debug(f"Starting Interceptor{id(self)} at {time()}")
+
         if plugin_key is not None:  # TODO :base-interceptor-refactor: :code-reorg: :usability:
             self.settings = get_settings(plugin_key)
         else: