Merge pull request #3 from xmalet-nrcan/main

BUG FIX

Author: xmalet-nrcan

nrcan_etl_toolbox/database/interface/abstract_database_objects_handlers.py

@@ -4,6 +4,7 @@
 from typing import TypeVar
 
 import sqlalchemy.engine
+from dateutil import parser as date_parser
 from psycopg2.errors import UniqueViolation
 from sqlalchemy import BinaryExpression, create_engine, func
 from sqlalchemy.exc import DataError, IntegrityError
@@ -22,6 +23,26 @@ class AbstractDatabaseObjectsInterface:
 
     logger = CustomLogger("database_objects_handler", logger_type="default")
 
+    @staticmethod
+    def _is_date_valid(date_string: str) -> bool:
+        """
+        Validates if a date string is in a valid date format.
+
+        Args:
+            date_string: The string to validate
+
+        Returns:
+            bool: True if the date is valid, False otherwise
+        """
+        if not isinstance(date_string, str):
+            return False
+        try:
+            # dateutil.parser can handle many date formats
+            date_parser.parse(date_string)
+            return True
+        except (ValueError, TypeError):
+            return False
+
     def __init__(self, database_url: str, db_objects_to_treat: list = None, logger_level="DEBUG"):
         if db_objects_to_treat is None:
             db_objects_to_treat = []
@@ -60,10 +81,10 @@ def _connect_to_database(self, database_url):
     def _insert_object(self, db_object: Base) -> bool | None:
         with self.session as session:
             try:
-                session.begin(nested=True)
-                session.add(db_object)
-                session.commit()
-                return True
+                with session.begin(nested=True):
+                    session.add(db_object)
+                    session.commit()
+                    return True
             except IntegrityError as e:
                 session.rollback()
                 if isinstance(e.orig, UniqueViolation):

nrcan_etl_toolbox/database/orm/base/base_table_mapping.py

@@ -156,7 +156,7 @@ def get_query_for_object(
         else:
             # Collect conditions dynamically
             for attr, value in filters.items():
-                if value is not None and hasattr(cls, attr):
+                if value is not None and hasattr(cls, attr) and not isinstance(value, Base):
                     # Add equality and "LIKE" conditions
                     column_attr = getattr(cls, attr)
 

pyproject.toml

@@ -1,6 +1,8 @@
 [project]
 name = "nrcan_etl_toolbox"
-version = "0.1.40"
+
+version = "0.1.45"
+
 description = "Package for logging and database interfacing using SQLAlchemy and SQLModels"
 authors = [
     { name = "Xavier Malet", email = "[email protected]" }