ins-pricing 0.3.2__tar.gz → 0.3.3__tar.gz

{ins_pricing-0.3.2 → ins_pricing-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ins_pricing
-Version: 0.3.2
+Version: 0.3.3
 Summary: Reusable modelling, pricing, governance, and reporting utilities.
 Author: meishi125478
 License: Proprietary

ins_pricing-0.3.3/ins_pricing/cli/BayesOpt_entry.py

@@ -0,0 +1,56 @@
+"""Thin wrapper for the BayesOpt CLI entry point.
+
+The main implementation lives in bayesopt_entry_runner.py.
+"""
+
+from __future__ import annotations
+
+from pathlib import Path
+import json
+import os
+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))
+
+def _apply_env_from_config(argv: list[str]) -> None:
+    if "--config-json" not in argv:
+        return
+    idx = argv.index("--config-json")
+    if idx + 1 >= len(argv):
+        return
+    raw_path = argv[idx + 1]
+    try:
+        cfg_path = Path(raw_path).expanduser()
+        if not cfg_path.is_absolute():
+            cfg_path = cfg_path.resolve()
+        if not cfg_path.exists():
+            script_dir = Path(__file__).resolve().parents[1]
+            candidate = (script_dir / raw_path).resolve()
+            if candidate.exists():
+                cfg_path = candidate
+        if not cfg_path.exists():
+            return
+        cfg = json.loads(cfg_path.read_text(encoding="utf-8", errors="replace"))
+        env = cfg.get("env", {})
+        if isinstance(env, dict):
+            for key, value in env.items():
+                if key is None:
+                    continue
+                os.environ.setdefault(str(key), str(value))
+    except Exception:
+        return
+
+_apply_env_from_config(sys.argv)
+
+try:
+    from .bayesopt_entry_runner import main
+except Exception:  # pragma: no cover
+    from ins_pricing.cli.bayesopt_entry_runner import main
+
+__all__ = ["main"]
+
+if __name__ == "__main__":
+    main()

{ins_pricing-0.3.2 → ins_pricing-0.3.3}/ins_pricing/cli/utils/import_resolver.py

@@ -13,6 +13,7 @@ Usage:
 from __future__ import annotations
 
 import importlib
+import os
 import sys
 from dataclasses import dataclass, field
 from pathlib import Path
@@ -70,14 +71,39 @@ class ResolvedImports:
     plot_loss_curve: Optional[Callable] = None
 
 
+def _debug_imports_enabled() -> bool:
+    value = os.environ.get("BAYESOPT_DEBUG_IMPORTS")
+    if value is None:
+        return False
+    return str(value).strip().lower() in {"1", "true", "yes", "y", "on"}
+
+
 def _try_import(module_path: str, attr_name: Optional[str] = None) -> Optional[Any]:
     """Attempt to import a module or attribute, returning None on failure."""
     try:
         module = importlib.import_module(module_path)
         if attr_name:
-            return getattr(module, attr_name, None)
-        return module
-    except Exception:
+            result = getattr(module, attr_name, None)
+        else:
+            result = module
+        if _debug_imports_enabled():
+            origin = getattr(module, "__file__", None)
+            origin = origin or getattr(module, "__path__", None)
+            print(
+                f"[BAYESOPT_DEBUG_IMPORTS] imported {module_path}"
+                f"{'::' + attr_name if attr_name else ''} from {origin}",
+                file=sys.stderr,
+                flush=True,
+            )
+        return result
+    except Exception as exc:
+        if _debug_imports_enabled():
+            print(
+                f"[BAYESOPT_DEBUG_IMPORTS] failed import {module_path}"
+                f"{'::' + attr_name if attr_name else ''}: {exc.__class__.__name__}: {exc}",
+                file=sys.stderr,
+                flush=True,
+            )
         return None
 
 

{ins_pricing-0.3.2 → ins_pricing-0.3.3}/ins_pricing/cli/utils/notebook_utils.py

