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

fluxloop_cli/__init__.py

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

fluxloop_cli/runner.py

@@ -6,6 +6,7 @@ from __future__ import annotations
 
 import asyncio
 import json
+import inspect
 import time
 from datetime import datetime
 from pathlib import Path
@@ -397,11 +398,20 @@ class ExperimentRunner:
             if callable(error_cb) and hasattr(error_cb, "errors"):
                 callback_store["error"] = error_cb.errors
 
+        if inspect.isasyncgenfunction(agent_func):
+            return await self._consume_async_gen(agent_func, kwargs)
+
         if asyncio.iscoroutinefunction(agent_func):
-            return await agent_func(**kwargs)
+            result = await agent_func(**kwargs)
+        else:
+            loop = asyncio.get_event_loop()
+            result = await loop.run_in_executor(None, lambda: agent_func(**kwargs))
 
-        loop = asyncio.get_event_loop()
-        return await loop.run_in_executor(None, lambda: agent_func(**kwargs))
+        # If an async generator/iterable is returned, consume it into a string
+        if inspect.isasyncgen(result) or hasattr(result, "__aiter__"):
+            return await self._consume_async_iterable(result)
+
+        return result
 
     async def _wait_for_callbacks(
         self,
@@ -464,6 +474,33 @@ class ExperimentRunner:
 
         return None
 
+    async def _consume_async_gen(self, func: Callable, kwargs: Dict[str, Any]) -> Any:
+        """Consume an async generator function by joining text chunks resolved from events."""
+        gen = func(**kwargs)
+        return await self._consume_async_iterable(gen)
+
+    async def _consume_async_iterable(self, agen: Any) -> Any:
+        """Consume async iterable items, extracting text via runner.stream_output_path."""
+        path = (getattr(self.config.runner, "stream_output_path", None) or "message.delta").split(".")
+        chunks: List[str] = []
+        async for item in agen:
+            val = self._get_by_path(item, path)
+            if isinstance(val, str) and val:
+                chunks.append(val)
+        return "".join(chunks) if chunks else None
+
+    @staticmethod
+    def _get_by_path(obj: Any, parts: List[str]) -> Any:
+        cur: Any = obj
+        for key in parts:
+            if cur is None:
+                return None
+            if isinstance(cur, dict):
+                cur = cur.get(key)
+            else:
+                cur = getattr(cur, key, None)
+        return cur
+
     @staticmethod
     def _extract_payload(args: Sequence[Any], kwargs: Dict[str, Any]) -> Any:
         if kwargs:

fluxloop_cli/target_loader.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import importlib
 import sys
 from pathlib import Path
-from typing import Callable, Optional
+from typing import Any, Callable, Optional
 
 from fluxloop.schemas import RunnerConfig
 
@@ -51,45 +51,85 @@ class TargetLoader:
         return str(path)
 
     def _load_from_target(self, target: str) -> Callable:
+        """Resolve a callable from target string.
+
+        Supports:
+          - module:function
+          - module:variable
+          - module:Class.method
+          - module:variable.method
+        If the first attribute is a class, attempts to construct an instance via:
+          - runner.factory if provided (module:callable)
+          - zero-argument constructor fallback
+        """
+
         if ":" not in target:
             raise ValueError(
-                "Invalid runner.target format. Expected 'module:function' or 'module:Class.method'."
+                "Invalid runner.target format. Expected 'module:symbol[.attr]'."
             )
 
-        module_name, attribute_part = target.split(":", 1)
+        module_name, attribute_chain = target.split(":", 1)
 
         try:
             module = importlib.import_module(module_name)
         except ImportError as exc:
-            raise ValueError(f"Failed to import module '{module_name}' for target '{target}': {exc}")
+            raise ValueError(
+                f"Failed to import module '{module_name}' for target '{target}': {exc}"
+            )
 
-        if "." in attribute_part:
-            class_name, method_name = attribute_part.split(".", 1)
-            try:
-                cls = getattr(module, class_name)
-            except AttributeError as exc:
-                raise ValueError(
-                    f"Class '{class_name}' not found in module '{module_name}' for target '{target}'."
-                ) from exc
+        parts = attribute_chain.split(".") if attribute_chain else []
+        if not parts:
+            raise ValueError(f"Invalid target '{target}': missing attribute path")
 
-            try:
-                instance = cls()
-            except TypeError as exc:
-                raise ValueError(
-                    "MVP limitation: only classes with zero-argument constructors are supported."
-                ) from exc
+        # Resolve first symbol from module
+        try:
+            obj: Any = getattr(module, parts[0])
+        except AttributeError as exc:
+            raise ValueError(
+                f"Symbol '{parts[0]}' not found in module '{module_name}' for target '{target}'."
+            ) from exc
 
+        # If it's a class, construct instance
+        if isinstance(obj, type):
+            factory = getattr(self.config, "factory", None)
+            factory_kwargs = getattr(self.config, "factory_kwargs", {}) or {}
+            if factory:
+                if ":" not in factory:
+                    raise ValueError("runner.factory must be in 'module:callable' format")
+                fmod, fname = factory.split(":", 1)
+                try:
+                    fac_mod = importlib.import_module(fmod)
+                    fac = getattr(fac_mod, fname)
+                except Exception as exc:
+                    raise ValueError(
+                        f"Failed to import factory '{factory}' for target '{target}': {exc}"
+                    ) from exc
+                try:
+                    obj = fac(**factory_kwargs)
+                except Exception as exc:
+                    raise ValueError(
+                        f"Factory '{factory}' failed to construct instance: {exc}"
+                    ) from exc
+            else:
+                try:
+                    obj = obj()
+                except TypeError as exc:
+                    raise ValueError(
+                        "Cannot construct class without zero-argument constructor. "
+                        "Provide runner.factory to construct the instance."
+                    ) from exc
+
+        # Traverse remaining attributes
+        for attr in parts[1:]:
             try:
-                return getattr(instance, method_name)
+                obj = getattr(obj, attr)
             except AttributeError as exc:
                 raise ValueError(
-                    f"Method '{method_name}' not found on class '{class_name}' for target '{target}'."
+                    f"Attribute '{attr}' not found while resolving target '{target}'."
                 ) from exc
 
-        try:
-            return getattr(module, attribute_part)
-        except AttributeError as exc:
-            raise ValueError(
-                f"Function or attribute '{attribute_part}' not found in module '{module_name}' for target '{target}'."
-            ) from exc
+        if not callable(obj):
+            raise ValueError(f"Resolved target '{target}' is not callable.")
+
+        return obj
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fluxloop-cli
-Version: 0.2.3
+Version: 0.2.4
 Summary: FluxLoop CLI for running agent simulations
 Author-email: FluxLoop Team <team@fluxloop.dev>
 License: Apache-2.0
@@ -71,6 +71,18 @@ The legacy `setting.yaml` is still supported, but new projects created with
 
 Run `fluxloop --help` or `fluxloop <command> --help` for more detail.
 
+## Runner Integration Patterns
+
+Configure how FluxLoop calls your code in `configs/simulation.yaml`:
+
+- Module + function: `module_path`/`function_name` or `target: "module:function"`
+- Class.method (zero-arg ctor): `target: "module:Class.method"`
+- Module-scoped instance method: `target: "module:instance.method"`
+- Class.method with factory: add `factory: "module:make_instance"` (+ `factory_kwargs`)
+- Async generators: set `runner.stream_output_path` if your streamed event shape differs (default `message.delta`).
+
+See full examples: `packages/website/docs-cli/configuration/runner-targets.md`.
+
 ## Developing
 
 Install dependencies and run tests:

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

@@ -1,4 +1,4 @@
-fluxloop_cli/__init__.py,sha256=4xwGwbCKXAH0urdnCLWhCwTBEuntha_81SWQG_voNys,142
+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/config_schema.py,sha256=JZJRcMFun5hp3vKLAyek7W3NvISyzRzZt0BZAeSU38I,2415
@@ -7,8 +7,8 @@ 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=Aqd5Gkqn3XqzteAOU4C7-5k3wjoiBVMNBln1fGGNI1o,22545
-fluxloop_cli/target_loader.py,sha256=F8fTxf-Jfu8rxK7-3Y_uPPxa6GBkCbQpXPaorQNqF6g,3220
+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/validators.py,sha256=_bLXmxUSzVrDtLjqyTba0bDqamRIaOUHhV4xZ7K36Xw,1155
 fluxloop_cli/commands/__init__.py,sha256=sxJX1mJoOSJnH_iIuCqYT8tjh7_yxlJB702j_B_GPUw,164
@@ -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.3.dist-info/METADATA,sha256=n8OBXteqpnxl72uzEXJTn1gK7YlslqyL1L8yY4wkbSA,3062
-fluxloop_cli-0.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fluxloop_cli-0.2.3.dist-info/entry_points.txt,sha256=NxOEMku4yLMY5kp_Qcd3JcevfXP6A98FsSf9xHcwkyE,51
-fluxloop_cli-0.2.3.dist-info/top_level.txt,sha256=ahLkaxzwhmVU4z-YhkmQVzAbW3-wez9cKnwPiDK7uKM,13
-fluxloop_cli-0.2.3.dist-info/RECORD,,
+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,,