fluxloop-cli 0.2.27__tar.gz → 0.2.29__tar.gz

{fluxloop_cli-0.2.27 → fluxloop_cli-0.2.29}/PKG-INFO

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

{fluxloop_cli-0.2.27 → fluxloop_cli-0.2.29}/fluxloop_cli/__init__.py

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

{fluxloop_cli-0.2.27 → fluxloop_cli-0.2.29}/fluxloop_cli/commands/parse.py

@@ -75,6 +75,9 @@ class TraceSummary:
     duration_ms: float
     success: bool
     raw: dict
+    conversation: Optional[List[Dict[str, Any]]] = None
+    conversation_state: Optional[Dict[str, Any]] = None
+    termination_reason: Optional[str] = None
 
     def to_payload(self) -> dict:
         """Return a JSON-serialisable representation of the summary entry."""
@@ -88,6 +91,9 @@ class TraceSummary:
             "duration_ms": self.duration_ms,
             "success": self.success,
             "raw": self.raw,
+            "conversation": self.conversation,
+            "conversation_state": self.conversation_state,
+            "termination_reason": self.termination_reason,
         }
 
 
@@ -164,6 +170,9 @@ def _load_trace_summaries(path: Path) -> Iterable[TraceSummary]:
                 output_text=payload.get("output"),
                 duration_ms=payload.get("duration_ms", 0.0),
                 success=payload.get("success", False),
+                conversation=payload.get("conversation"),
+                conversation_state=payload.get("conversation_state"),
+                termination_reason=payload.get("termination_reason"),
                 raw=payload,
             )
 
@@ -214,6 +223,30 @@ def _format_markdown(
         f"{_format_json_block({'output': trace.output_text})}\n\n"
     )
 
+    conversation_section = ""
+    if trace.conversation:
+        conversation_lines = ["## Conversation\n"]
+        for entry in trace.conversation:
+            role = (entry.get("role") or "unknown").capitalize()
+            content = entry.get("content") or ""
+            source = entry.get("source")
+            metadata = entry.get("metadata") or {}
+            meta_bits: List[str] = []
+            if source:
+                meta_bits.append(f"source={source}")
+            actions = metadata.get("actions") or []
+            if actions:
+                meta_bits.append("actions=" + ", ".join(actions))
+            if metadata.get("closing"):
+                meta_bits.append("closing=true")
+            persona = metadata.get("persona")
+            if persona:
+                meta_bits.append(f"persona={persona}")
+            meta_suffix = f" _({' ; '.join(meta_bits)})_" if meta_bits else ""
+            conversation_lines.append(f"- **{role}**: {content}{meta_suffix}")
+        conversation_lines.append("")
+        conversation_section = "\n".join(conversation_lines)
+
     timeline_lines = ["## Timeline\n"]
 
     for index, obs in enumerate(observations_sorted, start=1):
