uEdition 0.7.0__py3-none-any.whl → 0.8.0__py3-none-any.whl

uedition/__about__.py

@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 """About this package."""
-__version__ = "0.7.0"
+__version__ = "0.8.0"

uedition/cli/__init__.py

@@ -60,13 +60,13 @@ def version() -> None:
     print_cli(f'Configuration: {settings["version"]}')
 
 
-@language_app.command()
+@language_app.command("add")
 def language_add(path: str) -> None:
     """Add a language to the μEdition."""
     language_module.add(path)
 
 
-@language_app.command()
+@language_app.command("update")
 def language_update(path: str) -> None:
     """Update a language."""
     language_module.update(path)

uedition/settings.py

@@ -7,10 +7,59 @@ All application settings are accessed via the `settings` dictionary.
 """
 import os
 
-from pydantic import BaseSettings, BaseModel
-from pydantic.env_settings import SettingsSourceCallable
+from pydantic import BaseModel
+from pydantic.fields import FieldInfo
+from pydantic_settings import BaseSettings, PydanticBaseSettingsSource
 from yaml import safe_load
-from typing import Any
+from typing import Any, Type, Tuple, Dict
+
+
+class YAMLConfigSettingsSource(PydanticBaseSettingsSource):
+    """Loads the configuration settings from a YAML file."""
+
+    def get_field_value(
+        self: "YAMLConfigSettingsSource", field: FieldInfo, field_name: str
+    ) -> Tuple[Any, str, bool]:
+        """Get the value of a specific field."""
+        encoding = self.config.get("env_file_encoding")
+        file_content_json = None
+        if os.path.exists("uEdition.yaml"):
+            with open("uEdition.yaml", encoding=encoding) as in_f:
+                file_content_json = safe_load(in_f)
+        elif os.path.exists("uEdition.yml"):
+            with open("uEdition.yml", encoding=encoding) as in_f:
+                file_content_json = safe_load(in_f)
+        if file_content_json is not None:
+            field_value = file_content_json.get(field_name)
+        else:
+            field_value = None
+        return field_value, field_name, False
+
+    def prepare_field_value(
+        self: "YAMLConfigSettingsSource",
+        field_name: str,
+        field: FieldInfo,
+        value: Any,
+        value_is_complex: bool,
+    ) -> Any:
+        """Just return the value."""
+        return value
+
+    def __call__(self: "YAMLConfigSettingsSource") -> Dict[str, Any]:
+        """Call the loader."""
+        d: Dict[str, Any] = {}
+
+        for field_name, field in self.settings_cls.model_fields.items():
+            field_value, field_key, value_is_complex = self.get_field_value(
+                field, field_name
+            )
+            field_value = self.prepare_field_value(
+                field_name, field, field_value, value_is_complex
+            )
+            if field_value is not None:
+                d[field_key] = field_value
+
+        return d
 
 
 def uedition_yaml_settings(settings: BaseSettings) -> dict[str, Any]:
@@ -75,26 +124,25 @@ class Settings(BaseSettings):
     jb_config: dict = {}
     """Additional JupyterBook configuration."""
 
-    class Config:
-        """Configuration overrides."""
-
-        @classmethod
-        def customise_sources(
-            cls,  # noqa: ANN102
-            init_settings: SettingsSourceCallable,
-            env_settings: SettingsSourceCallable,
-            file_secret_settings: SettingsSourceCallable,
-        ) -> tuple[SettingsSourceCallable, ...]:
-            """Add the YAMl loading functionality."""
-            return (
-                env_settings,
-                init_settings,
-                file_secret_settings,
-                uedition_yaml_settings,
-            )
-
-
-settings = Settings().dict()
+    @classmethod
+    def settings_customise_sources(
+        cls: Type["Settings"],
+        settings_cls: Type[BaseSettings],
+        init_settings: PydanticBaseSettingsSource,
+        env_settings: PydanticBaseSettingsSource,
+        dotenv_settings: PydanticBaseSettingsSource,
+        file_secret_settings: PydanticBaseSettingsSource,
+    ) -> Tuple[PydanticBaseSettingsSource, ...]:
+        """Customise the settings sources."""
+        return (
+            init_settings,
+            env_settings,
+            file_secret_settings,
+            YAMLConfigSettingsSource(settings_cls),
+        )
+
+
+settings = Settings().model_dump()
 
 
 def reload_settings() -> None:

{uedition-0.7.0.dist-info → uedition-0.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uEdition
-Version: 0.7.0
+Version: 0.8.0
 Project-URL: Documentation, https://github.com/unknown/uedition#readme
 Project-URL: Issues, https://github.com/unknown/uedition/issues
 Project-URL: Source, https://github.com/unknown/uedition
@@ -14,11 +14,12 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.10
-Requires-Dist: copier<9.0.0,>=8.0.0
+Requires-Dist: copier<10.0.0,>=9.0.0
 Requires-Dist: jupyter-book<1.0.0,>=0.15.1
 Requires-Dist: livereload
-Requires-Dist: lxml<5.0.0,>=4.9.2
-Requires-Dist: pydantic[dotenv]<2.0.0,>=1.0.0
+Requires-Dist: lxml<6.0.0,>=4.9.2
+Requires-Dist: pydantic-settings<3.0.0,>=2.0.0
+Requires-Dist: pydantic<3.0.0,>=2.0.0
 Requires-Dist: pyyaml<7.0.0,>=6.0.0
 Requires-Dist: typer[all]<1.0.0
 Description-Content-Type: text/markdown

{uedition-0.7.0.dist-info → uedition-0.8.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-uedition/__about__.py,sha256=7Oa7k1v3RP9FXnafNXCwzLGxcVR2wiaboRUCMX8AXpA,157
+uedition/__about__.py,sha256=ZKY67hSUtUpZScVZxX9OP2T8_jgQEouuMOKpfXwtpjY,157
 uedition/__init__.py,sha256=IfQLccTve4Bc-f7TpeuOwXWE03DFAJoWpveFacMiBSA,285
 uedition/__main__.py,sha256=FpsS6LdCNPdC5twonoqvfrqWDyCNreKQz7t9ZeSHcLI,182
-uedition/settings.py,sha256=5Bb1GxJeePFaQVPTzZP0vfwJ09zgdv0OrvoJ7HbAL7g,2900
-uedition/cli/__init__.py,sha256=DmLuxuth3_GwofY4xJl50s0rB0NqTC34-KhIB9IKjVA,1515
+uedition/settings.py,sha256=n1L-c-gkvlowGSMuuH5UT_B2WBUMckQgy5Uu2md56fY,4708
+uedition/cli/__init__.py,sha256=5-kozUHJCDa0-ii9fPq6GtZQCC2sQG1L5WiRHuPiKNg,1528
 uedition/cli/build.py,sha256=Z9yQ2-FxcEGtoOPvWBiJpaCPJArKuScJEXdVr1Nw3pE,6204
 uedition/cli/check.py,sha256=OE5Mis1PwCwqnVBk1waR4AyOVeGBzI5Rudp653hMKAw,7352
 uedition/cli/create.py,sha256=Q-SvDq9VtmUP4DQhuuvt1eZ_72sX8_tcFOj2Bt_T6J8,371
@@ -15,8 +15,8 @@ uedition/ext/language_switcher.css,sha256=y4LzkCgCm6E_nHt15I4Ku5QzBNpjwda9bt9Fsq
 uedition/ext/language_switcher.js,sha256=5CL1Es5T_s0qXcbYtpycvh0tMNdn97MHWCoGECe5w0w,2661
 uedition/ext/language_switcher.py,sha256=2kWXKyVyPCUFIdO24azyNg03GYrJwasJ84wNpM1eFFY,1369
 uedition/ext/tei.py,sha256=VOVbecTA7b4HiJuh-ZAc9ZJd0DsJUmwUO-JO_wvByDk,11380
-uedition-0.7.0.dist-info/METADATA,sha256=l5o1g3124J7-DhhWF0zgGk5t8Hil4XSVyJxgsA5xHAA,1974
-uedition-0.7.0.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
-uedition-0.7.0.dist-info/entry_points.txt,sha256=Mor9i2VYxcNQcLbMmWGpFYSwsMs3MyewnLmFI3IG0Ls,46
-uedition-0.7.0.dist-info/licenses/LICENSE.txt,sha256=MhLJl8GE8mnuO5i_pvKaobpIGnhiAEdkY-a6LKiuwCE,1101
-uedition-0.7.0.dist-info/RECORD,,
+uedition-0.8.0.dist-info/METADATA,sha256=RE11bhXsEdpEWmrGo6c1g5mOk8iN4nowGQJJIT7ynfg,2014
+uedition-0.8.0.dist-info/WHEEL,sha256=mRYSEL3Ih6g5a_CVMIcwiF__0Ae4_gLYh01YFNwiq1k,87
+uedition-0.8.0.dist-info/entry_points.txt,sha256=Mor9i2VYxcNQcLbMmWGpFYSwsMs3MyewnLmFI3IG0Ls,46
+uedition-0.8.0.dist-info/licenses/LICENSE.txt,sha256=MhLJl8GE8mnuO5i_pvKaobpIGnhiAEdkY-a6LKiuwCE,1101
+uedition-0.8.0.dist-info/RECORD,,

{uedition-0.7.0.dist-info → uedition-0.8.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.18.0
+Generator: hatchling 1.21.0
 Root-Is-Purelib: true
 Tag: py3-none-any