ins-pricing 0.4.5__py3-none-any.whl → 0.5.1__py3-none-any.whl

ins_pricing/cli/Pricing_Run.py

@@ -1,25 +1,44 @@
-from __future__ import annotations
-
+from __future__ import annotations
+
 from pathlib import Path
 from typing import Optional
-
-try:
-    from .utils.notebook_utils import run_from_config, run_from_config_cli  # type: ignore
-except Exception:  # pragma: no cover
-    from utils.notebook_utils import run_from_config, run_from_config_cli  # type: ignore
-
-
-def run(config_json: str | Path) -> None:
-    """Unified entry point: run entry/incremental/watchdog/DDP based on config.json runner."""
-    run_from_config(config_json)
-
-
-def main(argv: Optional[list[str]] = None) -> None:
-    run_from_config_cli(
-        "Pricing_Run: run BayesOpt by config.json (entry/incremental/watchdog/DDP).",
-        argv,
-    )
-
-
-if __name__ == "__main__":
-    main()
+import importlib.util
+import sys
+
+
+def _ensure_repo_root() -> None:
+    if __package__ not in {None, ""}:
+        return
+    if importlib.util.find_spec("ins_pricing") is not None:
+        return
+    bootstrap_path = Path(__file__).resolve().parents[1] / "utils" / "bootstrap.py"
+    spec = importlib.util.spec_from_file_location("ins_pricing.cli.utils.bootstrap", bootstrap_path)
+    if spec is None or spec.loader is None:
+        return
+    module = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(module)
+    module.ensure_repo_root()
+
+
+_ensure_repo_root()
+
+try:
+    from ins_pricing.cli.utils.notebook_utils import run_from_config, run_from_config_cli  # type: ignore
+except Exception:  # pragma: no cover
+    from utils.notebook_utils import run_from_config, run_from_config_cli  # type: ignore
+
+
+def run(config_json: str | Path) -> None:
+    """Unified entry point: run entry/incremental/watchdog/DDP based on config.json runner."""
+    run_from_config(config_json)
+
+
+def main(argv: Optional[list[str]] = None) -> None:
+    run_from_config_cli(
+        "Pricing_Run: run BayesOpt by config.json (entry/incremental/watchdog/DDP).",
+        argv,
+    )
+
+
+if __name__ == "__main__":
+    main()

ins_pricing/cli/bayesopt_entry_runner.py

@@ -11,13 +11,26 @@ Example:
 
 from __future__ import annotations
 
-from pathlib import Path
-import sys
-
-if __package__ in {None, ""}:
-    repo_root = Path(__file__).resolve().parents[2]
-    if str(repo_root) not in sys.path:
-        sys.path.insert(0, str(repo_root))
+from pathlib import Path
+import importlib.util
+import sys
+
+
+def _ensure_repo_root() -> None:
+    if __package__ not in {None, ""}:
+        return
+    if importlib.util.find_spec("ins_pricing") is not None:
+        return
+    bootstrap_path = Path(__file__).resolve().parents[1] / "utils" / "bootstrap.py"
+    spec = importlib.util.spec_from_file_location("ins_pricing.cli.utils.bootstrap", bootstrap_path)
+    if spec is None or spec.loader is None:
+        return
+    module = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(module)
+    module.ensure_repo_root()
+
+
+_ensure_repo_root()
 
 import argparse
 import hashlib
@@ -30,8 +43,8 @@ import numpy as np
 import pandas as pd
 
 # Use unified import resolver to eliminate nested try/except chains
