[Python] Generate code for apps

.codegen.json

@@ -3,10 +3,10 @@
     "api_changelog": true,
     "formatter": "go run golang.org/x/tools/cmd/goimports@latest -w $FILENAMES && go fmt ./...",
     "version": {
-        "experimental/python/README.md": "version $VERSION or above",
-        "experimental/python/databricks/bundles/version.py": "__version__ = \"$VERSION\"",
-        "experimental/python/pyproject.toml": "version = \"$VERSION\"",
-        "experimental/python/uv.lock": "name = \"databricks-bundles\"\nversion = \"$VERSION\"",
+        "python/README.md": "version $VERSION or above",
+        "python/databricks/bundles/version.py": "__version__ = \"$VERSION\"",
+        "python/pyproject.toml": "version = \"$VERSION\"",
+        "python/uv.lock": "name = \"databricks-bundles\"\nversion = \"$VERSION\"",
         "libs/template/templates/experimental-jobs-as-code/library/versions.tmpl": "{{define \"latest_databricks_bundles_version\" -}}$VERSION{{- end}}",
         "libs/template/templates/default/library/versions.tmpl": "{{define \"latest_databricks_bundles_version\" -}}$VERSION{{- end}}"
     },

.github/workflows/push.yml

@@ -214,12 +214,12 @@ jobs:
           version: "0.6.5"
 
       - name: Verify that python/codegen is up to date
-        working-directory: experimental/python
+        working-directory: python
         run: |-
           make codegen
 
           if ! ( git diff --exit-code ); then
-            echo "Generated Python code is not up-to-date. Please run 'pushd experimental/python && make codegen' and commit the changes."
+            echo "Generated Python code is not up-to-date. Please run 'pushd python && make codegen' and commit the changes."
 
             exit 1
           fi

.github/workflows/python_push.yml

@@ -4,11 +4,11 @@ on:
   pull_request:
     types: [opened, synchronize]
     paths:
-      - experimental/python/**
+      - python/**
   merge_group:
     types: [checks_requested]
     paths:
-      - experimental/python/**
+      - python/**
   push:
     # Always run on push to main. The build cache can only be reused
     # if it was saved by a run from the repository's default branch.
@@ -39,7 +39,7 @@ jobs:
           version: "0.6.5"
 
       - name: Run tests
-        working-directory: experimental/python
+        working-directory: python
         run: make test
 
   python_linters:
@@ -56,7 +56,7 @@ jobs:
           version: "0.6.5"
 
       - name: Run lint
-        working-directory: experimental/python
+        working-directory: python
         run: make lint
 
   python_docs:
@@ -73,5 +73,5 @@ jobs:
           version: "0.6.5"
 
       - name: Run docs
-        working-directory: experimental/python
+        working-directory: python
         run: make docs

.github/workflows/release.yml

@@ -183,10 +183,10 @@ jobs:
           version: "0.6.5"
 
       - name: Build wheel
-        working-directory: experimental/python
+        working-directory: python
         run: make build
 
       - name: Publish package distributions to PyPI
         uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
         with:
-          packages-dir: experimental/python/dist
+          packages-dir: python/dist

.wsignore

@@ -3,7 +3,7 @@
 .codegen/_openapi_sha
 .release_metadata.json
 bundle/schema/jsonschema.json
-experimental/python/docs/images/databricks-logo.svg
+python/docs/images/databricks-logo.svg
 **/*.dist-info/METADATA
 **/*.dist-info/WHEEL
 
@@ -25,7 +25,7 @@ cmd/workspace/**/*.go
 cmd/account/**/*.go
 
 # Extra whitespace in generated Python models
