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

solace_agent_mesh/cli/commands/plugin/build.py

@@ -2,7 +2,12 @@ import subprocess
 import os
 import click
 
-from cli.utils import log_error, apply_document_parsers, load_plugin
+from cli.utils import (
+    log_error,
+    apply_document_parsers,
+    load_plugin,
+    get_formatted_names,
+)
 from cli.config import Config
 
 
@@ -27,12 +32,21 @@ def get_all_plugin_gateway_interfaces(config, abort, return_plugin_config=False)
             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_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):
-                if file.endswith("-flows.yaml") :
+                if file.endswith("-flows.yaml"):
                     name = file.split("-flows.yaml")[0]
                     if name not in interface_pairs:
                         interface_pairs[name] = []
@@ -43,22 +57,35 @@ def get_all_plugin_gateway_interfaces(config, abort, return_plugin_config=False)
                     if name not in interface_pairs:
                         interface_pairs[name] = []
                     interface_pairs[name].append(file)
-            
+
             for name, files in interface_pairs.items():
                 if len(files) == 2:
                     if return_plugin_config:
-                        for interface_name, interface_config in interface_gateway_configs.items():
+                        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)
+                        gateway_interfaces[name] = (
+                            interface_path,
+                            interface_gateway_config,
+                        )
                     else:
                         gateway_interfaces[name] = interface_path
-        
+
     return gateway_interfaces
 
 
-def build_plugins(config, build_config_dir, abort, parsers, plugin_gateway_interfaces, build_specific_gateway):
+def build_plugins(
+    config,
+    build_config_dir,
+    abort,
+    parsers,
+    plugin_gateway_interfaces,
+    build_specific_gateway,
+):
     plugins = config.get("plugins", [])
     plugins_overwrite_dir = os.path.join(build_config_dir, "..", "overwrites")
 
