sovereign 0.25.0__py3-none-any.whl → 0.25.2__py3-none-any.whl

sovereign/__init__.py

@@ -53,7 +53,9 @@ DIST_NAME = "sovereign"
 __version__ = version(DIST_NAME)
 config_path = os.getenv("SOVEREIGN_CONFIG", "file:///etc/sovereign.yaml")
 
-html_templates = Jinja2Templates(get_package_file(DIST_NAME, "templates"))  # type: ignore[arg-type]
+html_templates = Jinja2Templates(
+    directory=str(get_package_file(DIST_NAME, "templates"))
+)
 
 try:
     config = SovereignConfigv2(**parse_raw_configuration(config_path))

sovereign/schemas.py

@@ -367,6 +367,8 @@ class SovereignAsgiConfig(BaseSettings):
     worker_timeout: int = 30
     worker_tmp_dir: str = "/dev/shm"
     graceful_timeout: int = worker_timeout * 2
+    max_requests: int = 0
+    max_requests_jitter: int = 0
 
     class Config:
         fields = {
@@ -377,6 +379,8 @@ class SovereignAsgiConfig(BaseSettings):
             "threads": {"env": "SOVEREIGN_THREADS"},
             "preload_app": {"env": "SOVEREIGN_PRELOAD"},
             "worker_timeout": {"env": "SOVEREIGN_WORKER_TIMEOUT"},
+            "max_requests": {"env": "SOVEREIGN_MAX_REQUESTS"},
+            "max_requests_jitter": {"env": "SOVEREIGN_MAX_REQUESTS_JITTER"},
         }
 
     def as_gunicorn_conf(self) -> Dict[str, Any]:
@@ -392,6 +396,8 @@ class SovereignAsgiConfig(BaseSettings):
             "worker_class": self.worker_class,
             "worker_tmp_dir": self.worker_tmp_dir,
             "graceful_timeout": self.graceful_timeout,
+            "max_requests": self.max_requests,
+            "max_requests_jitter": self.max_requests_jitter,
         }
 
 

sovereign/views/interface.py

@@ -1,12 +1,13 @@
-from typing import List, Dict, Any
 from collections import defaultdict
-from fastapi import APIRouter, Query, Path, Cookie
+from typing import Any, Dict, List
+
+from fastapi import APIRouter, Cookie, Path, Query
 from fastapi.encoders import jsonable_encoder
 from fastapi.requests import Request
-from fastapi.responses import RedirectResponse, JSONResponse, Response
-from sovereign import html_templates, XDS_TEMPLATES
+from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse, Response
+
+from sovereign import XDS_TEMPLATES, html_templates, json_response_class, poller
 from sovereign.discovery import DiscoveryTypes
-from sovereign import poller, json_response_class
 from sovereign.utils.mock import mock_discovery_request
 from sovereign.views.discovery import perform_discovery
 
@@ -16,23 +17,23 @@ all_types = [t.value for t in DiscoveryTypes]
 
 
 @router.get("/")
