meshagent-agents 0.0.36__py3-none-any.whl → 0.0.38__py3-none-any.whl

meshagent/agents/schemas/schema.py

@@ -1,74 +1,128 @@
-from meshagent.api.schema import ElementProperty, ValueProperty, MeshSchema, ChildProperty, ElementType
+from meshagent.api.schema import (
+    ElementProperty,
+    ValueProperty,
+    MeshSchema,
+    ChildProperty,
+    ElementType,
+)
 from meshagent.api.schema_document import Document
 
 schema_schema = MeshSchema(
     root_tag_name="schema",
     elements=[
-        ElementType(tag_name="schema", description="defines an xml document representing a json schema", properties=[
-            ValueProperty(name="root_tag_name", description="the root tag name in this document (must match one of the elements defined in the schema)", type="string"),            
-            ChildProperty(name="elements", description="the configuration of this sandbox", child_tag_names=[
-                "element"
-            ]),
-        ]),
-        
-        ElementType(tag_name="element", description="an element inside the document", properties=[
-            ValueProperty(name="tag_name", description="the tag name used by this element. Element names are case-sensitive. Element names cannot contain spaces. Element names must start with a letter or underscore. Element names cannot start with the letters xml (or XML, or Xml, etc) Element names can contain letters, digits, hyphens, underscores, and periods.", type="string"),            
-            ChildProperty(name="schema", description="the attributes of this node", child_tag_names=[
-                "attribute", "child_elements"
-            ]),
-            ValueProperty(name="description", type="string"),
-        ]),
-        
-        ElementType(tag_name="attribute", properties=[
-            ValueProperty(name="name", description="the attribute name. Attribute names are case-sensitive. Attribute names cannot contain spaces. Attribute names must start with a letter or underscore. Attribute names cannot start with the letters xml (or XML, or Xml, etc) Attribute names can contain letters, digits, hyphens, underscores, and periods.", type="string"),
-            ValueProperty(name="type", description="the type of value stored by this attribute", type="string", enum= [ "string", "boolean", "number" ]),
-            ValueProperty(name="description", type="string"),
-        ]),
-        
-        ElementType(tag_name="child_elements", properties=[
-            ValueProperty(name="name", description="the name of the property to store the children in. Propterty names cannot contain spaces. Propterty names must start with a letter or underscore. Propterty names cannot start with the letters xml (or XML, or Xml, etc) Propterty names can contain letters, digits, hyphens, and underscores.", type="string"),
-            ValueProperty(name="description", type="string"),
-            ChildProperty(name="children", description="the tag name of an element. The element must have a corresponding element definition under the schema elements", child_tag_names=["element_reference"]),            
-        ]),
-
-        ElementType(tag_name="element_reference", description="an allowed child element for an element, should only used when a schema can contain multiple items of a specific type", properties=[
-            ValueProperty(name="tag_name", description="the tag name of an element. The element must have a corresponding element definition under the schema elements", type="string"),            
-        ]),
+        ElementType(
+            tag_name="schema",
+            description="defines an xml document representing a json schema",
+            properties=[
+                ValueProperty(
+                    name="root_tag_name",
+                    description="the root tag name in this document (must match one of the elements defined in the schema)",
+                    type="string",
+                ),
+                ChildProperty(
+                    name="elements",
+                    description="the configuration of this sandbox",
+                    child_tag_names=["element"],
+                ),
+            ],
+        ),
+        ElementType(
+            tag_name="element",
+            description="an element inside the document",
+            properties=[
+                ValueProperty(
+                    name="tag_name",
+                    description="the tag name used by this element. Element names are case-sensitive. Element names cannot contain spaces. Element names must start with a letter or underscore. Element names cannot start with the letters xml (or XML, or Xml, etc) Element names can contain letters, digits, hyphens, underscores, and periods.",
+                    type="string",
+                ),
+                ChildProperty(
+                    name="schema",
+                    description="the attributes of this node",
+                    child_tag_names=["attribute", "child_elements"],
+                ),
+                ValueProperty(name="description", type="string"),
+            ],
+        ),
+        ElementType(
+            tag_name="attribute",
+            properties=[
+                ValueProperty(
+                    name="name",
+                    description="the attribute name. Attribute names are case-sensitive. Attribute names cannot contain spaces. Attribute names must start with a letter or underscore. Attribute names cannot start with the letters xml (or XML, or Xml, etc) Attribute names can contain letters, digits, hyphens, underscores, and periods.",
+                    type="string",
+                ),
+                ValueProperty(
+                    name="type",
+                    description="the type of value stored by this attribute",
+                    type="string",
+                    enum=["string", "boolean", "number"],
+                ),
+                ValueProperty(name="description", type="string"),
+            ],
+        ),
+        ElementType(
+            tag_name="child_elements",
+            properties=[
+                ValueProperty(
+                    name="name",
+                    description="the name of the property to store the children in. Propterty names cannot contain spaces. Propterty names must start with a letter or underscore. Propterty names cannot start with the letters xml (or XML, or Xml, etc) Propterty names can contain letters, digits, hyphens, and underscores.",
+                    type="string",
+                ),
+                ValueProperty(name="description", type="string"),
+                ChildProperty(
+                    name="children",
+                    description="the tag name of an element. The element must have a corresponding element definition under the schema elements",
+                    child_tag_names=["element_reference"],
+                ),
+            ],
+        ),
+        ElementType(
+            tag_name="element_reference",
+            description="an allowed child element for an element, should only used when a schema can contain multiple items of a specific type",
+            properties=[
+                ValueProperty(
+                    name="tag_name",
+                    description="the tag name of an element. The element must have a corresponding element definition under the schema elements",
+                    type="string",
+                ),
+            ],
+        ),
     ],
 )
 
