papayne/guided conversation skill

assistants/skill-assistant/assistant/assistant_registry.py

@@ -1,7 +1,7 @@
 import asyncio
 import logging
 from pathlib import Path
-from typing import List
+from typing import Optional
 
 from openai_client.chat_driver import ChatDriverConfig
 from skill_library import Assistant, Skill
@@ -29,7 +29,7 @@ async def get_or_create_assistant(
         assistant_id: str,
         event_mapper: SkillEventMapperProtocol,
         chat_driver_config: ChatDriverConfig,
-        skills: List[Skill] = [],
+        skills: Optional[dict[str, Skill]] = None,
     ) -> Assistant:
         """
         Get or create an assistant for the given conversation context.
@@ -52,23 +52,26 @@ async def register_assistant(
         assistant_id: str,
         event_mapper: SkillEventMapperProtocol,
         chat_driver_config: ChatDriverConfig,
-        skills: List[Skill] = [],
+        skills: dict[str, Skill] | None = None,
     ) -> Assistant:
         """
         Define the skill assistant that you want to have backing this assistant
         service. You can configure the assistant instructions and which skills
         to include here.
         """
 
+        # for skill in skills:
+        # FIXME: add emit here?
+
         # Create the assistant.
         assistant = Assistant(
             name="Assistant",
             assistant_id=assistant_id,
             drive_root=Path(".data") / assistant_id / "assistant",
-            metadrive_drive_root=Path(".data") / assistant_id / ".assistant",
+            metadata_drive_root=Path(".data") / assistant_id / ".assistant",
             chat_driver_config=chat_driver_config,
+            skills=skills,
         )
-        assistant.register_skills(skills)
 
         # Assistant event consumer.
         async def subscribe() -> None:

assistants/skill-assistant/assistant/skill_assistant.py

@@ -9,9 +9,12 @@
 
 import logging
 from pathlib import Path
+from typing import Any, Optional
 
 import openai_client
 from content_safety.evaluators import CombinedContentSafetyEvaluator
+from form_filler_skill import FormFillerSkill
+from form_filler_skill.guided_conversation import GuidedConversationSkill
 from openai_client.chat_driver import ChatDriverConfig
 
 # from form_filler_skill import FormFillerSkill
@@ -30,6 +33,7 @@
     ContentSafetyEvaluator,
     ConversationContext,
 )
+from skill_library.types import Metadata
 
 from assistant.skill_event_mapper import SkillEventMapper
 
@@ -97,9 +101,28 @@ async def content_evaluator_factory(context: ConversationContext) -> ContentSafe
 assistant_registry = AssistantRegistry()
 
 
+# Handle the event triggered when the assistant is added to a conversation.
+@assistant.events.conversation.on_created
+async def on_conversation_created(conversation_context: ConversationContext) -> None:
+    """
+    Handle the event triggered when the assistant is added to a conversation.
+    """
+
+    # send a welcome message to the conversation
+    config = await assistant_config.get(conversation_context.assistant)
+    welcome_message = config.welcome_message
+    await conversation_context.send_messages(
+        NewConversationMessage(
+            content=welcome_message,
+            message_type=MessageType.chat,
+            metadata={"generated_content": False},
+        )
+    )
+
+
 @assistant.events.conversation.message.chat.on_created
 async def on_message_created(
-    context: ConversationContext, event: ConversationEvent, message: ConversationMessage
+    conversation_context: ConversationContext, event: ConversationEvent, message: ConversationMessage
 ) -> None:
     """
     Handle the event triggered when a new chat message is created in the conversation.
