quebec 0.2.1__tar.gz → 0.2.3__tar.gz

{quebec-0.2.1 → quebec-0.2.3}/.gitignore

@@ -1,6 +1,5 @@
 # Rust
 /target/
-Cargo.lock
 **/*.rs.bk
 *.pdb
 

{quebec-0.2.1 → quebec-0.2.3}/Cargo.lock

@@ -124,7 +124,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -135,7 +135,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -310,7 +310,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -468,7 +468,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -630,7 +630,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.111",
+ "syn 2.0.112",
  "unicode-xid",
 ]
 
@@ -660,7 +660,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -836,7 +836,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -911,8 +911,8 @@ dependencies = [
  "aho-corasick",
  "bstr",
  "log",
- "regex-automata",
- "regex-syntax",
+ "regex-automata 0.4.13",
+ "regex-syntax 0.8.8",
 ]
 
 [[package]]
@@ -1265,7 +1265,7 @@ dependencies = [
  "globset",
  "log",
  "memchr",
- "regex-automata",
+ "regex-automata 0.4.13",
  "same-file",
  "walkdir",
  "winapi-util",
@@ -1298,7 +1298,7 @@ checksum = "c727f80bfa4a6c6e2508d2f05b6f4bfce242030bd88ed15ae5331c5b5d30fba7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -1389,11 +1389,11 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
 [[package]]
 name = "matchers"
-version = "0.2.0"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
 dependencies = [
- "regex-automata",
+ "regex-automata 0.1.10",
 ]
 
 [[package]]
@@ -1465,11 +1465,12 @@ dependencies = [
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.50.3"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
 dependencies = [
- "windows-sys 0.61.2",
+ "overload",
+ "winapi",
 ]
 
 [[package]]
@@ -1521,7 +1522,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -1596,9 +1597,15 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
 [[package]]
 name = "parking"
 version = "2.2.1"
@@ -1682,7 +1689,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -1905,7 +1912,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -1925,7 +1932,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
  "version_check",
  "yansi",
 ]
@@ -2013,7 +2020,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -2026,7 +2033,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-build-config",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -2067,6 +2074,7 @@ dependencies = [
  "tower-http",
  "tracing",
  "tracing-log",
+ "tracing-logfmt",
  "tracing-subscriber",
  "url",
  "uuid",
@@ -2178,8 +2186,17 @@ checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata",
- "regex-syntax",
+ "regex-automata 0.4.13",
+ "regex-syntax 0.8.8",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
 ]
 
 [[package]]
@@ -2190,9 +2207,15 @@ checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax",
+ "regex-syntax 0.8.8",
 ]
 
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
 [[package]]
 name = "regex-syntax"
 version = "0.8.8"
@@ -2291,7 +2314,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils",
- "syn 2.0.111",
+ "syn 2.0.112",
  "walkdir",
 ]
 
@@ -2402,7 +2425,7 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -2445,7 +2468,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sea-bae",
- "syn 2.0.111",
+ "syn 2.0.112",
  "unicode-ident",
 ]
 
@@ -2520,7 +2543,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -2769,7 +2792,7 @@ dependencies = [
  "quote",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -2792,7 +2815,7 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.111",
+ "syn 2.0.112",
  "tokio",
  "url",
 ]
@@ -2968,9 +2991,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.111"
+version = "2.0.112"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
+checksum = "21f182278bf2d2bcb3c88b1b08a37df029d71ce3d3ae26168e3c653b213b99d4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2991,7 +3014,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -3054,7 +3077,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -3065,7 +3088,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -3175,7 +3198,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -3331,7 +3354,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -3355,22 +3378,47 @@ dependencies = [
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-logfmt"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b1f47d22deb79c3f59fcf2a1f00f60cbdc05462bf17d1cd356c1fefa3f444bd"
+dependencies = [
+ "time",
+ "tracing",
+ "tracing-core",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-serde"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1"
+dependencies = [
+ "serde",
+ "tracing-core",
+]
+
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.22"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "regex-automata",
+ "regex",
+ "serde",
+ "serde_json",
  "sharded-slab",
  "smallvec",
  "thread_local",
  "tracing",
  "tracing-core",
  "tracing-log",
+ "tracing-serde",
 ]
 
 [[package]]
@@ -3566,7 +3614,7 @@ dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
  "wasm-bindgen-shared",
 ]
 
@@ -3670,7 +3718,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -3681,7 +3729,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -3994,7 +4042,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
  "synstructure",
 ]
 
@@ -4015,7 +4063,7 @@ checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
@@ -4035,7 +4083,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
  "synstructure",
 ]
 
@@ -4075,11 +4123,11 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.112",
 ]
 
 [[package]]
 name = "zmij"
-version = "1.0.0"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d6085d62852e35540689d1f97ad663e3971fc19cf5eceab364d62c646ea167"
+checksum = "aac060176f7020d62c3bcc1cdbcec619d54f48b07ad1963a3f80ce7a0c17755f"

{quebec-0.2.1 → quebec-0.2.3}/Cargo.toml

@@ -49,7 +49,8 @@ rand = "0.8.5"
 # pyo3 = { version = "0.23.1", features = ["abi3-py38"] }
 # pyo3-log = "0.11.0"
 tracing = { version = "0.1.40", optional = false }
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+tracing-subscriber = { version = "=0.3.19", features = ["env-filter", "json"] }
+tracing-logfmt = "0.3"
 tracing-log = "0.2.0"
 signal-hook = "0.3.17"
 serde_json = "1.0.132"

{quebec-0.2.1 → quebec-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quebec
-Version: 0.2.1
+Version: 0.2.3
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -17,13 +17,13 @@ Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS
-Requires-Dist: pytest>=7.0.0 ; extra == 'test'
-Requires-Dist: pytest-cov ; extra == 'test'
 Requires-Dist: sphinx>=7.0 ; extra == 'docs'
 Requires-Dist: shibuya ; extra == 'docs'
 Requires-Dist: myst-parser ; extra == 'docs'
-Provides-Extra: test
+Requires-Dist: pytest>=7.0.0 ; extra == 'test'
+Requires-Dist: pytest-cov ; extra == 'test'
 Provides-Extra: docs
+Provides-Extra: test
 License-File: LICENSE
 Summary: Quebec is a simple background task queue for processing asynchronous tasks.
 Keywords: solid_queue,postgresql,mysql,sqlite,queue

{quebec-0.2.1 → quebec-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "quebec"
-version = "0.2.1"
+version = "0.2.3"
 requires-python = ">=3.9"
 classifiers = [
   "Programming Language :: Rust",

{quebec-0.2.1 → quebec-0.2.3}/python/quebec/__init__.py

@@ -1,5 +1,6 @@
-from .quebec import * # NOQA
+from .quebec import *  # NOQA
 from . import quebec
+from . import sqlalchemy  # NOQA
 from .quebec import Quebec, ActiveJob
 import logging
 import time
@@ -30,8 +31,8 @@ class JobBuilder:
 
     def _calculate_scheduled_at(self) -> Optional[datetime]:
         """Calculate scheduled_at from wait or wait_until options."""
-        wait = self.options.get('wait')
-        wait_until = self.options.get('wait_until')
+        wait = self.options.get("wait")
+        wait_until = self.options.get("wait_until")
 
         if wait_until is not None:
             if isinstance(wait_until, datetime):
@@ -53,19 +54,19 @@ class JobBuilder:
 
         return None
 
-    def perform_later(self, qc: 'Quebec', *args, **kwargs) -> 'ActiveJob':
+    def perform_later(self, qc: "Quebec", *args, **kwargs) -> "ActiveJob":
         """Enqueue the job with configured options."""
         scheduled_at = self._calculate_scheduled_at()
 
         # Pass internal options via kwargs (will be filtered out before serialization)
         if scheduled_at is not None:
-            kwargs['_scheduled_at'] = scheduled_at.timestamp()
+            kwargs["_scheduled_at"] = scheduled_at.timestamp()
 
-        if 'queue' in self.options:
-            kwargs['_queue'] = self.options['queue']
+        if "queue" in self.options:
+            kwargs["_queue"] = self.options["queue"]
 
-        if 'priority' in self.options:
-            kwargs['_priority'] = self.options['priority']
+        if "priority" in self.options:
+            kwargs["_priority"] = self.options["priority"]
 
         # Call the original perform_later
         return self.job_class.perform_later(qc, *args, **kwargs)
@@ -73,18 +74,22 @@ class JobBuilder:
 
 class NoNewOverrideMeta(type):
     def __new__(cls, name, bases, dct):
-        if '__new__' in dct:
+        if "__new__" in dct:
             raise TypeError(f"Overriding __new__ is not allowed in class {name}")
-        if '__init__' in dct:
+        if "__init__" in dct:
             raise TypeError(f"Overriding __init__ is not allowed in class {name}")
         return super().__new__(cls, name, bases, dct)
 
+
 class BaseClass(ActiveJob, metaclass=NoNewOverrideMeta):
     @classmethod
-    def set(cls, wait: Union[int, float, timedelta] = None,
-            wait_until: datetime = None,
-            queue: str = None,
-            priority: int = None) -> JobBuilder:
+    def set(
+        cls,
+        wait: Union[int, float, timedelta] = None,
+        wait_until: datetime = None,
+        queue: str = None,
+        priority: int = None,
+    ) -> JobBuilder:
         """Configure job options before enqueueing.
 
         Args:
@@ -103,13 +108,13 @@ class BaseClass(ActiveJob, metaclass=NoNewOverrideMeta):
         """
         options = {}
         if wait is not None:
-            options['wait'] = wait
+            options["wait"] = wait
         if wait_until is not None:
-            options['wait_until'] = wait_until
+            options["wait_until"] = wait_until
         if queue is not None:
-            options['queue'] = queue
+            options["queue"] = queue
         if priority is not None:
-            options['priority'] = priority
+            options["priority"] = priority
         return JobBuilder(cls, **options)
 
 
@@ -142,7 +147,9 @@ class ThreadedRunner:
             except (queue.ShutDown, KeyboardInterrupt):
                 break
             except Exception as e:
-                logger.error(f"Unexpected exception in ThreadedRunner: {e}", exc_info=True)
+                logger.error(
+                    f"Unexpected exception in ThreadedRunner: {e}", exc_info=True
+                )
             finally:
                 self.cleanup()
 
@@ -151,7 +158,7 @@ class ThreadedRunner:
     def cleanup(self):
         """Cleanup after job execution"""
         try:
-            if self.execution and hasattr(self.execution, 'cleanup'):
+            if self.execution and hasattr(self.execution, "cleanup"):
                 self.execution.cleanup()
         except Exception as e:
             logger.error(f"Error in cleanup: {e}", exc_info=True)
@@ -197,11 +204,11 @@ def _quebec_start(
         self.spawn_all()
     else:
         for component in spawn:
-            if component == 'worker':
+            if component == "worker":
                 self.spawn_job_claim_poller()
-            elif component == 'dispatcher':
+            elif component == "dispatcher":
                 self.spawn_dispatcher()
-            elif component == 'scheduler':
+            elif component == "scheduler":
                 self.spawn_scheduler()
             else:
                 raise ValueError(f"Unknown component: {component}")
@@ -225,15 +232,15 @@ def _quebec_start(
     # Start worker threads as daemon so program can exit after start()
     worker_threads = []
     for i in range(threads):
-        t = threading.Thread(target=run_worker, name=f'quebec-worker-{i}', daemon=True)
+        t = threading.Thread(target=run_worker, name=f"quebec-worker-{i}", daemon=True)
         t.start()
         worker_threads.append(t)
 
     # Store state by instance id
     _quebec_state[id(self)] = {
-        'shutdown_event': shutdown_event,
-        'job_queue': job_queue,
-        'worker_threads': worker_threads,
+        "shutdown_event": shutdown_event,
+        "job_queue": job_queue,
+        "worker_threads": worker_threads,
     }
 
     return self  # Enable chaining: qc.start().wait()
@@ -254,14 +261,14 @@ def _quebec_wait(self):
         raise RuntimeError("Quebec not started. Call start() first.")
 
     try:
-        while not state['shutdown_event'].is_set():
+        while not state["shutdown_event"].is_set():
             time.sleep(0.5)
     except KeyboardInterrupt:
-        logger.debug('KeyboardInterrupt, shutting down...')
+        logger.debug("KeyboardInterrupt, shutting down...")
         self.graceful_shutdown()
     finally:
         # Wait for worker threads to finish
-        for t in state['worker_threads']:
+        for t in state["worker_threads"]:
             t.join(timeout=5.0)
         _quebec_state.pop(id(self), None)