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

solace_agent_mesh/agents/global/actions/plotly_graph.py

@@ -47,7 +47,7 @@ class PlotlyGraph(Action):
                         ],
                         "reasoning": [
                             "- user has requested a random bar graph",
-                            "- invoke the plotly action from the global agent to generate a bar graph with random data"
+                            "- invoke the plotly action from the global agent to generate a bar graph with random data",
                         ],
                         "response_text": "Certainly! I'd be happy to generate a random bar graph for you.",
                         "status_update": "I'll use our plotting tool to create this for you right away.",
@@ -57,23 +57,23 @@ class PlotlyGraph(Action):
                             "parameter_name": "plotly_figure_config",
                             "parameters": {
                                 "plotly_figure_config": [
-                                    "{{",
-                                    "    \"data\": [",
-                                    "    {{",
-                                    "        \"x\": [\"A\", \"B\", \"C\", \"D\", \"E\"],",
-                                    "        \"y\": [23, 45, 56, 78, 90],",
-                                    "        \"type\": \"bar\"",
-                                    "    }}",
+                                    "{",
+                                    '    "data": [',
+                                    "    {",
+                                    '        "x": ["A", "B", "C", "D", "E"],',
+                                    '        "y": [23, 45, 56, 78, 90],',
+                                    '        "type": "bar"',
+                                    "    }",
                                     "    ],",
-                                    "    \"layout\": {{",
-                                    "    \"title\": \"Random Bar Graph\",",
-                                    "    \"xaxis\": {{\"title\": \"Categories\"}},",
-                                    "    \"yaxis\": {{\"title\": \"Values\"}}",
-                                    "    }}",
-                                    "}}"
+                                    '    "layout": {',
+                                    '    "title": "Random Bar Graph",',
+                                    '    "xaxis": {"title": "Categories"},',
+                                    '    "yaxis": {"title": "Values"}',
+                                    "    }",
+                                    "}",
                                 ]
-                            }
-                        }
+                            },
+                        },
                     }
                 ],
             },
@@ -82,15 +82,38 @@ class PlotlyGraph(Action):
 
     def invoke(self, params, meta={}) -> ActionResponse:
         if platform.system() == "Windows":
-            kaleido_version = version('kaleido')
-            min_version = parse('0.1.0.post1')
-            max_version = parse('0.2.0')
-            if parse(kaleido_version) < min_version or parse(kaleido_version) >= max_version:
+            kaleido_version = version("kaleido")
+            min_version = parse("0.1.0.post1")
+            max_version = parse("0.2.0")
+            if (
+                parse(kaleido_version) < min_version
+                or parse(kaleido_version) >= max_version
+            ):
                 return ActionResponse(
                     message="For Windows users, the plotting functionality requires a specific version of Kaleido. Please refer to the documentation."
                 )
         obj = params["plotly_figure_config"]
         if isinstance(obj, str):
+            # First remove any leading/trailing whitespace
+            obj = obj.strip()
+
+            # Next remove ```yaml or ```json
+            if obj.startswith("```yaml") or obj.startswith("```json"):
+                obj = obj[7:]
+            elif obj.startswith("```"):
+                obj = obj[3:]
+            # Remove any trailing ``` characters
+            if obj.endswith("```"):
+                obj = obj[:-3]
+            # Remove any leading/trailing whitespace again
+            obj = obj.strip()
+
+            # If the string starts with a quote and ends with that same quote, remove them
+            if obj.startswith("'") and obj.endswith("'"):
+                obj = obj[1:-1]
+            elif obj.startswith('"') and obj.endswith('"'):
+                obj = obj[1:-1]
+
             # Remove any leading/trailing quote characters
             obj = obj.strip("'\" ")
             try:
@@ -110,7 +133,9 @@ class PlotlyGraph(Action):
             pio.write_image(fig, byte_io)
             byte_io.seek(0)
             file_service = FileService()
-            image_name = "generated_graph_" + str(random.randint(100000, 999999)) + ".png"
+            image_name = (
+                "generated_graph_" + str(random.randint(100000, 999999)) + ".png"
+            )
             image_meta = file_service.upload_from_buffer(
                 byte_io.read(),
                 image_name,
@@ -120,7 +145,8 @@ class PlotlyGraph(Action):
             files.append(image_meta)
         except Exception as e:
             return ActionResponse(
-                message="Could not create plotly graph. Please check the plotly figure configuration. plotly error: " + str(e),
+                message="Could not create plotly graph. Please check the plotly figure configuration. plotly error: "
+                + str(e),
             )
 
         return ActionResponse(files=files)

solace_agent_mesh/cli/__init__.py

@@ -1 +1 @@
-__version__ = "0.2.0"
+__version__ = "0.2.1"

solace_agent_mesh/cli/commands/add/copy_from_plugin.py

@@ -16,7 +16,7 @@ def copy_from_plugin(name, plugin_name, entity_type):
     if entity_type not in ["agents", "gateways"]:
         log_error("Invalid entity type.")
         return 1
-    
+
     src_entity_name = name
     if ":" in plugin_name:
         plugin_name, src_entity_name = plugin_name.split(":")
@@ -33,11 +33,13 @@ def copy_from_plugin(name, plugin_name, entity_type):
     item_name = f"{item_name}.yaml" if entity_type == "agents" else item_name
 
     src_entity_name = src_entity_name.replace("-", "_")
-    src_entity_name = f"{src_entity_name}.yaml" if entity_type == "agents" else src_entity_name
+    src_entity_name = (
+        f"{src_entity_name}.yaml" if entity_type == "agents" else src_entity_name
+    )
     template_path = os.path.join(plugin_path, "configs", entity_type, src_entity_name)
 
     if not os.path.exists(template_path):
-        log_error(f"Could not find '{item_name}' in '{plugin_name}' plugin.")
+        log_error(f"Could not find '{src_entity_name}' in '{plugin_name}' plugin.")
         return 1
 
     config = click.get_current_context().obj
@@ -80,11 +82,11 @@ def copy_from_plugin(name, plugin_name, entity_type):
     else:
         log_error("Invalid entity type.")
         return 1
-    
+
     temp_file = os.path.join(config_directory, "__TEMPLATES_WILL_BE_HERE__")
     if os.path.exists(temp_file):
         os.remove(temp_file)
-        
+
     click.echo(
         f"Copied {entity_type[:-1]} '{name}' from plugin '{plugin_name}' at: {get_display_path(target_directory)}"
-    )
+    )

