lecrapaud 0.11.3__tar.gz → 0.11.5__tar.gz

{lecrapaud-0.11.3 → lecrapaud-0.11.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lecrapaud
-Version: 0.11.3
+Version: 0.11.5
 Summary: Framework for machine and deep learning, with regression, classification and time series analysis
 License: Apache License
 Author: Pierre H. Gallet

{lecrapaud-0.11.3 → lecrapaud-0.11.5}/lecrapaud/api.py

@@ -28,6 +28,7 @@ Basic Usage:
 import joblib
 import pandas as pd
 import ast
+import os
 import logging
 import seaborn as sns
 import numpy as np
@@ -47,6 +48,7 @@ from lecrapaud.experiment import create_experiment
 from lecrapaud.db import Experiment
 from lecrapaud.search_space import normalize_models_idx
 from lecrapaud.utils import logger
+from lecrapaud.directories import tmp_dir
 
 
 class LeCrapaud:
@@ -109,6 +111,12 @@ class ExperimentEngine:
         if id:
             self.experiment = Experiment.get(id)
             kwargs.update(self.experiment.context)
+            experiment_dir = f"{tmp_dir}/{self.experiment.name}"
+            preprocessing_dir = f"{experiment_dir}/preprocessing"
+            data_dir = f"{experiment_dir}/data"
+            os.makedirs(experiment_dir, exist_ok=True)
+            os.makedirs(preprocessing_dir, exist_ok=True)
+            os.makedirs(data_dir, exist_ok=True)
         else:
             if data is None:
                 raise ValueError("Either id or data must be provided")
@@ -201,10 +209,17 @@ class ExperimentEngine:
                 )
                 y_pred.name = "PRED"
 
-            # evaluate if TARGET is in columns
-            new_data.columns = new_data.columns.str.upper()
-            if f"TARGET_{target_number}" in new_data.columns:
-                y_true = new_data[f"TARGET_{target_number}"]
+            # evaluate if TARGET is in columns (case-insensitive check)
+            target_col = next(
+                (
+                    col
+                    for col in new_data.columns
+                    if col.upper() == f"TARGET_{target_number}"
+                ),
+                None,
+            )
+            if target_col is not None:
+                y_true = new_data[target_col]
                 prediction = pd.concat([y_true, y_pred], axis=1)
                 prediction.rename(
                     columns={f"TARGET_{target_number}": "TARGET"}, inplace=True

{lecrapaud-0.11.3 → lecrapaud-0.11.5}/lecrapaud/db/alembic/env.py

@@ -15,7 +15,7 @@ config.set_main_option("sqlalchemy.url", DATABASE_URL)
 # Interpret the config file for Python logging.
 # This line sets up loggers basically.
 if config.config_file_name is not None:
-    fileConfig(config.config_file_name)
+    fileConfig(config.config_file_name, disable_existing_loggers=False)
 
 # add your model's MetaData object here
 # for 'autogenerate' support

{lecrapaud-0.11.3 → lecrapaud-0.11.5}/lecrapaud/db/alembic.ini

@@ -84,11 +84,14 @@ sqlalchemy.url = %(DATABASE_URL)s
 [loggers]
 keys = root,sqlalchemy,alembic
 
+[loggers_root]
+disable_existing_loggers = False
+
 [handlers]
 keys = console
 
 [formatters]
-keys = generic
+keys = lecrapaud_format
 
 [logger_root]
 level = WARN
@@ -109,8 +112,8 @@ qualname = alembic
 class = StreamHandler
 args = (sys.stderr,)
 level = NOTSET
-formatter = generic
+formatter = lecrapaud_format
 
-[formatter_generic]
-format = %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S
+[formatter_lecrapaud_format]
+format = %(asctime)s - %(name)s - %(levelname)s - %(funcName)s - %(message)s
+datefmt = %Y-%m-%d %H:%M:%S

{lecrapaud-0.11.3 → lecrapaud-0.11.5}/lecrapaud/utils.py

@@ -57,11 +57,6 @@ def setup_logger():
         file_handler.setLevel(log_level)
         logger.addHandler(file_handler)
 
-    stream_handler = logging.StreamHandler(sys.stdout)
-    stream_handler.setFormatter(formatter)
-    stream_handler.setLevel(log_level)
-    logger.addHandler(stream_handler)
-
     _LECRAPAUD_LOGGER_ALREADY_CONFIGURED = True
     return logger
 

{lecrapaud-0.11.3 → lecrapaud-0.11.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lecrapaud"
-version = "0.11.3"
+version = "0.11.5"
 description = "Framework for machine and deep learning, with regression, classification and time series analysis"
 authors = [
     {name = "Pierre H. Gallet"}