meshagent-livekit 0.0.18__tar.gz → 0.0.20__tar.gz

{meshagent_livekit-0.0.18 → meshagent_livekit-0.0.20}/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.0.20]
+- Stability
+
+## [0.0.19]
+- Stability
+
 ## [0.0.18]
 - Stability
 

{meshagent_livekit-0.0.18/meshagent_livekit.egg-info → meshagent_livekit-0.0.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-livekit
-Version: 0.0.18
+Version: 0.0.20
 Summary: Livekit support for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://meshagent.com
@@ -13,13 +13,13 @@ Requires-Dist: pytest~=8.3.5
 Requires-Dist: pytest-asyncio~=0.26.0
 Requires-Dist: strip-markdown~=1.3
 Requires-Dist: livekit-api~=1.0.2
-Requires-Dist: livekit-agents~=1.0.11
-Requires-Dist: livekit-plugins-openai~=1.0.11
-Requires-Dist: livekit-plugins-cartesia~=1.0.11
-Requires-Dist: livekit-plugins-elevenlabs~=1.0.11
-Requires-Dist: livekit-plugins-playai~=1.0.11
-Requires-Dist: livekit-plugins-silero~=1.0.11
-Requires-Dist: livekit-plugins-turn-detector~=1.0.11
-Requires-Dist: meshagent-api~=0.0.18
-Requires-Dist: meshagent-tools~=0.0.18
+Requires-Dist: livekit-agents~=1.0.19
+Requires-Dist: livekit-plugins-openai~=1.0.19
+Requires-Dist: livekit-plugins-cartesia~=1.0.19
+Requires-Dist: livekit-plugins-elevenlabs~=1.0.19
+Requires-Dist: livekit-plugins-playai~=1.0.19
+Requires-Dist: livekit-plugins-silero~=1.0.19
+Requires-Dist: livekit-plugins-turn-detector~=1.0.19
+Requires-Dist: meshagent-api~=0.0.20
+Requires-Dist: meshagent-tools~=0.0.20
 Dynamic: license-file

{meshagent_livekit-0.0.18 → meshagent_livekit-0.0.20}/meshagent/livekit/agents/voice.py

@@ -1,16 +1,23 @@
 import logging
 import asyncio
 
-from meshagent.api import RoomMessage
+from meshagent.api import RoomMessage, ErrorResponse, JsonResponse, FileResponse, Requirement, Participant
 from meshagent.api.room_server_client import RoomClient
 
+from meshagent.agents import ToolResponseAdapter
+from meshagent.tools import ToolContext, Toolkit
 from livekit.agents import Agent, AgentSession
+from livekit.agents.llm import RawFunctionTool, ToolError, function_tool
+
 from livekit.plugins import openai, silero
 #from livekit.plugins.turn_detector.multilingual import MultilingualModel
 import uuid
 import asyncio
 import logging
 
+import json 
+
+from typing import Any
 
 from livekit.plugins import openai
 
@@ -30,9 +37,6 @@ from meshagent.agents import SingleRoomAgent
 logger = logging.getLogger("voice")
 
 
-from meshagent.agents.agent import AgentCallContext
-
-
 class VoiceConnection:
     def __init__(self, *, room: RoomClient, breakout_room: str):
         self.room = room
@@ -69,10 +73,19 @@ class Voicebot(SingleRoomAgent):
         rules: Optional[list[str]] = None,
         auto_greet_prompt: Optional[str] = None,
         greeting: Optional[str] = None,
+        tool_adapter: ToolResponseAdapter = None,
+        toolkits: list[Toolkit] = None,
+        requires: list[Requirement] = None
     ):
+        if toolkits == None:
+            toolkits = []
+
+        self.toolkits = toolkits
+        
         if rules == None:
             rules = [ "You are a helpful assistant communicating through voice." ]
         
+        self.tool_adapter = tool_adapter
         self.auto_greet_prompt = auto_greet_prompt
         self.greeting = greeting
 
@@ -90,7 +103,8 @@ class Voicebot(SingleRoomAgent):
             name=name,
             description=description,
             title=title,
-            labels=labels
+            labels=labels,
+            requires=requires
         )
 
     async def start(self, *, room):