-from .utils.import_resolver import resolve_imports, setup_sys_path
-from .utils.evaluation_context import (
+from ins_pricing.cli.utils.import_resolver import resolve_imports, setup_sys_path
+from ins_pricing.cli.utils.evaluation_context import (
     EvaluationContext,
     TrainingContext,
     ModelIdentity,
@@ -1112,10 +1125,21 @@ def train_from_config(args: argparse.Namespace) -> None:
         output_override=args.output_dir,
     )
     output_dir = output_cfg["output_dir"]
-    reuse_best_params = bool(
-        args.reuse_best_params or runtime_cfg["reuse_best_params"])
-    xgb_max_depth_max = runtime_cfg["xgb_max_depth_max"]
-    xgb_n_estimators_max = runtime_cfg["xgb_n_estimators_max"]
+    reuse_best_params = bool(
+        args.reuse_best_params or runtime_cfg["reuse_best_params"])
+    xgb_max_depth_max = runtime_cfg["xgb_max_depth_max"]
+    xgb_n_estimators_max = runtime_cfg["xgb_n_estimators_max"]
+    xgb_gpu_id = runtime_cfg["xgb_gpu_id"]
+    xgb_cleanup_per_fold = runtime_cfg["xgb_cleanup_per_fold"]
+    xgb_cleanup_synchronize = runtime_cfg["xgb_cleanup_synchronize"]
+    xgb_use_dmatrix = runtime_cfg["xgb_use_dmatrix"]
+    ft_cleanup_per_fold = runtime_cfg["ft_cleanup_per_fold"]
+    ft_cleanup_synchronize = runtime_cfg["ft_cleanup_synchronize"]
+    resn_cleanup_per_fold = runtime_cfg["resn_cleanup_per_fold"]
+    resn_cleanup_synchronize = runtime_cfg["resn_cleanup_synchronize"]
+    gnn_cleanup_per_fold = runtime_cfg["gnn_cleanup_per_fold"]
+    gnn_cleanup_synchronize = runtime_cfg["gnn_cleanup_synchronize"]
+    optuna_cleanup_synchronize = runtime_cfg["optuna_cleanup_synchronize"]
     optuna_storage = runtime_cfg["optuna_storage"]
     optuna_study_prefix = runtime_cfg["optuna_study_prefix"]
     best_params_files = runtime_cfg["best_params_files"]
@@ -1247,9 +1271,20 @@ def train_from_config(args: argparse.Namespace) -> None:
             "use_ft_ddp": use_ft_ddp,
             "use_gnn_ddp": use_gnn_ddp,
             "output_dir": output_dir,
-            "xgb_max_depth_max": xgb_max_depth_max,
-            "xgb_n_estimators_max": xgb_n_estimators_max,
-            "resn_weight_decay": cfg.get("resn_weight_decay"),
+            "xgb_max_depth_max": xgb_max_depth_max,
+            "xgb_n_estimators_max": xgb_n_estimators_max,
+            "xgb_gpu_id": xgb_gpu_id,
+            "xgb_cleanup_per_fold": xgb_cleanup_per_fold,
+            "xgb_cleanup_synchronize": xgb_cleanup_synchronize,
+            "xgb_use_dmatrix": xgb_use_dmatrix,
+            "ft_cleanup_per_fold": ft_cleanup_per_fold,
+            "ft_cleanup_synchronize": ft_cleanup_synchronize,
+            "resn_cleanup_per_fold": resn_cleanup_per_fold,
+            "resn_cleanup_synchronize": resn_cleanup_synchronize,
+            "gnn_cleanup_per_fold": gnn_cleanup_per_fold,
+            "gnn_cleanup_synchronize": gnn_cleanup_synchronize,
+            "optuna_cleanup_synchronize": optuna_cleanup_synchronize,
+            "resn_weight_decay": cfg.get("resn_weight_decay"),
             "final_ensemble": bool(cfg.get("final_ensemble", False)),
             "final_ensemble_k": int(cfg.get("final_ensemble_k", 3)),
             "final_refit": bool(cfg.get("final_refit", True)),

ins_pricing/cli/utils/bootstrap.py

@@ -0,0 +1,23 @@
+"""Bootstrap helpers for running CLI modules as scripts."""
+
+from __future__ import annotations
+
+import sys
+from pathlib import Path
+from typing import Optional
+
+
+def _find_repo_root(start: Optional[Path] = None) -> Path:
+    anchor = (start or Path(__file__)).resolve()
+    for parent in [anchor] + list(anchor.parents):
+        if (parent / "ins_pricing").is_dir():
+            return parent
+    return anchor.parent
+
+
+def ensure_repo_root(repo_root: Optional[Path] = None) -> Path:
+    """Ensure the repository root (parent of ins_pricing/) is on sys.path."""
+    root = _find_repo_root(repo_root)
+    if str(root) not in sys.path:
+        sys.path.insert(0, str(root))
+    return root