alloy-runtime-cli 0.2.44__tar.gz → 0.2.46__tar.gz

{alloy_runtime_cli-0.2.44 → alloy_runtime_cli-0.2.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alloy-runtime-cli
-Version: 0.2.44
+Version: 0.2.46
 Summary: Alloy Runtime CLI - Command-line interface for Alloy Runtime server
 Keywords: alloy,cli,python,terminal,workflow
 Classifier: Development Status :: 3 - Alpha
@@ -16,8 +16,8 @@ Requires-Dist: textual==8.1.1
 Requires-Dist: genson==1.3.0
 Requires-Dist: pyperclip==1.11.0
 Requires-Dist: prompt-toolkit==3.0.52
-Requires-Dist: alloy-runtime-sdk==0.2.44
-Requires-Dist: alloy-runtime-types==0.2.44
+Requires-Dist: alloy-runtime-sdk==0.2.46
+Requires-Dist: alloy-runtime-types==0.2.46
 Requires-Dist: trogon==0.6.0
 
 # alloy-runtime-cli
@@ -69,6 +69,17 @@ Use `alloy --format json` for automation-friendly machine-readable output.
 
 The CLI pins `toon-format` from the upstream GitHub source because the PyPI stub release is not usable yet.
 
+## Template validation
+
+Use `alloy templates validate` when you want to check local Jinja content against the server's template resolution and helper validation rules before saving anything.
+
+```bash
+alloy templates validate --file ./templates/email.jinja2 --var user.name=Alice
+alloy templates validate --content "Hello {{ name }}" --var name=World
+```
+
+Use `templates validate` for local drafts and CI-style checks. Use `templates create` or `templates update` when you want to persist the template after it passes validation.
+
 ## Configuration
 
 The CLI reads configuration in this order:

{alloy_runtime_cli-0.2.44 → alloy_runtime_cli-0.2.46}/README.md

@@ -47,6 +47,17 @@ Use `alloy --format json` for automation-friendly machine-readable output.
 
 The CLI pins `toon-format` from the upstream GitHub source because the PyPI stub release is not usable yet.
 
+## Template validation
+
+Use `alloy templates validate` when you want to check local Jinja content against the server's template resolution and helper validation rules before saving anything.
+
+```bash
+alloy templates validate --file ./templates/email.jinja2 --var user.name=Alice
+alloy templates validate --content "Hello {{ name }}" --var name=World
+```
+
+Use `templates validate` for local drafts and CI-style checks. Use `templates create` or `templates update` when you want to persist the template after it passes validation.
+
 ## Configuration
 
 The CLI reads configuration in this order:

{alloy_runtime_cli-0.2.44 → alloy_runtime_cli-0.2.46}/alloy_runtime_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alloy-runtime-cli
-Version: 0.2.44
+Version: 0.2.46
 Summary: Alloy Runtime CLI - Command-line interface for Alloy Runtime server
 Keywords: alloy,cli,python,terminal,workflow
 Classifier: Development Status :: 3 - Alpha
@@ -16,8 +16,8 @@ Requires-Dist: textual==8.1.1
 Requires-Dist: genson==1.3.0
 Requires-Dist: pyperclip==1.11.0
 Requires-Dist: prompt-toolkit==3.0.52
-Requires-Dist: alloy-runtime-sdk==0.2.44
-Requires-Dist: alloy-runtime-types==0.2.44
+Requires-Dist: alloy-runtime-sdk==0.2.46
+Requires-Dist: alloy-runtime-types==0.2.46
 Requires-Dist: trogon==0.6.0
 
 # alloy-runtime-cli
@@ -69,6 +69,17 @@ Use `alloy --format json` for automation-friendly machine-readable output.
 
 The CLI pins `toon-format` from the upstream GitHub source because the PyPI stub release is not usable yet.
 
+## Template validation
+
+Use `alloy templates validate` when you want to check local Jinja content against the server's template resolution and helper validation rules before saving anything.
+
+```bash
+alloy templates validate --file ./templates/email.jinja2 --var user.name=Alice
+alloy templates validate --content "Hello {{ name }}" --var name=World
+```
+
+Use `templates validate` for local drafts and CI-style checks. Use `templates create` or `templates update` when you want to persist the template after it passes validation.
+
 ## Configuration
 
 The CLI reads configuration in this order:

{alloy_runtime_cli-0.2.44 → alloy_runtime_cli-0.2.46}/alloy_runtime_cli.egg-info/SOURCES.txt

@@ -23,6 +23,7 @@ cli/commands/admin/credentials/grant/command.py
 cli/commands/admin/credentials/grant/fields.py
 cli/commands/admin/credentials/grant/presenter.py
 cli/commands/agents/__init__.py
+cli/commands/agents/tool_formatting.py
 cli/commands/agents/create/__init__.py
 cli/commands/agents/create/command.py
 cli/commands/agents/create/fields.py
@@ -324,6 +325,9 @@ cli/commands/templates/render/presenter.py
 cli/commands/templates/update/__init__.py
 cli/commands/templates/update/command.py
 cli/commands/templates/update/presenter.py
+cli/commands/templates/validate/__init__.py
+cli/commands/templates/validate/command.py
+cli/commands/templates/validate/presenter.py
 cli/commands/templates/version/__init__.py
 cli/commands/templates/version/command.py
 cli/commands/templates/version/presenter.py

{alloy_runtime_cli-0.2.44 → alloy_runtime_cli-0.2.46}/alloy_runtime_cli.egg-info/requires.txt

@@ -4,6 +4,6 @@ textual==8.1.1
 genson==1.3.0
 pyperclip==1.11.0
 prompt-toolkit==3.0.52
-alloy-runtime-sdk==0.2.44
-alloy-runtime-types==0.2.44
+alloy-runtime-sdk==0.2.46
+alloy-runtime-types==0.2.46
 trogon==0.6.0

{alloy_runtime_cli-0.2.44 → alloy_runtime_cli-0.2.46}/cli/commands/agents/get/presenter.py

@@ -2,6 +2,7 @@
 
 from alloy_runtime_types.dtos.agents import GetAgentResponse
 
+from cli.commands.agents.tool_formatting import format_tool_details
 from cli.infrastructure.output import OutputService
 from cli.infrastructure.renderers.entity_renderer import FieldConfig
 
@@ -23,7 +24,7 @@ def present_agent_details(response: GetAgentResponse) -> None:
         FieldConfig("name", "Name"),
         FieldConfig("description", "Description"),
         FieldConfig("models", "Models", _format_configured_count),
-        FieldConfig("tools", "Tools", _format_configured_count),
+        FieldConfig("tools", "Tools", lambda _: format_tool_details(response.tools)),
         FieldConfig("id", "Tags", lambda _: _format_tags(response)),
     ]
 

