meshagent-cli 0.7.0__py3-none-any.whl → 0.21.0__py3-none-any.whl

meshagent/cli/version.py

@@ -1 +1 @@
-__version__ = "0.7.0"
+__version__ = "0.21.0"

meshagent/cli/voicebot.py

@@ -5,56 +5,200 @@ from meshagent.cli.common_options import ProjectIdOption, RoomOption
 from meshagent.api import RoomClient, WebSocketClientProtocol, RoomException
 from meshagent.api.helpers import meshagent_base_url, websocket_room_url
 from meshagent.cli import async_typer
-from meshagent.api import ParticipantToken, ApiScope
+from meshagent.api import ParticipantToken, ApiScope, RemoteParticipant
 from meshagent.cli.helper import (
     get_client,
     resolve_project_id,
     resolve_room,
     resolve_key,
+    cleanup_args,
 )
 from typing import List
-
 from meshagent.api import RequiredToolkit, RequiredSchema
-from meshagent.api.services import ServiceHost
 from pathlib import Path
+from meshagent.agents.config import RulesConfig
+import logging
+
+from meshagent.cli.host import get_service, run_services, get_deferred, service_specs
+from meshagent.api.specs.service import AgentSpec, ANNOTATION_AGENT_TYPE
+
+import yaml
 
+import shlex
+import sys
+
+from meshagent.api.client import ConflictError
 
 app = async_typer.AsyncTyper(help="Join a voicebot to a room")
 
