diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index ee60da9d..907c75e6 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -38,7 +38,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: '3.9' + python-version: '3.10' - name: Set go env run: | diff --git a/bundle/tests/python_import/dataclass_no_wheel/databricks.yml b/bundle/tests/python_import/dataclass_no_wheel/databricks.yml new file mode 100644 index 00000000..a2531e12 --- /dev/null +++ b/bundle/tests/python_import/dataclass_no_wheel/databricks.yml @@ -0,0 +1,15 @@ +bundle: + name: python-import-dataclass-no-wheel + +experimental: + pydabs: + enabled: true + import: + - "my_job" + +variables: + default_cluster_spec: + type: complex + value: + num_workers: 1 + spark_version: "15.4.x-scala2.12" diff --git a/bundle/tests/python_import/dataclass_no_wheel/notebooks/my_notebook.py b/bundle/tests/python_import/dataclass_no_wheel/notebooks/my_notebook.py new file mode 100644 index 00000000..8d8fcd56 --- /dev/null +++ b/bundle/tests/python_import/dataclass_no_wheel/notebooks/my_notebook.py @@ -0,0 +1,2 @@ +# Databricks Notebook Source +1+1 diff --git a/bundle/tests/python_import/dataclass_no_wheel/src/my_job.py b/bundle/tests/python_import/dataclass_no_wheel/src/my_job.py new file mode 100644 index 00000000..15896296 --- /dev/null +++ b/bundle/tests/python_import/dataclass_no_wheel/src/my_job.py @@ -0,0 +1,22 @@ +from databricks.bundles.jobs import Job, Task, NotebookTask, JobCluster +from databricks.bundles.variables import Bundle + +my_job = Job( + name="Test Job", + resource_name="my_job", + job_clusters=[ + JobCluster( + job_cluster_key="my_cluster", + new_cluster=Bundle.variables.default_cluster_spec, + ), + ], + tasks=[ + Task( + task_key="my_notebook_task", + job_cluster_key="my_cluster", + notebook_task=NotebookTask( + notebook_path="notebooks/my_notebook.py", + ), + ), + ], +) diff --git a/bundle/tests/python_import_test.go b/bundle/tests/python_import_test.go new file mode 100644 index 00000000..ff6dd632 --- /dev/null +++ b/bundle/tests/python_import_test.go @@ -0,0 +1,95 @@ +package config_tests + +import ( + "os" + "os/exec" + pathlib "path" + "runtime" + "testing" + + "github.com/databricks/cli/bundle/config/resources" + "github.com/databricks/cli/libs/dyn" + "github.com/databricks/databricks-sdk-go/service/jobs" + "github.com/stretchr/testify/require" + "golang.org/x/exp/maps" + + "github.com/stretchr/testify/assert" +) + +func TestPythonImport_dataclass_no_wheel(t *testing.T) { + activateVEnv(t) + setPythonPath(t, "python_import/dataclass_no_wheel/src") + + expected := &resources.Job{ + JobSettings: &jobs.JobSettings{ + Name: "Test Job", + JobClusters: []jobs.JobCluster{ + { + JobClusterKey: "my_cluster", + }, + }, + Tasks: []jobs.Task{ + { + NotebookTask: &jobs.NotebookTask{ + NotebookPath: "notebooks/my_notebook.py", + }, + JobClusterKey: "my_cluster", + TaskKey: "my_notebook_task", + }, + }, + }, + } + + b := load(t, "./python_import/dataclass_no_wheel") + + assert.Equal(t, []string{"my_job"}, maps.Keys(b.Config.Resources.Jobs)) + + myJob := b.Config.Resources.Jobs["my_job"] + assert.Equal(t, expected, myJob) + + // NewCluster is reference to a variable and needs to be checked separately + err := b.Config.Mutate(func(value dyn.Value) (dyn.Value, error) { + path := dyn.MustPathFromString("resources.jobs.my_job.job_clusters[0].new_cluster") + value, err := dyn.GetByPath(value, path) + if err != nil { + return dyn.InvalidValue, err + } + + assert.Equal(t, "${var.default_cluster_spec}", value.AsAny()) + + return value, nil + }) + require.NoError(t, err) +} + +func setPythonPath(t *testing.T, path string) { + wd, err := os.Getwd() + require.NoError(t, err) + t.Setenv("PYTHONPATH", pathlib.Join(wd, path)) +} + +func activateVEnv(t *testing.T) { + dir := t.TempDir() + venvDir := pathlib.Join(dir, "venv") + + err := exec.Command("python3", "-m", "venv", venvDir).Run() + require.NoError(t, err, "failed to create venv") + + // we don't have shell to activate venv, updating PATH is enough + + var venvBinDir string + if runtime.GOOS == "windows" { + venvBinDir = pathlib.Join(venvDir, "Scripts") + t.Setenv("PATH", venvBinDir+";"+os.Getenv("PATH")) + } else { + venvBinDir = pathlib.Join(venvDir, "bin") + t.Setenv("PATH", venvBinDir+":"+os.Getenv("PATH")) + } + + err = exec.Command( + pathlib.Join(venvBinDir, "pip"), + "install", + "databricks-pydabs==0.5.1", + ).Run() + require.NoError(t, err, "failed to install databricks-pydabs") +}