alloy_runtime_cli-0.2.46/cli/commands/agents/tool_formatting.py

@@ -0,0 +1,25 @@
+import json
+
+from alloy_runtime_types.dtos.agents import AgentToolResponse
+
+
+def _format_json(value: object) -> str:
+    return json.dumps(value, sort_keys=True, separators=(",", ":"))
+
+
+def format_tool_details(tools: list[AgentToolResponse]) -> str:
+    if not tools:
+        return "(none)"
+    parts: list[str] = []
+    for tool in tools:
+        lines = [
+            f"{tool.tool_alias} ({tool.tool_id}, {tool.config_source}, {tool.update_mode})",
+            f"submitted={_format_json(tool.submitted_config)}",
+            f"effective={_format_json(tool.effective_config)}",
+        ]
+        if tool.defaults_applied:
+            lines.append(f"defaults={', '.join(tool.defaults_applied)}")
+        if tool.tool_config_name:
+            lines.append(f"tool_config_name={tool.tool_config_name}")
+        parts.append(" ".join(lines))
+    return "\n\n".join(parts)

{alloy_runtime_cli-0.2.44 → alloy_runtime_cli-0.2.46}/cli/commands/agents/update/fields.py

@@ -2,6 +2,8 @@
 
 from alloy_runtime_types.dtos.agents import UpdateAgentResponse
 
+from cli.commands.agents.tool_formatting import format_tool_details
+
 
 def format_models(response: UpdateAgentResponse) -> str:
     """Format models list for display."""
@@ -12,9 +14,7 @@ def format_models(response: UpdateAgentResponse) -> str:
 
 def format_tools(response: UpdateAgentResponse) -> str:
     """Format tools list for display."""
-    if not response.tools:
-        return "(none)"
-    return ", ".join(t.tool_id for t in response.tools)
+    return format_tool_details(response.tools)
 
 
 def format_tags(response: UpdateAgentResponse) -> str:

{alloy_runtime_cli-0.2.44 → alloy_runtime_cli-0.2.46}/cli/commands/generate/status/presenter.py

@@ -46,7 +46,16 @@ def present_generation_status(response: AsyncGenerationStatusResponse) -> None:
                     format_duration_ms(value) if value is not None else cast(str, None)
                 ),
             ),
+            FieldConfig(
+                "assistant_message_id", "Assistant Message ID", format_optional
+            ),
+            FieldConfig(
+                "primary_content_part_id",
+                "Primary Content Part ID",
+                format_optional,
+            ),
             FieldConfig("output_text", "Output"),
+            FieldConfig("output_incomplete", "Output Incomplete"),
             FieldConfig(
                 "usage",
                 "Input Tokens",
@@ -61,6 +70,15 @@ def present_generation_status(response: AsyncGenerationStatusResponse) -> None:
                     format_tokens(usage.output_tokens) if usage else cast(str, None)
                 ),
             ),
