sovereign 1.0.0b108__py3-none-any.whl → 1.0.0b121__py3-none-any.whl

sovereign/statistics.py

@@ -3,15 +3,12 @@ from typing import Optional, Any, Callable, Dict
 from functools import wraps
 from sovereign.schemas import config as sovereign_config
 
-emitted: Dict[str, Any] = dict()
-
 STATSD: Dict[str, Optional["StatsDProxy"]] = {"instance": None}
 
 
 class StatsDProxy:
     def __init__(self, statsd_instance: Optional[Any] = None) -> None:
         self.statsd = statsd_instance
-        self.emitted = emitted
 
     def __getattr__(self, item: str) -> Any:
         if self.statsd is not None:
@@ -23,13 +20,11 @@ class StatsDProxy:
 
     def do_nothing(self, *args: Any, **kwargs: Any) -> None:
         k = args[0]
-        emitted[k] = emitted.setdefault(k, 0) + 1
 
 
 class StatsdNoop:
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        k = args[0]
-        emitted[k] = emitted.setdefault(k, 0) + 1
+    def __init__(self, *args, **kwargs):
+        pass
 
     def __enter__(self):  # type: ignore
         return self
@@ -52,17 +47,9 @@ def configure_statsd() -> StatsDProxy:
     try:
         from datadog import DogStatsd
 
-        class CustomStatsd(DogStatsd):  # type: ignore
-            def _report(self, *args, **kwargs) -> None:  # type: ignore
-                super()._report(*args, **kwargs)
-                # Capture the metric name and increment its count for debugging
-                if metric := kwargs.get("metric"):
-                    self.emitted: Dict[str, Any] = dict()
-                    self.emitted[metric] = self.emitted.setdefault(metric, 0) + 1
-
-        module: Optional[CustomStatsd]
-        module = CustomStatsd()
-        if config.enabled:
+        module: Optional[DogStatsd]
+        module = DogStatsd()
+        if config.enabled and module:
             module.host = config.host
             module.port = config.port
             module.namespace = config.namespace

sovereign/views/discovery.py

@@ -10,8 +10,17 @@ from sovereign.schemas import (
 )
 
 
-def not_modified() -> Response:
-    return Response(status_code=304)
+def response_headers(
+    discovery_request: DiscoveryRequest, response: cache.Entry, xds: str
+) -> dict[str, str]:
+    return {
+        "X-Sovereign-Client-Build": discovery_request.envoy_version,
+        "X-Sovereign-Client-Version": discovery_request.version_info,
+        "X-Sovereign-Requested-Resources": ",".join(discovery_request.resource_names)
+        or "all",
+        "X-Sovereign-Requested-Type": xds,
+        "X-Sovereign-Response-Version": response.version,
+    }
 
 
 router = APIRouter()
@@ -51,11 +60,12 @@ async def discovery_response(
             XDS_CLIENT_VERSION=xds_req.version_info,
             XDS_SERVER_VERSION=entry.version,
         )
+        headers = response_headers(xds_req, entry, xds_type)
         if entry.len == 0:
-            return Response(status_code=404)
+            return Response(status_code=404, headers=headers)
         if entry.version == xds_req.version_info:
-            return not_modified()
-        return Response(entry.text, media_type="application/json")
+            return Response(status_code=304, headers=headers)
+        return Response(entry.text, media_type="application/json", headers=headers)
 
     if entry := await cache.blocking_read(xds_req):
         return handle_response(entry)

sovereign/worker.py

@@ -62,12 +62,17 @@ if config.sources is not None:
 
 def render(job: rendering.RenderJob):
     log.debug(f"Spawning render process for {job.id}")
-    Process(target=rendering.generate, args=[job]).start()
+    process = Process(target=rendering.generate, args=[job])
+    process.start()
+    return process
 
 
 async def submit_render(job: rendering.RenderJob):
     async with RENDER_SEMAPHORE:
