mashpy 0.2.2__tar.gz → 0.2.4__tar.gz

{mashpy-0.2.2 → mashpy-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mashpy
-Version: 0.2.2
+Version: 0.2.4
 Summary: SDK for building hosted multi-agent Mash applications.
 Author: imsid
 License: Proprietary

{mashpy-0.2.2 → mashpy-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mashpy"
-version = "0.2.2"
+version = "0.2.4"
 description = "SDK for building hosted multi-agent Mash applications."
 readme = "README.md"
 requires-python = ">=3.10"

{mashpy-0.2.2 → mashpy-0.2.4}/src/mash/logging/__init__.py

@@ -10,7 +10,7 @@ from .events import (
     MCPEvent,
 )
 from .logger import EventLogger
-from .trace_context import clear_trace_id, get_trace_id, set_trace_id
+from .trace_context import bound_trace_id, clear_trace_id, get_trace_id, set_trace_id
 
 __all__ = [
     "LogEvent",
@@ -21,6 +21,7 @@ __all__ = [
     "MemorySearchEvent",
     "DebugEvent",
     "EventLogger",
+    "bound_trace_id",
     "set_trace_id",
     "get_trace_id",
     "clear_trace_id",

{mashpy-0.2.2 → mashpy-0.2.4}/src/mash/logging/trace_context.py

@@ -3,7 +3,8 @@
 from __future__ import annotations
 
 import contextvars
-from typing import Optional
+from contextlib import contextmanager
+from typing import Iterator, Optional
 
 _trace_id: contextvars.ContextVar[str | None] = contextvars.ContextVar(
     "mash_trace_id",
@@ -24,3 +25,13 @@ def get_trace_id() -> Optional[str]:
 def clear_trace_id() -> None:
     """Clear the trace ID for the current task context."""
     _trace_id.set(None)
+
+
+@contextmanager
+def bound_trace_id(trace_id: Optional[str]) -> Iterator[None]:
+    """Temporarily bind a trace ID for the current task context."""
+    token = _trace_id.set(trace_id)
+    try:
+        yield
+    finally:
+        _trace_id.reset(token)

{mashpy-0.2.2 → mashpy-0.2.4}/src/mash/memory/compaction.py

@@ -7,6 +7,7 @@ from typing import Any, Dict, List, Tuple
 
 from ..core.llm import LLMProvider
 from ..core.llm.types import LLMContentBlock, LLMMessage, LLMRequest
+from ..logging import bound_trace_id
 from .store import MemoryStore
 
 COMPACTION_SYSTEM_PROMPT = """You are a conversation compactor.
@@ -75,23 +76,31 @@ async def compact_conversation(
     if not lines:
         return "", ""
 
+    trace_id = str(uuid.uuid4())
     conversation_text = "\n".join(lines)
-    response = await llm.send(
-        LLMRequest(
-            model=llm.model,
-            system=COMPACTION_SYSTEM_PROMPT,
-            messages=[
-                LLMMessage(
-                    role="user",
-                    content=[LLMContentBlock.text(conversation_text)],
+    if hasattr(llm, "set_trace_id"):
+        llm.set_trace_id(trace_id)
+    try:
+        with bound_trace_id(trace_id):
+            response = await llm.send(
+                LLMRequest(
+                    model=llm.model,
+                    system=COMPACTION_SYSTEM_PROMPT,
+                    messages=[
+                        LLMMessage(
+                            role="user",
+                            content=[LLMContentBlock.text(conversation_text)],
+                        )
+                    ],
+                    tools=[],
+                    max_tokens=max_tokens,
+                    temperature=temperature,
+                    use_prompt_caching=False,
                 )
-            ],
-            tools=[],
-            max_tokens=max_tokens,
-            temperature=temperature,
-            use_prompt_caching=False,
-        )
-    )
+            )
+    finally:
+        if hasattr(llm, "set_trace_id"):
+            llm.set_trace_id(None)
     summary_text = response.text.strip()
 
     metadata: Dict[str, Any] = {
@@ -102,7 +111,6 @@ async def compact_conversation(
         "app_id": app_id,
         "token_usage": {"input": 0, "output": 0},
     }
-    trace_id = str(uuid.uuid4())
     turn_id = await store.save_turn(
         trace_id=trace_id,
         session_id=session_id,

{mashpy-0.2.2 → mashpy-0.2.4}/src/mash/runtime/runtime.py

@@ -223,38 +223,40 @@ class MashAgentRuntime:
         manager = self.mcp_manager
         try:
             for server in mcp_servers:
-                manager.add_server(
-                    name=server.name,
-                    url=server.url,
-                    description=server.description,
-                    headers=server.headers,
-                    allowed_tools=server.allowed_tools,
-                    auto_connect=True,
-                )
-                mcp_tools = manager.get_flattened_tools(prefix="mcp_")
-                for mcp_tool in mcp_tools:
-                    server_name = mcp_tool.get("metadata", {}).get("server")
-                    original_name = mcp_tool.get("metadata", {}).get("original_name")
-                    if not server_name or not original_name:
-                        continue
-
-                    def make_executor(srv_name: str, tool_name: str):
-                        def executor(args):
-                            try:
-                                result = manager.call_tool(srv_name, tool_name, args)
-                                return extract_mcp_text(result)
-                            except Exception as exc:  # pragma: no cover
-                                return f"Error: {exc}"
-
-                        return executor
-
-                    adapter = MCPToolAdapter.from_mcp_tool(
-                        mcp_tool=mcp_tool,
-                        executor=make_executor(server_name, original_name),
-                        prefix="",
+                if manager.get_server(server.name) is None:
+                    manager.add_server(
+                        name=server.name,
+                        url=server.url,
+                        description=server.description,
+                        headers=server.headers,
+                        allowed_tools=server.allowed_tools,
+                        auto_connect=True,
                     )
-                    if adapter.name not in agent.tools:
-                        agent.tools.register(adapter)
+
+            mcp_tools = manager.get_flattened_tools(prefix="mcp_")
+            for mcp_tool in mcp_tools:
+                server_name = mcp_tool.get("metadata", {}).get("server")
+                original_name = mcp_tool.get("metadata", {}).get("original_name")
+                if not server_name or not original_name:
+                    continue
+
+                def make_executor(srv_name: str, tool_name: str):
+                    def executor(args):
+                        try:
+                            result = manager.call_tool(srv_name, tool_name, args)
+                            return extract_mcp_text(result)
+                        except Exception as exc:  # pragma: no cover
+                            return f"Error: {exc}"
+
+                    return executor
+
+                adapter = MCPToolAdapter.from_mcp_tool(
+                    mcp_tool=mcp_tool,
+                    executor=make_executor(server_name, original_name),
+                    prefix="",
+                )
+                if adapter.name not in agent.tools:
+                    agent.tools.register(adapter)
         except MCPClientError:
             return
 

{mashpy-0.2.2 → mashpy-0.2.4}/src/mashpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mashpy
-Version: 0.2.2
+Version: 0.2.4
 Summary: SDK for building hosted multi-agent Mash applications.
 Author: imsid
 License: Proprietary