fluxloop-cli 0.2.4__py3-none-any.whl → 0.2.10__py3-none-any.whl

fluxloop_cli/__init__.py

@@ -2,7 +2,7 @@
 FluxLoop CLI - Command-line interface for running agent simulations.
 """
 
-__version__ = "0.2.4"
+__version__ = "0.2.10"
 
 from .main import app
 

fluxloop_cli/arg_binder.py

@@ -7,6 +7,25 @@ import json
 from pathlib import Path
 from typing import Any, Callable, Dict, Optional
 
+
+class _AttrDict(dict):
+    """Dictionary that also supports attribute access for keys."""
+
+    def __getattr__(self, item: str) -> Any:  # type: ignore[override]
+        try:
+            return self[item]
+        except KeyError as exc:  # pragma: no cover
+            raise AttributeError(item) from exc
+
+    def __setattr__(self, key: str, value: Any) -> None:  # type: ignore[override]
+        self[key] = value
+
+    def __delattr__(self, item: str) -> None:  # type: ignore[override]
+        try:
+            del self[item]
+        except KeyError as exc:  # pragma: no cover
+            raise AttributeError(item) from exc
+
 from fluxloop.schemas import ExperimentConfig, ReplayArgsConfig
 
 
@@ -97,7 +116,7 @@ class ArgBinder:
 
             self._restore_callables(kwargs, replay)
             self._ensure_no_unmapped_callables(kwargs, replay)
-            return kwargs
+            return self._hydrate_structures(kwargs)
 
         return self._bind_by_signature(func, runtime_input)
 
@@ -141,7 +160,9 @@ class ArgBinder:
         callable_markers = {
             key: value
             for key, value in kwargs.items()
-            if isinstance(value, str) and value.startswith("<")
+            if isinstance(value, str)
+            and value.startswith("<")
+            and not value.startswith("<repr:")
         }
 
         if not callable_markers:
@@ -155,6 +176,20 @@ class ArgBinder:
                 f"{', '.join(missing)}. Configure them under replay_args.callable_providers."
             )
 
+    def _hydrate_structures(self, payload: Dict[str, Any]) -> Dict[str, Any]:
+        return {key: self._hydrate_value(value) for key, value in payload.items()}
+
+    def _hydrate_value(self, value: Any) -> Any:
+        if callable(value):
+            return value
+        if isinstance(value, _AttrDict):
+            return value
+        if isinstance(value, dict):
+            return _AttrDict({k: self._hydrate_value(v) for k, v in value.items()})
+        if isinstance(value, list):
+            return [self._hydrate_value(item) for item in value]
+        return value
+
     def _resolve_builtin_callable(self, provider: str, marker: str) -> Callable:
         is_async = marker.endswith(":async>")
 
@@ -206,10 +241,30 @@ class ArgBinder:
 
     def _set_by_path(self, payload: Dict[str, Any], path: str, value: Any) -> None:
         parts = path.split(".")
-        current = payload
+        current: Any = payload
+
         for key in parts[:-1]:
-            current = current[key]
-        current[parts[-1]] = value
+            if isinstance(current, list):
+                index = self._coerce_list_index(key)
+                current = current[index]
+            else:
+                current = current[key]
+
+        final_key = parts[-1]
+        if isinstance(current, list):
+            index = self._coerce_list_index(final_key)
+            current[index] = value
+        else:
+            current[final_key] = value
+
+    @staticmethod
+    def _coerce_list_index(key: str) -> int:
+        try:
+            return int(key)
+        except ValueError as exc:
+            raise TypeError(
+                "List index segments in override_param_path must be integers"
+            ) from exc
 
     def _resolve_config_target(self) -> Optional[str]:
         runner = self.config.runner

fluxloop_cli/config_loader.py

@@ -76,6 +76,7 @@ def load_experiment_config(
         source_dir = project_root
 
     _normalize_variation_strategies(data)
+    _normalize_runner_target(data)
 
     # Validate and create config object
     try:
@@ -284,6 +285,27 @@ def _normalize_variation_strategies(payload: Dict[str, Any]) -> None:
     payload["variation_strategies"] = deduped
 
 
+def _normalize_runner_target(payload: Dict[str, Any]) -> None:
+    """Populate runner.module_path/function_name when only target is provided."""
+
+    runner = payload.get("runner")
+    if not isinstance(runner, dict):
+        return
+
+    target = runner.get("target")
+    module_path = runner.get("module_path")
+    function_name = runner.get("function_name")
+
+    if target and (not module_path or not function_name):
+        if ":" in target:
+            module_part, attr_part = target.split(":", 1)
+            runner.setdefault("module_path", module_part)
+            if "." in attr_part:
+                # module:Class.method -> record class.method as function placeholder
+                runner.setdefault("function_name", attr_part)
+            else:
+                runner.setdefault("function_name", attr_part)
+
 def _detect_config_context(resolved_path: Path) -> tuple[str, Path, Path]:
     """Determine whether the path points to legacy or multi-section config."""
 

fluxloop_cli/target_loader.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import importlib
 import sys
 from pathlib import Path
-from typing import Any, Callable, Optional
+from typing import Any, Callable, Optional, List
 
 from fluxloop.schemas import RunnerConfig
 
@@ -21,11 +21,16 @@ class TargetLoader:
         """Return a callable based on the configured target."""
 
         work_dir = self._resolve_working_directory()
-        remove_path = False
+        added_paths: list[str] = []
 
         if work_dir and work_dir not in sys.path:
             sys.path.insert(0, work_dir)
-            remove_path = True
+            added_paths.append(work_dir)
+
+        for extra in self._resolve_python_paths():
+            if extra not in sys.path:
+                sys.path.insert(0, extra)
+                added_paths.append(extra)
 
         try:
             if self.config.target:
@@ -34,8 +39,9 @@ class TargetLoader:
             module = importlib.import_module(self.config.module_path)
             return getattr(module, self.config.function_name)
         finally:
-            if remove_path:
-                sys.path.remove(work_dir)
+            for path_entry in added_paths:
+                if path_entry in sys.path:
+                    sys.path.remove(path_entry)
 
     def _resolve_working_directory(self) -> str | None:
         if not self.config.working_directory:
@@ -50,6 +56,22 @@ class TargetLoader:
         path = raw_path
         return str(path)
 
+    def _resolve_python_paths(self) -> List[str]:
+        resolved: List[str] = []
+        entries = getattr(self.config, "python_path", []) or []
+
+        for entry in entries:
+            raw_path = Path(entry)
+            if not raw_path.is_absolute():
+                base = self.source_dir if self.source_dir else Path.cwd()
+                raw_path = (base / raw_path).resolve()
+            else:
+                raw_path = raw_path.expanduser().resolve()
+
+            resolved.append(str(raw_path))
+
+        return resolved
+
     def _load_from_target(self, target: str) -> Callable:
         """Resolve a callable from target string.
 

