lecrapaud 0.9.4__py3-none-any.whl → 0.10.1__py3-none-any.whl

lecrapaud/api.py

@@ -167,14 +167,10 @@ class ExperimentEngine:
                 else:
                     scores_reg.append(score)
 
-            # renaming pred column and concatenating with initial data
+            # renaming and concatenating with initial data
             if isinstance(y_pred, pd.DataFrame):
-                y_pred.rename(
-                    columns={"PRED": f"TARGET_{target_number}_PRED"}, inplace=True
-                )
-                new_data = pd.concat(
-                    [new_data, y_pred[f"TARGET_{target_number}_PRED"]], axis=1
-                )
+                y_pred = y_pred.add_prefix(f"TARGET_{target_number}_")
+                new_data = pd.concat([new_data, y_pred], axis=1)
 
             else:
                 y_pred.name = f"TARGET_{target_number}_PRED"
@@ -294,3 +290,8 @@ class ExperimentEngine:
 
     def get_feature_summary(self):
         return pd.read_csv(f"{self.experiment.path}/feature_summary.csv")
+
+    def get_threshold(self, target_number: int):
+        return joblib.load(
+            f"{self.experiment.path}/TARGET_{target_number}/thresholds.pkl"
+        )

lecrapaud/config.py

@@ -31,3 +31,4 @@ DB_URI = (
     else os.getenv("DB_URI", None)
 )
 OPENAI_API_KEY = os.getenv("OPENAI_API_KEY")
+LECRAPAUD_LOGFILE = os.getenv("LECRAPAUD_LOGFILE")

lecrapaud/directories.py

@@ -1,12 +1,16 @@
-import os, shutil
-from pathlib import Path
+import os
+import shutil
+from config import LECRAPAUD_LOGFILE
 
 cwd = os.getcwd()
-tmp_dir = cwd + "/tmp"
-logger_dir = cwd + "/log"
 
+tmp_dir = cwd + "/tmp"
 os.makedirs(tmp_dir, exist_ok=True)
-os.makedirs(logger_dir, exist_ok=True)
+
+logger_dir = None
+if LECRAPAUD_LOGFILE:
+    logger_dir = os.path.join(cwd, LECRAPAUD_LOGFILE)
+    os.makedirs(logger_dir, exist_ok=True)
 
 
 def clean_directories():

lecrapaud/feature_selection.py

@@ -47,7 +47,6 @@ from lecrapaud.db import (
     FeatureSelection,
     FeatureSelectionRank,
 )
-from lecrapaud.db.session import get_db
 from lecrapaud.search_space import all_models
 
 # Annoying Warnings
@@ -120,6 +119,7 @@ class FeatureSelectionEngine:
             target_id=target.id,
             experiment_id=self.experiment_id,
         )
