sovereign 1.0.0b104__tar.gz → 1.0.0b107__tar.gz

{sovereign-1.0.0b104 → sovereign-1.0.0b107}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sovereign
-Version: 1.0.0b104
+Version: 1.0.0b107
 Summary: Envoy Proxy control-plane written in Python
 Home-page: https://pypi.org/project/sovereign/
 License: Apache-2.0
@@ -39,7 +39,7 @@ Requires-Dist: cachelib (>=0.10.2,<0.11.0)
 Requires-Dist: cachetools (>=5.3.2,<6.0.0)
 Requires-Dist: cashews[redis] (>=6.3.0,<7.0.0) ; extra == "caching"
 Requires-Dist: croniter (>=1.4.1,<2.0.0)
-Requires-Dist: cryptography (>=42.0.0,<43.0.0)
+Requires-Dist: cryptography (>=45.0.2)
 Requires-Dist: datadog (>=0.50.1) ; extra == "statsd"
 Requires-Dist: fastapi (>=0.115.2,<0.116.0)
 Requires-Dist: glom (>=23.3.0,<24.0.0)

{sovereign-1.0.0b104 → sovereign-1.0.0b107}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sovereign"
-version = "1.0.0b104"
+version = "1.0.0b107"
 description = "Envoy Proxy control-plane written in Python"
 license = "Apache-2.0"
 packages = [
@@ -76,7 +76,7 @@ Jinja2 = "^3.1.2"
 structlog = "^23.1.0"
 cachelib = "^0.10.2"
 glom = "^23.3.0"
-cryptography = "^42.0.0"
+cryptography = ">=45.0.2"
 fastapi = "^0.115.2"
 uvloop = "^0.19.0"
 sentry-sdk = "^2.14.0"

{sovereign-1.0.0b104 → sovereign-1.0.0b107}/src/sovereign/schemas.py

@@ -6,7 +6,6 @@ from pathlib import Path
 from enum import Enum
 from os import getenv
 from types import ModuleType
-from collections import defaultdict
 from dataclasses import dataclass
 from functools import cached_property
 from typing import Any, Dict, List, Mapping, Optional, Self, Tuple, Union, Callable
@@ -767,6 +766,20 @@ class TracingConfig(BaseSettings):
         return values
 
 
+class SupervisordConfig(BaseSettings):
+    nodaemon: bool = Field(True, alias="SOVEREIGN_SUPERVISORD_NODAEMON")
+    loglevel: str = Field("error", alias="SOVEREIGN_SUPERVISORD_LOGLEVEL")
+    pidfile: str = Field("/tmp/supervisord.pid", alias="SOVEREIGN_SUPERVISORD_PIDFILE")
+    logfile: str = Field("/tmp/supervisord.log", alias="SOVEREIGN_SUPERVISORD_LOGFILE")
+    directory: str = Field("%(here)s", alias="SOVEREIGN_SUPERVISORD_DIRECTORY")
+    model_config = SettingsConfigDict(
+        env_file=".env",
+        extra="ignore",
+        env_file_encoding="utf-8",
+        populate_by_name=True,
+    )
+
+
 class LegacyConfig(BaseSettings):
     regions: Optional[List[str]] = None
     eds_priority_matrix: Optional[Dict[str, Dict[str, int]]] = None
@@ -858,6 +871,9 @@ class SovereignConfigv2(BaseSettings):
     tracing: Optional[TracingConfig] = Field(default_factory=TracingConfig)
     debug: bool = Field(False, alias="SOVEREIGN_DEBUG")
 
+    # Supervisord settings
+    supervisord: SupervisordConfig = SupervisordConfig()
+
     # Deprecated in 0.30
     sources: Optional[List[ConfiguredSource]] = Field(None, deprecated=True)
     source_config: SourcesConfiguration = Field(

{sovereign-1.0.0b104 → sovereign-1.0.0b107}/src/sovereign/server.py

@@ -8,10 +8,11 @@ import uvicorn
 from sovereign import application_logger as log
 from sovereign.app import app
 from sovereign.worker import worker as worker_app
-from sovereign.schemas import SovereignAsgiConfig
+from sovereign.schemas import SovereignAsgiConfig, SupervisordConfig
 
 
 asgi_config = SovereignAsgiConfig()
+supervisord_config = SupervisordConfig()
 
 
 def web() -> None:
@@ -59,8 +60,11 @@ def write_supervisor_conf() -> Path:
 
     conf = configparser.RawConfigParser()
     conf["supervisord"] = supervisord = {
-        "nodaemon": "true",
-        "loglevel": "error",
+        "nodaemon": str(supervisord_config.nodaemon).lower(),
+        "loglevel": supervisord_config.loglevel,
+        "pidfile": supervisord_config.pidfile,
+        "logfile": supervisord_config.logfile,
+        "directory": supervisord_config.directory,
     }
 
     conf["fcgi-program:web"] = web = {

{sovereign-1.0.0b104 → sovereign-1.0.0b107}/src/sovereign/sources/poller.py

@@ -35,7 +35,7 @@ GMods = Dict[str, Type[GlobalModifier]]
 
 
 def _deep_diff(old, new, path="") -> list[dict[str, Any]]:
-    changes = []
+    changes: list[dict[str, Any]] = []
 
     # handle add/remove
     if (old, new) == (None, None):
@@ -148,7 +148,7 @@ def source_diff_summary(prev, curr) -> dict[str, Any]:
             n_old = len(old)
             n_new = len(new)
 
-            scope_changes = {}
+            scope_changes: dict[str, Any] = {}
 
             if n_old == 0 and n_new > 0:
                 scope_changes["added"] = n_new
@@ -161,7 +161,7 @@ def source_diff_summary(prev, curr) -> dict[str, Any]:
                     scope_changes["count_change"] = n_new - n_old
 
             if scope_changes:
-                summary["scopes"][scope] = scope_changes
+                summary["scopes"][scope] = scope_changes  # type: ignore
 
         if not summary["scopes"]:
             summary = {"type": "no_changes"}