patera-taskmanager 0.2.0__tar.gz → 0.2.2__tar.gz

{patera_taskmanager-0.2.0 → patera_taskmanager-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: patera-taskmanager
-Version: 0.2.0
+Version: 0.2.2
 Requires-Dist: apscheduler>=3.11.2
 Requires-Dist: patera
-Requires-Python: >=3.12
+Requires-Python: >=3.13

{patera_taskmanager-0.2.0 → patera_taskmanager-0.2.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "patera-taskmanager"
-version = "0.2.0"
-requires-python = ">=3.12"
+version = "0.2.2"
+requires-python = ">=3.13"
 dependencies = [
   "apscheduler>=3.11.2",
   "patera",

{patera_taskmanager-0.2.0 → patera_taskmanager-0.2.2}/src/patera/taskmanager/task_manager.py

@@ -4,14 +4,14 @@ Task manager class
 
 from typing import (
     Callable,
+    Generic,
     Tuple,
     Optional,
     Type,
+    TypeVar,
     cast,
     TYPE_CHECKING,
     Any,
-    TypedDict,
-    NotRequired,
 )
 from functools import wraps
 
@@ -31,7 +31,7 @@ if TYPE_CHECKING:
     from patera import Patera
 
 
-class _TaskManagerConfigs(BaseModel):
+class TaskManagerConfig(BaseModel):
     """Configuration model for TaskManager extension."""
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
@@ -62,26 +62,17 @@ class _TaskManagerConfigs(BaseModel):
     )
 
 
-class TaskManagerConfig(TypedDict):
-    """TypedDict for TaskManager configuration."""
+AppT = TypeVar("AppT", bound="Patera", default="Patera")
 
-    NICE_NAME: NotRequired[str]
-    SCHEDULER: NotRequired[Type[BaseScheduler]]
-    JOB_STORES: NotRequired[dict[str, BaseJobStore]]
-    EXECUTORS: NotRequired[dict[str, BaseExecutor]]
-    JOB_DEFAULTS: NotRequired[dict[str, bool | int]]
-    DAEMON: NotRequired[bool]
 
-
-class TaskManager(BaseExtension):
+class TaskManager(BaseExtension[AppT], Generic[AppT]):
     """
     Task manager class for scheduling and managing backgroudn tasks.
     """
 
-    def __init__(self, configs_name: str = "TASK_MANAGER") -> None:
-        self._configs_name: str = cast(str, configs_name)
+    def __init__(self) -> None:
         self._configs: dict[str, Any] = {}
-        self._app: "Patera"
+        self._app: AppT = cast(AppT, None)
         self._job_stores: dict
         self._executors: dict
         self._job_defaults: dict
@@ -90,14 +81,14 @@ class TaskManager(BaseExtension):
         self._initial_jobs_methods_list: list[Tuple] = []
         self._active_jobs: dict[str, Job] = {}
 
-    def init_app(self, app: "Patera"):
+    def init_app(self, app: AppT):
         """
         Initlizer for TaskManager with Patera app
         """
         self._app = app  # type: ignore
-        self._configs = app.get_conf(self._configs_name, {})
+        self._configs = self.load_configs() or {}
 
-        self._configs = self.validate_configs(self._configs, _TaskManagerConfigs)
+        self._configs = self.validate_configs(self._configs, TaskManagerConfig)
         self._job_stores = self._configs["JOB_STORES"]
         self._executors = self._configs["EXECUTORS"]
         self._job_defaults = self._configs["JOB_DEFAULTS"]
@@ -110,7 +101,7 @@ class TaskManager(BaseExtension):
             job_defaults=self._job_defaults,
             daemon=self._daemon,
         )  # type: ignore
-        self._app.add_extension(self)
+        # self._app.add_extension(self)
         self._get_defined_jobs()
         self._app.add_on_startup_method(self._start_scheduler)
         self._app.add_on_shutdown_method(self._stop_scheduler)
@@ -190,7 +181,7 @@ class TaskManager(BaseExtension):
         :param job: job id (str) or the Job instance returned by the scheduler.add_job method
         """
         if isinstance(job, Job):
-            job = job.id
+            job = job.id  # type: ignore
         return self._remove_job(cast(str, job), job_store)
 
     def pause_job(self, job: str | Job):
@@ -198,7 +189,7 @@ class TaskManager(BaseExtension):
         Pauses the job
         """
         if isinstance(job, Job):
-            return job.pause()
+            return job.pause()  # type: ignore
         active_job: Optional[Job] = self._active_jobs.get(job, None)
         if job is None:
             raise JobLookupError(job)
@@ -210,7 +201,7 @@ class TaskManager(BaseExtension):
         :param paused_job: id or Job instance
         """
         if isinstance(job, Job):
-            return job.resume()
+            return job.resume()  # type: ignore
         paused_job: Optional[Job] = self._active_jobs.get(job, None)
         if paused_job is None:
             raise JobLookupError(paused_job)
@@ -245,13 +236,6 @@ class TaskManager(BaseExtension):
         """Nice name of the instance"""
         return self._configs["NICE_NAME"]
 
-    @property
-    def app(self) -> "Patera":
-        """
-        Application instance
-        """
-        return cast("Patera", self._app)
-
 
 def schedule_job(*args, **kwargs):
     """