lecrapaud 0.16.3__py3-none-any.whl → 0.16.5__py3-none-any.whl

lecrapaud/config.py

@@ -25,7 +25,7 @@ DB_PORT = (
 DB_NAME = (
     os.getenv("TEST_DB_NAME") if PYTHON_ENV == "Test" else os.getenv("DB_NAME", None)
 )
-DB_URI = (
+DB_URI: str = (
     os.getenv("TEST_DB_URI", None)
     if PYTHON_ENV == "Test"
     else os.getenv("DB_URI", None)

lecrapaud/db/alembic.ini

@@ -82,7 +82,7 @@ sqlalchemy.url = %(DATABASE_URL)s
 
 # Logging configuration
 [loggers]
-keys = root,sqlalchemy,alembic
+keys = root,sqlalchemy,alembic,lecrapaud
 
 [loggers_root]
 disable_existing_loggers = False
@@ -108,6 +108,12 @@ level = INFO
 handlers =
 qualname = alembic
 
+[logger_lecrapaud]
+level = INFO
+handlers = console
+qualname = lecrapaud
+propagate = 0
+
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)

lecrapaud/db/models/experiment.py

@@ -241,7 +241,7 @@ class Experiment(Base):
             # This ensures we're comparing apples to apples by normalizing the scores
             experiments = db.query(cls).filter(cls.name.ilike(f"%{name}%")).all()
             if not experiments:
-                return None
+                raise ValueError(f"No experiments found with the given name: {name}")
 
             # Get all scores
             rmse_scores = [e.avg_rmse for e in experiments if e.avg_rmse is not None]
@@ -250,7 +250,9 @@ class Experiment(Base):
             ]
 
             if not rmse_scores or not logloss_scores:
-                return None
+                raise ValueError(
+                    "No experiments found with both RMSE and LogLoss scores. Maybe try with only one metric."
+                )
 
             # Normalize scores (subtract min and divide by range)
             min_rmse = min(rmse_scores)
@@ -277,17 +279,29 @@ class Experiment(Base):
 
             return experiment_scores[0][0] if experiment_scores else None
 
-        # For single metric case (rmse or logloss)
-        score_property = cls.avg_rmse if metric == "rmse" else cls.avg_logloss
+        elif metric == "rmse" or metric == "logloss":
+            # For single metric case (rmse or logloss)
+            # Need to get all experiments first to evaluate instance properties
+            experiments = db.query(cls).filter(cls.name.ilike(f"%{name}%")).all()
 
-        return (
-            db.query(cls)
-            .filter(
-                cls.name.ilike(f"%{name}%"), score_property.isnot(None)
-            )  # Only consider experiments with scores
-            .order_by(score_property)
-            .first()
-        )
+            if not experiments:
+                return None
+
+            # Filter out experiments without scores and sort by the selected metric
+            filtered_experiments = []
+            for exp in experiments:
+                score = exp.avg_rmse if metric == "rmse" else exp.avg_logloss
+                if score is not None:
+                    filtered_experiments.append((exp, score))
+
+            if not filtered_experiments:
+                return None
+
+            # Sort by score (ascending since lower is better)
+            filtered_experiments.sort(key=lambda x: x[1])
+            return filtered_experiments[0][0]
+        else:
+            raise ValueError("Invalid metric. Must be 'rmse', 'logloss', or 'both'.")
 
     def get_features(self, target_number: int):
         targets = [t for t in self.targets if t.name == f"TARGET_{target_number}"]

lecrapaud/db/session.py

@@ -13,6 +13,8 @@ from lecrapaud.config import DB_USER, DB_PASSWORD, DB_HOST, DB_PORT, DB_NAME, DB
 _engine = None
 _SessionLocal = None
 if DB_URI:
+    if "mysql://" in DB_URI:
+        DB_URI = DB_URI.replace("mysql://", "mysql+pymysql://")
     DATABASE_URL = DB_URI
 elif DB_USER:
     DATABASE_URL = (
@@ -23,15 +25,13 @@ else:
 
 
 def init_db(uri: str = None):
-    global _engine, _SessionLocal, DATABASE_URL
+    global _engine, _SessionLocal, DATABASE_URL, DB_URI
     if uri:
+        if "mysql://" in uri:
+            uri = uri.replace("mysql://", "mysql+pymysql://")
         DATABASE_URL = uri
-    elif DB_USER:
-        DATABASE_URL = (
-            f"mysql+pymysql://{DB_USER}:{DB_PASSWORD}@{DB_HOST}:{DB_PORT}/{DB_NAME}"
-        )
-    elif DB_URI:
-        DATABASE_URL = DB_URI
+    elif DATABASE_URL:
+        pass
     else:
         raise ValueError(
             "No database configuration found, please set env variables "

lecrapaud/model_selection.py

@@ -1253,7 +1253,7 @@ class ModelSelectionEngine:
                 try:
                     with open(best_params_file, "r") as f:
                         target_params = json.load(f)
-                        all_best_params[target_number] = target_params
+                        all_best_params[int(target_number)] = target_params
                 except Exception as e:
                     logger.warning(
                         f"Error loading best params for {target_dir}: {str(e)}"

{lecrapaud-0.16.3.dist-info → lecrapaud-0.16.5.dist-info}/METADATA

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

{lecrapaud-0.16.3.dist-info → lecrapaud-0.16.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
 lecrapaud/__init__.py,sha256=oCxbtw_nk8rlOXbXbWo0RRMlsh6w-hTiZ6e5PRG_wp0,28
 lecrapaud/api.py,sha256=qPswq6faq3bhCmcFUqukQesS3BGlXL35fPbeqlpx6ng,20300
-lecrapaud/config.py,sha256=N8kQS1bNEXp6loIw7_X2_OjrbY4_a7UZhZcT1XgsYAs,1121
+lecrapaud/config.py,sha256=itiqC31HB8i2Xo-kn2viCQrg_9tnA07-TJuZ-xdnx44,1126
 lecrapaud/db/__init__.py,sha256=82o9fMfaqKXPh2_rt44EzNRVZV1R4LScEnQYvj_TjK0,34
 lecrapaud/db/alembic/README,sha256=MVlc9TYmr57RbhXET6QxgyCcwWP7w-vLkEsirENqiIQ,38
 lecrapaud/db/alembic/env.py,sha256=RvTTBa3bDVBxmDtapAfzUoeWBgmVQU3s9U6HmQCAP84,2421
@@ -9,10 +9,10 @@ lecrapaud/db/alembic/versions/2025_06_23_1748-f089dfb7e3ba_.py,sha256=hyPW0Mt_B4
 lecrapaud/db/alembic/versions/2025_06_24_1216-c62251b129ed_.py,sha256=6Pf36HAXEVrVlnrohAe2O7gVaXpDiv3LLIP_EEgTyA0,917
 lecrapaud/db/alembic/versions/2025_06_24_1711-86457e2f333f_.py,sha256=KjwjYvFaNqYmBLTYel8As37fyaBtNVWTqN_3M7y_2eI,1357
 lecrapaud/db/alembic/versions/2025_06_25_1759-72aa496ca65b_.py,sha256=MiqooJuZ1etExl2he3MniaEv8G0LrmqY-0m22m9xKmc,943
-lecrapaud/db/alembic.ini,sha256=TXrZB4pWVLn2EUg867yp6paA_19vGeirO95mTPA3nbs,3699
+lecrapaud/db/alembic.ini,sha256=Zw2rdwsKV6c7J1SPtoFIPDX08_oTP3MuUKnNxBDiY8I,3796
 lecrapaud/db/models/__init__.py,sha256=Lhyw9fVLdom0Fc6yIP-ip8FjkU1EwVwjae5q2VM815Q,740
 lecrapaud/db/models/base.py,sha256=J9ew-0z_-tnWAwhVvOmVDys2R6jPF_oSca_ny6wpXQE,7606
-lecrapaud/db/models/experiment.py,sha256=mQmbp_LzwMYVLzwYlaoRWYgzZCSJCA9dDcLpuvddsms,10931
+lecrapaud/db/models/experiment.py,sha256=q5jJ5FZM-XONVQjj2l7s2Sx2KcxlD2KjmqYzvem9Z24,11738
 lecrapaud/db/models/feature.py,sha256=5o77O2FyRObnLOCGNj8kaPSGM3pLv1Ov6mXXHYkmnYY,1136
 lecrapaud/db/models/feature_selection.py,sha256=mk42xuw1Sm_7Pznfg7TNc5_S4hscdw79QgIe3Bt9ZRI,3245
 lecrapaud/db/models/feature_selection_rank.py,sha256=Ydsb_rAT58FoSH13wkGjGPByzsjPx3DITXgJ2jgZmow,2198
@@ -22,7 +22,7 @@ lecrapaud/db/models/model_training.py,sha256=jAIYPdwBln2jf593soLQ730uYrTfNK8zdG8
 lecrapaud/db/models/score.py,sha256=fSfXLt6Dm-8Fy9ku0urMT5Fa6zNqn4YqVnEO4o3zKVI,1669
 lecrapaud/db/models/target.py,sha256=DKnfeaLU8eT8J_oh_vuFo5-o1CaoXR13xBbswme6Bgk,1649
 lecrapaud/db/models/utils.py,sha256=-a-nWWmpJ2XzidIxo2COVUTrGZIPYCfBzjhcszJj_bM,1109
-lecrapaud/db/session.py,sha256=K9dTyXmO-aF_2r9RRHsDsbW9_zLNDaOcchXlpiv7cSo,2719
+lecrapaud/db/session.py,sha256=NPa7A_uOaE4YegMYru2AwNk_kxg6rAZb0b-wqfWOjeY,2763
 lecrapaud/directories.py,sha256=0LrANuDgbuneSLker60c6q2hmGnQ3mKHIztTGzTx6Gw,826
 lecrapaud/experiment.py,sha256=1xLWjOrqAxJh9CdXOx9ppQuRFRRj0GH-xYZqg-ty9hI,2463
 lecrapaud/feature_engineering.py,sha256=2HaWn5UnZzczJBo7EyY1m1SGPmI6TpGXcwF58h_9wBE,32580
@@ -36,10 +36,10 @@ lecrapaud/misc/tabpfn_tests.ipynb,sha256=VkgsCUJ30d8jaL2VaWtQAgb8ngHPNtPgnXLs7QQ
 lecrapaud/misc/test-gpu-bilstm.ipynb,sha256=4nLuZRJVe2kn6kEmauhRiz5wkWT9AVrYhI9CEk_dYUY,9608
 lecrapaud/misc/test-gpu-resnet.ipynb,sha256=27Vu7nYwujYeh3fOxBNCnKJn3MXNPKZU-U8oDDUbymg,4944
 lecrapaud/misc/test-gpu-transformers.ipynb,sha256=k6MBSs_Um1h4PykvE-LTBcdpbWLbIFST_xl_AFW2jgI,8444
-lecrapaud/model_selection.py,sha256=l3ClaTeoz9wQak7nah3wsA_rlu7R1OChUAUk-ce5MjU,68509
+lecrapaud/model_selection.py,sha256=tjBM9X5CP02pNiuNLdNK2MFZblrH7w-gQgBc5FEN-TY,68514
 lecrapaud/search_space.py,sha256=-JkzuMhaomdwiWi4HvVQY5hiw3-oREemJA16tbwEIp4,34854
 lecrapaud/utils.py,sha256=JdBB1NvbNIx4y0Una-kSZdo1_ZEocc5hwyYFIZKHmGg,8305
-lecrapaud-0.16.3.dist-info/LICENSE,sha256=MImCryu0AnqhJE_uAZD-PIDKXDKb8sT7v0i1NOYeHTM,11350
-lecrapaud-0.16.3.dist-info/METADATA,sha256=UvUfHYr9HNMOluhg9QNbdcFZ9f_I_cwT2Fk5kkAPP_8,11081
-lecrapaud-0.16.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-lecrapaud-0.16.3.dist-info/RECORD,,
+lecrapaud-0.16.5.dist-info/LICENSE,sha256=MImCryu0AnqhJE_uAZD-PIDKXDKb8sT7v0i1NOYeHTM,11350
+lecrapaud-0.16.5.dist-info/METADATA,sha256=QLHyo-W9PTm_-_We0bNDLgPdgXGy-KrgJOX-UhtZ39s,11081
+lecrapaud-0.16.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+lecrapaud-0.16.5.dist-info/RECORD,,