@@ -111,9 +125,16 @@ class Voicebot(SingleRoomAgent):
                 except Exception as e:
                     logger.error(f"{e}", exc_info=e)
 
-            task = asyncio.create_task(self.run_voice_agent(breakout_room=breakout_room))
-            task.add_done_callback(on_done)
-            
+            for participant in self.room.messaging.remote_participants:
+
+                if participant.id == message.from_participant_id:
+
+                    task = asyncio.create_task(self.run_voice_agent(participant=participant, breakout_room=breakout_room))
+                    task.add_done_callback(on_done)
+                    return
+                
+            logger.error(f"unable to find participant {message.from_participant_id}")
+                
     
     async def _wait_for_disconnect(self, room: rtc.Room):
         disconnected = asyncio.Future()
@@ -122,12 +143,77 @@ class Voicebot(SingleRoomAgent):
         room.on("disconnected", on_disconnected)
 
         logger.info("waiting for disconnection")
-        await disconnected      
+        await disconnected
+
+    async def make_function_tools(self, *, context: ToolContext):
+
+        toolkits = [
+            *await self.get_required_toolkits(context=context),
+            *self.toolkits
+        ]
+
+        tools = []
+
+        for toolkit in toolkits:
+
+            for tool in toolkit.tools:
+                
+                tools.append(self._make_function_tool(toolkits, context, tool.name, tool.description, tool.input_schema))
+
+        return tools
+
+    def _make_function_tool(
+        self, toolkits: list[Toolkit], context: ToolContext, name: str, description: str | None, input_schema: dict
+    ) -> RawFunctionTool:
+        
+        async def _tool_called(raw_arguments: dict) -> Any:
+            try:
+
+                tool = None
+                for toolkit in toolkits:
+                    for t in toolkit.tools:
+                        if t.name == name:
+                            tool = t
+
+                if tool is None:
+                    raise ToolError(
+                    f"Could not find tool {name}"
+                    )
+
+                tool_result = await tool.execute(context, **raw_arguments)
+
+                if self.tool_adapter == None:
+
+                    if isinstance(tool_result, ErrorResponse):
+                        raise ToolError(tool_result.text)
+
+                    if isinstance(tool_result, JsonResponse):
+                        return json.dumps(tool_result.json)
+        
+                    raise ToolError(
+                        f"Tool '{name}' returned an unexpected result {type(tool_result)}, attach a tool response adapter"
+                    )
 
-    def create_agent(self):
+                else:
+                    
+                    text = await self.tool_adapter.to_plain_text(room=context.room, response=tool_result)
+                    return text
+
+            except Exception as e:
+                logger.error("unable to call tool", exc_info=e)
+                raise
+
+
+        return function_tool(
+            _tool_called,
+            raw_schema={"name": name, "description": description, "parameters": input_schema},
+        )
+
+    async def create_agent(self, *, context: ToolContext):
         return  Agent(
             instructions="\n".join(self.rules),
-            allow_interruptions=True
+            allow_interruptions=True,
+            tools=await self.make_function_tools(context=context)
         )     
 
         # agent = Agent(
@@ -154,20 +240,22 @@ class Voicebot(SingleRoomAgent):
                 voice="alloy",
                 turn_detection=None,
                 input_audio_transcription=None,
-
             ),
         )
         return session
     
     
-    async def run_voice_agent(self, *, breakout_room: str):
+    async def run_voice_agent(self, *, participant: Participant, breakout_room: str):
         
         async with VoiceConnection(room=self.room, breakout_room=breakout_room) as connection:
             
-
             logger.info("starting voice agent")
 
-            agent = self.create_agent()
+            agent = await self.create_agent(context=ToolContext(
+                room=self.room,
+                caller=self.room.local_participant,
+                on_behalf_of=participant
+            ))
             session = self.create_session()
 
             await session.start(agent=agent, room=connection.livekit_room)

meshagent_livekit-0.0.20/meshagent/livekit/version.py

@@ -0,0 +1 @@
+__version__ = "0.0.20"

