asyncz 0.4.0__tar.gz → 0.6.0__tar.gz

{asyncz-0.4.0 → asyncz-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: asyncz
-Version: 0.4.0
+Version: 0.6.0
 Summary: The scheduler that nobody wants but every application needs.
 Project-URL: Homepage, https://github.com/tarsil/asyncz
 Project-URL: Documentation, https://asyncz.tarsild.io/
@@ -27,6 +27,7 @@ Classifier: Programming Language :: Python :: 3.8
 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: Topic :: Internet
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: HTTP Servers
@@ -38,7 +39,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.8
 Requires-Dist: asyncio<4.0.0,>=3.4.3
 Requires-Dist: loguru<0.8.0,>=0.7.0
-Requires-Dist: pydantic<3.0.0,>=2.0.0
+Requires-Dist: pydantic<3.0.0,>=2.5.3
 Requires-Dist: pytz>=2022.6
 Requires-Dist: tzlocal<5.0,>=4.2
 Provides-Extra: all
@@ -47,12 +48,14 @@ Requires-Dist: pytz>=2022.6; extra == 'all'
 Requires-Dist: tzlocal<5.0,>=4.2; extra == 'all'
 Provides-Extra: dev
 Requires-Dist: autoflake<3.0.0,>=1.4.0; extra == 'dev'
-Requires-Dist: black<23.0.0,>=22.10.0; extra == 'dev'
-Requires-Dist: flake8<7.0.0,>=3.8.3; extra == 'dev'
+Requires-Dist: black==24.4.2; extra == 'dev'
+Requires-Dist: flake8<8.0.0,>=3.8.3; extra == 'dev'
+Requires-Dist: ipdb>=0.13.13; extra == 'dev'
 Requires-Dist: isort<6.0.0,>=5.0.6; extra == 'dev'
 Requires-Dist: mypy<2.0.0,>=0.982; extra == 'dev'
+Requires-Dist: pdbpp; extra == 'dev'
 Requires-Dist: pre-commit<3.0.0,>=2.17.0; extra == 'dev'
-Requires-Dist: watchfiles<0.20.0,>=0.16.1; extra == 'dev'
+Requires-Dist: watchfiles<0.22.0,>=0.16.1; extra == 'dev'
 Provides-Extra: doc
 Requires-Dist: mdx-include<2.0.0,>=1.4.2; extra == 'doc'
 Requires-Dist: mkautodoc<0.3.0,>=0.2.0; extra == 'doc'
@@ -65,10 +68,10 @@ Provides-Extra: test
 Requires-Dist: mock>=4.0.3; extra == 'test'
 Requires-Dist: pymongo<5.0.0,>=4.3.3; extra == 'test'
 Requires-Dist: pytest-asyncio<1.0.0,>=0.19.0; extra == 'test'
-Requires-Dist: pytest-cov<5.0.0,>=2.12.0; extra == 'test'
+Requires-Dist: pytest-cov<6.0.0,>=2.12.0; extra == 'test'
 Requires-Dist: pytest-loguru<1,>=0.2.0; extra == 'test'
-Requires-Dist: pytest<8.0.0,>=7.1.3; extra == 'test'
-Requires-Dist: redis<5.0.0,>=4.4.0; extra == 'test'
+Requires-Dist: pytest<9.0.0,>=7.1.3; extra == 'test'
+Requires-Dist: redis<6.0.0,>=4.4.0; extra == 'test'
 Requires-Dist: requests<3.0.0,>=2.27.0; extra == 'test'
 Requires-Dist: ruff<1.0.0,>=0.0.256; extra == 'test'
 Description-Content-Type: text/markdown

asyncz-0.6.0/asyncz/__init__.py

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

{asyncz-0.4.0 → asyncz-0.6.0}/asyncz/contrib/esmerald/decorator.py

@@ -14,7 +14,7 @@ class scheduler(Task):
         id: Optional[str] = None,
         mistrigger_grace_time: Optional[int] = None,
         coalesce: Optional[bool] = None,
-        max_intances: Optional[int] = None,
+        max_instances: Optional[int] = None,
         next_run_time: Optional[datetime] = None,
         store: Optional[str] = "default",
         executor: Optional[str] = "default",
@@ -29,7 +29,7 @@ class scheduler(Task):
             id=id,
             mistrigger_grace_time=mistrigger_grace_time,
             coalesce=coalesce,
-            max_intances=max_intances,
+            max_instances=max_instances,
             next_run_time=next_run_time,
             store=store,
             executor=executor,

{asyncz-0.4.0 → asyncz-0.6.0}/asyncz/contrib/esmerald/scheduler.py

@@ -145,7 +145,7 @@ class Task:
         id: Optional[str] = None,
         mistrigger_grace_time: Optional[int] = None,
         coalesce: Optional[bool] = None,
-        max_intances: Optional[int] = None,
+        max_instances: Optional[int] = None,
         next_run_time: Optional[datetime] = None,
         store: Optional[str] = "default",
         executor: Optional[str] = "default",
@@ -163,7 +163,7 @@ class Task:
             mistrigger_grace_time: Seconds after the designated runtime that the task is still allowed to be run (or None to allow the task to run no
                 matter  how late it is).
             coalesce: Run once instead of many times if the scheduler determines that the task should be run more than once in succession.
-            max_intances: Maximum number of concurrently running instances allowed for this task.
+            max_instances: Maximum number of concurrently running instances allowed for this task.
             next_run_time: When to first run the task, regardless of the trigger (pass None to add the task as paused).
             store: Alias of the task store to store the task in.
             executor: Alias of the executor to run the task with.
@@ -178,7 +178,7 @@ class Task:
         self.id = id
         self.mistrigger_grace_time = mistrigger_grace_time or undefined
         self.coalesce = coalesce or undefined
-        self.max_intances = max_intances or undefined
+        self.max_instances = max_instances or undefined
         self.next_run_time = next_run_time or undefined
         self.store = store
         self.executor = executor
@@ -199,7 +199,7 @@ class Task:
                 name=self.name,
                 mistrigger_grace_time=self.mistrigger_grace_time,
                 coalesce=self.coalesce,
-                max_instances=self.max_intances,
+                max_instances=self.max_instances,
                 next_run_time=self.next_run_time,
                 store=self.store,
                 executor=self.executor,

{asyncz-0.4.0 → asyncz-0.6.0}/asyncz/executors/base.py

@@ -61,7 +61,6 @@ class BaseExecutor(BaseStateExtra, ABC):
             run_times: A list of datetimes specifying when the task should have been run.
         """
         assert self.lock is not None, "This executor has not been started yet."
-
         with self.lock:
             if self.instances[task.id] >= task.max_instances:
                 raise MaximumInstancesError(task.id, task.max_instances)

{asyncz-0.4.0 → asyncz-0.6.0}/asyncz/schedulers/base.py

@@ -263,7 +263,6 @@ class BaseScheduler(BaseStateExtra, ABC):
                 raise TypeError(
                     f"Expected an executor instance or a string, got {executor.__class__.__name__} instead."
                 )
-
             if self.state != SchedulerState.STATE_STOPPED:
                 executor.start(self, alias)
 

{asyncz-0.4.0 → asyncz-0.6.0}/asyncz/state.py

@@ -14,12 +14,15 @@ class BaseState(BaseModel):
         """
         Retrives the data pickled and sets the state for Pydantic compatible fashion.
         """
+        state.model_config.update(self.model_config)
         object_setattr(self, "__dict__", state.__dict__)
         object_setattr(self, "__pydantic_fields_set__", state.__pydantic_fields_set__)
+        object_setattr(self, "__pydantic_extra__", state.__pydantic_extra__)
         for name, value in state.__private_attributes__.items():
             if callable(value) or inspect.iscoroutinefunction(value):
                 value = value.__name__
             object_setattr(self, name, value)
+
         return self
 
 

{asyncz-0.4.0 → asyncz-0.6.0}/asyncz/stores/mongo.py

@@ -64,7 +64,7 @@ class MongoDBStore(BaseStore):
 
     def rebuild_task(self, state: Any) -> "TaskType":
         state = pickle.loads(state)
-        task = Task.__new__(TaskType)
+        task = Task.__new__(Task)
         task.__setstate__(state)
         task.scheduler = self.scheduler
         task.store_alias = self.alias

{asyncz-0.4.0 → asyncz-0.6.0}/asyncz/tasks/base.py

@@ -54,6 +54,8 @@ class Task(BaseStateExtra):
     args: Optional[Any] = None
     kwargs: Optional[Any] = None
     next_run_time: Optional[datetime] = None
+    scheduler: Any = None
+    store_alias: Optional[str] = None
 
     def __init__(
         self,
@@ -220,6 +222,8 @@ class Task(BaseStateExtra):
     def __setstate__(self, state):
         object_setattr(self, "__dict__", state.__dict__)
         object_setattr(self, "__pydantic_fields_set__", state.__pydantic_fields_set__)
+        object_setattr(self, "__pydantic_extra__", state.__pydantic_extra__)
+        state.model_config.update(self.model_config)
 
         for name, value in self.__dict__.items():
             if name == "fn":

{asyncz-0.4.0 → asyncz-0.6.0}/asyncz/triggers/base.py

@@ -56,6 +56,8 @@ class BaseCombinationTrigger(BaseTrigger):
         jitter: he maximum number of second to add to the next_trigger_time.
     """
 
+    triggers: Any = []
+
     def __init__(
         self,
         triggers: List["TriggerType"],

{asyncz-0.4.0 → asyncz-0.6.0}/asyncz/triggers/cron/fields.py

@@ -33,7 +33,7 @@ class BaseField(BaseModel):
         exprs: Any,
         is_default: Optional[bool] = False,
         compilers: Optional[List[Any]] = None,
-        **kwargs: Any
+        **kwargs: Any,
     ):
         super().__init__(**kwargs)
         self.name = name

{asyncz-0.4.0 → asyncz-0.6.0}/asyncz/triggers/interval.py

@@ -94,10 +94,6 @@ class IntervalTrigger(BaseTrigger):
         )
         return state
 
