dao-ai 0.0.21__tar.gz → 0.0.22__tar.gz

{dao_ai-0.0.21 → dao_ai-0.0.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dao-ai
-Version: 0.0.21
+Version: 0.0.22
 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
@@ -24,9 +24,9 @@ Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: System :: Distributed Computing
 Requires-Python: >=3.12
-Requires-Dist: databricks-agents>=1.6.0
+Requires-Dist: databricks-agents>=1.6.1
 Requires-Dist: databricks-langchain>=0.8.0
-Requires-Dist: databricks-sdk[openai]>=0.66.0
+Requires-Dist: databricks-sdk[openai]>=0.67.0
 Requires-Dist: duckduckgo-search>=8.0.2
 Requires-Dist: grandalf>=0.8
 Requires-Dist: langchain-mcp-adapters>=0.1.10

{dao_ai-0.0.21 → dao_ai-0.0.22}/config/hardware_store/supervisor_postgres.yaml

@@ -194,29 +194,30 @@ resources:
   databases:
     # PostgreSQL database for agent memory and checkpoints
     retail_database: &retail_database
-      name: "retail-consumer-goods"
+      name: "Retail and Consumer Goods Database"
+      instance_name: "retail-consumer-goods"
       description: "Database for agent memory and checkpoints" 
       
       # Database connection parameters
       # These can be set via environment variables or Databricks secrets
-      host:                                                 
-        default_value: localhost                                             
-        options:
-          - env: PGHOST                              # Environment variable
-          - scope: retail_ai                         # Databricks secret scope
-            secret: PGHOST                           # Secret name
-      port: 
-        default_value: 5432
-        options:
-        - env: PGPORT 
-        - scope: retail_ai
-          secret: PGPORT
-      database: 
-        default_value: databricks_postgres           # Default database name
-        options:
-        - env: PGDATABASE 
-        - scope: retail_ai
-          secret: PGDATABASE
+#      host:                                                 
+#        default_value: localhost                                             
+#        options:
+#          - env: PGHOST                              # Environment variable
+#          - scope: retail_ai                         # Databricks secret scope
+#            secret: PGHOST                           # Secret name
+#      port: 
+#        default_value: 5432
+#        options:
+#        - env: PGPORT 
+#        - scope: retail_ai
+#          secret: PGPORT
+#      database: 
+#        default_value: databricks_postgres           # Default database name
+#        options:
+#        - env: PGDATABASE 
+#        - scope: retail_ai
+#          secret: PGDATABASE
 
 
       # Traditional PostgreSQL authentication (commented out)
@@ -959,7 +960,7 @@ app:
           content: Can you recommend a lamp to match my oak side tables?
       custom_inputs:
         configurable:
-          thread_id: "1"
+          #thread_id: "1"
           user_id: my_user_id
           store_num: 87887
   #chat_history: 

{dao_ai-0.0.21 → dao_ai-0.0.22}/databricks.yaml

@@ -50,17 +50,24 @@ resources:
             base_parameters:
               config-path: ${var.config_path}
           environment_key: dao-ai-env
+        - task_key: provision-lakebase
+          notebook_task:
+            notebook_path: ./notebooks/03_provision_lakebase.py
+            base_parameters:
+              config-path: ${var.config_path}
+          environment_key: dao-ai-env
         - task_key: generate-evaluation-data
           depends_on:
             - task_key: provision-vector-search
           notebook_task:
-            notebook_path: ./notebooks/03_generate_evaluation_data.py
+            notebook_path: ./notebooks/06_generate_evaluation_data.py
             base_parameters:
               config-path: ${var.config_path}
           environment_key: dao-ai-env
         - task_key: unity-catalog-tools
           depends_on:
             - task_key: provision-vector-search
+            - task_key: provision-lakebase
           notebook_task:
             notebook_path: ./notebooks/04_unity_catalog_tools.py
             base_parameters:
@@ -70,7 +77,7 @@ resources:
           depends_on:
             - task_key: unity-catalog-tools
           notebook_task:
-            notebook_path: ./notebooks/05_agent_as_code_driver.py
+            notebook_path: ./notebooks/05_deploy_agent.py
             base_parameters:
               config-path: ${var.config_path}
           environment_key: dao-ai-env
@@ -79,7 +86,7 @@ resources:
             - task_key: deploy-agents
             - task_key: generate-evaluation-data
           notebook_task:
-            notebook_path: ./notebooks/06_run_evaluation.py
+            notebook_path: ./notebooks/07_run_evaluation.py
             base_parameters:
               config-path: ${var.config_path}
           environment_key: dao-ai-env

{dao_ai-0.0.21 → dao_ai-0.0.22}/notebooks/01_ingest_and_transform.py

@@ -1,11 +1,42 @@
 # Databricks notebook source
 # MAGIC %pip install --quiet --upgrade -r ../requirements.txt
+# MAGIC %pip uninstall --quiet -y databricks-connect pyspark pyspark-connect
+# MAGIC %pip install --quiet databricks-connect
 # MAGIC %restart_python
 
 # COMMAND ----------
 
-dbutils.widgets.text(name="config-path", defaultValue="../config/model_config.yaml")
-config_path: str = dbutils.widgets.get("config-path")
+from typing import Sequence
+import os
+
+def find_yaml_files_os_walk(base_path: str) -> Sequence[str]:
+    if not os.path.exists(base_path):
+        raise FileNotFoundError(f"Base path does not exist: {base_path}")
+    
+    if not os.path.isdir(base_path):
+        raise NotADirectoryError(f"Base path is not a directory: {base_path}")
+    
+    yaml_files = []
+    
+    for root, dirs, files in os.walk(base_path):
+        for file in files:
+            if file.lower().endswith(('.yaml', '.yml')):
+                yaml_files.append(os.path.join(root, file))
+    
+    return sorted(yaml_files)
+
+# COMMAND ----------
+
+dbutils.widgets.text(name="config-path", 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
+
+config_path: str = config_path or project_path
+
 print(config_path)
 
 # COMMAND ----------

{dao_ai-0.0.21 → dao_ai-0.0.22}/notebooks/02_provision_vector_search.py

@@ -6,10 +6,38 @@
 
 # COMMAND ----------
 
-dbutils.widgets.text(name="config-path", defaultValue="../config/model_config.yaml")
-config_path: str = dbutils.widgets.get("config-path")
-print(config_path)
+from typing import Sequence
+import os
+
+def find_yaml_files_os_walk(base_path: str) -> Sequence[str]:
+    if not os.path.exists(base_path):
+        raise FileNotFoundError(f"Base path does not exist: {base_path}")
+    
+    if not os.path.isdir(base_path):
+        raise NotADirectoryError(f"Base path is not a directory: {base_path}")
+    
+    yaml_files = []
+    
+    for root, dirs, files in os.walk(base_path):
+        for file in files:
+            if file.lower().endswith(('.yaml', '.yml')):
+                yaml_files.append(os.path.join(root, file))
+    
+    return sorted(yaml_files)
+
+# COMMAND ----------
+
+dbutils.widgets.text(name="config-path", 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
+
+config_path: str = config_path or project_path
+
+print(config_path)
 # COMMAND ----------
 
 import sys

dao_ai-0.0.22/notebooks/03_provision_lakebase.py

@@ -0,0 +1,85 @@
+# Databricks notebook source
+# MAGIC %pip install --quiet --upgrade -r ../requirements.txt
+# MAGIC %pip uninstall --quiet -y databricks-connect pyspark pyspark-connect
+# MAGIC %pip install --quiet databricks-connect
+# MAGIC %restart_python
+
+# COMMAND ----------
+
+from typing import Sequence
+import os
+
+def find_yaml_files_os_walk(base_path: str) -> Sequence[str]:
+    if not os.path.exists(base_path):
+        raise FileNotFoundError(f"Base path does not exist: {base_path}")
+    
+    if not os.path.isdir(base_path):
+        raise NotADirectoryError(f"Base path is not a directory: {base_path}")
+    
+    yaml_files = []
+    
+    for root, dirs, files in os.walk(base_path):
+        for file in files:
+            if file.lower().endswith(('.yaml', '.yml')):
+                yaml_files.append(os.path.join(root, file))
+    
+    return sorted(yaml_files)
+
+# COMMAND ----------
+
+dbutils.widgets.text(name="config-path", 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
+
+config_path: str = config_path or project_path
+
+print(config_path)
+
+# COMMAND ----------
+
+import sys
+from typing import Sequence
+from importlib.metadata import version
+
+sys.path.insert(0, "../src")
+
+pip_requirements: Sequence[str] = (
+  f"databricks-sdk=={version('databricks-sdk')}",
+  f"mlflow=={version('mlflow')}",
+)
+print("\n".join(pip_requirements))
+
+# COMMAND ----------
+
+# MAGIC %load_ext autoreload
+# MAGIC %autoreload 2
+
+# COMMAND ----------
+
+from dotenv import find_dotenv, load_dotenv
+
+_ = load_dotenv(find_dotenv())
+
+# COMMAND ----------
+
+from dao_ai.config import AppConfig
+
+config: AppConfig = AppConfig.from_file(path=config_path)
+
+# COMMAND ----------
+
+from dao_ai.config import DatabaseModel
+
+databases: dict[str, DatabaseModel] = config.resources.databases
+
+for _, database in databases.items():
+  database: DatabaseModel
+
+  print(f"database: {database}")
+  database.create()
+
+

{dao_ai-0.0.21 → dao_ai-0.0.22}/notebooks/04_unity_catalog_tools.py

@@ -6,8 +6,37 @@
 
 # COMMAND ----------
 
-dbutils.widgets.text(name="config-path", defaultValue="../config/model_config.yaml")
-config_path: str = dbutils.widgets.get("config-path")
+from typing import Sequence
+import os
+
+def find_yaml_files_os_walk(base_path: str) -> Sequence[str]:
+    if not os.path.exists(base_path):
+        raise FileNotFoundError(f"Base path does not exist: {base_path}")
+    
+    if not os.path.isdir(base_path):
+        raise NotADirectoryError(f"Base path is not a directory: {base_path}")
+    
+    yaml_files = []
+    
+    for root, dirs, files in os.walk(base_path):
+        for file in files:
+            if file.lower().endswith(('.yaml', '.yml')):
+                yaml_files.append(os.path.join(root, file))
+    
+    return sorted(yaml_files)
+
+# COMMAND ----------
+
+dbutils.widgets.text(name="config-path", 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
+
+config_path: str = config_path or project_path
+
 print(config_path)
 
 # COMMAND ----------

dao_ai-0.0.21/notebooks/03_generate_evaluation_data.py → dao_ai-0.0.22/notebooks/06_generate_evaluation_data.py

@@ -6,8 +6,37 @@
 
 # COMMAND ----------
 
-dbutils.widgets.text(name="config-path", defaultValue="../config/model_config.yaml")
-config_path: str = dbutils.widgets.get("config-path")
+from typing import Sequence
+import os
+
+def find_yaml_files_os_walk(base_path: str) -> Sequence[str]:
+    if not os.path.exists(base_path):
+        raise FileNotFoundError(f"Base path does not exist: {base_path}")
+    
+    if not os.path.isdir(base_path):
+        raise NotADirectoryError(f"Base path is not a directory: {base_path}")
+    
+    yaml_files = []
+    
+    for root, dirs, files in os.walk(base_path):
+        for file in files:
+            if file.lower().endswith(('.yaml', '.yml')):
+                yaml_files.append(os.path.join(root, file))
+    
+    return sorted(yaml_files)
+
+# COMMAND ----------
+
+dbutils.widgets.text(name="config-path", 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
+
+config_path: str = config_path or project_path
+
 print(config_path)
 
 # COMMAND ----------

dao_ai-0.0.21/notebooks/06_run_evaluation.py → dao_ai-0.0.22/notebooks/07_run_evaluation.py

@@ -1,5 +1,4 @@
 # Databricks notebook source
-# DBTITLE 1,Install Required Python Packages and Restart Kernel
 # MAGIC %pip install --quiet --upgrade -r ../requirements.txt
 # MAGIC %pip uninstall --quiet -y databricks-connect pyspark pyspark-connect
 # MAGIC %pip install --quiet databricks-connect
@@ -7,11 +6,38 @@
 
 # COMMAND ----------
 
-# DBTITLE 1,Set and Retrieve Configuration Path
-dbutils.widgets.text(name="config-path", defaultValue="../config/model_config.yaml")
-config_path: str = dbutils.widgets.get("config-path")
-print(config_path)
+from typing import Sequence
+import os
+
+def find_yaml_files_os_walk(base_path: str) -> Sequence[str]:
+    if not os.path.exists(base_path):
+        raise FileNotFoundError(f"Base path does not exist: {base_path}")
+    
+    if not os.path.isdir(base_path):
+        raise NotADirectoryError(f"Base path is not a directory: {base_path}")
+    
+    yaml_files = []
+    
+    for root, dirs, files in os.walk(base_path):
+        for file in files:
+            if file.lower().endswith(('.yaml', '.yml')):
+                yaml_files.append(os.path.join(root, file))
+    
+    return sorted(yaml_files)
+
+# COMMAND ----------
+
+dbutils.widgets.text(name="config-path", 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
+
+config_path: str = config_path or project_path
+
+print(config_path)
 # COMMAND ----------
 
 from dotenv import find_dotenv, load_dotenv

{dao_ai-0.0.21 → dao_ai-0.0.22}/notebooks/09_evaluate_inferences.py

@@ -1,11 +1,42 @@
 # Databricks notebook source
-# MAGIC %pip install --quiet -r ../requirements.txt
+# MAGIC %pip install --quiet --upgrade -r ../requirements.txt
+# MAGIC %pip uninstall --quiet -y databricks-connect pyspark pyspark-connect
+# MAGIC %pip install --quiet databricks-connect
 # MAGIC %restart_python
 
 # COMMAND ----------
 
-dbutils.widgets.text(name="config-path", defaultValue="../config/model_config.yaml")
-config_path: str = dbutils.widgets.get("config-path")
+from typing import Sequence
+import os
+
+def find_yaml_files_os_walk(base_path: str) -> Sequence[str]:
+    if not os.path.exists(base_path):
+        raise FileNotFoundError(f"Base path does not exist: {base_path}")
+    
+    if not os.path.isdir(base_path):
+        raise NotADirectoryError(f"Base path is not a directory: {base_path}")
+    
+    yaml_files = []
+    
+    for root, dirs, files in os.walk(base_path):
+        for file in files:
+            if file.lower().endswith(('.yaml', '.yml')):
+                yaml_files.append(os.path.join(root, file))
+    
+    return sorted(yaml_files)
+
+# COMMAND ----------
+
+dbutils.widgets.text(name="config-path", 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
+
+config_path: str = config_path or project_path
+
 print(config_path)
 
 # COMMAND ----------

{dao_ai-0.0.21 → dao_ai-0.0.22}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dao-ai"
-version = "0.0.21"
+version = "0.0.22"
 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" }
@@ -42,9 +42,9 @@ classifiers = [
     "Topic :: System :: Distributed Computing",
 ]
 dependencies = [
-    "databricks-agents>=1.6.0",
+    "databricks-agents>=1.6.1",
     "databricks-langchain>=0.8.0",
-    "databricks-sdk[openai]>=0.66.0",
+    "databricks-sdk[openai]>=0.67.0",
     "duckduckgo-search>=8.0.2",
     "grandalf>=0.8",
     "langchain>=0.3.27",

{dao_ai-0.0.21 → dao_ai-0.0.22}/requirements.txt

@@ -22,10 +22,10 @@ contourpy==1.3.2
 cryptography==45.0.7
 cycler==0.12.1
 cyclopts==3.24.0
-databricks-agents==1.6.0
+databricks-agents==1.6.1
 databricks-ai-bridge==0.8.0
 databricks-langchain==0.8.0
-databricks-sdk==0.66.0
+databricks-sdk==0.67.0
 dataclasses-json==0.6.7
 deprecation==2.1.0
 distlib==0.3.9

{dao_ai-0.0.21 → dao_ai-0.0.22}/schemas/model_config_schema.json

@@ -663,6 +663,7 @@
       "type": "object"
     },
     "DatabaseModel": {
+      "additionalProperties": false,
       "properties": {
         "on_behalf_of_user": {
           "anyOf": [
@@ -680,6 +681,18 @@
           "title": "Name",
           "type": "string"
         },
+        "instance_name": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "title": "Instance Name"
+        },
         "description": {
           "anyOf": [
             {
@@ -722,6 +735,7 @@
               "type": "null"
             }
           ],
+          "default": null,
           "title": "Host"
         },
         "database": {
@@ -823,9 +837,37 @@
               "type": "null"
             }
           ],
-          "default": 5,
+          "default": 10,
           "title": "Timeout Seconds"
         },
+        "capacity": {
+          "anyOf": [
+            {
+              "enum": [
+                "CU_1",
+                "CU_2"
+              ],
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": "CU_2",
+          "title": "Capacity"
+        },
+        "node_count": {
+          "anyOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "title": "Node Count"
+        },
         "user": {
           "anyOf": [
             {
@@ -993,8 +1035,7 @@
         }
       },
       "required": [
-        "name",
-        "host"
+        "name"
       ],
       "title": "DatabaseModel",
       "type": "object"
@@ -2332,6 +2373,13 @@
         "model": {
           "$ref": "#/$defs/LLMModel"
         },
+        "tools": {
+          "items": {
+            "$ref": "#/$defs/ToolModel"
+          },
+          "title": "Tools",
+          "type": "array"
+        },
         "prompt": {
           "anyOf": [
             {
@@ -2788,6 +2836,18 @@
     "VolumeModel": {
       "additionalProperties": false,
       "properties": {
+        "on_behalf_of_user": {
+          "anyOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": false,
+          "title": "On Behalf Of User"
+        },
         "schema": {
           "anyOf": [
             {