+
 def schema_from_schema_document(document: Document):
     root_tag_name = document.root["root_tag_name"]
 
     elements = list[ElementType]()
 
     for element in document.root.get_children():
-
         properties = list[ElementProperty]()
-    
+
         for prop in element.get_children():
             name = prop["name"]
             description = prop["description"]
             type = prop["type"]
-            
+
             if prop.tag_name == "attribute":
-                properties.append(ValueProperty(
-                    name = name,
-                    type = type,
-                    description = description
-                ))
+                properties.append(
+                    ValueProperty(name=name, type=type, description=description)
+                )
             elif prop.tag_name == "child_elements":
                 child_tag_names = []
-                
+
                 for child in prop.get_children():
                     child_tag_names.append(child["tag_name"])
 
-                properties.append(ChildProperty(
-                    name=name,
-                    child_tag_names = child_tag_names
-                ))
+                properties.append(
+                    ChildProperty(name=name, child_tag_names=child_tag_names)
+                )
 
-        et = ElementType(tag_name = element["tag_name"], properties = properties, description = element["description"])
+        et = ElementType(
+            tag_name=element["tag_name"],
+            properties=properties,
+            description=element["description"],
+        )
         elements.append(et)
 
     doc = MeshSchema(root_tag_name=root_tag_name, elements=elements)

meshagent/agents/schemas/super_editor_document.py

@@ -1,47 +1,53 @@
-from meshagent.api.schema import MeshSchema, ElementType,  ChildProperty, ValueProperty, SimpleValue
+from meshagent.api.schema import MeshSchema, ElementType, ChildProperty, ValueProperty
 