+logger = logging.getLogger("voicebot")
+
+
+def build_voicebot(
+    *,
+    agent_name: str,
+    rules: list[str],
+    rules_file: Optional[str] = None,
+    toolkits: list[str],
+    schemas: list[str],
+    auto_greet_message: Optional[str] = None,
+    auto_greet_prompt: Optional[str] = None,
+    room_rules_paths: list[str],
+):
+    requirements = []
+
+    for t in toolkits:
+        requirements.append(RequiredToolkit(name=t))
+
+    for t in schemas:
+        requirements.append(RequiredSchema(name=t))
+
+    if rules_file is not None:
+        try:
+            with open(Path(rules_file).resolve(), "r") as f:
+                rules.extend(f.read().splitlines())
+        except FileNotFoundError:
+            print(f"[yellow]rules file not found at {rules_file}[/yellow]")
+
+    try:
+        from meshagent.livekit.agents.voice import VoiceBot
+    except ImportError:
+
+        class VoiceBot:
+            def __init__(self, **kwargs):
+                raise RoomException(
+                    "meshagent.livekit module not found, voicebots are not available"
+                )
+
+    class CustomVoiceBot(VoiceBot):
+        def __init__(self):
+            super().__init__(
+                auto_greet_message=auto_greet_message,
+                auto_greet_prompt=auto_greet_prompt,
+                name=agent_name,
+                requires=requirements,
+                rules=rules if len(rules) > 0 else None,
+            )
+
+        async def start(self, *, room: RoomClient):
+            await super().start(room=room)
+
+            if room_rules_paths is not None:
+                for p in room_rules_paths:
+                    await self._load_room_rules(path=p)
+
+        async def _load_room_rules(
+            self,
+            *,
+            path: str,
+            participant: Optional[RemoteParticipant] = None,
+        ):
+            rules = []
+            try:
+                room_rules = await self.room.storage.download(path=path)
+
+                rules_txt = room_rules.data.decode()
+
+                rules_config = RulesConfig.parse(rules_txt)
+
+                if rules_config.rules is not None:
+                    rules.extend(rules_config.rules)
+
+                if participant is not None:
+                    client = participant.get_attribute("client")
+
+                    if rules_config.client_rules is not None and client is not None:
+                        cr = rules_config.client_rules.get(client)
+                        if cr is not None:
+                            rules.extend(cr)
+
+            except RoomException:
+                try:
+                    logger.info("attempting to initialize rules file")
+                    handle = await self.room.storage.open(path=path, overwrite=False)
+                    await self.room.storage.write(
+                        handle=handle,
+                        data="# Add rules to this file to customize your agent's behavior, lines starting with # will be ignored.\n\n".encode(),
+                    )
+                    await self.room.storage.close(handle=handle)
+
+                except RoomException:
+                    pass
+                logger.info(
+                    f"unable to load rules from {path}, continuing with default rules"
+                )
+                pass
+
+            return rules
+
+        async def get_rules(self, *, participant: RemoteParticipant):
+            rules = [*self.rules] if self.rules is not None else []
+            if room_rules_paths is not None:
+                for p in room_rules_paths:
+                    rules.extend(
+                        await self._load_room_rules(participant=participant, path=p)
+                    )
+
+            logger.info(f"voicebot using rules {rules}")
+
+            return rules
+
+    return CustomVoiceBot
+
 
 @app.async_command("join")
 async def make_call(
     *,
-    project_id: ProjectIdOption = None,
+    project_id: ProjectIdOption,
     room: RoomOption,
     agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
     rule: Annotated[List[str], typer.Option("--rule", "-r", help="a system rule")] = [],
     rules_file: Optional[str] = None,
+    require_toolkit: Annotated[
+        List[str],
+        typer.Option(
+            "--require-toolkit", "-rt", help="the name or url of a required toolkit"
+        ),
+    ] = [],
+    require_schema: Annotated[
+        List[str],
+        typer.Option(
+            "--require-schema", "-rs", help="the name or url of a required schema"
+        ),
+    ] = [],
     toolkit: Annotated[
         List[str],
-        typer.Option("--toolkit", "-t", help="the name or url of a required toolkit"),
+        typer.Option(
+            "--toolkit", "-t", help="the name or url of a required toolkit", hidden=True
+        ),
     ] = [],
     schema: Annotated[
         List[str],
-        typer.Option("--schema", "-s", help="the name or url of a required schema"),
+        typer.Option(
+            "--schema", "-s", help="the name or url of a required schema", hidden=True
+        ),
     ] = [],
-    auto_greet_message: Annotated[Optional[str], typer.Option()] = None,
-    auto_greet_prompt: Annotated[Optional[str], typer.Option()] = None,
+    auto_greet_message: Annotated[
+        Optional[str],
+        typer.Option(help="Message to send automatically when the bot joins"),
+    ] = None,
+    auto_greet_prompt: Annotated[
+        Optional[str],
+        typer.Option(help="Prompt to generate an auto-greet message"),
+    ] = None,
     key: Annotated[
         str,
         typer.Option("--key", help="an api key to sign the token with"),
     ] = None,
+    room_rules: Annotated[
+        List[str],
+        typer.Option(
+            "--room-rules",
+            "-rr",
+            help="a path to a rules file within the room that can be used to customize the agent's behavior",
+        ),
+    ] = [],
 ):
-    try:
-        from meshagent.livekit.agents.voice import VoiceBot
-    except ImportError:
-
-        class VoiceBot:
-            def __init__(self, **kwargs):
-                raise RoomException(
-                    "meshagent.livekit module not found, voicebots are not available"
-                )
-
     key = await resolve_key(project_id=project_id, key=key)
 
     account_client = await get_client()
