dao-ai 0.0.24__py3-none-any.whl → 0.0.25__py3-none-any.whl

dao_ai/cli.py

@@ -460,6 +460,49 @@ def setup_logging(verbosity: int) -> None:
     logger.add(sys.stderr, level=level)
 
 
+def generate_bundle_from_template(config_path: Path, app_name: str) -> Path:
+    """
+    Generate an app-specific databricks.yaml from databricks.yaml.template.
+
+    This function:
+    1. Reads databricks.yaml.template (permanent template file)
+    2. Replaces __APP_NAME__ with the actual app name
+    3. Writes to databricks.yaml (overwrites if exists)
+    4. Returns the path to the generated file
+
+    The generated databricks.yaml is overwritten on each deployment and is not tracked in git.
+    Schema reference remains pointing to ./schemas/bundle_config_schema.json.
+
+    Args:
+        config_path: Path to the app config file
+        app_name: Normalized app name
+
+    Returns:
+        Path to the generated databricks.yaml file
+    """
+    cwd = Path.cwd()
+    template_path = cwd / "databricks.yaml.template"
+    output_path = cwd / "databricks.yaml"
+
+    if not template_path.exists():
+        logger.error(f"Template file {template_path} does not exist.")
+        sys.exit(1)
+
+    # Read template
+    with open(template_path, "r") as f:
+        template_content = f.read()
+
+    # Replace template variables
+    bundle_content = template_content.replace("__APP_NAME__", app_name)
+
+    # Write generated databricks.yaml (overwrite if exists)
+    with open(output_path, "w") as f:
+        f.write(bundle_content)
+
+    logger.info(f"Generated bundle configuration at {output_path} from template")
+    return output_path
+
+
 def run_databricks_command(
     command: list[str],
     profile: Optional[str] = None,
@@ -467,44 +510,55 @@ def run_databricks_command(
     target: Optional[str] = None,
     dry_run: bool = False,
 ) -> None:
-    """Execute a databricks CLI command with optional profile."""
+    """Execute a databricks CLI command with optional profile and target."""
+    config_path = Path(config) if config else None
+
+    if config_path and not config_path.exists():
+        logger.error(f"Configuration file {config_path} does not exist.")
+        sys.exit(1)
+
+    # Load app config and generate bundle from template
+    app_config: AppConfig = AppConfig.from_file(config_path) if config_path else None
+    normalized_name: str = normalize_name(app_config.app.name) if app_config else None
+
+    # Generate app-specific bundle from template (overwrites databricks.yaml temporarily)
+    if config_path and app_config:
+        generate_bundle_from_template(config_path, normalized_name)
+
+    # Use app name as target if not explicitly provided
+    # This ensures each app gets its own Terraform state in .databricks/bundle/<app-name>/
+    if not target and normalized_name:
+        target = normalized_name
+        logger.debug(f"Using app-specific target: {target}")
+
+    # Build databricks command (no -c flag needed, uses databricks.yaml in current dir)
     cmd = ["databricks"]
     if profile:
         cmd.extend(["--profile", profile])
+
     if target:
         cmd.extend(["--target", target])
-    cmd.extend(command)
-    if config:
-        config_path = Path(config)
 
-        if not config_path.exists():
-            logger.error(f"Configuration file {config_path} does not exist.")
-            sys.exit(1)
-
-        app_config: AppConfig = AppConfig.from_file(config_path)
+    cmd.extend(command)
 
-        # Always convert to path relative to notebooks directory
-        # Get absolute path of config file and current working directory
+    # Add config_path variable for notebooks
+    if config_path and app_config:
+        # Calculate relative path from notebooks directory to config file
         config_abs = config_path.resolve()
         cwd = Path.cwd()
         notebooks_dir = cwd / "notebooks"
 
-        # Calculate relative path from notebooks directory to config file
         try:
             relative_config = config_abs.relative_to(notebooks_dir)
         except ValueError:
-            # Config file is outside notebooks directory, calculate relative path
-            # Use os.path.relpath to get the relative path from notebooks_dir to config file
             relative_config = Path(os.path.relpath(config_abs, notebooks_dir))
 
         cmd.append(f'--var="config_path={relative_config}"')
 
-        normalized_name: str = normalize_name(app_config.app.name)
-        cmd.append(f'--var="app_name={normalized_name}"')
-
     logger.debug(f"Executing command: {' '.join(cmd)}")
 
     if dry_run:
+        logger.info(f"[DRY RUN] Would execute: {' '.join(cmd)}")
         return
 
     try:
@@ -531,6 +585,9 @@ def run_databricks_command(
     except FileNotFoundError:
         logger.error("databricks CLI not found. Please install the Databricks CLI.")
         sys.exit(1)
+    except Exception as e:
+        logger.error(f"Command execution failed: {e}")
+        sys.exit(1)
 
 
 def handle_bundle_command(options: Namespace) -> None:
@@ -539,6 +596,7 @@ def handle_bundle_command(options: Namespace) -> None:
     config: Optional[str] = options.config
     target: Optional[str] = options.target
     dry_run: bool = options.dry_run
+
     if options.deploy:
         logger.info("Deploying DAO AI asset bundle...")
         run_databricks_command(
@@ -546,8 +604,9 @@ def handle_bundle_command(options: Namespace) -> None:
         )
     if options.run:
         logger.info("Running DAO AI system with current configuration...")
+        # Use static job resource key that matches databricks.yaml (resources.jobs.deploy_job)
         run_databricks_command(
-            ["bundle", "run", "deploy-end-to-end"],
+            ["bundle", "run", "deploy_job"],
             profile,
             config,
             target,

dao_ai/config.py

@@ -1301,7 +1301,7 @@ class ChatPayload(BaseModel):
     model_config = ConfigDict(use_enum_values=True, extra="forbid")
     input: Optional[list[Message]] = None
     messages: Optional[list[Message]] = None
-    custom_inputs: dict
+    custom_inputs: Optional[dict] = Field(default_factory=dict)
 
     @model_validator(mode="after")
     def validate_mutual_exclusion_and_alias(self) -> "ChatPayload":

{dao_ai-0.0.24.dist-info → dao_ai-0.0.25.dist-info}/METADATA

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

@@ -2,8 +2,8 @@ dao_ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dao_ai/agent_as_code.py,sha256=kPSeDz2-1jRaed1TMs4LA3VECoyqe9_Ed2beRLB9gXQ,472
 dao_ai/catalog.py,sha256=sPZpHTD3lPx4EZUtIWeQV7VQM89WJ6YH__wluk1v2lE,4947
 dao_ai/chat_models.py,sha256=uhwwOTeLyHWqoTTgHrs4n5iSyTwe4EQcLKnh3jRxPWI,8626
-dao_ai/cli.py,sha256=Aez2TQW3Q8Ho1IaIkRggt0NevDxAAVPjXkePC5GPJF0,20429
-dao_ai/config.py,sha256=j9SAdf7UHSoS2pLos-oypJNDPS48A2rRq55OEW1wsMI,56755
+dao_ai/cli.py,sha256=gq-nsapWxDA1M6Jua3vajBvIwf0Oa6YLcB58lEtMKUo,22503
+dao_ai/config.py,sha256=_4OyJ1x7DH1S-5-FTJp7geeOf2H096PQHVFUBtALKsU,56795
 dao_ai/graph.py,sha256=APYc2y3cig4P52X4sOHSFSZNK8j5EtEPJLFwWeJ3KQQ,7956
 dao_ai/guardrails.py,sha256=4TKArDONRy8RwHzOT1plZ1rhy3x9GF_aeGpPCRl6wYA,4016
 dao_ai/messages.py,sha256=xl_3-WcFqZKCFCiov8sZOPljTdM3gX3fCHhxq-xFg2U,7005
@@ -34,8 +34,8 @@ dao_ai/tools/slack.py,sha256=SCvyVcD9Pv_XXPXePE_fSU1Pd8VLTEkKDLvoGTZWy2Y,4775
 dao_ai/tools/time.py,sha256=Y-23qdnNHzwjvnfkWvYsE7PoWS1hfeKy44tA7sCnNac,8759
 dao_ai/tools/unity_catalog.py,sha256=uX_h52BuBAr4c9UeqSMI7DNz3BPRLeai5tBVW4sJqRI,13113
 dao_ai/tools/vector_search.py,sha256=EDYQs51zIPaAP0ma1D81wJT77GQ-v-cjb2XrFVWfWdg,2621
-dao_ai-0.0.24.dist-info/METADATA,sha256=69qYBqdZg8tZF1ni90RBrSG9OAmE4jXdf5lec6U0TL8,42639
-dao_ai-0.0.24.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dao_ai-0.0.24.dist-info/entry_points.txt,sha256=Xa-UFyc6gWGwMqMJOt06ZOog2vAfygV_DSwg1AiP46g,43
-dao_ai-0.0.24.dist-info/licenses/LICENSE,sha256=YZt3W32LtPYruuvHE9lGk2bw6ZPMMJD8yLrjgHybyz4,1069
-dao_ai-0.0.24.dist-info/RECORD,,
+dao_ai-0.0.25.dist-info/METADATA,sha256=ahAblBSty81iw_mlf9blqOF4-AKN5Asak9SWH0H4FIs,42639
+dao_ai-0.0.25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dao_ai-0.0.25.dist-info/entry_points.txt,sha256=Xa-UFyc6gWGwMqMJOt06ZOog2vAfygV_DSwg1AiP46g,43
+dao_ai-0.0.25.dist-info/licenses/LICENSE,sha256=YZt3W32LtPYruuvHE9lGk2bw6ZPMMJD8yLrjgHybyz4,1069
+dao_ai-0.0.25.dist-info/RECORD,,