-experimental/python/databricks/bundles/*/_models/*.py
+python/databricks/bundles/*/_models/*.py
 
 # Developed elsewhere:
 internal/genkit/tagging.py

acceptance/acceptance_test.go

@@ -1241,7 +1241,7 @@ func buildDatabricksBundlesWheel(t *testing.T, buildDir string) string {
 	// so we prepare here by keeping only one.
 	_ = prepareWheelBuildDirectory(t, buildDir)
 
-	RunCommand(t, []string{"uv", "build", "--no-cache", "-q", "--wheel", "--out-dir", buildDir}, "../experimental/python")
+	RunCommand(t, []string{"uv", "build", "--no-cache", "-q", "--wheel", "--out-dir", buildDir}, "../python")
 
 	latestWheel := prepareWheelBuildDirectory(t, buildDir)
 	if latestWheel == "" {

bundle/config/mutator/python/python_mutator_test.go

@@ -394,7 +394,7 @@ func TestGetOps_PyDABs(t *testing.T) {
 		},
 	}, PythonMutatorPhaseLoadResources)
 
-	assert.Error(t, err, "experimental/pydabs is deprecated, use experimental/python instead (https://docs.databricks.com/dev-tools/bundles/python)")
+	assert.Error(t, err, "experimental/pydabs is deprecated, use python instead (https://docs.databricks.com/dev-tools/bundles/python)")
 }
 
 func TestGetOps_empty(t *testing.T) {

libs/dyn/dynvar/ref.go

@@ -10,7 +10,7 @@ import (
 var (
 	// !!! Should be in sync with _variable_regex in Python code.
 	// !!!
-	// !!! See experimental/python/databricks/bundles/core/_transform.py
+	// !!! See python/databricks/bundles/core/_transform.py
 	baseVarDef = `[a-zA-Z]+([-_]*[a-zA-Z0-9]+)*`
 	re         = regexp.MustCompile(fmt.Sprintf(`\$\{(%s(\.%s(\[[0-9]+\])*)*(\[[0-9]+\])*)\}`, baseVarDef, baseVarDef))
 )

experimental/python/README.md → python/README.md

@@ -7,7 +7,7 @@ Python for Databricks Asset Bundles extends [Databricks Asset Bundles](https://d
 
 Documentation is available at https://docs.databricks.com/dev-tools/cli/databricks-cli.html.
 
-Reference documentation is available at https://databricks.github.io/cli/experimental/python/
+Reference documentation is available at https://databricks.github.io/cli/python/
 
 ## Getting started
 

experimental/python/codegen/codegen/jsonschema.py → python/codegen/codegen/jsonschema.py

@@ -124,10 +124,9 @@ def _parse_bool(value) -> Optional[bool]:
 
 def _load_spec() -> dict:
     path = (
-        Path(__file__).parent  # ./experimental/python/codegen/codegen
-        / ".."  # ./experimental/python/codegen
-        / ".."  # ./experimental/python/
-        / ".."  # ./experimental
+        Path(__file__).parent  # ./python/codegen/codegen
+        / ".."  # ./python/codegen
+        / ".."  # ./python/
         / ".."  # ./
         / "./bundle/schema/jsonschema.json"
     )

experimental/python/codegen/codegen/packages.py → python/codegen/codegen/packages.py

@@ -3,6 +3,7 @@
 
 # All supported resource types and their namespace
 RESOURCE_NAMESPACE = {
+    "resources.App": "apps",
     "resources.Job": "jobs",
     "resources.Pipeline": "pipelines",
     "resources.Schema": "schemas",
@@ -15,11 +16,12 @@
 #
 # We can't load all types because of errors while loading some of them.
 LOADED_NAMESPACES = [
+    "apps",
+    "catalog",
     "compute",
     "jobs",
     "pipelines",
     "resources",
-    "catalog",
 ]
 
 RENAMES = {

python/databricks/bundles/apps/__init__.py

@@ -0,0 +1,145 @@
+__all__ = [
+    "App",
+    "AppDict",
+    "AppParam",
+    "AppPermission",
+    "AppPermissionDict",
+    "AppPermissionLevel",
+    "AppPermissionLevelParam",
+    "AppPermissionParam",
+    "AppResource",
+    "AppResourceDatabase",
+    "AppResourceDatabaseDatabasePermission",
+    "AppResourceDatabaseDatabasePermissionParam",
+    "AppResourceDatabaseDict",
+    "AppResourceDatabaseParam",
+    "AppResourceDict",
+    "AppResourceGenieSpace",
+    "AppResourceGenieSpaceDict",
+    "AppResourceGenieSpaceGenieSpacePermission",
+    "AppResourceGenieSpaceGenieSpacePermissionParam",
+    "AppResourceGenieSpaceParam",
+    "AppResourceJob",
+    "AppResourceJobDict",
+    "AppResourceJobJobPermission",
+    "AppResourceJobJobPermissionParam",
+    "AppResourceJobParam",
+    "AppResourceParam",
+    "AppResourceSecret",
+    "AppResourceSecretDict",
+    "AppResourceSecretParam",
+    "AppResourceSecretSecretPermission",
+    "AppResourceSecretSecretPermissionParam",
+    "AppResourceServingEndpoint",
+    "AppResourceServingEndpointDict",
+    "AppResourceServingEndpointParam",
+    "AppResourceServingEndpointServingEndpointPermission",
+    "AppResourceServingEndpointServingEndpointPermissionParam",
+    "AppResourceSqlWarehouse",
+    "AppResourceSqlWarehouseDict",
+    "AppResourceSqlWarehouseParam",
+    "AppResourceSqlWarehouseSqlWarehousePermission",
+    "AppResourceSqlWarehouseSqlWarehousePermissionParam",
+    "AppResourceUcSecurable",
+    "AppResourceUcSecurableDict",
+    "AppResourceUcSecurableParam",
+    "AppResourceUcSecurableUcSecurablePermission",
+    "AppResourceUcSecurableUcSecurablePermissionParam",
+    "AppResourceUcSecurableUcSecurableType",
+    "AppResourceUcSecurableUcSecurableTypeParam",
+    "ComputeSize",
+    "ComputeSizeParam",
+    "Lifecycle",
+    "LifecycleDict",
+    "LifecycleParam",
+]
+
+
+from databricks.bundles.apps._models.app import App, AppDict, AppParam
+from databricks.bundles.apps._models.app_permission import (
+    AppPermission,
+    AppPermissionDict,
+    AppPermissionParam,
+)
+from databricks.bundles.apps._models.app_permission_level import (
+    AppPermissionLevel,
+    AppPermissionLevelParam,
+)
+from databricks.bundles.apps._models.app_resource import (
+    AppResource,
+    AppResourceDict,
+    AppResourceParam,
+)
+from databricks.bundles.apps._models.app_resource_database import (
+    AppResourceDatabase,
+    AppResourceDatabaseDict,
+    AppResourceDatabaseParam,
+)
+from databricks.bundles.apps._models.app_resource_database_database_permission import (
+    AppResourceDatabaseDatabasePermission,
+    AppResourceDatabaseDatabasePermissionParam,
+)
+from databricks.bundles.apps._models.app_resource_genie_space import (
+    AppResourceGenieSpace,
+    AppResourceGenieSpaceDict,
+    AppResourceGenieSpaceParam,
+)
+from databricks.bundles.apps._models.app_resource_genie_space_genie_space_permission import (
+    AppResourceGenieSpaceGenieSpacePermission,
+    AppResourceGenieSpaceGenieSpacePermissionParam,
+)
+from databricks.bundles.apps._models.app_resource_job import (
+    AppResourceJob,
+    AppResourceJobDict,
+    AppResourceJobParam,
+)
+from databricks.bundles.apps._models.app_resource_job_job_permission import (
+    AppResourceJobJobPermission,
+    AppResourceJobJobPermissionParam,
+)
+from databricks.bundles.apps._models.app_resource_secret import (
+    AppResourceSecret,
+    AppResourceSecretDict,
+    AppResourceSecretParam,
+)
+from databricks.bundles.apps._models.app_resource_secret_secret_permission import (
+    AppResourceSecretSecretPermission,
+    AppResourceSecretSecretPermissionParam,
+)
+from databricks.bundles.apps._models.app_resource_serving_endpoint import (
+    AppResourceServingEndpoint,
+    AppResourceServingEndpointDict,
+    AppResourceServingEndpointParam,
+)
+from databricks.bundles.apps._models.app_resource_serving_endpoint_serving_endpoint_permission import (
+    AppResourceServingEndpointServingEndpointPermission,
+    AppResourceServingEndpointServingEndpointPermissionParam,
+)
+from databricks.bundles.apps._models.app_resource_sql_warehouse import (
+    AppResourceSqlWarehouse,
+    AppResourceSqlWarehouseDict,
+    AppResourceSqlWarehouseParam,
+)
+from databricks.bundles.apps._models.app_resource_sql_warehouse_sql_warehouse_permission import (
+    AppResourceSqlWarehouseSqlWarehousePermission,
+    AppResourceSqlWarehouseSqlWarehousePermissionParam,
+)
+from databricks.bundles.apps._models.app_resource_uc_securable import (
+    AppResourceUcSecurable,
+    AppResourceUcSecurableDict,
+    AppResourceUcSecurableParam,
+)
+from databricks.bundles.apps._models.app_resource_uc_securable_uc_securable_permission import (
+    AppResourceUcSecurableUcSecurablePermission,
+    AppResourceUcSecurableUcSecurablePermissionParam,
+)
+from databricks.bundles.apps._models.app_resource_uc_securable_uc_securable_type import (
+    AppResourceUcSecurableUcSecurableType,
+    AppResourceUcSecurableUcSecurableTypeParam,
+)
+from databricks.bundles.apps._models.compute_size import ComputeSize, ComputeSizeParam
+from databricks.bundles.apps._models.lifecycle import (
+    Lifecycle,
+    LifecycleDict,
+    LifecycleParam,
+)