alloy-runtime-cli 0.2.68__tar.gz → 0.2.70__tar.gz

{alloy_runtime_cli-0.2.68 → alloy_runtime_cli-0.2.70}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alloy-runtime-cli
-Version: 0.2.68
+Version: 0.2.70
 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.2.3
 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.68
-Requires-Dist: alloy-runtime-types==0.2.68
+Requires-Dist: alloy-runtime-sdk==0.2.70
+Requires-Dist: alloy-runtime-types==0.2.70
 Requires-Dist: trogon==0.6.0
 
 # alloy-runtime-cli

{alloy_runtime_cli-0.2.68 → alloy_runtime_cli-0.2.70}/alloy_runtime_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alloy-runtime-cli
-Version: 0.2.68
+Version: 0.2.70
 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.2.3
 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.68
-Requires-Dist: alloy-runtime-types==0.2.68
+Requires-Dist: alloy-runtime-sdk==0.2.70
+Requires-Dist: alloy-runtime-types==0.2.70
 Requires-Dist: trogon==0.6.0
 
 # alloy-runtime-cli

{alloy_runtime_cli-0.2.68 → alloy_runtime_cli-0.2.70}/alloy_runtime_cli.egg-info/requires.txt

@@ -4,6 +4,6 @@ textual==8.2.3
 genson==1.3.0
 pyperclip==1.11.0
 prompt-toolkit==3.0.52
-alloy-runtime-sdk==0.2.68
-alloy-runtime-types==0.2.68
+alloy-runtime-sdk==0.2.70
+alloy-runtime-types==0.2.70
 trogon==0.6.0

{alloy_runtime_cli-0.2.68 → alloy_runtime_cli-0.2.70}/cli/commands/content/edit/presenter.py

@@ -11,7 +11,10 @@ from cli.infrastructure.formatting.fields import (
 )
 from cli.infrastructure.output import OutputService
 from cli.infrastructure.renderers.entity_renderer import FieldConfig
-from alloy_runtime_types.dtos.content import UpdateContentPartResponse
+from alloy_runtime_types.dtos.content import (
+    ExecutionMetadataResponse,
+    UpdateContentPartResponse,
+)
 from alloy_runtime_types.dtos.templates import TagResponse
 
 
@@ -19,6 +22,7 @@ def present_content_edit_success(
     response: UpdateContentPartResponse, updated_content: bool, updated_tags: bool
 ) -> None:
     output = OutputService.get()
+    execution_metadata = _require_assistant_execution_metadata(response)
 
     updates: list[str] = []
     if updated_content:
