fix: remove workarounds for generic validation

Obviated by pydantic/pydantic#10666, which
does the Right Thing with instances of unparameterized generics.

Author: jvansanten

ampel/base/AmpelBaseModel.py

@@ -7,7 +7,6 @@
 # Last Modified Date:  05.01.2022
 # Last Modified By:    valery brinnel <[email protected]>
 
-import warnings
 from types import UnionType
 from typing import TYPE_CHECKING, Any, Union, get_args, get_origin
 
@@ -50,21 +49,6 @@ def __init_subclass__(cls, *args, **kwargs) -> None:
 				and NoneType in get_args(v)
 			):
 				setattr(cls, k, None)
-			# add generic args to defaults if missing
-			elif (
-				k in cls.__dict__
-				and safe_issubclass(v, AmpelBaseModel)
-				and v.get_model_origin() is type(cls.__dict__[k])
-				and v.get_model_args() and not cls.__dict__[k].get_model_args()
-			):
-				warnings.warn(
-					DeprecationWarning(
-						f"field {k} declared as {v}, but default has type {type(cls.__dict__[k])}"
-						" Adding generic args to default, but this will be an error in the future."
-					),
-					stacklevel=1
-				)
-				setattr(cls, k, v.model_validate(cls.__dict__[k].model_dump()))
 		super().__init_subclass__(*args, **kwargs)
 
 	@classmethod

ampel/base/AmpelUnit.py

@@ -7,14 +7,13 @@
 # Last Modified Date:  09.01.2022
 # Last Modified By:    valery brinnel <[email protected]>
 
-import warnings
 from functools import partial
 from types import MemberDescriptorType, UnionType
 from typing import TYPE_CHECKING, Any, ClassVar, Union, get_args, get_origin
 
 from pydantic import BaseModel, ValidationError, create_model
 
-from ampel.base.AmpelBaseModel import AmpelBaseModel, safe_issubclass
+from ampel.base.AmpelBaseModel import AmpelBaseModel
 from ampel.secret.Secret import Secret
 from ampel.types import TRACELESS, Traceless
 
@@ -72,22 +71,7 @@ def __init_subclass__(cls, *args, **kwargs) -> None:
 							if k in cls._slot_defaults:
 								joined_defaults[k] = cls._slot_defaults[k]
 							continue
-						# parameterized generic with unparameterized default
-						if (
-							safe_issubclass(v, AmpelBaseModel)
-							and v.get_model_origin() is type(defs[k])
-							and v.get_model_args() and not defs[k].get_model_args()
-						):
-							warnings.warn(
-								DeprecationWarning(
-									f"field {k} declared as {v}, but default has type {type(defs[k])}"
-									" Adding generic args to default, but this will be an error in the future."
-								),
-								stacklevel=1
-							)
-							joined_defaults[k] = v.model_validate(defs[k].model_dump())
-						else:
-							joined_defaults[k] = base.__dict__[k]
+						joined_defaults[k] = base.__dict__[k]
 					# if None |  with no default
 					elif get_origin(v) in (Union, UnionType) and NoneType in get_args(v) and k not in joined_defaults:
 						joined_defaults[k] = None

poetry.lock

@@ -18,7 +18,7 @@ packages = [{include = "ampel"}]
 
 [tool.poetry.dependencies]
 python = "^3.10"
-pydantic = "^2.7"
+pydantic = "^2.10"
 xxhash = "^3.0.0"
 PyYAML = "^6.0.0"
 ujson = "^5.1.0"

pyproject.toml

@@ -100,7 +100,6 @@ class Unit(AmpelUnit):
     }
 
 
-@pytest.mark.filterwarnings("ignore:field .* declared as:DeprecationWarning")
 def test_secret_without_type():
     class UnitWithSecret(AmpelUnit):
         secret: NamedSecret[str] = NamedSecret(label="foo")
@@ -109,9 +108,6 @@ class UnitWithSecret(AmpelUnit):
         other: Sequence[int] = [1]
 
     assert UnitWithSecret().secret.get_model_args() == (str,)
-    assert UnitWithSecret._defaults["secret"].get_model_args() == (
-        str,
-    ), "parameteized "
 
 
 def test_slots():

tests/test_AmpelUnit.py

@@ -28,9 +28,20 @@ class HasSecret(AmpelBaseModel):
 
 
 def test_secret_validation() -> None:
-    HasSecret(secret=NamedSecret[str](label="foo"))
+    """Secret fields can be initialized with and without type hints, but validate if fields are provided"""
+    secret = HasSecret(secret=NamedSecret[str](label="foo", value="bar")).secret
+    assert HasSecret(secret=NamedSecret(label="foo", value="bar")).secret == secret
+    assert HasSecret(**{"secret": {"label": "foo", "value": "bar"}}).secret == secret  # type: ignore[arg-type]
+    # type parameter defaults to Any
+    NamedSecret(label="foo", value=1)
+    # validation fails with explicit type hint
     with pytest.raises(ValidationError):
-        HasSecret(secret=NamedSecret(label="foo"))
+        NamedSecret[str](label="foo", value=1)  # type: ignore[arg-type]
+    # validation succeeds with correct type hint
+    int_secret = NamedSecret[int](label="foo", value=1)
+    # but passing the value to a model field will fail
+    with pytest.raises(ValidationError):
+        HasSecret(secret=int_secret)  # type: ignore[arg-type]
 
 
 def test_secret_resolution() -> None: