rococo 1.0.0__tar.gz → 1.0.3__tar.gz

{rococo-1.0.0 → rococo-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rococo
-Version: 1.0.0
+Version: 1.0.3
 Summary: A Python library to help build things the way we want them built
 Home-page: https://github.com/EcorRouge/rococo
 Author: Jay Grieves

{rococo-1.0.0 → rococo-1.0.3}/rococo/data/mysql.py

@@ -148,7 +148,8 @@ class MySqlAdapter(DbAdapter):
         table: str,
         conditions: Dict[str, Any] = None,
         sort: List[Tuple[str, str]] = None,
-        limit: int = 100,
+        limit: int = None,
+        offset: int = None,
         active: bool = True,
         join_statements: list = None,
         additional_fields: list = None
@@ -172,7 +173,12 @@ class MySqlAdapter(DbAdapter):
         if sort:
             sort_strs = [f"{column} {direction}" for column, direction in sort]
             query += f" ORDER BY {', '.join(sort_strs)}"
-        query += f" LIMIT {limit}"
+        if limit is not None:
+            query += f" LIMIT {limit}"
+        if offset is not None:
+            query += f" OFFSET {offset}"
+
+        print(query)
 
         db_response = self.parse_db_response(self.execute_query(query))
         if not db_response:

{rococo-1.0.0 → rococo-1.0.3}/rococo/messaging/rabbitmq.py

@@ -7,6 +7,7 @@ import threading
 import logging
 from typing import Callable
 import pika
+from dotenv import dotenv_values
 
 from . import MessageAdapter
 
@@ -16,7 +17,7 @@ logger = logging.getLogger(__name__)
 class RabbitMqConnection(MessageAdapter):
     """A connection to a RabbitMQ message queue that allows to send and receive messages."""
 
-    def __init__(self, host: str, port: int, username: str, password: str, virtual_host: str = ''):
+    def __init__(self, host: str, port: int, username: str, password: str, virtual_host: str = '', consume_config_file_path: str = None):
         """
         Initializes a new RabbitMQ connection.
 
@@ -32,10 +33,11 @@ class RabbitMqConnection(MessageAdapter):
         self._username = username
         self._password = password
         self._virtual_host = virtual_host
+        self._consume_config_file_path = consume_config_file_path
 
         self._connection = None
         self._channel = None
-        self._threads = []
+        self._threads = {}
 
     def __enter__(self):
         """
@@ -63,6 +65,11 @@ class RabbitMqConnection(MessageAdapter):
         self._connection = None
         self._channel = None
 
+    def _read_consume_config(self):
+        if self._consume_config_file_path is None:
+            return {}
+        return dotenv_values(self._consume_config_file_path)
+
     def send_message(self, queue_name: str, message: dict):
         """
         Sends a message to the specified queue.
@@ -114,6 +121,7 @@ class RabbitMqConnection(MessageAdapter):
             cb = functools.partial(_ack_message, ch, delivery_tag)
             logger.info("Sent ack for Delivery tag %s...", delivery_tag)
             self._connection.add_callback_threadsafe(cb)
+            self._threads.pop(delivery_tag, None)
 
         def _on_message(ch, method_frame, _header_frame, body, args):
             """Called when a message is received."""
@@ -125,27 +133,29 @@ class RabbitMqConnection(MessageAdapter):
                 target=_do_work, args=(ch, delivery_tag, body, callback)
             )
             t.start()
-            self._threads.append(t)
+            self._threads[delivery_tag] = t
 
         self._channel.queue_declare(queue=queue_name, durable=True)
 
-        self._threads = []
+        self._threads = {}
         self._channel.basic_qos(prefetch_count=num_threads)
 
         on_message_callback = functools.partial(_on_message, args=(callback_function,))
-        self._channel.basic_consume(
-            queue=queue_name, on_message_callback=on_message_callback
-        )
 
         try:
             logger.info('Listening to RabbitMQ queue %s on %s:%s with %s threads...', queue_name,
                         self._host, self._port, num_threads)
-            self._channel.start_consuming()
+            for method, properties, body in self._channel.consume(queue=queue_name, inactivity_timeout=5):
+                if (method, properties, body) == (None, None, None):
+                    if len(self._threads) == 0 and self._read_consume_config().get('EXIT_WHEN_FINISHED') == '1':
+                        logger.info("Reached inactivity timeout. No threads are running and EXIT_WHEN_FINISHED=1, exiting!")
+                        break
+                else:
+                    on_message_callback(self._channel, method, properties, body)
         except KeyboardInterrupt:
             logger.info("Exiting gracefully...")
-            self._channel.stop_consuming()
         finally:
             # Wait for all to complete
-            for thread in self._threads:
+            for thread in self._threads.values():
                 thread.join()
             self._connection.close()

{rococo-1.0.0 → rococo-1.0.3}/rococo/models/versioned_model.py

@@ -36,10 +36,10 @@ class VersionedModel:
     """A base class for versioned models with common (Big 6) attributes."""
 
     entity_id: UUID = field(default_factory=uuid4, metadata={'field_type': 'entity_id'})
-    version: UUID = UUID('00000000-0000-4000-8000-000000000000')
-    previous_version: UUID = None
+    version: UUID = field(default_factory=lambda: UUID('00000000-0000-4000-8000-000000000000'), metadata={'field_type': 'uuid'})
+    previous_version: UUID = field(default_factory=lambda: None, metadata={'field_type': 'uuid'})
     active: bool = True
-    changed_by_id: UUID = UUID('00000000-0000-4000-8000-000000000000')
+    changed_by_id: UUID = field(default_factory=lambda: UUID('00000000-0000-4000-8000-000000000000'), metadata={'field_type': 'uuid'})
     changed_on: datetime = field(default_factory=default_datetime)
 
     _is_partial: InitVar[bool] = False

{rococo-1.0.0 → rococo-1.0.3}/rococo/repositories/mysql/mysql_repository.py

@@ -37,7 +37,7 @@ class MySqlRepository(BaseRepository):
                 
             field_value = data[field.name]
 
-            if field.metadata.get('field_type') == 'entity_id':
+            if field.metadata.get('field_type') in ['entity_id', 'uuid']:
                 if isinstance(field_value, VersionedModel):
                     field_value = str(field_value.entity_id).replace('-', '')
                 elif isinstance(field_value, dict):
@@ -174,7 +174,8 @@ class MySqlRepository(BaseRepository):
         join_fields: List[str] = None,
         additional_fields: List[str] = None,
         sort: List[tuple] = None,
-        limit: int = 100
+        limit: int = None,
+        offset: int = None
     ) -> List[VersionedModel]:
         """get many"""
         if additional_fields is None:
@@ -230,7 +231,7 @@ class MySqlRepository(BaseRepository):
                         raise NotImplementedError
 
         records = self._execute_within_context(
-            self.adapter.get_many, self.table_name, conditions, sort, limit, join_statements=join_stmt_list, additional_fields=additional_fields
+            self.adapter.get_many, self.table_name, conditions, sort, limit, offset, join_statements=join_stmt_list, additional_fields=additional_fields
         )
 
         # If the adapter returned a single dictionary, wrap it in a list

{rococo-1.0.0 → rococo-1.0.3}/rococo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rococo
-Version: 1.0.0
+Version: 1.0.3
 Summary: A Python library to help build things the way we want them built
 Home-page: https://github.com/EcorRouge/rococo
 Author: Jay Grieves

{rococo-1.0.0 → rococo-1.0.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='rococo',
-    version='1.0.0',
+    version='1.0.3',
     packages=find_packages(),
     url='https://github.com/EcorRouge/rococo',
     license='MIT',