Merge pull request #2 from xmalet-nrcan/main

Update the main project from developments changes.

Author: xmalet-nrcan

nrcan_etl_toolbox/database/__init__.py

@@ -0,0 +1,13 @@
+from nrcan_etl_toolbox.database.database_connection_config import DatabaseConfig
+from nrcan_etl_toolbox.database.interface.abstract_database_objects_handlers import AbstractDatabaseObjectsInterface
+from nrcan_etl_toolbox.database.orm import FONCTION_FILTER, LIMIT, OFFSET, ORDER_BY, Base
+
+__all__ = [
+    "DatabaseConfig",
+    "AbstractDatabaseObjectsInterface",
+    "Base",
+    "FONCTION_FILTER",
+    "OFFSET",
+    "ORDER_BY",
+    "LIMIT",
+]

nrcan_etl_toolbox/database/database_connection_config.py

@@ -0,0 +1,14 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class DatabaseConfig:
+    host: str
+    port: int
+    database: str
+    user: str
+    password: str
+
+    @property
+    def url(self) -> str:
+        return f"postgresql://{self.user}:{self.password}@{self.host}:{self.port}/{self.database}"

nrcan_etl_toolbox/database/interface/abstract_database_objects_handlers.py

@@ -170,9 +170,7 @@ def _get_or_create_element(
             self.session.begin(nested=True)
             data = self._get_element_in_database(table_model=table_model, condition=condition, **kwargs)
             if data is not None and len(data) == 0:
-                data = self._get_element_to_be_inserted(
-                    dict_element=dict_element, table_model=table_model, **kwargs
-                )
+                data = self._get_element_to_be_inserted(dict_element=dict_element, table_model=table_model, **kwargs)
         except Exception as e:
             self.session.rollback()
             self.logger.warning(

nrcan_etl_toolbox/etl_toolbox/data_downloader/__init__.py

@@ -0,0 +1,8 @@
+from nrcan_etl_toolbox.etl_toolbox.data_downloader.ftp.ftp_downloader import (
+    BaseDownloader,
+    DownloaderFactory,
+    FTPDownloader,
+    SFTPDownloader,
+)
+
+__all__ = ["DownloaderFactory", "BaseDownloader", "FTPDownloader", "SFTPDownloader"]