Merge branch 'konradhalas:master' into master

Author: trojkat

CHANGELOG.md

@@ -5,9 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-[Unreleased]
+## [Unreleased]
 
-Nothing yet.
+- Fix issues with caching internal function calls
+
+## [1.8.1] - 2023-05-12
+
+### Fixed
+
+- Fix value creation for a field with a default factory
 
 ## [1.8.0] - 2023-01-26
 
@@ -113,7 +119,8 @@ Nothing yet.
 
 - Validate type for generic collection fields
 
-[Unreleased]: https://github.com/konradhalas/dacite/compare/v1.8.0...HEAD
+[Unreleased]: https://github.com/konradhalas/dacite/compare/v1.8.1...HEAD
+[1.8.1]: https://github.com/konradhalas/dacite/compare/v1.8.0...v1.8.1
 [1.8.0]: https://github.com/konradhalas/dacite/compare/v1.7.0...v1.8.0
 [1.7.0]: https://github.com/konradhalas/dacite/compare/v1.6.0...v1.7.0
 [1.6.0]: https://github.com/konradhalas/dacite/compare/v1.5.1...v1.6.0

dacite/cache.py

@@ -8,7 +8,7 @@
 
 @lru_cache(maxsize=None)
 def cache(function: T) -> T:
-    return lru_cache(maxsize=get_cache_size())(function)  # type: ignore
+    return lru_cache(maxsize=get_cache_size(), typed=True)(function)  # type: ignore
 
 
 def set_cache_size(size: Optional[int]) -> None:

dacite/dataclasses.py

@@ -11,7 +11,6 @@ class DefaultValueNotFoundError(Exception):
     pass
 
 
-@cache
 def get_default_value_for_field(field: Field, type_: Type) -> Any:
     if field.default != MISSING:
         return field.default

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="dacite",
-    version="1.8.0",
+    version="1.8.1",
     description="Simple creation of data classes from dictionaries.",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",

tests/core/test_base.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import Any, NewType, Optional
+from typing import Any, NewType, Optional, List
 
 import pytest
 
@@ -191,3 +191,16 @@ class X:
     result = from_dict(X, {"s": "test"})
 
     assert result == X(s=MyStr("test"))
+
+
+def test_dataclass_default_factory_identity():
+    # https://github.com/konradhalas/dacite/issues/215
+    @dataclass
+    class A:
+        name: str
+        items: List[str] = field(default_factory=list)
+
+    a1 = from_dict(A, {"name": "a1"})
+    a2 = from_dict(A, {"name": "a2"})
+
+    assert a1.items is not a2.items

tests/test_types.py

@@ -399,3 +399,8 @@ class FakeType:
         _special = True
 
     assert extract_generic(FakeType, defaults) == defaults
+
+
+def test_optional_and_union_none_does_not_pollute_scope_via_caching():
+    is_generic(Optional[str])
+    is_generic_collection(str | None)