dao-ai 0.1.15__py3-none-any.whl → 0.1.17__py3-none-any.whl

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/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(
@@ -2090,9 +2094,48 @@ class McpFunctionModel(BaseFunctionModel, IsDatabricksResource):
         if self.sql:
             return f"{workspace_host}/api/2.0/mcp/sql"
 
-        # Databricks App
+        # 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:
-            return self.app.url
+            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:
@@ -2607,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,
@@ -2621,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:
@@ -2897,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/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/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.15.dist-info → dao_ai-0.1.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dao-ai
-Version: 0.1.15
+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.15.dist-info → dao_ai-0.1.17.dist-info}/RECORD

@@ -1,7 +1,7 @@
 dao_ai/__init__.py,sha256=18P98ExEgUaJ1Byw440Ct1ty59v6nxyWtc5S6Uq2m9Q,1062
 dao_ai/catalog.py,sha256=sPZpHTD3lPx4EZUtIWeQV7VQM89WJ6YH__wluk1v2lE,4947
-dao_ai/cli.py,sha256=6qwlS07_Tei6iEPXIJ-19cQVnLXd7vJDpuY4Qu0k96E,51634
-dao_ai/config.py,sha256=Bpaj1iDuDarAnRnTMvIYjtfbewjOSfBppZ6Sp3Id0CM,130242
+dao_ai/cli.py,sha256=YRFbr7BC721SrNiOHRbr1dpeX1Ona76bGhO5vrDqTfk,51784
+dao_ai/config.py,sha256=w1M4q4vbOQrCdsAlpob_2p7e8OXBi9Om0VpihMB4sH0,132150
 dao_ai/graph.py,sha256=1-uQlo7iXZQTT3uU8aYu0N5rnhw5_g_2YLwVsAs6M-U,1119
 dao_ai/logging.py,sha256=lYy4BmucCHvwW7aI3YQkQXKJtMvtTnPDu9Hnd7_O4oc,1556
 dao_ai/messages.py,sha256=4ZBzO4iFdktGSLrmhHzFjzMIt2tpaL-aQLHOQJysGnY,6959
@@ -50,7 +50,7 @@ dao_ai/middleware/tool_selector.py,sha256=POj72YdzZEiNGfW4AQXPBeVVS1RUBsiG7PBuSE
 dao_ai/orchestration/__init__.py,sha256=i85CLfRR335NcCFhaXABcMkn6WZfXnJ8cHH4YZsZN0s,1622
 dao_ai/orchestration/core.py,sha256=qoU7uMXBJCth-sqfu0jRE1L0GOn5H4LoZdRUY1Ib3DI,9585
 dao_ai/orchestration/supervisor.py,sha256=alKMEEo9G5LhdpMvTVdAMel234cZj5_MguWl4wFB7XQ,9873
-dao_ai/orchestration/swarm.py,sha256=8tp1eGmsQqqWpaDcjPoJckddPWohZdmmN0RGRJ_xzOA,9198
+dao_ai/orchestration/swarm.py,sha256=BloDI0TWhGisv9r3-zTgJWZQy9l3hbQ5tXYggovr5i8,9467
 dao_ai/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dao_ai/providers/base.py,sha256=cJGo3UjUTPgS91dv38ePOHwQQtYhIa84ebb167CBXjk,2111
 dao_ai/providers/databricks.py,sha256=bI8lWZ2DkNac9aJWCIJzTG3lCE8MJ8n2BPurEHM1SeE,72791
@@ -59,7 +59,7 @@ dao_ai/tools/agent.py,sha256=plIWALywRjaDSnot13nYehBsrHRpBUpsVZakoGeajOE,1858
 dao_ai/tools/core.py,sha256=bRIN3BZhRQX8-Kpu3HPomliodyskCqjxynQmYbk6Vjs,3783
 dao_ai/tools/email.py,sha256=A3TsCoQgJR7UUWR0g45OPRGDpVoYwctFs1MOZMTt_d4,7389
 dao_ai/tools/genie.py,sha256=b0R51N5D58H1vpOCUCA88ALjLs58KSMn6nl80ap8_c0,11009
-dao_ai/tools/mcp.py,sha256=K1yMQ39UgJ0Q4xhMpNWV3AVNx929w9vxZlLoCq_jrws,22016
+dao_ai/tools/mcp.py,sha256=4uvag52OJPInUEnxFLwpE0JRugTrgHeWbkP5lzIx4lg,22620
 dao_ai/tools/memory.py,sha256=lwObKimAand22Nq3Y63tsv-AXQ5SXUigN9PqRjoWKes,1836
 dao_ai/tools/python.py,sha256=jWFnZPni2sCdtd8D1CqXnZIPHnWkdK27bCJnBXpzhvo,1879
 dao_ai/tools/search.py,sha256=cJ3D9FKr1GAR6xz55dLtRkjtQsI0WRueGt9TPDFpOxc,433
@@ -68,8 +68,8 @@ dao_ai/tools/sql.py,sha256=FG-Aa0FAUAnhCuZvao1J-y-cMM6bU5eCujNbsYn0xDw,7864
 dao_ai/tools/time.py,sha256=tufJniwivq29y0LIffbgeBTIDE6VgrLpmVf8Qr90qjw,9224
 dao_ai/tools/unity_catalog.py,sha256=oBlW6pH-Ne08g60QW9wVi_tyeVYDiecuNoxQbIIFmN8,16515
 dao_ai/tools/vector_search.py,sha256=LF_72vlEF6TwUjKVv6nkUetLK766l9Kl6DQQTc9ebJI,15888
-dao_ai-0.1.15.dist-info/METADATA,sha256=-cei_FUcN2BBlatDymERXwoag5tuuoJvdOcBBnsF8qU,16830
-dao_ai-0.1.15.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-dao_ai-0.1.15.dist-info/entry_points.txt,sha256=Xa-UFyc6gWGwMqMJOt06ZOog2vAfygV_DSwg1AiP46g,43
-dao_ai-0.1.15.dist-info/licenses/LICENSE,sha256=YZt3W32LtPYruuvHE9lGk2bw6ZPMMJD8yLrjgHybyz4,1069
-dao_ai-0.1.15.dist-info/RECORD,,
+dao_ai-0.1.17.dist-info/METADATA,sha256=fLwALpNC9d6hHemJ8Pt38Sfq-JLi3YGm7xxjm_wljd8,16836
+dao_ai-0.1.17.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+dao_ai-0.1.17.dist-info/entry_points.txt,sha256=Xa-UFyc6gWGwMqMJOt06ZOog2vAfygV_DSwg1AiP46g,43
+dao_ai-0.1.17.dist-info/licenses/LICENSE,sha256=YZt3W32LtPYruuvHE9lGk2bw6ZPMMJD8yLrjgHybyz4,1069
+dao_ai-0.1.17.dist-info/RECORD,,