@@ -70,7 +97,9 @@ def build_plugins(config, build_config_dir, abort, parsers, plugin_gateway_inter
         name = plugin.get("name")
         load_unspecified_files = plugin.get("load_unspecified_files", True)
         load = plugin.get("load", {})
-        agents_to_load = [agent.replace("-", "_") for agent in (load.get("agents") or [])]
+        agents_to_load = [
+            agent.replace("-", "_") for agent in (load.get("agents") or [])
+        ]
         gateways_to_load = load.get("gateways") or []
         overwrites_to_load = load.get("overwrites") or []
 
@@ -130,6 +159,14 @@ def build_plugins(config, build_config_dir, abort, parsers, plugin_gateway_inter
                     agent_config_content = apply_document_parsers(
                         agent_config_content, parsers, meta
                     )
+                    # Perform name substitutions
+                    base_agent_name = agent_config[:-5]  # Remove .yaml
+                    name_cases = get_formatted_names(base_agent_name)
+                    for case, val in name_cases.items():
+                        agent_config_content = agent_config_content.replace(
+                            f"{{{{{case}}}}}", val
+                        )
+
                     # Write agent configuration to build directory
                     agent_build_path = os.path.join(
                         build_config_dir, "agent_" + agent_config
@@ -165,7 +202,12 @@ def build_plugins(config, build_config_dir, abort, parsers, plugin_gateway_inter
             for gateway in gateway_subdirs:
                 if load_unspecified_files or gateway in gateway_dirs:
                     build_specific_gateway(
-                        build_config_dir, abort, parsers, gateway_config_path, gateway, plugin_gateway_interfaces
+                        build_config_dir,
+                        abort,
+                        parsers,
+                        gateway_config_path,
+                        gateway,
+                        plugin_gateway_interfaces,
                     )
 
         ####################

solace_agent_mesh/cli/commands/plugin/create.py

@@ -8,7 +8,7 @@ from cli.utils import log_error, ask_question
 
 DEFAULT_DESCRIPTION = "A solace-agent-mesh plugin project."
 DEFAULT_AUTHOR = "Author Name"
-EMPTY_FILE_MSG = "THIS WILL IS ONLY HERE TO PREVENT GIT FROM IGNORING THIS DIRECTORY"
+EMPTY_FILE_MSG = ""
 
 def create_command(
     path: str, description: str = None, author: str = None, skip: bool = False
@@ -87,10 +87,10 @@ def create_command(
         with open(os.path.join(py_path, "__init__.py"), "w", encoding="utf-8") as f:
             f.write("")
 
-    with open(os.path.join("configs", "__TEMPLATES_WILL_BE_HERE__"), "w", encoding="utf-8") as f:
+    with open(os.path.join("configs", ".gitkeep"), "w", encoding="utf-8") as f:
         f.write(EMPTY_FILE_MSG)
 
-    with open(os.path.join("interfaces", "__INTERFACES_WILL_BE_HERE__"), "w", encoding="utf-8") as f:
+    with open(os.path.join("interfaces", ".gitkeep"), "w", encoding="utf-8") as f:
         f.write(EMPTY_FILE_MSG)
 
     with open(os.path.join("src", "__init__.py"), "w", encoding="utf-8") as f:

solace_agent_mesh/cli/commands/run.py

@@ -21,7 +21,7 @@ FILES_TO_EXCLUDE = []
 
 
 def run_command(
-    use_env, config_files, exclude_files, quick_build, ignore_build, force_build
+    use_system_env, config_files, exclude_files, quick_build, ignore_build, force_build
 ):
     """Run the Solace Agent Mesh application."""
 
@@ -34,7 +34,7 @@ def run_command(
 
     click.echo("Running Solace Agent Mesh application")
 
-    if use_env:
+    if not use_system_env:
         try:
             from dotenv import load_dotenv
 

solace_agent_mesh/cli/main.py

@@ -66,11 +66,11 @@ def build(y, no_init):
 
 @cli.command()
 @click.option(
-    "-e",
-    "--use-env",
+    "-u",
+    "--use-system-env",
     default=False,
     is_flag=True,
-    help="Loads the environment variables file defined in the config.",
+    help="Use only system environment variables (ignore environment variables defined in the config).",
 )
 @click.option(
     "-s",
@@ -100,13 +100,13 @@ def build(y, no_init):
     is_flag=True,
     help="Runs the build command first regardless of the build directory. Mutually exclusive with --ignore-build.",
 )
-def run(use_env, files, skip, quick_build, ignore_build, force_build):
+def run(use_system_env, files, skip, quick_build, ignore_build, force_build):
     """Run the Solace Agent Mesh application.
 
     FILES: Config files to run. Uses all the yaml files in the build directory if not provided.
     """
     return run_command(
-        use_env, list(files), list(skip), quick_build, ignore_build, force_build
+        use_system_env, list(files), list(skip), quick_build, ignore_build, force_build
     )
 
 
@@ -153,6 +153,12 @@ def visualize(port, find_unused_port, host, use_env):
     default=False,
     help="Non-interactive mode. Skip all the prompts, Uses provided options and default values.",
 )
+@click.option(
+    "--use-web-based-init",
+    is_flag=True,
+    default=False,
+    help="Launch the browser-based initialization interface directly, skipping the prompt.",
+)
 @click.option(
     "--namespace",
     help="project namespace",
@@ -211,15 +217,21 @@ def visualize(port, find_unused_port, host, use_env):
 )
 @click.option(
     "--embedding-model-name",
-    help="Embedding model name to use",
+    help="Embedding model name to use (only used if embedding service is enabled)",
 )
 @click.option(
     "--embedding-endpoint-url",
-    help="Embedding endpoint URL",
+    help="Embedding endpoint URL (only used if embedding service is enabled)",
 )
 @click.option(
     "--embedding-api-key",
-    help="Embedding API Key",
+    help="Embedding API Key (only used if embedding service is enabled)",
+)
+@click.option(
+    "--embedding-service-enabled",
+    is_flag=True,
+    default=None,
+    help="Enable/disable Embedding Service for vector embeddings",
 )
 @click.option(
     "--built-in-agent",

solace_agent_mesh/common/prompt_templates.py

@@ -1,6 +1,4 @@
 from typing import List
-from langchain_core.messages import HumanMessage
-
 import yaml
 
 
@@ -22,7 +20,7 @@ matching_locations:
 """
 
 
-def FilterLocationsUserPrompt(location_filter: str) -> HumanMessage:
+def FilterLocationsUserPrompt(location_filter: str) -> str:
     return f"""
 <user-location-filter>
 {location_filter}

solace_agent_mesh/common/utils.py

@@ -140,6 +140,12 @@ def parse_file_content(file_xml: str) -> dict:
     Parse the xml tags in the content and return a dictionary of the content.
     """
     try:
+        # It is possible that the content of the file mistakenly has t###_ prefixes on the
+        # tags, so we need to strip them off. This is a bit of a hack to work around LLM errors
+
+        file_xml = re.sub(r"<t\d+_", "<", file_xml)
+        file_xml = re.sub(r"</t\d+_", "</", file_xml)
+
         ignore_content_tags = ["data"]
         file_dict = xml_to_dict(file_xml, ignore_content_tags)
         dict_keys = list(file_dict.keys())
@@ -165,6 +171,7 @@ def parse_llm_output(llm_output: str) -> dict:
     # We need to save all the strings that we replace so that we can put them back
     # after we parse the yaml. Use a sequence number to create a unique placeholder
     # for each string.
+
     string_placeholders = {}
     string_count = 0
     sanity = 100
@@ -246,7 +253,9 @@ def parse_llm_output(llm_output: str) -> dict:
     return obj
 
 
-def parse_orchestrator_response(response, last_chunk=False, tag_prefix=""):
+def parse_orchestrator_response(
+    response, last_chunk=False, tag_prefix="", check_reasoning=True
+):
     tp = tag_prefix
     parsed_data = {
         "actions": [],
@@ -324,6 +333,7 @@ def parse_orchestrator_response(response, last_chunk=False, tag_prefix=""):
     current_param_value = []
     open_tags = []
     current_text = []
+    seen_invoke_action = False
 
     for line in response.split("\n"):
 
@@ -350,7 +360,8 @@ def parse_orchestrator_response(response, last_chunk=False, tag_prefix=""):
                 file_line = line[: file_end_index + len(f"</{tp}file>")]
                 file_content = [file_line]
                 current_file = parse_file_content("\n".join(file_content))
-                add_content_entry(parsed_data["content"], "file", current_file)
+                if not seen_invoke_action:
+                    add_content_entry(parsed_data["content"], "file", current_file)
                 in_file = False
                 current_file = {}
                 file_content = []
@@ -368,7 +379,8 @@ def parse_orchestrator_response(response, last_chunk=False, tag_prefix=""):
                 file_line = line[: file_end_index + len(f"</{tp}file>")]
                 file_content.append(file_line)
                 current_file = parse_file_content("\n".join(file_content))
-                add_content_entry(parsed_data["content"], "file", current_file)
+                if not seen_invoke_action:
+                    add_content_entry(parsed_data["content"], "file", current_file)
                 in_file = False
                 current_file = {}
                 file_content = []
@@ -381,6 +393,7 @@ def parse_orchestrator_response(response, last_chunk=False, tag_prefix=""):
             if in_invoke_action:
                 parsed_data["errors"].append("Nested <invoke_action> tags")
             in_invoke_action = True
+            seen_invoke_action = True
             open_tags.append("invoke_action")
             current_action = {
                 "agent": None,
@@ -403,7 +416,7 @@ def parse_orchestrator_response(response, last_chunk=False, tag_prefix=""):
                 if current_param_name:
                     current_action["parameters"][current_param_name] = "\n".join(
                         current_param_value
-                    ).strip()
+                    )
                 parsed_data["actions"].append(current_action)
                 current_action = {}
                 current_param_name = None
@@ -411,9 +424,10 @@ def parse_orchestrator_response(response, last_chunk=False, tag_prefix=""):
 
         elif in_invoke_action and f"<{tp}parameter" in line:
             if current_param_name:
-                current_action["parameters"][current_param_name] = "\n".join(
-                    current_param_value
-                ).strip()
+                param_value = "\n".join(current_param_value)
+                current_action["parameters"][current_param_name] = (
+                    clean_parameter_value(param_value)
+                )
                 current_param_value = []
 
             param_name_match = re.search(r'name\s*=\s*[\'"](\w+)[\'"]', line)
@@ -426,17 +440,19 @@ def parse_orchestrator_response(response, last_chunk=False, tag_prefix=""):
                     r">(.*?)(?:</" + tp + "parameter>|$)", line
                 )
                 if content_after_open:
-                    initial_content = content_after_open.group(1).strip()
+                    initial_content = content_after_open.group(1)
                     if initial_content:
                         current_param_value.append(initial_content)
 
                 # Check if parameter closes on same line
                 if f"</{tp}parameter>" in line:
-                    current_action["parameters"][current_param_name] = "\n".join(
-                        current_param_value
-                    ).strip()
+                    param_value = "\n".join(current_param_value)
+                    current_action["parameters"][current_param_name] = (
+                        clean_parameter_value(param_value)
+                    )
                     current_param_name = None
                     current_param_value = []
+
                     if "parameter" in open_tags:
                         open_tags.remove("parameter")
                 elif line.endswith("/>"):
@@ -451,25 +467,30 @@ def parse_orchestrator_response(response, last_chunk=False, tag_prefix=""):
             if f"</{tp}parameter>" in line:
                 # Handle content before closing tag on final line
                 content_before_close = re.sub(f"</{tp}parameter>.*", "", line)
-                if content_before_close.strip():
-                    current_param_value.append(content_before_close.strip())
-                current_action["parameters"][current_param_name] = "\n".join(
-                    current_param_value
-                ).strip()
+                if content_before_close:
+                    current_param_value.append(content_before_close)
+                param_value = "\n".join(current_param_value)
+                current_action["parameters"][current_param_name] = (
+                    clean_parameter_value(param_value)
+                )
                 current_param_name = None
                 current_param_value = []
                 if "parameter" in open_tags:
                     open_tags.remove("parameter")
             else:
-                current_param_value.append(line.strip())
+                current_param_value.append(line)
 
         else:
-            current_text.append(line)
+            # NOTE that we are intentionally ignoring all output text that occurs
+            # after any <invoke_action> tag. It has been told to never do this and
+            # if it does, then there is a good chance it is hallucinating responses
+            if not seen_invoke_action:
+                current_text.append(line)
 
     if open_tags:
         parsed_data["errors"].append(f"Unclosed tags: {', '.join(open_tags)}")
 
-    if in_file:
+    if in_file and not seen_invoke_action:
         content = "\n".join(file_content)
         # Add a status update for this
         parsed_data["status_updates"].append(
@@ -481,9 +502,28 @@ def parse_orchestrator_response(response, last_chunk=False, tag_prefix=""):
     if len(current_text) > 0:
         add_content_entry(parsed_data["content"], "text", current_text)
 
+    # Final check - if there is no reasoning, then the LLM is not complying with the
+    # request and we should return an error
+    if check_reasoning and not parsed_data["reasoning"]:
+        parsed_data["errors"].append("No <t###_reasoning> tag found")
+        parsed_data["content"] = []
+
     return parsed_data
 
 
+def strip_text_after_invoke_action(text):
+    """
+    Remove any text after the last </invoke_action> tag.
+    This is to prevent hallucinations from the LLM.
+    """
+    # Find the last instance of </t\d+_invoke_action> regexp and remove everything after it.
+    matches = list(re.finditer(r"</t\d+_invoke_action>", text))
+    if matches:
+        last_match_end = matches[-1].end()
+        return text[:last_match_end]
+    return text
+
+
 def remove_incomplete_tags_at_end(text):
     """If the end of the text is in the middle of a <tag> or </tag> then remove it."""
     # remove any open tags at the end
@@ -555,6 +595,35 @@ def match_solace_topic(subscription: str, topic: str) -> bool:
     )
 
 
+def clean_parameter_value(param_value):
+    """
+    Cleans a parameter value by:
+    1. Removing CDATA wrapper if present
+    2. Resolving XML entities like &gt;, &lt;, etc.
+
+    Parameters:
+    - param_value (str): The parameter value that might contain a CDATA wrapper
+                         and/or XML entities
+
+    Returns:
+    - str: The cleaned parameter value
+    """
+    if isinstance(param_value, str):
+        # Remove CDATA wrapper if present
+        cdata_match = re.match(r"\s*<!\[CDATA\[(.*?)\]\]>\s*$", param_value, re.DOTALL)
+        if cdata_match:
+            param_value = cdata_match.group(1)
+
+        # Resolve XML entities
+        param_value = param_value.replace("&lt;", "<")
+        param_value = param_value.replace("&gt;", ">")
+        param_value = param_value.replace("&amp;", "&")
+        param_value = param_value.replace("&quot;", '"')
+        param_value = param_value.replace("&apos;", "'")
+
+    return param_value
+
+
 def clean_text(text_array):
     # Any leading blank lines are removed
     while text_array and not text_array[0]:

solace_agent_mesh/config_portal/backend/common.py

@@ -0,0 +1,35 @@
+default_options = {
+    "namespace": "",
+    "config_dir": "configs",
+    "module_dir": "modules",
+    "env_file": ".env",
+    "build_dir": "build",
+    "broker_type": "solace",
+    "broker_url": "ws://localhost:8008",
+    "broker_vpn": "default",
+    "broker_username": "default",
+    "broker_password": "default",
+    "container_engine": "docker",
+    "llm_model_name": "openai/gpt-4o",
+    "llm_endpoint_url": "https://api.openai.com/v1",
+    "llm_api_key": "",
+    "embedding_model_name": "openai/text-embedding-ada-002",
+    "embedding_endpoint_url": "https://api.openai.com/v1",
+    "embedding_api_key": "",
+    "embedding_service_enabled": False,
+    "built_in_agent": ["web_request"],
+    "file_service_provider": "volume",
+    "file_service_config": ["directory=/tmp/solace-agent-mesh"],
+    "env_var": [],
+    "rest_api_enabled": True,
+    "rest_api_server_input_port": "5050",
+    "rest_api_server_host": "127.0.0.1",
+    "rest_api_server_input_endpoint": "/api/v1/request",
+    "rest_api_gateway_name": "rest-api",
+    "webui_enabled": True,
+    "webui_listen_port": "5001",
+    "webui_host": "localhost",
+    "dev_mode": True,
+}
+
+CONTAINER_RUN_COMMAND = " run -d -p 8080:8080 -p 55554:55555 -p 8008:8008 -p 1883:1883 -p 8000:8000 -p 5672:5672 -p 9000:9000 -p 2222:2222 --shm-size=2g --env username_admin_globalaccesslevel=admin --env username_admin_password=admin --name=solace solace/solace-pubsub-standard"