solace-agent-mesh 0.1.3__py3-none-any.whl → 0.2.1__py3-none-any.whl

solace_agent_mesh/cli/commands/init/create_config_file_step.py

@@ -21,6 +21,14 @@ def create_config_file_step(options, default_options, none_interactive, abort):
     builtin_agents = options.get("built_in_agent", [])
     for agent in builtin_agents_ref:
         agent["enabled"] = agent["name"] in builtin_agents or agent["name"] == "global"
+        
+    # Set up the built-in services
+    builtin_services_ref = (
+        sam_config.get("solace_agent_mesh", {}).get("built_in", {}).get("services", [])
+    )
+    for service in builtin_services_ref:
+        if service["name"] == "embedding":
+            service["enabled"] = options.get("embedding_service_enabled", False)
 
     # Set up the project structure
     sam_config.get("solace_agent_mesh", {})["config_directory"] = options.get("config_dir")

solace_agent_mesh/cli/commands/init/create_other_project_files_step.py

@@ -17,6 +17,57 @@ def add_pair_to_file_if_not_exists(file_path, pairs):
                 f.write(f"{key}{value}\n")
 
 
+def update_or_add_pairs_to_file(file_path, pairs):
+    """
+    Updates existing key-value pairs in a file or adds them if they don't exist.
+    
+    Args:
+        file_path (str): The path to the file to update
+        pairs (list): A list of (key, value) tuples to update or add
+    """
+    # Check if file exists
+    if os.path.exists(file_path):
+        with open(file_path, "r", encoding="utf-8") as f:
+            lines = f.readlines()
+    else:
+        lines = []
+    
+    # Create a dictionary of key-value pairs for quick lookup
+    pair_dict = {key: value for key, value in pairs}
+    updated_keys = set()
+    
+    # Process each line
+    new_lines = []
+    for line in lines:
+        line = line.rstrip()
+        if not line or line.startswith("#"):
+            # Keep comments and empty lines
+            new_lines.append(line)
+            continue
+            
+        # Check if line contains any of our keys
+        found_key = None
+        for key in pair_dict:
+            if line.startswith(key + "=") or line.startswith(key + " ="):
+                found_key = key
+                updated_keys.add(key)
+                new_lines.append(f"{key}{pair_dict[key]}")
+                break
+                
+        if not found_key:
+            # Keep lines that don't match our keys
+            new_lines.append(line)
+    
+    # Add any new variables that weren't found
+    for key, value in pairs:
+        if key not in updated_keys:
+            new_lines.append(f"{key}{value}")
+    
+    # Write the updated content back to the file
+    with open(file_path, "w", encoding="utf-8") as f:
+        f.write("\n".join(new_lines) + "\n")
+
+
 def create_other_project_files_step(options, default_options, none_interactive, abort):
     """
     Creates the other project files. i.e. .gitignore, .env, requirements.txt, etc.
@@ -92,5 +143,5 @@ def create_other_project_files_step(options, default_options, none_interactive,
             required_env_variables.append((key, f"={value}"))
 
     create_if_not_exists(options["env_file"], "")
-    add_pair_to_file_if_not_exists(options["env_file"], required_env_variables)
+    update_or_add_pairs_to_file(options["env_file"], required_env_variables)
     add_gateway_command(options["rest_api_gateway_name"],["rest-api"])

solace_agent_mesh/cli/commands/init/init.py

@@ -9,45 +9,16 @@ from .create_config_file_step import create_config_file_step
 from .file_service_step import file_service_step
 from .project_structure_step import project_structure_step
 from .create_other_project_files_step import create_other_project_files_step
-
+from solace_agent_mesh.config_portal.backend.server import run_flask
+import click
+import multiprocessing
+import sys
+import time
 from cli.utils import (
     log_error,
+    ask_yes_no_question,
 )
-
-default_options = {
-    "namespace": "",
-    "config_dir": "configs",
-    "module_dir": "modules",
-    "env_file": ".env",
-    "build_dir": "build",
-    "broker_type": "container",
-    "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": "",
-    "built_in_agent": [],
-    "file_service_provider": "volume",
-    "file_service_config": ["volume=/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": "127.0.0.1"
-}
-"""
-Default options for the init command.
-"""
+from solace_agent_mesh.config_portal.backend.common import default_options
 
 
 def abort(message: str):
@@ -61,7 +32,6 @@ def init_command(options={}):
     """
     Initialize the Solace Agent Mesh application.
     """
-    click.echo(click.style("Initializing Solace Agent Mesh", bold=True, fg="blue"))
     skip = False
     if "skip" in options and options["skip"]:
         skip = True
@@ -77,6 +47,49 @@ def init_command(options={}):
         ("", create_config_file_step),
         ("Setting up project", create_other_project_files_step),
     ]
+
+    check_if_already_done(options, default_options, skip, abort)
+
+    click.echo(click.style("Initializing Solace Agent Mesh", bold=True, fg="blue"))
+    use_web_based_init = ask_yes_no_question("Would you like to configure your project through a web interface in your browser?", True)
+
+    if use_web_based_init and not skip:
+
+        with multiprocessing.Manager() as manager:
+            # Create a shared configuration dictionary
+            shared_config = manager.dict()
+            
+            # Start the Flask server with the shared config
+            init_gui_process = multiprocessing.Process(
+                target=run_flask,
+                args=("127.0.0.1", 5002, shared_config)
+            )
+            init_gui_process.start()
+
+            click.echo(click.style("Web configuration portal is running at http://127.0.0.1:5002", fg="green"))
+            click.echo("Complete the configuration in your browser to continue...")
+
+            # Wait for the Flask server to finish
+            init_gui_process.join()
+            
+            # Get the configuration from the shared dictionary
+            if shared_config:
+                # Convert from manager.dict to regular dict
+                config_from_portal = dict(shared_config)
+                options.update(config_from_portal)
+                click.echo(click.style("Configuration received from portal", fg="green"))
+
+                #if web configuration portal is used, skip the steps that are already done
+                steps_if_web_setup_used = [
+                    ("", create_config_file_step),
+                    ("", create_other_project_files_step),
+                ]
+                steps = steps_if_web_setup_used
+            else:
+                click.echo(click.style("Web configuration failed, please try again.", fg="red"))
+                return
+            
+
     non_hidden_steps_count = len([step for step in steps if step[0]])
 
     step = 0

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
 
 
@@ -11,7 +16,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,10 +32,21 @@ 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):
-                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] = []
@@ -41,15 +57,35 @@ def get_all_plugin_gateway_interfaces(config, abort):
                     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:
-                    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
 
 
-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")
 
@@ -61,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 []
 
@@ -121,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
@@ -156,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/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/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/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
     )
 
 
@@ -211,15 +211,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/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/constants.py

@@ -3,3 +3,13 @@ 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/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}