open-swarm 0.1.1744942884__py3-none-any.whl → 0.1.1744943015__py3-none-any.whl

{open_swarm-0.1.1744942884.dist-info → open_swarm-0.1.1744943015.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: open-swarm
-Version: 0.1.1744942884
+Version: 0.1.1744943015
 Summary: Open Swarm: Orchestrating AI Agent Swarms with Django
 Project-URL: Homepage, https://github.com/yourusername/open-swarm
 Project-URL: Documentation, https://github.com/yourusername/open-swarm/blob/main/README.md

{open_swarm-0.1.1744942884.dist-info → open_swarm-0.1.1744943015.dist-info}/RECORD

@@ -17,18 +17,18 @@ swarm/blueprints/README.md,sha256=tsngbSB9N0tILcz_m1OGAjyKZQYlGTN-i5e5asq1GbE,84
 swarm/blueprints/chatbot/blueprint_chatbot.py,sha256=XUR9vt3qXSFrvqmjU01_T-R90Q_r7p560sHQ_febssA,7995
 swarm/blueprints/chatbot/templates/chatbot/chatbot.html,sha256=REFnqNg0EHsXxAUfaCJe1YgOKiV_umBXuC6y8veF5CU,1568
 swarm/blueprints/codey/blueprint_codey.py,sha256=dmKb2mHOeCNlnKrmmkqy9oh_3fJ1-QTg9gjql7RINb4,8850
-swarm/blueprints/digitalbutlers/blueprint_digitalbutlers.py,sha256=bQ0h_oC7TBbwjXhlSDGgjsnePb8cRcCnft2CggZuLY0,11301
+swarm/blueprints/digitalbutlers/blueprint_digitalbutlers.py,sha256=ShEeg7l_R0U6eFY2ty7ooJTO95OKGRcfiX997c8CtWU,11285
 swarm/blueprints/divine_code/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 swarm/blueprints/divine_code/apps.py,sha256=k615JHdfOuo_GwfVbC7ah8X9OblkAL2XWm9aLBjmMyY,306
-swarm/blueprints/divine_code/blueprint_divine_code.py,sha256=p4A9RhvBrWy6OKFNWCxKUqQAmkc49xcSh5V0FGiZ50k,14994
+swarm/blueprints/divine_code/blueprint_divine_code.py,sha256=0BcvuW1ixFgA5LF01sgUJ-_w0HYGt4S2mr1asp1LZiY,14978
 swarm/blueprints/django_chat/apps.py,sha256=rn1Eu11c4zZ6DYZeFb6AkCDMoM_dcQTzeNwW-IxXpCI,200
-swarm/blueprints/django_chat/blueprint_django_chat.py,sha256=kaxR7mV6mYW3HQTLO36xpCP2jhbj_sb4VKnMgE9GiWo,3716
+swarm/blueprints/django_chat/blueprint_django_chat.py,sha256=a8oiGTC7j7KfZiSlEvPNcdidvV8al-2ISTpLcNv3NiQ,3700
 swarm/blueprints/django_chat/urls.py,sha256=TTTF3pgymvCYbuxpwi4WRBPv8ftQNH4pEoURT8sEVAg,147
 swarm/blueprints/django_chat/views.py,sha256=MUKjXXjXsq8jMZtAb4RR9g2mEYrwFemN6Bqxpeyi7p4,1299
 swarm/blueprints/django_chat/templates/django_chat/django_chat_webpage.html,sha256=wAEOI4Wg0JJ8drXaOcr2Pel6lW3JSHmyIpbocLS5tI8,1649
-swarm/blueprints/echocraft/blueprint_echocraft.py,sha256=Bv9ceqPQgPtWDHtmZejJn9YyXPJOA4uUwXnQpBcG52g,3145
+swarm/blueprints/echocraft/blueprint_echocraft.py,sha256=lIo2I1I6E-FsNDDHR3wMThVvvctJ5yWEQR-S5oawH1c,3129
 swarm/blueprints/family_ties/apps.py,sha256=EjV7AxDNsLM4gsLr_qMEiLAVbERuo1ZsdU9vPtOEYAY,287
-swarm/blueprints/family_ties/blueprint_family_ties.py,sha256=Pkqgf7oF5Ag8YddeeLbGPreb4r1YdGSYSsOQmZ18VIM,9462
+swarm/blueprints/family_ties/blueprint_family_ties.py,sha256=ZSGzqZdlNt03ubEQKkuB84uCJm56N_i4LRyefx4xLug,9446
 swarm/blueprints/family_ties/models.py,sha256=C3_okdVVYuu9xOpoKRsaLoGrM2775cS_cU4UKYAkJ9s,903
 swarm/blueprints/family_ties/serializers.py,sha256=kH3T6OgXjF534bO3gfAUr6GpXZ5Jx0BQkK58nvuEcqA,325
 swarm/blueprints/family_ties/settings.py,sha256=5zcVsq7ny3GLWcJnOplZW4fMFNtyC3ba0ZOESRD2gh4,425
@@ -36,16 +36,16 @@ swarm/blueprints/family_ties/urls.py,sha256=awRZHb1gb1p3I6YZzfKMGSydd6kYPTLgax2j
 swarm/blueprints/family_ties/views.py,sha256=FbPkDNlFEixtRFbSpkr51IyJ28FRkXa1W5xyO_KeXH0,1081
 swarm/blueprints/flock/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 swarm/blueprints/gaggle/blueprint_gaggle.py,sha256=rP8uiSz3GLGEjYxXYlo_RCsus7HKBfYkexXoHBCsl7k,14928
-swarm/blueprints/mcp_demo/blueprint_mcp_demo.py,sha256=eUu5_BvLwVSdWiEonXWKuN7YgKsqz04JB_KbMPowryc,6599
+swarm/blueprints/mcp_demo/blueprint_mcp_demo.py,sha256=xLXDwW-mIeRp-rzdcnQyCdGciDqqHvkYhUXrMABjmOE,8470
 swarm/blueprints/messenger/templates/messenger/messenger.html,sha256=izuFtFn40Gm7M4gSUAUT5CIezjBjmNv2w4_fwSlv7VA,2323
-swarm/blueprints/mission_improbable/blueprint_mission_improbable.py,sha256=N4Tw0laErP4eCJM103XOaVrqbFNKZRUG1Bpze8g79MI,12753
-swarm/blueprints/monkai_magic/blueprint_monkai_magic.py,sha256=cx2hPbYcttOcvC4jfb6tExSUKiL4GMOHxuqzLtuSlso,14235
-swarm/blueprints/nebula_shellz/blueprint_nebula_shellz.py,sha256=d_b-5doQVLUMfoFMLeQfumVl09hr91JkuGTonLtrqi4,9917
-swarm/blueprints/omniplex/blueprint_omniplex.py,sha256=wbxTux_98dFjUSjzJNIhLDJMNlVfAfSUmlJjTJ9VQFs,12670
+swarm/blueprints/mission_improbable/blueprint_mission_improbable.py,sha256=JseHJ7CXTvNqWfuN38JTXDsaf2VrMX7J1llXXroZMZg,12737
+swarm/blueprints/monkai_magic/blueprint_monkai_magic.py,sha256=2Ay_IO2NgQEdVqwyw_kkyK6bzGl9XXlpcktmpv1RD4M,14219
+swarm/blueprints/nebula_shellz/blueprint_nebula_shellz.py,sha256=gKe26daAUm7sDcALD_31RRe8jXSCSvL0jywkS4IboD8,11755
+swarm/blueprints/omniplex/blueprint_omniplex.py,sha256=lCp_FXo1rkHtDu2UZVUa8px-1nIh9cl_LhorwL3hteY,13377
 swarm/blueprints/rue_code/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-swarm/blueprints/rue_code/blueprint_rue_code.py,sha256=28Eb_SDsvlnDC3SLNYHrKBpD6izTz53U-jqfZ6nqpto,15417
-swarm/blueprints/suggestion/blueprint_suggestion.py,sha256=hB7SWedDcc97LzVK56qEe7IufK_p5Ze-9H5TxXREGsE,7112
-swarm/blueprints/unapologetic_press/blueprint_unapologetic_press.py,sha256=e1-HpSHNp1PJAcb3-6sI1kE7KeJRQ2lGTUJPXYjvaY4,17648
+swarm/blueprints/rue_code/blueprint_rue_code.py,sha256=kL6MJ-dYdwTsQBkmL_tTXnZUqai2KD1t94EuiVNUv2g,15401
+swarm/blueprints/suggestion/blueprint_suggestion.py,sha256=NvQgGAR9iVlmEOk5i1xb5OLvxOTlXMEMtxT3_5g1tHY,7096
+swarm/blueprints/unapologetic_press/blueprint_unapologetic_press.py,sha256=MDegKtYiea-MVNnOXHOk0grLRQnmxYBNI1b-6Bp4pK4,17632
 swarm/blueprints/whiskeytango_foxtrot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 swarm/blueprints/whiskeytango_foxtrot/apps.py,sha256=V1QKvyb2Vz-EtDNhhNe4tw2W9LYhNDuiaIq_fAU4ilw,334
 swarm/blueprints/whiskeytango_foxtrot/blueprint_whiskeytango_foxtrot.py,sha256=8PjKGDHSTaQ76DXPD3T4MXQ8uLIlm4xmJ5s0i64a_Jw,16179
@@ -64,12 +64,12 @@ swarm/extensions/cli/main.py,sha256=NnmovA7h1Rj1eDQVYe9AN6-eraIbIclHesNVmQPjdk4,
 swarm/extensions/cli/selection.py,sha256=etdG6hJFgnLuvD_sVJvXg8qFcgjzCjyL-vYyxWcU0TI,2002
 swarm/extensions/cli/utils.py,sha256=amDW-jbiM12N-t72j2S0cHP3Mxgoo3nrcwq6CwN9HFY,3290
 swarm/extensions/cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-swarm/extensions/cli/commands/blueprint_management.py,sha256=dLNLLoTjInXQ1m9zRyNxu8NacDgwqYY50GvnhSiMQ_I,1116
-swarm/extensions/cli/commands/config_management.py,sha256=RFu9AP437aqUnyy8RDoyoZgW0WfT7h88_CQJaUnCR9E,480
-swarm/extensions/cli/commands/edit_config.py,sha256=O2Y-BKOSx7shSc-kspyseEQvtIeyQBUCD7Aj3r9dirw,2325
-swarm/extensions/cli/commands/list_blueprints.py,sha256=TyZv_dqM_UTK84-s-Dp7UWUcvWHXsNuxnCRNNNymWio,768
-swarm/extensions/cli/commands/validate_env.py,sha256=VXBjx9etvj4Re8qLwIPoHr4g5VwbwBCBdsr8gGLLYHI,1958
-swarm/extensions/cli/commands/validate_envvars.py,sha256=7-BDPYzV7wsga7kOggHNuCscI-7z-oPjMEBhq-ndDXA,1588
+swarm/extensions/cli/commands/blueprint_management.py,sha256=CXjS3GAYIJ8aCcxDtDJ0Cehe-r8ZYjOnBsr8pn43l0Y,1084
+swarm/extensions/cli/commands/config_management.py,sha256=L-z4YEJnfQQ-QGbQtodgptt8wbWtEPKJWHBIBx6TPj4,519
+swarm/extensions/cli/commands/edit_config.py,sha256=oo_VPezAshyuCTfc1R2Ergtqwf5dHA5oC1FzfO8kn-A,2368
+swarm/extensions/cli/commands/list_blueprints.py,sha256=jqyecR1tKpN9Q2tuanSL3rI4kTsqGCV6Lmc3JAsf1BY,752
+swarm/extensions/cli/commands/validate_env.py,sha256=ilfBVsAsH4QVZVrarWEQxrJCtIp2XJ-0kVuCK1mTAaQ,1955
+swarm/extensions/cli/commands/validate_envvars.py,sha256=ctXNHtvgPtIgk3vPj5D8OAJ-gQLHkEHEd0vvpDI8Luk,1613
 swarm/extensions/cli/utils/discover_commands.py,sha256=aJdU3kSmLlpBxzGdfOA88AaCwpknHSD2cE0piCHZRUY,1053
 swarm/extensions/cli/utils/env_setup.py,sha256=k7QxRjzIGx5HC6RVZP9QSaaXEKMkcKCewD66u0e7qfE,496
 swarm/extensions/config/__init__.py,sha256=WjmGxMU5k3S40TNQxTfByYcT2YAchq_5gzXFWDLrLzU,141
@@ -235,8 +235,8 @@ swarm/views/message_views.py,sha256=sDUnXyqKXC8WwIIMAlWf00s2_a2T9c75Na5FvYMJwBM,
 swarm/views/model_views.py,sha256=aAbU4AZmrOTaPeKMWtoKK7FPYHdaN3Zbx55JfKzYTRY,2937
 swarm/views/utils.py,sha256=8Usc0g0L0NPegNAyY20tJBNBy-JLwODf4VmxV0yUtpw,3627
 swarm/views/web_views.py,sha256=T1CKe-Nyv1C8aDt6QFTGWo_dkH7ojWAvS_QW9mZnZp0,7371
-open_swarm-0.1.1744942884.dist-info/METADATA,sha256=llG-oRb-Jxg-dS1HS00UaIegqr-pBH3_xlkmuy_ubvk,18813
-open_swarm-0.1.1744942884.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-open_swarm-0.1.1744942884.dist-info/entry_points.txt,sha256=fo28d0_zJrytRsh8QqkdlWQT_9lyAwYUx1WuSTDI3HM,177
-open_swarm-0.1.1744942884.dist-info/licenses/LICENSE,sha256=BU9bwRlnOt_JDIb6OT55Q4leLZx9RArDLTFnlDIrBEI,1062
-open_swarm-0.1.1744942884.dist-info/RECORD,,
+open_swarm-0.1.1744943015.dist-info/METADATA,sha256=-IY39ve592zB1K4xEMlDzC6l0l0Z0DqjSgCE_b8pO5Q,18813
+open_swarm-0.1.1744943015.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+open_swarm-0.1.1744943015.dist-info/entry_points.txt,sha256=fo28d0_zJrytRsh8QqkdlWQT_9lyAwYUx1WuSTDI3HM,177
+open_swarm-0.1.1744943015.dist-info/licenses/LICENSE,sha256=BU9bwRlnOt_JDIb6OT55Q4leLZx9RArDLTFnlDIrBEI,1062
+open_swarm-0.1.1744943015.dist-info/RECORD,,

swarm/blueprints/digitalbutlers/blueprint_digitalbutlers.py

@@ -16,7 +16,7 @@ try:
     from agents.models.interface import Model
     from agents.models.openai_chatcompletions import OpenAIChatCompletionsModel
     from openai import AsyncOpenAI
-    from swarm.extensions.blueprint.blueprint_base import BlueprintBase
+    from swarm.core.blueprint_base import BlueprintBase
 except ImportError as e:
     print(f"ERROR: Import failed in DigitalButlersBlueprint: {e}. Check 'openai-agents' install and project structure.")
     print(f"Attempted import from directory: {os.path.dirname(__file__)}")

swarm/blueprints/divine_code/blueprint_divine_code.py

@@ -16,7 +16,7 @@ try:
     from agents.models.interface import Model
     from agents.models.openai_chatcompletions import OpenAIChatCompletionsModel
     from openai import AsyncOpenAI
-    from swarm.extensions.blueprint.blueprint_base import BlueprintBase
+    from swarm.core.blueprint_base import BlueprintBase
 except ImportError as e:
     print(f"ERROR: Import failed in DivineOpsBlueprint: {e}. Check 'openai-agents' install and project structure.")
     print(f"sys.path: {sys.path}")

swarm/blueprints/django_chat/blueprint_django_chat.py

@@ -44,7 +44,7 @@ from django.contrib.auth.decorators import login_required
 from django.views.decorators.csrf import csrf_exempt
 from django.contrib.auth.models import User
 from swarm.models import ChatConversation, ChatMessage
-from swarm.extensions.blueprint.blueprint_base import BlueprintBase as Blueprint
+from swarm.core.blueprint_base import BlueprintBase as Blueprint
 from swarm.utils.logger_setup import setup_logger
 
 logger = setup_logger(__name__)

swarm/blueprints/echocraft/blueprint_echocraft.py

@@ -6,7 +6,7 @@ from typing import List, Dict, Any, AsyncGenerator
 import uuid # Import uuid to generate IDs
 import time # Import time for timestamp
 
-from swarm.extensions.blueprint.blueprint_base import BlueprintBase
+from swarm.core.blueprint_base import BlueprintBase
 
 logger = logging.getLogger(__name__)
 

swarm/blueprints/family_ties/blueprint_family_ties.py

@@ -16,7 +16,7 @@ try:
     from agents.models.interface import Model
     from agents.models.openai_chatcompletions import OpenAIChatCompletionsModel
     from openai import AsyncOpenAI
-    from swarm.extensions.blueprint.blueprint_base import BlueprintBase
+    from swarm.core.blueprint_base import BlueprintBase
 except ImportError as e:
     print(f"ERROR: Import failed in FamilyTiesBlueprint: {e}. Check dependencies.")
     print(f"sys.path: {sys.path}")

swarm/blueprints/mcp_demo/blueprint_mcp_demo.py

@@ -14,7 +14,7 @@ try:
     from agents.models.interface import Model
     from agents.models.openai_chatcompletions import OpenAIChatCompletionsModel
     from openai import AsyncOpenAI
-    from swarm.extensions.blueprint.blueprint_base import BlueprintBase
+    from swarm.core.blueprint_base import BlueprintBase
 except ImportError as e:
     print(f"ERROR: Import failed in MCPDemoBlueprint: {e}. Check dependencies.")
     print(f"sys.path: {sys.path}")
@@ -128,6 +128,35 @@ class MCPDemoBlueprint(BlueprintBase):
         logger.debug("Sage agent created.")
         return sage_agent
 
+    async def run(self, messages: List[dict], **kwargs):
+        """Main execution entry point for the MCP Demo blueprint."""
+        logger.info("MCPDemoBlueprint run method called.")
+        instruction = messages[-1].get("content", "") if messages else ""
+        try:
+            mcp_servers = kwargs.get("mcp_servers", [])
+            starting_agent = self.create_starting_agent(mcp_servers=mcp_servers)
+            from agents import Runner
+            if not starting_agent.model:
+                yield {"messages": [{"role": "assistant", "content": f"Error: No model instance available for MCPDemo agent. Check your OPENAI_API_KEY, or LITELLM_MODEL/LITELLM_BASE_URL config."}]}
+                return
+            if not starting_agent.tools:
+                yield {"messages": [{"role": "assistant", "content": f"Warning: No tools registered for MCPDemo agent. Only direct LLM output is possible."}]}
+            required_mcps = self.metadata.get('required_mcp_servers', [])
+            missing_mcps = [m for m in required_mcps if m not in [s.name for s in mcp_servers]]
+            if missing_mcps:
+                yield {"messages": [{"role": "assistant", "content": f"Warning: Missing required MCP servers: {', '.join(missing_mcps)}. Some features may not work."}]}
+            from rich.console import Console
+            console = Console()
+            with console.status("Generating...", spinner="dots") as status:
+                async for chunk in Runner.run(starting_agent, instruction):
+                    content = chunk.get("content")
+                    if content and ("function call" in content or "args" in content):
+                        continue
+                    yield chunk
+            logger.info("MCPDemoBlueprint run method finished.")
+        except Exception as e:
+            yield {"messages": [{"role": "assistant", "content": f"Error: {e}"}]}
+
 # Standard Python entry point
 if __name__ == "__main__":
     MCPDemoBlueprint.main()

swarm/blueprints/mission_improbable/blueprint_mission_improbable.py

@@ -17,7 +17,7 @@ try:
     from agents.models.interface import Model
     from agents.models.openai_chatcompletions import OpenAIChatCompletionsModel
     from openai import AsyncOpenAI
-    from swarm.extensions.blueprint.blueprint_base import BlueprintBase
+    from swarm.core.blueprint_base import BlueprintBase
 except ImportError as e:
     print(f"ERROR: Import failed in MissionImprobableBlueprint: {e}. Check dependencies.")
     print(f"sys.path: {sys.path}")

swarm/blueprints/monkai_magic/blueprint_monkai_magic.py

@@ -29,7 +29,7 @@ try:
     from agents.models.interface import Model
     from agents.models.openai_chatcompletions import OpenAIChatCompletionsModel
     from openai import AsyncOpenAI
-    from swarm.extensions.blueprint.blueprint_base import BlueprintBase
+    from swarm.core.blueprint_base import BlueprintBase
 except ImportError as e:
     print(f"ERROR: Import failed in MonkaiMagicBlueprint: {e}. Check dependencies.")
     print(f"sys.path: {sys.path}")

swarm/blueprints/nebula_shellz/blueprint_nebula_shellz.py

@@ -13,7 +13,7 @@ try:
     from agents.models.interface import Model
     from agents.models.openai_chatcompletions import OpenAIChatCompletionsModel
     from openai import AsyncOpenAI
-    from swarm.extensions.blueprint.blueprint_base import BlueprintBase
+    from swarm.core.blueprint_base import BlueprintBase
     from rich.panel import Panel # Import Panel for splash screen
 except ImportError as e:
     print(f"ERROR: Import failed in nebula_shellz: {e}. Ensure 'openai-agents' install and structure.")
@@ -170,5 +170,33 @@ Initializing NebulaShellzzar Crew...
         logger.debug("NebulaShellzzar agent team created. Morpheus is the starting agent.") # Changed to DEBUG
         return morpheus
 
+    async def run(self, messages: List[dict], **kwargs):
+        logger.info("NebuchaShellzzarBlueprint run method called.")
+        instruction = messages[-1].get("content", "") if messages else ""
+        try:
+            mcp_servers = kwargs.get("mcp_servers", [])
+            starting_agent = self.create_starting_agent(mcp_servers=mcp_servers)
+            from agents import Runner
+            if not starting_agent.model:
+                yield {"messages": [{"role": "assistant", "content": f"Error: No model instance available for NebuchaShellzzar agent. Check your OPENAI_API_KEY, or LITELLM_MODEL/LITELLM_BASE_URL config."}]}
+                return
+            if not starting_agent.tools:
+                yield {"messages": [{"role": "assistant", "content": f"Warning: No tools registered for NebuchaShellzzar agent. Only direct LLM output is possible."}]}
+            required_mcps = self.metadata.get('required_mcp_servers', [])
+            missing_mcps = [m for m in required_mcps if m not in [s.name for s in mcp_servers]]
+            if missing_mcps:
+                yield {"messages": [{"role": "assistant", "content": f"Warning: Missing required MCP servers: {', '.join(missing_mcps)}. Some features may not work."}]}
+            from rich.console import Console
+            console = Console()
+            with console.status("Generating...", spinner="dots") as status:
+                async for chunk in Runner.run(starting_agent, instruction):
+                    content = chunk.get("content")
+                    if content and ("function call" in content or "args" in content):
+                        continue
+                    yield chunk
+            logger.info("NebuchaShellzzarBlueprint run method finished.")
+        except Exception as e:
+            yield {"messages": [{"role": "assistant", "content": f"Error: {e}"}]}
+
 if __name__ == "__main__":
     NebuchaShellzzarBlueprint.main()

swarm/blueprints/omniplex/blueprint_omniplex.py

@@ -14,7 +14,7 @@ try:
     from agents.models.interface import Model
     from agents.models.openai_chatcompletions import OpenAIChatCompletionsModel
     from openai import AsyncOpenAI
-    from swarm.extensions.blueprint.blueprint_base import BlueprintBase
+    from swarm.core.blueprint_base import BlueprintBase
 except ImportError as e:
     print(f"ERROR: Import failed in OmniplexBlueprint: {e}. Check dependencies.")
     print(f"sys.path: {sys.path}")
@@ -216,26 +216,36 @@ class OmniplexBlueprint(BlueprintBase):
         logger.info(f"Omniplex Coordinator created with tools for: {[t.name for t in team_tools]}")
         return coordinator_agent
 
-    async def run(self, messages: List[Dict[str, Any]], **kwargs) -> Any:
-        """Main execution entry point for the Omniplex blueprint."""
-        logger.info("OmniplexBlueprint run method called.")
+    async def run(self, messages: list, **kwargs):
+        import logging
+        if not hasattr(self, "logger"):
+            self.logger = logging.getLogger(__name__)
+        self.logger.info("OmniplexBlueprint run method called.")
         instruction = messages[-1].get("content", "") if messages else ""
-        async for chunk in self._run_non_interactive(instruction, **kwargs):
-            yield chunk
-        logger.info("OmniplexBlueprint run method finished.")
-
-    async def _run_non_interactive(self, instruction: str, **kwargs) -> Any:
-        logger.info(f"Running OmniplexBlueprint non-interactively with instruction: '{instruction[:100]}...'")
-        mcp_servers = kwargs.get("mcp_servers", [])
-        agent = self.create_starting_agent(mcp_servers=mcp_servers)
-        from agents import Runner
-        model_name = os.getenv("LITELLM_MODEL") or os.getenv("DEFAULT_LLM") or "gpt-3.5-turbo"
         try:
-            for chunk in Runner.run(agent, instruction):
-                yield chunk
+            mcp_servers = kwargs.get("mcp_servers", [])
+            agent = self.create_starting_agent(mcp_servers=mcp_servers)
+            from agents import Runner
+            if not agent.model:
+                yield {"messages": [{"role": "assistant", "content": f"Error: No model instance available for Omniplex agent. Check your OPENAI_API_KEY, or LITELLM_MODEL/LITELLM_BASE_URL config."}]}
+                return
+            if not agent.tools:
+                yield {"messages": [{"role": "assistant", "content": f"Warning: No tools registered for Omniplex agent. Only direct LLM output is possible."}]}
+            required_mcps = self.metadata.get('required_mcp_servers', [])
+            missing_mcps = [m for m in required_mcps if m not in [s.name for s in mcp_servers]]
+            if missing_mcps:
+                yield {"messages": [{"role": "assistant", "content": f"Warning: Missing required MCP servers: {', '.join(missing_mcps)}. Some features may not work."}]}
+            from rich.console import Console
+            console = Console()
+            with console.status("Generating...", spinner="dots") as status:
+                async for chunk in Runner.run(agent, instruction):
+                    content = chunk.get("content")
+                    if content and ("function call" in content or "args" in content):
+                        continue
+                    yield chunk
+            self.logger.info("OmniplexBlueprint run method finished.")
         except Exception as e:
-            logger.error(f"Error during non-interactive run: {e}", exc_info=True)
-            yield {"messages": [{"role": "assistant", "content": f"An error occurred: {e}"}]}
+            yield {"messages": [{"role": "assistant", "content": f"Error: {e}"}]}
 
 # Standard Python entry point
 if __name__ == "__main__":

swarm/blueprints/rue_code/blueprint_rue_code.py

@@ -13,7 +13,7 @@ logger = logging.getLogger(__name__)
 
 # Attempt to import BlueprintBase, handle potential ImportError during early setup/testing
 try:
-    from swarm.extensions.blueprint.blueprint_base import BlueprintBase
+    from swarm.core.blueprint_base import BlueprintBase
 except ImportError as e:
     logger.error(f"Import failed: {e}. Check 'openai-agents' install and project structure.")
     # *** REMOVED sys.exit(1) ***

swarm/blueprints/suggestion/blueprint_suggestion.py

@@ -14,7 +14,7 @@ try:
     from agents.models.interface import Model
     from agents.models.openai_chatcompletions import OpenAIChatCompletionsModel
     from openai import AsyncOpenAI
-    from swarm.extensions.blueprint.blueprint_base import BlueprintBase
+    from swarm.core.blueprint_base import BlueprintBase
 except ImportError as e:
      print(f"ERROR: Failed to import 'agents' or 'BlueprintBase'. Is 'openai-agents' installed and src in PYTHONPATH? Details: {e}")
      sys.exit(1)

swarm/blueprints/unapologetic_press/blueprint_unapologetic_press.py

@@ -18,7 +18,7 @@ try:
     from agents.models.interface import Model
     from agents.models.openai_chatcompletions import OpenAIChatCompletionsModel
     from openai import AsyncOpenAI
-    from swarm.extensions.blueprint.blueprint_base import BlueprintBase
+    from swarm.core.blueprint_base import BlueprintBase
 except ImportError as e:
     print(f"ERROR: Import failed in UnapologeticPressBlueprint: {e}. Check dependencies.")
     print(f"sys.path: {sys.path}")

swarm/extensions/cli/commands/blueprint_management.py

@@ -1,7 +1,7 @@
 # Handles blueprint discovery and validation for the CLI
 
-from swarm.extensions.blueprint.discovery import discover_blueprints
-from swarm.extensions.config.config_loader import load_server_config
+from swarm.core.blueprint_discovery import discover_blueprints
+from swarm.core.config_loader import load_server_config
 
 def list_blueprints():
     """List available blueprints and their metadata."""
@@ -16,7 +16,7 @@ def list_blueprints():
 cat > src/swarm/extensions/cli/commands/config_management.py << 'EOF'
 # Handles configuration management workflows (e.g., LLM, MCP servers)
 
-from swarm.extensions.config.config_loader import (
+from swarm.core.config_loader import (
     load_server_config,
     save_server_config,
 )

swarm/extensions/cli/commands/config_management.py

@@ -1,15 +1,14 @@
 # Handles configuration management workflows (e.g., LLM, MCP servers)
 
-from swarm.extensions.config.config_loader import (
-    load_server_config,
-    save_server_config,
-)
+from swarm.core import config_loader
+from swarm.core import config_manager
+from swarm.core import server_config
 
 def add_llm(model_name, api_key):
     """Add a new LLM configuration."""
-    config = load_server_config()
+    config = config_loader.load_server_config()
     if "llms" not in config:
         config["llms"] = {}
     config["llms"][model_name] = {"api_key": api_key}
-    save_server_config(config)
+    config_manager.save_server_config(config)
     print(f"Added LLM '{model_name}' to configuration.")

swarm/extensions/cli/commands/edit_config.py

@@ -1,8 +1,10 @@
 import argparse
 import json
-from swarm.extensions.config.config_loader import (
-    load_server_config,
-    save_server_config,
+from swarm.core import (
+    config_loader,
+    config_manager,
+    server_config,
+    setup_wizard,
 )
 from pathlib import Path
 
@@ -60,7 +62,7 @@ def main():
     args = parser.parse_args()
 
     try:
-        config = load_server_config(str(CONFIG_PATH))
+        config = config_loader.load_server_config(str(CONFIG_PATH))
     except FileNotFoundError as e:
         print(f"Error: {e}")
         return
@@ -69,9 +71,9 @@ def main():
         list_config(config)
     elif args.interactive:
         edit_config_interactive(config)
-        save_server_config(str(CONFIG_PATH), config)
+        config_loader.save_server_config(str(CONFIG_PATH), config)
     elif args.field and args.value:
         edit_config_field(config, args.field, args.value)
-        save_server_config(str(CONFIG_PATH), config)
+        config_loader.save_server_config(str(CONFIG_PATH), config)
     else:
         parser.print_help()

swarm/extensions/cli/commands/list_blueprints.py

@@ -4,7 +4,7 @@ Description: Lists all blueprints available in the system.
 """
 
 from pathlib import Path
-from swarm.extensions.blueprint.blueprint_discovery import discover_blueprints
+from swarm.core.blueprint_discovery import discover_blueprints
 
 # Metadata for dynamic registration
 description = "Lists all blueprints available in the system."

swarm/extensions/cli/commands/validate_env.py

@@ -1,7 +1,7 @@
 import os
 import argparse
-from swarm.extensions.config.config_loader import load_server_config
-from swarm.extensions.blueprint.blueprint_base import BlueprintBase
+from swarm.core import config_loader, config_manager, server_config
+from swarm.core.blueprint_base import BlueprintBase
 
 CONFIG_PATH = "swarm_config.json"
 
@@ -43,7 +43,7 @@ def main():
     args = parser.parse_args()
 
     try:
-        config = load_server_config(CONFIG_PATH)
+        config = server_config.load_server_config(CONFIG_PATH)
     except FileNotFoundError as e:
         print(f"Error: {e}")
         return

swarm/extensions/cli/commands/validate_envvars.py

@@ -1,5 +1,5 @@
-from swarm.extensions.blueprint.blueprint_discovery import discover_blueprints
-from swarm.extensions.config.config_loader import load_env_config, validate_env_vars
+from swarm.core.blueprint_discovery import discover_blueprints
+from swarm.core import config_loader, config_manager, server_config
 import argparse
 
 def validate_envvars(blueprint_name=None):
@@ -19,16 +19,16 @@ def validate_envvars(blueprint_name=None):
             print(f"Blueprint '{blueprint_name}' not found.")
             return
         required_vars = blueprint.get("env_vars", [])
-        env_vars = load_env_config()
-        validation = validate_env_vars(env_vars, required_vars)
+        env_vars = config_loader.load_env_config()
+        validation = config_manager.validate_env_vars(env_vars, required_vars)
         print(f"Validation for '{blueprint_name}': {validation}")
     else:
         # Global validation
-        env_vars = load_env_config()
+        env_vars = config_loader.load_env_config()
         print("Global Environment Validation:")
         for blueprint_name, blueprint_data in blueprints.items():
             required_vars = blueprint_data.get("env_vars", [])
-            validation = validate_env_vars(env_vars, required_vars)
+            validation = config_manager.validate_env_vars(env_vars, required_vars)
             print(f"Validation for '{blueprint_name}': {validation}")
 
 def main():