@@ -8,9 +8,9 @@ from pathlib import Path
 from typing import Iterable, List, Optional, Sequence, cast
 
 try:
-    from .cli_config import add_config_json_arg  # type: ignore
+    from .cli_config import add_config_json_arg, set_env  # type: ignore
 except Exception:  # pragma: no cover
-    from cli_config import add_config_json_arg  # type: ignore
+    from cli_config import add_config_json_arg, set_env  # type: ignore
 
 
 def _find_ins_pricing_dir(cwd: Optional[Path] = None) -> Path:
@@ -261,6 +261,7 @@ def run_from_config(config_json: str | Path) -> subprocess.CompletedProcess:
     if not config_path.is_absolute():
         config_path = (pkg_dir / config_path).resolve() if (pkg_dir / config_path).exists() else config_path.resolve()
     raw = json.loads(config_path.read_text(encoding="utf-8", errors="replace"))
+    set_env(raw.get("env", {}))
     runner = cast(dict, raw.get("runner") or {})
 
     mode = str(runner.get("mode") or "entry").strip().lower()

{ins_pricing-0.3.2 → ins_pricing-0.3.3}/ins_pricing/modelling/core/bayesopt/__init__.py

@@ -4,6 +4,10 @@ from __future__ import annotations
 
 import torch
 
+from ins_pricing.utils.torch_compat import disable_torch_dynamo_if_requested
+
+disable_torch_dynamo_if_requested()
+
 from .config_preprocess import (
     BayesOptConfig,
     DatasetPreprocessor,

{ins_pricing-0.3.2 → ins_pricing-0.3.3}/ins_pricing/modelling/core/bayesopt/models/model_ft_components.py

@@ -106,31 +106,58 @@ class ScaledTransformerEncoderLayer(nn.Module):
         self.res_scale_attn = residual_scale_attn
         self.res_scale_ffn = residual_scale_ffn
 
-    def forward(self, src, src_mask=None, src_key_padding_mask=None):
+    def forward(self, src, src_mask=None, src_key_padding_mask=None, is_causal: Optional[bool] = None, **_kwargs):
         # Input tensor shape: (batch, seq_len, d_model).
         x = src
 
         if self.norm_first:
             # Pre-norm before attention.
-            x = x + self._sa_block(self.norm1(x), src_mask,
-                                   src_key_padding_mask)
+            x = x + self._sa_block(
+                self.norm1(x),
+                src_mask,
+                src_key_padding_mask,
+                is_causal=is_causal,
+            )
             x = x + self._ff_block(self.norm2(x))
         else:
             # Post-norm (usually disabled).
             x = self.norm1(
-                x + self._sa_block(x, src_mask, src_key_padding_mask))
+                x + self._sa_block(
+                    x,
+                    src_mask,
+                    src_key_padding_mask,
+                    is_causal=is_causal,
+                )
+            )
             x = self.norm2(x + self._ff_block(x))
 
         return x
 
-    def _sa_block(self, x, attn_mask, key_padding_mask):
+    def _sa_block(self, x, attn_mask, key_padding_mask, *, is_causal: Optional[bool] = None):
         # Self-attention with residual scaling.
-        attn_out, _ = self.self_attn(
-            x, x, x,
-            attn_mask=attn_mask,
-            key_padding_mask=key_padding_mask,
-            need_weights=False
-        )
+        if is_causal is None:
+            attn_out, _ = self.self_attn(
+                x, x, x,
+                attn_mask=attn_mask,
+                key_padding_mask=key_padding_mask,
+                need_weights=False,
+            )
+        else:
+            try:
+                attn_out, _ = self.self_attn(
+                    x, x, x,
+                    attn_mask=attn_mask,
+                    key_padding_mask=key_padding_mask,
+                    need_weights=False,
+                    is_causal=is_causal,
+                )
+            except TypeError:
+                attn_out, _ = self.self_attn(
+                    x, x, x,
+                    attn_mask=attn_mask,
+                    key_padding_mask=key_padding_mask,
+                    need_weights=False,
+                )
         return self.res_scale_attn * self.dropout1(attn_out)
 
     def _ff_block(self, x):