-super_editor_document_schema = MeshSchema(root_tag_name='document', elements=[
-    ElementType(
-      tag_name='document',
-      description='A SuperEditor document for use with Flutter apps',
-      properties=[
-        ChildProperty(name='children', child_tag_names=[
-          'block',
-          'horizontalRule',
-          'image',
-        ]),
-      ],
-    ),
-    ElementType(
-      tag_name='block',
-      description='Block element - this can be a paragraph, list-item or tasks',
-      properties=[
-        ValueProperty(name='blockType', type="string"),
-        ValueProperty(name='textAlign', type="string"),
-        ValueProperty(name='itemType',  type="string"),
-        ValueProperty(name='indent',  type="number"),
-        ChildProperty(name='children', child_tag_names= ['text']),
-      ],
-    ),
-    ElementType(
-      tag_name='image',
-      description='Image element',
-      properties=[
-        ValueProperty(name='imageUrl', type="string"),
-        ValueProperty(name='width', type="number"),
-        ValueProperty(name='height', type="number"),
-      ],
-    ),
-    ElementType(
-      tag_name='horizontalRule',
-      description='Horizontal rule element',
-      properties=[],
-    ),
-    ElementType(
-      tag_name='text',
-      description='Text element',
-      properties=[
-        ValueProperty(name='text', type="string"),
-      ],
-    ),
-  ])
+super_editor_document_schema = MeshSchema(
+    root_tag_name="document",
+    elements=[
+        ElementType(
+            tag_name="document",
+            description="A SuperEditor document for use with Flutter apps",
+            properties=[
+                ChildProperty(
+                    name="children",
+                    child_tag_names=[
+                        "block",
+                        "horizontalRule",
+                        "image",
+                    ],
+                ),
+            ],
+        ),
+        ElementType(
+            tag_name="block",
+            description="Block element - this can be a paragraph, list-item or tasks",
+            properties=[
+                ValueProperty(name="blockType", type="string"),
+                ValueProperty(name="textAlign", type="string"),
+                ValueProperty(name="itemType", type="string"),
+                ValueProperty(name="indent", type="number"),
+                ChildProperty(name="children", child_tag_names=["text"]),
+            ],
+        ),
+        ElementType(
+            tag_name="image",
+            description="Image element",
+            properties=[
+                ValueProperty(name="imageUrl", type="string"),
+                ValueProperty(name="width", type="number"),
+                ValueProperty(name="height", type="number"),
+            ],
+        ),
+        ElementType(
+            tag_name="horizontalRule",
+            description="Horizontal rule element",
+            properties=[],
+        ),
+        ElementType(
+            tag_name="text",
+            description="Text element",
+            properties=[
+                ValueProperty(name="text", type="string"),
+            ],
+        ),
+    ],
+)

meshagent/agents/single_shot_writer.py

@@ -1,4 +1,3 @@
-
 from meshagent.api.schema import ValueProperty, ChildProperty
 from meshagent.tools import Toolkit
 from meshagent.agents.writer import Writer, WriterContext
@@ -12,37 +11,44 @@ import logging
 logger = logging.getLogger("planning_agent")
 
 
-
 class SingleShotWriter(Writer):
-
-    def __init__(self,  name: str,  llm_adapter: LLMAdapter, tool_adapter:  Optional[ToolResponseAdapter] = None, description: Optional[str] = None, title: Optional[str] = None, rules:Optional[list[str]] = None, requires: Optional[list[Requirement]] = None, toolkits : Optional[list[Toolkit]] = None, supports_tools: Optional[bool] = None, labels: Optional[list[str]] = None, ):
+    def __init__(
+        self,
+        name: str,
+        llm_adapter: LLMAdapter,
+        tool_adapter: Optional[ToolResponseAdapter] = None,
+        description: Optional[str] = None,
+        title: Optional[str] = None,
+        rules: Optional[list[str]] = None,
+        requires: Optional[list[Requirement]] = None,
+        toolkits: Optional[list[Toolkit]] = None,
+        supports_tools: Optional[bool] = None,
+        labels: Optional[list[str]] = None,
+    ):
         super().__init__(
             name=name,
             description=description,
             title=title,
             input_schema=merge(
                 schema=prompt_schema(description="use a prompt to generate content"),
-                additional_properties={
-                    "path" : { "type" : "string" }
-                }),
-                output_schema={
-                    "type" : "object",
-                    "additionalProperties" : False,
-                    "required" : [],
-                    "properties" : {
-                    }
-                },
+                additional_properties={"path": {"type": "string"}},
+            ),
+            output_schema={
+                "type": "object",
+                "additionalProperties": False,
+                "required": [],
+                "properties": {},
+            },
             requires=requires,
             supports_tools=supports_tools,
         )
         self._rules = rules
         self._llm_adapter = llm_adapter
-        self._tool_adapter = tool_adapter 
-        if toolkits == None:
+        self._tool_adapter = tool_adapter
+        if toolkits is None:
             toolkits = []
         self._toolkits = toolkits
         self._labels = labels
-    
 
     async def init_chat_context(self):
         context = self._llm_adapter.create_chat_context()
@@ -50,31 +56,33 @@ class SingleShotWriter(Writer):
         return context
 
     async def write(self, writer_context: WriterContext, arguments: dict):
-
         arguments = arguments.copy()
         self.pop_path(arguments=arguments)
 
         prompt = arguments["prompt"]
 
         writer_context.call_context.chat.append_user_message(message=prompt)
-            
-        toolkits = [
-            *self._toolkits,
-            *writer_context.call_context.toolkits
-        ]
-        
+
+        toolkits = [*self._toolkits, *writer_context.call_context.toolkits]
+
         try:
             logger.info("SINGLE SHOT COMPLETION STARTING")
-            
-            response = await self._llm_adapter.next(context=writer_context.call_context.chat, room=writer_context.room, toolkits=toolkits, tool_adapter=self._tool_adapter, output_schema=writer_context.document.schema.to_json())
+
+            response = await self._llm_adapter.next(
+                context=writer_context.call_context.chat,
+                room=writer_context.room,
+                toolkits=toolkits,
+                tool_adapter=self._tool_adapter,
+                output_schema=writer_context.document.schema.to_json(),
+            )
 
             logger.info("SINGLE SHOT COMPLETION RESPONSE %s", response)
-        
+
         except Exception as e:
             logger.error("Unable to execute reasoning completion task", exc_info=e)
             # retry
-            raise(e)
-        
+            raise (e)
+
         document = writer_context.document
         response = response[document.schema.root.tag_name]
 
@@ -88,5 +96,3 @@ class SingleShotWriter(Writer):
                 raise Exception("Unexpected property type")
 
         return {}
-
- 

meshagent/agents/thread_schema.py

