Merge pull request #61 from edornd/bugfix/59-cli-override

Fix order in static sources (#59)
edornd · Jan 10, 2025 · 33f65c4 · 33f65c4
2 parents b5a2e2d + 4e18ace
commit 33f65c4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.5.6
+    rev: v0.9.0
     hooks:
       # Run the linter.
       - id: ruff

diff --git a/argdantic/core.py b/argdantic/core.py
@@ -117,9 +117,10 @@ def __init__(
         self.commands: List[Command] = []
         self.groups: List[ParserType] = []
         # internal variables
-        assert (
-            internal_delimiter.isidentifier()
-        ), f"The internal delimiter {internal_delimiter} is not a valid identifier"
+        assert internal_delimiter.isidentifier(), (
+            f"The internal delimiter {internal_delimiter} is not a valid identifier"
+        )
+
         self._delimiter = delimiter
         self._internal_delimiter = internal_delimiter
         self._subcommand_meta = subcommand_meta
@@ -267,20 +268,20 @@ def decorator(f: Callable) -> Command:
                 # if the function expects a single argument, we do not wrap it
                 # otherwise, we prepare the fields for the wrapper model
                 if singleton:
-                    assert (
-                        len(func_params) == 1
-                    ), f"The command '{command_name}' expects a single argument, but {len(func_params)} were provided"
+                    assert len(func_params) == 1, (
+                        f"The command '{command_name}' expects a single argument, but {len(func_params)} were provided"
+                    )
                     param_name, param = func_params[0]
-                    assert lenient_issubclass(
-                        param.annotation, BaseModel
-                    ), f"The singleton argument '{param_name}' must be a pydantic model"
+                    assert lenient_issubclass(param.annotation, BaseModel), (
+                        f"The singleton argument '{param_name}' must be a pydantic model"
+                    )
                     model_class = param.annotation
 
                 else:
                     for param_name, param in func_params:
-                        assert (
-                            param.annotation is not inspect.Parameter.empty
-                        ), f"Field '{param_name}' lacks type annotations"
+                        assert param.annotation is not inspect.Parameter.empty, (
+                            f"Field '{param_name}' lacks type annotations"
+                        )
                         default_value = param.default if param.default is not inspect.Parameter.empty else Ellipsis
                         wrapped_fields[param_name] = (param.annotation, default_value)
 
@@ -306,7 +307,7 @@ def settings_customise_sources(
                         # Env and file sources are discarded, the user must provide them explicitly.
                         source_list = cast(List[SettingSourceCallable], sources)
                         callables = [source(settings_cls) for source in source_list]
-                        return (*callables, init_settings)
+                        return (init_settings, *callables)
 
                 model_class = StaticSourceSettings if model_class is None else (model_class, StaticSourceSettings)