@@ -313,4 +340,3 @@ class MaskedTabularDataset(Dataset):
             None if self.X_cat_true is None else self.X_cat_true[idx],
             None if self.cat_mask is None else self.cat_mask[idx],
         )
-

{ins_pricing-0.3.2 → ins_pricing-0.3.3}/ins_pricing/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="ins_pricing",
-    version="0.3.2",
+    version="0.3.3",
     description="Reusable modelling, pricing, governance, and reporting utilities.",
     author="meishi125478",
     license="Proprietary",

{ins_pricing-0.3.2 → ins_pricing-0.3.3}/ins_pricing/utils/torch_compat.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import inspect
+import os
 from typing import Any, Optional
 
 try:
@@ -14,6 +15,7 @@ except ImportError:  # pragma: no cover - handled by callers
     torch = None
 
 _SUPPORTS_WEIGHTS_ONLY: Optional[bool] = None
+_DYNAMO_PATCHED = False
 
 
 def _supports_weights_only() -> bool:
@@ -43,3 +45,41 @@ def torch_load(
     if weights_only is not None and _supports_weights_only():
         return torch.load(path, *args, weights_only=weights_only, **kwargs)
     return torch.load(path, *args, **kwargs)
+
+
+def _env_truthy(key: str) -> bool:
+    value = os.environ.get(key)
+    if value is None:
+        return False
+    return str(value).strip().lower() in {"1", "true", "yes", "y", "on"}
+
+
+def disable_torch_dynamo_if_requested() -> None:
+    """Disable torch._dynamo wrappers when compile is explicitly disabled."""
+    global _DYNAMO_PATCHED
+    if _DYNAMO_PATCHED or not TORCH_AVAILABLE:
+        return
+
+    if not any(
+        _env_truthy(k)
+        for k in (
+            "TORCHDYNAMO_DISABLE",
+            "TORCH_DISABLE_DYNAMO",
+            "TORCH_COMPILE_DISABLE",
+            "TORCHINDUCTOR_DISABLE",
+        )
+    ):
+        return
+
+    try:
+        import torch.optim.optimizer as optim_mod
+    except Exception:
+        return
+
+    for name in ("state_dict", "load_state_dict", "zero_grad", "add_param_group"):
+        fn = getattr(optim_mod.Optimizer, name, None)
+        wrapped = getattr(fn, "__wrapped__", None)
+        if wrapped is not None:
+            setattr(optim_mod.Optimizer, name, wrapped)
+
+    _DYNAMO_PATCHED = True

{ins_pricing-0.3.2 → ins_pricing-0.3.3}/ins_pricing.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ins_pricing
-Version: 0.3.2
+Version: 0.3.3
 Summary: Reusable modelling, pricing, governance, and reporting utilities.
 Author: meishi125478
 License: Proprietary

{ins_pricing-0.3.2 → ins_pricing-0.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ins_pricing"
-version = "0.3.2"
+version = "0.3.3"
 description = "Reusable modelling, pricing, governance, and reporting utilities."
 readme = "README.md"
 requires-python = ">=3.9"

ins_pricing-0.3.2/ins_pricing/cli/BayesOpt_entry.py

@@ -1,24 +0,0 @@
-"""Thin wrapper for the BayesOpt CLI entry point.
-
-The main implementation lives in bayesopt_entry_runner.py.
-"""
-
-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))
-
-try:
-    from .bayesopt_entry_runner import main
-except Exception:  # pragma: no cover
-    from ins_pricing.cli.bayesopt_entry_runner import main
-
-__all__ = ["main"]
-
-if __name__ == "__main__":
-    main()