rococo 1.3.0__tar.gz → 1.3.2__tar.gz

{rococo-1.3.0 → rococo-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rococo
-Version: 1.3.0
+Version: 1.3.2
 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.3.0 → rococo-1.3.2}/rococo/data/postgresql.py

@@ -11,7 +11,18 @@ from rococo.data.base import DbAdapter
 class PostgreSQLAdapter(DbAdapter):
     """PostgreSQL adapter for interacting with PostgreSQL."""
 
-    def __init__(self, host: str, port: int, user: str, password: str, database: str, connection_resolver: Optional[Callable] = None, connection_closer: Optional[Callable] = None):
+
+    def __init__(
+        self,
+        host: str,
+        port: int,
+        user: str,
+        password: str,
+        database: str,
+        connection_resolver: Optional[Callable] = None,
+        connection_closer: Optional[Callable] = None,
+        connect_kwargs: Optional[dict] = None,
+    ):
         self._host = host
         self._port = port
         self._user = user
@@ -19,7 +30,8 @@ class PostgreSQLAdapter(DbAdapter):
         self._database = database
         self._connection = None
         self._cursor = None
-        self._table_columns_cache = {}  # Cache for table column names
+        self._table_columns_cache = {}
+        self._connect_kwargs = connect_kwargs or {}
 
         if connection_resolver is None:
             self._connection_resolver = psycopg2.connect
@@ -28,6 +40,7 @@ class PostgreSQLAdapter(DbAdapter):
 
         self._connection_closer = connection_closer
 
+
     def __enter__(self):
         """Context manager entry point for creating DB connection."""
         self._connection = self.connect
@@ -60,7 +73,8 @@ class PostgreSQLAdapter(DbAdapter):
             port=self._port,
             user=self._user,
             password=self._password,
-            database=self._database
+            database=self._database,
+            **self._connect_kwargs
         )
 
     def _call_cursor(self, function_name, *args, **kwargs):
@@ -405,8 +419,8 @@ class PostgreSQLAdapter(DbAdapter):
             return True
         except psycopg2.Error as ex:
             self._connection.rollback()
-            if retry_count < 3 and ex.args[0] == 1213:
-                # Deadlock detected
+            if retry_count < 3 and getattr(ex, 'pgcode', None) == '40P01':
+                # Deadlock detected (PostgreSQL SQLSTATE 40P01)
                 logging.warning("Deadlock detected on table %s. Retrying in %d seconds. Attempt %d",
                                 table_name, 2**retry_count, retry_count+1)
                 time.sleep(2**retry_count)

{rococo-1.3.0 → rococo-1.3.2}/rococo/emailing/mailjet.py

@@ -71,8 +71,14 @@ class MailjetService(EmailService):
     def __call__(self, config: MailjetConfig, *args, **kwargs):
         super().__call__(config)
 
-        match = re.match(r'^(.*)\s*<(.*)>$', self.config.SOURCE_EMAIL)
-        name, email = match.groups()
+        # Parse SOURCE_EMAIL which accepts two formats:
+        #   "Name <email@example.com>"  → {"Name": "Name", "Email": "email@example.com"}
+        #   "user@example.com"          → {"Name": "", "Email": "user@example.com"}
+        match = re.match(r'^\s*(.*?)\s*<(.+)>\s*$', self.config.SOURCE_EMAIL)
+        if match:
+            name, email = match.groups()
+        else:
+            name, email = '', self.config.SOURCE_EMAIL.strip()
         self.from_address = {"Name": name, "Email": email}
 
         self.client = Client(
@@ -152,7 +158,7 @@ class MailjetService(EmailService):
             response_data = result.json()["Data"]
         except Exception as e:
             message = f"Couldn't find Mailjet contact for {email}: {e}"
-            logger.exception(message, "warning")
+            logger.exception(message)
             return
 
         for contact in response_data:
@@ -163,4 +169,4 @@ class MailjetService(EmailService):
                     self.config.MAILJET_API_KEY, self.config.MAILJET_API_SECRET), timeout=15)
             except Exception as e:
                 message = f"Couldn't remove Mailjet contact for {email} : {e}"
-                logger.exception(message, "warning")
+                logger.exception(message)

{rococo-1.3.0 → rococo-1.3.2}/rococo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rococo
-Version: 1.3.0
+Version: 1.3.2
 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.3.0 → rococo-1.3.2}/setup.py

@@ -64,7 +64,7 @@ extras_require["all"] = [
 
 setup(
     name='rococo',
-    version='1.3.0',
+    version='1.3.2',
     packages=find_packages(),
     url='https://github.com/EcorRouge/rococo',
     license='MIT',