+            FieldConfig(
+                "usage",
+                "Reasoning Tokens",
+                lambda usage: (
+                    format_tokens(usage.reasoning_tokens)
+                    if usage and usage.reasoning_tokens is not None
+                    else cast(str, None)
+                ),
+            ),
             FieldConfig(
                 "cost",
                 "Cost",

{alloy_runtime_cli-0.2.44 → alloy_runtime_cli-0.2.46}/cli/commands/generate/text/command.py

@@ -25,6 +25,7 @@ from cli.commands.shared_flags import (
     SCHEMA_DEF,
     SCHEMA_FORMAT,
     SCHEMA_REF,
+    SHOW_FULL_TRACE,
     SHOW_THINKING,
     STREAM,
     TAGS,
@@ -198,6 +199,7 @@ def generate_text_command(
     # Display Options
     stream: bool = STREAM,
     show_thinking: bool = SHOW_THINKING,
+    show_full_trace: bool = SHOW_FULL_TRACE,
     # Concurrent Execution
     count: int = typer.Option(
         1,
@@ -508,6 +510,7 @@ def generate_text_command(
         tags=tags,
         stream=stream,
         show_thinking=show_thinking,
+        show_full_trace=show_full_trace,
         count=count,
         output_mode=output,
         output_file=output_file,
@@ -848,6 +851,7 @@ async def _execute_generate_text(
     tools: list[Any] | None = None,
     parent_execution_id: UUID | None = None,
     execution_purpose: str | None = None,
+    show_full_trace: bool = False,
 ) -> None:
     """Execute the generate text command.
 
@@ -957,6 +961,7 @@ async def _execute_generate_text(
             tag_list=tag_list,
             stream=stream,
             show_thinking=show_thinking,
+            show_full_trace=show_full_trace,
             console=console,
             _output=output,
             output_mode=output_mode,
@@ -990,6 +995,7 @@ async def _execute_generate_text(
         tags=tag_list,
         stream=stream,
         output_schema=output_schema,
+        show_full_trace=show_full_trace,
         external_id=external_id,
         billing_project_id=billing_project_id,
         max_history_messages=max_history_messages,
@@ -1023,6 +1029,7 @@ async def _execute_generate_text(
         chat_session_id=session_id,
         tags=tag_list,
         stream=stream,
+        show_full_trace=show_full_trace,
         output_schema=output_schema,
         billing_project_id=billing_project_id,
         parent_execution_id=parent_execution_id,
@@ -1246,6 +1253,7 @@ async def _execute_multi_agent(
     _output: OutputService,
     output_mode: str = "console",
     output_file: str | None = None,
+    show_full_trace: bool = False,
 ) -> None:
     async with authenticated_client() as (_config, client):
         requests = [
@@ -1259,6 +1267,7 @@ async def _execute_multi_agent(
                 system_instruction_variables=system_variables,
                 tags=tag_list,
                 stream=stream,
+                show_full_trace=show_full_trace,
             )
             for agent_id in agents
         ]

{alloy_runtime_cli-0.2.44 → alloy_runtime_cli-0.2.46}/cli/commands/generate/text/presenter.py

@@ -4,7 +4,11 @@ from pydantic import BaseModel
 
 from cli.infrastructure.output import OutputFormat, OutputService
 from cli.infrastructure.renderers.entity_renderer import FieldConfig
-from alloy_runtime_types.dtos.generation import GenerateTextResponse
+from cli.infrastructure.renderers.list_renderer import ColumnConfig
+from alloy_runtime_types.dtos.generation import (
+    GenerateTextResponse,
+    GenerationFullTrace,
+)
 
 
 class GeneratedTextOutput(BaseModel):
@@ -27,6 +31,20 @@ def _format_total_tokens(response: GenerateTextResponse) -> str:
     return str(response.usage.input_tokens + response.usage.output_tokens)
 
 
+def _format_reasoning_tokens(usage: Any) -> Any:
+    reasoning_tokens = getattr(usage, "reasoning_tokens", None)
+    if reasoning_tokens is None:
+        return cast(str, None)
+    return str(reasoning_tokens)
+
+
+def _format_content_parts(parts: list[Any]) -> str:
+    if not parts:
+        return "-"
+    first_part: Any = parts[0]
+    return getattr(first_part, "content_text", None) or "-"
+
+
 class GenerateTextPresenter:
     def __init__(self, output: OutputService):
         self.output = output
@@ -50,10 +68,14 @@ class GenerateTextPresenter:
                 [
                     FieldConfig("execution_id", "Execution ID", str),
                     FieldConfig("chat_session_id", "Session ID", str),
-                    FieldConfig("content_part_id", "Content Part ID", str),
+                    FieldConfig("assistant_message_id", "Assistant Message ID", str),
+                    FieldConfig(
+                        "primary_content_part_id", "Primary Content Part ID", str
+                    ),
                     FieldConfig("provider_key", "Provider"),
                     FieldConfig("provider_model_name", "Model"),
                     FieldConfig("finish_reason", "Finish Reason"),
+                    FieldConfig("output_incomplete", "Output Incomplete"),
                     FieldConfig(
                         "usage", "Input Tokens", lambda usage: str(usage.input_tokens)
                     ),
@@ -65,6 +87,7 @@ class GenerateTextPresenter:
                         "Total Tokens",
                         lambda _: _format_total_tokens(response),
                     ),
+                    FieldConfig("usage", "Reasoning Tokens", _format_reasoning_tokens),
                     FieldConfig(
                         "cost", "Input Cost", lambda cost: f"${cost.input_cost_usd:.6f}"
                     ),
@@ -92,6 +115,8 @@ class GenerateTextPresenter:
             )
 
         self.present_text_output(response.output_text, title=output_title)
+        if response.full_trace is not None:
+            self.present_full_trace(response.full_trace)
 
     def present_multiple_results(
         self, responses: list[GenerateTextResponse], show_metadata: bool = True
@@ -120,3 +145,42 @@ class GenerateTextPresenter:
             [FieldConfig("output_text", "Output")],
             raw_payload=output,
         )
+
+    def present_full_trace(self, trace: GenerationFullTrace) -> None:
+        self.output.table(
+            items=cast(list[BaseModel], trace.messages),
+            title=f"Full Trace ({trace.finish_reason})",
+            columns=[
+                ColumnConfig(
+                    source_field="sequence_number",
+                    header_label="#",
+                    align="right",
+                    compact_line=1,
+                    compact_style="cyan",
+                ),
+                ColumnConfig(
+                    source_field="role",
+                    header_label="Role",
+                    compact_line=1,
+                    compact_style="yellow",
+                ),
+                ColumnConfig(
+                    source_field="created_at",
+                    header_label="Time",
+                    formatter=lambda value: (
+                        value.strftime("%H:%M:%S") if value else "-"
+                    ),
+                    compact_line=1,
+                    compact_style="blue",
+                ),
+                ColumnConfig(
+                    source_field="content_parts",
+                    header_label="Content",
+                    formatter=_format_content_parts,
+                    compact_line=2,
+                    compact_style="dim",
+                ),
+            ],
+            raw_payload=trace,
+            total_count=len(trace.messages),
+        )

{alloy_runtime_cli-0.2.44 → alloy_runtime_cli-0.2.46}/cli/commands/shared_flags.py

@@ -469,6 +469,12 @@ SHOW_THINKING = typer.Option(
     help="Show thinking blocks",
 )
 
+SHOW_FULL_TRACE = typer.Option(
+    False,
+    "--show-full-trace/--no-show-full-trace",
+    help="Include the full ordered trace for the generated turn",
+)
+
 
 # =============================================================================
 # CREDENTIAL FLAGS

alloy_runtime_cli-0.2.46/cli/commands/templates/validate/command.py

@@ -0,0 +1,82 @@
+from pathlib import Path
+from typing import Annotated, Any, Optional
+
+import typer
+
+from cli.commands.flag_utils import require_exclusive, require_one_of
+from cli.commands.templates.validate.presenter import present_validate_result
+from cli.infrastructure.command import async_command, authenticated_client
+from cli.infrastructure.file_content import FileContentError, resolve_content
+from cli.infrastructure.kv_parser import parse_kv_pairs
+from alloy_runtime_types.dtos.templates import ValidateTemplateRequest
+
+
+def templates_validate_command(
+    content_file: Optional[Path] = typer.Option(
+        None,
+        "-f",
+        "--file",
+        help="Read template content from file",
+        exists=True,
+        readable=True,
+    ),
+    content: Optional[str] = typer.Option(
+        None,
+        "-c",
+        "--content",
+        help="Inline template content (or @file)",
+    ),
+    variables: Annotated[
+        Optional[list[str]],
+        typer.Option(
+            "-v",
+            "--var",
+            help="Variable (key=value, key:=json, or key={...}/[...] for nested JSON). Repeatable.",
+        ),
+    ] = None,
+) -> None:
+    """Validate template content without saving it."""
+    require_exclusive(("--file", content_file), ("--content", content))
+    require_one_of(("--file", content_file), ("--content", content))
+
+    variables_dict = parse_kv_pairs(variables, parse_object_array_strings=True)
+
+    _execute_validate_from_flags(
+        content_file=content_file,
+        content=content,
+        variables_dict=variables_dict,
+    )
+
+
+def _execute_validate_from_flags(
+    *,
+    content_file: Path | None,
+    content: str | None,
+    variables_dict: dict[str, Any] | None,
+) -> None:
+    try:
+        resolved_content = resolve_content(content)
+    except FileContentError as e:
+        raise typer.BadParameter(str(e))
+
+    if content_file is not None:
+        template_content = content_file.read_text()
+    else:
+        template_content = resolved_content or ""
+
+    if not template_content.strip():
+        raise typer.BadParameter("Template content cannot be empty")
+
+    request = ValidateTemplateRequest(
+        content=template_content,
+        variables=variables_dict or {},
+    )
+    _execute_validate(request)
+
+
+@async_command
+async def _execute_validate(request: ValidateTemplateRequest) -> None:
+    async with authenticated_client() as (_config, client):
+        response = await client.validate_template(request)
+
+    present_validate_result(response)

alloy_runtime_cli-0.2.46/cli/commands/templates/validate/presenter.py

@@ -0,0 +1,126 @@
+from typing import cast
+
+from pydantic import BaseModel
+
+from cli.infrastructure.output import OutputFormat, OutputService
+from cli.infrastructure.renderers.entity_renderer import FieldConfig
+from cli.infrastructure.renderers.list_renderer import ColumnConfig
+from alloy_runtime_types.dtos.templates import (
+    TemplateValidationDependencyTraceEntry,
+    ValidateTemplateResponse,
+)
+
+
+class _TemplateValidationSummary(BaseModel):
+    validation_status: str
+    renderable: bool
+    createable: bool
+    required_variables: str
+    unresolved_dependencies: str
+    circular_dependencies: str
+    issue_count: int
+    resolved_dependency_count: int
+
+
+def present_validate_result(response: ValidateTemplateResponse) -> None:
+    output = OutputService.get()
+
+    if getattr(output, "format", OutputFormat.COMPACT) == OutputFormat.JSON:
+        output.raw(response)
+        return
+
+    summary = _TemplateValidationSummary(
+        validation_status=("renderable" if response.is_renderable else "issues found"),
+        renderable=response.is_renderable,
+        createable=response.is_createable,
+        required_variables=_format_string_list(response.required_variables),
+        unresolved_dependencies=_format_string_list(response.unresolved_dependencies),
+        circular_dependencies=_format_cycles(response.circular_dependencies),
+        issue_count=len(response.issues),
+        resolved_dependency_count=len(response.resolved_dependencies),
+    )
+    output.entity(
+        summary,
+        "Template Validation",
+        [
+            FieldConfig("validation_status", "Template Validation"),
+            FieldConfig("renderable", "Renderable"),
+            FieldConfig("createable", "Createable"),
+            FieldConfig("required_variables", "Required Variables"),
+            FieldConfig("unresolved_dependencies", "Unresolved Dependencies"),
+            FieldConfig("circular_dependencies", "Circular Dependencies"),
+            FieldConfig("issue_count", "Validation Issues"),
+            FieldConfig("resolved_dependency_count", "Resolved Dependencies"),
+        ],
+        raw_payload=response,
+    )
+
+    if response.resolved_dependencies:
+        output.table(
+            items=cast(list[BaseModel], response.resolved_dependencies),
+            title="Resolved Dependencies",
+            columns=[
+                ColumnConfig("template_name", "Template"),
+                ColumnConfig("depth", "Depth"),
+                ColumnConfig("was_pinned", "Pinned"),
+                ColumnConfig("template_version_id", "Version ID", str),
+            ],
+        )
+
+    if response.issues:
+        output.table(
+            items=cast(list[BaseModel], response.issues),
+            title="Validation Issues",
+            columns=[
+                ColumnConfig("code", "Code"),
+                ColumnConfig("identifier", "Identifier", _format_optional_value),
+                ColumnConfig("message", "Message"),
+                ColumnConfig(
+                    "dependency_trace",
+                    "Dependency Trace",
+                    _format_issue_trace,
+                ),
+            ],
+        )
+    elif response.dependency_trace:
+        output.table(
+            items=cast(list[BaseModel], response.dependency_trace),
+            title="Dependency Trace",
+            columns=[
+                ColumnConfig("template_name", "Template", _format_optional_value),
+                ColumnConfig("depth", "Depth"),
+                ColumnConfig("source_kind", "Source"),
+                ColumnConfig(
+                    "template_version_id", "Version ID", _format_optional_value
+                ),
+            ],
+        )
+
+
+def _format_string_list(values: list[str]) -> str:
+    if not values:
+        return "(none)"
+    return ", ".join(values)
+
+
+def _format_cycles(cycles: list[list[str]]) -> str:
+    if not cycles:
+        return "(none)"
+    return " | ".join(" -> ".join(cycle) for cycle in cycles)
+
+
+def _format_optional_value(value: object) -> str:
+    if value is None or value == "":
+        return "(none)"
+    return str(value)
+
+
+def _format_issue_trace(trace: list[TemplateValidationDependencyTraceEntry]) -> str:
+    if not trace:
+        return "(none)"
+    return " -> ".join(_format_trace_entry(item) for item in trace)
+
+
+def _format_trace_entry(item: TemplateValidationDependencyTraceEntry) -> str:
+    name = item.template_name or "(unknown)"
+    return f"{name} [{item.source_kind}]"