PyPI - solace-agent-mesh - Versions diffs - 1.1.0__py3-none-any.whl → 1.3.0__py3-none-any.whl - Mend

solace-agent-mesh 1.1.0py3-none-any.whl → 1.3.0py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of solace-agent-mesh might be problematic. Click here for more details.

Files changed (139) hide show

solace_agent_mesh/config_portal/frontend/static/client/assets/{manifest-d845808d.js → manifest-89db7c30.js} RENAMED Viewed

	@@ -1 +1 @@
1	- window.__remixManifest={"entry":{"module":"/assets/entry.client-mvZjNKiz.js","imports":["/assets/index-DzNKzXrc.js","/assets/components-Rk0n-9cK.js"],"css":[]},"routes":{"root":{"id":"root","path":"","hasAction":false,"hasLoader":false,"hasClientAction":false,"hasClientLoader":false,"hasErrorBoundary":false,"module":"/assets/root-BWvk5-gF.js","imports":["/assets/index-DzNKzXrc.js","/assets/components-Rk0n-9cK.js"],"css":["/assets/root-DxRwaWiE.css"]},"routes/_index":{"id":"routes/_index","parentId":"root","index":true,"hasAction":false,"hasLoader":false,"hasClientAction":false,"hasClientLoader":false,"hasErrorBoundary":false,"module":"/assets/_index-~~Bym6YkMd~~.js","imports":["/assets/index-DzNKzXrc.js"],"css":[]}},"url":"/assets/manifest-~~d845808d~~.js","version":"~~d845808d~~"};
1	+ window.__remixManifest={"entry":{"module":"/assets/entry.client-mvZjNKiz.js","imports":["/assets/index-DzNKzXrc.js","/assets/components-Rk0n-9cK.js"],"css":[]},"routes":{"root":{"id":"root","path":"","hasAction":false,"hasLoader":false,"hasClientAction":false,"hasClientLoader":false,"hasErrorBoundary":false,"module":"/assets/root-BWvk5-gF.js","imports":["/assets/index-DzNKzXrc.js","/assets/components-Rk0n-9cK.js"],"css":["/assets/root-DxRwaWiE.css"]},"routes/_index":{"id":"routes/_index","parentId":"root","index":true,"hasAction":false,"hasLoader":false,"hasClientAction":false,"hasClientLoader":false,"hasErrorBoundary":false,"module":"/assets/_index-bFMKlzKf.js","imports":["/assets/index-DzNKzXrc.js"],"css":[]}},"url":"/assets/manifest-89db7c30.js","version":"89db7c30"};

solace_agent_mesh/config_portal/frontend/static/client/index.html CHANGED Viewed

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1"/><link rel="stylesheet" href="/assets/root-DxRwaWiE.css"/><link rel="preconnect" href="https://fonts.googleapis.com"/><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin="anonymous"/><link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&amp;display=swap"/></head><body><p>Loading...</p><link rel="modulepreload" href="/assets/manifest-d845808d.js"/><link rel="modulepreload" href="/assets/entry.client-mvZjNKiz.js"/><link rel="modulepreload" href="/assets/index-DzNKzXrc.js"/><link rel="modulepreload" href="/assets/components-Rk0n-9cK.js"/><link rel="modulepreload" href="/assets/root-BWvk5-gF.js"/><script>window.__remixContext = {"basename":"/","future":{"v3_fetcherPersist":false,"v3_relativeSplatPath":false,"v3_throwAbortReason":false,"v3_routeConfig":false,"v3_singleFetch":false,"v3_lazyRouteDiscovery":false,"unstable_optimizeDeps":false},"isSpaMode":true,"state":{"loaderData":{"root":null,"routes/_index":null},"actionData":null,"errors":null}};</script><script type="module" async="">import "/assets/manifest-d845808d.js";
+<html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1"/><link rel="stylesheet" href="/assets/root-DxRwaWiE.css"/><link rel="preconnect" href="https://fonts.googleapis.com"/><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin="anonymous"/><link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&amp;display=swap"/></head><body><p>Loading...</p><link rel="modulepreload" href="/assets/manifest-89db7c30.js"/><link rel="modulepreload" href="/assets/entry.client-mvZjNKiz.js"/><link rel="modulepreload" href="/assets/index-DzNKzXrc.js"/><link rel="modulepreload" href="/assets/components-Rk0n-9cK.js"/><link rel="modulepreload" href="/assets/root-BWvk5-gF.js"/><script>window.__remixContext = {"basename":"/","future":{"v3_fetcherPersist":false,"v3_relativeSplatPath":false,"v3_throwAbortReason":false,"v3_routeConfig":false,"v3_singleFetch":false,"v3_lazyRouteDiscovery":false,"unstable_optimizeDeps":false},"isSpaMode":true,"state":{"loaderData":{"root":null,"routes/_index":null},"actionData":null,"errors":null}};</script><script type="module" async="">import "/assets/manifest-89db7c30.js";
 import * as route0 from "/assets/root-BWvk5-gF.js";
 window.__remixRouteModules = {"root":route0};

solace_agent_mesh/evaluation/message_organizer.py CHANGED Viewed

@@ -106,16 +106,22 @@ class TaskIdExtractor:
         Extract task ID using multiple strategies in order of preference.
         Returns (parent_task_id, sub_task_id) tuple.
         """
+        if not isinstance(message.payload, dict):
+            return None, None
         strategies = [
-            self._extract_from_payload_metadata,
-            self._extract_from_payload_params,
-            self._extract_from_payload_result,
+            self._extract_from_subtask_delegation,
+            self._extract_from_toplevel_id,
+            self._extract_from_result_object,
             self._extract_from_topic,
         ]
         for strategy in strategies:
             try:
-                task_id, sub_task_id = strategy(message)
+                if strategy.__name__ == "_extract_from_topic":
+                    task_id, sub_task_id = strategy(message)
+                else:
+                    task_id, sub_task_id = strategy(message.payload)
                 if task_id:
                     return task_id, sub_task_id
             except Exception as e:
@@ -124,67 +130,40 @@ class TaskIdExtractor:
         return None, None
-    def _extract_from_payload_metadata(
-        self, message: TaskMessage
+    def _extract_from_subtask_delegation(
+        self, payload: dict
     ) -> Tuple[Optional[str], Optional[str]]:
-        """Strategy 1: Extract from payload metadata (parent-child relationship)."""
-        payload = message.payload
-        if not isinstance(payload, dict):
-            return None, None
+        """Strategy 1: Check for sub-task delegation (agent-to-agent calls)."""
         params = payload.get("params", {})
-        if not isinstance(params, dict):
-            return None, None
-        metadata = params.get("metadata", {})
-        if not isinstance(metadata, dict):
-            return None, None
-        parent_task_id = metadata.get("parentTaskId")
-        sub_task_id = params.get("id")
-        if parent_task_id and sub_task_id:
-            return parent_task_id, sub_task_id
+        if isinstance(params, dict):
+            message_param = params.get("message", {})
+            if isinstance(message_param, dict):
+                metadata = message_param.get("metadata", {})
+                if isinstance(metadata, dict):
+                    parent_task_id = metadata.get("parentTaskId")
+                    sub_task_id = payload.get("id")
+                    if parent_task_id and sub_task_id:
+                        return parent_task_id, sub_task_id
         return None, None
-    def _extract_from_payload_params(
-        self, message: TaskMessage
+    def _extract_from_toplevel_id(
+        self, payload: dict
     ) -> Tuple[Optional[str], Optional[str]]:
-        """Strategy 2: Extract from payload params (direct task ID)."""
-        payload = message.payload
-        if not isinstance(payload, dict):
-            return None, None
-        params = payload.get("params", {})
-        if not isinstance(params, dict):
-            return None, None
-        task_id = params.get("id")
-        if task_id and isinstance(task_id, str) and task_id.startswith("task-"):
+        """Strategy 2: Get the primary task ID from the top-level 'id' field."""
+        task_id = payload.get("id")
+        if task_id and isinstance(task_id, str):
             return task_id, None
         return None, None
-    def _extract_from_payload_result(
-        self, message: TaskMessage
+    def _extract_from_result_object(
+        self, payload: dict
     ) -> Tuple[Optional[str], Optional[str]]:
-        """Strategy 3: Extract from payload result."""
-        payload = message.payload
-        if not isinstance(payload, dict):
-            return None, None
+        """Strategy 3: Fallback for status updates which also have taskId nested."""
         result = payload.get("result", {})
-        if not isinstance(result, dict):
-            return None, None
-        task_id = result.get("id")
-        if task_id and isinstance(task_id, str) and task_id.startswith("task-"):
-            return task_id, None
+        if isinstance(result, dict):
+            task_id = result.get("taskId")
+            if task_id and isinstance(task_id, str):
+                return task_id, None
         return None, None
     def _extract_from_topic(
@@ -197,7 +176,7 @@ class TaskIdExtractor:
         # Extract the last part of the topic path
         task_id = topic.split("/")[-1]
-        if task_id.startswith("task-"):
+        if task_id.startswith("gdk-task-"):
             return task_id, None
         return None, None

solace_agent_mesh/evaluation/run.py CHANGED Viewed

@@ -33,7 +33,7 @@ class EvaluationConfig:
     """Centralized configuration with validation and defaults."""
     # Constants
-    DEFAULT_STARTUP_WAIT_TIME = 20
+    DEFAULT_STARTUP_WAIT_TIME = 60
     DEFAULT_TEST_TIMEOUT = 60
     def __init__(self, config_data: Dict[str, Any]):
@@ -108,13 +108,34 @@ class ProcessManager:
             command, stdout=sys.stdout, stderr=sys.stderr, cwd=project_root
         )
-        print(
-            f"Waiting for server to start... ({self.config.DEFAULT_STARTUP_WAIT_TIME} seconds)"
-        )
-        time.sleep(self.config.DEFAULT_STARTUP_WAIT_TIME)
+        print("Waiting for server to become healthy...")
+        self._wait_for_server_ready()
         return self.process, self.namespace
+    def _wait_for_server_ready(self):
+        """Poll the health endpoint until the server is ready."""
+        start_time = time.time()
+        health_url = f"{self.config.API_BASE_URL.replace('/api/v2', '')}/health"
+        while time.time() - start_time < self.config.DEFAULT_STARTUP_WAIT_TIME:
+            try:
+                response = requests.get(health_url)
+                if response.status_code == 200:
+                    print("Server is healthy.")
+                    time.sleep(1)  # Wait an extra second as requested
+                    return
+            except requests.ConnectionError:
+                # Server is not yet available, wait and retry
+                time.sleep(1)
+            except Exception as e:
+                print(f"An unexpected error occurred during health check: {e}")
+                time.sleep(1)
+        raise RuntimeError(
+            f"Server did not become healthy within {self.config.DEFAULT_STARTUP_WAIT_TIME} seconds."
+        )
     def stop_services(self, subscriber: Optional[Subscriber] = None):
         """Clean up running processes."""
         if subscriber:

solace_agent_mesh/evaluation/subscriber.py CHANGED Viewed

@@ -120,9 +120,14 @@ class SubscriptionConfig:
             "/gateway/response/",
         ]
     )
+    blocked_topic_infixes: List[str] = field(
+        default_factory=lambda: [
+            "/discovery/"
+        ]
+    )
     message_timeout: int = 1000
     filter_non_final_status: bool = True
-    remove_config_keys: bool = True
+    remove_config_keys: bool = False
     def __post_init__(self):
         """Validate subscription configuration."""
@@ -142,7 +147,10 @@ class SubscriptionConfig:
     def is_topic_allowed(self, topic: str) -> bool:
         """Check if a topic is allowed based on configured infixes."""
-        return any(infix in topic for infix in self.allowed_topic_infixes)
+        # return any(infix in topic for infix in self.allowed_topic_infixes)
+        if any(infix in topic for infix in self.blocked_topic_infixes):
+            return False
+        return True
 @dataclass
@@ -300,20 +308,37 @@ class MessageProcessor:
         if not self.config.filter_non_final_status:
             return False
-        if "/gateway/status/" not in topic:
-            return False
         try:
-            if isinstance(payload, dict):
-                result = payload.get("result", {})
-                if isinstance(result, dict):
-                    # Filter out non-final status messages
-                    return not result.get("final", True)
+            # Filter only for llm_invocation
+            if self._find_part_type(payload, "llm_invocation"):
+                return True
+            # Filter only for llm_response
+            if self._find_part_type(payload, "llm_response"):
+                return True
+            # Filter out agent progress update messages
+            if self._find_part_type(payload, "agent_progress_update"):
+                return True
         except Exception:
             pass
         return False
+    def _find_part_type(self, data: Any, type_to_find: str) -> bool:
+        """Recursively search for a part with a specific type."""
+        if isinstance(data, dict):
+            if data.get("type") == type_to_find:
+                return True
+            for key, value in data.items():
+                if self._find_part_type(value, type_to_find):
+                    return True
+        elif isinstance(data, list):
+            for item in data:
+                if self._find_part_type(item, type_to_find):
+                    return True
+        return False
     def _determine_message_type(self, topic: str) -> str:
         """Determine the type of message based on topic."""
         if "/agent/request/" in topic:

solace_agent_mesh/evaluation/summary_builder.py CHANGED Viewed

@@ -57,7 +57,7 @@ class RunSummary:
     query: str = ""
     target_agent: str = ""
     namespace: str = ""
-    session_id: str = ""
+    context_id: str = ""
     final_status: str = ""
     final_message: str = ""
     time_metrics: TimeMetrics = field(default_factory=TimeMetrics)
@@ -74,7 +74,7 @@ class RunSummary:
             "query": self.query,
             "target_agent": self.target_agent,
             "namespace": self.namespace,
-            "session_id": self.session_id,
+            "context_id": self.context_id,
             "final_status": self.final_status,
             "final_message": self.final_message,
             "start_time": self.time_metrics.start_time,
@@ -105,9 +105,6 @@ class RunSummary:
                     "artifact_name": art.artifact_name,
                     "directory": art.directory,
                     "versions": art.versions,
-                    "created_by_tool": art.created_by_tool,
-                    "created_by_call_id": art.created_by_call_id,
-                    "creation_timestamp": art.creation_timestamp,
                 }
                 for art in self.output_artifacts
             ],
@@ -311,12 +308,13 @@ class MessageProcessor:
         return None, None
     @staticmethod
-    def extract_session_id(first_message: Dict[str, Any]) -> Optional[str]:
-        """Extract session ID from the first message."""
+    def extract_context_id(first_message: Dict[str, Any]) -> Optional[str]:
+        """Extract context ID from the first message."""
         try:
             payload = first_message.get("payload", {})
             params = payload.get("params", {})
-            return params.get("sessionId")
+            message = params.get("message", {})
+            return message.get("contextId")
         except KeyError:
             return None
@@ -357,27 +355,22 @@ class MessageProcessor:
                 result = payload.get("result", {})
                 status = result.get("status", {})
                 message_data = status.get("message", {})
-                metadata = message_data.get("metadata", {})
-                data = metadata.get("data", {})
-                content = data.get("content", {})
-                parts = content.get("parts", [])
+                parts = message_data.get("parts", [])
                 for part in parts:
-                    function_call = part.get("function_call", {})
-                    if not function_call:
-                        continue
-                    call_id = function_call.get("id")
-                    if call_id and call_id not in processed_tool_calls:
-                        tool_call = ToolCall(
-                            call_id=call_id,
-                            agent=result.get("metadata", {}).get("agent_name", ""),
-                            tool_name=function_call.get("name", ""),
-                            arguments=function_call.get("args", {}),
-                            timestamp=status.get("timestamp", ""),
-                        )
-                        tool_calls.append(tool_call)
-                        processed_tool_calls.add(call_id)
+                    data = part.get("data", {})
+                    if data.get("type") == "tool_invocation_start":
+                        call_id = data.get("function_call_id")
+                        if call_id and call_id not in processed_tool_calls:
+                            tool_call = ToolCall(
+                                call_id=call_id,
+                                agent=result.get("metadata", {}).get("agent_name", ""),
+                                tool_name=data.get("tool_name", ""),
+                                arguments=data.get("tool_args", {}),
+                                timestamp=status.get("timestamp", ""),
+                            )
+                            tool_calls.append(tool_call)
+                            processed_tool_calls.add(call_id)
             except (KeyError, IndexError):
                 continue
@@ -392,11 +385,11 @@ class ArtifactService:
         self.base_path = base_path
         self.user_identity = user_identity
-    def get_artifact_info(self, namespace: str, session_id: str) -> List[ArtifactInfo]:
+    def get_artifact_info(self, namespace: str, context_id: str) -> List[ArtifactInfo]:
         """Retrieve information about artifacts from the session directory."""
         artifact_info = []
         session_dir = os.path.join(
-            self.base_path, namespace, self.user_identity, session_id
+            self.base_path, namespace, self.user_identity, context_id
         )
         if not os.path.isdir(session_dir):
@@ -652,9 +645,9 @@ class SummaryBuilder:
                 "Could not find target agent and namespace in the first message."
             )
-        session_id = self.message_processor.extract_session_id(first_message)
-        if session_id:
-            summary.session_id = session_id
+        context_id = self.message_processor.extract_context_id(first_message)
+        if context_id:
+            summary.context_id = context_id
         # Extract final status information
         final_status, final_message = self.message_processor.extract_final_status_info(
@@ -699,7 +692,7 @@ class SummaryBuilder:
     def _add_artifact_information(self, summary: RunSummary, test_case: Dict[str, Any]):
         """Add artifact information if configuration is available."""
-        if not summary.namespace or not summary.session_id:
+        if not summary.namespace or not summary.context_id:
             return
         try:
@@ -710,7 +703,7 @@ class SummaryBuilder:
             # Get and categorize artifacts
             all_artifacts = self.artifact_service.get_artifact_info(
-                summary.namespace, summary.session_id
+                summary.namespace, summary.context_id
             )
             input_artifacts, output_artifacts = (

solace-agent-mesh 1.1.0__py3-none-any.whl → 1.3.0__py3-none-any.whl

Potentially problematic release.

solace-agent-mesh 1.1.0py3-none-any.whl → 1.3.0py3-none-any.whl