sovereign 1.0.0b123__py3-none-any.whl → 1.0.0b134__py3-none-any.whl

sovereign/utils/mock.py

@@ -7,12 +7,16 @@ 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,
     resource_names: Optional[List[str] | str] = None,
     region: Optional[str] = "none",
-    version: Optional[str] = "1.11.1",
+    version: Optional[str] = "<envoy_version>",
     metadata: Optional[Dict[str, str]] = None,
     error_message: Optional[str] = None,
     expressions: Optional[list[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/healthchecks.py

@@ -31,7 +31,7 @@ async def deep_check(response: Response) -> List[str]:
     for template in list(XDS_TEMPLATES["default"].keys()):
         try:
             req = mock_discovery_request("v3", template, expressions=["cluster=*"])
-            cache.read(cache.client_id(req))
+            await cache.blocking_read(req)
         # pylint: disable=broad-except
         except Exception as e:
             ret.append(f"Failed {template}: {str(e)}")

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
-from multiprocessing import Process, cpu_count
+from typing import Optional, final
 from contextlib import asynccontextmanager
 
 from fastapi import FastAPI, Body
@@ -17,12 +16,50 @@ from sovereign import (
 )
 from sovereign.sources import SourcePoller
 from sovereign.schemas import RegisterClientRequest, DiscoveryRequest
-from sovereign.context import NEW_CONTEXT
+from sovereign.events import bus, Topic
 
 
 ClientId = str
-ONDEMAND: asyncio.Queue[tuple[ClientId, DiscoveryRequest]] = asyncio.Queue(100)
-RENDER_SEMAPHORE = asyncio.Semaphore(cpu_count())
+OnDemandJob = tuple[ClientId, DiscoveryRequest]
+
+
+@final
+class RenderQueue:
+    def __init__(self, maxsize: int = 0):
+        self._queue: asyncio.Queue[OnDemandJob] = asyncio.Queue(maxsize)
+        self._set: set[ClientId] = set()
+        self._lock = asyncio.Lock()
+
+    async def put(self, item: OnDemandJob):
+        id_ = item[0]
+        async with self._lock:
+            if id_ not in self._set:
+                await self._queue.put(item)
+                self._set.add(id_)
+
+    def put_nowait(self, item: OnDemandJob):
+        id_ = item[0]
+        if id_ in self._set:
+            return
+        if self._queue.full():
+            raise asyncio.QueueFull
+        self._queue.put_nowait(item)
+        self._set.add(id_)
+
+    async def get(self):
+        item = await self._queue.get()
+        async with self._lock:
+            self._set.remove(item[0])
+        return item
+
+    def full(self):
+        return self._queue.full()
+
+    def task_done(self):
+        self._queue.task_done()
+
+
+ONDEMAND = RenderQueue()
 
 
 def hidden_field(*args, **kwargs):
@@ -60,70 +97,69 @@ 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():
+    subscription = bus.subscribe(Topic.CONTEXT)
     while True:
         # block forever until new context arrives
-        await NEW_CONTEXT.wait()
-        log.debug("New context detected, re-rendering templates")
+        event = await subscription.get()
+        context_name = event.metadata.get("name")
+
+        log.debug(event.message)
         try:
             if registered := cache.clients():
-                log.debug("New context detected, re-rendering templates")
-                jobs = [
-                    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)
+                size = len(registered)
                 stats.increment("template.render_on_event", tags=[f"batch_size:{size}"])
-                await asyncio.gather(*tasks)
-                log.debug(f"Completed rendering {size} jobs")
+
+                for client, request in registered:
+                    if context_name in request.template.depends_on:
+                        log.debug(f"Rendering template for {request}")
+                        job = rendering.RenderJob(
+                            id=client,
+                            request=request,
+                            context=template_context.get_context(request),
+                        )
+                        job.submit()
+
         finally:
-            NEW_CONTEXT.clear()
+            await asyncio.sleep(config.template_context.cooldown)
 
 
 async def render_on_demand():
     while True:
         id, request = await ONDEMAND.get()
         stats.increment("template.render_on_demand")
-        log.debug("Received on-demand request to render templates")
+        log.debug(
+            f"Received on-demand request to render templates for {id} ({request})"
+        )
         job = rendering.RenderJob(
             id=id, request=request, context=template_context.get_context(request)
         )
-        await submit_render(job)
+        job.submit()
         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
+    subscription = bus.subscribe(Topic.CONTEXT)
     log.debug("Starting context loop")
     template_context.middleware = context_middleware
     asyncio.create_task(template_context.start())
-    await NEW_CONTEXT.wait()  # first refresh finished
+    event = await subscription.get()
+    log.debug(event.message)
 
     # Source polling
     if poller is not None:
@@ -156,12 +192,17 @@ async def client_add(
     registration: RegisterClientRequest = Body(...),
 ):
     xds = registration.request
-    if not cache.registered(xds):
-        log.debug(f"Received registration for new client {xds}")
-        ONDEMAND.put_nowait(await cache.register(xds))
-        stats.increment("client.registration", tags=["status:registered"])
-        return "Registering", 202
-    else:
-        log.debug("Client already registered")
+    if cache.registered(xds):
+        log.debug(f"Client already registered {xds=}")
         stats.increment("client.registration", tags=["status:exists"])
         return "Registered", 200
+    else:
+        id, req = cache.register(xds)
+        log.debug(f"Received registration for new client {xds}, {id=}")
+        try:
+            ONDEMAND.put_nowait((id, req))
+        except asyncio.QueueFull:
+            stats.increment("client.registration", tags=["status:queue_full"])
+            return "Slow down :(", 429
+        stats.increment("client.registration", tags=["status:registered"])
+        return "Registering", 202

{sovereign-1.0.0b123.dist-info → sovereign-1.0.0b134.dist-info}/METADATA

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: sovereign
-Version: 1.0.0b123
+Version: 1.0.0b134
 Summary: Envoy Proxy control-plane written in Python
-Home-page: https://pypi.org/project/sovereign/
 License: Apache-2.0
 Keywords: envoy,envoyproxy,control-plane,management,server
 Author: Vasili Syrakis
@@ -20,6 +19,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
@@ -37,7 +37,6 @@ Requires-Dist: aiofiles (>=23.2.1,<24.0.0)
 Requires-Dist: boto3 (>=1.28.62,<2.0.0) ; extra == "boto"
 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 (>=45.0.2)
 Requires-Dist: datadog (>=0.50.1) ; extra == "statsd"
@@ -49,7 +48,6 @@ Requires-Dist: jmespath (>=1.0.1,<2.0.0)
 Requires-Dist: orjson (>=3.9.15,<4.0.0) ; extra == "orjson"
 Requires-Dist: pydantic (>=2.7.2,<3.0.0)
 Requires-Dist: pydantic-settings (<2.6.0)
-Requires-Dist: redis (<=5.0.0)
 Requires-Dist: requests (>=2.32.4,<3.0.0)
 Requires-Dist: sentry-sdk (>=2.14.0,<3.0.0) ; extra == "sentry"
 Requires-Dist: starlette (>=0.47.2,<0.48.0)
@@ -60,6 +58,7 @@ Requires-Dist: ujson (>=5.8.0,<6.0.0) ; extra == "ujson"
 Requires-Dist: uvicorn (>=0.23.2,<0.24.0)
 Requires-Dist: uvloop (>=0.19.0,<0.20.0)
 Project-URL: Documentation, https://developer.atlassian.com/platform/sovereign/
+Project-URL: Homepage, https://pypi.org/project/sovereign/
 Project-URL: Repository, https://bitbucket.org/atlassian/sovereign/src/master/
 Description-Content-Type: text/markdown
 

{sovereign-1.0.0b123.dist-info → sovereign-1.0.0b134.dist-info}/RECORD

@@ -1,37 +1,38 @@
 sovereign/__init__.py,sha256=m8MVzaMSW4AvAqHvUAsXFdp8Oas5oQ8X7BcVt7Hfcik,1431
-sovereign/app.py,sha256=fsf4Jgni2G4EYJO0oQSWfGRZVDBvE2Yfick4n2YR6K4,4876
-sovereign/cache.py,sha256=P2LAskGxZSFgQ392aKz7auHty57HJNepQ7xl2-iWbBA,3842
+sovereign/app.py,sha256=LUsy4NgOddTxyC35lqezyDTG-_HMJZ5Q4b1GRv5NpgM,4882
+sovereign/cache/__init__.py,sha256=963_hdG4_HV8Kj-LYj7HM0VlL1sJF7F06dCPQdiHv4k,6228
+sovereign/cache/backends/__init__.py,sha256=6mPpf9OzyCBvRqpZzIBNy6jrDimEmg8yIiUYpNVTkQk,3160
+sovereign/cache/backends/s3.py,sha256=y8j-YGHWMWet_DGEH3dBtkolLHhgGvSS0nCtRuPbIb8,4991
+sovereign/cache/filesystem.py,sha256=83hyaRVTcueLgghgE50E88azkF4hTyIhzii9Plw1KmQ,1354
+sovereign/cache/types.py,sha256=RXLv5fTlDOOvkkycyYuDbq4WL7X7KaEslp-Thbz7o2k,243
 sovereign/constants.py,sha256=qdWD1lTvkaW5JGF7TmZhfksQHlRAJFVqbG7v6JQA9k8,46
-sovereign/context.py,sha256=aoGJ5k1n8ytCk7jggQ6XTx6Hx_ocy7cEkvGOFS3gzzc,8912
+sovereign/context.py,sha256=hnohbF4R-L3Kve5JKWHo9UfA4WGBCtwfq5m6xgMT8ak,8788
 sovereign/dynamic_config/__init__.py,sha256=0hrI9Y-FzDywEM9Lu6i2mPFhs1c47C096R1B_-E3sKA,3161
 sovereign/dynamic_config/deser.py,sha256=N3iUvDpuNHWjxUbGFydMVKicx4o8DyfvNukorqnQdt8,1834
 sovereign/dynamic_config/loaders.py,sha256=gPkxTL7gep20HIMRvjgOqAdUWqtb3970VBCAcUrIM4c,2915
 sovereign/error_info.py,sha256=r2KXBYq9Fo7AI2pmIpATWFm0pykr2MqfrKH0WWW5Sfk,1488
+sovereign/events.py,sha256=8WEIJo0C7mnx-pLjOTXPUFWYySvVXqDsj6p2e9LR9Jg,1203
 sovereign/logging/access_logger.py,sha256=G-R6kSPDQlrunSh34qXIT3LwbamAhdASuPgPOaXCRdM,2983
 sovereign/logging/application_logger.py,sha256=HjrGTi2zZ06AaToDVdSv4MNIF6aWN6vFW5heAdfqwlk,1800
 sovereign/logging/base_logger.py,sha256=ScOzHs8Rt1RZaUZGvaJSAlDEjD0BxkD5sLKSm2GgM0I,1243
 sovereign/logging/bootstrapper.py,sha256=gWFzIVsfeMdv7-d2Z6Fiw7J0xcuZzc4z2F4Iqn1KG30,1296
 sovereign/logging/types.py,sha256=rGqJAEVvgvzHy4aPfvEH6yQ-yblXNkEcWG7G8l9ALEA,282
-sovereign/middlewares.py,sha256=tQazHAtIdUc1hWhopg33x83-g-JcilU4HdjzoxFe6NU,3053
+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=NmdUUrOZMffFOGNmZ4AhrBe1BxVsCeITrL1Hds6Iv0k,6546
 sovereign/response_class.py,sha256=beMAFV-4L6DwyWzJzy71GkEW4gb7fzH1jd8-Tul13cU,427
-sovereign/schemas.py,sha256=Jf_w2mAX1b31eCAtJuxSZgy9KMVRKntmnEbbCZGZCxQ,38067
-sovereign/server.py,sha256=uviXN0mX-Wbhv36xjWlHiybzIlZrJsCwRf4xyRnibXQ,2970
+sovereign/schemas.py,sha256=iYb9l1ZUy2YLwQ41cyqM9qXyqPl40dyIIAuqk9cxMYA,37565
+sovereign/server.py,sha256=GAuBj73fpfZH760dDgVZFfI_2aKj3QHFv1JaVm4Eqow,2979
 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=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
-sovereign/static/style.css,sha256=vG8HPsbCbPIZfHgy7gSeof97Pnp0okkyaXyJzIEEW-8,447517
-sovereign/statistics.py,sha256=QhDB0bs5kZDGjy248AOIv_bzNbz_c2U7xmJ0hoUNOmw,2033
-sovereign/templates/base.html,sha256=5vw3-NmN291pXRdArpCwhSce9bAYBWCJVRhvO5EmE9g,2296
+sovereign/sources/poller.py,sha256=RPAyCKJ16k-195ugnR_UM6UtzpHOqvkzbpyY759WRLc,18994
+sovereign/statistics.py,sha256=xyWY_VEyIHzSmptPzLDx7kmP4J3roZkJX_CHA6RZlHo,2038
+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 +48,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=UyfURjsR0RVU7Xj_fiagI3IpcZjlEwaY7mx0iuxGK-k,2397
 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
@@ -57,11 +58,19 @@ 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=B_D1ckfbN1dSKBvuFCTyfB79GUUriCADTB53OwZ8D4Q,2409
-sovereign/views/healthchecks.py,sha256=TaXbxkX679jyQ8v5FxtBa2Qa0Z7KuqQ10WgAqfuVGUc,1743
-sovereign/views/interface.py,sha256=FmQ7LiUPLSvkEDOKCncrnKMD9g1lJKu-DQNbbyi8mqk,6346
-sovereign/worker.py,sha256=sOVHVVv63I08_KIdaKR0hUnYLMXwoqh9jmsCw8albZE,5230
-sovereign-1.0.0b123.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
-sovereign-1.0.0b123.dist-info/METADATA,sha256=ZiGaNA-XWo08b2EghMAbSDPRhKeu3_s8ls2o-pXqJNU,6304
-sovereign-1.0.0b123.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-sovereign-1.0.0b123.dist-info/entry_points.txt,sha256=VKJdnnN_HNL8xYQMXsFXfFmN6QkdXMEk5S964avxQJI,1404
-sovereign-1.0.0b123.dist-info/RECORD,,
+sovereign/views/healthchecks.py,sha256=ByJORGPxkaq0P2Mb1uy6qciwH0qZpCaThXEdRaHwrws,1741
+sovereign/views/interface.py,sha256=o6DaOqoh2M09_SsZrCOxr9rCVxMUZHXRXj4TNq800Ho,6999
+sovereign/worker.py,sha256=HD1otdAxgPiQrkyy_FNmCZDG_Qb9XOpiPQk_-KRP4Uk,6162
+sovereign_files/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sovereign_files/static/darkmode.js,sha256=3ip-eKGctDvNhN7UgmaHhzls7r5qIY-Jvh2EpefHbQ0,1449
+sovereign_files/static/node_expression.js,sha256=GKxKTSRc_96IbL3H4L_31ueJFXq4N7scm5R1RNqxP24,1489
+sovereign_files/static/panel.js,sha256=i5mGExjv-I4Gtt9dQiTyFwPZa8pg5rXeuTeidXNUiTE,2695
+sovereign_files/static/resources.css,sha256=Rt_ir_FkoI-VIAOqPhk0vILy8kB2egAYbQU26SOs1io,4500
+sovereign_files/static/resources.js,sha256=-TaXZ6tohyKA1SkX5YwrTcV5M8mOZ68cvEXpvZWznTo,24506
+sovereign_files/static/sass/style.scss,sha256=LdGXXuHi_tyMc7XhijIOrlIxyfLt827AAs2Z7DYpFpg,990
+sovereign_files/static/style.css,sha256=kmvkJ2820RKehWxhddkucbgFkvnpUgBMteOtpEuXjvQ,601347
+sovereign_files/static/style.css.map,sha256=h1ufjfDVX-8z-FuJqFG2-U9AVdi66U-e8uyiGdUZjDw,66576
+sovereign-1.0.0b134.dist-info/METADATA,sha256=y-8pqkfWk5pLl0lm07XUzKl4PxmWOTMD63DRXgw1ghI,6268
+sovereign-1.0.0b134.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+sovereign-1.0.0b134.dist-info/entry_points.txt,sha256=BhOMKka7D5WOnfEB_XWWFDNlejKOB4zax-HGu-_uL9k,1473
+sovereign-1.0.0b134.dist-info/RECORD,,

{sovereign-1.0.0b123.dist-info → sovereign-1.0.0b134.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.2.1
 Root-Is-Purelib: true
 Tag: py3-none-any

{sovereign-1.0.0b123.dist-info → sovereign-1.0.0b134.dist-info}/entry_points.txt

@@ -3,6 +3,9 @@ sovereign=sovereign.server:main
 sovereign-web=sovereign.server:web
 sovereign-worker=sovereign.server:worker
 
+[sovereign.cache.backends]
+s3=sovereign.cache.backends.s3:S3Backend
+
 [sovereign.deserializers]
 jinja=sovereign.dynamic_config.deser:JinjaDeserializer
 jinja2=sovereign.dynamic_config.deser:JinjaDeserializer

sovereign_files/static/darkmode.js

@@ -0,0 +1,51 @@
+document.addEventListener('DOMContentLoaded', function() {
+    const darkmode = "theme-dark";
+    const lightmode = "theme-light";
+    const toggle = document.getElementById('dark-mode-toggle');
+    const htmlTag = document.documentElement;
+
+    function preferredTheme() {
+        const preference = localStorage.getItem("theme");
+        if (preference) {
+            return preference;
+        }
+        if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
+            return "dark";
+        } else {
+            return "light";
+        };
+    }
+
+    function currentTheme() {
+        if (htmlTag.classList.contains(darkmode)) {
+            return "dark"
+        } else {
+            return "light"
+        }
+    }
+
+    function setTheme(theme) {
+        localStorage.setItem("theme", theme);
+        if (theme === "dark") {
+            htmlTag.classList.remove(lightmode);
+            htmlTag.classList.add(darkmode);
+            toggle.textContent = '🌘';
+        } else {
+            htmlTag.classList.remove(darkmode);
+            htmlTag.classList.add(lightmode);
+            toggle.textContent = '🌞';
+        }
+    }
+
+    setTheme(preferredTheme());
+
+    toggle.addEventListener("click", function() {
+        let current = currentTheme();
+        console.log("Current theme: " + current);
+        if (current === "dark") {
+            setTheme("light");
+        } else {
+            setTheme("dark");
+        }
+    });
+});

sovereign_files/static/node_expression.js

@@ -0,0 +1,42 @@
+const input = document.getElementById('filterInput');
+const inputMessage = document.getElementById('filterMessage');
+const form = document.getElementById('filterForm');
+
+function validateInput(inputString) {
+  if (!inputString || inputString.trim() === '') {
+    return "empty";
+  }
+  const validationRegex = /^(?:(?:id|cluster|metadata\.[\w\.\=\-]+|locality\.?(?:zone|sub_zone|region))=[a-zA-Z0-9_-]+ ?)*$/;
+  return validationRegex.test(inputString);
+}
+
+window.addEventListener('DOMContentLoaded', () => {
+  const match = document.cookie.match(/(?:^|; )node_expression=([^;]*)/);
+  if (match) {
+    input.value = match[1];
+  }
+});
+
+input.addEventListener('input', (event) => {
+  const result = validateInput(event.target.value);
+  if (result === "empty") {
+    input.className = "input is-dark";
+    inputMessage.className = "help is-dark";
+    inputMessage.innerHTML = "";
+  } else if (result === true) {
+    input.className = "input is-success";
+    inputMessage.className = "help is-success";
+    inputMessage.innerHTML = "Press enter to apply filter expression";
+  } else {
+    input.className = "input is-danger";
+    inputMessage.className = "help is-danger";
+    inputMessage.innerHTML = "The node filter expression may have no effect, or be invalid";
+  }
+});
+
+form.addEventListener('submit', (event) => {
+  event.preventDefault();
+  const value = input.value.trim();
+  document.cookie = `node_expression=${value}; path=/ui/resources/; max-age=31536000`;
+  location.reload();
+});