sovereign 1.0.0b125__py3-none-any.whl → 1.0.0b127__py3-none-any.whl

sovereign/utils/mock.py

@@ -7,6 +7,10 @@ from sovereign.schemas import DiscoveryRequest, Node, Locality, Status
 scrub = re.compile(r"[^a-zA-Z_\.]")
 
 
+class NodeExpressionError(Exception):
+    pass
+
+
 def mock_discovery_request(
     api_version: Optional[str] = "V3",
     resource_type: Optional[str] = None,
@@ -54,7 +58,7 @@ def set_node_expressions(node, expressions):
             field, value = re.split(r"\s*=\s*", expr, maxsplit=1)
             value = f'"{value}"'
         except ValueError:
-            raise ValueError(f"Invalid expression format: {expr}")
+            raise NodeExpressionError(f"Invalid node filter format: {expr}")
 
         field = scrub.sub("", field)
         parts = field.split(".")
@@ -62,7 +66,7 @@ def set_node_expressions(node, expressions):
         try:
             value = ast.literal_eval(value)
         except Exception as e:
-            raise ValueError(f"invalid value: {value}") from e
+            raise NodeExpressionError(f"Invalid node filter value: {value}") from e
 
         current = node
         for part in parts[:-1]:

sovereign/views/interface.py

@@ -7,10 +7,10 @@ from fastapi.encoders import jsonable_encoder
 from fastapi.requests import Request
 from fastapi.responses import HTMLResponse, JSONResponse, Response
 
-from sovereign import html_templates, cache
+from sovereign import html_templates, cache, __version__
 from sovereign.schemas import DiscoveryTypes, XDS_TEMPLATES
 from sovereign.response_class import json_response_class
-from sovereign.utils.mock import mock_discovery_request
+from sovereign.utils.mock import NodeExpressionError, mock_discovery_request
 
 router = APIRouter()
 
@@ -25,9 +25,7 @@ async def ui_main(request: Request) -> HTMLResponse:
             request=request,
             name="base.html",
             media_type="text/html",
-            context={
-                "all_types": all_types,
-            },
+            context={"all_types": all_types, "sovereign_version": __version__},
         )
     except IndexError:
         return html_templates.TemplateResponse(
@@ -36,9 +34,12 @@ async def ui_main(request: Request) -> HTMLResponse:
             media_type="text/html",
             context={
                 "title": "No resource types configured",
-                "message": "A template should be defined for every resource "
-                "type that you want your envoy proxies to discover.",
+                "message": (
+                    "A template should be defined for every resource "
+                    "type that you want your envoy proxies to discover."
+                ),
                 "doc_link": "https://developer.atlassian.com/platform/sovereign/tutorial/templates/#templates",
+                "sovereign_version": __version__,
             },
         )
 
@@ -63,18 +64,31 @@ async def resources(
 ) -> HTMLResponse:
     ret: Dict[str, List[Dict[str, Any]]] = defaultdict(list)
     response = None
-    mock_request = mock_discovery_request(
-        api_version,
-        xds_type,
-        version=envoy_version,
-        region=region,
-        expressions=node_expression.split(),
-    )
+    try:
+        mock_request = mock_discovery_request(
+            api_version,
+            xds_type,
+            version=envoy_version,
+            region=region,
+            expressions=node_expression.split(),
+        )
+        clear_cookie = False
+        error = None
+    except NodeExpressionError as e:
+        mock_request = mock_discovery_request(
+            api_version,
+            xds_type,
+            version=envoy_version,
+            region=region,
+        )
+        clear_cookie = True
+        error = str(e)
+
     response = await cache.blocking_read(mock_request)
     if response:
         ret["resources"] = json.loads(response.text).get("resources", [])
 
