rococo 1.0.4__tar.gz → 1.0.6__tar.gz

{rococo-1.0.4 → rococo-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rococo
-Version: 1.0.4
+Version: 1.0.6
 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.4 → rococo-1.0.6}/rococo/config/config.py

@@ -1,21 +1,23 @@
 """
 Config class that allows to load from a .toml file, and/or use a .env file.
 """
+import json
+import logging
 import os
 import re
-import json
 from abc import abstractmethod
-from typing import Optional
-import logging
+from typing import List, Optional
+
 from dotenv import load_dotenv
 
 logger = logging.getLogger(__name__)
 
 
-class BaseConfig():
+class BaseConfig:
     """
     Config class that allows to load from a .toml file, and/or use a .env file.
     """
+
     def __init__(self):
         load_dotenv()
         self.project_version = None
@@ -40,7 +42,7 @@ class BaseConfig():
             logger.warning("Variable %s not found.", var_name)
             return None
 
-    def load_toml(self, toml_folder_dir: str, log_version_string: bool=True) -> bool:
+    def load_toml(self, toml_folder_dir: str, log_version_string: bool = True) -> bool:
         """
         Loads the toml file for the project
         Args:
@@ -87,19 +89,18 @@ class BaseConfig():
         logger.warning("Warning: var %s not found.", var_name)
         return False
 
-    def get_var_as_list(self, var_name: str) -> bool:
+    def get_var_as_list(self, var_name: str) -> Optional[List]:
         """
         Returns a comma-delimited var as list
         """
-        if var_name in self.env_vars.keys():
-            try:
-                return [env_var.strip() for env_var in self.env_vars[var_name].split(",")]
-            except ValueError:
-                logger.error(
-                    "Error: Invalid input format. Please provide a comma-delimited string.")
-        logger.warning("Warning: var %s not found.", var_name)
-        return None
+        if var_name not in self.env_vars.keys():
+            logger.warning("Warning: var %s not found.", var_name)
+            return None
 
+        try:
+            return [env_var.strip() for env_var in self.env_vars[var_name].split(",")]
+        except ValueError:
+            logger.error("Error: Invalid input format. Please provide a comma-delimited string.")
 
     def convert_var_from_json_string(self, var_name: str) -> bool:
         """
@@ -120,3 +121,4 @@ class BaseConfig():
         """
         Abstract method for validation of the env vars.
         """
+        pass

{rococo-1.0.4 → rococo-1.0.6}/rococo/data/mysql.py

@@ -1,6 +1,7 @@
 import logging
-from typing import Any, Dict, List, Tuple, Union
+from typing import Any, Dict, List, Tuple, Union, Optional
 from uuid import UUID
+
 import pymysql
 
 from rococo.data.base import DbAdapter
@@ -19,7 +20,6 @@ class MySqlAdapter(DbAdapter):
         self._connection = None
         self._cursor = None
 
