Skip to content
Merged
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 pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ authors = [
maintainers = [{ name = "codejedi365", email = "codejedi365+flatdictpy@gmail.com" }]
dependencies = [
"Deprecated ~= 1.3",
"typing_extensions >= 4.13, < 5.0",
]


Expand Down
8 changes: 7 additions & 1 deletion src/cj365/flatdict/flat_dict.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,10 @@ def update(self, arg: Any = None, /, **kwargs: Any) -> None:
"""
params = {**kwargs}
if arg is not None:
if hasattr(arg, "keys") and hasattr(arg, "__getitem__"):
if isinstance(arg, self.__class__):
params.update(arg.inflate())

elif hasattr(arg, "keys") and hasattr(arg, "__getitem__"):
params.update(
{
k: arg[k]
Expand All @@ -282,6 +285,9 @@ def update(self, arg: Any = None, /, **kwargs: Any) -> None:
else:
params.update({k: v for k, v in arg})

if not params:
return

flattened_params = self.flatten(params, self.delimiter)

if matching_meta_keys := flattened_params.keys() & set(self.meta_keys):
Expand Down
39 changes: 39 additions & 0 deletions tests/flatdict_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,45 @@ def test_flatdict_update_empty(request: pytest.FixtureRequest):
assert flat_dict["b.c"] == [2]


def test_flatdict_update_from_flatdict(request: pytest.FixtureRequest):
if not str(request.config.getoption("-k")):
depends(request, [test_flatdict_dunder_getitem.__name__], scope="module")

base_data: dict[str, Any] = {"a": 1, "b": {"c": 2, "d": 3}}
base_flat_dict = FlatDict(base_data, delimiter=".")

# Test merging a FlatDict with overlapping and new keys into another FlatDict
update_data: dict[str, Any] = {"b": {"d": 99, "e": 4}, "f": 5}
update_flat_dict = FlatDict(update_data, delimiter=".")
base_flat_dict.update(update_flat_dict)

# Original key unchanged
assert base_data["a"] == base_flat_dict["a"]
# Nested key preserved from base where not overwritten
assert base_data["b"]["c"] == base_flat_dict["b.c"]
# Overlapping nested key overwritten by update
assert update_data["b"]["d"] == base_flat_dict["b.d"]
# New nested key added from update
assert update_data["b"]["e"] == base_flat_dict["b.e"]
# New top-level key added from update
assert update_data["f"] == base_flat_dict["f"]

# Test overwriting a top-level key with a FlatDict using a different delimiter
base_flat_dict2 = FlatDict({"x": 10, "y": {"z": 20}}, delimiter=".")
update_flat_dict2 = FlatDict({"y": {"z": 99, "w": 30}}, delimiter=".")
base_flat_dict2.update(update_flat_dict2)

assert 10 == base_flat_dict2["x"]
assert 99 == base_flat_dict2["y.z"]
assert 30 == base_flat_dict2["y.w"]

# Test that updating with an empty FlatDict does not change the content
base_flat_dict3 = FlatDict({"a": 1, "b": {"c": 2}}, delimiter=".")
base_flat_dict3.update(FlatDict())
assert 1 == base_flat_dict3["a"]
assert {"c": 2} == base_flat_dict3["b"]


@pytest.mark.order("third")
@pytest.mark.dependency
def test_flatdict_values(request: pytest.FixtureRequest):
Expand Down
Loading