fluxloop-cli 0.2.8__py3-none-any.whl → 0.2.11__py3-none-any.whl

fluxloop_cli/__init__.py

@@ -2,7 +2,7 @@
 FluxLoop CLI - Command-line interface for running agent simulations.
 """
 
-__version__ = "0.2.8"
+__version__ = "0.2.11"
 
 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>")
 

fluxloop_cli/runner.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 import asyncio
 import json
 import inspect
+import os
 import time
 from datetime import datetime
 from pathlib import Path
@@ -39,6 +40,9 @@ class ExperimentRunner:
         self.config = config
         self.no_collector = no_collector
         
+        # Apply project environment (.env + inline environment variables)
+        self._apply_environment()
+
         # Configure output directories (respect config location for relative paths)
         output_base = Path(config.output_directory)
         if not output_base.is_absolute():
@@ -51,6 +55,7 @@ class ExperimentRunner:
         output_base.mkdir(parents=True, exist_ok=True)
 
         offline_dir = output_base / "artifacts"
+        offline_dir.mkdir(parents=True, exist_ok=True)
         fluxloop.configure(
             use_collector=not no_collector and bool(config.collector_url),
             collector_url=config.collector_url or None,
@@ -78,6 +83,31 @@ class ExperimentRunner:
         # Helpers for target loading and argument binding
         self._arg_binder = ArgBinder(config)
     
+    def _apply_environment(self) -> None:
+        """Load environment variables from .env and runner settings."""
+
+        source_dir = self.config.get_source_dir()
+        env_candidates: List[Path] = []
+
+        if source_dir:
+            env_candidates.append(source_dir / ".env")
+            parent = source_dir.parent
+            if parent != source_dir:
+                env_candidates.append(parent / ".env")
+
+        for candidate in env_candidates:
+            if candidate.exists():
+                try:
+                    fluxloop.load_env(candidate, override=True, refresh_config=True)
+                except Exception:
+                    console.log(f"[yellow]Warning:[/yellow] Failed to load environment from {candidate}")
+                else:
+                    break
+
+        env_vars = getattr(self.config.runner, "environment_vars", {}) or {}
+        for key, value in env_vars.items():
+            os.environ[key] = str(value)
+
     def _load_agent(self) -> Callable:
         """Load the agent function from module path."""
         loader = TargetLoader(self.config.runner, source_dir=self.config.get_source_dir())
@@ -487,6 +517,11 @@ class ExperimentRunner:
             val = self._get_by_path(item, path)
             if isinstance(val, str) and val:
                 chunks.append(val)
+                continue
+
+            fallback = self._extract_stream_text(item)
+            if fallback:
+                chunks.append(fallback)
         return "".join(chunks) if chunks else None
 
     @staticmethod
@@ -501,6 +536,39 @@ class ExperimentRunner:
                 cur = getattr(cur, key, None)
         return cur
 
+    @staticmethod
+    def _extract_stream_text(event: Any) -> Optional[str]:
+        """Best-effort extraction of text payloads from streaming events."""
+
+        update = getattr(event, "update", None)
+        if update is not None:
+            delta = getattr(update, "delta", None)
+            if isinstance(delta, str) and delta:
+                return delta
+
+            content = getattr(update, "content", None)
+            text = getattr(content, "text", None) if content is not None else None
+            if isinstance(text, str) and text:
+                return text
+
+        item = getattr(event, "item", None)
+        if item is not None:
+            content = getattr(item, "content", None)
+            if isinstance(content, list):
+                parts: List[str] = []
+                for piece in content:
+                    text = getattr(piece, "text", None)
+                    if isinstance(text, str) and text:
+                        parts.append(text)
+                if parts:
+                    return " ".join(parts)
+
+        text_attr = getattr(event, "text", None)
+        if isinstance(text_attr, str) and text_attr:
+            return text_attr
+
+        return None
+
     @staticmethod
     def _extract_payload(args: Sequence[Any], kwargs: Dict[str, Any]) -> Any:
         if kwargs:
@@ -591,9 +659,6 @@ class ExperimentRunner:
 
         source_path = self.offline_dir / "observations.jsonl"
         if not source_path.exists():
-            console.print(
-                f"[yellow]⚠️  Observations file not found: {source_path}[/yellow]"
-            )
             return
 
         destination = self.output_dir / "observations.jsonl"

{fluxloop_cli-0.2.8.dist-info → fluxloop_cli-0.2.11.dist-info}/METADATA

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

{fluxloop_cli-0.2.8.dist-info → fluxloop_cli-0.2.11.dist-info}/RECORD

@@ -1,5 +1,5 @@
-fluxloop_cli/__init__.py,sha256=cQ5jftUmZZBndl3qNpiGNyEQMmWGM_uxoRRiWjaQq0o,142
-fluxloop_cli/arg_binder.py,sha256=ogb7FPdnDK1VYYIUbBWAH-AgsV5xY6yLMhiI352dRjI,8437
+fluxloop_cli/__init__.py,sha256=NgsS7Nxhi0nRomvzdHVsIubTKzIZKUykYNcexsVQb1o,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
@@ -7,7 +7,7 @@ fluxloop_cli/input_generator.py,sha256=ldlVdPSDfGsP9zO2RALk7QmZjkIvUzTaxDgwOjuPB
 fluxloop_cli/llm_generator.py,sha256=SosP5DeZuhBLEM6bj7BDp-7mckvVhtNJMEk2ZgV143M,12894
 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/runner.py,sha256=cb9e8lhK0NVIhAfhyMejgNVSDHVWwBiYCOIMQGhXqkw,26387
 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
@@ -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.8.dist-info/METADATA,sha256=aNfj7fU6xRDeEShjycEaTXIzFWo1DakGldEIeuFnyas,3664
-fluxloop_cli-0.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fluxloop_cli-0.2.8.dist-info/entry_points.txt,sha256=NxOEMku4yLMY5kp_Qcd3JcevfXP6A98FsSf9xHcwkyE,51
-fluxloop_cli-0.2.8.dist-info/top_level.txt,sha256=ahLkaxzwhmVU4z-YhkmQVzAbW3-wez9cKnwPiDK7uKM,13
-fluxloop_cli-0.2.8.dist-info/RECORD,,
+fluxloop_cli-0.2.11.dist-info/METADATA,sha256=RhgDfMz7r9-YfhZRQDmNvqut1k1KHcZqycbBM1tzGkI,3665
+fluxloop_cli-0.2.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fluxloop_cli-0.2.11.dist-info/entry_points.txt,sha256=NxOEMku4yLMY5kp_Qcd3JcevfXP6A98FsSf9xHcwkyE,51
+fluxloop_cli-0.2.11.dist-info/top_level.txt,sha256=ahLkaxzwhmVU4z-YhkmQVzAbW3-wez9cKnwPiDK7uKM,13
+fluxloop_cli-0.2.11.dist-info/RECORD,,