meshagent-cli 0.0.35__py3-none-any.whl → 0.0.36__py3-none-any.whl

meshagent/cli/chatbot.py

@@ -11,7 +11,7 @@ from meshagent.agents.chat import ChatBot
 from meshagent.openai import OpenAIResponsesAdapter
 from meshagent.openai.tools.responses_adapter import LocalShellTool
 from meshagent.api.services import ServiceHost
-
+from meshagent.computers.agent import ComputerAgent
 from meshagent.agents.chat import ChatBotThreadOpenAIImageGenerationTool
 
 from typing import List
@@ -20,6 +20,77 @@ from meshagent.api import RequiredToolkit, RequiredSchema
 
 app = async_typer.AsyncTyper()
 
+
+def build_chatbot(*,
+    model: str,
+    agent_name: str, 
+    rule: List[str],
+    toolkit: List[str],
+    schema: List[str],
+    image_generation: Optional[str] = None,
+    local_shell: bool,
+    computer_use: bool
+):
+
+    requirements = []
+    
+    toolkits = []
+
+    for t in toolkit:
+        requirements.append(RequiredToolkit(name=t))
+    
+    for t in schema:
+        requirements.append(RequiredSchema(name=t))
+
+    BaseClass = ChatBot
+    if computer_use:
+        BaseClass = ComputerAgent
+
+        llm_adapter = OpenAIResponsesAdapter(
+            model=model,
+            response_options={
+                "reasoning" : {
+                    "generate_summary" : "concise"
+                },
+                "truncation" : "auto"
+            }
+        )
+    else:
+        llm_adapter = OpenAIResponsesAdapter(
+            model=model
+        )
+    class CustomChatbot(BaseClass):
+        def __init__(self):
+            super().__init__(
+                llm_adapter=llm_adapter,
+                name=agent_name,
+                requires=requirements,
+                toolkits=toolkits,
+                rules=rule if len(rule) > 0 else None
+            )
+        
+        async def get_thread_toolkits(self, *, thread_context, participant):
+            toolkits = await super().get_thread_toolkits(thread_context=thread_context, participant=participant)
+            
+            thread_toolkit = Toolkit(name="thread_toolkit", tools=[])
+
+            if local_shell:
+                thread_toolkit.tools.append(LocalShellTool()) 
+
+            if image_generation != None:
+               
+                print("adding openai image gen to thread", flush=True)
+                thread_toolkit.tools.append(ChatBotThreadOpenAIImageGenerationTool(
+                    model=image_generation,
+                    thread_context=thread_context,
+                    partial_images=3
+                ))
+               
+            toolkits.append(thread_toolkit)
+            return toolkits
+    
+    return CustomChatbot
+
 @app.async_command("join")
 async def make_call(
     *,
@@ -29,11 +100,15 @@ async def make_call(
     name: Annotated[str, typer.Option(..., help="Participant name")] = "cli",
     role: str = "agent",
     agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
+    token_path: Annotated[Optional[str], typer.Option()] = None, 
+    
     rule: Annotated[List[str], typer.Option("--rule", "-r", help="a system rule")] = [],
     toolkit: Annotated[List[str], typer.Option("--toolkit", "-t", help="the name or url of a required toolkit")] = [],
-    schema: Annotated[List[str], typer.Option("--schema", "-s", help="the name or url of a required schema")] = [],
-    token_path: Annotated[Optional[str], typer.Option()] = None, 
-    image_generation: Annotated[Optional[str], typer.Option(..., help="Name of an image gen provider (openai)")] = None,
+    schema: Annotated[List[str], typer.Option("--schema", "-s", help="the name or url of a required schema")] = [], 
+    model: Annotated[str, typer.Option(..., help="Name of the LLM model to use for the chatbot")] = "gpt-4o",
+    image_generation: Annotated[Optional[str], typer.Option(..., help="Name of an image gen model")] = None,
+    computer_use:  Annotated[Optional[bool], typer.Option(..., help="Enable computer use (requires computer-use-preview model)")] = False,
+    local_shell: Annotated[Optional[bool], typer.Option(..., help="Enable local shell tool calling")] = False,
 ):
     account_client = await get_client()
     try:
@@ -43,7 +118,7 @@ async def make_call(
         room = resolve_room(room)
         jwt = await resolve_token_jwt(project_id=project_id, api_key_id=api_key_id, token_path=token_path, name=name, role=role, room=room)
         
-        print("[bold green]Connecting to room...[/bold green]")
+        print("[bold green]Connecting to room...[/bold green]", flush=True)
         async with RoomClient(
             protocol=WebSocketClientProtocol(
                 url=websocket_room_url(room_name=room, base_url=meshagent_base_url()),
@@ -61,21 +136,7 @@ async def make_call(
             for t in schema:
                 requirements.append(RequiredSchema(name=t))
 
-            class CustomChatbot(ChatBot):
-
-                async def get_thread_toolkits(self, *, thread_context, participant):
-                    toolkits = await super().get_thread_toolkits(thread_context=thread_context, participant=participant)
-                    
-                    thread_toolkit = Toolkit(name="thread_toolkit", tools=[])
-                    if image_generation != None:
-                        if image_generation == "openai":
-                            print("adding openai image gen to thread")
-                            thread_toolkit.tools.append(ChatBotThreadOpenAIImageGenerationTool(thread_context=thread_context, partial_images=3))
-                        else:
-                            raise Exception("image-generation must be openai")
-                    toolkits.append(thread_toolkit)
-                    return toolkits
-                
+            CustomChatbot = build_chatbot(computer_use=computer_use, model=model, local_shell=local_shell, agent_name=agent_name, rule=rule, toolkit=toolkit, schema=schema, image_generation=image_generation)
                 
             bot = CustomChatbot(
                 llm_adapter=OpenAIResponsesAdapter(),
@@ -106,7 +167,10 @@ async def service(
     rule: Annotated[List[str], typer.Option("--rule", "-r", help="a system rule")] = [],
     toolkit: Annotated[List[str], typer.Option("--toolkit", "-t", help="the name or url of a required toolkit")] = [],
     schema: Annotated[List[str], typer.Option("--schema", "-s", help="the name or url of a required schema")] = [],
-    image_generation: Annotated[Optional[str], typer.Option(..., help="Name of an image gen provider (openai)")] = None,
+    model: Annotated[str, typer.Option(..., help="Name of the LLM model to use for the chatbot")] = "gpt-4o",
+    image_generation: Annotated[Optional[str], typer.Option(..., help="Name of an image gen model")] = None,
+    local_shell: Annotated[Optional[bool], typer.Option(..., help="Enable local shell tool calling")] = False,
+    computer_use: Annotated[Optional[bool], typer.Option(..., help="Enable computer use (requires computer-use-preview model)")] = False,
 
     host: Annotated[Optional[str], typer.Option()] = None, 
     port: Annotated[Optional[int], typer.Option()] = None, 
@@ -115,48 +179,12 @@ async def service(
     
     room = resolve_room(room)
     
-    print("[bold green]Connecting to room...[/bold green]")
-
-    requirements = []
-    
-    toolkits = []
-
-    for t in toolkit:
-        requirements.append(RequiredToolkit(name=t))
-    
-    for t in schema:
-        requirements.append(RequiredSchema(name=t))
-
-    class CustomChatbot(ChatBot):
-
-        async def get_thread_toolkits(self, *, thread_context, participant):
-            toolkits = await super().get_thread_toolkits(thread_context=thread_context, participant=participant)
-            
-            thread_toolkit = Toolkit(name="thread_toolkit", tools=[])
-            if image_generation != None:
-                if image_generation == "openai":
-                    print("adding openai image gen to thread")
-                    thread_toolkit.tools.append(ChatBotThreadOpenAIImageGenerationTool(thread_context=thread_context, partial_images=3))
-                else:
-                    raise Exception("image-generation must be openai")
-            toolkits.append(thread_toolkit)
-            return toolkits
-        
+    print("[bold green]Connecting to room...[/bold green]", flush=True)
 
     service = ServiceHost(
         host=host,
         port=port
     )
-
-    @service.path(path=path)
-    class CustomChatbot(ChatBot):
-        def __init__(self):
-            super().__init__(
-                llm_adapter=OpenAIResponsesAdapter(),
-                name=agent_name,
-                requires=requirements,
-                toolkits=toolkits,
-                rules=rule if len(rule) > 0 else None
-            )
+    service.add_path(path=path, cls=build_chatbot(computer_use=computer_use, model=model, local_shell=local_shell, agent_name=agent_name, rule=rule, toolkit=toolkit, schema=schema, image_generation=image_generation))
 
     await service.run()

meshagent/cli/cli.py

@@ -20,6 +20,16 @@ from meshagent.cli import chatbot
 from meshagent.cli import voicebot
 from meshagent.cli import tty
 
+from meshagent.cli import otel
+
+import logging
+
+otel.init(level=logging.INFO)
+
+# Turn down OpenAI logs, they are a bit noisy
+logging.getLogger("openai").setLevel(logging.ERROR)
+logging.getLogger("httpx").setLevel(logging.ERROR)
+
 app = typer.Typer()
 app.add_typer(call.app, name="call")
 app.add_typer(auth.app, name="auth")

meshagent/cli/otel.py

@@ -0,0 +1,118 @@
+from opentelemetry.sdk.resources import SERVICE_NAME, Resource
+from opentelemetry import trace
+from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
+from opentelemetry.sdk.trace import TracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor, ConsoleSpanExporter
+
+from opentelemetry import metrics
+from opentelemetry.exporter.otlp.proto.http.metric_exporter import OTLPMetricExporter
+from opentelemetry.sdk._logs.export import ConsoleLogExporter
+from opentelemetry.sdk.metrics import MeterProvider
+from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader, ConsoleMetricExporter
+from opentelemetry import _logs  
+from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
+from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
+from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter
+from opentelemetry.sdk.metrics.export import AggregationTemporality
+from opentelemetry.sdk.metrics import Counter, Histogram
+import logging
+
+import os
+
+def _call_once(fn):
+    called = False
+    result = None
+
+    def wrapper(*args, **kwargs):
+        nonlocal called, result
+        if not called:
+            result = fn(*args, **kwargs)
+            called = True
+        return result
+    return wrapper
+
+
+attributes = {
+    SERVICE_NAME: "room-server",
+}
+
+if os.getenv("MESHAGENT_PROJECT_ID") != None:
+    attributes["project"] = os.getenv("MESHAGENT_PROJECT_ID")
+
+if os.getenv("MESHAGENT_SESSION_ID") != None:
+    attributes["session"] = os.getenv("MESHAGENT_SESSION_ID")
+
+if os.getenv("MESHAGENT_ROOM") != None:
+    attributes["room"] = os.getenv("MESHAGENT_ROOM")
+
+resource = Resource.create(attributes=attributes)
+
+logger_provider = None
+tracer_provider = None
+meter_provider = None
+
+add_console_exporters = False
+
+otel_endpoint = os.getenv("OTEL_ENDPOINT") 
+
+if otel_endpoint != None:
+
+    otel_logs_endpoint = otel_endpoint + "/v1/logs"
+    otel_traces_endpoint = otel_endpoint + "/v1/traces"
+    otel_metrics_endpoint = otel_endpoint + "/v1/metrics"
+    
+    if otel_logs_endpoint != None:
+        logs_exporter = OTLPLogExporter(
+            endpoint=otel_logs_endpoint,
+        )
+        logger_provider = LoggerProvider(resource=resource)
+        _logs.set_logger_provider(logger_provider) 
+        
+        logger_provider.add_log_record_processor(
+            BatchLogRecordProcessor(logs_exporter)
+        )
+
+        if add_console_exporters: 
+            logger_provider.add_log_record_processor(BatchLogRecordProcessor(ConsoleLogExporter()))
+
+        
+    if otel_traces_endpoint != None:
+        tracer_provider = TracerProvider(resource=resource)
+        processor = BatchSpanProcessor(OTLPSpanExporter(endpoint=otel_traces_endpoint))
+        tracer_provider.add_span_processor(processor)
+        if add_console_exporters: 
+            tracer_provider.add_span_processor(BatchSpanProcessor(ConsoleSpanExporter()))
+        trace.set_tracer_provider(tracer_provider)
+
+    if otel_metrics_endpoint != None:
+        reader = PeriodicExportingMetricReader(
+            exporter=OTLPMetricExporter(
+                endpoint=otel_metrics_endpoint,
+                 preferred_temporality={
+                    Counter: AggregationTemporality.DELTA,
+                    Histogram: AggregationTemporality.DELTA,
+                },
+            ),
+            export_interval_millis=1000
+        )
+        
+        readers = [
+            reader,
+        ]
+        if add_console_exporters:
+            readers.append(PeriodicExportingMetricReader(
+                ConsoleMetricExporter()
+            ))
+        
+        meter_provider = MeterProvider(resource=resource, metric_readers=readers)
+        metrics.set_meter_provider(meter_provider)
+
+@_call_once
+def init(level):
+    if logger_provider != None:
+        logging_handler = LoggingHandler(level=level, logger_provider=logger_provider)
+        root = logging.getLogger() 
+        root.setLevel(level) 
+        root.addHandler(logging_handler)
+    else:
+        logging.basicConfig(level=level)

meshagent/cli/version.py

@@ -1 +1 @@
-__version__ = "0.0.35"
+__version__ = "0.0.36"

meshagent/cli/voicebot.py

@@ -53,7 +53,7 @@ async def make_call(
         room = resolve_room(room)
         jwt = await resolve_token_jwt(project_id=project_id, api_key_id=api_key_id, token_path=token_path, name=name, role=role, room=room)
         
-        print("[bold green]Connecting to room...[/bold green]")
+        print("[bold green]Connecting to room...[/bold green]", flush=True)
         async with RoomClient(
             protocol=WebSocketClientProtocol(url=websocket_room_url(room_name=room, base_url=meshagent_base_url()), token=jwt)
         ) as client:

{meshagent_cli-0.0.35.dist-info → meshagent_cli-0.0.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.0.35
+Version: 0.0.36
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -10,12 +10,14 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: typer~=0.15
 Requires-Dist: pydantic-yaml~=1.4
-Requires-Dist: meshagent-api~=0.0.35
-Requires-Dist: meshagent-agents~=0.0.35
-Requires-Dist: meshagent-tools~=0.0.35
-Requires-Dist: meshagent-mcp~=0.0.35
+Requires-Dist: meshagent-api~=0.0.36
+Requires-Dist: meshagent-agents~=0.0.36
+Requires-Dist: meshagent-tools~=0.0.36
+Requires-Dist: meshagent-mcp~=0.0.36
 Requires-Dist: supabase~=2.15
 Requires-Dist: fastmcp~=2.8
+Requires-Dist: opentelemetry-distro~=0.54b1
+Requires-Dist: opentelemetry-exporter-otlp-proto-http~=1.33
 
 ### Meshagent CLI
 

{meshagent_cli-0.0.35.dist-info → meshagent_cli-0.0.36.dist-info}/RECORD

@@ -5,24 +5,25 @@ meshagent/cli/async_typer.py,sha256=GCeSefBDbpd-V4V8LrvHGUTBMth3HspVMfFa-HUZ0cg,
 meshagent/cli/auth.py,sha256=pZQwYTNWQOWTqpyDrkQLNKuidH-wn9GNE5yEJoxn3-g,767
 meshagent/cli/auth_async.py,sha256=run_J11mRPJQ6BI_aAtV_3O3h52eAl1EOnHuotwhoqQ,4018
 meshagent/cli/call.py,sha256=-6Bf5PCVcsuLMgDpG1g3GiY3S5rgs_-CWgWX4C6AXwg,4739
-meshagent/cli/chatbot.py,sha256=_ZuEpWwj1tYpu4CxuoQ4OXAk4LEkD1Qfmt-bOsjkkBU,6437
-meshagent/cli/cli.py,sha256=L3DaoAy03buBemBiltTSgcV9aq9I044pkg6zoZPKzYc,5937
+meshagent/cli/chatbot.py,sha256=1MDzQOdNPyyux50D3rre_HhqXlySo8tBVfnDu2_std4,7455
+meshagent/cli/cli.py,sha256=HbMyzks8LTDz-D6pGV97OHZAiAX39VqS3DrZZB06Y5A,6166
 meshagent/cli/cli_mcp.py,sha256=SG0r-cL3P7eu-fbwB-1WgjQPCmxKqQBh-X3kTKDli-E,9536
 meshagent/cli/cli_secrets.py,sha256=U0kdzN3zt7JIqzdRLynAjxdvAsI0enesBd_m7TeXjnQ,13629
 meshagent/cli/developer.py,sha256=5eoDr3kfi-IufA5d6OESqNr739Bdut_IFBtT3nq0xZU,3002
 meshagent/cli/helper.py,sha256=39_oznxO4sCi3namCJzYC0eWqeeGNlen1zlOuWF43os,4785
 meshagent/cli/messaging.py,sha256=bHMecKtVwY8P11itXMIvaLxPv-Zm6SpgrXnLDppb4Gc,6282
+meshagent/cli/otel.py,sha256=6XaCrffRwPnQWp2KqGBAz4oPZUdlT6xh5kc-JKanJm4,4056
 meshagent/cli/participant_token.py,sha256=uCGmlUgNOfarYGkDZpzreXwnv9AJrM76tu5Lt690vYU,1456
 meshagent/cli/projects.py,sha256=EQfbO9_GQKkjlFcaSHQfIxqIxsmFR3FbH5Fd17I5IPk,3305
 meshagent/cli/services.py,sha256=pMAyLg0eEO33fhRiin5q0KbNVoTzQyT5wSDgvDqeRYM,11241
 meshagent/cli/sessions.py,sha256=WWvuztYqRfthSq6ztwL_eQ_sz9JRc33jcN6p7YyM_Fs,782
 meshagent/cli/storage.py,sha256=Se_4xhxiihIovSR1ajlEWo_YZ12G7eUY_-lvifJ8pjo,33806
 meshagent/cli/tty.py,sha256=DkgeYQckjil191HNoEGHmheniCi41XNUSMpYY1ilAic,4099
-meshagent/cli/version.py,sha256=QmUV3Ydc9xA0pOuihDI_wM1kvEzVZrdkq2eiedTW2UA,23
-meshagent/cli/voicebot.py,sha256=5vB0yzcKVvQ-nq2in51Xlf-rWbJB8Mjc8V44me6mUD4,4701
+meshagent/cli/version.py,sha256=oSKhQHo_8dYEVv3A19nCmQysoh4TbOzHl508xX9iHoo,23
+meshagent/cli/voicebot.py,sha256=lkiFHL2vhQuknQU5b2fbLafqzfycDik8DGZ8PkuK1z0,4713
 meshagent/cli/webhook.py,sha256=KBl8U1TcOX3z2uoyH4YMuUuw0vSVX7xpRxYvzxI5c-Y,2811
-meshagent_cli-0.0.35.dist-info/METADATA,sha256=5tcx5aulHPt6KgjOIdaih5sXkMGB1Dp7SiLPIg5H7o4,627
-meshagent_cli-0.0.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-meshagent_cli-0.0.35.dist-info/entry_points.txt,sha256=WRcGGN4vMtvC5Pgl3uRFqsJiQXNoHuLLa-TCSY3gAhQ,52
-meshagent_cli-0.0.35.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
-meshagent_cli-0.0.35.dist-info/RECORD,,
+meshagent_cli-0.0.36.dist-info/METADATA,sha256=TW6N-7Duj-FnJA6C5NkWpKBF3ovNE18HHcNK6MQKCHM,731
+meshagent_cli-0.0.36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+meshagent_cli-0.0.36.dist-info/entry_points.txt,sha256=WRcGGN4vMtvC5Pgl3uRFqsJiQXNoHuLLa-TCSY3gAhQ,52
+meshagent_cli-0.0.36.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
+meshagent_cli-0.0.36.dist-info/RECORD,,