labtasker 0.2.12__tar.gz → 0.2.13__tar.gz

{labtasker-0.2.12 → labtasker-0.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labtasker
-Version: 0.2.12
+Version: 0.2.13
 Summary: A task queue system for lab experiments
 Author-email: Your Name <your.email@example.com>
 License: Apache License 2.0
@@ -19,19 +19,19 @@ Requires-Python: <4.0,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pymongo<5.0.0,>=4.0.0
-Requires-Dist: fastapi<0.117.0,>=0.115.0
-Requires-Dist: uvicorn[standard]<0.36.0,>=0.15.0
+Requires-Dist: fastapi<0.133.0,>=0.115.0
+Requires-Dist: uvicorn[standard]<0.42.0,>=0.15.0
 Requires-Dist: click<9.0.0,>=8.2.0
 Requires-Dist: passlib<2.0.0,>=1.7.0
 Requires-Dist: pydantic-settings<3.0.0,>=2.8.0
 Requires-Dist: httpx[socks]<0.29.0,>=0.28.0
-Requires-Dist: typer<0.17.0,>=0.16.0
+Requires-Dist: typer<0.25.0,>=0.16.0
 Requires-Dist: loguru<0.8.0,>=0.7.0
-Requires-Dist: ruamel-yaml<0.19.0,>=0.18.10
+Requires-Dist: ruamel-yaml<0.20.0,>=0.18.10
 Requires-Dist: pyyaml<7.0.0,>=6.0.0
-Requires-Dist: tomlkit<0.14.0,>=0.13.2
+Requires-Dist: tomlkit<0.15.0,>=0.13.2
 Requires-Dist: importlib-metadata<9.0.0,>=8.5.0
-Requires-Dist: packaging<26.0,>=24.2
+Requires-Dist: packaging<27.0,>=24.2
 Requires-Dist: sse-starlette<4.0.0,>=2.1.3
 Requires-Dist: httpx-sse<0.5.0,>=0.4.0
 Requires-Dist: stamina<26.0.0,>=25.1.0
@@ -43,24 +43,24 @@ Requires-Dist: pexpect<5.0.0,>=4.9.0
 Requires-Dist: pip>=25
 Requires-Dist: dateparser<2.0.0,>=1.2.2
 Provides-Extra: dev
-Requires-Dist: pytest<9.0.0,>=8.0.0; extra == "dev"
-Requires-Dist: pytest-cov<7.0.0,>=5.0.0; extra == "dev"
-Requires-Dist: black<26.0.0,>=24.0.0; extra == "dev"
-Requires-Dist: isort<7.0.0,>=5.13.0; extra == "dev"
+Requires-Dist: pytest<10.0.0,>=8.0.0; extra == "dev"
+Requires-Dist: pytest-cov<8.0.0,>=5.0.0; extra == "dev"
+Requires-Dist: black<27.0.0,>=24.0.0; extra == "dev"
+Requires-Dist: isort<9.0.0,>=5.13.0; extra == "dev"
 Requires-Dist: mypy<2.0.0,>=1.14.0; extra == "dev"
 Requires-Dist: flake8<8.0.0,>=7.0.0; extra == "dev"
 Requires-Dist: pre-commit<5.0.0,>=3.0.0; extra == "dev"
 Requires-Dist: freezegun<2.0.0,>=1.5.0; extra == "dev"
 Requires-Dist: pytest-docker<4.0.0,>=3.0.0; extra == "dev"
-Requires-Dist: pytest-asyncio<1.2.0,>=0.24.0; extra == "dev"
+Requires-Dist: pytest-asyncio<1.4.0,>=0.24.0; extra == "dev"
 Requires-Dist: asgi-lifespan<3.0.0,>=2.1.0; extra == "dev"
-Requires-Dist: tox<4.29.0,>=4.24.0; extra == "dev"
+Requires-Dist: tox<4.46.0,>=4.24.0; extra == "dev"
 Requires-Dist: pytest-dependency<0.7.0,>=0.6.0; extra == "dev"
 Requires-Dist: pytest-sugar<2.0.0,>=1.0.0; extra == "dev"
 Requires-Dist: rust-just<2.0.0,>=1.42.4; extra == "dev"
 Provides-Extra: doc
-Requires-Dist: mkdocs-material<9.7.0,>=9.6.5; extra == "doc"
-Requires-Dist: mkdocs-glightbox<0.5.0,>=0.4.0; extra == "doc"
+Requires-Dist: mkdocs-material<9.8.0,>=9.6.5; extra == "doc"
+Requires-Dist: mkdocs-glightbox<0.6.0,>=0.4.0; extra == "doc"
 Requires-Dist: mike<2.2.0,>=2.1.3; extra == "doc"
 Provides-Extra: plugins
 Requires-Dist: labtasker-plugin-task-count; extra == "plugins"

{labtasker-0.2.12 → labtasker-0.2.13}/labtasker/__init__.py

@@ -1,4 +1,7 @@
-__version__ = "0.2.12"
+from importlib.metadata import version
+
+__application__ = "labtasker"
+__version__: str = version(__application__)
 
 from labtasker.client.client_api import *
 from labtasker.client.core.config import get_client_config

{labtasker-0.2.12 → labtasker-0.2.13}/labtasker/client/core/job_runner.py

@@ -341,7 +341,8 @@ def loop_run(
                             if success_flag:
                                 # Default finish. Can be overridden by the user if called somewhere deep in the wrapped func().
                                 finish(status="success")
-                            end_heartbeat()
+                            # finish() already calls end_heartbeat(), but use raise_error=False as safety net
+                            end_heartbeat(raise_error=False)
                 except _LabtaskerLoopExit:
                     # clean up the worker
                     if auto_create_worker:  # worker is managed automatically
@@ -391,6 +392,10 @@ def finish(
                 "You can either use @labtasker.loop() decorator or labtasker loop cli to run job."
             )
 
+    # Stop heartbeat before reporting status to avoid race condition
+    # where heartbeat thread tries to refresh a non-running task
+    end_heartbeat(raise_error=False)
+
     summary_file_path = get_labtasker_log_dir() / "summary.json"
     if summary_file_path.exists():
         # Skip if summary.json exists. Might be already called from subprocess.

{labtasker-0.2.12 → labtasker-0.2.13}/labtasker/client/core/paths.py

@@ -6,12 +6,13 @@ from pathlib import Path
 from labtasker.client.core.exceptions import LabtaskerRuntimeError
 from labtasker.utils import get_current_time
 
-_LABTASKER_ROOT = Path(os.environ.get("LABTASKER_ROOT", ".labtasker"))
+# Use absolute path to avoid issues when working directory changes
+_LABTASKER_ROOT = Path(os.environ.get("LABTASKER_ROOT", ".labtasker")).resolve()
 
 _labtasker_log_dir = contextvars.ContextVar(
     "labtasker_root",
     default=(
-        Path(os.environ["LABTASKER_LOG_DIR"])
+        Path(os.environ["LABTASKER_LOG_DIR"]).resolve()
         if "LABTASKER_LOG_DIR" in os.environ
         else None
     ),

{labtasker-0.2.12 → labtasker-0.2.13}/labtasker/filtering.py

@@ -4,13 +4,16 @@ from contextlib import contextmanager
 from types import TracebackType
 from typing import Optional, Set, Type
 
-from rich.traceback import Traceback
-from typer.main import console_stderr
-
 _registered_sensitive_texts: Set[str] = set()
 _hook_enabled = True
 
 
+def _get_rich_stderr_console():
+    from rich.console import Console
+
+    return Console(stderr=True)
+
+
 def register_sensitive_text(text: str):
     """Register a sensitive text to be filtered out of tracebacks"""
     _registered_sensitive_texts.add(text)
@@ -75,7 +78,7 @@ def install_traceback_filter():
         if sanitized_exc.__str__() != sanitize_text(
             sanitized_exc.__str__()
         ) or sanitized_exc.__repr__() != sanitize_text(sanitized_exc.__repr__()):
-            console_stderr.print(
+            _get_rich_stderr_console().print(
                 "[bold orange1]Warning:[/bold orange1] Traceback output has been suppressed due to an unexpected error in the traceback filtering hook. The traceback was intercepted and prevented from displaying. To view tracebacks, set `enable_traceback_filter` to `false` in your .labtasker/client.toml configuration file."
             )
             return
@@ -86,6 +89,8 @@ def install_traceback_filter():
         ]
 
         # Use rich traceback for pretty output
+        from rich.traceback import Traceback
+
         rich_tb = Traceback.from_exception(
             type(sanitized_exc),
             sanitized_exc,
@@ -94,7 +99,7 @@ def install_traceback_filter():
             suppress=suppress_internal_dir_names,
             width=80,  # Set a default width
         )
-        console_stderr.print(rich_tb)
+        _get_rich_stderr_console().print(rich_tb)
 
     # Install the custom excepthook
     sys.excepthook = filtered_excepthook

{labtasker-0.2.12 → labtasker-0.2.13}/labtasker/server/database.py

@@ -951,6 +951,10 @@ class DBService:
                     return_document=ReturnDocument.AFTER,
                 )
 
+                assert (
+                    updated_task is not None
+                ), f"Task {task_id} not found after update"
+
                 # if the FSM state is modified by user manually
                 if not reset_pending and updated_task["status"] != task["status"]:
                     event_handle = fsm.transition_to(updated_task["status"])
@@ -1022,6 +1026,8 @@ class DBService:
             return_document=ReturnDocument.AFTER,
         )
 
+        assert updated_worker is not None, f"Worker {worker_id} not found after update"
+
         # Update the event with entity data and publish
         event_handle.update_fsm_event(updated_worker)
 
@@ -1192,6 +1198,10 @@ class DBService:
                             session=session,
                         )
 