-async def ui_main(request: Request) -> Response:
+async def ui_main(request: Request) -> HTMLResponse:
     try:
         return html_templates.TemplateResponse(
+            request=request,
             name="base.html",
             media_type="text/html",
             context={
-                "request": request,
                 "all_types": all_types,
                 "last_update": str(poller.last_updated),
             },
         )
     except IndexError:
         return html_templates.TemplateResponse(
+            request=request,
             name="err.html",
             media_type="text/html",
             context={
-                "request": request,
                 "title": "No resource types configured",
                 "message": "A template should be defined for every resource "
                 "type that you want your envoy proxies to discover.",
@@ -88,7 +89,7 @@ async def resources(
     envoy_version: str = Cookie(
         "__any__", title="The clients envoy version to emulate in this XDS request"
     ),
-) -> Response:
+) -> HTMLResponse:
     ret: Dict[str, List[Dict[str, Any]]] = defaultdict(list)
     try:
         response = await perform_discovery(
@@ -107,11 +108,11 @@ async def resources(
     else:
         ret["resources"] += response.deserialize_resources()
     return html_templates.TemplateResponse(
+        request=request,
         name="resources.html",
         media_type="text/html",
         context={
             "resources": ret["resources"],
-            "request": request,
             "resource_type": xds_type,
             "all_types": all_types,
             "version": envoy_version,

{sovereign-0.25.0.dist-info → sovereign-0.25.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sovereign
-Version: 0.25.0
+Version: 0.25.2
 Summary: Envoy Proxy control-plane written in Python
 Home-page: https://pypi.org/project/sovereign/
 License: Apache-2.0
@@ -39,11 +39,11 @@ Requires-Dist: cashews[redis] (>=6.3.0,<7.0.0) ; extra == "caching"
 Requires-Dist: croniter (>=1.4.1,<2.0.0)
 Requires-Dist: cryptography (>=41.0.4,<42.0.0)
 Requires-Dist: datadog (>=0.47.0,<0.48.0) ; extra == "statsd"
-Requires-Dist: fastapi (>=0.99.1,<0.100.0)
+Requires-Dist: fastapi (>=0.110.0,<0.111.0)
 Requires-Dist: glom (>=23.3.0,<24.0.0)
 Requires-Dist: gunicorn (>=21.2.0,<22.0.0)
 Requires-Dist: httptools (>=0.6.0,<0.7.0) ; extra == "httptools"
-Requires-Dist: orjson (>=3.9.7,<4.0.0) ; extra == "orjson"
+Requires-Dist: orjson (>=3.9.15,<4.0.0) ; extra == "orjson"
 Requires-Dist: redis (<=5.0.0)
 Requires-Dist: requests (>=2.31.0,<3.0.0)
 Requires-Dist: sentry-sdk (>=1.23.1,<2.0.0) ; extra == "sentry"

{sovereign-0.25.0.dist-info → sovereign-0.25.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-sovereign/__init__.py,sha256=a8bCatvhtIQEw3_gZCdAbzXKP3fwA1AtyPlez-wQvGE,3274
+sovereign/__init__.py,sha256=wwpeI6VR7n03N5tIg85jb9ME6Ef-rdzNPZODMlMx5so,3269
 sovereign/app.py,sha256=uozeEQJjefBUV6dZfIooTBJgDhEE4bd2ozRxWVdVMK4,4085
 sovereign/config_loader.py,sha256=ZLKlyuvJ8Wqhsg6xZI-zp_5ABslB3Tc9zEdpds7-d7Q,6349
 sovereign/configuration.py,sha256=thiNe_6x3wR8wc4Jy0aeBlQe3kSsIqpTOIlOoxp5UJg,2497
@@ -16,7 +16,7 @@ sovereign/modifiers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 sovereign/modifiers/lib.py,sha256=DbXsxrrjnFE4Y7rbwpeiM5tS5w5NBwSdYH58AtDTP0I,2884
 sovereign/modifiers/test.py,sha256=7_c2hWXn_sYJ6997N1_uSWtClOikcOzu1yRCY56-l-4,361
 sovereign/response_class.py,sha256=beMAFV-4L6DwyWzJzy71GkEW4gb7fzH1jd8-Tul13cU,427
-sovereign/schemas.py,sha256=JsL_qL5dMhiAH2FB9UHb9nkRT4sUcT5qwuk129pNm3o,28718
+sovereign/schemas.py,sha256=FL0iQAftCVVFOL7r_l9scqllyMum0g2AD0qhMyONyg0,29025
 sovereign/server.py,sha256=z8Uz1UYIZix0S40Srk774WIMDN2jl2SozO8irib0wc4,1402
 sovereign/sources/__init__.py,sha256=g9hEpFk8j5i1ApHQpbc9giTyJW41Ppgsqv5P9zGxOJk,78
 sovereign/sources/file.py,sha256=A4UWoRU39v2Ex5Mtdl_uw53iMkslYylF4CiiwW7LOpk,689
@@ -53,9 +53,9 @@ sovereign/views/admin.py,sha256=GtjSipSfLwrvU1axX3pJfJXiSO82e2pkw8izykZNtGA,4306
 sovereign/views/crypto.py,sha256=o8NSyiUBy7v1pMOXt_1UBi68FNcGkXSlEVg9C18y8kY,3324
 sovereign/views/discovery.py,sha256=TVvWTMzWydsC-SNKL9WsSss_Hfnt2Ed4SVC2A8Na7Jo,5932
 sovereign/views/healthchecks.py,sha256=_WkMunlrFpqGTLgtNtRr7gCsDCv5kiuYxCyTi-dMEKM,1357
-sovereign/views/interface.py,sha256=Y2fbR26cSF8eKQHfTbnv5WKEdgqaGNwys0lEGUTjXqw,7041
-sovereign-0.25.0.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
-sovereign-0.25.0.dist-info/METADATA,sha256=vIWzrbn5aJUnPeNtlqJkGvb3bdJBO_f-SDOT07TRjYU,6463
-sovereign-0.25.0.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-sovereign-0.25.0.dist-info/entry_points.txt,sha256=kOn848ucVbNvtsGABDuwzOHmNiOb0Ey8dV85Z3dLv3Y,222
-sovereign-0.25.0.dist-info/RECORD,,
+sovereign/views/interface.py,sha256=Xi5F36Zn7ATbMtuhlE8f9xTEKj9T7GzHg6XLdb3bQjY,7023
+sovereign-0.25.2.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
+sovereign-0.25.2.dist-info/METADATA,sha256=U5K9Wu30LfB9NpQn0w2VCkPd799ixlNHTZKNjZa1Gyw,6465
+sovereign-0.25.2.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+sovereign-0.25.2.dist-info/entry_points.txt,sha256=kOn848ucVbNvtsGABDuwzOHmNiOb0Ey8dV85Z3dLv3Y,222
+sovereign-0.25.2.dist-info/RECORD,,