+        feature_map = {f.name: f.id for f in Feature.get_all(limit=20000)}
 
         if feature_selection.best_features_path and os.path.exists(
             feature_selection.best_features_path
@@ -156,21 +156,30 @@ class FeatureSelectionEngine:
 
         if target_type == "classification" and self.X_categorical.shape[1] > 0:
             feat_scores = self.select_categorical_features(percentile=percentile)
-            with get_db() as db:
-                for row in feat_scores.itertuples(index=False):
-                    feature = Feature.find_by(name=row.features, db=db)
-                    FeatureSelectionRank.upsert(
-                        ["feature_selection_id", "feature_id", "method"],
-                        db=db,
-                        score=row.score,
-                        pvalue=row.pvalue,
-                        support=row.support,
-                        rank=row.rank,
-                        method=row.method,
-                        training_time=row.training_time,
-                        feature_selection_id=feature_selection.id,
-                        feature_id=feature.id,
-                    )
+            rows = []
+            for row in feat_scores.itertuples(index=False):
+                feature_id = feature_map.get(row.features)
+
+                rows.append(
+                    {
+                        "feature_selection_id": feature_selection.id,
+                        "feature_id": feature_id,
+                        "method": row.method,
+                        "score": row.score,
+                        "pvalue": row.pvalue,
+                        "support": row.support,
+                        "rank": row.rank,
+                        "training_time": row.training_time,
+                    }
+                )
+
+            if len(rows) == 0:
+                logger.warning(
+                    f"No categorical features selected for TARGET_{target_number}"
+                )
+
+            FeatureSelectionRank.bulk_upsert(rows=rows)
+
             categorical_features_selected = feat_scores[feat_scores["support"]][
                 "features"
             ].values.tolist()
@@ -238,30 +247,26 @@ class FeatureSelectionEngine:
 
         logger.info("Inserting feature selection results to db...")
         rows = []
-        with get_db() as db:
-            feature_map = {f.name: f.id for f in Feature.get_all(db=db, limit=20000)}
-            for row in feat_scores.itertuples(index=False):
-                feature_id = feature_map.get(row.features)
-                if not feature_id:
-                    continue  # or raise if feature must exist
-
-                rows.append(
-                    {
-                        "feature_selection_id": feature_selection.id,
-                        "feature_id": feature_id,
-                        "method": row.method,
-                        "score": row.score,
-                        "pvalue": None if pd.isna(row.pvalue) else row.pvalue,
-                        "support": row.support,
-                        "rank": row.rank,
-                        "training_time": row.training_time,
-                    }
-                )
+        for row in feat_scores.itertuples(index=False):
+            feature_id = feature_map.get(row.features)
+
+            rows.append(
+                {
+                    "feature_selection_id": feature_selection.id,
+                    "feature_id": feature_id,
+                    "method": row.method,
+                    "score": row.score,
+                    "pvalue": None if pd.isna(row.pvalue) else row.pvalue,
+                    "support": row.support,
+                    "rank": row.rank,
+                    "training_time": row.training_time,
+                }
+            )
 
-            if len(rows) == 0:
-                raise ValueError(f"No features selected for TARGET_{target_number}")
+        if len(rows) == 0:
+            logger.warning(f"No numerical features selected for TARGET_{target_number}")
 
-            FeatureSelectionRank.bulk_upsert(rows=rows, db=db)
+        FeatureSelectionRank.bulk_upsert(rows=rows)
 
         # Merge the results
         logger.info("Merging feature selection methods...")

lecrapaud/model_selection.py

@@ -1537,6 +1537,9 @@ def apply_thresholds(
                     pd.Series(np.where(exceeded, col, -np.inf), index=pred_proba.index)
                 )
 
+        # For each row:
+        # 1. If any threshold is exceeded, take the class with highest probability among exceeded
+        # 2. If no threshold is exceeded, take the class with highest probability overall
         if class_predictions:
             preds_df = pd.concat(class_predictions, axis=1)
             probs_df = pd.concat(class_probabilities, axis=1)

lecrapaud/utils.py

@@ -13,13 +13,13 @@ import string
 from lecrapaud.directories import logger_dir
 from lecrapaud.config import LOGGING_LEVEL, PYTHON_ENV
 
-_LOGGER_ALREADY_CONFIGURED = False
+_LECRAPAUD_LOGGER_ALREADY_CONFIGURED = False
 
 
 def setup_logger():
 
-    global _LOGGER_ALREADY_CONFIGURED
-    if _LOGGER_ALREADY_CONFIGURED:  # ← bail out if done before
+    global _LECRAPAUD_LOGGER_ALREADY_CONFIGURED
+    if _LECRAPAUD_LOGGER_ALREADY_CONFIGURED:  # ← bail out if done before
 
         return logging.getLogger("lecrapaud" if PYTHON_ENV != "Worker" else "")
 
@@ -47,16 +47,17 @@ def setup_logger():
         "Worker": "worker.log",
     }.get(PYTHON_ENV, "app.log")
 
-    file_handler = RotatingFileHandler(
-        f"{logger_dir}/{env_file}",
-        maxBytes=5 * 1024 * 1024,
-        backupCount=3,
-    )
-    file_handler.setFormatter(formatter)
-    file_handler.setLevel(log_level)
-    logger.addHandler(file_handler)
+    if logger_dir:
+        file_handler = RotatingFileHandler(
+            f"{logger_dir}/{env_file}",
+            maxBytes=5 * 1024 * 1024,
+            backupCount=3,
+        )
+        file_handler.setFormatter(formatter)
+        file_handler.setLevel(log_level)
+        logger.addHandler(file_handler)
 
-    _LOGGER_ALREADY_CONFIGURED = True
+    _LECRAPAUD_LOGGER_ALREADY_CONFIGURED = True
     return logger
 
 

{lecrapaud-0.9.4.dist-info → lecrapaud-0.10.1.dist-info}/METADATA

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

{lecrapaud-0.9.4.dist-info → lecrapaud-0.10.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 lecrapaud/__init__.py,sha256=oCxbtw_nk8rlOXbXbWo0RRMlsh6w-hTiZ6e5PRG_wp0,28
-lecrapaud/api.py,sha256=K1sDm7XBcHmxplWTltQMsVRJ5AOYJ_AUiOS0rtg6uH8,10542
-lecrapaud/config.py,sha256=WJglRV6-lUfYUy5LZjwv3aO_X6ossHY9BUT7_NCSY1I,942
+lecrapaud/api.py,sha256=hpAVsHeOaxck2ufH0BA7IsKQXG9oA8Y_q1lvaHn6liU,10563
+lecrapaud/config.py,sha256=n5qYpWyNSgxhJrmiujqRPa_EN3eLjGjtXDsboi1eeCo,993
 lecrapaud/db/__init__.py,sha256=82o9fMfaqKXPh2_rt44EzNRVZV1R4LScEnQYvj_TjK0,34
 lecrapaud/db/alembic/README,sha256=MVlc9TYmr57RbhXET6QxgyCcwWP7w-vLkEsirENqiIQ,38
 lecrapaud/db/alembic/env.py,sha256=rseEi8oR_eKXYYW3UwOKiCMuDEwT4lxsT7llySOUpgk,2305
@@ -22,23 +22,23 @@ lecrapaud/db/models/model_training.py,sha256=egggSfkW8C2nTadytc5DdjU7d2VEMT6LRRZ
 lecrapaud/db/models/score.py,sha256=_yaa6yBxugcOZMvLxqqIaMN7QGvzAOzOGCYQO0_gBjw,1601
 lecrapaud/db/models/target.py,sha256=DKnfeaLU8eT8J_oh_vuFo5-o1CaoXR13xBbswme6Bgk,1649
 lecrapaud/db/session.py,sha256=K9dTyXmO-aF_2r9RRHsDsbW9_zLNDaOcchXlpiv7cSo,2719
-lecrapaud/directories.py,sha256=t4PrnJR48MpDfBOTYTyGlDVMUr39mcaj7uCPTaocBRw,725
+lecrapaud/directories.py,sha256=svfeNjuUvxYKUQECx3qOi4XxBO3cg-bnlDq6FhNFI0Q,816
 lecrapaud/experiment.py,sha256=FSj5RUQsRdFpiK0iSyRBLRZQMlKJLQbS52cFoAVxoMk,2553
 lecrapaud/feature_engineering.py,sha256=2Er29SxHRIdzwxcEjk-2UI-MxQNVBPdTzlTemZ8bqYg,32193
-lecrapaud/feature_selection.py,sha256=9I0nQrou9f3tfIj_LRHCdj_eZYNNG0W4SOIXuHpIYRQ,43519
+lecrapaud/feature_selection.py,sha256=u3TWq3G5Xh3geQevGDOZEt_rl_m6-K_CR7SttFtpwKw,43409
 lecrapaud/integrations/openai_integration.py,sha256=hHLF3fk5Bps8KNbNrEL3NUFa945jwClE6LrLpuMZOd4,7459
 lecrapaud/jobs/__init__.py,sha256=ZkrsyTOR21c_wN7RY8jPhm8jCrL1oCEtTsf3VFIlQiE,292
 lecrapaud/jobs/config.py,sha256=AmO0j3RFjx8H66dfKw_7vnshaOJb9Ox5BAZ9cwwLFMY,377
 lecrapaud/jobs/scheduler.py,sha256=SiYWPxokpKnR8V6btLOO6gbK0PEjSRoeG0kCbQvYPf4,990
 lecrapaud/jobs/tasks.py,sha256=jfhOCsgZlZGTnsLB_K7-Y3NgJqpzpUCFu7EfDQuIeSY,1655
-lecrapaud/model_selection.py,sha256=FRlW0G4qAPk4jyX_5kiCRhTIBrQuSVtmIv440NBu60c,61555
+lecrapaud/model_selection.py,sha256=hKa6rQPbFBPSiQv98R89bxp-U-3Kufj9pETV0ff6KKM,61767
 lecrapaud/search_space.py,sha256=-JkzuMhaomdwiWi4HvVQY5hiw3-oREemJA16tbwEIp4,34854
 lecrapaud/speed_tests/test-gpu-bilstm.ipynb,sha256=4nLuZRJVe2kn6kEmauhRiz5wkWT9AVrYhI9CEk_dYUY,9608
 lecrapaud/speed_tests/test-gpu-resnet.ipynb,sha256=27Vu7nYwujYeh3fOxBNCnKJn3MXNPKZU-U8oDDUbymg,4944
 lecrapaud/speed_tests/test-gpu-transformers.ipynb,sha256=k6MBSs_Um1h4PykvE-LTBcdpbWLbIFST_xl_AFW2jgI,8444
 lecrapaud/speed_tests/tests.ipynb,sha256=RjI7LDHSsbadUkea_hT14sD7ivljtIQk4NB5McXJ1bE,3835
-lecrapaud/utils.py,sha256=Dy2uhK9cslzoqRHiIE6MdkxjNJWjmKmzGr6i7EYM28A,8106
-lecrapaud-0.9.4.dist-info/LICENSE,sha256=MImCryu0AnqhJE_uAZD-PIDKXDKb8sT7v0i1NOYeHTM,11350
-lecrapaud-0.9.4.dist-info/METADATA,sha256=o8RM-3rjlsiISI4xwgCdvRIped4YvpdLg14OYAY2hfA,11623
-lecrapaud-0.9.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-lecrapaud-0.9.4.dist-info/RECORD,,
+lecrapaud/utils.py,sha256=zM3V6WzY7XTBnbBAzk5_HKPYsH4WskjbqFwnQLG9g90,8197
+lecrapaud-0.10.1.dist-info/LICENSE,sha256=MImCryu0AnqhJE_uAZD-PIDKXDKb8sT7v0i1NOYeHTM,11350
+lecrapaud-0.10.1.dist-info/METADATA,sha256=Ho8NyjWAZKXC6TI2QBgfxspyGRkTjP0ywimgRP3LtcQ,11624
+lecrapaud-0.10.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+lecrapaud-0.10.1.dist-info/RECORD,,