{meshagent_livekit-0.0.18 → meshagent_livekit-0.0.20/meshagent_livekit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-livekit
-Version: 0.0.18
+Version: 0.0.20
 Summary: Livekit support for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://meshagent.com
@@ -13,13 +13,13 @@ Requires-Dist: pytest~=8.3.5
 Requires-Dist: pytest-asyncio~=0.26.0
 Requires-Dist: strip-markdown~=1.3
 Requires-Dist: livekit-api~=1.0.2
-Requires-Dist: livekit-agents~=1.0.11
-Requires-Dist: livekit-plugins-openai~=1.0.11
-Requires-Dist: livekit-plugins-cartesia~=1.0.11
-Requires-Dist: livekit-plugins-elevenlabs~=1.0.11
-Requires-Dist: livekit-plugins-playai~=1.0.11
-Requires-Dist: livekit-plugins-silero~=1.0.11
-Requires-Dist: livekit-plugins-turn-detector~=1.0.11
-Requires-Dist: meshagent-api~=0.0.18
-Requires-Dist: meshagent-tools~=0.0.18
+Requires-Dist: livekit-agents~=1.0.19
+Requires-Dist: livekit-plugins-openai~=1.0.19
+Requires-Dist: livekit-plugins-cartesia~=1.0.19
+Requires-Dist: livekit-plugins-elevenlabs~=1.0.19
+Requires-Dist: livekit-plugins-playai~=1.0.19
+Requires-Dist: livekit-plugins-silero~=1.0.19
+Requires-Dist: livekit-plugins-turn-detector~=1.0.19
+Requires-Dist: meshagent-api~=0.0.20
+Requires-Dist: meshagent-tools~=0.0.20
 Dynamic: license-file

meshagent_livekit-0.0.20/meshagent_livekit.egg-info/requires.txt

@@ -0,0 +1,13 @@
+pytest~=8.3.5
+pytest-asyncio~=0.26.0
+strip-markdown~=1.3
+livekit-api~=1.0.2
+livekit-agents~=1.0.19
+livekit-plugins-openai~=1.0.19
+livekit-plugins-cartesia~=1.0.19
+livekit-plugins-elevenlabs~=1.0.19
+livekit-plugins-playai~=1.0.19
+livekit-plugins-silero~=1.0.19
+livekit-plugins-turn-detector~=1.0.19
+meshagent-api~=0.0.20
+meshagent-tools~=0.0.20

{meshagent_livekit-0.0.18 → meshagent_livekit-0.0.20}/pyproject.toml

@@ -14,15 +14,15 @@ dependencies = [
   "pytest-asyncio~=0.26.0",
   "strip-markdown~=1.3",
   "livekit-api~=1.0.2",
-  "livekit-agents~=1.0.11",
-  "livekit-plugins-openai~=1.0.11",
-  "livekit-plugins-cartesia~=1.0.11",
-  "livekit-plugins-elevenlabs~=1.0.11",
-  "livekit-plugins-playai~=1.0.11",
-  "livekit-plugins-silero~=1.0.11",
-  "livekit-plugins-turn-detector~=1.0.11",
-  "meshagent-api~=0.0.18",
-  "meshagent-tools~=0.0.18"
+  "livekit-agents~=1.0.19",
+  "livekit-plugins-openai~=1.0.19",
+  "livekit-plugins-cartesia~=1.0.19",
+  "livekit-plugins-elevenlabs~=1.0.19",
+  "livekit-plugins-playai~=1.0.19",
+  "livekit-plugins-silero~=1.0.19",
+  "livekit-plugins-turn-detector~=1.0.19",
+  "meshagent-api~=0.0.20",
+  "meshagent-tools~=0.0.20"
 ]
 
 [project.urls]

meshagent_livekit-0.0.18/meshagent/livekit/version.py

@@ -1 +0,0 @@
-__version__ = "0.0.18"

meshagent_livekit-0.0.18/meshagent_livekit.egg-info/requires.txt

@@ -1,13 +0,0 @@
-pytest~=8.3.5
-pytest-asyncio~=0.26.0
-strip-markdown~=1.3
-livekit-api~=1.0.2
-livekit-agents~=1.0.11
-livekit-plugins-openai~=1.0.11
-livekit-plugins-cartesia~=1.0.11
-livekit-plugins-elevenlabs~=1.0.11
-livekit-plugins-playai~=1.0.11
-livekit-plugins-silero~=1.0.11
-livekit-plugins-turn-detector~=1.0.11
-meshagent-api~=0.0.18
-meshagent-tools~=0.0.18