solace_agent_mesh/cli/commands/build.py

@@ -378,7 +378,22 @@ def build_solace_agent_mesh(config, build_config_dir, abort, parsers):
         if f.endswith(".yaml")
         and not any(f.startswith(prefix) for prefix in skip_prefixes)
     ]
+    
+    # Check if embedding service is enabled
+    embedding_enabled = True  # Default to True for backward compatibility
+    built_in_services = config.get("built_in", {}).get("services", [])
+    if built_in_services:  # Only check if services section exists
+        embedding_enabled = False
+        for service in built_in_services:
+            if service.get("name") == "embedding" and service.get("enabled"):
+                embedding_enabled = True
+                break
+    
     for config_file in config_files:
+        # Skip embedding service if not enabled
+        if config_file == "service_embedding.yaml" and not embedding_enabled:
+            click.echo(f"Skipping embedding service as it is disabled.")
+            continue
         try:
             # Read config file
             config_file_path = os.path.join(configs_source_path, config_file)

solace_agent_mesh/cli/commands/init/ai_provider_step.py

@@ -39,38 +39,55 @@ def ai_provider_step(options, default_options, none_interactive, abort):
         default_options["llm_model_name"],
         none_interactive,
     )
-
-    ask_if_not_provided(
+    # Ask if the user wants to enable the embedding service
+    embedding_enabled = ask_if_not_provided(
         options,
-        "embedding_endpoint_url",
-        "Provide Embedding endpoint URL",
-        default_options["embedding_endpoint_url"],
+        "embedding_service_enabled",
+        "Enable embedding service for vector embeddings?",
+        default_options["embedding_service_enabled"],
         none_interactive,
     )
 
-    ask_if_not_provided(
-        options,
-        "embedding_api_key",
-        "Provide Embedding API Key",
-        default_options["embedding_api_key"],
-        none_interactive,
-        hide_input=True,
-    )
+    options["embedding_service_enabled"] = embedding_enabled
 
-    click.echo(
-        click.style(
-            (
-                "The model name should follow the format `provider/model-name`."
-                "\n\t For example: openai/text-embedding-ada-002 or openai/my-model-that-follows-openai-api"
-            ),
-            fg="yellow",
+    # Only ask for embedding configuration if the service is enabled
+    if embedding_enabled:
+        ask_if_not_provided(
+            options,
+            "embedding_endpoint_url",
+            "Provide Embedding endpoint URL",
+            default_options["embedding_endpoint_url"],
+            none_interactive,
         )
-    )
 
-    ask_if_not_provided(
-        options,
-        "embedding_model_name",
-        "Provide Embedding model name to use",
-        default_options["embedding_model_name"],
-        none_interactive,
-    )
+        ask_if_not_provided(
+            options,
+            "embedding_api_key",
+            "Provide Embedding API Key",
+            default_options["embedding_api_key"],
+            none_interactive,
+            hide_input=True,
+        )
+
+        click.echo(
+            click.style(
+                (
+                    "The model name should follow the format `provider/model-name`."
+                    "\n\t For example: openai/text-embedding-ada-002 or openai/my-model-that-follows-openai-api"
+                ),
+                fg="yellow",
+            )
+        )
+
+        ask_if_not_provided(
+            options,
+            "embedding_model_name",
+            "Provide Embedding model name to use",
+            default_options["embedding_model_name"],
+            none_interactive,
+        )
+    else:
+        # Set empty values for embedding configuration if the service is disabled
+        options["embedding_endpoint_url"] = ""
+        options["embedding_api_key"] = ""
+        options["embedding_model_name"] = ""

solace_agent_mesh/cli/commands/init/broker_step.py

@@ -3,10 +3,7 @@ import click
 import os
 
 from cli.utils import ask_if_not_provided
-
-
-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"
-
+from solace_agent_mesh.config_portal.backend.common import CONTAINER_RUN_COMMAND
 
 def broker_step(options, default_options, none_interactive, abort):
     """

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/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
 
 
@@ -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/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
     )
 
 
@@ -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/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}