Merge pull request #53 from lincolnloop/fix-6.1.1

Fix regression in #51

Author: marcgibbons

goodconf/__init__.py

@@ -36,19 +36,16 @@
 
 
 def Field(
+    *args,
     initial=None,
     json_schema_extra=None,
     **kwargs,
 ):
-    """ """
-    if initial and not callable(initial):
-        val = initial
-        initial = lambda: val
-
-    json_schema_extra = json_schema_extra or {}
-    if initial and isinstance(json_schema_extra, dict):
+    if initial:
+        json_schema_extra = json_schema_extra or {}
         json_schema_extra["initial"] = initial
-    return PydanticField(json_schema_extra=json_schema_extra, **kwargs)
+
+    return PydanticField(*args, json_schema_extra=json_schema_extra, **kwargs)
 
 
 class GoodConfConfigDict(SettingsConfigDict):

tests/test_goodconf.py

@@ -186,6 +186,29 @@ class TestConf(GoodConf):
         TestConf(load=True)
 
 
+def test_default_values_are_used(monkeypatch):
+    """
+    Covers regression in: https://github.com/lincolnloop/goodconf/pull/51
+
+    Requires more than one defined field to reproduce.
+    """
+    monkeypatch.delenv("a", raising=False)
+    monkeypatch.setenv("b", "value_from_env")
+    monkeypatch.delenv("c", raising=False)
+
+    class TestConf(GoodConf):
+        a: str = Field(default="default_for_a")
+        b: str = Field(initial=lambda: "1234")
+        c: str = Field("default_for_c")
+
+    c = TestConf()
+    c.load()
+
+    assert c.a == "default_for_a"
+    assert c.b == "value_from_env"
+    assert c.c == "default_for_c"
+
+
 def test_set_on_init():
     class TestConf(GoodConf):
         a: str = Field()

tests/test_initial.py

@@ -1,5 +1,7 @@
 from typing import Optional
 
+import pytest
+
 from goodconf import Field, GoodConf, initial_for_field
 
 from .utils import KEY
@@ -12,11 +14,12 @@ class C(GoodConf):
     assert initial_for_field(KEY, C.model_fields["f"]) == "x"
 
 
-def test_initial_converts_to_callable():
+def test_initial_bad():
     class C(GoodConf):
         f: str = Field(initial="x")
 
-    assert initial_for_field(KEY, C.model_fields["f"]) == "x"
+    with pytest.raises(ValueError):
+        initial_for_field(KEY, C.model_fields["f"])
 
 
 def test_initial_default():