meshagent-api 0.22.2__tar.gz → 0.23.0__tar.gz

{meshagent_api-0.22.2/meshagent_api.egg-info → meshagent_api-0.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-api
-Version: 0.22.2
+Version: 0.23.0
 Summary: Python Server API for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com

{meshagent_api-0.22.2 → meshagent_api-0.23.0}/meshagent/api/client.py

@@ -94,6 +94,19 @@ class ProjectRoomGrant(BaseModel):
     permissions: ApiScope
 
 
+class User(BaseModel):
+    id: str
+    first_name: Optional[str] = None
+    last_name: Optional[str] = None
+    email: str
+
+
+class UserRoomGrant(BaseModel):
+    room: Room
+    user: User
+    permissions: ApiScope
+
+
 class ProjectRoomGrantCount(BaseModel):
     room: Room
     count: int
@@ -197,7 +210,7 @@ def _parse_secret(raw: dict) -> SecretLike:
         )
 
 
-ProjectRole = Literal["member", "admin", "developer"]
+ProjectRole = Literal["member", "admin", "developer", "none"]
 
 
 class _CreateMailboxRequest(BaseModel):
@@ -1131,6 +1144,33 @@ class Meshagent:
         async with self._session.delete(url, headers=self._get_headers()) as resp:
             await self._raise_for_status(resp)
 
+    async def render_template(
+        self,
+        *,
+        template: str,
+        values: dict[str, str],
+    ) -> ServiceTemplateSpec:
+        """
+        POST /templates/render
+        Body: full service spec, e.g.
+          {
+            "template" : ""
+            "values": {...}
+          }
+        Returns: {}
+        """
+        url = f"{self.base_url}/templates/render"
+        async with self._session.post(
+            url,
+            headers=self._get_headers(),
+            json={
+                "template": template,
+                "values": values,
+            },
+        ) as resp:
+            await self._raise_for_status(resp)
+            return ServiceTemplateSpec.model_validate_json(await resp.json())
+
     async def create_service(
         self,
         *,
@@ -1185,7 +1225,7 @@ class Meshagent:
             return ServiceSpec.model_validate_json(await resp.json())
 
     async def create_service_from_template(
-        self, *, project_id: str, template: ServiceTemplateSpec, values: Dict[str, str]
+        self, *, project_id: str, template: str, values: Dict[str, str]
     ) -> str:
         """
         POST /accounts/projects/{project_id}/services
@@ -1207,7 +1247,7 @@ class Meshagent:
             url,
             headers=self._get_headers(),
             json={
-                "template": template.model_dump(mode="json"),
+                "template": template,
                 "values": values,
             },
         ) as resp:
@@ -1219,7 +1259,7 @@ class Meshagent:
         *,
         project_id: str,
         service_id: str,
-        template: ServiceTemplateSpec,
+        template: str,
         values: Dict[str, str],
     ) -> None:
         """
@@ -1233,7 +1273,7 @@ class Meshagent:
             url,
             headers=self._get_headers(),
             json={
-                "template": template.model_dump(mode="json"),
+                "template": template,
                 "values": values,
             },
         ) as resp:

meshagent_api-0.23.0/meshagent/api/service_template_test.py

