workercommon 0.4.2__tar.gz → 0.5.0__tar.gz

{workercommon-0.4.2 → workercommon-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workercommon
-Version: 0.4.2
+Version: 0.5.0
 Summary: Support code for various projects
 Author-email: "Neil E. Hodges" <47hasbegun@gmail.com>
 License-Expression: BSD-3-Clause
@@ -13,8 +13,10 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.TXT
-Requires-Dist: psycopg2
+Requires-Dist: immutables
 Requires-Dist: pika
+Requires-Dist: psycopg2
+Requires-Dist: pyyaml
 Dynamic: license-file
 
 # Requirements

{workercommon-0.4.2 → workercommon-0.5.0}/pyproject.toml

@@ -13,10 +13,12 @@ readme = "README.md"
 requires-python = ">= 3.8"
 license = "BSD-3-Clause"
 dependencies = [
-  "psycopg2",
+  "immutables",
   "pika",
+  "psycopg2",
+  "pyyaml",
 ]
-version = "0.4.2"
+version = "0.5.0"
 license-files = ["LICENSE.TXT"]
 classifiers = [
   "Programming Language :: Python :: 3",

{workercommon-0.4.2 → workercommon-0.5.0}/workercommon/worker.py

@@ -4,19 +4,21 @@ import sys
 if sys.version_info < (3, 8):
     raise RuntimeError("At least Python 3.8 is required")
 
-from pathlib import Path
 from .database import Connection, Cursor
 from . import rabbitmqueue
-import json, re, pika.connection, pika.channel, pika.spec, logging
+import json, pika.connection, pika.channel, pika.spec, logging
 from collections.abc import Mapping
-from time import sleep
 from threading import Thread, Lock
 from typing import Iterable, Optional, Any, Callable, List
-from multiprocessing import Process, Manager, Event
+from multiprocessing import Process
 from multiprocessing.managers import SyncManager
 from concurrent.futures import ThreadPoolExecutor
 
 
+class NoDatabase(RuntimeError):
+    pass
+
+
 class BaseWorker(object):
     def start(self) -> None:
         raise NotImplementedError
@@ -43,7 +45,7 @@ class ThreadWorker(BaseWorker, Thread):
 class ReaderWorker(ThreadWorker):
     def __init__(
         self,
-        database_source: Callable[[], Connection],
+        database_source: Optional[Callable[[], Connection]],
         readq_parameters: rabbitmqueue.Parameters,
         any_exchange: bool = False,
         **readq_arguments: Any,
@@ -152,7 +154,7 @@ class ReaderWorker(ThreadWorker):
     def get_cursor(self) -> Cursor:
         if self.database is None:
             if self.database_source is None:
-                raise RuntimeError("Database source is unavailable")
+                raise NoDatabase("Database source is unavailable")
             self.database = self.database_source()
 
         return self.database.cursor()
@@ -192,8 +194,11 @@ class ReaderWorker(ThreadWorker):
             filtered = self.filter_message(root)
 
             if filtered is not None:
-                with self.get_cursor() as cursor:
-                    self.handle_message(cursor, filtered)
+                try:
+                    with self.get_cursor() as cursor:
+                        self.handle_message(cursor, filtered)
+                except NoDatabase:
+                    self.handle_message_nodb(filtered)
 
             logging.debug(f"Successfully handled {method.delivery_tag}")
             self.get_readq().add_callback_threadsafe(
@@ -242,6 +247,9 @@ class ReaderWorker(ThreadWorker):
     def handle_message(self, cursor: Cursor, message: Any) -> None:
         raise NotImplementedError
 
+    def handle_message_nodb(self, message: Any) -> None:
+        raise NotImplementedError
+
     def stop(self) -> None:
         with self.lock:
             if self.readq is not None:

{workercommon-0.4.2 → workercommon-0.5.0}/workercommon.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workercommon
-Version: 0.4.2
+Version: 0.5.0
 Summary: Support code for various projects
 Author-email: "Neil E. Hodges" <47hasbegun@gmail.com>
 License-Expression: BSD-3-Clause
@@ -13,8 +13,10 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.TXT
-Requires-Dist: psycopg2
+Requires-Dist: immutables
 Requires-Dist: pika
+Requires-Dist: psycopg2
+Requires-Dist: pyyaml
 Dynamic: license-file
 
 # Requirements

{workercommon-0.4.2 → workercommon-0.5.0}/workercommon.egg-info/SOURCES.txt

@@ -4,7 +4,6 @@ pyproject.toml
 workercommon/__init__.py
 workercommon/background.py
 workercommon/commands.py
-workercommon/config.py
 workercommon/connectionpool.py
 workercommon/locking.py
 workercommon/py.typed

workercommon-0.5.0/workercommon.egg-info/requires.txt

@@ -0,0 +1,4 @@
+immutables
+pika
+psycopg2
+pyyaml

workercommon-0.4.2/workercommon/config.py

@@ -1,81 +0,0 @@
-#!/usr/bin/env python3
-import sys
-
-if sys.version_info < (3, 8):
-    raise RuntimeError("At least Python 3.8 is required")
-
-from configparser import ConfigParser
-import logging
-from logging.handlers import WatchedFileHandler
-from typing import Tuple, Optional, Callable
-from pathlib import Path
-
-
-class Configuration(object):
-    def __init__(self, filename: str):
-        self.parser = self.create_parser()
-        self.set_base_config(self.parser)
-        self.parser.read(filename)
-        self.check_all_values(self.parser)
-
-    def create_parser(self) -> ConfigParser:
-        return ConfigParser()
-
-    def set_base_config(self, parser: ConfigParser) -> None:
-        pass
-
-    def check_all_values(self, parser: ConfigParser) -> None:
-        pass
-
-    @staticmethod
-    def dir_exists(s: str) -> bool:
-        return bool(s and Path(s).is_dir())
-
-    def check_value(
-        self, section: str, key: str, validator: Callable[[str], bool]
-    ) -> None:
-        value: Optional[str] = self[section, key]
-        try:
-            if value is None or not validator(value):
-                raise ValueError
-        except:
-            raise ValueError(f"Invalid {section}/{key} value: {value}")
-
-    def __getitem__(self, parts: Tuple[str, str]) -> Optional[str]:
-        section, key = parts
-
-        try:
-            value = self.parser[section][key]
-            return value if value else None
-        except KeyError:
-            return None
-
-    def get_strict(self, section: str, key: str) -> str:
-        value = self[section, key]
-        if value is None:
-            raise ValueError(f"Missing {section}/{key} value")
-
-        return value
-
-    def get(self, section: str, key: str, default: str) -> str:
-        value = self[section, key]
-        return value if value is not None else default
-
-    def configure_logging(self, *handlers) -> None:
-        level = self["Logging", "level"]
-        if not level:
-            raise RuntimeError("Logging level should have already been validated")
-
-        log_format = self["Logging", "format"]
-        if not log_format:
-            log_format = "[%(asctime)s] [%(levelname)s] [%(module)s] [%(filename)s:%(lineno)d %(funcName)s] %(message)s"
-
-        if handlers:
-            logging.basicConfig(level=level, format=log_format, handlers=handlers)
-        else:
-            fname = self["Logging", "file"]
-            if fname:
-                handler = WatchedFileHandler(fname)
-                logging.basicConfig(level=level, format=log_format, handlers=[handler])
-            else:
-                logging.basicConfig(level=level, format=log_format, stream=sys.stderr)

workercommon-0.4.2/workercommon.egg-info/requires.txt

@@ -1,2 +0,0 @@
-psycopg2
-pika