+                        assert (
+                            updated_task is not None
+                        ), f"Task {task['_id']} not found after update"
+
                         event_handle.update_fsm_event(updated_task)
                         fsm_event_handles.append(event_handle)
 

{labtasker-0.2.12 → labtasker-0.2.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "labtasker"
-version = "0.2.12"
+version = "0.2.13"
 description = "A task queue system for lab experiments"
 authors = [{ name = "Your Name", email = "your.email@example.com" }]
 license = { text = "Apache License 2.0" }
@@ -23,19 +23,19 @@ classifiers = [
 
 dependencies = [
     "pymongo (>=4.0.0,<5.0.0)",
-    "fastapi (>=0.115.0,<0.117.0)",
-    "uvicorn[standard] (>=0.15.0,<0.36.0)",
+    "fastapi (>=0.115.0,<0.133.0)",
+    "uvicorn[standard] (>=0.15.0,<0.42.0)",
     "click (>=8.2.0,<9.0.0)",
     "passlib (>=1.7.0,<2.0.0)",
     "pydantic-settings (>=2.8.0,<3.0.0)",
     "httpx[socks] (>=0.28.0,<0.29.0)",
-    "typer (>=0.16.0,<0.17.0)",
+    "typer (>=0.16.0,<0.25.0)",
     "loguru (>=0.7.0,<0.8.0)",
-    "ruamel-yaml (>=0.18.10,<0.19.0)",
+    "ruamel-yaml (>=0.18.10,<0.20.0)",
     "pyyaml (>=6.0.0,<7.0.0)",
-    "tomlkit (>=0.13.2,<0.14.0)",
+    "tomlkit (>=0.13.2,<0.15.0)",
     "importlib-metadata (>=8.5.0,<9.0.0)",
-    "packaging (>=24.2,<26.0)",
+    "packaging (>=24.2,<27.0)",
     "sse-starlette (>=2.1.3,<4.0.0)",
     "httpx-sse (>=0.4.0,<0.5.0)",
     "stamina (>=25.1.0,<26.0.0)",
@@ -50,25 +50,25 @@ dependencies = [
 
 [project.optional-dependencies]
 dev = [
-    "pytest (>=8.0.0,<9.0.0)",
-    "pytest-cov (>=5.0.0,<7.0.0)",
-    "black (>=24.0.0,<26.0.0)",
-    "isort (>=5.13.0,<7.0.0)",
+    "pytest (>=8.0.0,<10.0.0)",
+    "pytest-cov (>=5.0.0,<8.0.0)",
+    "black (>=24.0.0,<27.0.0)",
+    "isort (>=5.13.0,<9.0.0)",
     "mypy (>=1.14.0,<2.0.0)",
     "flake8 (>=7.0.0,<8.0.0)",
     "pre-commit (>=3.0.0,<5.0.0)",
     "freezegun (>=1.5.0,<2.0.0)",
     "pytest-docker (>=3.0.0,<4.0.0)",
-    "pytest-asyncio (>=0.24.0,<1.2.0)",
+    "pytest-asyncio (>=0.24.0,<1.4.0)",
     "asgi-lifespan (>=2.1.0,<3.0.0)",
-    "tox (>=4.24.0,<4.29.0)",
+    "tox (>=4.24.0,<4.46.0)",
     "pytest-dependency (>=0.6.0,<0.7.0)",
     "pytest-sugar (>=1.0.0,<2.0.0)",
     "rust-just (>=1.42.4,<2.0.0)",
 ]
 doc = [
-    "mkdocs-material (>=9.6.5,<9.7.0)",
-    "mkdocs-glightbox (>=0.4.0,<0.5.0)",
+    "mkdocs-material (>=9.6.5,<9.8.0)",
+    "mkdocs-glightbox (>=0.4.0,<0.6.0)",
     "mike (>=2.1.3,<2.2.0)",
 ]