@@ -238,7 +271,7 @@ def _format_markdown(
     if not observations_sorted:
         timeline_lines.append("(no observations recorded)\n")
 
-    return header + summary_section + "".join(timeline_lines)
+    return header + summary_section + conversation_section + "".join(timeline_lines)
 
 
 def _sort_observations(
@@ -278,12 +311,40 @@ def _build_structured_record(
         "success": summary_payload["success"],
         "summary": summary_payload,
         "timeline": timeline,
+        "conversation": trace.conversation or summary_payload.get("conversation") or [],
     }
 
+    def _maybe_decode_content(value: Any) -> Any:
+        if isinstance(value, str):
+            text = value.strip()
+            if text and text[0] in "{[" and text[-1] in "}]" and len(text) >= 2:
+                try:
+                    return json.loads(text)
+                except (json.JSONDecodeError, TypeError):
+                    return value
+        return value
+
     record["metrics"] = {
         "observation_count": len(timeline),
     }
 
+    if trace.conversation_state:
+        record["conversation_state"] = trace.conversation_state
+    if trace.termination_reason:
+        record["termination_reason"] = trace.termination_reason
+    if not record["conversation"] and trace.raw.get("conversation"):
+        record["conversation"] = trace.raw.get("conversation")
+    if record["conversation"]:
+        normalized_conversation: List[Dict[str, Any]] = []
+        for entry in record["conversation"]:
+            if not isinstance(entry, dict):
+                normalized_conversation.append(entry)
+                continue
+            normalized_entry = dict(entry)
+            normalized_entry["content"] = _maybe_decode_content(entry.get("content"))
+            normalized_conversation.append(normalized_entry)
+        record["conversation"] = normalized_conversation
+
     return record
 
 

{fluxloop_cli-0.2.27 → fluxloop_cli-0.2.29}/fluxloop_cli/commands/run.py

@@ -5,7 +5,7 @@ Run command for executing experiments and simulations.
 import asyncio
 import sys
 from pathlib import Path
-from typing import Optional
+from typing import Callable, Optional
 
 import typer
 from rich.console import Console
@@ -113,6 +113,11 @@ def experiment(
         "--dry-run",
         help="Show what would be run without executing",
     ),
+    display: bool = typer.Option(
+        True,
+        "--display/--no-display",
+        help="Show rich console output (disable for plain log streaming)",
+    ),
 ):
     """
     Run an experiment based on configuration file.
@@ -227,7 +232,7 @@ def experiment(
     summary.add_row("Output", config.output_directory)
     
     console.print(summary)
-    
+
     if dry_run:
         console.print("\n[yellow]Dry run mode - no execution will occur[/yellow]")
         return
@@ -250,87 +255,127 @@ def experiment(
     # Run experiment with progress tracking
     console.print("\n[bold green]▶️ Starting experiment...[/bold green]\n")
 
-    with Progress(
-        SpinnerColumn(),
-        TextColumn("[progress.description]{task.description}"),
-        BarColumn(),
-        TextColumn("[progress.percentage]{task.percentage:>3.0f}%"),
-        TimeRemainingColumn(),
-        TextColumn("({task.completed} of {task.total})"),
-        console=console,
-    ) as progress:
-        # Create main task
-        main_task = progress.add_task(
-            f"Running {config.name}",
-            total=total_runs,
-        )
-        multi_turn_total = (
-            config.multi_turn.max_turns
-            if config.multi_turn and config.multi_turn.max_turns
-            else None
-        )
-        turn_task = progress.add_task(
-            "[cyan]Turn 0/0",
-            total=multi_turn_total or 1,
-            visible=False,
-        )
+    def _execute_with_callbacks(
+        progress_callback: Optional[Callable[[], None]],
+        turn_progress_callback: Optional[Callable[[int, int, Optional[str]], None]],
+    ):
+        try:
+            return asyncio.run(
+                runner.run_experiment(
+                    progress_callback=progress_callback,
+                    turn_progress_callback=turn_progress_callback,
+                )
+            )
+        except KeyboardInterrupt:
+            console.print("\n[yellow]Experiment interrupted by user[/yellow]")
+            raise typer.Exit(1)
+        except Exception as e:
+            console.print(f"\n[red]Error during experiment:[/red] {e}")
+            if "--debug" in sys.argv:
+                console.print_exception()
+            raise typer.Exit(1)
 
-        def _progress_callback():
-            progress.advance(main_task)
+    if display and console.is_terminal:
+        with Progress(
+            SpinnerColumn(),
+            TextColumn("[progress.description]{task.description}"),
+            BarColumn(),
+            TextColumn("[progress.percentage]{task.percentage:>3.0f}%"),
+            TimeRemainingColumn(),
+            TextColumn("({task.completed} of {task.total})"),
+            console=console,
+        ) as progress:
+            main_task = progress.add_task(
+                f"Running {config.name}",
+                total=total_runs,
+            )
+            multi_turn_total = (
+                config.multi_turn.max_turns
+                if config.multi_turn and config.multi_turn.max_turns
+                else None
+            )
+            turn_task = progress.add_task(
+                "[cyan]Turn 0/0",
+                total=multi_turn_total or 1,
+                visible=False,
+            )
 
-        def _turn_progress_callback(
-            current_turn: int,
-            total_turns: int,
-            message: Optional[str] = None,
-        ) -> None:
-            total = total_turns or 1
-            clamped_turn = max(0, current_turn)
-            if message is None:
-                completed = min(clamped_turn, total)
-                description = f"[cyan]Turn {min(clamped_turn, total)}/{total}: complete"
+            def _progress_callback() -> None:
+                progress.advance(main_task)
+
+            def _turn_progress_callback(
+                current_turn: int,
+                total_turns: int,
+                message: Optional[str] = None,
+            ) -> None:
+                total = total_turns or 1
+                clamped_turn = max(0, current_turn)
+                if message is None:
+                    completed = min(clamped_turn, total)
+                    description = f"[cyan]Turn {min(clamped_turn, total)}/{total}: complete"
+                    progress.update(
+                        turn_task,
+                        total=total,
+                        completed=completed,
+                        description=description,
+                        visible=False,
+                    )
+                    return
+
+                if not progress.tasks[turn_task].visible:
+                    progress.update(turn_task, visible=True)
+
+                preview = message.replace("\n", " ")
+                if len(preview) > 40:
+                    preview = preview[:37] + "..."
+
+                completed = max(0, min(clamped_turn - 1, total))
+                description = f"[cyan]Turn {min(clamped_turn, total)}/{total}: {preview}"
                 progress.update(
                     turn_task,
                     total=total,
                     completed=completed,
                     description=description,
-                    visible=False,
                 )
-                return
 
-            if not progress.tasks[turn_task].visible:
-                progress.update(turn_task, visible=True)
-
-            preview = message.replace("\n", " ")
-            if len(preview) > 40:
-                preview = preview[:37] + "..."
-
-            completed = max(0, min(clamped_turn - 1, total))
-            description = f"[cyan]Turn {min(clamped_turn, total)}/{total}: {preview}"
+            results = _execute_with_callbacks(_progress_callback, _turn_progress_callback)
+    else:
+        completed_runs = 0
 
-            progress.update(
-                turn_task,
-                total=total,
-                completed=completed,
-                description=description,
+        def _progress_callback() -> None:
+            nonlocal completed_runs
+            completed_runs += 1
+            print(
+                f"[fluxloop] run progress {completed_runs}/{total_runs}",
+                flush=True,
             )
 
-        # Run experiment
-        try:
-            results = asyncio.run(
-                runner.run_experiment(
-                    progress_callback=_progress_callback,
-                    turn_progress_callback=_turn_progress_callback,
+        def _turn_progress_callback(
+            current_turn: int,
+            total_turns: int,
+            message: Optional[str] = None,
+        ) -> None:
+            total = total_turns or 1
+            clamped_turn = max(0, current_turn)
+            if message:
+                preview = message.replace("\n", " ")
+                if len(preview) > 80:
+                    preview = preview[:77] + "..."
+                print(
+                    f"[fluxloop] turn progress {min(clamped_turn, total)}/{total}: {preview}",
+                    flush=True,
                 )
-            )
-        except KeyboardInterrupt:
-            console.print("\n[yellow]Experiment interrupted by user[/yellow]")
-            raise typer.Exit(1)
-        except Exception as e:
-            console.print(f"\n[red]Error during experiment:[/red] {e}")
-            # Debug mode - show full traceback
-            if "--debug" in sys.argv:
-                console.print_exception()
-            raise typer.Exit(1)
+            else:
+                print(
+                    f"[fluxloop] turn progress {min(clamped_turn, total)}/{total}: complete",
+                    flush=True,
+                )
+
+        print(
+            f"[fluxloop] running {config.name} ({total_runs} total runs)",
+            flush=True,
+        )
+        results = _execute_with_callbacks(_progress_callback, _turn_progress_callback)
     
     config.set_resolved_input_count(results.get("input_count", config.get_input_count()))
 

{fluxloop_cli-0.2.27 → fluxloop_cli-0.2.29}/fluxloop_cli/evaluation/engine/core.py

@@ -217,6 +217,12 @@ def _write_per_trace(results: List[TraceOutcome], path: Path) -> None:
                     if outcome.trace.get(key) is not None
                 },
             }
+            if outcome.trace.get("conversation") is not None:
+                payload["conversation"] = outcome.trace.get("conversation")
+            if outcome.trace.get("conversation_state") is not None:
+                payload["conversation_state"] = outcome.trace.get("conversation_state")
+            if outcome.trace.get("termination_reason") is not None:
+                payload["termination_reason"] = outcome.trace.get("termination_reason")
             handle.write(json.dumps(payload, ensure_ascii=False) + "\n")