-        render(job)
+        process = render(job)
+        # Wait for the process to complete to ensure semaphore is held
+        # until the actual rendering work is done
+        await asyncio.get_event_loop().run_in_executor(None, process.join)
 
 
 async def render_on_event():

{sovereign-1.0.0b108.dist-info → sovereign-1.0.0b121.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sovereign
-Version: 1.0.0b108
+Version: 1.0.0b121
 Summary: Envoy Proxy control-plane written in Python
 Home-page: https://pypi.org/project/sovereign/
 License: Apache-2.0

{sovereign-1.0.0b108.dist-info → sovereign-1.0.0b121.dist-info}/RECORD

@@ -28,7 +28,7 @@ sovereign/static/node_expression.js,sha256=dL9QLM49jorqavf3Qtye6E1QTWYDT1rFI0tQR
 sovereign/static/panel.js,sha256=i5mGExjv-I4Gtt9dQiTyFwPZa8pg5rXeuTeidXNUiTE,2695
 sovereign/static/sass/style.scss,sha256=tPHPEm3sZeBFGDyyn3pHcA-nbaKT-h-UsSTsf6dHNDU,1158
 sovereign/static/style.css,sha256=vG8HPsbCbPIZfHgy7gSeof97Pnp0okkyaXyJzIEEW-8,447517
-sovereign/statistics.py,sha256=-me83Bkfya5vQai3Irrf5R-RNG-XE7wlyqQFqKeueFo,2666
+sovereign/statistics.py,sha256=XKwblg_00TAdr7EjZ9gf7MEzvGR6tQ21bsJ-m-fSJE4,2033
 sovereign/templates/base.html,sha256=5vw3-NmN291pXRdArpCwhSce9bAYBWCJVRhvO5EmE9g,2296
 sovereign/templates/err.html,sha256=a3cEzOqyqWOIe3YxfTEjkxbTfxBxq1knD6GwzEFljfs,603
 sovereign/templates/resources.html,sha256=QaZ1S38JhAZg3-PfQS1cAKhCczVLXw9e4pztBrqr4qs,40217
@@ -56,12 +56,12 @@ sovereign/utils/weighted_clusters.py,sha256=bPzuRE7Qgvv04HcR2AhMDvBrFlZ8AfteweLK
 sovereign/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sovereign/views/api.py,sha256=jKVjSvi0Tr1HHix3hc0H8yGZoyDind2sJ4w7a4pJvy0,2168
 sovereign/views/crypto.py,sha256=7y0eHWtt-bbr2CwHEkH7odPaJ1IEviU-71U-MYJD0Kc,3360
-sovereign/views/discovery.py,sha256=4sVRPWpH8nYwY26GWK9N8maOYUNbIJTrUckZ3MahqAU,1876
+sovereign/views/discovery.py,sha256=B_D1ckfbN1dSKBvuFCTyfB79GUUriCADTB53OwZ8D4Q,2409
 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.0b108.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
-sovereign-1.0.0b108.dist-info/METADATA,sha256=HknFrhiSn4aRtUyRUxQYqGNkL7617PgNzIV8v5UsEFA,6304
-sovereign-1.0.0b108.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-sovereign-1.0.0b108.dist-info/entry_points.txt,sha256=VKJdnnN_HNL8xYQMXsFXfFmN6QkdXMEk5S964avxQJI,1404
-sovereign-1.0.0b108.dist-info/RECORD,,
+sovereign/worker.py,sha256=sOVHVVv63I08_KIdaKR0hUnYLMXwoqh9jmsCw8albZE,5230
+sovereign-1.0.0b121.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
+sovereign-1.0.0b121.dist-info/METADATA,sha256=iPs_H0klgEjiVvrzINuD7-SIek9EsGcqIOJHC5mMP3E,6304
+sovereign-1.0.0b121.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+sovereign-1.0.0b121.dist-info/entry_points.txt,sha256=VKJdnnN_HNL8xYQMXsFXfFmN6QkdXMEk5S964avxQJI,1404
+sovereign-1.0.0b121.dist-info/RECORD,,