Merge branch 'main' into fix-import

Author: hramezani

pydantic_settings/sources/providers/cli.py

@@ -923,11 +923,13 @@ def _add_parser_submodels(
 
         preferred_alias = alias_names[0]
         is_model_suppressed = self._is_field_suppressed(field_info) or is_model_suppressed
+        if is_model_suppressed:
+            model_group_kwargs['description'] = CLI_SUPPRESS
         if not self.cli_avoid_json:
             added_args.append(arg_names[0])
             kwargs['nargs'] = '?'
             kwargs['const'] = '{}'
-            kwargs['help'] = kwargs['help'] = (
+            kwargs['help'] = (
                 CLI_SUPPRESS if is_model_suppressed else f'set {arg_names[0]} from JSON string (default: {{}})'
             )
             model_group = self._add_group(parser, **model_group_kwargs)

tests/test_source_cli.py

@@ -2159,17 +2159,17 @@ class DeepHiddenSubModel(BaseModel):
     class HiddenSubModel(BaseModel):
         hidden_a: int
         hidden_b: int
-        deep_hidden_obj: DeepHiddenSubModel
+        deep_hidden_obj: DeepHiddenSubModel = Field(description='deep_hidden_obj description')
 
     class SubModel(BaseModel):
         visible_a: int
         visible_b: int
-        deep_hidden_obj: CliSuppress[DeepHiddenSubModel]
+        deep_hidden_obj: CliSuppress[DeepHiddenSubModel] = Field(description='deep_hidden_obj description')
 
     class Settings(BaseSettings, cli_parse_args=True):
         field_a: CliSuppress[int] = 0
-        field_b: str = Field(default=1, description=CLI_SUPPRESS)
-        hidden_obj: CliSuppress[HiddenSubModel]
+        field_b: str = Field(default='hi', description=CLI_SUPPRESS)
+        hidden_obj: CliSuppress[HiddenSubModel] = Field(description='hidden_obj description')
         visible_obj: SubModel
 
     with monkeypatch.context() as m: