flowent 0.0.4 → 0.0.6

package/backend/src/flowent/assistant_commands.py

@@ -5,7 +5,7 @@ from typing import Any
 
 
 @dataclass(frozen=True)
-class AssistantCommandDefinition:
+class ConversationCommandDefinition:
     name: str
     description: str
     usage: str
@@ -13,36 +13,36 @@ class AssistantCommandDefinition:
 
 
 @dataclass(frozen=True)
-class AssistantCommandInvocation:
+class ConversationCommandInvocation:
     name: str
     argument: str = ""
 
 
-class AssistantCommandError(ValueError):
+class ConversationCommandError(ValueError):
     pass
 
 
 @dataclass(frozen=True)
-class ExecutedAssistantCommand:
+class ExecutedConversationCommand:
     command_name: str
     feedback: str
 
 
-COMMAND_DEFINITIONS: tuple[AssistantCommandDefinition, ...] = (
-    AssistantCommandDefinition(
+COMMAND_DEFINITIONS: tuple[ConversationCommandDefinition, ...] = (
+    ConversationCommandDefinition(
         name="/clear",
-        description="Clear the current Assistant chat history.",
+        description="Clear the current chat.",
         usage="/clear",
     ),
-    AssistantCommandDefinition(
+    ConversationCommandDefinition(
         name="/compact",
-        description="Compact the current execution context.",
+        description="Compress this chat for future replies.",
         usage="/compact [focus]",
         accepts_argument=True,
     ),
-    AssistantCommandDefinition(
+    ConversationCommandDefinition(
         name="/help",
-        description="Show the built-in Assistant commands and usage.",
+        description="Show available commands and usage.",
         usage="/help",
     ),
 )
@@ -50,7 +50,7 @@ COMMAND_DEFINITIONS: tuple[AssistantCommandDefinition, ...] = (
 COMMANDS_BY_NAME = {definition.name: definition for definition in COMMAND_DEFINITIONS}
 
 
-def parse_assistant_command(content: str) -> AssistantCommandInvocation | None:
+def parse_conversation_command(content: str) -> ConversationCommandInvocation | None:
     stripped = content.lstrip()
     if not stripped.startswith("/"):
         return None
@@ -63,16 +63,16 @@ def parse_assistant_command(content: str) -> AssistantCommandInvocation | None:
 
     argument = parts[1].lstrip() if len(parts) > 1 else ""
     if not definition.accepts_argument and argument.strip():
-        raise AssistantCommandError(f"{definition.name} does not accept arguments")
+        raise ConversationCommandError(f"{definition.name} does not accept arguments")
 
-    return AssistantCommandInvocation(
+    return ConversationCommandInvocation(
         name=definition.name,
         argument=argument if definition.accepts_argument else "",
     )
 
 
-def build_assistant_help_text() -> str:
-    lines = ["Built-in Assistant commands:", ""]
+def build_conversation_help_text() -> str:
+    lines = ["Available commands:", ""]
     for definition in COMMAND_DEFINITIONS:
         lines.extend(
             [
@@ -85,22 +85,31 @@ def build_assistant_help_text() -> str:
     return "\n".join(lines).strip()
 
 
-def execute_assistant_command_input(
-    assistant: Any,
+def execute_conversation_command_input(
+    target: Any,
     content: str,
     *,
     interrupt_timeout: float = 5.0,
-) -> ExecutedAssistantCommand | None:
-    invocation = parse_assistant_command(content)
+) -> ExecutedConversationCommand | None:
+    invocation = parse_conversation_command(content)
     if invocation is None:
         return None
 
-    entry = assistant.execute_assistant_command(
+    entry = target.execute_conversation_command(
         command_name=invocation.name,
         argument=invocation.argument,
         interrupt_timeout=interrupt_timeout,
     )
-    return ExecutedAssistantCommand(
+    return ExecutedConversationCommand(
         command_name=entry.command_name,
         feedback=entry.content,
     )
+
+
+AssistantCommandDefinition = ConversationCommandDefinition
+AssistantCommandInvocation = ConversationCommandInvocation
+AssistantCommandError = ConversationCommandError
+ExecutedAssistantCommand = ExecutedConversationCommand
+parse_assistant_command = parse_conversation_command
+build_assistant_help_text = build_conversation_help_text
+execute_assistant_command_input = execute_conversation_command_input

package/backend/src/flowent/channels/telegram.py

@@ -9,8 +9,8 @@ from typing import Any
 from loguru import logger
 
 from flowent.assistant_commands import (
-    AssistantCommandError,
-    execute_assistant_command_input,
+    ConversationCommandError,
+    execute_conversation_command_input,
 )
 from flowent.events import event_bus
 from flowent.models import Event, EventType, Message
@@ -215,8 +215,8 @@ class TelegramChannel:
                 return
 
             try:
-                executed_command = execute_assistant_command_input(assistant, text)
-            except AssistantCommandError as exc:
+                executed_command = execute_conversation_command_input(assistant, text)
+            except ConversationCommandError as exc:
                 await self._send_message(chat_id, str(exc), markdown=False)
                 return
             except (RuntimeError, TimeoutError, LLMProviderError) as exc: