meshagent-agents 0.6.2__py3-none-any.whl → 0.6.3__py3-none-any.whl

meshagent/agents/agent.py

@@ -194,46 +194,49 @@ class SingleRoomAgent(Agent):
         builtin_agents_url = "http://localhost:8080"
 
         for requirement in self.requires:
-            if isinstance(requirement, RequiredToolkit):
-                if requirement.name == "ui":
-                    # TODO: maybe requirements can be marked as non installable?
-                    continue
+            if requirement.callable:
+                if isinstance(requirement, RequiredToolkit):
+                    if requirement.name == "ui":
+                        # TODO: maybe requirements can be marked as non installable?
+                        continue
 
-                if requirement.name not in toolkits_by_name:
-                    installed = True
+                    if requirement.name not in toolkits_by_name:
+                        installed = True
 
-                    logger.info(f"calling required tool into room {requirement.name}")
+                        logger.info(
+                            f"calling required tool into room {requirement.name}"
+                        )
 
-                    if requirement.name.startswith(
-                        "https://"
-                    ) or requirement.name.startswith("http://"):
-                        url = requirement.name
-                    else:
-                        url = f"{builtin_agents_url}/toolkits/{requirement.name}"
+                        if requirement.name.startswith(
+                            "https://"
+                        ) or requirement.name.startswith("http://"):
+                            url = requirement.name
+                        else:
+                            url = f"{builtin_agents_url}/toolkits/{requirement.name}"
 
-                    await self._room.agents.make_call(
-                        url=url, name=requirement.name, arguments={}
-                    )
+                        await self._room.agents.make_call(
+                            url=url, name=requirement.name, arguments={}
+                        )
 
-            elif isinstance(requirement, RequiredSchema):
-                if requirement.name not in schemas_by_name:
-                    installed = True
+                elif isinstance(requirement, RequiredSchema):
+                    if requirement.name not in schemas_by_name:
+                        installed = True
 
-                    logger.info(f"Installing required schema {requirement.name}")
+                        logger.info(f"Installing required schema {requirement.name}")
 
-                    if requirement.name.startswith(
-                        "https://"
-                    ) or requirement.name.startswith("http://"):
-                        url = requirement.name
-                    else:
-                        url = f"{builtin_agents_url}/schemas/{requirement.name}"
+                        if requirement.name.startswith(
+                            "https://"
+                        ) or requirement.name.startswith("http://"):
+                            url = requirement.name
+                        else:
+                            url = f"{builtin_agents_url}/schemas/{requirement.name}"
 
-                    await self._room.agents.make_call(
-                        url=url, name=requirement.name, arguments={}
-                    )
+                        await self._room.agents.make_call(
+                            url=url, name=requirement.name, arguments={}
+                        )
 
-            else:
-                raise RoomException("unsupported requirement")
+                else:
+                    raise RoomException("unsupported requirement")
 
         if installed:
             await asyncio.sleep(5)

meshagent/agents/mail.py

@@ -31,172 +31,6 @@ class MailThreadContext:
         self.message = message
 
 
-def create_reply_email_message(
-    *, message: dict, from_address: str, body: str
-) -> EmailMessage:
-    subject: str = message.get("subject")
-
-    if not subject.startswith("RE:"):
-        subject = "RE: " + subject
-
-    _, addr = email.utils.parseaddr(from_address)
-    domain = addr.split("@")[-1].lower()
-    id = f"<{uuid.uuid4()}@{domain}>"
-
-    msg = EmailMessage()
-    msg["Message-ID"] = id
-    msg["Subject"] = subject
-    msg["From"] = from_address
-    msg["To"] = message.get("reply_to")
-    msg["In-Reply-To"] = message.get("id")
-    msg.set_content(body)
-
-    return msg
-
-
-def message_to_json(*, message: EmailMessage, role: MessageRole):
-    body_part = message.get_body(
-        ("plain", "html")
-    )  # returns the “best” part :contentReference[oaicite:0]{index=0}
-    if body_part:
-        body = body_part.get_content()
-    else:  # simple, non-MIME message
-        body = message.get_content()
-
-    id = message.get("Message-ID")
-    if id is None:
-        mfrom = message.get("From")
-        _, addr = email.utils.parseaddr(mfrom)
-        domain = addr.split("@")[-1].lower()
-        id = f"{uuid.uuid4()}@{domain}"
-
-    return {
-        "id": id,
-        "in_reply_to": message.get("In-Reply-To"),
-        "reply_to": message.get("Reply-To", message.get("From")),
-        "references": message.get("References"),
-        "from": message.get("From"),
-        "to": message.get_all("To"),
-        "subject": message.get("Subject"),
-        "body": body,
-        "attachments": [],
-        "role": role,
-    }
-
-
-async def load_message(*, room: RoomClient, message_id: str) -> dict | None:
-    messages = await room.database.search(table="emails", where={"id": message_id})
-
-    if len(messages) == 0:
-        return None
-
-    return json.loads(messages[0]["json"])
-
-
-async def save_email_message(
-    *, room: RoomClient, content: bytes, role: MessageRole
-) -> dict:
-    message = message_from_bytes(content, policy=default)
-
-    now = datetime.now(timezone.utc)
-
-    folder_path = (
-        now.strftime("%Y/%m/%d")
-        + "/"
-        + now.strftime("%H/%M/%S")
-        + "/"
-        + secrets.token_hex(3)
-    )
-
-    queued_message = message_to_json(message=message, role=role)
-    message_id = queued_message["id"]
-
-    queued_message["role"] = role
-
-    queued_message["path"] = f".emails/{message_id}/message.json"
-
-    for part in (
-        message.iter_attachments()
-    ):  # ↔ only the “real” attachments :contentReference[oaicite:0]{index=0}
-        fname = (
-            part.get_filename() or "attachment.bin"
-        )  # RFC 2183 filename, if any :contentReference[oaicite:1]{index=1}
-
-        # get_content() auto-decodes transfer-encodings; returns
-        # *str* for text/*, *bytes* for everything else :contentReference[oaicite:2]{index=2}
-        data = part.get_content()
-
-        # make sure we write binary data
-        bin_data = (
-            data.encode(part.get_content_charset("utf-8"))
-            if isinstance(data, str)
-            else data
-        )
-
-        path = f".emails/{folder_path}/attachments/{fname}"
-        handle = await room.storage.open(path=path)
-        try:
-            logger.info(f"writing content to {path}")
-            await room.storage.write(handle=handle, data=bin_data)
-        finally:
-            await room.storage.close(handle=handle)
-
-        queued_message["attachments"].append(path)
-
-    logger.info(f"received mail, {queued_message}")
-
-    # write email
-    path = f".emails/{folder_path}/message.eml"
-    handle = await room.storage.open(path=path)
-    try:
-        logger.info(f"writing source message.eml to {path}")
-        await room.storage.write(handle=handle, data=content)
-    finally:
-        await room.storage.close(handle=handle)
-
-    path = f".emails/{folder_path}/message.json"
-    handle = await room.storage.open(path=path)
-    try:
-        logger.info(f"writing source message.json to {path}")
-        await room.storage.write(
-            handle=handle, data=json.dumps(queued_message, indent=4).encode("utf-8")
-        )
-    finally:
-        await room.storage.close(handle=handle)
-
-    # create email table if it doesn't exist
-    tables = await room.database.list_tables()
-
-    if "emails" not in tables:
-        await room.database.create_table_with_schema(
-            name="emails",
-            schema={"id": TextDataType(), "json": TextDataType()},
-            mode="create_if_not_exists",
-        )
-
-        await room.database.create_scalar_index(table="emails", column="id")
-
-    await room.database.insert(
-        table="emails", records=[{"id": message_id, "json": json.dumps(queued_message)}]
-    )
-
-    return queued_message
-
-
-async def load_thread(*, room: RoomClient, message: dict, thread: list[dict]):
-    in_reply_to = message.get("in_reply_to", None)
-    if in_reply_to is not None:
-        source = await load_message(room=room, message_id=in_reply_to)
-
-        if source is not None:
-            thread.insert(0, source)
-
-            await load_thread(room=room, message=source, thread=thread)
-
-        else:
-            logger.warning(f"message not found {in_reply_to}")
-
-
 class SmtpConfiguration:
     def __init__(
         self,
@@ -258,11 +92,154 @@ class MailWorker(Worker):
         )
         self._email_address = email_address
 
-    async def append_message_context(self, *, room, message, chat_context):
-        thread = [message]
+    async def load_message(self, *, room: RoomClient, message_id: str) -> dict | None:
+        messages = await room.database.search(table="emails", where={"id": message_id})
+
+        if len(messages) == 0:
+            return None
+
+        return json.loads(messages[0]["json"])
+
+    def message_to_json(self, *, message: EmailMessage, role: MessageRole):
+        body_part = message.get_body(
+            ("plain", "html")
+        )  # returns the “best” part :contentReference[oaicite:0]{index=0}
+        if body_part:
+            body = body_part.get_content()
+        else:  # simple, non-MIME message
+            body = message.get_content()
+
+        id = message.get("Message-ID")
+        if id is None:
+            mfrom = message.get("From")
+            _, addr = email.utils.parseaddr(mfrom)
+            domain = addr.split("@")[-1].lower()
+            id = f"{uuid.uuid4()}@{domain}"
+
+        return {
+            "id": id,
+            "in_reply_to": message.get("In-Reply-To"),
+            "reply_to": message.get("Reply-To", message.get("From")),
+            "references": message.get("References"),
+            "from": message.get("From"),
+            "to": message.get_all("To"),
+            "subject": message.get("Subject"),
+            "body": body,
+            "attachments": [],
+            "role": role,
+        }
+
+    async def save_email_message(
+        self, *, room: RoomClient, content: bytes, role: MessageRole
+    ) -> dict:
+        message = message_from_bytes(content, policy=default)
+
+        now = datetime.now(timezone.utc)
+
+        folder_path = (
+            now.strftime("%Y/%m/%d")
+            + "/"
+            + now.strftime("%H/%M/%S")
+            + "/"
+            + secrets.token_hex(3)
+        )
+
+        queued_message = self.message_to_json(message=message, role=role)
+        message_id = queued_message["id"]
+
+        queued_message["role"] = role
+
+        queued_message["path"] = f".emails/{message_id}/message.json"
+
+        for part in (
+            message.iter_attachments()
+        ):  # ↔ only the “real” attachments :contentReference[oaicite:0]{index=0}
+            fname = (
+                part.get_filename() or "attachment.bin"
+            )  # RFC 2183 filename, if any :contentReference[oaicite:1]{index=1}
+
+            # get_content() auto-decodes transfer-encodings; returns
+            # *str* for text/*, *bytes* for everything else :contentReference[oaicite:2]{index=2}
+            data = part.get_content()
+
+            # make sure we write binary data
+            bin_data = (
+                data.encode(part.get_content_charset("utf-8"))
+                if isinstance(data, str)
+                else data
+            )
 
-        await load_thread(room=room, message=message, thread=thread)
+            path = f".emails/{folder_path}/attachments/{fname}"
+            handle = await room.storage.open(path=path)
+            try:
+                logger.info(f"writing content to {path}")
+                await room.storage.write(handle=handle, data=bin_data)
+            finally:
+                await room.storage.close(handle=handle)
 
+            queued_message["attachments"].append(path)
+
+        logger.info(f"received mail, {queued_message}")
+
+        # write email
+        path = f".emails/{folder_path}/message.eml"
+        handle = await room.storage.open(path=path)
+        try:
+            logger.info(f"writing source message.eml to {path}")
+            await room.storage.write(handle=handle, data=content)
+        finally:
+            await room.storage.close(handle=handle)
+
+        path = f".emails/{folder_path}/message.json"
+        handle = await room.storage.open(path=path)
+        try:
+            logger.info(f"writing source message.json to {path}")
+            await room.storage.write(
+                handle=handle, data=json.dumps(queued_message, indent=4).encode("utf-8")
+            )
+        finally:
+            await room.storage.close(handle=handle)
+
+        # create email table if it doesn't exist
+        tables = await room.database.list_tables()
+
+        if "emails" not in tables:
+            await room.database.create_table_with_schema(
+                name="emails",
+                schema={"id": TextDataType(), "json": TextDataType()},
+                mode="create_if_not_exists",
+            )
+
+            await room.database.create_scalar_index(table="emails", column="id")
+
+        await room.database.insert(
+            table="emails",
+            records=[{"id": message_id, "json": json.dumps(queued_message)}],
+        )
+
+        return queued_message
+
+    async def load_thread(self, *, room: RoomClient, message: dict, thread: list[dict]):
+        in_reply_to = message.get("in_reply_to", None)
+        if in_reply_to is not None:
+            source = await self.load_message(room=room, message_id=in_reply_to)
+
+            if source is not None:
+                thread.insert(0, source)
+
+                await self.load_thread(room=room, message=source, thread=thread)
+
+            else:
+                logger.warning(f"message not found {in_reply_to}")
+
+    async def append_message_context(
+        self,
+        *,
+        room: RoomClient,
+        message: dict,
+        chat_context: AgentChatContext,
+        thread: list[dict],
+    ):
         for msg in thread:
             if msg["role"] == "agent":
                 chat_context.append_assistant_message(json.dumps(msg))
@@ -275,18 +252,33 @@ class MailWorker(Worker):
             room=room, message=message, chat_context=chat_context
         )
 
-    async def process_message(self, *, chat_context, room, message, toolkits):
+    async def process_message(
+        self,
+        *,
+        chat_context: AgentChatContext,
+        room: RoomClient,
+        message: dict,
+        toolkits: list[Toolkit],
+    ):
         message_bytes = base64.b64decode(message["base64"])
 
-        message = await save_email_message(
+        message = await self.save_email_message(
             room=room, content=message_bytes, role="agent"
         )
 
-        thread_context = MailThreadContext(chat=chat_context, message=message)
-        toolkits = await self.get_thread_toolkits(thread_context=thread_context)
+        thread = [message]
+
+        await self.load_thread(room=room, message=message, thread=thread)
+
         await self.append_message_context(
-            room=room, message=message, chat_context=chat_context
+            room=room, message=message, chat_context=chat_context, thread=thread
+        )
+
+        thread_context = MailThreadContext(
+            chat=chat_context, message=message, thread=thread
         )
+        toolkits = await self.get_thread_toolkits(thread_context=thread_context)
+
         logger.info(f"processing message {message}")
         reply = await super().process_message(
             chat_context=thread_context.chat,
@@ -296,12 +288,34 @@ class MailWorker(Worker):
         )
         return await self.send_reply_message(room=room, message=message, reply=reply)
 
+    def create_reply_email_message(
+        self, *, message: dict, from_address: str, body: str
+    ) -> EmailMessage:
+        subject: str = message.get("subject")
+
+        if not subject.startswith("RE:"):
+            subject = "RE: " + subject
+
+        _, addr = email.utils.parseaddr(from_address)
+        domain = addr.split("@")[-1].lower()
+        id = f"<{uuid.uuid4()}@{domain}>"
+
+        msg = EmailMessage()
+        msg["Message-ID"] = id
+        msg["Subject"] = subject
+        msg["From"] = from_address
+        msg["To"] = message.get("reply_to")
+        msg["In-Reply-To"] = message.get("id")
+        msg.set_content(body)
+
+        return msg
+
     async def send_reply_message(self, *, room: RoomClient, message: dict, reply: str):
-        msg = create_reply_email_message(
+        msg = self.create_reply_email_message(
             message=message, from_address=self._email_address, body=reply
         )
 
-        reply_msg_dict = await save_email_message(
+        reply_msg_dict = await self.save_email_message(
             room=room, content=msg.as_bytes(), role="agent"
         )
 

meshagent/agents/version.py

@@ -1 +1 @@
-__version__ = "0.6.2"
+__version__ = "0.6.3"

{meshagent_agents-0.6.2.dist-info → meshagent_agents-0.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-agents
-Version: 0.6.2
+Version: 0.6.3
 Summary: Agent Building Blocks for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -12,19 +12,19 @@ License-File: LICENSE
 Requires-Dist: pyjwt~=2.10
 Requires-Dist: pytest~=8.4
 Requires-Dist: pytest-asyncio~=0.26
-Requires-Dist: meshagent-api~=0.6.2
-Requires-Dist: meshagent-tools~=0.6.2
-Requires-Dist: meshagent-openai~=0.6.2
+Requires-Dist: meshagent-api~=0.6.3
+Requires-Dist: meshagent-tools~=0.6.3
+Requires-Dist: meshagent-openai~=0.6.3
 Requires-Dist: pydantic~=2.11
 Requires-Dist: opentelemetry-distro~=0.54b1
 Provides-Extra: all
-Requires-Dist: meshagent-api[all]~=0.6.2; extra == "all"
+Requires-Dist: meshagent-api[all]~=0.6.3; extra == "all"
 Requires-Dist: chonkie~=0.5.1; extra == "all"
 Requires-Dist: chonkie[semantic]~=0.5.1; extra == "all"
 Requires-Dist: chonkie[openai]~=0.5.1; extra == "all"
 Requires-Dist: aiosmtplib~=4.0.1; extra == "all"
 Provides-Extra: sync
-Requires-Dist: meshagent-api[sync]~=0.6.2; extra == "sync"
+Requires-Dist: meshagent-api[sync]~=0.6.3; extra == "sync"
 Provides-Extra: mail
 Requires-Dist: aiosmtplib~=4.0.1; extra == "mail"
 Provides-Extra: rag

{meshagent_agents-0.6.2.dist-info → meshagent_agents-0.6.3.dist-info}/RECORD

@@ -1,20 +1,20 @@
 meshagent/agents/__init__.py,sha256=BcPxGW5__oLXEU2FQxWBAqSYUwXH99nIGaO2dTGyUxQ,634
 meshagent/agents/adapter.py,sha256=enFUYMVaq3XZgqFIxOqeZxJp6YI0yLPQBd5VNQMhq8s,2097
-meshagent/agents/agent.py,sha256=ibl2igR0WZofOnJp95WJghF7ktoQBZRViPhO5p4qbFg,20486
+meshagent/agents/agent.py,sha256=kMAFCrOSBuioKFR8lotYVvNnUYwcvkmzVwc_JuaGlrk,20701
 meshagent/agents/chat.py,sha256=SOkoJPOAQ4yVPc6ymPZNmXQOe1NvhQzSwI8mVHIqppo,43861
 meshagent/agents/context.py,sha256=MNK3BwtVtFUnMeaUAPDt7tQLrHip39y7rqtOs3KFHv8,4491
 meshagent/agents/development.py,sha256=uWKfwmPEE1Er4KgMtsEzdJEWE8H2c1S7l6q6a8OSDOw,997
 meshagent/agents/indexer.py,sha256=8J_5f127J0jLKlQkPw955nHouqWlQUuRDm4bjyObZfE,19361
 meshagent/agents/listener.py,sha256=q5z216FMVW-a7FBs706u3IuB81VArfucxEHaHvPFHEo,5139
 meshagent/agents/llmrunner.py,sha256=ovHWsAsDqDCjmXLqXvx5B9Zwh9DaZMzvWU2dIL90syw,5739
-meshagent/agents/mail.py,sha256=sck-j1sEdkV11k046fz3VkQyGAPdgxWIbcQmCamcAkk,12318
+meshagent/agents/mail.py,sha256=1X5D92JbZoEmQ-dnlI5NFYtEM3kyODKOsqrpH7cWxnQ,13170
 meshagent/agents/planning.py,sha256=npu29Z-lXgsJgMr7kXmlfz9gq5CcE0Q6RoZg4IBsfig,21952
 meshagent/agents/prompt.py,sha256=OSSqbzaugyQtuvYxTY5UcZQWyeV73e3GUJz_iC5xZkA,1883
 meshagent/agents/pydantic.py,sha256=Fnjx9fdKRHKeAKw1-Yqrm_emM3UVIpLBOj1tmeSJfwk,6270
 meshagent/agents/single_shot_writer.py,sha256=miWVMo4NX8Hib0yHwDmiwuk8GraJwg1JzljsgFyTl4Y,3237
 meshagent/agents/thread_schema.py,sha256=J5k3PLyrMKSxtmCTGoN3m81t_K_AiymtIqRGqHeOWjI,5987
 meshagent/agents/utils.py,sha256=2Z3r7cUpKDZig8MVCrBwZRBUambeX4esZovDWme9uVE,1353
-meshagent/agents/version.py,sha256=jFlbxEJFS0G44LE-yXXVSwXACA1J_NyYDk5E20_2zpc,22
+meshagent/agents/version.py,sha256=zYiFHqR7JwbvdK9dvKrh-RTNfUqjHUwC4CTcFAPVYLc,22
 meshagent/agents/worker.py,sha256=ACwV5Uq3_Dg0PrwahYQ8EiguW2sru2_Rvg0RwZB1DdE,3932
 meshagent/agents/writer.py,sha256=DdM1YzZyHSh4Cl-OmzU0Hhqg7A8M1ES0hiNTYDu1BS4,2680
 meshagent/agents/schemas/__init__.py,sha256=_xAhrkxvFdfer3NolrynragGxcLElGR51LSribT3deU,299
@@ -24,8 +24,8 @@ meshagent/agents/schemas/presentation.py,sha256=aaMzkFQryurbHd1fbzTQPdN7v8QIhsjX
 meshagent/agents/schemas/schema.py,sha256=8OXGCLVouoPg6eHBU9mgf1pTGTMvVZqiKNq15wkQJe0,5310
 meshagent/agents/schemas/super_editor_document.py,sha256=iRv4Q-DE_5kUdsAD5Rm4GwHek8L_7ZEpxIZ1x2dWjdg,1813
 meshagent/agents/schemas/transcript.py,sha256=-Cj7cT8aZIGiEw9HGV3iivGgTlJYtmtKaO9E-amQiFs,2099
-meshagent_agents-0.6.2.dist-info/licenses/LICENSE,sha256=eTt0SPW-sVNdkZe9PS_S8WfCIyLjRXRl7sUBWdlteFg,10254
-meshagent_agents-0.6.2.dist-info/METADATA,sha256=gpEgA2PSvJlImNIxICMY9ltlv9xc2FkzWP29DzBUkWA,3762
-meshagent_agents-0.6.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-meshagent_agents-0.6.2.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
-meshagent_agents-0.6.2.dist-info/RECORD,,
+meshagent_agents-0.6.3.dist-info/licenses/LICENSE,sha256=eTt0SPW-sVNdkZe9PS_S8WfCIyLjRXRl7sUBWdlteFg,10254
+meshagent_agents-0.6.3.dist-info/METADATA,sha256=Fp350ZgLJNy7Ksyzs1j8QdRVY0bz7lUPsC06iGWwxi4,3762
+meshagent_agents-0.6.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+meshagent_agents-0.6.3.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
+meshagent_agents-0.6.3.dist-info/RECORD,,