-    def __setstate__(self, state: Any) -> None:
-        trigger = super().__setstate__(state)
-        trigger.interval_size = timedelta_seconds(self.interval)
-
     def __str__(self) -> str:
         return f"interval[{self.interval}]"
 

{asyncz-0.4.0 → asyncz-0.6.0}/pyproject.toml

@@ -34,13 +34,14 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
     "Topic :: Internet :: WWW/HTTP",
 ]
 dependencies = [
     "asyncio>=3.4.3,<4.0.0",
     "loguru>=0.7.0,<0.8.0",
-    "pydantic>=2.0.0,<3.0.0",
+    "pydantic>=2.5.3,<3.0.0",
     "pytz>=2022.6",
     "tzlocal>=4.2,<5.0",
 ]
@@ -76,23 +77,25 @@ test = [
     # "esmerald==0.4.2",
     "mock>=4.0.3",
     "pymongo>=4.3.3,<5.0.0",
-    "pytest >=7.1.3,<8.0.0",
-    "pytest-cov >=2.12.0,<5.0.0",
+    "pytest>=7.1.3,<9.0.0",
+    "pytest-cov >=2.12.0,<6.0.0",
     "pytest-asyncio >=0.19.0,<1.0.0",
     "pytest-loguru>=0.2.0,<1",
-    "redis>=4.4.0,<5.0.0",
+    "redis>=4.4.0,<6.0.0",
     "requests >=2.27.0,<3.0.0",
     "ruff>=0.0.256,<1.0.0",
 ]
 
 dev = [
-    "autoflake >=1.4.0,<3.0.0",
-    "black>=22.10.0,<23.0.0",
-    "flake8>=3.8.3,<7.0.0",
+    "autoflake>=1.4.0,<3.0.0",
+    "black==24.4.2",
+    "flake8>=3.8.3,<8.0.0",
+    "ipdb>=0.13.13",
+    "pdbpp",
     "isort>=5.0.6,<6.0.0",
     "mypy>=0.982,<2.0.0",
     "pre-commit>=2.17.0,<3.0.0",
-    "watchfiles>=0.16.1,<0.20.0",
+    "watchfiles>=0.16.1,<0.22.0",
 ]
 
 doc = [
@@ -128,19 +131,9 @@ disable_error_code = "attr-defined"
 warn_unused_ignores = true
 warn_redundant_casts = true
 
-[tool.ruff]
-select = [
-    "E", # pycodestyle errors
-    "W", # pycodestyle warnings
-    "F", # pyflakes
-    "C", # flake8-comprehensions
-    "B", # flake8-bugbear
-]
-ignore = [
-    "E501", # line too long, handled by black
-    "B008", # do not perform function calls in argument defaults
-    "C901", # too complex
-]
+[tool.ruff.lint]
+select = ["E", "W", "F", "C", "B", "I"]
+ignore = ["E501", "B008", "C901", "B026"]
 
 exclude = ["docs_src/*"]
 

asyncz-0.4.0/asyncz/__init__.py

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