dao-ai 0.1.11__py3-none-any.whl → 0.1.13__py3-none-any.whl

dao_ai/apps/handlers.py

@@ -34,7 +34,7 @@ mlflow.set_tracking_uri("databricks")
 mlflow.langchain.autolog()
 
 # Get config path from environment or use default
-config_path: str = os.environ.get("DAO_AI_CONFIG_PATH", "model_config.yaml")
+config_path: str = os.environ.get("DAO_AI_CONFIG_PATH", "dao_ai.yaml")
 
 # Load configuration using AppConfig.from_file (consistent with CLI, notebook, builder)
 config: AppConfig = AppConfig.from_file(config_path)

dao_ai/apps/resources.py

@@ -310,6 +310,25 @@ def _extract_secrets_from_config(config: AppConfig) -> list[dict[str, Any]]:
         A list of secret resource dictionaries with unique scope/key pairs
     """
     secrets: dict[tuple[str, str], dict[str, Any]] = {}
+    used_names: set[str] = set()
+
+    def get_unique_resource_name(base_name: str) -> str:
+        """Generate a unique resource name, adding suffix if needed."""
+        sanitized = _sanitize_resource_name(base_name)
+        if sanitized not in used_names:
+            used_names.add(sanitized)
+            return sanitized
+        # Name collision - add numeric suffix
+        counter = 1
+        while True:
+            # Leave room for suffix (e.g., "_1", "_2", etc.)
+            suffix = f"_{counter}"
+            max_base_len = 30 - len(suffix)
+            candidate = sanitized[:max_base_len] + suffix
+            if candidate not in used_names:
+                used_names.add(candidate)
+                return candidate
+            counter += 1
 
     def extract_from_value(value: Any, path: str = "") -> None:
         """Recursively extract secrets from any value."""
@@ -317,9 +336,10 @@ def _extract_secrets_from_config(config: AppConfig) -> list[dict[str, Any]]:
             secret_key = (value.scope, value.secret)
             if secret_key not in secrets:
                 # Create a unique name for the secret resource
-                resource_name = f"{value.scope}_{value.secret}".replace(
-                    "-", "_"
-                ).replace("/", "_")
+                base_name = f"{value.scope}_{value.secret}".replace("-", "_").replace(
+                    "/", "_"
+                )
+                resource_name = get_unique_resource_name(base_name)
                 secrets[secret_key] = {
                     "name": resource_name,
                     "type": "secret",
@@ -327,7 +347,9 @@ def _extract_secrets_from_config(config: AppConfig) -> list[dict[str, Any]]:
                     "key": value.secret,
                     "permissions": [{"level": "READ"}],
                 }
-                logger.debug(f"Found secret: {value.scope}/{value.secret} at {path}")
+                logger.debug(
+                    f"Found secret: {value.scope}/{value.secret} at {path} -> resource: {resource_name}"
+                )
         elif isinstance(value, dict):
             for k, v in value.items():
                 extract_from_value(v, f"{path}.{k}" if path else k)
@@ -742,6 +764,25 @@ def _extract_sdk_secrets_from_config(config: AppConfig) -> list[AppResource]:
         A list of AppResource objects for secrets
     """
     secrets: dict[tuple[str, str], AppResource] = {}
+    used_names: set[str] = set()
+
+    def get_unique_resource_name(base_name: str) -> str:
+        """Generate a unique resource name, adding suffix if needed."""
+        sanitized = _sanitize_resource_name(base_name)
+        if sanitized not in used_names:
+            used_names.add(sanitized)
+            return sanitized
+        # Name collision - add numeric suffix
+        counter = 1
+        while True:
+            # Leave room for suffix (e.g., "_1", "_2", etc.)
+            suffix = f"_{counter}"
+            max_base_len = 30 - len(suffix)
+            candidate = sanitized[:max_base_len] + suffix
+            if candidate not in used_names:
+                used_names.add(candidate)
+                return candidate
+            counter += 1
 
     def extract_from_value(value: Any) -> None:
         """Recursively extract secrets from any value."""
@@ -749,10 +790,10 @@ def _extract_sdk_secrets_from_config(config: AppConfig) -> list[AppResource]:
             secret_key = (value.scope, value.secret)
             if secret_key not in secrets:
                 # Create a unique name for the secret resource
-                resource_name = f"{value.scope}_{value.secret}".replace(
-                    "-", "_"
-                ).replace("/", "_")
-                resource_name = _sanitize_resource_name(resource_name)
+                base_name = f"{value.scope}_{value.secret}".replace("-", "_").replace(
+                    "/", "_"
+                )
+                resource_name = get_unique_resource_name(base_name)
 
                 resource = AppResource(
                     name=resource_name,
@@ -764,7 +805,7 @@ def _extract_sdk_secrets_from_config(config: AppConfig) -> list[AppResource]:
                 )
                 secrets[secret_key] = resource
                 logger.debug(
-                    f"Found secret for SDK resource: {value.scope}/{value.secret}"
+                    f"Found secret for SDK resource: {value.scope}/{value.secret} -> resource: {resource_name}"
                 )
         elif isinstance(value, dict):
             for v in value.values():
@@ -969,12 +1010,21 @@ def generate_app_yaml(
         {"name": "MLFLOW_TRACKING_URI", "value": "databricks"},
         {"name": "MLFLOW_REGISTRY_URI", "value": "databricks-uc"},
         {"name": "MLFLOW_EXPERIMENT_ID", "valueFrom": "experiment"},
-        {"name": "DAO_AI_CONFIG_PATH", "value": "model_config.yaml"},
+        {"name": "DAO_AI_CONFIG_PATH", "value": "dao_ai.yaml"},
     ]
 
     # Extract environment variables from config.app.environment_vars
     config_env_vars = _extract_env_vars_from_config(config)
 
+    # Environment variables that are automatically provided by Databricks Apps
+    # and should not be included in app.yaml
+    platform_provided_env_vars = {"DATABRICKS_HOST"}
+
+    # Filter out platform-provided env vars from config
+    config_env_vars = [
+        e for e in config_env_vars if e["name"] not in platform_provided_env_vars
+    ]
+
     # Merge config env vars, avoiding duplicates (config takes precedence)
     base_env_names = {e["name"] for e in env_vars}
     for config_env in config_env_vars:

dao_ai/apps/server.py

@@ -7,13 +7,13 @@ uses the AgentServer for the Databricks Apps runtime.
 
 Configuration Loading:
     The config path is specified via the DAO_AI_CONFIG_PATH environment variable,
-    or defaults to model_config.yaml in the current directory.
+    or defaults to dao_ai.yaml in the current directory.
 
 Usage:
     # With environment variable
     DAO_AI_CONFIG_PATH=/path/to/config.yaml python -m dao_ai.apps.server
 
-    # With default model_config.yaml in current directory
+    # With default dao_ai.yaml in current directory
     python -m dao_ai.apps.server
 """
 

dao_ai/config.py

@@ -294,36 +294,37 @@ class IsDatabricksResource(ABC, BaseModel):
 
         # Check for OBO first (highest priority)
         if self.on_behalf_of_user:
-            # NEW: In Databricks Apps, use forwarded headers for per-user auth
-            try:
-                from mlflow.genai.agent_server import get_request_headers
-
-                headers = get_request_headers()
-                forwarded_token = headers.get("x-forwarded-access-token")
+            # In Databricks Apps, use forwarded headers for per-user auth
+            from mlflow.genai.agent_server import get_request_headers
+
+            headers = get_request_headers()
+            logger.debug(f"Headers received: {list(headers.keys())}")
+            # Try both lowercase and title-case header names (HTTP headers are case-insensitive)
+            forwarded_token = headers.get("x-forwarded-access-token") or headers.get(
+                "X-Forwarded-Access-Token"
+            )
 
-                if forwarded_token:
-                    forwarded_user = headers.get("x-forwarded-user", "unknown")
-                    logger.debug(
-                        f"Creating WorkspaceClient for {self.__class__.__name__} "
-                        f"with OBO using forwarded token from Databricks Apps",
-                        forwarded_user=forwarded_user,
-                    )
-                    # Use workspace_host if configured, otherwise SDK will auto-detect
-                    workspace_host_value: str | None = (
-                        normalize_host(value_of(self.workspace_host))
-                        if self.workspace_host
-                        else None
-                    )
-                    return WorkspaceClient(
-                        host=workspace_host_value,
-                        token=forwarded_token,
-                        auth_type="pat",
-                    )
-            except (ImportError, LookupError):
-                # mlflow not available or headers not set - fall through to Model Serving
-                pass
+            if forwarded_token:
+                forwarded_user = headers.get("x-forwarded-user") or headers.get(
+                    "X-Forwarded-User", "unknown"
+                )
+                logger.debug(
+                    f"Creating WorkspaceClient for {self.__class__.__name__} "
+                    f"with OBO using forwarded token from Databricks Apps",
+                    forwarded_user=forwarded_user,
+                )
+                # Use workspace_host if configured, otherwise SDK will auto-detect
+                workspace_host_value: str | None = (
+                    normalize_host(value_of(self.workspace_host))
+                    if self.workspace_host
+                    else None
+                )
+                return WorkspaceClient(
+                    host=workspace_host_value,
+                    token=forwarded_token,
+                    auth_type="pat",
+                )
 
-            # Fall back to Model Serving OBO (existing behavior)
             credentials_strategy: CredentialsStrategy = ModelServingUserCredentials()
             logger.debug(
                 f"Creating WorkspaceClient for {self.__class__.__name__} "

dao_ai/providers/databricks.py

@@ -152,25 +152,77 @@ class DatabricksProvider(ServiceProvider):
         client_secret: str | None = None,
         workspace_host: str | None = None,
     ) -> None:
-        if w is None:
-            w = _workspace_client(
-                pat=pat,
-                client_id=client_id,
-                client_secret=client_secret,
-                workspace_host=workspace_host,
+        # Store credentials for lazy initialization
+        self._pat = pat
+        self._client_id = client_id
+        self._client_secret = client_secret
+        self._workspace_host = workspace_host
+
+        # Lazy initialization for WorkspaceClient
+        self._w: WorkspaceClient | None = w
+        self._w_initialized = w is not None
+
+        # Lazy initialization for VectorSearchClient - only create when needed
+        # This avoids authentication errors in Databricks Apps where VSC
+        # requires explicit credentials but the platform uses ambient auth
+        self._vsc: VectorSearchClient | None = vsc
+        self._vsc_initialized = vsc is not None
+
+        # Lazy initialization for DatabricksFunctionClient
+        self._dfs: DatabricksFunctionClient | None = dfs
+        self._dfs_initialized = dfs is not None
+
+    @property
+    def w(self) -> WorkspaceClient:
+        """Lazy initialization of WorkspaceClient."""
+        if not self._w_initialized:
+            self._w = _workspace_client(
+                pat=self._pat,
+                client_id=self._client_id,
+                client_secret=self._client_secret,
+                workspace_host=self._workspace_host,
             )
-        if vsc is None:
-            vsc = _vector_search_client(
-                pat=pat,
-                client_id=client_id,
-                client_secret=client_secret,
-                workspace_host=workspace_host,
+            self._w_initialized = True
+        return self._w  # type: ignore[return-value]
+
+    @w.setter
+    def w(self, value: WorkspaceClient) -> None:
+        """Set WorkspaceClient and mark as initialized."""
+        self._w = value
+        self._w_initialized = True
+
+    @property
+    def vsc(self) -> VectorSearchClient:
+        """Lazy initialization of VectorSearchClient."""
+        if not self._vsc_initialized:
+            self._vsc = _vector_search_client(
+                pat=self._pat,
+                client_id=self._client_id,
+                client_secret=self._client_secret,
+                workspace_host=self._workspace_host,
             )
-        if dfs is None:
-            dfs = _function_client(w=w)
-        self.w = w
-        self.vsc = vsc
-        self.dfs = dfs
+            self._vsc_initialized = True
+        return self._vsc  # type: ignore[return-value]
+
+    @vsc.setter
+    def vsc(self, value: VectorSearchClient) -> None:
+        """Set VectorSearchClient and mark as initialized."""
+        self._vsc = value
+        self._vsc_initialized = True
+
+    @property
+    def dfs(self) -> DatabricksFunctionClient:
+        """Lazy initialization of DatabricksFunctionClient."""
+        if not self._dfs_initialized:
+            self._dfs = _function_client(w=self.w)
+            self._dfs_initialized = True
+        return self._dfs  # type: ignore[return-value]
+
+    @dfs.setter
+    def dfs(self, value: DatabricksFunctionClient) -> None:
+        """Set DatabricksFunctionClient and mark as initialized."""
+        self._dfs = value
+        self._dfs_initialized = True
 
     def experiment_name(self, config: AppConfig) -> str:
         current_user: User = self.w.current_user.me()
@@ -572,7 +624,7 @@ class DatabricksProvider(ServiceProvider):
         source_config_path: str | None = config.source_config_path
         if source_config_path:
             # Read the config file and upload to workspace
-            config_file_name: str = "model_config.yaml"
+            config_file_name: str = "dao_ai.yaml"
             workspace_config_path: str = f"{source_path}/{config_file_name}"
 
             logger.info(
@@ -603,7 +655,7 @@ class DatabricksProvider(ServiceProvider):
             logger.warning(
                 "No source config path available. "
                 "Ensure DAO_AI_CONFIG_PATH is set in the app environment or "
-                "model_config.yaml exists in the app source directory."
+                "dao_ai.yaml exists in the app source directory."
             )
 
         # Generate and upload app.yaml with dynamically discovered resources
@@ -634,7 +686,9 @@ class DatabricksProvider(ServiceProvider):
             generate_user_api_scopes,
         )
 
-        sdk_resources = generate_sdk_resources(config, experiment_id=experiment.experiment_id)
+        sdk_resources = generate_sdk_resources(
+            config, experiment_id=experiment.experiment_id
+        )
         if sdk_resources:
             logger.info(
                 "Discovered app resources from config",

{dao_ai-0.1.11.dist-info → dao_ai-0.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dao-ai
-Version: 0.1.11
+Version: 0.1.13
 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
@@ -125,7 +125,7 @@ DAO AI Builder generates valid YAML configurations that work seamlessly with thi
 - **[Architecture](docs/architecture.md)** - Understand how DAO works under the hood
 
 ### Core Concepts
-- **[Key Capabilities](docs/key-capabilities.md)** - Explore 14 powerful features for production agents
+- **[Key Capabilities](docs/key-capabilities.md)** - Explore 15 powerful features for production agents
 - **[Configuration Reference](docs/configuration-reference.md)** - Complete YAML configuration guide
 - **[Examples](docs/examples.md)** - Ready-to-use example configurations
 
@@ -148,7 +148,7 @@ Before you begin, you'll need:
 - **Python 3.11 or newer** installed on your computer ([download here](https://www.python.org/downloads/))
 - **A Databricks workspace** (ask your IT team or see [Databricks docs](https://docs.databricks.com/))
   - Access to **Unity Catalog** (your organization's data catalog)
-  - **Model Serving** enabled (for deploying AI agents)
+  - **Model Serving** or **Databricks Apps** enabled (for deploying AI agents)
   - *Optional*: Vector Search, Genie (for advanced features)
 
 **Not sure if you have access?** Your Databricks administrator can grant you permissions.
@@ -345,6 +345,7 @@ DAO provides powerful capabilities for building production-ready AI agents:
 
 | Feature | Description |
 |---------|-------------|
+| **Dual Deployment Targets** | Deploy to Databricks Model Serving or Databricks Apps with a single config |
 | **Multi-Tool Support** | Python functions, Unity Catalog, MCP, Agent Endpoints |
 | **On-Behalf-Of User** | Per-user permissions and governance |
 | **Advanced Caching** | Two-tier (LRU + Semantic) caching for cost optimization |

{dao_ai-0.1.11.dist-info → dao_ai-0.1.13.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=1Ox8qjLKRlrKu2YXozm0lWoeZnDCouECeZSGVPkQgIQ,50923
-dao_ai/config.py,sha256=9G_JiPbr_ihUCaqYPvnMbzLKtyppXTjraQfVOxnqeBA,129323
+dao_ai/config.py,sha256=E2lwWro3A6c3cKLYyHZeqNz2X5vkXgLS8TfDlGL5o9M,129307
 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
@@ -14,10 +14,10 @@ dao_ai/types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dao_ai/utils.py,sha256=_Urd7Nj2VzrgPKf3NS4E6vt0lWRhEUddBqWN9BksqeE,11543
 dao_ai/vector_search.py,sha256=8d3xROg9zSIYNXjRRl6rSexsJTlufjRl5Fy1ZA8daKA,4019
 dao_ai/apps/__init__.py,sha256=RLuhZf4gQ4pemwKDz1183aXib8UfaRhwfKvRx68GRlM,661
-dao_ai/apps/handlers.py,sha256=NN81uDV2hy83zT-kY36mxyBgCQIHBJApX4bnUceGB8k,2614
+dao_ai/apps/handlers.py,sha256=nbJZOgmnHG5icR4Pb56jxIWsm_AGnsURgViMJX2_LTU,2608
 dao_ai/apps/model_serving.py,sha256=XLt3_0pGSRceMK6YtOrND9Jnh7mKLPCtwjVDLIaptQU,847
-dao_ai/apps/resources.py,sha256=kAXqYx-Xwba1SaltPZIAtB2xoIHxH98Q41b8YGPLfI0,38029
-dao_ai/apps/server.py,sha256=D3R3J1svtpxnpDjoM-oxg66dMDI8USgiQHPRvRHc7oQ,1276
+dao_ai/apps/resources.py,sha256=5l6UxfMq6uspOql-HNDyUikfqRAa9eH_TiJHrGgMb6s,40029
+dao_ai/apps/server.py,sha256=neWbVnC2z9f-tJZBnho70FytNDEVOdOM1YngoGc5KHI,1264
 dao_ai/genie/__init__.py,sha256=vdEyGhrt6L8GlK75SyYvTnl8QpHKDCJC5hJKLg4DesQ,1063
 dao_ai/genie/core.py,sha256=HPKbocvhnnw_PkQwfoq5bpgQmL9lZyyS6_goTJL8yiY,1073
 dao_ai/genie/cache/__init__.py,sha256=JfgCJl1NYQ1aZvZ4kly4T6uQK6ZCJ6PX_htuq7nJF50,1203
@@ -53,7 +53,7 @@ dao_ai/orchestration/supervisor.py,sha256=alKMEEo9G5LhdpMvTVdAMel234cZj5_MguWl4w
 dao_ai/orchestration/swarm.py,sha256=8tp1eGmsQqqWpaDcjPoJckddPWohZdmmN0RGRJ_xzOA,9198
 dao_ai/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dao_ai/providers/base.py,sha256=cJGo3UjUTPgS91dv38ePOHwQQtYhIa84ebb167CBXjk,2111
-dao_ai/providers/databricks.py,sha256=EZokRfbScW5K2h8EOCQ95XjoXt981ySslQk0d0DJmeI,70687
+dao_ai/providers/databricks.py,sha256=bI8lWZ2DkNac9aJWCIJzTG3lCE8MJ8n2BPurEHM1SeE,72791
 dao_ai/tools/__init__.py,sha256=NfRpAKds_taHbx6gzLPWgtPXve-YpwzkoOAUflwxceM,1734
 dao_ai/tools/agent.py,sha256=plIWALywRjaDSnot13nYehBsrHRpBUpsVZakoGeajOE,1858
 dao_ai/tools/core.py,sha256=bRIN3BZhRQX8-Kpu3HPomliodyskCqjxynQmYbk6Vjs,3783
@@ -68,8 +68,8 @@ dao_ai/tools/sql.py,sha256=tKd1gjpLuKdQDyfmyYYtMiNRHDW6MGRbdEVaeqyB8Ok,7632
 dao_ai/tools/time.py,sha256=tufJniwivq29y0LIffbgeBTIDE6VgrLpmVf8Qr90qjw,9224
 dao_ai/tools/unity_catalog.py,sha256=AjQfW7bvV8NurqDLIyntYRv2eJuTwNdbvex1L5CRjOk,15534
 dao_ai/tools/vector_search.py,sha256=oe2uBwl2TfeJIXPpwiS6Rmz7wcHczSxNyqS9P3hE6co,14542
-dao_ai-0.1.11.dist-info/METADATA,sha256=uSlkpK84xgQlBOkLAzdOCycWxUC1ovzrrrU_uCVMOd0,16698
-dao_ai-0.1.11.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-dao_ai-0.1.11.dist-info/entry_points.txt,sha256=Xa-UFyc6gWGwMqMJOt06ZOog2vAfygV_DSwg1AiP46g,43
-dao_ai-0.1.11.dist-info/licenses/LICENSE,sha256=YZt3W32LtPYruuvHE9lGk2bw6ZPMMJD8yLrjgHybyz4,1069
-dao_ai-0.1.11.dist-info/RECORD,,
+dao_ai-0.1.13.dist-info/METADATA,sha256=xQ1apcAp24Co2FBzFL6Hw5mCqQzsskmMw-br41NSJqk,16830
+dao_ai-0.1.13.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+dao_ai-0.1.13.dist-info/entry_points.txt,sha256=Xa-UFyc6gWGwMqMJOt06ZOog2vAfygV_DSwg1AiP46g,43
+dao_ai-0.1.13.dist-info/licenses/LICENSE,sha256=YZt3W32LtPYruuvHE9lGk2bw6ZPMMJD8yLrjgHybyz4,1069
+dao_ai-0.1.13.dist-info/RECORD,,