fluxloop_cli/templates.py

@@ -108,6 +108,7 @@ def create_simulation_config(project_name: str) -> str:
           function_name: "run"
           target: "examples.simple_agent:run"
           working_directory: .
+          python_path:
           timeout_seconds: 120
           max_retries: 3
 

{fluxloop_cli-0.2.4.dist-info → fluxloop_cli-0.2.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fluxloop-cli
-Version: 0.2.4
+Version: 0.2.10
 Summary: FluxLoop CLI for running agent simulations
 Author-email: FluxLoop Team <team@fluxloop.dev>
 License: Apache-2.0

{fluxloop_cli-0.2.4.dist-info → fluxloop_cli-0.2.10.dist-info}/RECORD

@@ -1,6 +1,6 @@
-fluxloop_cli/__init__.py,sha256=FHpr2ZbHLVuqou57OtaIPfJQW-8mSfUeIRDZepsNWmk,142
-fluxloop_cli/arg_binder.py,sha256=oluHrwe1nNVq7alxBhBEoZrLrYop-cRgXgSu59LJcw4,7827
-fluxloop_cli/config_loader.py,sha256=IoOY39KxDWNjSWyN5a8n89ym7jiUDTmy7Id-o4E0Usk,9450
+fluxloop_cli/__init__.py,sha256=8aHKnuCYiKZ2JYjaQTCSmi-M_GUENpy7VUSqG399-9I,143
+fluxloop_cli/arg_binder.py,sha256=yaK79zRNBEyTO1CB76WLLKQwYBW404HEKeDC2Y1QlLk,9725
+fluxloop_cli/config_loader.py,sha256=PYy0CfGVbU8jpPbx4sJzOu7i3BbrkQMNaRiSOp_uX9g,10307
 fluxloop_cli/config_schema.py,sha256=JZJRcMFun5hp3vKLAyek7W3NvISyzRzZt0BZAeSU38I,2415
 fluxloop_cli/constants.py,sha256=oMYCkUUqy2LORNY99gDRCOkgLOPrT1FY_Vrylo-QSSw,719
 fluxloop_cli/input_generator.py,sha256=ldlVdPSDfGsP9zO2RALk7QmZjkIvUzTaxDgwOjuPB-0,4043
@@ -8,8 +8,8 @@ fluxloop_cli/llm_generator.py,sha256=SosP5DeZuhBLEM6bj7BDp-7mckvVhtNJMEk2ZgV143M
 fluxloop_cli/main.py,sha256=xJgrKMv6cN6Q1SNz0rbL4owHsN5CSiLkAaAd747WYds,2584
 fluxloop_cli/project_paths.py,sha256=FoHp-g3aY1nytxGys85Oy3wJ6gmiKU6FVOwkgTtlHNA,4128
 fluxloop_cli/runner.py,sha256=dzKv0OZiqBoFfO9LMP5rro9lBL3vkvNmlXqh0U-z9vU,24046
-fluxloop_cli/target_loader.py,sha256=TdMBnuD7qkv71C48y5gCaK5sMFyPCoNyOt-JprL0jOI,4734
-fluxloop_cli/templates.py,sha256=_QJxAq3JnylGryRjFwLVzaPmYMLsIl5eyVBNfkgGOeA,11207
+fluxloop_cli/target_loader.py,sha256=ACCu2izqGKoOrEiNnAajH0FgLZcw3j1pWn5rAhEuWFU,5528
+fluxloop_cli/templates.py,sha256=Y7sE_hSm8q2IGXwXDLq-jCEBS_eCUzDPdQSrQELTzWk,11230
 fluxloop_cli/validators.py,sha256=_bLXmxUSzVrDtLjqyTba0bDqamRIaOUHhV4xZ7K36Xw,1155
 fluxloop_cli/commands/__init__.py,sha256=sxJX1mJoOSJnH_iIuCqYT8tjh7_yxlJB702j_B_GPUw,164
 fluxloop_cli/commands/config.py,sha256=xVpBv9D1zCTz3rABl1F1Pm1YMOx6r7B9AICy0-_9kao,11418
@@ -19,8 +19,8 @@ fluxloop_cli/commands/parse.py,sha256=AVPYi59ejFWx4TYyM7JuI69koxDVkIBxy4LBRDMMbF
 fluxloop_cli/commands/record.py,sha256=56ASu3Np6TX8_F8caMBJArv10ag5M96kJ-sII8df-5Q,4803
 fluxloop_cli/commands/run.py,sha256=NLkBN2puqDLdHhKhilLriXsZnm7pMDMcoWeBSEXPM-o,9660
 fluxloop_cli/commands/status.py,sha256=ERZrWoSP3V7dz5A_TEE5b8E0nGwsPggP4nXw4tLOzxE,7841
-fluxloop_cli-0.2.4.dist-info/METADATA,sha256=TYbYk8XqV7NQCAfFAgm4HEWFfAKRCYHX5qca8BLi9Kw,3664
-fluxloop_cli-0.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fluxloop_cli-0.2.4.dist-info/entry_points.txt,sha256=NxOEMku4yLMY5kp_Qcd3JcevfXP6A98FsSf9xHcwkyE,51
-fluxloop_cli-0.2.4.dist-info/top_level.txt,sha256=ahLkaxzwhmVU4z-YhkmQVzAbW3-wez9cKnwPiDK7uKM,13
-fluxloop_cli-0.2.4.dist-info/RECORD,,
+fluxloop_cli-0.2.10.dist-info/METADATA,sha256=7RmpBYanuT8ROZBYNCaWdrEdXH9lQ5UE85HJoa8beGo,3665
+fluxloop_cli-0.2.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fluxloop_cli-0.2.10.dist-info/entry_points.txt,sha256=NxOEMku4yLMY5kp_Qcd3JcevfXP6A98FsSf9xHcwkyE,51
+fluxloop_cli-0.2.10.dist-info/top_level.txt,sha256=ahLkaxzwhmVU4z-YhkmQVzAbW3-wez9cKnwPiDK7uKM,13
+fluxloop_cli-0.2.10.dist-info/RECORD,,