workercommon 0.4.1__tar.gz → 0.4.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workercommon
-Version: 0.4.1
+Version: 0.4.2
 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.2}/pyproject.toml

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

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

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