solace-agent-mesh 0.1.2__py3-none-any.whl → 0.2.0__py3-none-any.whl

solace_agent_mesh/cli/commands/plugin/add.py

@@ -37,7 +37,9 @@ def add_command(name: str, installer: str = None, from_url=None, add_all=False):
                 f"Module '{name}' not found. Attempting to install '{install_name}' using {installer}..."
             )
             if installer == "pip":
-                subprocess.check_call(["pip", "install", install_name])
+                subprocess.check_call(["pip3", "install", install_name])
+            elif installer == "uv":
+                subprocess.check_call(["uv", "pip", "install", install_name])
             elif installer == "poetry":
                 subprocess.check_call(["poetry", "add", install_name])
             elif installer == "conda":

solace_agent_mesh/cli/commands/plugin/build.py

@@ -11,7 +11,7 @@ def build_command():
     subprocess.check_call(["python", "-m", "build"])
 
 
-def get_all_plugin_gateway_interfaces(config, abort): 
+def get_all_plugin_gateway_interfaces(config, abort, return_plugin_config=False):
     plugins = config.get("plugins", [])
     gateway_interfaces = {}
 
@@ -27,6 +27,8 @@ def get_all_plugin_gateway_interfaces(config, abort):
             if not os.path.exists(interface_path):
                 continue
 
+            interface_gateway_configs = (Config.load_config(os.path.join(plugin_path, Config.user_plugin_config_file)) or {}).get("solace_agent_mesh_plugin", {}).get("interface_gateway_configs", {})
+            interface_gateway_config = None
             # Ensuring flow and default pair exist
             interface_pairs = {}
             for file in os.listdir(interface_path):
@@ -44,7 +46,14 @@ def get_all_plugin_gateway_interfaces(config, abort):
             
             for name, files in interface_pairs.items():
                 if len(files) == 2:
-                    gateway_interfaces[name] = interface_path
+                    if return_plugin_config:
+                        for interface_name, interface_config in interface_gateway_configs.items():
+                            if interface_name == name.replace("-", "_"):
+                                interface_gateway_config = interface_config
+                                break
+                        gateway_interfaces[name] = (interface_path, interface_gateway_config)
+                    else:
+                        gateway_interfaces[name] = interface_path
         
     return gateway_interfaces
 

solace_agent_mesh/cli/commands/plugin/plugin.py

@@ -44,6 +44,7 @@ def plugin_command(plugin):
     @click.argument("name")
     @click.option("--add-all", is_flag=True, help="Added the plugin with default of loading all exported files from the plugin")
     @click.option("--pip", is_flag=True, help="Install with pip.")
+    @click.option("--uv", is_flag=True, help="Install with uv pip.")
     @click.option("--poetry", is_flag=True, help="Install with poetry.")
     @click.option("--conda", is_flag=True, help="Install with conda.")
     @click.option(
@@ -51,7 +52,7 @@ def plugin_command(plugin):
         "--from-url",
         help="Install the plugin from a the given URL instead of the given name. (URL can be a file path or a git URL)",
     )
-    def add(name, add_all, pip, poetry, conda, from_url):
+    def add(name, add_all, uv, pip, poetry, conda, from_url):
         """
         Add a new plugin to solace-agent-mesh config yaml.
         Optional install the module if not found.
@@ -59,10 +60,16 @@ def plugin_command(plugin):
         Only one installation method can be selected at a time.
         """
         # Only one option can be true at a time
-        if sum([pip, poetry, conda]) > 1:
+        if sum([uv, pip, poetry, conda]) > 1:
             log_error("Only one installation method can be selected.")
             return 1
-        installer = "pip" if pip else "poetry" if poetry else "conda" if conda else None
+        installer = (
+            "uv" if uv 
+            else "pip" if pip 
+            else "poetry" if poetry 
+            else "conda" if conda 
+            else None
+        )
         return add_command(name, installer, from_url, add_all)
 
     @plugin.command()
@@ -73,6 +80,12 @@ def plugin_command(plugin):
         is_flag=True,
         help="Removes the plugin module using pip",
     )
