Merge branch 'dev' into kzscisoft/filter-object

Author: kzscisoft

.github/workflows/deploy.yaml

@@ -79,7 +79,7 @@ jobs:
           name: python-package-distributions
           path: dist/
       - name: Sign the dists with Sigstore
-        uses: sigstore/gh-action-sigstore-python@v2
+        uses: sigstore/gh-action-sigstore-python@v2.1.1
         with:
           inputs: >-
             ./dist/*.tar.gz

.github/workflows/test_client_windows.yml

@@ -27,4 +27,4 @@ jobs:
         export SIMVUE_TOKEN=${{ secrets.SIMVUE_TOKEN }}
         poetry install --all-extras
         poetry run python -m pip install torch
-        poetry run pytest tests/unit/ tests/refactor/ -m 'not scenario'
+        poetry run pytest tests/unit/ tests/refactor/ -m 'not scenario' -m 'not unix'

.pre-commit-config.yaml

@@ -23,7 +23,7 @@ repos:
         args: [--branch, main, --branch, dev]
       - id: check-added-large-files
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.2
+    rev: v0.5.5
     hooks:
       - id: ruff
         args: [ --fix, --exit-non-zero-on-fix, "--ignore=C901" ]

poetry.lock

@@ -5,6 +5,9 @@ description = "Simulation tracking and monitoring"
 authors = ["Simvue Development Team <[email protected]>"]
 license = "Apache v2"
 readme = "README.md"
+homepage = "https://simvue.io"
+repository = "https://github.com/simvue-io/python-api"
+documentation = "https://docs.simvue.io"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Science/Research",

pyproject.toml

@@ -196,9 +196,9 @@ def callback_function(status_code: int, std_out: str, std_err: str) -> None:
         if not self._runner.name:
             raise RuntimeError("Cannot add process, expected Run instance to have name")
 
-        if sys.platform == "win32" and completion_callback:
+        if sys.platform == "win32" and completion_trigger:
             logger.warning(
-                "Completion callback for 'add_process' may fail on Windows due to "
+                "Completion trigger for 'add_process' may fail on Windows "
                 "due to function pickling restrictions"
             )
 

simvue/executor.py

@@ -720,7 +720,7 @@ def callback_function(status_code: int, std_out: str, std_err: str) -> None:
         """
         if platform.system() == "Windows" and completion_trigger:
             raise RuntimeError(
-                "Use of 'completion_callback' on Windows based operating systems is unsupported "
+                "Use of 'completion_trigger' on Windows based operating systems is unsupported "
                 "due to function pickling restrictions for multiprocessing"
             )
 

simvue/run.py

@@ -17,9 +17,12 @@ def test_executor_add_process(
     request: pytest.FixtureRequest
 ) -> None:
     import logging
+    trigger = multiprocessing.Event()
+
+    def completion_callback(*_, trigger=trigger, **__):
+        trigger.set()
     logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
     run = simvue.Run()
-    completion_trigger = multiprocessing.Event()
     run.init(
         f"test_executor_{'success' if successful else 'fail'}",
         tags=["simvue_client_unit_tests", request.node.name.replace("[", "_").replace("]", "_")],
@@ -29,10 +32,10 @@ def test_executor_add_process(
         identifier=f"test_add_process_{'success' if successful else 'fail'}",
         c=f"exit {0 if successful else 1}",
         executable="bash" if sys.platform != "win32" else "powershell",
-        completion_trigger=completion_trigger
+        completion_callback=completion_callback
     )
 
-    while not completion_trigger.is_set():
+    while not trigger.is_set():
         time.sleep(1)
 
     if successful:
@@ -43,6 +46,7 @@ def test_executor_add_process(
 
 
 @pytest.mark.executor
+@pytest.mark.unix
 def test_executor_multiprocess(request: pytest.FixtureRequest) -> None:
     triggers: dict[int, multiprocessing.synchronize.Event] = {}
     callbacks: dict[int, typing.Callable] = {}
@@ -127,6 +131,7 @@ def test_add_process_command_assembly(request: pytest.FixtureRequest) -> None:
 def test_completion_callbacks_var_change(request: pytest.FixtureRequest) -> None:
     success: dict[str, bool] = {"complete": False}
     def completion_callback(*_, success: dict[str, bool]=success, **__):
+        print("YH BOI")
         success["complete"] = True
 
     with simvue.Run() as run:
@@ -142,9 +147,13 @@ def completion_callback(*_, success: dict[str, bool]=success, **__):
             completion_callback=completion_callback
         )
 
+    # Need a slight delay before checking
+    time.sleep(1)
+
     assert success["complete"]
 
 @pytest.mark.executor
+@pytest.mark.unix
 def test_completion_trigger_set(request: pytest.FixtureRequest) -> None:
     trigger = multiprocessing.Event()
 
@@ -161,6 +170,9 @@ def test_completion_trigger_set(request: pytest.FixtureRequest) -> None:
             completion_trigger=trigger
         )
 
+    # Need a slight delay before checking
+    time.sleep(1)
+
     assert trigger.is_set()
 
 @pytest.mark.executor
@@ -183,5 +195,8 @@ def completion_callback(*_, trigger=trigger, **__):
             completion_callback=completion_callback
         )
 
+    # Need a slight delay before checking
+    time.sleep(1)
+
     assert trigger.is_set()