ursaproxy 0.1.2__py3-none-any.whl → 0.2.0__py3-none-any.whl

ursaproxy/config.py

@@ -1,9 +1,29 @@
 from pydantic import field_validator
-from pydantic_settings import BaseSettings
+from pydantic_settings import (
+    BaseSettings,
+    PydanticBaseSettingsSource,
+    SettingsConfigDict,
+    TomlConfigSettingsSource,
+)
 
 
 class Settings(BaseSettings):
-    """Configuration from environment variables."""
+    """Configuration from ursaproxy.toml file and/or environment variables.
+
+    Settings are loaded in this priority order (highest to lowest):
+    1. Environment variables (e.g., BEARBLOG_URL)
+    2. ursaproxy.toml file in current directory
+    3. Default values
+
+    Example ursaproxy.toml:
+        bearblog_url = "https://example.bearblog.dev"
+        blog_name = "My Blog"
+        pages = { about = "About Me", now = "Now" }
+    """
+
+    model_config = SettingsConfigDict(
+        toml_file="ursaproxy.toml",
+    )
 
     # Required: the Bearblog URL to proxy
     bearblog_url: str
@@ -26,6 +46,24 @@ class Settings(BaseSettings):
     cert_file: str | None = None
     key_file: str | None = None
 
+    @classmethod
+    def settings_customise_sources(
+        cls,
+        settings_cls: type[BaseSettings],
+        init_settings: PydanticBaseSettingsSource,
+        env_settings: PydanticBaseSettingsSource,
+        dotenv_settings: PydanticBaseSettingsSource,
+        file_secret_settings: PydanticBaseSettingsSource,
+    ) -> tuple[PydanticBaseSettingsSource, ...]:
+        """Configure settings sources with TOML file support.
+
+        Priority (highest to lowest): env vars -> TOML file -> defaults.
+        """
+        return (
+            env_settings,
+            TomlConfigSettingsSource(settings_cls),
+        )
+
     @field_validator("bearblog_url")
     @classmethod
     def normalize_url(cls, v: str) -> str:
@@ -36,4 +74,25 @@ class Settings(BaseSettings):
         return v
 
 
-settings = Settings()  # type: ignore[call-arg]  # pydantic-settings reads from env
+def _load_settings() -> Settings:
+    """Load settings, handling missing TOML file gracefully."""
+    try:
+        return Settings()  # type: ignore[call-arg]
+    except FileNotFoundError:
+        # No TOML file - disable TOML source and rely on env vars only
+        class _EnvOnlySettings(Settings):
+            @classmethod
+            def settings_customise_sources(
+                cls,
+                settings_cls: type[BaseSettings],
+                init_settings: PydanticBaseSettingsSource,
+                env_settings: PydanticBaseSettingsSource,
+                dotenv_settings: PydanticBaseSettingsSource,
+                file_secret_settings: PydanticBaseSettingsSource,
+            ) -> tuple[PydanticBaseSettingsSource, ...]:
+                return (env_settings,)
+
+        return _EnvOnlySettings()  # type: ignore[call-arg]
+
+
+settings = _load_settings()

{ursaproxy-0.1.2.dist-info → ursaproxy-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ursaproxy
-Version: 0.1.2
+Version: 0.2.0
 Summary: A Bearblog-to-Gemini proxy showcasing Xitzin
 Author: Alan Velasco
 Author-email: Alan Velasco <ursaproxy@alanbato.com>

{ursaproxy-0.1.2.dist-info → ursaproxy-0.2.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
 ursaproxy/__init__.py,sha256=bO2ym_YzTMOUVBbqTjXWWI0ZQqRc81HnZ2o0JBkkZso,5777
 ursaproxy/cache.py,sha256=Q5cypE91xGte1ph-_NqcEwZ0NoT7_LszYT1DVpfd2bM,1205
-ursaproxy/config.py,sha256=mjyZPOtW7f_IhP4ukMj8TOHpyGaXfoSXmExYGv2Z-FI,1216
+ursaproxy/config.py,sha256=j9QOFB1a-VaEYkr_stuxFPyG5D7dKY10h5YBQTNYMjs,3191
 ursaproxy/converter.py,sha256=FAW0fA7a3WtlPYMtZbDlsM0Gl7twXK73DAV911R7SPI,1955
 ursaproxy/fetcher.py,sha256=1Bsm96QYjnKQMorS2xwp9e3WRq8GbA6tKZrs1Z4ObOM,1591
 ursaproxy/templates/about.gmi,sha256=hJxK25i9uXr2geBo1HrdkLztqkebICDy-_bdnQ4jlGI,105
 ursaproxy/templates/feed.xml,sha256=0aiFNOfgHeMH0427LPc58pEf0NdvcDHIRa-x9tc_Ty8,597
 ursaproxy/templates/index.gmi,sha256=2J-1lQRcwoxr46bqasW969RPpo_X5n2sh9sVuXIMdFg,265
 ursaproxy/templates/post.gmi,sha256=DMPbqZl52v-G-6wmwbXh15kg8dYpTDUx3mfqkce-HhQ,133
-ursaproxy-0.1.2.dist-info/WHEEL,sha256=iHtWm8nRfs0VRdCYVXocAWFW8ppjHL-uTJkAdZJKOBM,80
-ursaproxy-0.1.2.dist-info/entry_points.txt,sha256=uM3A9bQS-p_6VhWbkFRtob2oN-SuBboJWS3ZwCjlAFk,46
-ursaproxy-0.1.2.dist-info/METADATA,sha256=S1WUJKOfwq-hNgMslrbIzqN53x9cOosPRrVAc9lUTqM,4781
-ursaproxy-0.1.2.dist-info/RECORD,,
+ursaproxy-0.2.0.dist-info/WHEEL,sha256=iHtWm8nRfs0VRdCYVXocAWFW8ppjHL-uTJkAdZJKOBM,80
+ursaproxy-0.2.0.dist-info/entry_points.txt,sha256=uM3A9bQS-p_6VhWbkFRtob2oN-SuBboJWS3ZwCjlAFk,46
+ursaproxy-0.2.0.dist-info/METADATA,sha256=zwq7-OQSXqWywFSbsiMR0oDuveuPIGzfiqRglvVJZUc,4781
+ursaproxy-0.2.0.dist-info/RECORD,,