asyncz 0.13.0__tar.gz → 0.13.2__tar.gz

{asyncz-0.13.0 → asyncz-0.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: asyncz
-Version: 0.13.0
+Version: 0.13.2
 Summary: The scheduler that nobody wants but every application needs.
 Project-URL: Homepage, https://github.com/dymmond/asyncz
 Project-URL: Documentation, https://asyncz.dymmond.com/
@@ -27,6 +27,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Internet
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: HTTP Servers
@@ -43,7 +44,7 @@ Requires-Dist: tzlocal; extra == 'localtime'
 Provides-Extra: loguru
 Requires-Dist: loguru<0.8.0,>=0.7.0; extra == 'loguru'
 Provides-Extra: testing
-Requires-Dist: esmerald; extra == 'testing'
+Requires-Dist: esmerald>=3.7.5; extra == 'testing'
 Requires-Dist: httpx; extra == 'testing'
 Requires-Dist: lilya; extra == 'testing'
 Requires-Dist: loguru<0.8.0,>=0.7.0; extra == 'testing'
@@ -71,8 +72,8 @@ Description-Content-Type: text/markdown
 </p>
 
 <p align="center">
-<a href="https://github.com/dymmond/asyncz/workflows/Test%20Suite/badge.svg?event=push&branch=main" target="_blank">
-    <img src="https://github.com/dymmond/asyncz/workflows/Test%20Suite/badge.svg?event=push&branch=main" alt="Test Suite">
+<a href="https://github.com/dymmond/asyncz/actions/workflows/test-suite.yml/badge.svg?event=push&branch=main" target="_blank">
+    <img src="https://github.com/dymmond/asyncz/actions/workflows/test-suite.yml/badge.svg?event=push&branch=main" alt="Test Suite">
 </a>
 
 <a href="https://pypi.org/project/asyncz" target="_blank">

{asyncz-0.13.0 → asyncz-0.13.2}/README.md

@@ -9,8 +9,8 @@
 </p>
 
 <p align="center">
-<a href="https://github.com/dymmond/asyncz/workflows/Test%20Suite/badge.svg?event=push&branch=main" target="_blank">
-    <img src="https://github.com/dymmond/asyncz/workflows/Test%20Suite/badge.svg?event=push&branch=main" alt="Test Suite">
+<a href="https://github.com/dymmond/asyncz/actions/workflows/test-suite.yml/badge.svg?event=push&branch=main" target="_blank">
+    <img src="https://github.com/dymmond/asyncz/actions/workflows/test-suite.yml/badge.svg?event=push&branch=main" alt="Test Suite">
 </a>
 
 <a href="https://pypi.org/project/asyncz" target="_blank">

asyncz-0.13.2/asyncz/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.13.2"

{asyncz-0.13.0 → asyncz-0.13.2}/asyncz/file_locking.py

@@ -17,7 +17,11 @@ Example Usage::
     ...     f.write('Edgy')
 """
 
+from __future__ import annotations
+
 import os
+from collections.abc import Generator
+from contextlib import contextmanager
 from typing import IO, Any
 
 __all__ = ("LOCK_EX", "LOCK_SH", "LOCK_NB", "lock", "unlock")
@@ -114,3 +118,10 @@ else:
         def unlock(f: IO) -> bool:
             fcntl.flock(_fd(f), fcntl.LOCK_UN)
             return True
+
+
+@contextmanager
+def with_lock(f: IO, flags: int) -> Generator[IO, None, None]:
+    lock(f, flags)
+    yield f
+    unlock(f)

{asyncz-0.13.0 → asyncz-0.13.2}/asyncz/schedulers/base.py

@@ -1138,7 +1138,7 @@ class BaseScheduler(SchedulerType):
                 due_tasks: list[TaskType] = store.get_due_tasks(now)
             except Exception as e:
                 self.loggers[self.logger_name].warning(
-                    f"Error getting due tasks from the store {store_alias}: {e}."
+                    f'Error getting due tasks from the store "{store_alias}": {e}.'
                 )
                 retry_wakeup_time = now + timedelta(seconds=self.store_retry_interval)
                 if not next_wakeup_time or next_wakeup_time > retry_wakeup_time:

{asyncz-0.13.0 → asyncz-0.13.2}/asyncz/schedulers/defaults.py

@@ -19,6 +19,7 @@ executors: dict[str, str] = {
 
 stores: dict[str, str] = {
     "memory": "asyncz.stores.memory:MemoryStore",
+    "file": "asyncz.stores.file:FileStore",
     "mongodb": "asyncz.stores.mongo:MongoDBStore",
     "redis": "asyncz.stores.redis:RedisStore",
     "sqlalchemy": "asyncz.stores.sqlalchemy:SQLAlchemyStore",

asyncz-0.13.2/asyncz/stores/file.py

@@ -0,0 +1,178 @@
+from __future__ import annotations
+
+import glob
+import os
+import pickle
+import shutil
+from contextlib import suppress
+from datetime import datetime
+from pathlib import Path
+from typing import TYPE_CHECKING, Any, Optional, Union, cast
+
+from asyncz.exceptions import ConflictIdError, TaskLookupError
+from asyncz.file_locking import LOCK_EX, LOCK_SH, with_lock
+from asyncz.stores.base import BaseStore
+from asyncz.tasks import Task
+from asyncz.tasks.types import TaskType
+
+if TYPE_CHECKING:
+    from asyncz.schedulers.types import SchedulerType
+
+
+class FileStore(BaseStore):
+    """
+    Stores tasks via sqlalchemy in a database.
+
+    Args:
+        directory - The directory to store the tasks. String or Path.
+        suffix - The task suffix.
+        pickle_protocol - Pickle protocol level to use (for serialization), defaults to the
+            highest available.
+    """
+
+    forbidden_characters: set[str] = {"/", "\\", "\0", ":"}
+
+    def __init__(
+        self,
+        directory: Union[str, os.PathLike],
+        suffix: str = ".task",
+        mode: int = 0o700,
+        cleanup_directory: bool = False,
+        pickle_protocol: Optional[int] = pickle.HIGHEST_PROTOCOL,
+        **kwargs: Any,
+    ) -> None:
+        super().__init__(**kwargs)
+        self.pickle_protocol = pickle_protocol
+        self.directory = Path(directory)
+        self.mode = mode
+        self.cleanup_directory = cleanup_directory
+        self.suffix = suffix
+
+    def check_task_id(self, task_id: str | None) -> None:
+        if task_id is None:
+            raise RuntimeError("Task id is None")
+        if task_id.startswith("."):
+            raise RuntimeError(f'Invalid character in task id: "{task_id}".')
+        for char in task_id:
+            if char in self.forbidden_characters:
+                raise RuntimeError(f'Invalid character in task id: "{task_id}".')
+
+    def start(self, scheduler: Any, alias: str) -> None:
+        """
+        When starting omits from the index any documents that lack next_run_time field.
+        """
+        super().start(scheduler, alias)
+        self.directory.mkdir(self.mode, parents=True, exist_ok=True)
+        if not self.directory.is_dir():
+            raise RuntimeError("Not a directory.")
+
+    def shutdown(self) -> None:
+        if self.cleanup_directory:
+            shutil.rmtree(self.directory, ignore_errors=True)
+        super().shutdown()
+
+    def lookup_task(self, task_id: str) -> Optional[TaskType]:
+        self.check_task_id(task_id)
+        task_path = self.directory / f"{task_id}{self.suffix}"
+        try:
+            with open(task_path, "rb") as read_ob, with_lock(read_ob, LOCK_SH):
+                task = self.rebuild_task(read_ob.read())
+        except Exception:
+            task_path.unlink(missing_ok=True)
+            task = None
+        return task
+
+    def rebuild_task(self, state: Any) -> TaskType:
+        state = pickle.loads(self.conditional_decrypt(state))
+        task = Task.__new__(Task)
+        task.__setstate__(state)
+        task.scheduler = cast("SchedulerType", self.scheduler)
+        task.store_alias = self.alias
+        return task
+
+    def get_due_tasks(self, now: datetime) -> list[TaskType]:
+        return [
+            task
+            for task in self.get_all_tasks()
+            if task.next_run_time is not None and task.next_run_time <= now
+        ]
+
+    def get_tasks(self) -> list[TaskType]:
+        tasks: list[tuple[TaskType, os.stat_result]] = []
+        with os.scandir(self.directory) as scanner:
+            for entry in scanner:
+                if not entry.name.endswith(self.suffix) or not entry.is_file():
+                    continue
+                try:
+                    with open(entry.path, "rb") as read_ob, with_lock(read_ob, LOCK_SH):
+                        task = self.rebuild_task(read_ob.read())
+                    tasks.append((task, entry.stat()))
+                except Exception:
+                    with suppress(FileNotFoundError):
+                        os.unlink(entry.path)
+            return [
+                task
+                for task, _ in sorted(
+                    tasks,
+                    key=lambda task_stat: (
+                        int(task_stat[0].next_run_time is None),
+                        task_stat[0].next_run_time,
+                        # sort for task creation not update
+                        task_stat[1].st_ctime,
+                    ),
+                )
+            ]
+
+    def get_next_run_time(self) -> Optional[datetime]:
+        next_run_time: datetime | None = None
+        for task in self.get_all_tasks():
+            if task.next_run_time is None:
+                break
+            if next_run_time is None or next_run_time >= task.next_run_time:
+                next_run_time = task.next_run_time
+        return next_run_time
+
+    def get_all_tasks(self) -> list[TaskType]:
+        return self.get_tasks()
+
+    def add_task(self, task: TaskType) -> None:
+        self.check_task_id(task.id)
+        task_path = self.directory / f"{task.id}{self.suffix}"
+        try:
+            with task_path.open("xb") as write_ob, with_lock(write_ob, LOCK_EX):
+                write_ob.write(
+                    self.conditional_encrypt(
+                        pickle.dumps(task.__getstate__(), self.pickle_protocol)
+                    )
+                )
+        except FileExistsError:
+            raise ConflictIdError(task.id) from None
+
+    def update_task(self, task: TaskType) -> None:
+        self.check_task_id(task.id)
+        task_path = self.directory / f"{task.id}{self.suffix}"
+        try:
+            with task_path.open("r+b") as write_ob, with_lock(write_ob, LOCK_EX):
+                write_ob.truncate()
+                write_ob.write(
+                    self.conditional_encrypt(
+                        pickle.dumps(task.__getstate__(), self.pickle_protocol)
+                    )
+                )
+        except FileNotFoundError:
+            raise TaskLookupError(task.id) from None
+
+    def delete_task(self, task_id: str) -> None:
+        self.check_task_id(task_id)
+        task_path = self.directory / f"{task_id}{self.suffix}"
+        try:
+            task_path.unlink(missing_ok=False)
+        except FileNotFoundError:
+            raise TaskLookupError(task_id) from None
+
+    def remove_all_tasks(self) -> None:
+        for task_path in self.directory.glob(f"*{glob.escape(self.suffix)}"):
+            task_path.unlink(missing_ok=True)
+
+    def __repr__(self) -> str:
+        return f"<{self.__class__.__name__} (directory={self.directory})>"

{asyncz-0.13.0 → asyncz-0.13.2}/asyncz/stores/sqlalchemy.py

@@ -41,7 +41,7 @@ class SQLAlchemyStore(BaseStore):
         super().__init__(**kwargs)
         self.pickle_protocol = pickle_protocol
         if isinstance(database, str):
-            database = sqlalchemy.create_engine(database)
+            database = sqlalchemy.create_engine(database, **kwargs)
         if not database:
             raise ValueError("database must not be empty or None")
         self.engine: sqlalchemy.Engine = database
@@ -63,6 +63,10 @@ class SQLAlchemyStore(BaseStore):
         super().start(scheduler, alias)
         self.metadata.create_all(self.engine)
 
+    def shutdown(self) -> None:
+        self.engine.dispose()
+        super().shutdown()
+
     def lookup_task(self, task_id: str) -> Optional[TaskType]:
         tasks = self.get_tasks(self.table.c.id == task_id, limit=1)
         return tasks[0] if tasks else None
@@ -82,7 +86,7 @@ class SQLAlchemyStore(BaseStore):
     def get_tasks(self, conditions: Any = None, limit: int = 0) -> list[TaskType]:
         tasks: list[TaskType] = []
         failed_task_ids = []
-        stmt = self.table.select().order_by(self.table.c.next_run_time.asc())
+        stmt = self.table.select().order_by(self.table.c.next_run_time.asc().nullslast())
         if conditions is not None:
             stmt = stmt.where(conditions)
 
@@ -119,9 +123,7 @@ class SQLAlchemyStore(BaseStore):
             return utc_timestamp_to_datetime(row.next_run_time) if row else None
 
     def get_all_tasks(self) -> list[TaskType]:
-        tasks = self.get_tasks()
-        self.fix_paused_tasks(tasks)
-        return tasks
+        return self.get_tasks()
 
     def add_task(self, task: TaskType) -> None:
         data = {
@@ -168,9 +170,5 @@ class SQLAlchemyStore(BaseStore):
         with self.engine.begin() as conn:
             conn.execute(self.table.delete())
 
-    def shutdown(self) -> None:
-        self.engine.dispose()
-        super().shutdown()
-
     def __repr__(self) -> str:
         return f"<{self.__class__.__name__} (database={self.engine.url})>"

{asyncz-0.13.0 → asyncz-0.13.2}/pyproject.toml

@@ -34,6 +34,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
     "Topic :: Internet :: WWW/HTTP",
 ]
@@ -76,7 +77,7 @@ testing = [
     "pytest-loguru>=0.2.0,<1",
     "redis>=4.4.0,<6.0.0",
     "mypy>=0.982,<2.0.0",
-    "esmerald",
+    "esmerald>=3.7.5",
     "starlette",
     "lilya",
     "sqlalchemy",

asyncz-0.13.0/asyncz/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.13.0"