@@ -0,0 +1,184 @@
+import json
+
+from meshagent.api.specs.service import (
+    ServiceTemplateSpec,
+)
+
+
+def test_service_template_spec_renders_jinja_values():
+    yml = """
+    version: v1
+    kind: ServiceTemplate
+    metadata:
+        name: "{{service_name}}"
+        description: "Hello {{user}}"
+        repo: "https://example.com/{{service_name}}"
+        annotations:
+            "greeting": "hi {{user}}"
+    agents:
+      - name: "agent-{{service_name}}"
+        description: "handles {{role}}"
+        annotations:
+            role: "{{role}}"    
+    external:
+        url: "https://{{host}}/api"
+
+
+    """
+
+    values = {
+        "service_name": "Concierge",
+        "user": "Rina",
+        "role": "support",
+        "host": "meshagent.dev",
+    }
+
+    service = ServiceTemplateSpec.from_yaml(yaml=yml, values=values).to_service_spec()
+
+    assert service.metadata.annotations is not None
+    assert service.agents is not None
+    assert service.external is not None
+    assert service.metadata.name == "Concierge"
+    assert service.metadata.description == "Hello Rina"
+    assert service.metadata.repo == "https://example.com/Concierge"
+    assert service.metadata.annotations["greeting"] == "hi Rina"
+    assert service.external.url == "https://meshagent.dev/api"
+    assert service.agents[0].name == "agent-Concierge"
+    assert service.agents[0].description == "handles support"
+    assert service.agents[0].annotations is not None
+    assert service.agents[0].annotations["role"] == "support"
+
+    source = service.metadata.annotations["meshagent.service.template.yaml"]
+    values_json = service.metadata.annotations["meshagent.service.template.values"]
+    assert json.loads(values_json) == values
+    assert "ServiceTemplate" in source
+
+
+def test_service_template_spec_from_yaml():
+    yaml_spec = """
+version: v1
+kind: ServiceTemplate
+metadata:
+  name: "{{service_name}}"
+  description: "Hello {{user}}"
+  repo: null
+  annotations:
+    greeting: "hi {{user}}"
+agents:
+  - name: "agent-{{service_name}}"
+    description: "handles {{role}}"
+external:
+  url: "https://{{host}}/api"
+"""
+
+    values = {
+        "service_name": "Concierge",
+        "user": "Rina",
+        "role": "support",
+        "host": "meshagent.dev",
+    }
+
+    service = ServiceTemplateSpec.from_yaml(
+        yaml=yaml_spec, values=values
+    ).to_service_spec()
+
+    assert service.metadata.annotations is not None
+    assert service.agents is not None
+    assert service.external is not None
+    assert service.metadata.name == "Concierge"
+    assert service.metadata.description == "Hello Rina"
+    assert service.metadata.annotations["greeting"] == "hi Rina"
+    assert service.external.url == "https://meshagent.dev/api"
+    assert service.agents[0].name == "agent-Concierge"
+    assert service.agents[0].description == "handles support"
+
+
+def test_service_template_spec_replaces_email_in_command():
+    yaml_spec = """
+    version: v1
+    kind: ServiceTemplate
+    metadata:
+        name: PropertyAssistant
+        description: Email template
+        repo: null
+        annotations: null
+
+    container:
+        image: us-central1-docker.pkg.dev/meshagent-public/images/cli:{SERVER_VERSION}-esgz
+        command: >-
+            meshagent multi service -c "chatbot --require-uuid
+            --agent-name=PropertyAssistant --image-generation=gpt-image-1
+            --require-storage --require-toolkit=propertyemail
+            --require-table-write=propertyinsurance
+            --require-table-write=propertyexpenses --mcp --web-search
+            -rr='agents/PropertyAssistant/assistantrules.txt'
+            --rule='you have access to the email tool, and you can send out emails.';
+            mailbot --reply-all --enable-attachments
+            --room-rules='/agents/PropertyAssistant/emailrules.txt'
+            --rule='never respnod in JSON or HTML, only in text.'
+            --agent-name=PropertyAssistant
+            --require-table-write=propertyinsurance
+            --require-table-write=propertyexpenses
+            --queue={{email}} --require-uuid --reply-all --require-storage
+            --email-address={{email}} --require-web-search
+            --toolkit-name=propertyemail;
+            worker --require-storage
+            --room-rules='/agents/PropertyAssistant/workerrules.txt'
+            --agent-name=PropertyAssistant
+            --require-toolkit=propertyemail --queue=sendupdate
+            --require-table-read=propertyinsurance
+            --require-table-read=propertyexpenses
+            --rule='Use the read_file tool to read PDFs.'"
+        """
+
+    service = ServiceTemplateSpec.from_yaml(
+        yaml=yaml_spec, values={"email": "owner@example.com"}
+    ).to_service_spec()
+
+    assert service.container is not None
+    assert service.container.command is not None
+    assert "{{email}}" not in service.container.command
+    assert "--queue=owner@example.com" in service.container.command
+    assert "--email-address=owner@example.com" in service.container.command
+
+
+def test_service_template_spec_handles_none_values():
+    yaml_spec = """
+version: v1
+kind: ServiceTemplate
+
+metadata:
+  name: Plain Service
+  description: null
+  repo: null
+  icon: null
+  annotations: null
+
+agents:
+  - name: Support
+    description: null
+    annotations: null
+
+container:
+  image: meshagent/example
+  command: null
+  environment:
+    - name: EMPTY
+      value: null
+    """
+
+    service = ServiceTemplateSpec.from_yaml(yaml=yaml_spec, values={}).to_service_spec()
+
+    assert service.metadata.annotations is not None
+    assert service.agents is not None
+    assert service.container is not None
+    assert service.container.environment is not None
+    assert service.metadata.description is None
+    assert service.metadata.repo is None
+    assert service.metadata.icon is None
+    assert service.metadata.annotations["meshagent.service.template.yaml"]
+    assert service.metadata.annotations["meshagent.service.template.values"] == "{}"
+    assert len(service.metadata.annotations) == 2
+    assert service.agents[0].description is None
+    assert service.agents[0].annotations is None
+    assert service.container.environment[0].value is None

