ursaproxy 0.1.2__tar.gz → 0.2.0__tar.gz

{ursaproxy-0.1.2 → ursaproxy-0.2.0}/PKG-INFO

@@ -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 → ursaproxy-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ursaproxy"
-version = "0.1.2"
+version = "0.2.0"
 description = "A Bearblog-to-Gemini proxy showcasing Xitzin"
 readme = "README.md"
 authors = [

ursaproxy-0.2.0/src/ursaproxy/config.py

@@ -0,0 +1,98 @@
+from pydantic import field_validator
+from pydantic_settings import (
+    BaseSettings,
+    PydanticBaseSettingsSource,
+    SettingsConfigDict,
+    TomlConfigSettingsSource,
+)
+
+
+class Settings(BaseSettings):
+    """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
+    blog_name: str
+
+    cache_ttl_feed: int = 300  # 5 minutes
+    cache_ttl_post: int = 1800  # 30 minutes
+
+    # Static pages (slug -> title) - pages not in RSS feed
+    # Override via PAGES='{"about": "About Me", "now": "Now"}'
+    pages: dict[str, str] = {}
+
+    # Gemini capsule hostname (for feed URLs)
+    # e.g., "gemini.example.com" -> gemini://gemini.example.com/post/...
+    gemini_host: str | None = None
+
+    # Server settings
+    host: str = "localhost"
+    port: int = 1965
+    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:
+        """Remove trailing slash to prevent double slashes in URLs."""
+        v = v.rstrip("/")
+        if not v.startswith(("http://", "https://")):
+            raise ValueError("bearblog_url must start with http:// or https://")
+        return v
+
+
+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/src/ursaproxy/config.py

@@ -1,39 +0,0 @@
-from pydantic import field_validator
-from pydantic_settings import BaseSettings
-
-
-class Settings(BaseSettings):
-    """Configuration from environment variables."""
-
-    # Required: the Bearblog URL to proxy
-    bearblog_url: str
-    blog_name: str
-
-    cache_ttl_feed: int = 300  # 5 minutes
-    cache_ttl_post: int = 1800  # 30 minutes
-
-    # Static pages (slug -> title) - pages not in RSS feed
-    # Override via PAGES='{"about": "About Me", "now": "Now"}'
-    pages: dict[str, str] = {}
-
-    # Gemini capsule hostname (for feed URLs)
-    # e.g., "gemini.example.com" -> gemini://gemini.example.com/post/...
-    gemini_host: str | None = None
-
-    # Server settings
-    host: str = "localhost"
-    port: int = 1965
-    cert_file: str | None = None
-    key_file: str | None = None
-
-    @field_validator("bearblog_url")
-    @classmethod
-    def normalize_url(cls, v: str) -> str:
-        """Remove trailing slash to prevent double slashes in URLs."""
-        v = v.rstrip("/")
-        if not v.startswith(("http://", "https://")):
-            raise ValueError("bearblog_url must start with http:// or https://")
-        return v
-
-
-settings = Settings()  # type: ignore[call-arg]  # pydantic-settings reads from env