Merge branch 'main' into cli-kebab-case

Author: kschwab

pydantic_settings/sources.py

@@ -1439,8 +1439,8 @@ def _get_sub_models(self, model: type[BaseModel], field_name: str, field_info: F
                 raise SettingsError(f'CliSubCommand is not outermost annotation for {model.__name__}.{field_name}')
             elif _annotation_contains_types(type_, (_CliPositionalArg,), is_include_origin=False):
                 raise SettingsError(f'CliPositionalArg is not outermost annotation for {model.__name__}.{field_name}')
-            if is_model_class(type_) or is_pydantic_dataclass(type_):
-                sub_models.append(type_)  # type: ignore
+            if is_model_class(_strip_annotated(type_)) or is_pydantic_dataclass(_strip_annotated(type_)):
+                sub_models.append(_strip_annotated(type_))
         return sub_models
 
     def _verify_cli_flag_annotations(self, model: type[BaseModel], field_name: str, field_info: FieldInfo) -> None:

tests/test_source_azure_key_vault.py

@@ -115,7 +115,7 @@ def settings_customise_sources(
         assert settings.sql_server_user == expected_secret_value
         assert settings.sql_server.password == expected_secret_value
 
-    def _raise_resource_not_found_when_getting_parent_secret_name(self, secret_name: str) -> KeyVaultSecret:
+    def _raise_resource_not_found_when_getting_parent_secret_name(self, secret_name: str):
         expected_secret_value = 'SecretValue'
         key_vault_secret = KeyVaultSecret(SecretProperties(), expected_secret_value)
 

tests/test_source_cli.py

@@ -15,7 +15,9 @@
     BaseModel,
     ConfigDict,
     DirectoryPath,
+    Discriminator,
     Field,
+    Tag,
     ValidationError,
 )
 from pydantic import (
@@ -2270,6 +2272,28 @@ class MySettings(BaseSettings):
         )
 
 
+def test_cli_submodels_strip_annotated():
+    class PolyA(BaseModel):
+        a: int = 1
+        type: Literal['a'] = 'a'
+
+    class PolyB(BaseModel):
+        b: str = '2'
+        type: Literal['b'] = 'b'
+
+    def _get_type(model: Union[BaseModel, Dict]) -> str:
+        if isinstance(model, dict):
+            return model.get('type', 'a')
+        return model.type  # type: ignore
+
+    Poly = Annotated[Union[Annotated[PolyA, Tag('a')], Annotated[PolyB, Tag('b')]], Discriminator(_get_type)]
+
+    class WithUnion(BaseSettings):
+        poly: Poly
+
+    assert CliApp.run(WithUnion, ['--poly.type=a']).model_dump() == {'poly': {'a': 1, 'type': 'a'}}
+
+
 def test_cli_kebab_case(capsys, monkeypatch):
     class DeepSubModel(BaseModel):
         deep_submodel_positional_arg: CliPositionalArg[str]