queuerPy 0.10.0__tar.gz → 0.11.0__tar.gz

{queuerpy-0.10.0/queuerPy.egg-info → queuerpy-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: queuerPy
-Version: 0.10.0
+Version: 0.11.0
 Summary: A Python implementation of the queuer system - a job queuing and processing system with PostgreSQL backend
 Author-email: Simon Herrmann <siherrmann@users.noreply.github.com>
 Maintainer-email: Simon Herrmann <siherrmann@users.noreply.github.com>

{queuerpy-0.10.0 → queuerpy-0.11.0}/__init__.py

@@ -10,50 +10,42 @@ A job queuing and processing system with PostgreSQL backend that provides:
 - Event-driven notifications
 """
 
-import sys
-import os
-
-# Add the package directory to Python path to enable direct imports
-_package_dir = os.path.dirname(__file__)
-if _package_dir not in sys.path:
-    sys.path.insert(0, _package_dir)
-
-from _version import __version__
+from ._version import __version__
 
 __author__ = "Simon Herrmann"
 __email__ = "siherrmann@users.noreply.github.com"
 
 # Core exports
-from queuer import (
+from .queuer import (
     Queuer,
     new_queuer,
     new_queuer_with_db,
 )
 
-from helper.database import (
+from .helper.database import (
     DatabaseConfiguration,
 )
 
-from model.job import (
+from .model.job import (
     Job,
     JobStatus,
 )
 
-from model.worker import (
+from .model.worker import (
     Worker,
     WorkerStatus,
 )
 
-from model.master import (
+from .model.master import (
     Master,
 )
 
-from model.options_on_error import (
+from .model.options_on_error import (
     OnError,
     RetryBackoff,
 )
 
-from helper.error import (
+from .helper.error import (
     QueuerError,
 )
 

{queuerpy-0.10.0 → queuerpy-0.11.0}/_version.py

@@ -1,6 +1,6 @@
 """Version information for queuerPy package."""
 
-__version__ = "0.10.0"
+__version__ = "0.11.0"
 __version_info__ = tuple(int(part) for part in __version__.split("."))
 
 # For compatibility

{queuerpy-0.10.0 → queuerpy-0.11.0}/core/listener.py

@@ -9,8 +9,8 @@ import asyncio
 import threading
 from typing import TypeVar, Generic, Callable, Optional, Any
 
-from core.broadcaster import Broadcaster
-from core.runner import go_func
+from .broadcaster import Broadcaster
+from .runner import go_func
 
 T = TypeVar("T")
 

{queuerpy-0.10.0 → queuerpy-0.11.0}/core/retryer.py

@@ -6,16 +6,11 @@ for reliable task execution with various backoff strategies.
 """
 
 import logging
-import sys
-import os
 import asyncio
 import inspect
 from typing import Any, Callable, Optional
 
-# Add parent directory to path for imports
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-from model.options_on_error import OnError, RetryBackoff
+from ..model.options_on_error import OnError, RetryBackoff
 
 
 # Configure logging

{queuerpy-0.10.0 → queuerpy-0.11.0}/core/runner.py

@@ -10,7 +10,7 @@ import traceback
 import queue
 from typing import Callable, Any, Optional, Union
 
-from helper.logging import get_logger
+from ..helper.logging import get_logger
 
 logger = get_logger(__name__)
 

{queuerpy-0.10.0 → queuerpy-0.11.0}/core/scheduler.py

@@ -6,9 +6,9 @@ import time
 from datetime import datetime
 from typing import Callable, Dict, Optional, Any, Tuple
 
-from core.runner import go_func
-from helper.logging import get_logger
-from helper.task import check_valid_task_with_parameters
+from .runner import go_func
+from ..helper.logging import get_logger
+from ..helper.task import check_valid_task_with_parameters
 
 logger = get_logger(__name__)
 

{queuerpy-0.10.0 → queuerpy-0.11.0}/core/ticker.py

@@ -9,8 +9,8 @@ import time
 from datetime import timedelta
 from typing import Any, Callable, Dict, Optional, Union
 
-from core.runner import Runner, SmallRunner, go_func
-from helper.logging import get_logger
+from .runner import Runner, SmallRunner, go_func
+from ..helper.logging import get_logger
 
 logger = get_logger(__name__)
 

{queuerpy-0.10.0 → queuerpy-0.11.0}/database/__init__.py

@@ -4,7 +4,7 @@ Provides database handlers and SQL loading using helper.database classes.
 """
 
 # Import from helper for core database functionality
-from helper.database import (
+from ..helper.database import (
     Database,
     DatabaseConfiguration,
     new_database,
@@ -12,7 +12,7 @@ from helper.database import (
 )
 
 # Import deprecated SQL loader from helper.sql module
-from helper.sql import (
+from ..helper.sql import (
     SQLLoader,
 )
 
@@ -42,7 +42,6 @@ __all__ = [
     # Worker handler
     "WorkerDBHandler",
     # Listeners
-    "DBListener",
-    "DBListenerJob",
-    "DBListenerWorker",
+    "QueuerListener",
+    "new_queuer_db_listener",
 ]

{queuerpy-0.10.0 → queuerpy-0.11.0}/database/db_job.py

@@ -9,11 +9,11 @@ from typing import List, Optional, Tuple
 from uuid import UUID
 from psycopg.rows import dict_row
 
-from helper.database import Database
-from helper.error import QueuerError
-from helper.sql import SQLLoader, run_ddl
-from model.job import Job
-from model.worker import Worker
+from ..helper.database import Database
+from ..helper.error import QueuerError
+from ..helper.sql import SQLLoader, run_ddl
+from ..model.job import Job
+from ..model.worker import Worker
 
 
 class JobDBHandler:

{queuerpy-0.10.0 → queuerpy-0.11.0}/database/db_listener.py

@@ -9,8 +9,8 @@ from typing import Optional, Callable, Awaitable
 import psycopg
 from psycopg import AsyncConnection
 
-from helper.database import DatabaseConfiguration
-from helper.error import QueuerError
+from ..helper.database import DatabaseConfiguration
+from ..helper.error import QueuerError
 
 
 class QueuerListener:

{queuerpy-0.10.0 → queuerpy-0.11.0}/database/db_master.py

@@ -7,10 +7,10 @@ import json
 from typing import Optional
 from psycopg.rows import dict_row
 
-from helper.database import Database
-from helper.sql import SQLLoader, run_ddl
-from model.master import Master, MasterSettings
-from model.worker import Worker
+from ..helper.database import Database
+from ..helper.sql import SQLLoader, run_ddl
+from ..model.master import Master, MasterSettings
+from ..model.worker import Worker
 
 
 class MasterDBHandler:

{queuerpy-0.10.0 → queuerpy-0.11.0}/database/db_worker.py

@@ -9,10 +9,10 @@ from typing import List, Optional
 from uuid import UUID
 from psycopg.rows import dict_row
 
-from helper.database import Database
-from helper.sql import SQLLoader, run_ddl
-from model.worker import Worker, WorkerStatus
-from model.connection import Connection as ConnectionModel
+from ..helper.database import Database
+from ..helper.sql import SQLLoader, run_ddl
+from ..model.worker import Worker, WorkerStatus
+from ..model.connection import Connection as ConnectionModel
 
 
 class WorkerDBHandler:

{queuerpy-0.10.0 → queuerpy-0.11.0}/helper/database.py

@@ -10,8 +10,7 @@ from dataclasses import dataclass
 import psycopg
 from psycopg import Connection, ConnectionInfo, sql
 
-from helper.logging import QueuerLogger
-
+from .logging import QueuerLogger
 from .error import QueuerError
 from .sql import run_ddl
 

{queuerpy-0.10.0 → queuerpy-0.11.0}/helper/error.py

@@ -5,6 +5,7 @@ Mirrors Go's helper/error.go with Python exception handling.
 
 import inspect
 from types import FrameType
+from typing import Optional
 
 
 class QueuerError(Exception):
@@ -18,7 +19,7 @@ class QueuerError(Exception):
         traceWithFunction = trace
         current_frame = inspect.currentframe()
 
-        frame: FrameType | None = None
+        frame: Optional[FrameType] = None
         if current_frame is not None:
             frame = current_frame.f_back
 

{queuerpy-0.10.0 → queuerpy-0.11.0}/helper/sql.py

@@ -10,7 +10,7 @@ from typing import List, Optional
 from psycopg import Connection, errors
 from pathlib import Path
 
-from helper.logging import get_logger
+from .logging import get_logger
 
 logger = get_logger(__name__)
 

{queuerpy-0.10.0 → queuerpy-0.11.0}/model/job.py

@@ -9,7 +9,7 @@ from datetime import datetime
 from typing import List, Any, Optional, Callable, Dict, Union
 from uuid import UUID, uuid4
 
-from helper.task import get_task_name_from_interface
+from ..helper.task import get_task_name_from_interface
 from .options import Options
 
 

{queuerpy-0.10.0 → queuerpy-0.11.0}/model/options.py

@@ -6,6 +6,7 @@ Mirrors the Go Options struct with Python types.
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 from typing import Any, Dict, Optional
+
 from .options_on_error import OnError
 
 

{queuerpy-0.10.0 → queuerpy-0.11.0}/model/task.py

@@ -7,7 +7,7 @@ import inspect
 from dataclasses import dataclass, field
 from typing import Callable, List, Any
 
-from helper.error import QueuerError
+from ..helper.error import QueuerError
 
 
 @dataclass

{queuerpy-0.10.0 → queuerpy-0.11.0}/model/worker.py

@@ -8,6 +8,7 @@ from dataclasses import dataclass, field
 from datetime import datetime
 from typing import List, Optional, Dict, Any
 from uuid import UUID, uuid4
+
 from .options_on_error import OnError
 
 

{queuerpy-0.10.0 → queuerpy-0.11.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "queuerPy"
-version = "0.10.0"
+version = "0.11.0"
 description = "A Python implementation of the queuer system - a job queuing and processing system with PostgreSQL backend"
 readme = "README.md"
 license = "Apache-2.0"
@@ -62,15 +62,10 @@ packages = ["queuerPy", "queuerPy.core", "queuerPy.database", "queuerPy.helper",
 
 [tool.setuptools.package-dir]
 "queuerPy" = "."
-"queuerPy.core" = "core"
-"queuerPy.database" = "database"
-"queuerPy.helper" = "helper"
-"queuerPy.model" = "model"
-"queuerPy.sql" = "sql"
 
 [tool.setuptools.package-data]
-"queuerPy" = ["sql/*.sql", "py.typed"]
-"*" = ["*.sql"]
+"queuerPy" = ["py.typed"]
+"queuerPy.sql" = ["*.sql"]
 
 [tool.pytest.ini_options]
 testpaths = ["."]
@@ -97,7 +92,7 @@ pythonVersion = "3.8"
 pythonPlatform = "All"
 
 [tool.mypy]
-python_version = "0.10.0"
+python_version = "0.11.0"
 warn_return_any = true
 warn_unused_configs = true
 disallow_untyped_defs = true

{queuerpy-0.10.0 → queuerpy-0.11.0}/queuer.py

@@ -14,20 +14,20 @@ from datetime import datetime, timedelta
 from typing import Optional, Dict, Callable, Any
 from uuid import UUID
 
-from core.ticker import Ticker
-from core.runner import Runner, SmallRunner, go_func
-from database.db_listener import QueuerListener, new_queuer_db_listener
-from helper.logging import get_logger
-from helper.database import DatabaseConfiguration
-from model.job import Job, JobStatus
-from model.worker import Worker, new_worker, new_worker_with_options, WorkerStatus
-from model.master import MasterSettings
-from model.options_on_error import OnError
-from queuer_job import QueuerJobMixin
-from queuer_task import QueuerTaskMixin
-from queuer_next_interval import QueuerNextIntervalMixin
-from queuer_listener import QueuerListenerMixin
-from queuer_master import QueuerMasterMixin
+from .core.ticker import Ticker
+from .core.runner import Runner, SmallRunner, go_func
+from .database.db_listener import QueuerListener, new_queuer_db_listener
+from .helper.logging import get_logger
+from .helper.database import DatabaseConfiguration
+from .model.job import Job, JobStatus
+from .model.worker import Worker, new_worker, new_worker_with_options, WorkerStatus
+from .model.master import MasterSettings
+from .model.options_on_error import OnError
+from .queuer_job import QueuerJobMixin
+from .queuer_task import QueuerTaskMixin
+from .queuer_next_interval import QueuerNextIntervalMixin
+from .queuer_listener import QueuerListenerMixin
+from .queuer_master import QueuerMasterMixin
 
 logger = get_logger(__name__)
 

{queuerpy-0.10.0 → queuerpy-0.11.0/queuerPy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: queuerPy
-Version: 0.10.0
+Version: 0.11.0
 Summary: A Python implementation of the queuer system - a job queuing and processing system with PostgreSQL backend
 Author-email: Simon Herrmann <siherrmann@users.noreply.github.com>
 Maintainer-email: Simon Herrmann <siherrmann@users.noreply.github.com>

{queuerpy-0.10.0 → queuerpy-0.11.0}/queuerPy.egg-info/SOURCES.txt

@@ -22,6 +22,33 @@ queuer_task.py
 ./queuer_master.py
 ./queuer_next_interval.py
 ./queuer_task.py
+./core/__init__.py
+./core/broadcaster.py
+./core/listener.py
+./core/retryer.py
+./core/runner.py
+./core/scheduler.py
+./core/ticker.py
+./database/__init__.py
+./database/db_job.py
+./database/db_listener.py
+./database/db_master.py
+./database/db_worker.py
+./helper/__init__.py
+./helper/database.py
+./helper/error.py
+./helper/logging.py
+./helper/sql.py
+./helper/task.py
+./model/__init__.py
+./model/batch_job.py
+./model/connection.py
+./model/job.py
+./model/master.py
+./model/options.py
+./model/options_on_error.py
+./model/task.py
+./model/worker.py
 ./sql/job.sql
 ./sql/master.sql
 ./sql/notify.sql

{queuerpy-0.10.0 → queuerpy-0.11.0}/queuer_global.py

@@ -1,15 +1,16 @@
 import threading
 from typing import Any, Callable, Dict, Optional
-from core.broadcaster import new_broadcaster
-from core.listener import Listener
-from database.db_job import JobDBHandler
-from database.db_master import MasterDBHandler
-from database.db_worker import WorkerDBHandler
-from helper.database import Database, DatabaseConfiguration, new_database
-from helper.logging import get_logger
-from model.job import Job
-from model.task import Task
-from model.worker import Worker
+
+from .core.broadcaster import new_broadcaster
+from .core.listener import Listener
+from .database.db_job import JobDBHandler
+from .database.db_master import MasterDBHandler
+from .database.db_worker import WorkerDBHandler
+from .helper.database import Database, DatabaseConfiguration, new_database
+from .helper.logging import get_logger
+from .model.job import Job
+from .model.task import Task
+from .model.worker import Worker
 
 logger = get_logger()
 

{queuerpy-0.10.0 → queuerpy-0.11.0}/queuer_job.py

@@ -9,17 +9,17 @@ from datetime import datetime
 from typing import Dict, List, Optional, Any, Tuple, Union, Callable
 from uuid import UUID
 
-from core.broadcaster import BroadcasterQueue
-from core.runner import Runner, SmallRunner
-from core.retryer import Retryer
-from core.scheduler import Scheduler
-from helper.error import QueuerError
-from helper.task import get_task_name_from_interface
-from model.batch_job import BatchJob
-from model.job import Job, JobStatus, new_job as create_job
-from model.options import Options
-from model.worker import Worker
-from queuer_global import QueuerGlobalMixin
+from .core.broadcaster import BroadcasterQueue
+from .core.runner import Runner, SmallRunner
+from .core.retryer import Retryer
+from .core.scheduler import Scheduler
+from .helper.error import QueuerError
+from .helper.task import get_task_name_from_interface
+from .model.batch_job import BatchJob
+from .model.job import Job, JobStatus, new_job as create_job
+from .model.options import Options
+from .model.worker import Worker
+from .queuer_global import QueuerGlobalMixin
 
 # Set up logger
 logger = logging.getLogger(__name__)

{queuerpy-0.10.0 → queuerpy-0.11.0}/queuer_listener.py

@@ -6,8 +6,8 @@ Mirrors Go's queuerListener.go functionality.
 import logging
 from typing import Callable
 
-from queuer_global import QueuerGlobalMixin
-from model.job import Job
+from .queuer_global import QueuerGlobalMixin
+from .model.job import Job
 
 logger = logging.getLogger(__name__)
 

{queuerpy-0.10.0 → queuerpy-0.11.0}/queuer_master.py

@@ -6,12 +6,12 @@ Mirrors the Go queuerMaster.go with Python async patterns.
 from datetime import timedelta
 from typing import Optional
 
-from core.runner import go_func
-from core.ticker import Ticker
-from helper.logging import get_logger
-from helper.error import QueuerError
-from model.master import Master, MasterSettings
-from queuer_global import QueuerGlobalMixin
+from .core.runner import go_func
+from .core.ticker import Ticker
+from .helper.logging import get_logger
+from .helper.error import QueuerError
+from .model.master import Master, MasterSettings
+from .queuer_global import QueuerGlobalMixin
 
 logger = get_logger(__name__)
 

{queuerpy-0.10.0 → queuerpy-0.11.0}/queuer_next_interval.py

@@ -6,8 +6,8 @@ Mirrors Go's queuerNextInterval.go functionality.
 import logging
 from typing import Any, Callable
 
-from queuer_global import QueuerGlobalMixin
-from model.worker import Worker
+from .queuer_global import QueuerGlobalMixin
+from .model.worker import Worker
 
 logger = logging.getLogger(__name__)
 
@@ -32,10 +32,7 @@ class QueuerNextIntervalMixin(QueuerGlobalMixin):
         :raises ValueError: If function is None
         :raises RuntimeError: If function already exists or database update fails
         """
-        from helper.task import get_task_name_from_interface
-
-        if nif is None:
-            raise ValueError("NextIntervalFunc cannot be None")
+        from .helper.task import get_task_name_from_interface
 
         try:
             nif_name = get_task_name_from_interface(nif)

{queuerpy-0.10.0 → queuerpy-0.11.0}/queuer_task.py

@@ -6,9 +6,9 @@ Mirrors Go's queuerTask.go functionality.
 import logging
 from typing import Any, Callable, Optional, TypeVar, overload
 
-from model.task import new_task, new_task_with_name
-from model.task import Task
-from queuer_global import QueuerGlobalMixin
+from .model.task import new_task, new_task_with_name
+from .model.task import Task
+from .queuer_global import QueuerGlobalMixin
 
 logger = logging.getLogger(__name__)