dao-ai 0.1.16__tar.gz → 0.1.17__tar.gz

{dao_ai-0.1.16 → dao_ai-0.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dao-ai
-Version: 0.1.16
+Version: 0.1.17
 Summary: DAO AI: A modular, multi-agent orchestration framework for complex AI workflows. Supports agent handoff, tool integration, and dynamic configuration via YAML.
 Project-URL: Homepage, https://github.com/natefleming/dao-ai
 Project-URL: Documentation, https://natefleming.github.io/dao-ai
@@ -235,7 +235,7 @@ app:
     - *assistant
   orchestration:
     swarm:
-      model: *default_llm
+      default_agent: *assistant
 ```
 
 **💡 What's happening here?**

{dao_ai-0.1.16 → dao_ai-0.1.17}/README.md

@@ -156,7 +156,7 @@ app:
     - *assistant
   orchestration:
     swarm:
-      model: *default_llm
+      default_agent: *assistant
 ```
 
 **💡 What's happening here?**

{dao_ai-0.1.16 → dao_ai-0.1.17}/config/examples/02_mcp/custom_mcp.yaml

@@ -55,4 +55,4 @@ app:
     - *jira_agent                                 # MCP agent
   orchestration:                                 # Agent orchestration configuration
     swarm:                                       # Supervisor orchestration pattern
-      model: *default_llm                        # LLM for routing decisions
+      default_agent: *jira_agent                 # Default agent for routing

{dao_ai-0.1.16 → dao_ai-0.1.17}/config/examples/02_mcp/filtered_mcp.yaml

@@ -309,8 +309,7 @@ app:
     - *functions_agent                    # Functions agent
   orchestration:                          # Agent orchestration configuration
     swarm:                                # Supervisor orchestration pattern
-      model: *default_llm                 # LLM for routing decisions
-      # Agents will be automatically routed based on their capabilities
+      default_agent: *general_agent       # Default agent for routing
 
 # =============================================================================
 # USAGE NOTES

{dao_ai-0.1.16 → dao_ai-0.1.17}/config/examples/02_mcp/managed_mcp.yaml

@@ -120,4 +120,4 @@ app:
     - *mcp_agent                                 # MCP agent
   orchestration:                                 # Agent orchestration configuration
     swarm:                                       # Supervisor orchestration pattern
-      model: *default_llm                        # LLM for routing decisions
+      default_agent: *mcp_agent                  # Default agent for routing

{dao_ai-0.1.16 → dao_ai-0.1.17}/config/examples/02_mcp/slack_integration.yaml

@@ -65,5 +65,5 @@ app:
     - *slack_agent                                  # Slack notification agent
   orchestration:                                    # Agent orchestration configuration
     swarm:                                          # Swarm orchestration pattern
-      model: *default_llm                           # LLM for routing decisions
+      default_agent: *slack_agent                   # Default agent for routing
 

{dao_ai-0.1.16 → dao_ai-0.1.17}/config/examples/04_genie/genie_lru_cache.yaml

@@ -93,6 +93,6 @@ app:
   orchestration:                                    # Agent orchestration configuration
     memory: *memory                                 # In-memory conversation persistence
     swarm:                                          # Swarm orchestration pattern
-      model: *default_llm                           # LLM for routing decisions
+      default_agent: *genie                         # Default agent for routing
 
 

{dao_ai-0.1.16 → dao_ai-0.1.17}/config/examples/04_genie/genie_semantic_cache.yaml

@@ -131,5 +131,5 @@ app:
   orchestration:                                    # Agent orchestration configuration
     memory: *memory                                 # In-memory conversation persistence
     swarm:                                          # Swarm orchestration pattern
-      model: *default_llm                           # LLM for routing decisions
+      default_agent: *genie                         # Default agent for routing
 

{dao_ai-0.1.16 → dao_ai-0.1.17}/config/examples/04_genie/genie_with_conversation_id.yaml

@@ -132,7 +132,7 @@ app:
   orchestration:                                    # Agent orchestration configuration
     memory: *memory                            # Memory store for conversation context
     swarm:                                     # Supervisor orchestration pattern
-      model: *default_llm                      # LLM for routing decisions
+      default_agent: *genie                    # Default agent for routing
 
 
 

{dao_ai-0.1.16 → dao_ai-0.1.17}/config/examples/05_memory/conversation_summarization.yaml

@@ -135,7 +135,7 @@ app:
   orchestration:
     memory: *memory
     swarm:
-      model: *default_llm
+      default_agent: *main_agent
 
   # ---------------------------------------------------------------------------
   # CHAT HISTORY / SUMMARIZATION CONFIGURATION

{dao_ai-0.1.16 → dao_ai-0.1.17}/config/examples/07_human_in_the_loop/human_in_the_loop.yaml

@@ -165,7 +165,7 @@ app:
   
   orchestration:
     swarm:
-      model: *default_llm
+      default_agent: *main_agent
 
     memory: *memory  # CRITICAL: Memory with checkpointer required for HITL
   

{dao_ai-0.1.16 → dao_ai-0.1.17}/config/examples/11_prompt_engineering/prompt_optimization.yaml

@@ -237,7 +237,6 @@ app:
           user_id: my_user_id
           store_num: 87887
     # swarm:
-    #   model: *tool_calling_llm
     #   default_agent: *general
 
 

{dao_ai-0.1.16 → dao_ai-0.1.17}/config/examples/11_prompt_engineering/prompt_registry.yaml

@@ -837,7 +837,6 @@ app:
           store_num: 87887
         session: {}
     # swarm:
-    #   model: *tool_calling_llm
     #   default_agent: *general
 
 # =============================================================================

{dao_ai-0.1.16 → dao_ai-0.1.17}/config/examples/13_orchestration/README.md

@@ -105,11 +105,13 @@ app:
     - inventory_agent # Can transfer to product or comparison
     - comparison_agent # Can transfer back to product or inventory
 
-tools:
-  transfer_to_inventory:
-    function: dao_ai.tools.agent.create_handoff_tool
-    args:
-      agent_name: inventory_agent
+  orchestration:
+    swarm:
+      default_agent: product_agent    # Starting agent for new conversations
+      handoffs:
+        product_agent: [inventory_agent, comparison_agent]
+        inventory_agent: [product_agent]
+        comparison_agent: [product_agent, inventory_agent]
 ```
 
 See [`swarm_pattern.yaml`](./swarm_pattern.yaml) for a complete working example.

{dao_ai-0.1.16 → dao_ai-0.1.17}/config/examples/15_complete_applications/deep_research.yaml

@@ -388,7 +388,6 @@ app:
     - *strategy_synthesizer                                     
   orchestration:                                  
     swarm:                                    
-      model: *default_llm
       default_agent: research_lead
       handoffs:
         research_lead:

{dao_ai-0.1.16 → dao_ai-0.1.17}/config/examples/15_complete_applications/hardware_store_swarm.yaml

@@ -709,10 +709,6 @@ app:
     # - If no specific handoffs defined, agent can hand off to any agent
     # ========================================================================
     swarm:
-      # LLM used for swarm coordination and agent decision-making
-      # This model powers the underlying swarm orchestration logic
-      model: *tool_calling_llm
-      
       # Starting agent for new conversations - acts as the entry point
       # Users initially interact with this agent before potential handoffs
       default_agent: *general

{dao_ai-0.1.16 → dao_ai-0.1.17}/config/examples/15_complete_applications/quick_serve_restaurant.yaml

@@ -355,7 +355,7 @@ app:
     - *barista  
   orchestration:                                    # Agent orchestration configuration
     swarm:                                     # Supervisor orchestration pattern
-      model: *tool_calling_llm                      # LLM for routing decisions
+      default_agent: *barista                       # Default agent for routing
     memory: *memory                            # Memory store for conversation context
   input_example:
       messages:

{dao_ai-0.1.16 → dao_ai-0.1.17}/docs/architecture.md

@@ -245,7 +245,6 @@ No central supervisor needed — agents decide collaboratively.
 ```yaml
 orchestration:
   swarm:
-    model: *default_llm
     default_agent: *general_agent    # Where to start
     handoffs:
       product_agent: [orders_agent, diy_agent]  # Product agent can hand off to these

{dao_ai-0.1.16 → dao_ai-0.1.17}/docs/configuration-reference.md

@@ -152,7 +152,6 @@ app:
       model: *model_name
       prompt: string
     swarm:
-      model: *model_name
       default_agent: *agent_name
       handoffs:
         agent_a: [agent_b, agent_c]

{dao_ai-0.1.16 → dao_ai-0.1.17}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dao-ai"
-version = "0.1.16"
+version = "0.1.17"
 description = "DAO AI: A modular, multi-agent orchestration framework for complex AI workflows. Supports agent handoff, tool integration, and dynamic configuration via YAML."
 readme = "README.md"
 license = { text = "MIT" }

{dao_ai-0.1.16 → dao_ai-0.1.17}/schemas/model_config_schema.json

@@ -3155,11 +3155,16 @@
             {
               "$ref": "#/$defs/SwarmModel"
             },
+            {
+              "const": true,
+              "type": "boolean"
+            },
             {
               "type": "null"
             }
           ],