-
     def __enter__(self):
         """Context manager entry point for creating DB connection."""
         self._connection = pymysql.connect(
@@ -34,7 +34,6 @@ class MySqlAdapter(DbAdapter):
 
         return self
 
-
     def __exit__(self, exc_type, exc_value, traceback):
         """Context manager exit point for closing DB connection."""
 
@@ -46,7 +45,6 @@ class MySqlAdapter(DbAdapter):
             self._connection.close()
             self._connection = None
 
-
     @property
     def connect(self):
         return pymysql.connect(
@@ -80,10 +78,16 @@ class MySqlAdapter(DbAdapter):
         elif isinstance(value, type(None)):
             return f"{key} IS NULL"
         else:
-            raise Exception(f"Unsuppported type {type(value)} for condition key: {key}, value: {value}")
+            raise Exception(f"Unsupported type {type(value)} for condition key: {key}, value: {value}")
 
     def move_entity_to_audit_table(self, table, entity_id):
-        query = f"""INSERT INTO {table}_audit (SELECT * FROM {table} WHERE entity_id="{str(entity_id).replace('-', '')}")"""
+        # Get the column names from the table
+        self._call_cursor('execute', f"SHOW COLUMNS FROM {table}")
+
+        column_list = ", ".join(column.get('Field') for column in self._cursor.fetchall())
+
+        query = f"""INSERT INTO {table}_audit ({column_list}) (SELECT {column_list} FROM {table} WHERE entity_id="{str(entity_id).replace('-', '')}");"""
+
         self._call_cursor('execute', query)
         self._connection.commit()
 
@@ -109,13 +113,13 @@ class MySqlAdapter(DbAdapter):
         return response
 
     def get_one(
-        self,
-        table: str,
-        conditions: Dict[str, Any],
-        sort: List[Tuple[str, str]] = None,
-        join_statements: list = None,
-        additional_fields: list = None
-    ) -> Dict[str, Any]:
+            self,
+            table: str,
+            conditions: Dict[str, Any],
+            sort: List[Tuple[str, str]] = None,
+            join_statements: list = None,
+            additional_fields: list = None
+    ) -> Optional[Dict[str, Any]]:
         fields = [f'{table}.*']
         if additional_fields:
             fields += additional_fields
@@ -123,7 +127,7 @@ class MySqlAdapter(DbAdapter):
         query = f"SELECT {', '.join(fields)} FROM {table}"
         for join_stmt in join_statements:
             query += f"""\n{join_stmt}\n"""
-        
+
         condition_strs = []
         if conditions:
             condition_strs = [f"{self._build_condition_string(table, k, v)}" for k, v in conditions.items()]
@@ -144,15 +148,15 @@ class MySqlAdapter(DbAdapter):
             return db_response
 
     def get_many(
-        self,
-        table: str,
-        conditions: Dict[str, Any] = None,
-        sort: List[Tuple[str, str]] = None,
-        limit: int = None,
-        offset: int = None,
-        active: bool = True,
-        join_statements: list = None,
-        additional_fields: list = None
+            self,
+            table: str,
+            conditions: Dict[str, Any] = None,
+            sort: List[Tuple[str, str]] = None,
+            limit: int = None,
+            offset: int = None,
+            active: bool = True,
+            join_statements: list = None,
+            additional_fields: list = None
     ) -> List[Dict[str, Any]]:
 
         fields = [f'{table}.*']
@@ -178,8 +182,6 @@ class MySqlAdapter(DbAdapter):
         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:
             return []
@@ -209,4 +211,5 @@ class MySqlAdapter(DbAdapter):
     def delete(self, table: str, data: Dict[str, Any]) -> bool:
         # Set active = false
         data['active'] = False
-        return self.save(table, data)
+        self.save(table, data)
+        return True

{rococo-1.0.4 → rococo-1.0.6}/rococo/messaging/sqs.py

@@ -3,6 +3,7 @@ import json
 import logging
 import uuid
 import boto3
+from dotenv import dotenv_values
 
 from . import MessageAdapter
 
@@ -14,7 +15,8 @@ class SqsConnection(MessageAdapter):
 
     def __init__(self, aws_access_key_id: str = None,
                  aws_access_key_secret: str = None,
-                 region_name: str = None):
+                 region_name: str = None,
+                 consume_config_file_path: str = None):
         """Initializes a new SQS connection.
 
         Args:
@@ -26,6 +28,7 @@ class SqsConnection(MessageAdapter):
         self._aws_access_key_id = aws_access_key_id
         self._aws_access_key_secret = aws_access_key_secret
         self._region_name = region_name
+        self._consume_config_file_path = consume_config_file_path
         self._sqs = boto3.resource('sqs',
                                    aws_access_key_id=self._aws_access_key_id,
                                    aws_secret_access_key=self._aws_access_key_secret,
@@ -38,6 +41,11 @@ class SqsConnection(MessageAdapter):
     def __exit__(self, exc_type, exc_value, traceback):
         pass
 
+    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 SQS queue.
         
@@ -83,6 +91,9 @@ class SqsConnection(MessageAdapter):
             )
             if not responses:
                 logger.info("No messages left in queue.")
+                if self._read_consume_config().get('EXIT_WHEN_FINISHED') == '1':
+                    logger.info("EXIT_WHEN_FINISHED=1 and no messages left in queue. Exiting...")
+                    return
                 continue
 
             response = {}

{rococo-1.0.4 → rococo-1.0.6}/rococo/repositories/mysql/mysql_repository.py

@@ -1,12 +1,12 @@
-"""SurrealDbRepository class"""
+"""MySqlDbRepository class"""
 
+import re
 from dataclasses import fields
+from datetime import datetime
 from typing import Any, Dict, List, Type, Union
 from uuid import UUID
-import re
-from datetime import datetime
 
-from rococo.data import SurrealDbAdapter
+from rococo.data import MySqlAdapter
 from rococo.messaging import MessageAdapter
 from rococo.models import VersionedModel
 from rococo.repositories import BaseRepository
@@ -17,7 +17,7 @@ class MySqlRepository(BaseRepository):
 
     def __init__(
             self,
-            db_adapter: SurrealDbAdapter,
+            db_adapter: MySqlAdapter,
             model: Type[VersionedModel],
             message_adapter: MessageAdapter,
             queue_name: str,
@@ -34,7 +34,7 @@ class MySqlRepository(BaseRepository):
         for field in fields(instance):
             if data.get(field.name) is None:
                 continue
-                
+
             field_value = data[field.name]
 
             if field.metadata.get('field_type') in ['entity_id', 'uuid']:
@@ -49,7 +49,7 @@ class MySqlRepository(BaseRepository):
                 field_value = str(field_value).replace('-', '')
             if isinstance(field_value, datetime):
                 field_value = field_value.strftime('%Y-%m-%d %H:%M:%S')
-            
+
             data[field.name] = field_value
         return data
 
@@ -60,7 +60,7 @@ class MySqlRepository(BaseRepository):
             model()
             is_partial = not all(_field.name in data for _field in fields(model))
             for field in fields(model):
-                if data.get(field.name) is None: 
+                if data.get(field.name) is None:
                     continue
 
                 if field.metadata.get('field_type') == 'entity_id':
@@ -80,7 +80,8 @@ class MySqlRepository(BaseRepository):
                             field_data = {'entity_id': field_value}
                             for _field in fields(field_model_class):
                                 if f'joined_{field.name}_{field_table_name}_{_field.name}' in data:
-                                    field_data[_field.name] = data[f'joined_{field.name}_{field_table_name}_{_field.name}']
+                                    field_data[_field.name] = data[
+                                        f'joined_{field.name}_{field_table_name}_{_field.name}']
                             for data_field, data_value in data.items():
                                 if data_field.startswith('joined_'):
                                     field_data[data_field] = data_value
@@ -104,8 +105,8 @@ class MySqlRepository(BaseRepository):
         else:
             raise NotImplementedError
 
-
-    def get_one(self, conditions: Dict[str, Any] = None, join_fields: List[str] = None, additional_fields: List[str] = None) -> Union[VersionedModel, None]:
+    def get_one(self, conditions: Dict[str, Any] = None, join_fields: List[str] = None,
+                additional_fields: List[str] = None) -> Union[VersionedModel, None]:
         """get one"""
 
         if additional_fields is None:
@@ -118,7 +119,8 @@ class MySqlRepository(BaseRepository):
                 if '.' in field_name:
                     parent_field, child_field = field_name.rsplit('.', 1)
                     if parent_field not in joined_fields:
-                        raise Exception(f"Parent field {parent_field} needs to be joined before joining {child_field} field. Raised while joining {field_name} for model {self.model.__name__}.")
+                        raise Exception(
+                            f"Parent field {parent_field} needs to be joined before joining {child_field} field. Raised while joining {field_name} for model {self.model.__name__}.")
                     parent_model = joined_fields[parent_field]
                 else:
                     parent_model = self.model
@@ -129,8 +131,11 @@ class MySqlRepository(BaseRepository):
                     raise Exception(f"Invalid join field {child_field} specified for model {parent_model.__name__}.")
                 join_model = join_field.metadata.get('relationship').get('model')
                 join_table_name = re.sub(r'(?<!^)(?=[A-Z])', '_', join_model.__name__).lower()
-                join_stmt_list.append(f'INNER JOIN {join_table_name} ON {parent_table_name}.{child_field}={join_table_name}.entity_id AND {join_table_name}.active=true')
-                join_field_list = [f'{join_table_name}.{_field.name} AS joined_{child_field}_{join_table_name}_{_field.name}' for _field in fields(join_model)]
+                join_stmt_list.append(
+                    f'INNER JOIN {join_table_name} ON {parent_table_name}.{child_field}={join_table_name}.entity_id AND {join_table_name}.active=true')
+                join_field_list = [
+                    f'{join_table_name}.{_field.name} AS joined_{child_field}_{join_table_name}_{_field.name}' for
+                    _field in fields(join_model)]
                 additional_fields += join_field_list
                 joined_fields[field_name] = join_model
 
@@ -156,7 +161,8 @@ class MySqlRepository(BaseRepository):
                         raise NotImplementedError
 
         data = self._execute_within_context(
-            self.adapter.get_one, self.table_name, conditions, join_statements=join_stmt_list, additional_fields=additional_fields
+            self.adapter.get_one, self.table_name, conditions, join_statements=join_stmt_list,
+            additional_fields=additional_fields
         )
 
         self.model()  # Calls __post_init__ of model to import related models and update fields.
@@ -167,15 +173,14 @@ class MySqlRepository(BaseRepository):
             return None
         return self.model.from_dict(data)
 
-
     def get_many(
-        self,
-        conditions: Dict[str, Any] = None,
-        join_fields: List[str] = None,
-        additional_fields: List[str] = None,
-        sort: List[tuple] = None,
-        limit: int = None,
-        offset: int = None
+            self,
+            conditions: Dict[str, Any] = None,
+            join_fields: List[str] = None,
+            additional_fields: List[str] = None,
+            sort: List[tuple] = None,
+            limit: int = None,
+            offset: int = None
     ) -> List[VersionedModel]:
         """get many"""
         if additional_fields is None:
@@ -188,7 +193,8 @@ class MySqlRepository(BaseRepository):
                 if '.' in field_name:
                     parent_field, child_field = field_name.rsplit('.', 1)
                     if parent_field not in joined_fields:
-                        raise Exception(f"Parent field {parent_field} needs to be joined before joining {child_field} field. Raised while joining {field_name} for model {self.model.__name__}.")
+                        raise Exception(
+                            f"Parent field {parent_field} needs to be joined before joining {child_field} field. Raised while joining {field_name} for model {self.model.__name__}.")
                     parent_model = joined_fields[parent_field]
                 else:
                     parent_model = self.model
@@ -199,12 +205,14 @@ class MySqlRepository(BaseRepository):
                     raise Exception(f"Invalid join field {child_field} specified for model {parent_model.__name__}.")
                 join_model = join_field.metadata.get('relationship').get('model')
                 join_table_name = re.sub(r'(?<!^)(?=[A-Z])', '_', join_model.__name__).lower()
-                join_stmt_list.append(f'INNER JOIN {join_table_name} ON {parent_table_name}.{child_field}={join_table_name}.entity_id AND {join_table_name}.active=true')
-                join_field_list = [f'{join_table_name}.{_field.name} AS joined_{child_field}_{join_table_name}_{_field.name}' for _field in fields(join_model)]
+                join_stmt_list.append(
+                    f'INNER JOIN {join_table_name} ON {parent_table_name}.{child_field}={join_table_name}.entity_id AND {join_table_name}.active=true')
+                join_field_list = [
+                    f'{join_table_name}.{_field.name} AS joined_{child_field}_{join_table_name}_{_field.name}' for
+                    _field in fields(join_model)]
                 additional_fields += join_field_list
                 joined_fields[field_name] = join_model
 
-
         if conditions:
             for condition_name, value in conditions.copy().items():
                 condition_field = next((field for field in fields(self.model) if field.name == condition_name), None)
@@ -231,7 +239,8 @@ class MySqlRepository(BaseRepository):
                         raise NotImplementedError
 
         records = self._execute_within_context(
-            self.adapter.get_many, self.table_name, conditions, sort, limit, offset, 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.4 → rococo-1.0.6}/rococo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rococo
-Version: 1.0.4
+Version: 1.0.6
 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.4 → rococo-1.0.6}/setup.py

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