-    return html_templates.TemplateResponse(
+    resp = html_templates.TemplateResponse(
         request=request,
         name="resources.html",
         media_type="text/html",
@@ -87,8 +101,13 @@ async def resources(
             "all_types": all_types,
             "version": envoy_version,
             "available_versions": list(XDS_TEMPLATES.keys()),
+            "error": error,
+            "sovereign_version": __version__,
         },
     )
+    if clear_cookie:
+        resp.delete_cookie("node_expression", path="/ui/resources/")
+    return resp
 
 
 @router.get(

sovereign/worker.py

@@ -1,6 +1,5 @@
 import asyncio
 from typing import Optional, final
-from multiprocessing import Process, cpu_count
 from contextlib import asynccontextmanager
 
 from fastapi import FastAPI, Body
@@ -61,7 +60,6 @@ class RenderQueue:
 
 
 ONDEMAND = RenderQueue()
-RENDER_SEMAPHORE = asyncio.Semaphore(cpu_count())
 
 
 def hidden_field(*args, **kwargs):
@@ -99,42 +97,23 @@ if config.sources is not None:
     context_middleware.append(poller.add_to_context)
 
 
-def render(job: rendering.RenderJob):
-    log.debug(f"Spawning render process for {job.id}")
-    process = Process(target=rendering.generate, args=[job])
-    process.start()
-    return process
-
-
-async def submit_render(job: rendering.RenderJob):
-    async with RENDER_SEMAPHORE:
-        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():
     while True:
         # block forever until new context arrives
-        await NEW_CONTEXT.wait()
+        _ = await NEW_CONTEXT.wait()
         log.debug("New context detected, re-rendering templates")
         try:
             if registered := cache.clients():
                 log.debug("New context detected, re-rendering templates")
-                jobs = [
-                    rendering.RenderJob(
+                size = len(registered)
+                stats.increment("template.render_on_event", tags=[f"batch_size:{size}"])
+                for client, request in registered:
+                    job = rendering.RenderJob(
                         id=client,
                         request=request,
                         context=template_context.get_context(request),
                     )
-                    for client, request in registered
-                ]
-                tasks = [submit_render(job) for job in jobs]
-                size = len(tasks)
-                stats.increment("template.render_on_event", tags=[f"batch_size:{size}"])
-                await asyncio.gather(*tasks)
-                log.debug(f"Completed rendering {size} jobs")
+                    job.spawn()
         finally:
             NEW_CONTEXT.clear()
 
@@ -147,16 +126,24 @@ async def render_on_demand():
         job = rendering.RenderJob(
             id=id, request=request, context=template_context.get_context(request)
         )
-        await submit_render(job)
+        job.spawn()
         ONDEMAND.task_done()
 
 
+async def monitor_render_queue():
+    """Periodically report render queue size metrics"""
+    while True:
+        await asyncio.sleep(10)
+        stats.gauge("template.on_demand_queue_size", ONDEMAND._queue.qsize())
+
+
 @asynccontextmanager
 async def lifespan(_: FastAPI):
     # Template Rendering
     log.debug("Starting rendering loops")
     asyncio.create_task(render_on_event())
     asyncio.create_task(render_on_demand())
+    asyncio.create_task(monitor_render_queue())
 
     # Template context
     log.debug("Starting context loop")

{sovereign-1.0.0b125.dist-info → sovereign-1.0.0b127.dist-info}/METADATA

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

{sovereign-1.0.0b125.dist-info → sovereign-1.0.0b127.dist-info}/RECORD

@@ -15,7 +15,7 @@ sovereign/logging/types.py,sha256=rGqJAEVvgvzHy4aPfvEH6yQ-yblXNkEcWG7G8l9ALEA,28
 sovereign/middlewares.py,sha256=6w4JpvtNGvQA4rocQsYQjuu-ckhpKT6gKYA16T-kiqA,3082
 sovereign/modifiers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sovereign/modifiers/lib.py,sha256=Cx0VrpTKbSjb3YmHyG4Jy6YEaPlrwpeqNaom3zu1_hw,2885
-sovereign/rendering.py,sha256=MIA7se7-C4WTWf7xZSgqpf7NvhDT7NkZbR3_G9N1dHI,5015
+sovereign/rendering.py,sha256=hxlu_K7h1fVNYRLVA4-YM_KY4rhaEOzHq-4dCVwgdWE,5688
 sovereign/response_class.py,sha256=beMAFV-4L6DwyWzJzy71GkEW4gb7fzH1jd8-Tul13cU,427
 sovereign/schemas.py,sha256=Jf_w2mAX1b31eCAtJuxSZgy9KMVRKntmnEbbCZGZCxQ,38067
 sovereign/server.py,sha256=uviXN0mX-Wbhv36xjWlHiybzIlZrJsCwRf4xyRnibXQ,2970
@@ -24,14 +24,16 @@ 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=zpNUhQft-NoJbbxO1kCFp6jJSRSkBmf181xodnF_TiI,18469
-sovereign/static/node_expression.js,sha256=dL9QLM49jorqavf3Qtye6E1QTWYDT1rFI0tQR1HsiLQ,504
+sovereign/static/darkmode.js,sha256=3ip-eKGctDvNhN7UgmaHhzls7r5qIY-Jvh2EpefHbQ0,1449
+sovereign/static/node_expression.js,sha256=GKxKTSRc_96IbL3H4L_31ueJFXq4N7scm5R1RNqxP24,1489
 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/static/resources.css,sha256=Rt_ir_FkoI-VIAOqPhk0vILy8kB2egAYbQU26SOs1io,4500
+sovereign/static/resources.js,sha256=-TaXZ6tohyKA1SkX5YwrTcV5M8mOZ68cvEXpvZWznTo,24506
+sovereign/static/sass/style.scss,sha256=LdGXXuHi_tyMc7XhijIOrlIxyfLt827AAs2Z7DYpFpg,990
 sovereign/statistics.py,sha256=QhDB0bs5kZDGjy248AOIv_bzNbz_c2U7xmJ0hoUNOmw,2033
-sovereign/templates/base.html,sha256=5vw3-NmN291pXRdArpCwhSce9bAYBWCJVRhvO5EmE9g,2296
+sovereign/templates/base.html,sha256=MMhhvvClTixKibYfhXm8Ezx6ttu6Sqki44niciCPMO4,2990
 sovereign/templates/err.html,sha256=a3cEzOqyqWOIe3YxfTEjkxbTfxBxq1knD6GwzEFljfs,603
-sovereign/templates/resources.html,sha256=QaZ1S38JhAZg3-PfQS1cAKhCczVLXw9e4pztBrqr4qs,40217
+sovereign/templates/resources.html,sha256=5MfXHW8s3tAWda66Q48zVgDhZNLwHGsdCKkKHLZohIs,10420
 sovereign/testing/loaders.py,sha256=mcmErhI9ZkJUBZl8jv2qP-PCBRFeAIgyBFlfCgU4Vvk,199
 sovereign/testing/modifiers.py,sha256=7_c2hWXn_sYJ6997N1_uSWtClOikcOzu1yRCY56-l-4,361
 sovereign/tracing.py,sha256=Xo3npgh6yesACSlynv9j6qnXxvYEBzXv5LL4Zkc1QDw,2446
@@ -47,7 +49,7 @@ sovereign/utils/crypto/suites/fernet_cipher.py,sha256=rP6M5ys1vctyadOxDGNFoyerWP
 sovereign/utils/dictupdate.py,sha256=Bi7QaC7en-k3EOepwNJqpOKRNBgp6ZsBZVOvH_0nMtc,2558
 sovereign/utils/eds.py,sha256=sCEDj1y-0Crs40cHZLiPGVb7ed1f8vFqgHLY5R2LMbw,4377
 sovereign/utils/entry_point_loader.py,sha256=BEVodk-um70RvT1nSOu_IB-hr1K4ppthXod0VZEiZJ8,526
-sovereign/utils/mock.py,sha256=VgaxArNnTi0z6cyodrcjiSNdQn4sFOcYG_VQYhvsisI,2308
+sovereign/utils/mock.py,sha256=j9zaLT39MSuF7vGKvhGRJtrXSTU7WFB1rirUWWBGYm4,2388
 sovereign/utils/resources.py,sha256=rPrWgcIt4YhV-Dz88_kr5WrQNiSKt-jTlOZ8EIJxJx8,472
 sovereign/utils/templates.py,sha256=FE_H_oE7VrS3X_VN1z_g10b9-rpmi1_gL-cMxi5XtXU,1057
 sovereign/utils/timer.py,sha256=_dUtEasj0BKbWYuQ_T3HFIyjurXXj-La-dNSMAwKMSo,795
@@ -58,10 +60,10 @@ sovereign/views/api.py,sha256=jKVjSvi0Tr1HHix3hc0H8yGZoyDind2sJ4w7a4pJvy0,2168
 sovereign/views/crypto.py,sha256=7y0eHWtt-bbr2CwHEkH7odPaJ1IEviU-71U-MYJD0Kc,3360
 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=iMeUQfN6hFoarqteG0eYpzVDj_Izknpe6QnVY-l7U6U,6373
-sovereign-1.0.0b125.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
-sovereign-1.0.0b125.dist-info/METADATA,sha256=lE6OWxPME5zhTc3YNQhJbVPxYq4C2rVBQSZJc5JTxlw,6304
-sovereign-1.0.0b125.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-sovereign-1.0.0b125.dist-info/entry_points.txt,sha256=VKJdnnN_HNL8xYQMXsFXfFmN6QkdXMEk5S964avxQJI,1404
-sovereign-1.0.0b125.dist-info/RECORD,,
+sovereign/views/interface.py,sha256=o6DaOqoh2M09_SsZrCOxr9rCVxMUZHXRXj4TNq800Ho,6999
+sovereign/worker.py,sha256=Y4le54cZU1Enj8scu1G1sM_KPVPUmZ7vmTuxpd59X2Q,5855
+sovereign-1.0.0b127.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
+sovereign-1.0.0b127.dist-info/METADATA,sha256=oU2lYwJzDy4asWnC88rWcstr-lrjycu0Os6jtrQPAdE,6304
+sovereign-1.0.0b127.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+sovereign-1.0.0b127.dist-info/entry_points.txt,sha256=VKJdnnN_HNL8xYQMXsFXfFmN6QkdXMEk5S964avxQJI,1404
+sovereign-1.0.0b127.dist-info/RECORD,,