@@ -1,60 +1,102 @@
-from meshagent.api.schema import MeshSchema, ElementType,  ChildProperty, ValueProperty
+from meshagent.api.schema import MeshSchema, ElementType, ChildProperty, ValueProperty
 
 thread_schema = MeshSchema(
     root_tag_name="thread",
     elements=[
         ElementType(
-            tag_name="thread", 
+            tag_name="thread",
             description="a thread of messages",
             properties=[
-                ValueProperty(name="name", description="name of the tread", type="string"),
-                ChildProperty(name="properties", description="the messages in the thread", ordered=True, child_tag_names=[
-                    "members", "messages"
-                ]),
-            ]
+                ValueProperty(
+                    name="name", description="name of the tread", type="string"
+                ),
+                ChildProperty(
+                    name="properties",
+                    description="the messages in the thread",
+                    ordered=True,
+                    child_tag_names=["members", "messages"],
+                ),
+            ],
         ),
         ElementType(
-            tag_name="members", 
+            tag_name="members",
             description="the members of this thread",
             properties=[
-                ChildProperty(name="items", child_tag_names=["member"], description="the messages in this thread")
-            ]
+                ChildProperty(
+                    name="items",
+                    child_tag_names=["member"],
+                    description="the messages in this thread",
+                )
+            ],
         ),
         ElementType(
-            tag_name="messages", 
+            tag_name="messages",
             description="the messages of this thread",
             properties=[
-                ChildProperty(name="items", child_tag_names=["message"], description="the messages in this thread")
-            ]
+                ChildProperty(
+                    name="items",
+                    child_tag_names=["message"],
+                    description="the messages in this thread",
+                )
+            ],
         ),
         ElementType(
-            tag_name="member", 
+            tag_name="member",
             description="a member of this thread",
             properties=[
-                ValueProperty(name="name", description="the name of the member", type="string"),
-                ValueProperty(name="type", description="the type of member", type="string", enum=[
-                    "user", "agent"
-                ]),
-            ]
+                ValueProperty(
+                    name="name", description="the name of the member", type="string"
+                ),
+                ValueProperty(
+                    name="type",
+                    description="the type of member",
+                    type="string",
+                    enum=["user", "agent"],
+                ),
+            ],
         ),
         ElementType(
-            tag_name="file", 
+            tag_name="file",
             description="a file attachment",
             properties=[
-                ValueProperty(name="path", description="the path of the file in the room", type="string"),
-            ]
+                ValueProperty(
+                    name="path",
+                    description="the path of the file in the room",
+                    type="string",
+                ),
+            ],
         ),
         ElementType(
-            tag_name="message", 
+            tag_name="message",
             description="a message sent in the conversation",
             properties=[
-                ValueProperty(name="id", description="the id of the message", type="string"),
-                ValueProperty(name="text", description="the text of the message", type="string"),
-                ValueProperty(name="created_at", description="the date that the message was sent in ISO format", type="string"),
-                ValueProperty(name="author_name", description="the name of the author of the post", type="string"),
-                ValueProperty(name="author_ref", description="a reference to author identity in another system", type="string"),
-                ChildProperty(name="attachments", child_tag_names=["file"], description="a list of message attachments")
-            ]
-        ),          
-    ]
+                ValueProperty(
+                    name="id", description="the id of the message", type="string"
+                ),
+                ValueProperty(
+                    name="text", description="the text of the message", type="string"
+                ),
+                ValueProperty(
+                    name="created_at",
+                    description="the date that the message was sent in ISO format",
+                    type="string",
+                ),
+                ValueProperty(
+                    name="author_name",
+                    description="the name of the author of the post",
+                    type="string",
+                ),
+                ValueProperty(
+                    name="author_ref",
+                    description="a reference to author identity in another system",
+                    type="string",
+                ),
+                ChildProperty(
+                    name="attachments",
+                    child_tag_names=["file"],
+                    description="a list of message attachments",
+                ),
+            ],
+        ),
+    ],
 )

meshagent/agents/utils.py

@@ -1,11 +1,18 @@
 from meshagent.api import RoomClient, Requirement, RoomException, Participant
-from meshagent.tools import validate_openai_schema, Toolkit
+from meshagent.tools import validate_openai_schema
 import json
 from typing import Optional
 import asyncio
 
-async def generate_json(*, on_behalf_of: Optional[Participant] = None, room: RoomClient, prompt: Optional[str] = None, output_schema: dict, requires: Optional[list[Requirement]] = None) -> dict:
-    
+
+async def generate_json(
+    *,
+    on_behalf_of: Optional[Participant] = None,
+    room: RoomClient,
+    prompt: Optional[str] = None,
+    output_schema: dict,
+    requires: Optional[list[Requirement]] = None,
+) -> dict:
     # make sure agent is in the room before proceeding
     agent = None
     for i in range(10):
@@ -14,25 +21,26 @@ async def generate_json(*, on_behalf_of: Optional[Participant] = None, room: Roo
             if a.name == "meshagent.schema_planner":
                 agent = a
                 break
-        
-        if agent != None:
+
+        if agent is not None:
             break
 
         await asyncio.sleep(1)
 
-    if agent == None:
-        raise RoomException("unable to locate required agent (meshagent.schema_planner)")
-        
-    
-    if prompt == None:
+    if agent is None:
+        raise RoomException(
+            "unable to locate required agent (meshagent.schema_planner)"
+        )
+
+    if prompt is None:
         prompt = f"ask me a series of questions to completely fill out the data structure described by this JSON schema ${json.dumps(output_schema)}. If you need to ask multiple questions, try to include all of them in a single form."
 
     validate_openai_schema(output_schema)
     return await room.agents.ask(
         on_behalf_of=on_behalf_of,
         agent="meshagent.schema_planner",
-        requires = requires,
-        arguments = {
+        requires=requires,
+        arguments={
             "prompt": prompt,
             "output_schema": output_schema,
         },

meshagent/agents/version.py

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