meshagent-api 0.24.6__tar.gz → 0.25.1__tar.gz

{meshagent_api-0.24.6/meshagent_api.egg-info → meshagent_api-0.25.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-api
-Version: 0.24.6
+Version: 0.25.1
 Summary: Python Server API for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -10,12 +10,13 @@ Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pyjwt~=2.10
-Requires-Dist: aiohttp~=3.10
+Requires-Dist: aiohttp[speedups]~=3.13.0
 Requires-Dist: jsonschema~=4.23
 Requires-Dist: pycrdt~=0.12.26
 Requires-Dist: opentelemetry-distro~=0.54b1
 Requires-Dist: pydantic~=2.11.7
 Requires-Dist: jinja2~=3.1.6
+Requires-Dist: certifi~=2026.1.4
 Provides-Extra: all
 Provides-Extra: sync
 Provides-Extra: stpyv8

{meshagent_api-0.24.6 → meshagent_api-0.25.1}/meshagent/api/client.py

@@ -4,6 +4,7 @@ from pydantic import BaseModel, ValidationError, JsonValue, Field, ConfigDict
 from meshagent.api import RoomException
 from meshagent.api.participant_token import ApiScope
 from meshagent.api.helpers import meshagent_base_url
+from meshagent.api.http import new_client_session
 from datetime import datetime
 from meshagent.api.specs.service import (
     ServiceSpec,
@@ -314,6 +315,7 @@ class Meshagent:
         *,
         base_url: str = meshagent_base_url(),
         token: str = os.getenv("MESHAGENT_API_KEY"),
+        session: aiohttp.ClientSession | None = None,
     ):
         """
         :param base_url: The root URL of your server, e.g. 'http://localhost:8080'.
@@ -321,11 +323,11 @@ class Meshagent:
         """
         self.base_url = base_url.rstrip("/")
         self.token = token  # The "Bearer" token
-
-        self._session = aiohttp.ClientSession()
+        self._session_external = session is not None
+        self._session = session or new_client_session()
 
     async def close(self):
-        if not self._session.closed:
+        if not self._session_external and not self._session.closed:
             await self._session.close()
 
     async def __aenter__(self):
@@ -592,6 +594,32 @@ class Meshagent:
             await self._raise_for_status(resp)
             return await resp.json()
 
+    async def update_project_user(
+        self,
+        project_id: str,
+        user_id: str,
+        *,
+        is_admin: bool,
+        is_developer: bool,
+        can_create_rooms: bool,
+    ) -> Dict[str, Any]:
+        """
+        Corresponds to: PUT /accounts/projects/:project_id/users/:user_id
+        Body: { "is_admin", "is_developer", "can_create_rooms" }
+        Returns a JSON dict with { "ok": True } on success.
+        """
+        url = f"{self.base_url}/accounts/projects/{project_id}/users/{user_id}"
+        body = {
+            "is_admin": is_admin,
+            "is_developer": is_developer,
+            "can_create_rooms": can_create_rooms,
+        }
+        async with self._session.put(
+            url, headers=self._get_headers(), json=body
+        ) as resp:
+            await self._raise_for_status(resp)
+            return await resp.json()
+
     async def update_project_settings(
         self, project_id: str, settings: dict
     ) -> Dict[str, Any]:
@@ -1377,7 +1405,7 @@ class Meshagent:
         *,
         project_id: str,
         room_name: str,
-        template: ServiceTemplateSpec,
+        template: str,
         values: Dict[str, str],
     ) -> ServiceSpec:
         """
@@ -1402,12 +1430,12 @@ class Meshagent:
             url,
             headers=self._get_headers(),
             json={
-                "template": template.model_dump(mode="json"),
+                "template": template,
                 "values": values,
             },
         ) as resp:
             await self._raise_for_status(resp)
-            return ServiceSpec.model_validate_json(await resp.json())
+            return ServiceSpec.model_validate(await resp.json())
 
     async def update_room_service_from_template(
         self,
@@ -1415,7 +1443,7 @@ class Meshagent:
         project_id: str,
         room_name: str,
         service_id: str,
-        template: ServiceTemplateSpec,
+        template: str,
         values: Dict[str, str],
     ) -> ServiceSpec:
         """
