dao-ai 0.1.9__tar.gz → 0.1.10__tar.gz

{dao_ai-0.1.9 → dao_ai-0.1.10}/.gitignore

@@ -278,3 +278,6 @@ mlruns/
 databricks.yaml
 
 .cursor/
+
+# Deployment directory for local source code
+deploy/

{dao_ai-0.1.9 → dao_ai-0.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dao-ai
-Version: 0.1.9
+Version: 0.1.10
 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

{dao_ai-0.1.9 → dao_ai-0.1.10}/app.yaml

@@ -1,4 +1,4 @@
-command: ["uv", "run", "python", "-m", "dao_ai.app_server"]
+command: ["uv", "run", "python", "-m", "dao_ai.apps.server"]
 # Databricks Apps listen by default on port 8000
 
 env:

{dao_ai-0.1.9 → dao_ai-0.1.10}/config/examples/15_complete_applications/hardware_store_lakebase.yaml

@@ -10,6 +10,20 @@
 # DATABRICKS SCHEMAS
 # =============================================================================
 # Define Unity Catalog schemas where data and functions will be stored
+
+
+variables:
+  client_id: &client_id
+    options:
+      - env: RETAIL_AI_DATABRICKS_CLIENT_ID      # Service principal client ID
+      - scope: retail_consumer_goods
+        secret: RETAIL_AI_DATABRICKS_CLIENT_ID
+  client_secret: &client_secret
+    options:
+      - env: RETAIL_AI_DATABRICKS_CLIENT_SECRET  # Service principal secret
+      - scope: retail_consumer_goods
+        secret: RETAIL_AI_DATABRICKS_CLIENT_SECRET
+
 schemas:
   retail_schema: &retail_schema
     catalog_name: retail_consumer_goods                    # Unity Catalog name
@@ -134,6 +148,8 @@ resources:
       instance_name: "retail-consumer-goods"  # Use instance_name for Databricks Lakebase
       description: "Database for agent memory and checkpoints" 
    
+      client_id: *client_id
+      client_secret: *client_secret
       on_behalf_of_user: false
 
 # =============================================================================

{dao_ai-0.1.9 → dao_ai-0.1.10}/databricks.yaml.template

@@ -16,6 +16,9 @@ variables:
     description: The job compute node type (cloud-specific, set per target)
   cloud:
     description: Cloud provider (azure, aws, gcp) - auto-detected or set per target
+  deployment_target:
+    description: Agent deployment target (model_serving or apps) - defaults to model_serving
+    default: model_serving
 
 resources:
   jobs:
@@ -83,6 +86,7 @@ resources:
             notebook_path: ./notebooks/05_deploy_agent.py
             base_parameters:
               config-path: ${var.config_path}
+              deployment-target: ${var.deployment_target}
           environment_key: dao-ai-env
         - task_key: run-evaluation
           depends_on:

{dao_ai-0.1.9 → dao_ai-0.1.10}/notebooks/05_deploy_agent.py

@@ -28,16 +28,23 @@ def find_yaml_files_os_walk(base_path: str) -> Sequence[str]:
 # COMMAND ----------
 
 dbutils.widgets.text(name="config-path", defaultValue="")
+dbutils.widgets.dropdown(
+    name="deployment-target",
+    choices=["", "model_serving", "apps"],
+    defaultValue="",
+)
 
 config_files: Sequence[str] = find_yaml_files_os_walk("../config")
 dbutils.widgets.dropdown(name="config-paths", choices=config_files, defaultValue=next(iter(config_files), ""))
 
 config_path: str | None = dbutils.widgets.get("config-path") or None
 project_path: str = dbutils.widgets.get("config-paths") or None
+deployment_target_str: str | None = dbutils.widgets.get("deployment-target") or None
 
 config_path: str = config_path or project_path
 
-print(config_path)
+print(f"Config path: {config_path}")
+print(f"Deployment target: {deployment_target_str or '(using config default)'}")
 
 # COMMAND ----------
 
@@ -93,10 +100,21 @@ nest_asyncio.apply()
 
 # COMMAND ----------
 
-from dao_ai.config import AppConfig
+from dao_ai.config import AppConfig, DeploymentTarget
 
 config: AppConfig = AppConfig.from_file(path=config_path)
 
+# Resolve deployment target from widget (hybrid resolution)
+# If widget is empty/None, deploy_agent() will use config.app.deployment_target or default
+deployment_target: DeploymentTarget | None = None
+if deployment_target_str:
+    deployment_target = DeploymentTarget(deployment_target_str)
+    print(f"Using widget-specified deployment target: {deployment_target.value}")
+elif config.app and config.app.deployment_target:
+    print(f"Using config file deployment target: {config.app.deployment_target.value}")
+else:
+    print("Using default deployment target: model_serving")
+
 # COMMAND ----------
 
 config.display_graph()
@@ -107,4 +125,4 @@ config.create_agent()
 
 # COMMAND ----------
 
-config.deploy_agent()
+config.deploy_agent(target=deployment_target)

{dao_ai-0.1.9 → dao_ai-0.1.10}/notebooks/99_scratchpad.py

@@ -618,7 +618,7 @@ result = reflection_app.invoke({"messages": example_query})
 
 # COMMAND ----------
 
-from agent_as_code import app
+from dao_ai.apps.model_serving import app
 
 
 # COMMAND ----------

{dao_ai-0.1.9 → dao_ai-0.1.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dao-ai"
-version = "0.1.9"
+version = "0.1.10"
 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.9 → dao_ai-0.1.10}/requirements.txt

@@ -71,6 +71,7 @@ grandalf==0.8
 graphene==3.4.3
 graphql-core==3.2.7
 graphql-relay==3.2.0
+greenlet==3.3.0
 grpcio==1.76.0
 grpcio-status==1.76.0
 gunicorn==23.0.0

{dao_ai-0.1.9 → dao_ai-0.1.10}/schemas/model_config_schema.json

@@ -395,6 +395,18 @@
           "default": "3.12",
           "description": "Python version for Model Serving deployment. Defaults to 3.12 which is supported by Databricks Model Serving. This allows deploying from environments with different Python versions (e.g., Databricks Apps with 3.11).",
           "title": "Python Version"
+        },
+        "deployment_target": {
+          "anyOf": [
+            {
+              "$ref": "#/$defs/DeploymentTarget"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "Default deployment target. If not specified, defaults to MODEL_SERVING. Can be overridden via CLI --target flag. Options: 'model_serving' or 'apps'."
         }
       },
       "required": [
@@ -1472,6 +1484,15 @@
       "title": "DatasetModel",
       "type": "object"
     },
+    "DeploymentTarget": {
+      "description": "Target platform for agent deployment.",
+      "enum": [
+        "model_serving",
+        "apps"
+      ],
+      "title": "DeploymentTarget",
+      "type": "string"
+    },
     "Entitlement": {
       "enum": [
         "CAN_MANAGE",

dao_ai-0.1.10/src/dao_ai/apps/__init__.py

@@ -0,0 +1,24 @@
+"""
+Databricks Apps deployment module for dao-ai.
+
+This subpackage contains all modules related to deploying dao-ai agents
+as Databricks Apps or Model Serving endpoints.
+
+Modules:
+    handlers: MLflow AgentServer request handlers (@invoke, @stream)
+    server: Entry point for Databricks Apps deployment
+    resources: Databricks App resource configuration generation
+    model_serving: Entry point for Databricks Model Serving deployment
+"""
+
+from dao_ai.apps.resources import (
+    generate_app_resources,
+    generate_app_yaml,
+    generate_sdk_resources,
+)
+
+__all__ = [
+    "generate_app_resources",
+    "generate_app_yaml",
+    "generate_sdk_resources",
+]

dao_ai-0.1.9/src/dao_ai/app_server.py → dao_ai-0.1.10/src/dao_ai/apps/handlers.py

@@ -1,20 +1,12 @@
 """
-App server module for running dao-ai agents as Databricks Apps.
+Agent request handlers for MLflow AgentServer.
 
-This module provides the entry point for deploying dao-ai agents as Databricks Apps
-using MLflow's AgentServer. It follows the same pattern as agent_as_code.py but
-uses the AgentServer for the Databricks Apps runtime.
+This module defines the invoke and stream handlers that are registered
+with the MLflow AgentServer. These handlers delegate to the ResponsesAgent
+created from the dao-ai configuration.
 
-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.
-
-Usage:
-    # With environment variable
-    DAO_AI_CONFIG_PATH=/path/to/config.yaml python -m dao_ai.app_server
-
-    # With default model_config.yaml in current directory
-    python -m dao_ai.app_server
+The handlers use async methods (apredict, apredict_stream) to be compatible
+with both Databricks Model Serving and Databricks Apps environments.
 """
 
 import os
@@ -22,8 +14,7 @@ from typing import AsyncGenerator
 
 import mlflow
 from dotenv import load_dotenv
-from mlflow.genai.agent_server import AgentServer, invoke, stream
-from mlflow.pyfunc import ResponsesAgent
+from mlflow.genai.agent_server import invoke, stream
 from mlflow.types.responses import (
     ResponsesAgentRequest,
     ResponsesAgentResponse,
@@ -32,6 +23,7 @@ from mlflow.types.responses import (
 
 from dao_ai.config import AppConfig
 from dao_ai.logging import configure_logging
+from dao_ai.models import LanggraphResponsesAgent
 
 # Load environment variables from .env.local if it exists
 load_dotenv(dotenv_path=".env.local", override=True)
@@ -51,53 +43,42 @@ config: AppConfig = AppConfig.from_file(config_path)
 if config.app and config.app.log_level:
     configure_logging(level=config.app.log_level)
 
-# Create the ResponsesAgent
-_responses_agent: ResponsesAgent = config.as_responses_agent()
+# Create the ResponsesAgent - cast to LanggraphResponsesAgent to access async methods
+_responses_agent: LanggraphResponsesAgent = config.as_responses_agent()  # type: ignore[assignment]
 
 
 @invoke()
-def non_streaming(request: ResponsesAgentRequest) -> ResponsesAgentResponse:
+async def non_streaming(request: ResponsesAgentRequest) -> ResponsesAgentResponse:
     """
     Handle non-streaming requests by delegating to the ResponsesAgent.
 
+    Uses the async apredict() method for compatibility with both
+    Model Serving and Apps environments.
+
     Args:
         request: The incoming ResponsesAgentRequest
 
     Returns:
         ResponsesAgentResponse with the complete output
     """
-    return _responses_agent.predict(request)
+    return await _responses_agent.apredict(request)
 
 
 @stream()
-def streaming(
+async def streaming(
     request: ResponsesAgentRequest,
 ) -> AsyncGenerator[ResponsesAgentStreamEvent, None]:
     """
     Handle streaming requests by delegating to the ResponsesAgent.
 
+    Uses the async apredict_stream() method for compatibility with both
+    Model Serving and Apps environments.
+
     Args:
         request: The incoming ResponsesAgentRequest
 
     Yields:
         ResponsesAgentStreamEvent objects as they are generated
     """
-    # The predict_stream method returns a generator, convert to async generator
-    for event in _responses_agent.predict_stream(request):
+    async for event in _responses_agent.apredict_stream(request):
         yield event
-
-
-# Create the AgentServer instance
-agent_server = AgentServer("ResponsesAgent", enable_chat_proxy=True)
-
-# Define the app as a module level variable to enable multiple workers
-app = agent_server.app
-
-
-def main() -> None:
-    """Entry point for running the agent server."""
-    agent_server.run(app_import_string="dao_ai.app_server:app")
-
-
-if __name__ == "__main__":
-    main()

dao_ai-0.1.10/src/dao_ai/apps/model_serving.py

@@ -0,0 +1,29 @@
+# Apply nest_asyncio FIRST before any other imports
+# This allows dao-ai's async/sync patterns to work in Model Serving
+# where there may already be an event loop running (e.g., notebook context)
+import nest_asyncio
+
+nest_asyncio.apply()
+
+import mlflow  # noqa: E402
+from mlflow.models import ModelConfig  # noqa: E402
+from mlflow.pyfunc import ResponsesAgent  # noqa: E402
+
+from dao_ai.config import AppConfig  # noqa: E402
+from dao_ai.logging import configure_logging  # noqa: E402
+
+mlflow.set_registry_uri("databricks-uc")
+mlflow.set_tracking_uri("databricks")
+
+mlflow.langchain.autolog()
+
+model_config: ModelConfig = ModelConfig()
+config: AppConfig = AppConfig(**model_config.to_dict())
+
+log_level: str = config.app.log_level
+
+configure_logging(level=log_level)
+
+app: ResponsesAgent = config.as_responses_agent()
+
+mlflow.models.set_model(app)