@@ -53,29 +57,23 @@ def present_content_edit_success(
         FieldConfig(
             "id",
             "Execution ID",
-            lambda _: format_uuid(
-                response.execution_metadata.agent_execution_id, short=True
-            ),
+            lambda _: format_uuid(execution_metadata.agent_execution_id, short=True),
         ),
         FieldConfig(
             "id",
             "Agent",
             lambda _: format_optional(
-                response.execution_metadata.agent_name,
+                execution_metadata.agent_name,
                 placeholder="(direct model call)",
             ),
         ),
-        FieldConfig(
-            "id", "Provider", lambda _: response.execution_metadata.provider_key
-        ),
-        FieldConfig(
-            "id", "Model", lambda _: response.execution_metadata.provider_model_name
-        ),
+        FieldConfig("id", "Provider", lambda _: execution_metadata.provider_key),
+        FieldConfig("id", "Model", lambda _: execution_metadata.provider_model_name),
         FieldConfig(
             "id",
             "Cost",
             lambda _: format_optional(
-                response.execution_metadata.total_cost_usd,
+                execution_metadata.total_cost_usd,
                 formatter=format_cost,
             ),
         ),
@@ -83,14 +81,14 @@ def present_content_edit_success(
             "id",
             "Tokens",
             lambda _: format_optional(
-                response.execution_metadata.total_tokens,
+                execution_metadata.total_tokens,
                 formatter=format_tokens,
             ),
         ),
         FieldConfig(
             "id",
             "Queued At",
-            lambda _: format_datetime(response.execution_metadata.queued_at),
+            lambda _: format_datetime(execution_metadata.queued_at),
         ),
     ]
     output.entity(
@@ -123,3 +121,12 @@ def _format_content(response: UpdateContentPartResponse) -> str:
     if response.content_structured is not None:
         return json.dumps(response.content_structured, indent=2, ensure_ascii=False)
     return "(no content)"
+
+
+def _require_assistant_execution_metadata(
+    response: UpdateContentPartResponse,
+) -> ExecutionMetadataResponse:
+    assert response.message_role == "assistant"
+    execution_metadata = response.execution_metadata
+    assert execution_metadata is not None
+    return execution_metadata

alloy_runtime_cli-0.2.70/cli/commands/content/get/presenter.py

@@ -0,0 +1,139 @@
+import json
+
+from cli.infrastructure.formatting.fields import (
+    format_cost,
+    format_datetime,
+    format_optional,
+    format_tokens,
+    format_uuid,
+)
+from cli.infrastructure.output import OutputFormat, OutputService
+from cli.infrastructure.renderers.entity_renderer import FieldConfig
+from alloy_runtime_types.dtos.content import ContentPartItemResponse
+from alloy_runtime_types.dtos.templates import TagResponse
+
+
+def present_content_part(response: ContentPartItemResponse) -> None:
+    output = OutputService.get()
+
+    if getattr(output, "format", OutputFormat.COMPACT) == OutputFormat.JSON:
+        output.raw(response)
+        return
+
+    metadata_fields = [
+        FieldConfig("id", "ID", str),
+        FieldConfig(
+            "message_id", "Message ID", lambda value: format_uuid(value, short=True)
+        ),
+        FieldConfig("message_role", "Message Role"),
+        FieldConfig("part_index", "Part Index", str),
+        FieldConfig("content_type_id", "Content Type"),
+        FieldConfig(
+            "content_structured",
+            "Storage Type",
+            lambda value: "structured" if value else "text",
+        ),
+        FieldConfig("created_at", "Created", format_datetime),
+        FieldConfig("tags", "Tags", _format_tags),
+    ]
+
+    session = response.session
+    if session is not None:
+        metadata_fields.extend(
+            [
+                FieldConfig(
+                    "id",
+                    "Session ID",
+                    lambda _: format_uuid(session.id, short=True),
+                ),
+                FieldConfig(
+                    "id",
+                    "Session Name",
+                    lambda _: format_optional(
+                        session.name,
+                        placeholder="(unnamed session)",
+                    ),
+                ),
+                FieldConfig(
+                    "id",
+                    "Session Activity",
+                    lambda _: format_datetime(session.last_activity_at),
+                ),
+            ]
+        )
+
+    execution_metadata = response.execution_metadata
+    if execution_metadata is not None:
+        metadata_fields.extend(
+            [
+                FieldConfig(
+                    "id",
+                    "Execution ID",
+                    lambda _: format_uuid(
+                        execution_metadata.agent_execution_id, short=True
+                    ),
+                ),
+                FieldConfig(
+                    "id",
+                    "Agent",
+                    lambda _: format_optional(
+                        execution_metadata.agent_name,
+                        placeholder="(direct model call)",
+                    ),
+                ),
+                FieldConfig(
+                    "id",
+                    "Provider",
+                    lambda _: execution_metadata.provider_key,
+                ),
+                FieldConfig(
+                    "id",
+                    "Model",
+                    lambda _: execution_metadata.provider_model_name,
+                ),
+                FieldConfig(
+                    "id",
+                    "Cost",
+                    lambda _: format_optional(
+                        execution_metadata.total_cost_usd,
+                        formatter=format_cost,
+                    ),
+                ),
+                FieldConfig(
+                    "id",
+                    "Tokens",
+                    lambda _: format_optional(
+                        execution_metadata.total_tokens,
+                        formatter=format_tokens,
+                    ),
+                ),
+                FieldConfig(
+                    "id",
+                    "Queued At",
+                    lambda _: format_datetime(execution_metadata.queued_at),
+                ),
+            ]
+        )
+
+    output.entity(response, "Content Part", metadata_fields, raw_payload=response)
+
+    content_fields = [
+        FieldConfig("id", "Content", lambda _: _format_content(response)),
+    ]
+    output.entity(response, "Content Body", content_fields)
+
+
+def _format_tags(tags: list[TagResponse]) -> str:
+    if not tags:
+        return "(no tags)"
+
+    tag_paths = [t.tag_path for t in tags]
+    return ", ".join(tag_paths)
+
+
+def _format_content(response: ContentPartItemResponse) -> str:
+    if response.content_text is not None:
+        return response.content_text
+    if response.content_structured is not None:
+        return json.dumps(response.content_structured, indent=2, ensure_ascii=False)
+    return "(no content)"

{alloy_runtime_cli-0.2.68 → alloy_runtime_cli-0.2.70}/cli/commands/content/list/command.py

@@ -40,7 +40,7 @@ def content_list_command(
         None,
         "-a",
         "--agent",
-        help="Filter by agent UUID",
+        help="Filter by agent UUID (assistant-only)",
     ),
     session: Optional[str] = typer.Option(
         None,
@@ -163,7 +163,7 @@ def content_list_command(
         help="Fields output: tsv, csv, json, jsonl, values",
     ),
 ) -> None:
-    """List AI-generated content parts.
+    """List content parts from user and assistant messages.
 
     Examples:
         alloy content list

{alloy_runtime_cli-0.2.68 → alloy_runtime_cli-0.2.70}/cli/commands/content/list/export_formatters.py

@@ -48,6 +48,18 @@ class ContentExportFormatter(ABC):
             return json.dumps(item.content_structured, ensure_ascii=False)
         return ""
 
+    def _format_role_label(self, item: ContentPartItemResponse) -> str:
+        """Return the explicit plain-text role label."""
+        return item.message_role
+
+    def _format_role_header_label(self, item: ContentPartItemResponse) -> str:
+        """Return the title-cased role label for markdown headers."""
+        return self._format_role_label(item).capitalize()
+
+    def _format_labeled_content(self, item: ContentPartItemResponse) -> str:
+        """Prefix content with its role label."""
+        return f"[{self._format_role_label(item)}] {self._get_content(item)}"
+
     def _group_items(
         self, items: list[ContentPartItemResponse], group_by: str
     ) -> dict[str, list[ContentPartItemResponse]]:
@@ -140,7 +152,9 @@ class MarkdownFormatter(ContentExportFormatter):
         sections: list[str] = []
         for i, item in enumerate(items, 1):
             content = self._get_content(item)
-            sections.append(f"## Item {i}\n\n{content}")
+            sections.append(
+                f"## {self._format_role_header_label(item)} Item {i}\n\n{content}"
+            )
         return "\n\n".join(sections)
 
     def _format_grouped(
@@ -153,7 +167,9 @@ class MarkdownFormatter(ContentExportFormatter):
             group_sections: list[str] = [f"## {group_name}"]
             for i, item in enumerate(group_items, 1):
                 content = self._get_content(item)
-                group_sections.append(f"### Item {i}\n\n{content}")
+                group_sections.append(
+                    f"### {self._format_role_header_label(item)} Item {i}\n\n{content}"
+                )
             sections.append("\n\n".join(group_sections))
         return "\n\n".join(sections)
 
@@ -211,7 +227,10 @@ class XmlFormatter(ContentExportFormatter):
             tag_name = (
                 self._safe_tag_name(item.tags[0].tag_path) if item.tags else "item"
             )
-            lines.append(f"  <{tag_name}>{self._wrap_cdata(content)}</{tag_name}>")
+            role = self._format_role_label(item)
+            lines.append(
+                f'  <{tag_name} role="{role}">{self._wrap_cdata(content)}</{tag_name}>'
+            )
         lines.append("</content_items>")
         return "\n".join(lines)
 
@@ -226,7 +245,10 @@ class XmlFormatter(ContentExportFormatter):
             lines.append(f"  <{safe_name}>")
             for item in group_items:
                 content = self._get_content(item)
-                lines.append(f"    <item>{self._wrap_cdata(content)}</item>")
+                role = self._format_role_label(item)
+                lines.append(
+                    f'    <item role="{role}">{self._wrap_cdata(content)}</item>'
+                )
             lines.append(f"  </{safe_name}>")
         lines.append("</content_items>")
         return "\n".join(lines)
@@ -255,7 +277,7 @@ class NumberedFormatter(ContentExportFormatter):
         """Format items as a flat numbered list."""
         lines: list[str] = []
         for i, item in enumerate(items, 1):
-            content = self._get_content(item)
+            content = self._format_labeled_content(item)
             # Handle multi-line content
             content_lines = content.split("\n")
             if len(content_lines) == 1:
@@ -276,7 +298,7 @@ class NumberedFormatter(ContentExportFormatter):
         for group_name, group_items in groups.items():
             lines.append(f"[{group_name}]")
             for i, item in enumerate(group_items, 1):
-                content = self._get_content(item)
+                content = self._format_labeled_content(item)
                 content_lines = content.split("\n")
                 if len(content_lines) == 1:
                     lines.append(f"  {i}. {content}")
@@ -314,7 +336,7 @@ class PlainFormatter(ContentExportFormatter):
         """Format items as plain text."""
         lines: list[str] = []
         for item in items:
-            content = self._get_content(item)
+            content = self._format_labeled_content(item)
             lines.append(content)
         return "\n".join(lines)
 
@@ -327,7 +349,7 @@ class PlainFormatter(ContentExportFormatter):
         for group_items in groups.values():
             section_lines: list[str] = []
             for item in group_items:
-                content = self._get_content(item)
+                content = self._format_labeled_content(item)
                 section_lines.append(content)
             sections.append("\n".join(section_lines))
         return "\n\n".join(sections)
@@ -356,6 +378,7 @@ class JsonExportFormatter(ContentExportFormatter):
         """Convert content item to dictionary for JSON serialization."""
         return {
             "id": str(item.id),
+            "message_role": item.message_role,
             "content_type": item.content_type_id,
             "content": item.content_text or item.content_structured,
             "tags": [t.tag_path for t in item.tags],

{alloy_runtime_cli-0.2.68 → alloy_runtime_cli-0.2.70}/cli/commands/content/list/presenter.py

@@ -74,6 +74,11 @@ def _format_model_info(part: Any) -> str:
     return "-"
 
 
+def _format_role(part: Any) -> str:
+    """Format the message role for display."""
+    return str(part.message_role)
+
+
 def _format_created_at(created_at: datetime | None) -> str:
     """Format creation timestamp for display.
 
@@ -106,6 +111,12 @@ def present_content_list(response: ListContentPartsResponse) -> None:
             compact_line=1,
             compact_style="cyan",
         ),
+        ColumnConfig(
+            source_field="_role",
+            header_label="Role",
+            compact_line=1,
+            compact_style="yellow",
+        ),
         ColumnConfig(
             source_field="content_type_id",
             header_label="Type",
@@ -153,6 +164,7 @@ def present_content_list(response: ListContentPartsResponse) -> None:
             self.tags = part.tags
             self.created_at = part.created_at
             # Add computed fields
+            self._role = _format_role(part)
             self._content_preview = _format_content_preview(
                 part.content_text, part.content_structured
             )

alloy_runtime_cli-0.2.70/cli/commands/models/list/command.py

@@ -0,0 +1,198 @@
+"""Models list command implementation."""
+
+from enum import Enum
+from typing import Annotated, Optional
+
+import typer
+
+from alloy_runtime_types.enums.content_enums import SortOrder
+from alloy_runtime_types.enums.model_enums import ModelSortField
+
+from cli.commands.models.list.presenter import present_models_list
+from cli.infrastructure.command import async_command, authenticated_client
+
+
+class DisplayColumn(str, Enum):
+    """Column display options."""
+
+    MODEL = "model"
+    PROVIDER = "provider"
+
+
+def models_list_command(
+    search: Optional[str] = typer.Option(
+        None,
+        "-s",
+        "--search",
+        help="Fuzzy search terms",
+    ),
+    provider_filter: Optional[str] = typer.Option(
+        None,
+        "-p",
+        "--provider",
+        help="Filter by provider",
+    ),
+    configured_only: bool = typer.Option(
+        False,
+        "--configured",
+        help="Only show models with credentials",
+    ),
+    context_window_min: Optional[int] = typer.Option(
+        None,
+        "--context-window-min",
+        min=1,
+        help="Minimum context window size",
+    ),
+    context_window_max: Optional[int] = typer.Option(
+        None,
+        "--context-window-max",
+        min=1,
+        help="Maximum context window size",
+    ),
+    max_output_tokens_min: Optional[int] = typer.Option(
+        None,
+        "--max-output-min",
+        min=1,
+        help="Minimum max output tokens",
+    ),
+    max_output_tokens_max: Optional[int] = typer.Option(
+        None,
+        "--max-output-max",
+        min=1,
+        help="Maximum max output tokens",
+    ),
+    input_modalities: Annotated[
+        Optional[list[str]],
+        typer.Option(
+            "--input-modality",
+            help="Filter by input modality (repeatable)",
+        ),
+    ] = None,
+    output_modalities: Annotated[
+        Optional[list[str]],
+        typer.Option(
+            "--output-modality",
+            help="Filter by output modality (repeatable)",
+        ),
+    ] = None,
+    sort_by: Optional[str] = typer.Option(
+        None,
+        "--sort-by",
+        help="Sort field: provider_key, provider_model_name, context_window, max_output_tokens",
+    ),
+    sort_order: Optional[str] = typer.Option(
+        None,
+        "--sort-order",
+        help="Sort direction: asc or desc",
+    ),
+    limit: int = typer.Option(
+        100,
+        "--limit",
+        min=1,
+        max=10000,
+        help="Maximum number of models to return",
+    ),
+    offset: int = typer.Option(
+        0,
+        "--offset",
+        min=0,
+        help="Number of matching models to skip before returning results",
+    ),
+    display: DisplayColumn | None = typer.Option(
+        None,
+        "--display",
+        help="Show only: model or provider",
+    ),
+    extra_fields: bool = typer.Option(
+        False,
+        "--extra",
+        help="Show detailed table",
+    ),
+) -> None:
+    """List available AI models.
+
+    Examples:
+        alloy models list
+        alloy models list -s "claude sonnet"
+        alloy models list -p anthropic
+        alloy models list --configured
+        alloy models list --display model
+        alloy models list --extra
+        alloy models list --context-window-min 100000
+        alloy models list --input-modality text --input-modality image
+        alloy models list --sort-by context_window --sort-order desc
+    """
+    sort_by_enum: Optional[ModelSortField] = None
+    if sort_by:
+        try:
+            sort_by_enum = ModelSortField(sort_by)
+        except ValueError:
+            valid = ", ".join(sf.value for sf in ModelSortField)
+            raise typer.BadParameter(f"Invalid sort field '{sort_by}'. Valid: {valid}")
+
+    sort_order_enum: Optional[SortOrder] = None
+    if sort_order:
+        try:
+            sort_order_enum = SortOrder(sort_order)
+        except ValueError:
+            valid = ", ".join(so.value for so in SortOrder)
+            raise typer.BadParameter(
+                f"Invalid sort order '{sort_order}'. Valid: {valid}"
+            )
+
+    _execute_list(
+        search=search,
+        provider_filter=provider_filter,
+        configured_only=configured_only,
+        context_window_min=context_window_min,
+        context_window_max=context_window_max,
+        max_output_tokens_min=max_output_tokens_min,
+        max_output_tokens_max=max_output_tokens_max,
+        input_modalities=input_modalities,
+        output_modalities=output_modalities,
+        sort_by=sort_by_enum,
+        sort_order=sort_order_enum,
+        limit=limit,
+        offset=offset,
+        display=display,
+        extra_fields=extra_fields,
+    )
+
+
+@async_command
+async def _execute_list(
+    search: Optional[str],
+    provider_filter: Optional[str],
+    configured_only: bool,
+    context_window_min: Optional[int],
+    context_window_max: Optional[int],
+    max_output_tokens_min: Optional[int],
+    max_output_tokens_max: Optional[int],
+    input_modalities: Optional[list[str]],
+    output_modalities: Optional[list[str]],
+    sort_by: Optional[ModelSortField],
+    sort_order: Optional[SortOrder],
+    limit: int,
+    offset: int,
+    display: DisplayColumn | None,
+    extra_fields: bool,
+) -> None:
+    """Execute list models operation."""
+    async with authenticated_client() as (_config, client):
+        response = await client.list_models(
+            search=search,
+            provider_filter=provider_filter,
+            configured_only=configured_only,
+            context_window_min=context_window_min,
+            context_window_max=context_window_max,
+            max_output_tokens_min=max_output_tokens_min,
+            max_output_tokens_max=max_output_tokens_max,
+            input_modalities=input_modalities,
+            output_modalities=output_modalities,
+            sort_by=sort_by,
+            sort_order=sort_order,
+            limit=limit,
+            offset=offset,
+        )
+
+    present_models_list(response, display_column=display, extra_fields=extra_fields)

{alloy_runtime_cli-0.2.68 → alloy_runtime_cli-0.2.70}/cli/infrastructure/field_extractor.py

@@ -318,6 +318,7 @@ Available fields for --fields/-F option:
 Top-level fields:
   id                           Content part UUID
   message_id                   Parent message UUID
+  message_role                 Role: user or assistant
   part_index                   Index within message (0-based)
   content_type_id              Content type (text, code, json, etc.)
   content_text                 Plain text content

{alloy_runtime_cli-0.2.68 → alloy_runtime_cli-0.2.70}/cli/main.py

@@ -678,7 +678,7 @@ generate_app.command("cancel")(generate_cancel_command)
 
 # Content command group
 content_app = typer.Typer(
-    help="Query and manage AI-generated content parts",
+    help="Query and manage content from user and assistant messages",
     no_args_is_help=True,
 )