@@ -71,13 +215,18 @@ async def make_call(
         token.add_role_grant(role="agent")
         token.add_room_grant(room)
 
+        CustomVoiceBot = build_voicebot(
+            agent_name=agent_name,
+            rules=rule,
+            rules_file=rules_file,
+            toolkits=require_toolkit + toolkit,
+            schemas=require_schema + schema,
+            auto_greet_message=auto_greet_message,
+            auto_greet_prompt=auto_greet_prompt,
+            room_rules_paths=room_rules,
+        )
+
         jwt = token.to_jwt(api_key=key)
-        if rules_file is not None:
-            try:
-                with open(Path(rules_file).resolve(), "r") as f:
-                    rule.extend(f.read().splitlines())
-            except FileNotFoundError:
-                print(f"[yellow]rules file not found at {rules_file}[/yellow]")
 
         print("[bold green]Connecting to room...[/bold green]", flush=True)
         async with RoomClient(
@@ -86,21 +235,7 @@ async def make_call(
                 token=jwt,
             )
         ) as client:
-            requirements = []
-
-            for t in toolkit:
-                requirements.append(RequiredToolkit(name=t))
-
-            for t in schema:
-                requirements.append(RequiredSchema(name=t))
-
-            bot = VoiceBot(
-                auto_greet_message=auto_greet_message,
-                auto_greet_prompt=auto_greet_prompt,
-                name=agent_name,
-                requires=requirements,
-                rules=rule if len(rule) > 0 else None,
-            )
+            bot = CustomVoiceBot()
 
             await bot.start(room=client)
 
@@ -123,56 +258,347 @@ async def service(
     agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
     rule: Annotated[List[str], typer.Option("--rule", "-r", help="a system rule")] = [],
     rules_file: Optional[str] = None,
+    require_toolkit: Annotated[
+        List[str],
+        typer.Option(
+            "--require-toolkit", "-rt", help="the name or url of a required toolkit"
+        ),
+    ] = [],
+    require_schema: Annotated[
+        List[str],
+        typer.Option(
+            "--require-schema", "-rs", help="the name or url of a required schema"
+        ),
+    ] = [],
+    toolkit: Annotated[
+        List[str],
+        typer.Option(
+            "--toolkit", "-t", help="the name or url of a required toolkit", hidden=True
+        ),
+    ] = [],
+    schema: Annotated[
+        List[str],
+        typer.Option(
+            "--schema", "-s", help="the name or url of a required schema", hidden=True
+        ),
+    ] = [],
+    auto_greet_message: Annotated[
+        Optional[str],
+        typer.Option(help="Message to send automatically when the bot joins"),
+    ] = None,
+    auto_greet_prompt: Annotated[
+        Optional[str],
+        typer.Option(help="Prompt to generate an auto-greet message"),
+    ] = None,
+    host: Annotated[
+        Optional[str], typer.Option(help="Host to bind the service on")
+    ] = None,
+    port: Annotated[
+        Optional[int], typer.Option(help="Port to bind the service on")
+    ] = None,
+    path: Annotated[
+        Optional[str], typer.Option(help="HTTP path to mount the service at")
+    ] = None,
+    room_rules: Annotated[
+        List[str],
+        typer.Option(
+            "--room-rules",
+            "-rr",
+            help="a path to a rules file within the room that can be used to customize the agent's behavior",
+        ),
+    ] = [],
+):
+    CustomVoiceBot = build_voicebot(
+        agent_name=agent_name,
+        rules=rule,
+        rules_file=rules_file,
+        toolkits=require_toolkit + toolkit,
+        schemas=require_schema + schema,
+        auto_greet_message=auto_greet_message,
+        auto_greet_prompt=auto_greet_prompt,
+        room_rules_paths=room_rules,
+    )
+
+    service = get_service(host=host, port=port)
+
+    service.agents.append(
+        AgentSpec(name=agent_name, annotations={ANNOTATION_AGENT_TYPE: "ChatBot"})
+    )
+
+    if path is None:
+        path = "/agent"
+        i = 0
+        while service.has_path(path):
+            i += 1
+            path = f"/agent{i}"
+
+    service.add_path(identity=agent_name, path=path, cls=CustomVoiceBot)
+
+    if not get_deferred():
+        await run_services()
+
+
+@app.async_command("spec")
+async def spec(
+    *,
+    service_name: Annotated[str, typer.Option("--service-name", help="service name")],
+    service_description: Annotated[
+        Optional[str], typer.Option("--service-description", help="service description")
+    ] = None,
+    service_title: Annotated[
+        Optional[str],
+        typer.Option("--service-title", help="a display name for the service"),
+    ] = None,
+    agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
+    rule: Annotated[List[str], typer.Option("--rule", "-r", help="a system rule")] = [],
+    rules_file: Optional[str] = None,
+    require_toolkit: Annotated[
+        List[str],
+        typer.Option(
+            "--require-toolkit", "-rt", help="the name or url of a required toolkit"
+        ),
+    ] = [],
+    require_schema: Annotated[
+        List[str],
+        typer.Option(
+            "--require-schema", "-rs", help="the name or url of a required schema"
+        ),
+    ] = [],
     toolkit: Annotated[
         List[str],
-        typer.Option("--toolkit", "-t", help="the name or url of a required toolkit"),
+        typer.Option(
+            "--toolkit", "-t", help="the name or url of a required toolkit", hidden=True
+        ),
     ] = [],
     schema: Annotated[
         List[str],
-        typer.Option("--schema", "-s", help="the name or url of a required schema"),
+        typer.Option(
+            "--schema", "-s", help="the name or url of a required schema", hidden=True
+        ),
+    ] = [],
+    auto_greet_message: Annotated[
+        Optional[str],
+        typer.Option(help="Message to send automatically when the bot joins"),
+    ] = None,
+    auto_greet_prompt: Annotated[
+        Optional[str],
+        typer.Option(help="Prompt to generate an auto-greet message"),
+    ] = None,
+    host: Annotated[
+        Optional[str], typer.Option(help="Host to bind the service on")
+    ] = None,
+    port: Annotated[
+        Optional[int], typer.Option(help="Port to bind the service on")
+    ] = None,
+    path: Annotated[
+        Optional[str], typer.Option(help="HTTP path to mount the service at")
+    ] = None,
+    room_rules: Annotated[
+        List[str],
+        typer.Option(
+            "--room-rules",
+            "-rr",
+            help="a path to a rules file within the room that can be used to customize the agent's behavior",
+        ),
     ] = [],
-    auto_greet_message: Annotated[Optional[str], typer.Option()] = None,
-    auto_greet_prompt: Annotated[Optional[str], typer.Option()] = None,
-    host: Annotated[Optional[str], typer.Option()] = None,
-    port: Annotated[Optional[int], typer.Option()] = None,
-    path: Annotated[str, typer.Option()] = "/agent",
 ):
-    try:
-        from meshagent.livekit.agents.voice import VoiceBot
-    except ImportError:
+    CustomVoiceBot = build_voicebot(
+        agent_name=agent_name,
+        rules=rule,
+        rules_file=rules_file,
+        toolkits=require_toolkit + toolkit,
+        schemas=require_schema + schema,
+        auto_greet_message=auto_greet_message,
+        auto_greet_prompt=auto_greet_prompt,
+        room_rules_paths=room_rules,
+    )
 
-        class VoiceBot:
-            def __init__(self, **kwargs):
-                raise RoomException(
-                    "meshagent.livekit module not found, voicebots are not available"
-                )
+    service = get_service(host=host, port=port)
 
-    requirements = []
+    service.agents.append(
+        AgentSpec(name=agent_name, annotations={ANNOTATION_AGENT_TYPE: "ChatBot"})
+    )
 
-    for t in toolkit:
-        requirements.append(RequiredToolkit(name=t))
+    if path is None:
+        path = "/agent"
+        i = 0
+        while service.has_path(path):
+            i += 1
+            path = f"/agent{i}"
 
-    for t in schema:
-        requirements.append(RequiredSchema(name=t))
+    service.add_path(identity=agent_name, path=path, cls=CustomVoiceBot)
 
-    if rules_file is not None:
+    spec = service_specs()[0]
+    spec.metadata.annotations = {
+        "meshagent.service.id": service_name,
+    }
+    spec.metadata.name = service_name
+    spec.metadata.description = service_description
+    spec.container.image = (
+        "us-central1-docker.pkg.dev/meshagent-public/images/cli:{SERVER_VERSION}-esgz"
+    )
+    spec.container.command = shlex.join(
+        ["meshagent", "voicebot", "service", *cleanup_args(sys.argv[2:])]
+    )
+
+    print(yaml.dump(spec.model_dump(mode="json", exclude_none=True), sort_keys=False))
+
+
+@app.async_command("deploy")
+async def deploy(
+    *,
+    service_name: Annotated[str, typer.Option("--service-name", help="service name")],
+    service_description: Annotated[
+        Optional[str], typer.Option("--service-description", help="service description")
+    ] = None,
+    service_title: Annotated[
+        Optional[str],
+        typer.Option("--service-title", help="a display name for the service"),
+    ] = None,
+    agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
+    rule: Annotated[List[str], typer.Option("--rule", "-r", help="a system rule")] = [],
+    rules_file: Optional[str] = None,
+    require_toolkit: Annotated[
+        List[str],
+        typer.Option(
+            "--require-toolkit", "-rt", help="the name or url of a required toolkit"
+        ),
+    ] = [],
+    require_schema: Annotated[
+        List[str],
+        typer.Option(
+            "--require-schema", "-rs", help="the name or url of a required schema"
+        ),
+    ] = [],
+    toolkit: Annotated[
+        List[str],
+        typer.Option(
+            "--toolkit", "-t", help="the name or url of a required toolkit", hidden=True
+        ),
+    ] = [],
+    schema: Annotated[
+        List[str],
+        typer.Option(
+            "--schema", "-s", help="the name or url of a required schema", hidden=True
+        ),
+    ] = [],
+    auto_greet_message: Annotated[
+        Optional[str],
+        typer.Option(help="Message to send automatically when the bot joins"),
+    ] = None,
+    auto_greet_prompt: Annotated[
+        Optional[str],
+        typer.Option(help="Prompt to generate an auto-greet message"),
+    ] = None,
+    host: Annotated[
+        Optional[str], typer.Option(help="Host to bind the service on")
+    ] = None,
+    port: Annotated[
+        Optional[int], typer.Option(help="Port to bind the service on")
+    ] = None,
+    path: Annotated[
+        Optional[str], typer.Option(help="HTTP path to mount the service at")
+    ] = None,
+    room_rules: Annotated[
+        List[str],
+        typer.Option(
+            "--room-rules",
+            "-rr",
+            help="a path to a rules file within the room that can be used to customize the agent's behavior",
+        ),
+    ] = [],
+    project_id: ProjectIdOption,
+    room: Annotated[
+        Optional[str],
+        typer.Option("--room", help="The name of a room to create the service for"),
+    ] = None,
+):
+    project_id = await resolve_project_id(project_id=project_id)
+
+    CustomVoiceBot = build_voicebot(
+        agent_name=agent_name,
+        rules=rule,
+        rules_file=rules_file,
+        toolkits=require_toolkit + toolkit,
+        schemas=require_schema + schema,
+        auto_greet_message=auto_greet_message,
+        auto_greet_prompt=auto_greet_prompt,
+        room_rules_paths=room_rules,
+    )
+
+    service = get_service(host=host, port=port)
+
+    service.agents.append(
+        AgentSpec(name=agent_name, annotations={ANNOTATION_AGENT_TYPE: "ChatBot"})
+    )
+
+    if path is None:
+        path = "/agent"
+        i = 0
+        while service.has_path(path):
+            i += 1
+            path = f"/agent{i}"
+
+    service.add_path(identity=agent_name, path=path, cls=CustomVoiceBot)
+
+    spec = service_specs()[0]
+    spec.metadata.annotations = {
+        "meshagent.service.id": service_name,
+    }
+    spec.metadata.name = service_name
+    spec.metadata.description = service_description
+    spec.container.image = (
+        "us-central1-docker.pkg.dev/meshagent-public/images/cli:{SERVER_VERSION}-esgz"
+    )
+    spec.container.command = shlex.join(
+        ["meshagent", "voicebot", "service", *cleanup_args(sys.argv[2:])]
+    )
+
+    client = await get_client()
+    try:
+        id = None
         try:
-            with open(Path(rules_file).resolve(), "r") as f:
-                rule.extend(f.read().splitlines())
-        except FileNotFoundError:
-            print(f"[yellow]rules file not found at {rules_file}[/yellow]")
+            if id is None:
+                if room is None:
+                    services = await client.list_services(project_id=project_id)
+                else:
+                    services = await client.list_room_services(
+                        project_id=project_id, room_name=room
+                    )
 
-    service = ServiceHost(host=host, port=port)
+                for s in services:
+                    if s.metadata.name == spec.metadata.name:
+                        id = s.id
 
-    @service.path(path=path)
-    class CustomVoiceBot(VoiceBot):
-        def __init__(self):
-            super().__init__(
-                auto_greet_message=auto_greet_message,
-                auto_greet_prompt=auto_greet_prompt,
-                name=agent_name,
-                requires=requirements,
-                rules=rule if len(rule) > 0 else None,
-            )
+            if id is None:
+                if room is None:
+                    id = await client.create_service(
+                        project_id=project_id, service=spec
+                    )
+                else:
+                    id = await client.create_room_service(
+                        project_id=project_id, service=spec, room_name=room
+                    )
+
+            else:
+                spec.id = id
+                if room is None:
+                    await client.update_service(
+                        project_id=project_id, service_id=id, service=spec
+                    )
+                else:
+                    await client.update_room_service(
+                        project_id=project_id,
+                        service_id=id,
+                        service=spec,
+                        room_name=room,
+                    )
 
-    await service.run()
+        except ConflictError:
+            print(f"[red]Service name already in use: {spec.metadata.name}[/red]")
+            raise typer.Exit(code=1)
+        else:
+            print(f"[green]Deployed service:[/] {id}")
+
+    finally:
+        await client.close()

meshagent/cli/webhook.py

@@ -7,17 +7,17 @@ from meshagent.cli.common_options import ProjectIdOption
 from meshagent.cli import async_typer
 from meshagent.cli.helper import get_client, print_json_table, resolve_project_id
 
-app = async_typer.AsyncTyper()
+app = async_typer.AsyncTyper(help="Manage project webhooks")
 
 # ---------------------------------------------------------------------------
 # Webhook commands
 # ---------------------------------------------------------------------------
 
 
-@app.async_command("create")
+@app.async_command("create", help="Create a webhook")
 async def webhook_create(
     *,
-    project_id: ProjectIdOption = None,
+    project_id: ProjectIdOption,
     name: Annotated[str, typer.Option(help="Friendly name for the webhook")],
     url: Annotated[str, typer.Option(help="Target URL that will receive POSTs")],
     event: Annotated[
@@ -61,10 +61,10 @@ async def webhook_create(
         await client.close()
 
 
-@app.async_command("list")
+@app.async_command("list", help="List webhooks")
 async def webhook_list(
     *,
-    project_id: ProjectIdOption = None,
+    project_id: ProjectIdOption,
 ):
     """List all webhooks for the project."""
     client = await get_client()
@@ -84,10 +84,10 @@ async def webhook_list(
         await client.close()
 
 
-@app.async_command("delete")
+@app.async_command("delete", help="Delete a webhook")
 async def webhook_delete(
     *,
-    project_id: ProjectIdOption = None,
+    project_id: ProjectIdOption,
     webhook_id: Annotated[str, typer.Argument(help="ID of the webhook to delete")],
 ):
     """Delete a project webhook."""