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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-api
-Version: 0.22.0
+Version: 0.22.2
 Summary: Python Server API for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -15,6 +15,7 @@ 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
 Provides-Extra: all
 Provides-Extra: sync
 Provides-Extra: stpyv8

meshagent_api-0.22.2/meshagent/api/service_template_test.py

@@ -0,0 +1,181 @@
+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.0 → meshagent_api-0.22.2}/meshagent/api/specs/service.py

@@ -207,6 +207,8 @@ class ContainerTemplateSpec(BaseModel):
     image: Optional[str] = None
     command: Optional[str] = None
     storage: Optional[ServiceTemplateContainerMountSpec] = None
+    on_demand: Optional[bool] = None
+    writable_root_fs: Optional[bool] = None
 
 
 class ExternalServiceTemplateSpec(BaseModel):
@@ -214,6 +216,31 @@ class ExternalServiceTemplateSpec(BaseModel):
     url: str
 
 
+def format_yaml_value(original: Optional[str], values: dict[str, str]):
+    if original is None:
+        return None
+
+    if original.startswith("!template "):
+        from jinja2 import Template
+
+        template = Template(original.removeprefix("!template "))
+        return template.render(**values)
+
+    else:
+        return original
+
+
+def format_yaml_map(original: Optional[dict[str, str]], values: dict[str, str]):
+    if original is None:
+        return None
+    output = {}
+
+    for k, v in original.items():
+        output[k] = format_yaml_value(v, values)
+
+    return output
+
+
 class ServiceTemplateSpec(BaseModel):
     model_config = ConfigDict(extra="forbid")
     version: Literal["v1"]
@@ -232,28 +259,39 @@ class ServiceTemplateSpec(BaseModel):
                 for e in self.container.environment:
                     env.append(
                         EnvironmentVariable(
-                            name=e.name, value=e.value.format_map(values)
+                            name=e.name, value=format_yaml_value(e.value, values)
                         )
                     )
 
         return ServiceSpec(
             version=self.version,
             kind="Service",
-            agents=self.agents,
+            agents=[
+                *(
+                    AgentSpec(
+                        name=format_yaml_value(a.name, values),
+                        description=format_yaml_value(a.description, values),
+                        annotations=format_yaml_map(a.annotations, values),
+                    )
+                    for a in self.agents
+                )
+            ]
+            if self.agents is not None
+            else None,
             metadata=ServiceMetadata(
-                name=self.metadata.name,
-                description=self.metadata.description,
-                repo=self.metadata.repo,
-                icon=self.metadata.icon,
+                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),
                 annotations={
                     "meshagent.service.template.source": self.model_dump_json(),
                     "meshagent.service.template.values": json.dumps(values),
-                    **self.metadata.annotations,
+                    **(format_yaml_map(self.metadata.annotations, values) or {}),
                 },
             ),
             container=ContainerSpec(
-                command=self.container.command,
-                image=self.container.image,
+                command=format_yaml_value(self.container.command, values),
+                image=format_yaml_value(self.container.image, values),
                 environment=env,
                 storage=ContainerMountSpec(
                     room=self.container.storage.room
@@ -266,11 +304,13 @@ class ServiceTemplateSpec(BaseModel):
                     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=self.external.url,
+                url=format_yaml_value(self.external.url, values),
             )
             if self.external is not None
             else None,

meshagent_api-0.22.2/meshagent/api/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-api
-Version: 0.22.0
+Version: 0.22.2
 Summary: Python Server API for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -15,6 +15,7 @@ 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
 Provides-Extra: all
 Provides-Extra: sync
 Provides-Extra: stpyv8

{meshagent_api-0.22.0 → meshagent_api-0.22.2}/meshagent_api.egg-info/SOURCES.txt

@@ -28,6 +28,7 @@ meshagent/api/schema_document_test.py
 meshagent/api/schema_registry.py
 meshagent/api/schema_test.py
 meshagent/api/schema_util.py
+meshagent/api/service_template_test.py
 meshagent/api/services.py
 meshagent/api/token_test.py
 meshagent/api/urls.py

{meshagent_api-0.22.0 → meshagent_api-0.22.2}/meshagent_api.egg-info/requires.txt

@@ -4,6 +4,7 @@ jsonschema~=4.23
 pycrdt~=0.12.26
 opentelemetry-distro~=0.54b1
 pydantic~=2.11.7
+jinja2~=3.1.6
 
 [all]
 

{meshagent_api-0.22.0 → meshagent_api-0.22.2}/pyproject.toml

@@ -15,7 +15,8 @@ dependencies = [
   "jsonschema~=4.23",
   "pycrdt~=0.12.26",
   "opentelemetry-distro~=0.54b1",
-  "pydantic~=2.11.7"
+  "pydantic~=2.11.7",
+  "jinja2~=3.1.6"
 ]
 classifiers = [
   # You can add your classifiers here if needed.

meshagent_api-0.22.0/meshagent/api/version.py

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