workercommon 0.4.1__tar.gz → 0.4.3__tar.gz

{workercommon-0.4.1 → workercommon-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workercommon
-Version: 0.4.1
+Version: 0.4.3
 Summary: Support code for various projects
 Author-email: "Neil E. Hodges" <47hasbegun@gmail.com>
 License-Expression: BSD-3-Clause

{workercommon-0.4.1 → workercommon-0.4.3}/pyproject.toml

@@ -16,7 +16,7 @@ dependencies = [
   "psycopg2",
   "pika",
 ]
-version = "0.4.1"
+version = "0.4.3"
 license-files = ["LICENSE.TXT"]
 classifiers = [
   "Programming Language :: Python :: 3",

{workercommon-0.4.1 → workercommon-0.4.3}/workercommon/rabbitmqueue.py

@@ -83,7 +83,7 @@ class BaseQueue(object):
 
         raise TypeError(f"Cannot serialize: {obj}")
 
-    def send_callback(self, message: Any, persist: bool = False) -> None:
+    def send_callback(self, message: Any, persist: bool = False, raw: bool = False) -> None:
         properties = BasicProperties(
             content_type="application/json",
             delivery_mode=(
@@ -92,16 +92,21 @@ class BaseQueue(object):
         )
 
         parameters = self.get_parameters()
+        serialized = (
+            message
+            if isinstance(message, str) and raw
+            else json.dumps(message, default=self.serialize_for_json)
+        )
         self.get_channel().basic_publish(
             exchange=parameters.exchange,
             routing_key=parameters.routing_key,
-            body=json.dumps(message, default=self.serialize_for_json),
+            body=serialized,
             properties=properties,
         )
 
-    def send(self, message: Any, persist: bool = False) -> None:
+    def send(self, message: Any, persist: bool = False, raw: bool = False) -> None:
         self.add_callback_threadsafe(
-            partial(self.send_callback, message, persist)
+            partial(self.send_callback, message, persist, raw)
         ).result(60)
 
     def add_callback_threadsafe(self, callback: Callable[[], Any]) -> Future:
@@ -256,7 +261,7 @@ class SendQueueWrapper(object):
                 logging.exception(f"Failed to wait for queue thread {self.queue_thread}")
             self.queue_thread = None
 
-    def send(self, message: Any, persist: bool = False) -> None:
+    def send(self, message: Any, persist: bool = False, raw: bool = False) -> None:
         for i in range(self.TRIES):
             with self.lock:
                 if self.closed:
@@ -268,7 +273,7 @@ class SendQueueWrapper(object):
                         self.queue_thread = self.create_queue_thread(self.queue)
                         logging.info("Re-established broken connection")
 
-                    self.queue.send(message, persist)
+                    self.queue.send(message, persist, raw)
                     break
 
                 except BaseException:

{workercommon-0.4.1 → workercommon-0.4.3}/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.1 → workercommon-0.4.3}/workercommon.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workercommon
-Version: 0.4.1
+Version: 0.4.3
 Summary: Support code for various projects
 Author-email: "Neil E. Hodges" <47hasbegun@gmail.com>
 License-Expression: BSD-3-Clause