-          "default": null
+          "default": null,
+          "title": "Swarm"
         },
         "memory": {
           "anyOf": [
@@ -4005,9 +4010,6 @@
     "SwarmModel": {
       "additionalProperties": false,
       "properties": {
-        "model": {
-          "$ref": "#/$defs/LLMModel"
-        },
         "default_agent": {
           "anyOf": [
             {
@@ -4063,9 +4065,6 @@
           "title": "Handoffs"
         }
       },
-      "required": [
-        "model"
-      ],
       "title": "SwarmModel",
       "type": "object"
     },

{dao_ai-0.1.16 → dao_ai-0.1.17}/src/dao_ai/cli.py

@@ -64,6 +64,7 @@ def detect_cloud_provider(profile: Optional[str] = None) -> Optional[str]:
     """
     try:
         import os
+
         from databricks.sdk import WorkspaceClient
 
         # Check for environment variables that might override profile
@@ -1208,7 +1209,9 @@ def run_databricks_command(
             f"Using CLI-specified deployment target: {resolved_deployment_target}"
         )
     elif app_config and app_config.app and app_config.app.deployment_target:
-        resolved_deployment_target = app_config.app.deployment_target.value
+        # deployment_target is DeploymentTarget enum (str subclass) or string
+        # str() works for both since DeploymentTarget inherits from str
+        resolved_deployment_target = str(app_config.app.deployment_target)
         logger.debug(
             f"Using config file deployment target: {resolved_deployment_target}"
         )

{dao_ai-0.1.16 → dao_ai-0.1.17}/src/dao_ai/config.py

@@ -373,15 +373,19 @@ class IsDatabricksResource(ABC, BaseModel):
         """
         from dao_ai.utils import normalize_host
 
-        logger.trace(f"workspace_client_from called", context=context, on_behalf_of_user=self.on_behalf_of_user)
+        logger.trace(
+            "workspace_client_from called",
+            context=context,
+            on_behalf_of_user=self.on_behalf_of_user,
+        )
 
         # Check if we have headers in context for OBO
         if context and context.headers and self.on_behalf_of_user:
             headers = context.headers
             # Try both lowercase and title-case header names (HTTP headers are case-insensitive)
-            forwarded_token: str = headers.get("x-forwarded-access-token") or headers.get(
-                "X-Forwarded-Access-Token"
-            )
+            forwarded_token: str = headers.get(
+                "x-forwarded-access-token"
+            ) or headers.get("X-Forwarded-Access-Token")
 
             if forwarded_token:
                 forwarded_user = headers.get("x-forwarded-user") or headers.get(
@@ -2091,9 +2095,47 @@ class McpFunctionModel(BaseFunctionModel, IsDatabricksResource):
             return f"{workspace_host}/api/2.0/mcp/sql"
 
         # Databricks App - MCP endpoint is at {app_url}/mcp
+        # Try McpFunctionModel's workspace_client first (which may have credentials),
+        # then fall back to DatabricksAppModel.url property (which uses its own workspace_client)
         if self.app:
-            app_url = self.app.url.rstrip("/")
-            return f"{app_url}/mcp"
+            from databricks.sdk.service.apps import App
+
+            app_url: str | None = None
+
+            # First, try using McpFunctionModel's workspace_client
+            try:
+                app: App = self.workspace_client.apps.get(self.app.name)
+                app_url = app.url
+                logger.trace(
+                    "Got app URL using McpFunctionModel workspace_client",
+                    app_name=self.app.name,
+                    url=app_url,
+                )
+            except Exception as e:
+                logger.debug(
+                    "Failed to get app URL using McpFunctionModel workspace_client, "
+                    "trying DatabricksAppModel.url property",
+                    app_name=self.app.name,
+                    error=str(e),
+                )
+
+            # Fall back to DatabricksAppModel.url property
+            if not app_url:
+                try:
+                    app_url = self.app.url
+                    logger.trace(
+                        "Got app URL using DatabricksAppModel.url property",
+                        app_name=self.app.name,
+                        url=app_url,
+                    )
+                except Exception as e:
+                    raise RuntimeError(
+                        f"Databricks App '{self.app.name}' does not have a URL. "
+                        "The app may not be deployed yet, or credentials may be invalid. "
+                        f"Error: {e}"
+                    ) from e
+
+            return f"{app_url.rstrip('/')}/mcp"
 
         # Vector Search
         if self.vector_search:
@@ -2608,7 +2650,6 @@ class SupervisorModel(BaseModel):
 
 class SwarmModel(BaseModel):
     model_config = ConfigDict(use_enum_values=True, extra="forbid")
-    model: LLMModel
     default_agent: Optional[AgentModel | str] = None
     middleware: list[MiddlewareModel] = Field(
         default_factory=list,
@@ -2622,11 +2663,17 @@ class SwarmModel(BaseModel):
 class OrchestrationModel(BaseModel):
     model_config = ConfigDict(use_enum_values=True, extra="forbid")
     supervisor: Optional[SupervisorModel] = None
-    swarm: Optional[SwarmModel] = None
+    swarm: Optional[SwarmModel | Literal[True]] = None
     memory: Optional[MemoryModel] = None
 
     @model_validator(mode="after")
-    def validate_mutually_exclusive(self) -> Self:
+    def validate_and_normalize(self) -> Self:
+        """Validate orchestration and normalize swarm shorthand."""
+        # Convert swarm: true to SwarmModel()
+        if self.swarm is True:
+            self.swarm = SwarmModel()
+
+        # Validate mutually exclusive
         if self.supervisor is not None and self.swarm is not None:
             raise ValueError("Cannot specify both supervisor and swarm")
         if self.supervisor is None and self.swarm is None:
@@ -2898,9 +2945,7 @@ class AppModel(BaseModel):
             elif len(self.agents) == 1:
                 default_agent: AgentModel = self.agents[0]
                 self.orchestration = OrchestrationModel(
-                    swarm=SwarmModel(
-                        model=default_agent.model, default_agent=default_agent
-                    )
+                    swarm=SwarmModel(default_agent=default_agent)
                 )
             else:
                 raise ValueError("At least one agent must be specified")

{dao_ai-0.1.16 → dao_ai-0.1.17}/src/dao_ai/orchestration/swarm.py

@@ -167,8 +167,13 @@ def create_swarm_graph(config: AppConfig) -> CompiledStateGraph:
     default_agent: str
     if isinstance(swarm.default_agent, AgentModel):
         default_agent = swarm.default_agent.name
-    else:
+    elif swarm.default_agent is not None:
         default_agent = swarm.default_agent
+    elif len(config.app.agents) > 0:
+        # Fallback to first agent if no default specified
+        default_agent = config.app.agents[0].name
+    else:
+        raise ValueError("Swarm requires at least one agent and a default_agent")
 
     logger.info(
         "Creating swarm graph",

{dao_ai-0.1.16 → dao_ai-0.1.17}/src/dao_ai/tools/mcp.py

@@ -144,31 +144,42 @@ def _should_include_tool(
     return True
 
 
+def _has_auth_configured(resource: IsDatabricksResource) -> bool:
+    """Check if a resource has explicit authentication configured."""
+    return bool(
+        resource.on_behalf_of_user
+        or resource.service_principal
+        or resource.client_id
+        or resource.pat
+    )
+
+
 def _get_auth_resource(function: McpFunctionModel) -> IsDatabricksResource:
     """
     Get the IsDatabricksResource to use for authentication.
 
     Follows a priority hierarchy:
-    1. Explicit resource with auth (app, connection, genie_room, vector_search, functions)
+    1. Nested resource with explicit auth (app, connection, genie_room, vector_search)
     2. McpFunctionModel itself (which also inherits from IsDatabricksResource)
 
+    Only uses a nested resource if it has authentication configured.
+    Otherwise falls back to McpFunctionModel which may have credentials set at the tool level.
+
     Returns the resource whose workspace_client should be used for authentication.
     """
-    # Check each possible resource source in priority order
-    # These resources may have their own auth configured
-    if function.app:
+    # Check each possible resource source - only use if it has auth configured
+    if function.app and _has_auth_configured(function.app):
         return function.app
-    if function.connection:
+    if function.connection and _has_auth_configured(function.connection):
         return function.connection
-    if function.genie_room:
+    if function.genie_room and _has_auth_configured(function.genie_room):
         return function.genie_room
-    if function.vector_search:
+    if function.vector_search and _has_auth_configured(function.vector_search):
         return function.vector_search
-    if function.functions:
-        # SchemaModel doesn't have auth - fall through to McpFunctionModel
-        pass
+    # SchemaModel (functions) doesn't have auth - always fall through
 
     # Fall back to McpFunctionModel itself (it inherits from IsDatabricksResource)
+    # This allows credentials to be set at the tool level
     return function
 
 

{dao_ai-0.1.16 → dao_ai-0.1.17}/tests/dao_ai/test_mcp.py

@@ -270,9 +270,10 @@ def test_mcp_function_with_databricks_app():
         assert mcp_function_model.app.name == "my-mcp-server"
         assert mcp_function_model.url is None  # URL is retrieved from app
 
-        # Verify the mcp_url property returns the app's URL
+        # Verify the mcp_url property returns the app's URL with /mcp suffix
         assert (
-            mcp_function_model.mcp_url == "https://my-mcp-server.cloud.databricks.com"
+            mcp_function_model.mcp_url
+            == "https://my-mcp-server.cloud.databricks.com/mcp"
         )
 
         # Verify the workspace client was called correctly

{dao_ai-0.1.16 → dao_ai-0.1.17}/tests/dao_ai/test_mcp_filtering_integration.py

@@ -523,7 +523,7 @@ class TestBuildConnectionConfigWithApp:
 
     @patch("databricks_mcp.DatabricksOAuthClientProvider")
     def test_app_source_uses_oauth_provider(self, mock_provider_class):
-        """Test that app source uses DatabricksOAuthClientProvider with app's workspace_client."""
+        """Test that app source uses DatabricksOAuthClientProvider with function's workspace_client."""
         from unittest.mock import PropertyMock
 
         # Create mock app with URL
@@ -537,25 +537,26 @@ class TestBuildConnectionConfigWithApp:
         # Create DatabricksAppModel
         app_model = DatabricksAppModel(name="my-mcp-app")
 
-        # Mock the workspace_client property
+        # Create McpFunctionModel with app source
+        function = McpFunctionModel(app=app_model)
+
+        # Mock the workspace_client property on McpFunctionModel
+        # (since app has no auth configured, function's workspace_client is used)
         with patch.object(
-            type(app_model),
+            type(function),
             "workspace_client",
             new_callable=PropertyMock,
             return_value=mock_ws,
         ):
-            # Create McpFunctionModel with app source
-            function = McpFunctionModel(app=app_model)
-
             # Build connection config
             config = _build_connection_config(function)
 
-            # Verify structure
-            assert config["url"] == "https://my-mcp-app.cloud.databricks.com"
+            # Verify structure - app URLs get /mcp suffix
+            assert config["url"] == "https://my-mcp-app.cloud.databricks.com/mcp"
             assert config["transport"] == "http"
             assert "auth" in config
 
-            # Verify OAuth provider was called with app's workspace client
+            # Verify OAuth provider was called with function's workspace client
             mock_provider_class.assert_called_once_with(mock_ws)
 
     @patch("databricks_mcp.DatabricksOAuthClientProvider")
@@ -585,9 +586,9 @@ class TestBuildConnectionConfigWithApp:
             function = McpFunctionModel(app=app_model)
             config = _build_connection_config(function)
 
-            # Verify complete config structure
+            # Verify complete config structure - app URLs get /mcp suffix
             assert config == {
-                "url": "https://test-app.azuredatabricks.net",
+                "url": "https://test-app.azuredatabricks.net/mcp",
                 "transport": "http",
                 "auth": mock_auth,
             }
@@ -734,7 +735,7 @@ class TestBuildConnectionConfigUnifiedAuth:
 
     @patch("databricks_mcp.DatabricksOAuthClientProvider")
     def test_genie_room_uses_own_workspace_client(self, mock_provider_class):
-        """Test that genie_room source uses its own workspace_client for auth."""
+        """Test that genie_room source uses its own workspace_client for auth when auth is configured."""
         from unittest.mock import PropertyMock
 
         from dao_ai.config import GenieRoomModel
@@ -745,7 +746,10 @@ class TestBuildConnectionConfigUnifiedAuth:
         # Create mock workspace client for genie room
         mock_ws = Mock()
 
-        genie_room = GenieRoomModel(name="test-genie", space_id="space_123")
+        # Genie room must have auth configured to take priority
+        genie_room = GenieRoomModel(
+            name="test-genie", space_id="space_123", on_behalf_of_user=True
+        )
 
         # Mock the workspace_client property
         with patch.object(
@@ -766,9 +770,12 @@ class TestBuildConnectionConfigUnifiedAuth:
             assert config["transport"] == "http"
             assert config["auth"] == mock_auth
 
+    @patch("dao_ai.providers.databricks.VectorSearchClient")
     @patch("databricks_mcp.DatabricksOAuthClientProvider")
-    def test_vector_search_uses_own_workspace_client(self, mock_provider_class):
-        """Test that vector_search source uses its own workspace_client for auth."""
+    def test_vector_search_uses_own_workspace_client(
+        self, mock_provider_class, mock_vsc_class
+    ):
+        """Test that vector_search source uses its own workspace_client for auth when auth is configured."""
         from unittest.mock import PropertyMock
 
         from dao_ai.config import IndexModel, SchemaModel, TableModel, VectorStoreModel
@@ -783,11 +790,13 @@ class TestBuildConnectionConfigUnifiedAuth:
         table = TableModel(schema=schema, name="table")
         index = IndexModel(schema=schema, name="index")
 
+        # Vector search must have auth configured to take priority
         vector_search = VectorStoreModel(
             source_table=table,
             embedding_source_column="text",
             index=index,
             primary_key="id",
+            on_behalf_of_user=True,
         )
 
         # Mock the workspace_client property
@@ -902,7 +911,7 @@ class TestBuildConnectionConfigUnifiedAuth:
 
     @patch("databricks_mcp.DatabricksOAuthClientProvider")
     def test_connection_has_priority_over_mcpfunction_auth(self, mock_provider_class):
-        """Test that connection's workspace_client takes priority over McpFunctionModel's."""
+        """Test that connection's workspace_client takes priority over McpFunctionModel's when connection has auth."""
         from unittest.mock import PropertyMock
 
         mock_auth = Mock()
@@ -914,7 +923,8 @@ class TestBuildConnectionConfigUnifiedAuth:
         connection_ws = Mock(name="connection_ws")
         function_ws = Mock(name="function_ws")
 
-        connection = ConnectionModel(name="test-connection")
+        # Connection must have auth configured to take priority
+        connection = ConnectionModel(name="test-connection", on_behalf_of_user=True)
         function = McpFunctionModel(connection=connection)
 
         # Mock both workspace_client properties
@@ -937,7 +947,7 @@ class TestBuildConnectionConfigUnifiedAuth:
 
     @patch("databricks_mcp.DatabricksOAuthClientProvider")
     def test_app_has_priority_over_mcpfunction_auth(self, mock_provider_class):
-        """Test that app's workspace_client takes priority over McpFunctionModel's."""
+        """Test that app's workspace_client takes priority over McpFunctionModel's when app has auth."""
         from unittest.mock import PropertyMock
 
         mock_auth = Mock()
@@ -952,7 +962,8 @@ class TestBuildConnectionConfigUnifiedAuth:
         mock_app_instance.url = "https://my-app.databricks.com"
         app_ws.apps.get.return_value = mock_app_instance
 
-        app = DatabricksAppModel(name="my-app")
+        # App must have auth configured to take priority
+        app = DatabricksAppModel(name="my-app", on_behalf_of_user=True)
         function = McpFunctionModel(app=app)
 
         # Mock both workspace_client properties