sibi-dst 0.3.43__tar.gz → 0.3.45__tar.gz

{sibi_dst-0.3.43 → sibi_dst-0.3.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sibi-dst
-Version: 0.3.43
+Version: 0.3.45
 Summary: Data Science Toolkit
 Author: Luis Valverde
 Author-email: lvalverdeb@gmail.com

{sibi_dst-0.3.43 → sibi_dst-0.3.45}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sibi-dst"
-version = "0.3.43"
+version = "0.3.45"
 description = "Data Science Toolkit"
 authors = ["Luis Valverde <lvalverdeb@gmail.com>"]
 readme = "README.md"

{sibi_dst-0.3.43 → sibi_dst-0.3.45}/sibi_dst/df_helper/_parquet_artifact.py

@@ -1,3 +1,4 @@
+import datetime
 import logging
 from typing import Optional, Any, Dict
 
@@ -136,7 +137,30 @@ class ParquetArtifact(DfHelper):
 
     def update_parquet(self, period: str = 'today', **kwargs) -> None:
         """Update the Parquet file with data from a specific period."""
-        kwargs.update(self.parse_parquet_period(period=period))
+
+        def itd_config():
+            try:
+                start_date = kwargs.pop('history_begins_on')
+            except KeyError:
+                raise ValueError("For period 'itd', you must provide 'history_begins_on' in kwargs.")
+            return {'parquet_start_date': start_date, 'parquet_end_date': datetime.date.today().strftime('%Y-%m-%d')}
+
+        def ytd_config():
+            return {
+                'parquet_start_date': datetime.date(datetime.date.today().year, 1, 1).strftime('%Y-%m-%d'),
+                'parquet_end_date': datetime.date.today().strftime('%Y-%m-%d')
+            }
+
+        config_map = {
+            'itd': itd_config,
+            'ytd': ytd_config
+        }
+
+        if period in config_map:
+            kwargs.update(config_map[period]())
+        else:
+            kwargs.update(self.parse_parquet_period(period=period))
+        self.logger.debug(f"kwargs passed to update parquet: {kwargs}")
         self.generate_parquet(**kwargs)
 
     def rebuild_parquet(self, **kwargs) -> None:

{sibi_dst-0.3.43 → sibi_dst-0.3.45}/sibi_dst/df_helper/backends/django/_load_from_db.py

@@ -64,6 +64,7 @@ class DjangoLoadFromDb:
         self.connection_config = db_connection
         self.debug = kwargs.pop('debug', False)
         self.logger = logger or Logger.default_logger(logger_name=self.__class__.__name__)
+        self.logger.set_level(Logger.DEBUG if self.debug else Logger.INFO)
         if self.connection_config.model is None:
             if self.debug:
                 self.logger.debug('Model must be specified')

{sibi_dst-0.3.43 → sibi_dst-0.3.45}/sibi_dst/df_helper/backends/parquet/_filter_handler.py

@@ -17,8 +17,9 @@ class ParquetFilterHandler(object):
     :ivar logger: Logger object to handle logging within the class. Defaults to the class-level logger.
     :type logger: Logger
     """
-    def __init__(self, logger=None):
+    def __init__(self, logger=None, debug=False):
         self.logger = logger or Logger.default_logger(logger_name=self.__class__.__name__)
+        self.logger.set_level(Logger.DEBUG if debug else Logger.INFO)
 
     @staticmethod
     def apply_filters_dask(df, filters):

{sibi_dst-0.3.43 → sibi_dst-0.3.45}/sibi_dst/df_helper/backends/parquet/_parquet_options.py

@@ -62,6 +62,7 @@ class ParquetConfig(BaseModel):
     parquet_end_date: Optional[str] = None
     fs: Optional[fsspec.spec.AbstractFileSystem] = None  # Your fsspec filesystem object
     logger: Optional[Logger] = None
+    debug: bool = False
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
     @model_validator(mode='after')
@@ -83,9 +84,7 @@ class ParquetConfig(BaseModel):
         # Configure paths based on fsspec
         if self.logger is None:
             self.logger = Logger.default_logger(logger_name=self.__class__.__name__)
-        #self.fs = fsspec.filesystem("file") if "://" not in str(self.parquet_storage_path) else fsspec.filesystem(
-        #    str(self.parquet_storage_path).split("://")[0])
-        # Validation for parquet path
+        self.logger.set_level(Logger.DEBUG if self.debug else Logger.INFO)
 
 
         if self.parquet_storage_path is None:

{sibi_dst-0.3.43 → sibi_dst-0.3.45}/sibi_dst/df_helper/backends/sqlalchemy/_io_dask.py

@@ -29,6 +29,7 @@ class SQLAlchemyDask:
         self.engine = create_engine(engine_url)
         self.Session = sessionmaker(bind=self.engine)
         self.logger = logger or Logger.default_logger(logger_name=self.__class__.__name__)
+        self.logger.set_level(logger.DEBUG if debug else logger.INFO)
 
     @staticmethod
     def infer_dtypes_from_model(model):
@@ -70,11 +71,7 @@ class SQLAlchemyDask:
                 # Build query
                 self.query = select(self.model)
                 if self.filters:
-                    """
-                    deprecated specific filter handling to a generic one
-                    #self.query = SqlAlchemyFilterHandler.apply_filters_sqlalchemy(self.query, self.model, self.filters)
-                    """
-                    self.query = FilterHandler(backend="sqlalchemy", logger=self.logger).apply_filters(self.query,
+                    self.query = FilterHandler(backend="sqlalchemy", logger=self.logger, debug=self.debug).apply_filters(self.query,
                                                                                                        model=self.model,
                                                                                                        filters=self.filters)
                 else:

{sibi_dst-0.3.43 → sibi_dst-0.3.45}/sibi_dst/df_helper/core/_filter_handler.py

@@ -25,7 +25,7 @@ class FilterHandler:
     :ivar backend_methods: A dictionary mapping backend-specific methods for column retrieval and operation application.
     :type backend_methods: dict
     """
-    def __init__(self, backend, logger=None):
+    def __init__(self, backend, logger=None, debug=False):
         """
         Initialize the FilterHandler.
 
@@ -36,6 +36,7 @@ class FilterHandler:
         self.backend = backend
         self.logger = logger or Logger.default_logger(
             logger_name=self.__class__.__name__)  # No-op logger if none provided
+        self.logger.set_level(Logger.DEBUG if debug else Logger.INFO)
         self.backend_methods = self._get_backend_methods(backend)
 
     def apply_filters(self, query_or_df, model=None, filters=None):

{sibi_dst-0.3.43 → sibi_dst-0.3.45}/sibi_dst/utils/log_utils.py

@@ -26,6 +26,12 @@ class Logger:
     :type logger: logging.Logger
     """
 
+    DEBUG = logging.DEBUG
+    INFO = logging.INFO
+    WARNING = logging.WARNING
+    ERROR = logging.ERROR
+    CRITICAL = logging.CRITICAL
+
     def __init__(self, log_dir: str, logger_name: str, log_file: str, log_level: int = logging.DEBUG):
         """
         Initialize the Logger instance.