Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .nextchanges/bundles/7790.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Python resources now keep an empty nested object such as `StreamingMode()` instead of dropping it, as YAML does. A job with `continuous=Continuous()` now runs continuously. ([#7790](https://github.com/databricks/cli/pull/7790))
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"my_data_quality_monitor_2": {
"data_profiling_config": {
"assets_dir": "/Workspace/Users/user@example.com/assets",
"output_schema_id": "[UUID][0]"
"output_schema_id": "[UUID][0]",
"snapshot": {}
},
"object_id": "[UUID][1] (updated)",
"object_type": "table"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,31 @@ resources:
table_name_prefix: my_feature_1_off
cron_schedule_trigger:
mode: DERIVED

yaml_streaming_mode:
materialized_features:
- feature_name: main.default.yaml_streaming_feature
online_store_config:
online_store_name: my_online_store
catalog_name: main
schema_name: default
table_name_prefix: yaml_streaming_feature_on
streaming_mode: {}

yaml_table_trigger:
materialized_features:
- feature_name: main.default.yaml_table_feature
offline_store_config:
catalog_name: main
schema_name: default
table_name_prefix: yaml_table_feature_off
table_trigger: {}

yaml_external_trigger:
materialized_features:
- feature_name: main.default.yaml_external_feature
offline_store_config:
catalog_name: main
schema_name: default
table_name_prefix: yaml_external_feature_off
external_trigger: {}
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,86 @@
}
}
]
},
"python_external_trigger": {
"materialized_features": [
{
"external_trigger": {},
"feature_name": "main.default.python_external_feature_updated",
"offline_store_config": {
"catalog_name": "main",
"schema_name": "default",
"table_name_prefix": "python_external_feature_off"
}
}
]
},
"python_streaming_mode": {
"materialized_features": [
{
"feature_name": "main.default.python_streaming_feature_updated",
"online_store_config": {
"catalog_name": "main",
"online_store_name": "my_online_store",
"schema_name": "default",
"table_name_prefix": "python_streaming_feature_on"
},
"streaming_mode": {}
}
]
},
"python_table_trigger": {
"materialized_features": [
{
"feature_name": "main.default.python_table_feature_updated",
"offline_store_config": {
"catalog_name": "main",
"schema_name": "default",
"table_name_prefix": "python_table_feature_off"
},
"table_trigger": {}
}
]
},
"yaml_external_trigger": {
"materialized_features": [
{
"external_trigger": {},
"feature_name": "main.default.yaml_external_feature_updated",
"offline_store_config": {
"catalog_name": "main",
"schema_name": "default",
"table_name_prefix": "yaml_external_feature_off"
}
}
]
},
"yaml_streaming_mode": {
"materialized_features": [
{
"feature_name": "main.default.yaml_streaming_feature_updated",
"online_store_config": {
"catalog_name": "main",
"online_store_name": "my_online_store",
"schema_name": "default",
"table_name_prefix": "yaml_streaming_feature_on"
},
"streaming_mode": {}
}
]
},
"yaml_table_trigger": {
"materialized_features": [
{
"feature_name": "main.default.yaml_table_feature_updated",
"offline_store_config": {
"catalog_name": "main",
"schema_name": "default",
"table_name_prefix": "yaml_table_feature_off"
},
"table_trigger": {}
}
]
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
from databricks.bundles.core import Resources
from databricks.bundles.materialization_sets import (
ExternalTrigger,
MaterializationSet,
MaterializedFeature,
OfflineStoreConfig,
OnlineStoreConfig,
StreamingMode,
TableTrigger,
)


def load_resources() -> Resources:
Expand All @@ -21,4 +30,56 @@ def load_resources() -> Resources:
},
)

resources.add_materialization_set(
"python_streaming_mode",
MaterializationSet(
materialized_features=[
MaterializedFeature(
feature_name="main.default.python_streaming_feature",
online_store_config=OnlineStoreConfig(
online_store_name="my_online_store",
catalog_name="main",
schema_name="default",
table_name_prefix="python_streaming_feature_on",
),
streaming_mode=StreamingMode(),
),
],
),
)

resources.add_materialization_set(
"python_table_trigger",
MaterializationSet(
materialized_features=[
MaterializedFeature(
feature_name="main.default.python_table_feature",
offline_store_config=OfflineStoreConfig(
catalog_name="main",
schema_name="default",
table_name_prefix="python_table_feature_off",
),
table_trigger=TableTrigger(),
),
],
),
)

resources.add_materialization_set(
"python_external_trigger",
MaterializationSet(
materialized_features=[
MaterializedFeature(
feature_name="main.default.python_external_feature",
offline_store_config=OfflineStoreConfig(
catalog_name="main",
schema_name="default",
table_name_prefix="python_external_feature_off",
),
external_trigger=ExternalTrigger(),
),
],
),
)

return resources
10 changes: 6 additions & 4 deletions python/databricks/bundles/core/_transform_to_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@ def _transform_to_json_object(value: Any) -> dict[str, Any]:
out = {}

for field_name, _ in _stable_fields(value):
field_value = _transform_to_json_value(getattr(value, field_name))
python_value = getattr(value, field_name)
json_value = _transform_to_json_value(python_value)

# we implement omittempty semantics here skipping None, [], and {}
if field_value not in [None, [], {}]:
out[field_name] = field_value
# we implement omitempty semantics here skipping None, [], and {}, but keep an
# empty dataclass, as Go keeps a non-nil pointer to an empty struct
if json_value not in [None, [], {}] or is_dataclass(python_value):
out[field_name] = json_value

return out

Expand Down
15 changes: 15 additions & 0 deletions python/databricks_tests/core/test_transform.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,21 @@ def test_complex_cluster_spec_roundtrip():
assert cluster_spec_dict == cluster_spec_dict_2


def test_empty_dataclass_roundtrip():
@dataclass
class Nested:
field: Optional[int] = None

@dataclass
class Fake:
nested: Optional[Nested] = None

out = _transform(Fake, {"nested": {}})

assert out == Fake(nested=Nested())
assert _transform_to_json_object(out) == {"nested": {}}


def test_cron_schedule():
cron_schedule = _transform(
CronSchedule,
Expand Down
35 changes: 34 additions & 1 deletion python/databricks_tests/core/test_transform_to_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import pytest

from databricks.bundles.core import Variable
from databricks.bundles.core import Variable, VariableOrOptional
from databricks.bundles.core._transform_to_json import _transform_to_json_value


Expand All @@ -21,6 +21,22 @@ class Fake:
dict_field: dict[str, int] = field(default_factory=dict)


@dataclass
class FakeNested:
int_field: Optional[int] = None


@dataclass
class FakeMarker:
pass


@dataclass
class FakeParent:
nested_field: VariableOrOptional[FakeNested] = None
marker_field: Optional[FakeMarker] = None


@pytest.mark.parametrize(
("input", "expected"),
[
Expand All @@ -37,6 +53,23 @@ class Fake:
Fake(),
{},
),
(
# empty dataclasses are kept
FakeParent(nested_field=FakeNested(), marker_field=FakeMarker()),
{"nested_field": {}, "marker_field": {}},
),
(
FakeParent(nested_field=FakeNested(int_field=1)),
{"nested_field": {"int_field": 1}},
),
(
FakeParent(),
{},
),
(
FakeParent(nested_field=Variable(path="var.my_var", type=FakeNested)),
{"nested_field": "${var.my_var}"},
),
(
[{"a": Fake(enum_field=Color.RED)}],
[{"a": {"enum_field": "red"}}],
Expand Down
Loading