+    @click.option(
+        "--uv-uninstall",
+        default=False,
+        is_flag=True,
+        help="Removes the plugin module using uv.",
+    )
     @click.option(
         "--poetry-uninstall",
         default=False,
@@ -85,7 +98,7 @@ def plugin_command(plugin):
         is_flag=True,
         help="Removes the plugin module using conda",
     )
-    def remove(name, pip_uninstall, poetry_uninstall, conda_uninstall):
+    def remove(name, pip_uninstall, uv_uninstall, poetry_uninstall, conda_uninstall):
         """
         Remove a plugin by removing it from solace-agent-mesh config yaml
         Optionally uninstall the module.
@@ -93,13 +106,15 @@ def plugin_command(plugin):
         Only one uninstallation method can be selected at a time.
         """
         # Only one option can be true at a time
-        if sum([pip_uninstall, poetry_uninstall, conda_uninstall]) > 1:
+        if sum([pip_uninstall, uv_uninstall, poetry_uninstall, conda_uninstall]) > 1:
             log_error("Only one uninstallation method can be selected.")
             return 1
 
         installer = (
             "pip"
             if pip_uninstall
+            else "uv"
+            if uv_uninstall
             else "poetry"
             if poetry_uninstall
             else "conda"

solace_agent_mesh/cli/commands/plugin/remove.py

@@ -48,7 +48,9 @@ def remove_command(name: str, installer: str = None):
         click.echo(f"Attempting to uninstall module '{name}' using {installer}...")
         try:
             if installer == "pip":
-                subprocess.check_call(["pip", "uninstall", "-y", name])
+                subprocess.check_call(["pip3", "uninstall", "-y", name])
+            elif installer == "uv":
+                subprocess.check_call(["uv", "pip", "uninstall", "-y", name])
             elif installer == "poetry":
                 subprocess.check_call(["poetry", "remove", name])
             elif installer == "conda":

solace_agent_mesh/cli/config.py

@@ -79,3 +79,7 @@ class Config:
         if os.path.exists(path):
             with open(path, "r", encoding="utf-8") as f:
                 return yaml.load(f)
+            
+    @staticmethod
+    def get_yaml_parser():
+        return yaml.load

solace_agent_mesh/cli/utils.py

@@ -42,7 +42,7 @@ def literal_format_template(template, literals):
     return template
 
 
-def load_template(name, format_pair={}):
+def load_template(name, format_pair={}, parser=None):
     """Load a template file and format it with the given key-value pairs."""
     # Construct the path to the template file using a relative path
     template_file = os.path.normpath(
@@ -53,7 +53,10 @@ def load_template(name, format_pair={}):
         return None
 
     with open(template_file, "r", encoding="utf-8") as f:
-        file = f.read()
+        if parser:
+            file = parser(f)
+        else:
+            file = f.read()
 
     file = literal_format_template(file, format_pair)
 
@@ -75,6 +78,8 @@ def get_display_path(path):
 def log_error(message):
     click.echo(click.style(message, fg="red"), err=True)
 
+def log_warning(message):
+    click.echo(click.style(message, fg="yellow"), err=False)
 
 def log_link(message):
     click.echo(click.style(message, fg="blue"), err=False)

solace_agent_mesh/common/action_response.py

@@ -1,5 +1,7 @@
 """This is the definition of responses for the actions of the system."""
 
+from typing import Optional
+
 
 class RagMatch:
 
@@ -212,6 +214,8 @@ class ActionResponse:
         self._is_async: bool = is_async
         # async_response_id - unique identifier for correlating async responses
         self._async_response_id: str = async_response_id
+        # originator - the component that originated the action request
+        self._originator: Optional[str] = None
 
     @property
     def message(self) -> any:
@@ -269,6 +273,10 @@ class ActionResponse:
     def action_params(self) -> dict:
         return self._action_params
 
+    @property
+    def originator(self) -> dict:
+        return self._originator
+
     @action_list_id.setter
     def action_list_id(self, action_list_id: str):
         self._action_list_id = action_list_id
@@ -285,6 +293,10 @@ class ActionResponse:
     def action_params(self, action_params: dict):
         self._action_params = action_params
 
+    @originator.setter
+    def originator(self, originator: str):
+        self._originator = originator
+
     @property
     def is_async(self) -> bool:
         return self._is_async
@@ -324,4 +336,5 @@ class ActionResponse:
         response["action_idx"] = self._action_idx
         response["action_name"] = self._action_name
         response["action_params"] = self._action_params
+        response["originator"] = self._originator
         return response

solace_agent_mesh/common/constants.py

@@ -1,3 +1,15 @@
 SOLACE_AGENT_MESH_SYSTEM_SESSION_ID = "solace_agent_mesh_system_session_id"
 
 DEFAULT_IDENTITY_KEY_FIELD = "identity"
+
+ORCHESTRATOR_COMPONENT_NAME = "orchestrator"
+
+HISTORY_MEMORY_ROLE = "history"
+
+HISTORY_ACTION_ROLE = "tool_call"
+
+HISTORY_USER_ROLE = "user"
+
+HISTORY_SYSTEM_ROLE = "system"
+
+HISTORY_ASSISTANT_ROLE = "assistant"

solace_agent_mesh/common/postgres_database.py

@@ -56,11 +56,17 @@ class PostgreSQLDatabase:
 
         return cursor
 
-def get_db_for_action(action_obj):
-    sql_host = action_obj.get_config("sql_host")
-    sql_user = action_obj.get_config("sql_user")
-    sql_password = action_obj.get_config("sql_password")
-    sql_database = action_obj.get_config("sql_database")
+def get_db_for_action(action_obj, sql_params=None):
+    if sql_params:
+        sql_host = sql_params.get("sql_host")
+        sql_user = sql_params.get("sql_user")
+        sql_password = sql_params.get("sql_password")
+        sql_database = sql_params.get("sql_database")
+    else:
+        sql_host = action_obj.get_config("sql_host")
+        sql_user = action_obj.get_config("sql_user")
+        sql_password = action_obj.get_config("sql_password")
+        sql_database = action_obj.get_config("sql_database")
     sql_db = None
 
     if sql_host and sql_user and sql_password and sql_database:

solace_agent_mesh/common/utils.py

@@ -139,17 +139,22 @@ def parse_file_content(file_xml: str) -> dict:
     """
     Parse the xml tags in the content and return a dictionary of the content.
     """
-    ignore_content_tags = ["data"]
-    file_dict = xml_to_dict(file_xml, ignore_content_tags)
-    dict_keys = list(file_dict.keys())
-    top_key = [key for key in dict_keys if key not in ignore_content_tags][0]
-
-    return {
-        "data": file_dict.get("data", {}).get("data", ""),
-        "url": file_dict.get(top_key, {}).get("url", {}).get("url", ""),
-        "mime_type": file_dict.get(top_key, {}).get("mime_type", ""),
-        "name": file_dict.get(top_key, {}).get("name", ""),
-    }
+    try:
+        ignore_content_tags = ["data"]
+        file_dict = xml_to_dict(file_xml, ignore_content_tags)
+        dict_keys = list(file_dict.keys())
+        top_key = [key for key in dict_keys if key not in ignore_content_tags][0]
+
+        return {
+            "data": file_dict.get("data", {}).get("data", ""),
+            "url": file_dict.get(top_key, {}).get("url", {}).get("url", ""),
+            "mime_type": file_dict.get(top_key, {}).get("mime_type", ""),
+            "name": file_dict.get(top_key, {}).get("name", ""),
+        }
+    except Exception as e:
+        result = {"data": "", "url": "", "mime_type": "", "name": ""}
+        log.error("Error parsing file content: %s", e)
+        return result
 
 
 def parse_llm_output(llm_output: str) -> dict:

solace_agent_mesh/configs/monitor_stim_and_errors_to_slack.yaml

@@ -99,6 +99,9 @@ flows:
           - type: copy
             source_value: '0'
             dest_expression: user_data.output:payload.action_idx
+          - type: copy
+            source_value: 'stim_and_error_monitor'
+            dest_expression: user_data.output:payload.originator
           - type: copy
             source_expression: template:${SOLACE_AGENT_MESH_NAMESPACE}solace-agent-mesh/v1/actionRequest/monitor/x/slack/post_message/{{text://input.payload:correlation_id}}
             dest_expression: user_data.output:topic

solace_agent_mesh/configs/service_embedding.yaml

@@ -53,7 +53,7 @@ flows:
           source_expression: input.payload
 
       - component_name: embedding_service_model
-        num_instances: 1
+        num_instances: ${EMBEDDING_SERVICE_MODEL_NUM_INSTANCES, 1}
         component_module: litellm_embeddings
         component_config:
           load_balancer:

solace_agent_mesh/configs/service_llm.yaml

@@ -81,7 +81,7 @@ flows:
           source_expression: input.payload
 
       - component_name: llm_service_planning
-        num_instances: 1
+        num_instances: ${LLM_SERVICE_PLANNING_MODEL_NUM_INSTANCES, 1}
         component_module: litellm_chat_model
         component_config:
           <<: *llm_config

solace_agent_mesh/gateway/components/gateway_base.py

@@ -3,15 +3,17 @@ from solace_ai_connector.common.log import log
 from ...services.history_service import HistoryService
 from ..identity.identity_provider import IdentityProvider
 from ...common.constants import DEFAULT_IDENTITY_KEY_FIELD
+from ...orchestrator.orchestrator_prompt import LONG_TERM_MEMORY_PROMPT
 
 
 class GatewayBase(ComponentBase):
     def __init__(self, info, **kwargs):
         super().__init__(info, **kwargs)
         self.gateway_id = self.get_config("gateway_id", "default-change-me")
+        self.system_purpose_prompt_suffix = ""
         self.history_instance = self._initialize_history()
 
-    def _initialize_history(self):
+    def _initialize_history(self) -> HistoryService:
         self.use_history = self.get_config("retain_history", True)
 
         if not self.use_history:
@@ -19,6 +21,9 @@ class GatewayBase(ComponentBase):
 
         history_config = self.get_config("history_config", {})
 
+        if history_config.get("enable_long_term_memory", False):
+            self.system_purpose_prompt_suffix = LONG_TERM_MEMORY_PROMPT
+
         try:
             return HistoryService(
                 history_config, identifier=self.gateway_id + "_history"
@@ -27,6 +32,7 @@ class GatewayBase(ComponentBase):
             log.error("Failed to load history class: %s", e)
             raise
 
+
     def _initialize_identity_component(self):
         identity_config = self.get_config("identity", {})
         identity_key_field = self.get_config("identity_key_field", DEFAULT_IDENTITY_KEY_FIELD)

solace_agent_mesh/gateway/components/gateway_input.py

@@ -6,7 +6,7 @@ from uuid import uuid4
 from solace_ai_connector.common.message import Message
 from solace_ai_connector.common.log import log
 from ...services.file_service import FileService
-from ...common.constants import DEFAULT_IDENTITY_KEY_FIELD
+from ...common.constants import DEFAULT_IDENTITY_KEY_FIELD, HISTORY_USER_ROLE
 from .gateway_base import GatewayBase
 
 info = {
@@ -130,7 +130,7 @@ class GatewayInput(GatewayBase):
 
     def __init__(self, **kwargs):
         super().__init__(info, **kwargs)
-        self.system_purpose = self.get_config("system_purpose", DEFAULT_SYSTEM_PURPOSE)
+        self.system_purpose = self.get_config("system_purpose", DEFAULT_SYSTEM_PURPOSE) + self.system_purpose_prompt_suffix
         self.interaction_type = self.get_config(
             "interaction_type", DEFAULT_INTERACTION_TYPE
         )
@@ -209,17 +209,20 @@ class GatewayInput(GatewayBase):
 
             copied_data["history"] = []
             if self.use_history:
+                other_history_props = {
+                    "identity": identity_value,
+                }
                 prompt = data.get("text", "")
-                self.history_instance.store_history(session_id, "user", prompt)
+                self.history_instance.store_history(session_id, HISTORY_USER_ROLE, prompt, other_history_props)
 
                 for file in attached_files:
-                    self.history_instance.store_file(session_id, file)
+                    self.history_instance.store_file(session_id, file )
 
                 # retrieve all files for the session
                 available_files = self.history_instance.get_files(session_id)
 
                 # Add history to the data
-                copied_data["history"] = self.history_instance.get_history(session_id)
+                copied_data["history"] = self.history_instance.get_history(session_id, other_history_props)
 
             available_files = json.dumps(available_files)
         except Exception as e:

solace_agent_mesh/gateway/components/gateway_output.py

@@ -5,7 +5,7 @@ from solace_ai_connector.common.log import log
 from .gateway_base import GatewayBase
 from ...services.file_service import FileService
 from ...common.utils import files_to_block_text
-
+from ...common.constants import HISTORY_ASSISTANT_ROLE
 
 info = {
     "class_name": "GatewayOutput",
@@ -170,6 +170,7 @@ class GatewayOutput(GatewayBase):
         file_service = FileService()
         user_properties = message.get_user_properties()
         session_id = user_properties.get("session_id")
+        identity_value = user_properties.get("identity")
         files = data.get("files", [])
 
         # Extract the interface queue ID
@@ -181,6 +182,10 @@ class GatewayOutput(GatewayBase):
         )
 
         if self.use_history and session_id:
+            other_history_props = {
+                "identity": identity_value,
+            }
+
             topic = message.get_topic()
             content = data.get("text") or ""
 
@@ -193,14 +198,18 @@ class GatewayOutput(GatewayBase):
                 and data.get("last_chunk")
                 and "text" in data
             ):
+                actions_called = user_properties.get("actions_called", [])
+                if actions_called:
+                    self.history_instance.store_actions(session_id, actions_called)
+                
                 if content:
                     self.history_instance.store_history(
-                        session_id, "assistant", content
+                        session_id, HISTORY_ASSISTANT_ROLE, content, other_history_props
                     )
 
             for file in files:
                 self.history_instance.store_history(
-                    session_id, "assistant", f'\n[Returned file: {{name: {file.get("name")}, url: {file.get("url")}}}]\n'
+                    session_id, HISTORY_ASSISTANT_ROLE, f'\n[Returned file: {{name: {file.get("name")}, url: {file.get("url")}}}]\n', other_history_props
                 )
                 self.history_instance.store_file(session_id, file)
 

solace_agent_mesh/orchestrator/action_manager.py

@@ -15,6 +15,7 @@ from datetime import datetime
 
 from solace_ai_connector.common.log import log
 from ..common.utils import format_agent_response
+from ..common.constants import ORCHESTRATOR_COMPONENT_NAME
 
 ACTION_REQUEST_TIMEOUT = 180
 
@@ -78,6 +79,17 @@ class ActionManager:
     def add_action_response(self, action_response_obj, response_text_and_files):
         """Add an action response to the list"""
         action_list_id = action_response_obj.get("action_list_id")
+
+        originator = action_response_obj.get("originator", "unknown")
+        # Ignore responses for actions that are not originated by the orchestrator
+        if originator != ORCHESTRATOR_COMPONENT_NAME:
+            log.debug(
+                "Ignoring response for action not originated by the orchestrator. "
+                "originator: %s   action_list_id: %s", 
+                originator, action_list_id
+            )
+            return None
+            
         with self.lock:
             action_list = self.action_requests.get(action_list_id)
             if action_list is None:
@@ -222,4 +234,4 @@ class ActionRequestList:
 
     def format_ai_response(self):
         """Format the action response for the AI"""
-        return format_agent_response(self.actions)
+        return format_agent_response(self.actions)

solace_agent_mesh/orchestrator/components/orchestrator_stimulus_processor_component.py

@@ -14,6 +14,7 @@ import yaml
 from solace_ai_connector.common.log import log
 from solace_ai_connector.common.message import Message
 
+from ...common.constants import ORCHESTRATOR_COMPONENT_NAME, HISTORY_MEMORY_ROLE
 from ...services.llm_service.components.llm_request_component import LLMRequestComponent, info as base_info
 from ...services.middleware_service.middleware_service import MiddlewareService
 from ...services.file_service import FileService
@@ -127,6 +128,18 @@ class OrchestratorStimulusProcessorComponent(LLMRequestComponent):
 
         user_properties = message.get_user_properties()
         user_properties['timestamp_end'] = time()
+
+        actions_called = []
+        if results:
+            for result in results:
+                if result.get("payload", {}).get("action_name"):
+                    actions_called.append({
+                        "agent_name": result.get("payload", {}).get("agent_name"),
+                        "action_name": result.get("payload", {}).get("action_name"),
+                        "action_params": result.get("payload", {}).get("action_params"),
+                    })
+        user_properties['actions_called'] = actions_called
+
         message.set_user_properties(user_properties)
 
         return results
@@ -184,7 +197,7 @@ class OrchestratorStimulusProcessorComponent(LLMRequestComponent):
             message.set_user_properties(user_properties)
 
         input_data = self.get_user_input(chat_text)
-        user_info = payload.get("user_info", {"email": "unknown"})
+        user_info = user_properties.get("user_info", {"email": "unknown"})
 
         agent_state_yaml, examples = self.get_agents_yaml(user_properties)
         full_input = {
@@ -205,7 +218,7 @@ class OrchestratorStimulusProcessorComponent(LLMRequestComponent):
         }
 
         # Get the prompts
-        gateway_history = self.get_gateway_history(data)
+        gateway_history, memory_history = self.get_gateway_history(data)
         system_prompt = SystemPrompt(full_input, examples)
         if action_response_reinvoke:
             user_prompt = ActionResponsePrompt(
@@ -216,6 +229,9 @@ class OrchestratorStimulusProcessorComponent(LLMRequestComponent):
             user_prompt = UserStimulusPrompt(
                 full_input, gateway_history, errors, has_files
             )
+            if memory_history:
+                self.history.store_history(stimulus_uuid, "system", memory_history)
+
 
         # Store the user prompt in the history
         self.history.store_history(stimulus_uuid, "user", user_prompt)
@@ -374,6 +390,9 @@ class OrchestratorStimulusProcessorComponent(LLMRequestComponent):
 
     def get_gateway_history(self, data):
         gateway_history = data.get("history", [])
+        memory_history = None
+        if gateway_history and gateway_history[0].get("role") == HISTORY_MEMORY_ROLE:
+            memory_history =gateway_history[0].get("content")
         # Returning the history from the last user message
         first_user_idx = None
         last_user_idx = None
@@ -384,13 +403,13 @@ class OrchestratorStimulusProcessorComponent(LLMRequestComponent):
                 last_user_idx = idx
 
         if first_user_idx is None:
-            return []  # No user query found
+            return [], memory_history  # No user query found
 
         if not last_user_idx > first_user_idx:
             # Latest user message is already handled by orchestator history
-            return []
+            return [], memory_history
 
-        return gateway_history[first_user_idx:last_user_idx]
+        return gateway_history[first_user_idx:last_user_idx], memory_history
 
     def get_user_input(self, chat_text):
 
@@ -458,6 +477,7 @@ class OrchestratorStimulusProcessorComponent(LLMRequestComponent):
                             "action_name": action_name,
                             "action_params": action_params,
                             "action_idx": action_idx,
+                            "originator": ORCHESTRATOR_COMPONENT_NAME,
                         },
                         "topic": f"{os.getenv('SOLACE_AGENT_MESH_NAMESPACE')}solace-agent-mesh/v1/actionRequest/orchestrator/agent/{agent_name}/{action_name}",
                     }