@@ -115,56 +138,38 @@ async def on_message_created(
     """
 
     # pass the message to the core response logic
-    await respond_to_conversation(context, event, message)
+    async with conversation_context.set_status("thinking..."):
+        config = await assistant_config.get(conversation_context.assistant)
+        metadata: dict[str, Any] = {"debug": {"content_safety": event.data.get(content_safety.metadata_key, {})}}
+        await respond_to_conversation(conversation_context, config, message, metadata)
 
 
-@assistant.events.conversation.message.command.on_created
-async def on_command_message_created(
-    context: ConversationContext, event: ConversationEvent, message: ConversationMessage
-) -> None:
-    """
-    Handle the event triggered when a new command message is created in the conversation.
-    """
+# @assistant.events.conversation.message.command.on_created
+# async def on_command_message_created(
+#     conversation_context: ConversationContext, event: ConversationEvent, message: ConversationMessage
+# ) -> None:
+#     """
+#     Handle the event triggered when a new command message is created in the conversation.
+#     """
 
-    # pass the message to the core response logic
-    await respond_to_conversation(context, event, message)
-
-
-# Handle the event triggered when the assistant is added to a conversation.
-@assistant.events.conversation.on_created
-async def on_conversation_created(context: ConversationContext) -> None:
-    """
-    Handle the event triggered when the assistant is added to a conversation.
-    """
-
-    # send a welcome message to the conversation
-    config = await assistant_config.get(context.assistant)
-    welcome_message = config.welcome_message
-    await context.send_messages(
-        NewConversationMessage(
-            content=welcome_message,
-            message_type=MessageType.chat,
-            metadata={"generated_content": False},
-        )
-    )
+#     # pass the message to the core response logic
+#     async with conversation_context.set_status("thinking..."):
+#         config = await assistant_config.get(conversation_context.assistant)
+#         metadata: dict[str, Any] = {"debug": {"content_safety": event.data.get(content_safety.metadata_key, {})}}
+#         await respond_to_conversation(conversation_context, config, message, metadata)
 
 
 # Core response logic for handling messages (chat or command) in the conversation.
 async def respond_to_conversation(
     conversation_context: ConversationContext,
-    event: ConversationEvent,
+    config: AssistantConfigModel,
     message: ConversationMessage,
+    metadata: Optional[Metadata] = None,
 ) -> None:
     """
     Respond to a conversation message.
     """
 
-    # Get the assistant configuration.
-    config = await assistant_config.get(conversation_context.assistant)
-
-    # TODO: pass metadata to the assistant for at least adding the content safety metadata to debug.
-    # metadata = {"debug": {"content_safety": event.data.get(content_safety.metadata_key, {})}}
-
     # Update the participant status to indicate the assistant is thinking.
     await conversation_context.update_participant_me(UpdateParticipant(status="thinking..."))
 
@@ -174,27 +179,31 @@ async def respond_to_conversation(
     # Create and register an assistant if necessary.
     if not assistant:
         try:
-            async_client = openai_client.create_client(config.service_config)
+            language_model = openai_client.create_client(config.service_config)
             chat_driver_config = ChatDriverConfig(
-                openai_client=async_client,
+                openai_client=language_model,
                 model=config.chat_driver_config.openai_model,
                 instructions=config.chat_driver_config.instructions,
-                # context will be overwritten by the assistant when initialized.
             )
             assistant = await assistant_registry.register_assistant(
                 conversation_context.id,
                 SkillEventMapper(conversation_context),
                 chat_driver_config,
-                [
-                    PosixSkill(
+                {
+                    "posix": PosixSkill(
                         sandbox_dir=Path(".data") / conversation_context.id,
                         chat_driver_config=chat_driver_config,
                         mount_dir="/mnt/data",
                     ),
-                    # FormFillerSkill(
-                    #     chat_driver_config=chat_driver_config,
-                    # ),
-                ],
+                    "form_filler": FormFillerSkill(
+                        chat_driver_config=chat_driver_config,
+                        language_model=language_model,
+                    ),
+                    "guided_conversation": GuidedConversationSkill(
+                        chat_driver_config=chat_driver_config,
+                        language_model=language_model,
+                    ),
+                },
             )
 
         except Exception as e:
@@ -210,7 +219,7 @@ async def respond_to_conversation(
             await conversation_context.update_participant_me(UpdateParticipant(status=None))
 
     try:
-        await assistant.put_message(message.content)
+        await assistant.put_message(message.content, metadata)
     except Exception as e:
         logging.exception("exception in on_message_created")
         await conversation_context.send_messages(
@@ -219,6 +228,3 @@ async def respond_to_conversation(
                 content=f"Unhandled error: {e}",
             )
         )
-    finally:
-        # update the participant status to indicate the assistant is done thinking
-        await conversation_context.update_participant_me(UpdateParticipant(status=None))

libraries/python/openai-client/openai_client/__init__.py

@@ -1,16 +1,30 @@
-import logging
+import logging as _logging  # Avoid name conflict with local logging module.
 
 from .client import (
     create_client,
 )
+from .completion import message_content_from_completion, message_from_completion
 from .config import (
     AzureOpenAIApiKeyAuthConfig,
     AzureOpenAIAzureIdentityAuthConfig,
     AzureOpenAIServiceConfig,
     OpenAIServiceConfig,
     ServiceConfig,
 )
+from .errors import (
+    CompletionError,
+    validate_completion,
+)
+from .logging import (
+    add_serializable_data,
+    make_completion_args_serializable,
+)
 from .messages import (
+    create_assistant_message,
+    create_system_message,
+    create_user_message,
+    format_with_dict,
+    format_with_liquid,
     truncate_messages_for_logging,
 )
 from .tokens import (
@@ -19,19 +33,28 @@
     num_tokens_from_tools_and_messages,
 )
 
-logger = logging.getLogger(__name__)
-
+logger = _logging.getLogger(__name__)
 
 __all__ = [
+    "add_serializable_data",
+    "AzureOpenAIApiKeyAuthConfig",
+    "AzureOpenAIAzureIdentityAuthConfig",
+    "AzureOpenAIServiceConfig",
+    "CompletionError",
     "create_client",
-    "truncate_messages_for_logging",
+    "create_assistant_message",
+    "create_system_message",
+    "create_user_message",
+    "format_with_dict",
+    "format_with_liquid",
+    "make_completion_args_serializable",
+    "message_content_from_completion",
+    "message_from_completion",
     "num_tokens_from_message",
     "num_tokens_from_messages",
     "num_tokens_from_tools_and_messages",
-    "AzureOpenAIApiKeyAuthConfig",
-    "AzureOpenAIAzureIdentityAuthConfig",
-    "AzureOpenAIServiceConfig",
     "OpenAIServiceConfig",
     "ServiceConfig",
-    "logger",
+    "truncate_messages_for_logging",
+    "validate_completion",
 ]

libraries/python/openai-client/openai_client/chat_driver/chat_driver.py

@@ -2,7 +2,7 @@
 from typing import Any, Callable, Union
 
 from events import BaseEvent, ErrorEvent, MessageEvent
-from openai import AsyncOpenAI
+from openai import AsyncAzureOpenAI, AsyncOpenAI
 from openai.types.chat import (
     ChatCompletionMessageParam,
     ChatCompletionSystemMessageParam,
@@ -21,7 +21,7 @@
 
 @dataclass
 class ChatDriverConfig:
-    openai_client: AsyncOpenAI
+    openai_client: AsyncOpenAI | AsyncAzureOpenAI
     model: str
     instructions: str | list[str] = "You are a helpful assistant."
     instruction_formatter: MessageFormatter | None = None
@@ -130,6 +130,7 @@ async def respond(
         response_format: Union[ResponseFormat, type[BaseModel]] = TEXT_RESPONSE_FORMAT,
         function_choice: list[str] | None = None,
         instruction_parameters: dict[str, Any] | None = None,
+        metadata: dict[str, Any] | None = None,
     ) -> BaseEvent:
         """
         Respond to a user message.
@@ -165,7 +166,7 @@ async def respond(
             await self.add_message(user_message)
 
         # Generate a response.
-        metadata = {}
+        metadata = metadata or {}
 
         completion_args = {
             "model": self.model,

libraries/python/skills/skill-library/skill_library/__init__.py

@@ -3,7 +3,7 @@
 from context import Context
 
 from .assistant import Assistant
-from .routine import FunctionRoutine, InstructionRoutine, ProgramRoutine, RoutineTypes
+from .routine import InstructionRoutine, ProgramRoutine, RoutineTypes, StateMachineRoutine
 from .skill import EmitterType, Skill
 
 logger = logging.getLogger(__name__)
@@ -12,7 +12,7 @@
     "Assistant",
     "Context",
     "EmitterType",
-    "FunctionRoutine",
+    "StateMachineRoutine",
     "InstructionRoutine",
     "ProgramRoutine",
     "RoutineTypes",