From bf5e7220f67ddf9fb85591ae045e99d6bbff26ea Mon Sep 17 00:00:00 2001 From: avison9 Date: Mon, 26 Oct 2026 13:18:51 +0100 Subject: [PATCH] fix(jobs): keep omitted settings unchanged on jobs/update update_job merged a full dump of new_settings, which carries model defaults for fields the caller never sent, so a tags-only update reset the job name to "Untitled". Merge only the top-level fields present in the request. Nested defaults such as a task's run_if are kept, so updated jobs are stored in the same shape as created ones. Closes #52 --- src/minilake/services/jobs.py | 7 +++++- tests/test_jobs.py | 43 +++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/src/minilake/services/jobs.py b/src/minilake/services/jobs.py index d3894cd..cd31f9b 100644 --- a/src/minilake/services/jobs.py +++ b/src/minilake/services/jobs.py @@ -152,7 +152,12 @@ async def update_job(req: UpdateJobRequest) -> dict: ) job = _state["jobs"][req.job_id] if req.new_settings is not None: - job["settings"].update(req.new_settings.model_dump(exclude_none=True)) + # Merge only the top-level fields the request actually sent. A plain dump also + # carries model defaults (name="Untitled"), which would overwrite stored values the + # caller never touched. exclude_unset is not used because it would also strip the + # nested defaults (e.g. a task's run_if) that create_job stores. + sent = req.new_settings.model_fields_set + job["settings"].update(req.new_settings.model_dump(exclude_none=True, include=sent)) for field in req.fields_to_remove or []: job["settings"].pop(field, None) return {} diff --git a/tests/test_jobs.py b/tests/test_jobs.py index de18c18..3e92e1f 100644 --- a/tests/test_jobs.py +++ b/tests/test_jobs.py @@ -13,6 +13,7 @@ from databricks.sdk import WorkspaceClient from databricks.sdk.service.compute import ClusterSpec from databricks.sdk.service.jobs import ( + JobSettings, NotebookTask, RunIf, SparkPythonTask, @@ -71,6 +72,48 @@ def test_job_list_includes_created(workspace_client: WorkspaceClient): print(f"✓ Job {job.job_id} appears in job list") +@pytest.mark.crud +@pytest.mark.parametrize( + "new_settings", + [ + JobSettings(tags={"team": "qa"}), + JobSettings(timeout_seconds=600), + JobSettings(), + ], + ids=["tags-only", "timeout-only", "empty"], +) +def test_job_partial_update_keeps_omitted_fields(workspace_client: WorkspaceClient, new_settings: JobSettings): + """Test: jobs/update only changes the fields it sends; the name and tasks survive.""" + job = workspace_client.jobs.create( + name="valuable name", + tasks=[Task(task_key="main", notebook_task=NotebookTask(notebook_path="/Shared/nb"))], + ) + + workspace_client.jobs.update(job_id=job.job_id, new_settings=new_settings) + + settings = workspace_client.jobs.get(job_id=job.job_id).settings + assert settings.name == "valuable name" + assert [t.task_key for t in settings.tasks] == ["main"] + if new_settings.tags is not None: + assert settings.tags == new_settings.tags + if new_settings.timeout_seconds is not None: + assert settings.timeout_seconds == new_settings.timeout_seconds + + print(f"✓ Partial update kept name and tasks of job {job.job_id}") + + +@pytest.mark.crud +def test_job_update_with_name_renames(workspace_client: WorkspaceClient): + """Test: a name sent in jobs/update still replaces the stored one.""" + job = workspace_client.jobs.create(name="old name", tasks=[]) + + workspace_client.jobs.update(job_id=job.job_id, new_settings=JobSettings(name="new name")) + + assert workspace_client.jobs.get(job_id=job.job_id).settings.name == "new name" + + print(f"✓ Job {job.job_id} renamed via update") + + @pytest.mark.crud def test_job_delete(workspace_client: WorkspaceClient): """Test: Deleting a job removes it; get then raises NOT_FOUND."""