@@ -1429,12 +1457,12 @@ class Meshagent:
             url,
             headers=self._get_headers(),
             json={
-                "template": template.model_dump(mode="json"),
+                "template": template,
                 "values": values,
             },
         ) as resp:
             await self._raise_for_status(resp)
-            return ServiceSpec.model_validate_json(await resp.json())
+            return ServiceSpec.model_validate(await resp.json())
 
     async def get_room_service(
         self, *, project_id: str, room_name: str, service_id: str

{meshagent_api-0.24.6 → meshagent_api-0.25.1}/meshagent/api/helpers.py

@@ -3,6 +3,7 @@ import json
 from .participant_token import ParticipantToken, ApiScope
 from typing import Optional
 import os
+import aiohttp
 from .websocket_protocol import WebSocketClientProtocol
 import re
 from warnings import deprecated
@@ -68,7 +69,11 @@ def participant_token(
 
 @deprecated("create WebSocketClientProtocol directly instead")
 def websocket_protocol(
-    *, participant_name: str, room_name: str, role: Optional[str] = None
+    *,
+    participant_name: str,
+    room_name: str,
+    role: Optional[str] = None,
+    session: aiohttp.ClientSession | None = None,
 ):
     url = websocket_room_url(room_name=room_name)
     token_jwt = os.getenv("MESHAGENT_TOKEN", None)
@@ -78,7 +83,7 @@ def websocket_protocol(
         )
         token_jwt = token.to_jwt(token=os.getenv("MESHAGENT_SECRET"))
 
-    return WebSocketClientProtocol(url=url, token=token_jwt)
+    return WebSocketClientProtocol(url=url, token=token_jwt, session=session)
 
 
 # Pre-compile the pattern once if you’ll call this many times

meshagent_api-0.25.1/meshagent/api/http.py

@@ -0,0 +1,14 @@
+from __future__ import annotations
+
+from typing import Any
+import ssl
+
+from aiohttp import ClientSession, TCPConnector
+import certifi
+
+
+def new_client_session(*args: Any, **kwargs: Any) -> ClientSession:
+    if "connector" not in kwargs:
+        ssl_context = ssl.create_default_context(cafile=certifi.where())
+        kwargs["connector"] = TCPConnector(ssl=ssl_context)
+    return ClientSession(*args, **kwargs)

{meshagent_api-0.24.6 → meshagent_api-0.25.1}/meshagent/api/participant_token.py

@@ -227,6 +227,10 @@ class TunnelsGrant(BaseModel):
     ports: Optional[list[str]] = None
 
 
+class ServicesGrant(BaseModel):
+    list: bool = True
+
+
 class ApiScope(BaseModel):
     livekit: Optional[LivekitGrant] = None
     queues: Optional[QueuesGrant] = None
@@ -240,6 +244,7 @@ class ApiScope(BaseModel):
     admin: Optional[AdminGrant] = None
     secrets: Optional[SecretsGrant] = None
     tunnels: Optional[TunnelsGrant] = None
+    services: Optional[ServicesGrant] = None
 
     # no secrets access, no admin access by default for agents
     @staticmethod
@@ -254,6 +259,7 @@ class ApiScope(BaseModel):
             containers=ContainersGrant(),
             developer=DeveloperGrant(),
             agents=AgentsGrant(),
+            services=ServicesGrant(),
             tunnels=TunnelsGrant() if tunnels else None,
         )
 
@@ -272,6 +278,7 @@ class ApiScope(BaseModel):
             admin=AdminGrant(),
             secrets=SecretsGrant(),
             tunnels=TunnelsGrant(),
+            services=ServicesGrant(),
         )
 
 

{meshagent_api-0.24.6 → meshagent_api-0.25.1}/meshagent/api/port_forward.py

@@ -7,6 +7,7 @@ from dataclasses import dataclass
 import aiohttp
 
 from meshagent.api.helpers import meshagent_base_url
+from meshagent.api.http import new_client_session
 
 
 @dataclass
@@ -60,7 +61,7 @@ async def port_forward(
         sock_read=None,
     )
 
-    session = aiohttp.ClientSession(timeout=timeout)
+    session = new_client_session(timeout=timeout)
 
     async def handle_client(reader: asyncio.StreamReader, writer: asyncio.StreamWriter):
         ws: aiohttp.ClientWebSocketResponse | None = None