{meshagent_api-0.22.2 → meshagent_api-0.23.0}/meshagent/api/specs/service.py

@@ -4,10 +4,14 @@ from meshagent.api.participant_token import ApiScope
 from meshagent.api.oauth import OAuthClientConfig
 import json
 
+import yaml as YAML
+from yaml.loader import SafeLoader
+
 
 class TokenValue(BaseModel):
     identity: str
     api: Optional[ApiScope] = None
+    role: Optional[str] = None
 
 
 class EnvironmentVariable(BaseModel):
@@ -39,11 +43,19 @@ class ImageStorageMountSpec(BaseModel):
     read_only: bool = True
 
 
+class FileStorageMountSpec(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+    path: str
+    text: str
+    read_only: bool = True
+
+
 class ContainerMountSpec(BaseModel):
     model_config = ConfigDict(extra="forbid")
     room: Optional[list[RoomStorageMountSpec]] = None
     project: Optional[list[ProjectStorageMountSpec]] = None
     images: Optional[list[ImageStorageMountSpec]] = None
+    files: Optional[list[FileStorageMountSpec]] = None
 
 
 class ServiceApiKeySpec(BaseModel):
@@ -133,6 +145,10 @@ class ServiceSpec(BaseModel):
             raise ValueError("Either 'external' or 'container' must be set")
         return m
 
+    @staticmethod
+    def from_yaml(yaml: str) -> "ServiceSpec":
+        return ServiceSpec.model_validate(YAML.safe_load(yaml))
+
 
 class MeshagentEndpointSpec(BaseModel):
     model_config = ConfigDict(extra="forbid")
@@ -190,6 +206,7 @@ class ServiceTemplateContainerMountSpec(BaseModel):
     room: Optional[list[RoomStorageMountSpec]] = None
     project: Optional[list[ProjectStorageMountSpec]] = None
     images: Optional[list[ImageStorageMountSpec]] = None
+    files: Optional[list[FileStorageMountSpec]] = None
 
 
 class ServiceTemplateMetadata(BaseModel):
@@ -201,9 +218,22 @@ class ServiceTemplateMetadata(BaseModel):
     annotations: Optional[dict[str, str]] = None
 
 
+class TemplateEnvironmentVariable(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+    name: str
+    value: Optional[str] = None
+    token: Optional[TokenValue] = None
+
+
+class AgentTemplateSpec(BaseModel):
+    name: str
+    description: Optional[str] = None
+    annotations: Optional[dict[str, str]] = None
+
+
 class ContainerTemplateSpec(BaseModel):
     model_config = ConfigDict(extra="forbid")
-    environment: Optional[list[EnvironmentVariable]] = None
+    environment: Optional[list[TemplateEnvironmentVariable]] = None
     image: Optional[str] = None
     command: Optional[str] = None
     storage: Optional[ServiceTemplateContainerMountSpec] = None
@@ -246,20 +276,22 @@ class ServiceTemplateSpec(BaseModel):
     version: Literal["v1"]
     kind: Literal["ServiceTemplate"]
     metadata: ServiceTemplateMetadata
-    agents: Optional[list[AgentSpec]] = None
+    agents: Optional[list[AgentTemplateSpec]] = None
     variables: Optional[list[ServiceTemplateVariable]] = None
-    ports: list[PortSpec] = []
+    ports: Optional[list[PortSpec]] = None
     container: Optional[ContainerTemplateSpec] = None
     external: Optional[ExternalServiceTemplateSpec] = None
 
-    def to_service_spec(self, *, values: dict[str, str]) -> ServiceSpec:
+    def to_service_spec(self) -> ServiceSpec:
         env = []
         if self.container is not None:
             if self.container.environment is not None:
                 for e in self.container.environment:
                     env.append(
                         EnvironmentVariable(
-                            name=e.name, value=format_yaml_value(e.value, values)
+                            name=e.name,
+                            value=e.value,
+                            token=e.token,
                         )
                     )
 
@@ -269,9 +301,9 @@ class ServiceTemplateSpec(BaseModel):
             agents=[
                 *(
                     AgentSpec(
-                        name=format_yaml_value(a.name, values),
-                        description=format_yaml_value(a.description, values),
-                        annotations=format_yaml_map(a.annotations, values),
+                        name=a.name,
+                        description=a.description,
+                        annotations=a.annotations,
                     )
                     for a in self.agents
                 )
@@ -279,40 +311,69 @@ class ServiceTemplateSpec(BaseModel):
             if self.agents is not None
             else None,
             metadata=ServiceMetadata(
-                name=format_yaml_value(self.metadata.name, values),
-                description=format_yaml_value(self.metadata.description, values),
-                repo=format_yaml_value(self.metadata.repo, values),
-                icon=format_yaml_value(self.metadata.icon, values),
+                name=self.metadata.name,
+                description=self.metadata.description,
+                repo=self.metadata.repo,
+                icon=self.metadata.icon,
                 annotations={
-                    "meshagent.service.template.source": self.model_dump_json(),
-                    "meshagent.service.template.values": json.dumps(values),
-                    **(format_yaml_map(self.metadata.annotations, values) or {}),
+                    **(self.metadata.annotations or {}),
                 },
             ),
             container=ContainerSpec(
-                command=format_yaml_value(self.container.command, values),
-                image=format_yaml_value(self.container.image, values),
+                command=self.container.command,
+                image=self.container.image,
                 environment=env,
                 storage=ContainerMountSpec(
-                    room=self.container.storage.room
-                    if self.container.storage is not None
-                    else None,
-                    project=self.container.storage.project
-                    if self.container.storage is not None
-                    else None,
-                    images=self.container.storage.images
-                    if self.container.storage is not None
-                    else None,
-                ),
+                    room=self.container.storage.room,
+                    project=self.container.storage.project,
+                    images=self.container.storage.images,
+                    files=self.container.storage.files,
+                )
+                if self.container.storage is not None
+                else None,
                 writable_root_fs=self.container.writable_root_fs,
                 on_demand=self.container.on_demand,
             )
             if self.container is not None
             else None,
             external=ExternalServiceSpec(
-                url=format_yaml_value(self.external.url, values),
+                url=self.external.url,
             )
             if self.external is not None
             else None,
             ports=self.ports,
         )
+
+    @staticmethod
+    def from_yaml(yaml: str, values: dict[str, str] = {}) -> "ServiceTemplateSpec":
+        from jinja2 import Template
+
+        class _ApplyTagLoader(SafeLoader):
+            pass
+
+        def _tagged_scalar(loader, tag_suffix, node):
+            value = loader.construct_scalar(node)
+            template = Template(value)
+            return template.render(**values)
+
+        _ApplyTagLoader.add_multi_constructor("!template", _tagged_scalar)
+
+        def load_yaml(y: str):
+            return YAML.load(y, Loader=_ApplyTagLoader)
+
+        template = Template(yaml)
+
+        rendered = template.render(**values)
+
+        spec = ServiceTemplateSpec.model_validate(load_yaml(rendered))
+
+        if spec.metadata.annotations is None:
+            spec.metadata.annotations = {}
+
+        spec.metadata.annotations["meshagent.service.template.yaml"] = yaml
+
+        spec.metadata.annotations["meshagent.service.template.values"] = json.dumps(
+            values
+        )
+
+        return spec

meshagent_api-0.23.0/meshagent/api/version.py

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

{meshagent_api-0.22.2 → meshagent_api-0.23.0/meshagent_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-api
-Version: 0.22.2
+Version: 0.23.0
 Summary: Python Server API for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com

meshagent_api-0.22.2/meshagent/api/service_template_test.py

@@ -1,181 +0,0 @@
-import json
-
-from pydantic_yaml import parse_yaml_raw_as
-
-from meshagent.api.specs.service import (
-    AgentSpec,
-    ContainerTemplateSpec,
-    EnvironmentVariable,
-    ExternalServiceTemplateSpec,
-    ServiceTemplateMetadata,
-    ServiceTemplateSpec,
-)
-
-
-def test_service_template_spec_renders_jinja_values():
-    template = ServiceTemplateSpec(
-        version="v1",
-        kind="ServiceTemplate",
-        metadata=ServiceTemplateMetadata(
-            name="!template {{service_name}}",
-            description="!template Hello {{user}}",
-            repo="https://example.com/{{service_name}}",
-            annotations={"greeting": "!template hi {{user}}"},
-        ),
-        agents=[
-            AgentSpec(
-                name="!template agent-{{service_name}}",
-                description="!template handles {{role}}",
-                annotations={"role": "!template {{role}}"},
-            )
-        ],
-        external=ExternalServiceTemplateSpec(url="!template https://{{host}}/api"),
-    )
-
-    values = {
-        "service_name": "Concierge",
-        "user": "Rina",
-        "role": "support",
-        "host": "meshagent.dev",
-    }
-
-    service = template.to_service_spec(values=values)
-
-    assert service.metadata.annotations is not None
-    assert service.agents is not None
-    assert service.external is not None
-    assert service.metadata.name == "Concierge"
-    assert service.metadata.description == "Hello Rina"
-    assert service.metadata.repo == "https://example.com/{{service_name}}"
-    assert service.metadata.annotations["greeting"] == "hi Rina"
-    assert service.external.url == "https://meshagent.dev/api"
-    assert service.agents[0].name == "agent-Concierge"
-    assert service.agents[0].description == "handles support"
-    assert service.agents[0].annotations is not None
-    assert service.agents[0].annotations["role"] == "support"
-
-    source = service.metadata.annotations["meshagent.service.template.source"]
-    values_json = service.metadata.annotations["meshagent.service.template.values"]
-    assert json.loads(values_json) == values
-    assert "ServiceTemplate" in source
-
-
-def test_service_template_spec_from_yaml():
-    yaml_spec = """
-version: v1
-kind: ServiceTemplate
-metadata:
-  name: "!template {{service_name}}"
-  description: "!template Hello {{user}}"
-  repo: null
-  annotations:
-    greeting: "!template hi {{user}}"
-agents:
-  - name: "!template agent-{{service_name}}"
-    description: "!template handles {{role}}"
-external:
-  url: "!template https://{{host}}/api"
-"""
-
-    template = parse_yaml_raw_as(ServiceTemplateSpec, yaml_spec.encode())
-    values = {
-        "service_name": "Concierge",
-        "user": "Rina",
-        "role": "support",
-        "host": "meshagent.dev",
-    }
-
-    service = template.to_service_spec(values=values)
-
-    assert service.metadata.annotations is not None
-    assert service.agents is not None
-    assert service.external is not None
-    assert service.metadata.name == "Concierge"
-    assert service.metadata.description == "Hello Rina"
-    assert service.metadata.annotations["greeting"] == "hi Rina"
-    assert service.external.url == "https://meshagent.dev/api"
-    assert service.agents[0].name == "agent-Concierge"
-    assert service.agents[0].description == "handles support"
-
-
-def test_service_template_spec_replaces_email_in_command():
-    template = ServiceTemplateSpec(
-        version="v1",
-        kind="ServiceTemplate",
-        metadata=ServiceTemplateMetadata(
-            name="PropertyAssistant",
-            description="Email template",
-            repo=None,
-            annotations=None,
-        ),
-        container=ContainerTemplateSpec(
-            image="us-central1-docker.pkg.dev/meshagent-public/images/cli:{SERVER_VERSION}-esgz",
-            command=(
-                '!template meshagent multi service -c "chatbot --require-uuid '
-                "--agent-name=PropertyAssistant --image-generation=gpt-image-1 "
-                "--require-storage --require-toolkit=propertyemail --require-table-write=propertyinsurance "
-                "--require-table-write=propertyexpenses --mcp --web-search "
-                "-rr='agents/PropertyAssistant/assistantrules.txt' --rule='you have access to "
-                "the email tool, and you can send out emails.'; mailbot --reply-all "
-                "--enable-attachments --room-rules='/agents/PropertyAssistant/emailrules.txt' "
-                "--rule='never respnod in JSON or HTML, only in text.' --agent-name=PropertyAssistant "
-                "--require-table-write=propertyinsurance --require-table-write=propertyexpenses "
-                "--queue={{email}} --require-uuid --reply-all --require-storage "
-                "--email-address={{email}} --require-web-search --toolkit-name=propertyemail; "
-                "worker --require-storage --room-rules='/agents/PropertyAssistant/workerrules.txt' "
-                "--agent-name=PropertyAssistant --require-toolkit=propertyemail --queue=sendupdate "
-                "--require-table-read=propertyinsurance --require-table-read=propertyexpenses "
-                "--rule='Use the read_file tool to read PDFs.'\""
-            ),
-        ),
-    )
-
-    service = template.to_service_spec(values={"email": "owner@example.com"})
-
-    assert service.container is not None
-    assert service.container.command is not None
-    assert "{{email}}" not in service.container.command
-    assert "--queue=owner@example.com" in service.container.command
-    assert "--email-address=owner@example.com" in service.container.command
-
-
-def test_service_template_spec_handles_none_values():
-    template = ServiceTemplateSpec(
-        version="v1",
-        kind="ServiceTemplate",
-        metadata=ServiceTemplateMetadata(
-            name="Plain Service",
-            description=None,
-            repo=None,
-            icon=None,
-            annotations=None,
-        ),
-        agents=[
-            AgentSpec(
-                name="Support",
-                description=None,
-                annotations=None,
-            )
-        ],
-        container=ContainerTemplateSpec(
-            image="meshagent/example",
-            command=None,
-            environment=[EnvironmentVariable(name="EMPTY", value=None)],
-        ),
-    )
-
-    service = template.to_service_spec(values={})
-
-    assert service.metadata.annotations is not None
-    assert service.agents is not None
-    assert service.container is not None
-    assert service.container.environment is not None
-    assert service.metadata.description is None
-    assert service.metadata.repo is None
-    assert service.metadata.icon is None
-    assert service.metadata.annotations["meshagent.service.template.source"]
-    assert service.metadata.annotations["meshagent.service.template.values"] == "{}"
-    assert len(service.metadata.annotations) == 2
-    assert service.agents[0].description is None
-    assert service.agents[0].annotations is None
-    assert service.container.environment[0].value is None

meshagent_api-0.22.2/meshagent/api/version.py

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