sovereign 1.0.0b104__py3-none-any.whl → 1.0.0b107__py3-none-any.whl

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/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/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"}

{sovereign-1.0.0b104.dist-info → sovereign-1.0.0b107.dist-info}/METADATA

@@ -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.dist-info → sovereign-1.0.0b107.dist-info}/RECORD

@@ -17,13 +17,13 @@ sovereign/modifiers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 sovereign/modifiers/lib.py,sha256=Cx0VrpTKbSjb3YmHyG4Jy6YEaPlrwpeqNaom3zu1_hw,2885
 sovereign/rendering.py,sha256=MIA7se7-C4WTWf7xZSgqpf7NvhDT7NkZbR3_G9N1dHI,5015
 sovereign/response_class.py,sha256=beMAFV-4L6DwyWzJzy71GkEW4gb7fzH1jd8-Tul13cU,427
-sovereign/schemas.py,sha256=PlAhNOeVKLlKIlMHKAHNfkPiE1cnpRnIIiNgJVr5ChQ,37413
-sovereign/server.py,sha256=3qfcUGaRrTF2GTfGEJgGnPXBiZGis1qxOlpIKvoCyFA,2596
+sovereign/schemas.py,sha256=Jf_w2mAX1b31eCAtJuxSZgy9KMVRKntmnEbbCZGZCxQ,38067
+sovereign/server.py,sha256=CEFysknYBtYdve9TTGSMW_-wmygp3NJ85pynAxNdlcw,2855
 sovereign/sources/__init__.py,sha256=g9hEpFk8j5i1ApHQpbc9giTyJW41Ppgsqv5P9zGxOJk,78
 sovereign/sources/file.py,sha256=prUThsDCSPNwZaZpkKXhAm-GVRZWbBoGKGU0It4HHXs,690
 sovereign/sources/inline.py,sha256=pP77m7bHjqE3sSoqZthcuw1ARVMf9gooVwbz4B8OAek,1003
 sovereign/sources/lib.py,sha256=0hk_G6mKJrB65WokVZnqF5kdJ3vsQZMNPuJqJO0mBsI,1031
-sovereign/sources/poller.py,sha256=9iwmP4wjc951OTxKDB8RYhKwEKpgW5tC5-Js5OA6zVo,18415
+sovereign/sources/poller.py,sha256=zpNUhQft-NoJbbxO1kCFp6jJSRSkBmf181xodnF_TiI,18469
 sovereign/static/node_expression.js,sha256=dL9QLM49jorqavf3Qtye6E1QTWYDT1rFI0tQR1HsiLQ,504
 sovereign/static/panel.js,sha256=i5mGExjv-I4Gtt9dQiTyFwPZa8pg5rXeuTeidXNUiTE,2695
 sovereign/static/sass/style.scss,sha256=tPHPEm3sZeBFGDyyn3pHcA-nbaKT-h-UsSTsf6dHNDU,1158
@@ -60,8 +60,8 @@ sovereign/views/discovery.py,sha256=4sVRPWpH8nYwY26GWK9N8maOYUNbIJTrUckZ3MahqAU,
 sovereign/views/healthchecks.py,sha256=TaXbxkX679jyQ8v5FxtBa2Qa0Z7KuqQ10WgAqfuVGUc,1743
 sovereign/views/interface.py,sha256=FmQ7LiUPLSvkEDOKCncrnKMD9g1lJKu-DQNbbyi8mqk,6346
 sovereign/worker.py,sha256=NqXlfi9QRlXcWeUPqHWvnYx2CPldY44iLb_fBJAiZ-4,4983
-sovereign-1.0.0b104.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
-sovereign-1.0.0b104.dist-info/METADATA,sha256=qjbGaqLJwlJsHaJuKbaye4TL1JRudbtuF0mVIN6sPqg,6268
-sovereign-1.0.0b104.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-sovereign-1.0.0b104.dist-info/entry_points.txt,sha256=VKJdnnN_HNL8xYQMXsFXfFmN6QkdXMEk5S964avxQJI,1404
-sovereign-1.0.0b104.dist-info/RECORD,,
+sovereign-1.0.0b107.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
+sovereign-1.0.0b107.dist-info/METADATA,sha256=r01WJzQCvbZ3YXhs-xsehoOMcpPM5sguHhCXOTCJmyA,6260
+sovereign-1.0.0b107.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+sovereign-1.0.0b107.dist-info/entry_points.txt,sha256=VKJdnnN_HNL8xYQMXsFXfFmN6QkdXMEk5S964avxQJI,1404
+sovereign-1.0.0b107.dist-info/RECORD,,