sovereign 0.18.1__py3-none-any.whl → 0.19.1__py3-none-any.whl

sovereign/__init__.py

@@ -1,7 +1,8 @@
 import os
 from contextvars import ContextVar
 from typing import Type, Any, Mapping
-from pkg_resources import get_distribution, resource_filename
+from importlib.metadata import version
+from pkg_resources import resource_filename
 
 from fastapi.responses import JSONResponse
 from starlette.templating import Jinja2Templates
@@ -52,9 +53,12 @@ def get_request_id() -> str:
     return _request_id_ctx_var.get()
 
 
-__version__ = get_distribution("sovereign").version
+DIST_NAME = "sovereign"
+
+__version__ = version(DIST_NAME)
 config_path = os.getenv("SOVEREIGN_CONFIG", "file:///etc/sovereign.yaml")
-html_templates = Jinja2Templates(resource_filename("sovereign", "templates"))
+
+html_templates = Jinja2Templates(resource_filename(DIST_NAME, "templates"))
 
 try:
     config = SovereignConfigv2(**parse_raw_configuration(config_path))

sovereign/context.py

@@ -26,10 +26,10 @@ class TemplateContext:
         self.configured_context = configured_context
         self.crypto = encryption_suite
         self.disabled_suite = disabled_suite
-        # initial load
-        self.context = self.load_context_variables()
         self.logger = logger
         self.stats = stats
+        # initial load
+        self.context = self.load_context_variables()
 
     async def start_refresh_context(self) -> NoReturn:
         if self.refresh_cron is not None:
@@ -40,21 +40,26 @@ class TemplateContext:
         raise RuntimeError("Failed to start refresh_context, this should never happen")
 
     async def refresh_context(self) -> None:
-        try:
-            self.context = self.load_context_variables()
-            self.stats.increment("context.refresh.success")
-        # pylint: disable=broad-except
-        except Exception as e:
-            self.logger(event=e)
-            self.stats.increment("context.refresh.error")
+        self.context = self.load_context_variables()
 
     def load_context_variables(self) -> Dict[str, Any]:
         ret = dict()
         for k, v in self.configured_context.items():
-            if isinstance(v, Loadable):
-                ret[k] = v.load()
-            elif isinstance(v, str):
-                ret[k] = Loadable.from_legacy_fmt(v).load()
+            try:
+                if isinstance(v, Loadable):
+                    ret[k] = v.load()
+                elif isinstance(v, str):
+                    ret[k] = Loadable.from_legacy_fmt(v).load()
+                self.stats.increment(
+                    "context.refresh.success",
+                    tags=[f"context:{k}"],
+                )
+            except Exception as e:  # pylint: disable=broad-exception-caught
+                self.logger(event=e)
+                self.stats.increment(
+                    "context.refresh.error",
+                    tags=[f"context:{k}"],
+                )
         if "crypto" not in ret:
             ret["crypto"] = self.crypto
         return ret

sovereign/server.py

@@ -1,14 +1,18 @@
 import gunicorn.app.base
 from fastapi import FastAPI
-from typing import Optional, Dict, Any
+from typing import Optional, Dict, Any, Callable
 from sovereign import asgi_config
 from sovereign.app import app
+from sovereign.utils.entry_point_loader import EntryPointLoader
 
 
 class StandaloneApplication(gunicorn.app.base.BaseApplication):  # type: ignore
+    _HOOKS = ["pre_fork", "post_fork"]
+
     def __init__(
         self, application: FastAPI, options: Optional[Dict[str, Any]] = None
     ) -> None:
+        self.loader = EntryPointLoader(*self._HOOKS)
         self.options = options or {}
         self.application = application
         super().__init__()
@@ -17,6 +21,20 @@ class StandaloneApplication(gunicorn.app.base.BaseApplication):  # type: ignore
         for key, value in self.options.items():
             self.cfg.set(key.lower(), value)
 
+        for hook in self._HOOKS:
+            self._install_hooks(hook)
+
+    def _install_hooks(self, name: str) -> None:
+        hooks: list[Callable[[Any, Any], None]] = [
+            ep.load() for ep in self.loader.groups[name]
+        ]
+
+        def master_hook(server: Any, worker: Any) -> None:
+            for hook in hooks:
+                hook(server, worker)
+
+        self.cfg.set(name, master_hook)
+
     def load(self) -> FastAPI:
         return self.application
 

sovereign/sources/poller.py

@@ -1,12 +1,13 @@
 import asyncio
 import traceback
 from copy import deepcopy
+from importlib.metadata import EntryPoint
 from datetime import timedelta, datetime
-from pkg_resources import iter_entry_points, EntryPoint
 from typing import Iterable, Any, Dict, List, Union, Type, Optional
 
 from glom import glom, PathAccessError
 
+from sovereign.utils.entry_point_loader import EntryPointLoader
 from sovereign.sources.lib import Source
 from sovereign.modifiers.lib import Modifier, GlobalModifier
 from sovereign.schemas import (
@@ -50,14 +51,10 @@ class SourcePoller:
         self.logger = logger
         self.stats = stats
 
-        self.entry_points: Dict[str, List[EntryPoint]] = dict()
-        for entry_point in ("sources", "modifiers", "global_modifiers"):
-            self.entry_points[entry_point] = list(
-                iter_entry_points(f"sovereign.{entry_point}")
-            )
+        self.entry_points = EntryPointLoader("sources", "modifiers", "global_modifiers")
 
         self.source_classes: Dict[str, Type[Source]] = {
-            e.name: e.load() for e in self.entry_points["sources"]
+            e.name: e.load() for e in self.entry_points.groups["sources"]
         }
         self.sources = [self.setup_source(s) for s in sources]
         if not self.sources:
@@ -89,14 +86,14 @@ class SourcePoller:
         if len(self.modifiers) == len(modifiers):
             return
         self.modifiers = self.load_modifier_entrypoints(
-            self.entry_points["modifiers"], modifiers
+            self.entry_points.groups["modifiers"], modifiers
         )
 
     def lazy_load_global_modifiers(self, global_modifiers: List[str]) -> None:
         if len(self.global_modifiers) == len(global_modifiers):
             return
         self.global_modifiers = self.load_global_modifier_entrypoints(
-            self.entry_points["global_modifiers"], global_modifiers
+            self.entry_points.groups["global_modifiers"], global_modifiers
         )
 
     def load_modifier_entrypoints(

sovereign/utils/entry_point_loader.py

@@ -0,0 +1,18 @@
+from typing import Dict
+from functools import cached_property
+from importlib.metadata import entry_points, EntryPoints
+
+
+class EntryPointLoader:
+    ENTRY_POINTS = entry_points()
+
+    def __init__(self, *args: str) -> None:
+        self._groups = args
+
+    @classmethod
+    def _select(cls, group: str) -> EntryPoints:
+        return cls.ENTRY_POINTS.select(group=f"sovereign.{group}")
+
+    @cached_property
+    def groups(self) -> Dict[str, EntryPoints]:
+        return {group: self._select(group) for group in self._groups}

{sovereign-0.18.1.dist-info → sovereign-0.19.1.dist-info}/METADATA

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

{sovereign-0.18.1.dist-info → sovereign-0.19.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
-sovereign/__init__.py,sha256=S6Wdp9HKMrOJwiGzjdYrT6LSZT7mz5m2Dcr_syOScLQ,3110
+sovereign/__init__.py,sha256=OqRozdp92NTV_6pbYNtyXsTAHxkpHTpxslhNgcrXuNY,3136
 sovereign/app.py,sha256=z5dT5wdVNeAQap5ORRmnLpJstb1euWoj4vXZPrMttNs,4017
 sovereign/config_loader.py,sha256=siuXN6T62Lx3JzMchnEBZ7ZDuSCFH73oWuUk-oTOVQQ,6382
-sovereign/context.py,sha256=zOiI5ml3OeMytT-N-fqXVafzoJByoJ15ys97wPQjbH8,4212
+sovereign/context.py,sha256=VswYtHZNcRMMT-Dlx9CBTxLo398uRXUPl6N--VcqybE,4411
 sovereign/discovery.py,sha256=EIghvk_HMYp14WzEG1aQhnsoGcLXMWSrCncPobJST4c,5885
 sovereign/error_info.py,sha256=r2KXBYq9Fo7AI2pmIpATWFm0pykr2MqfrKH0WWW5Sfk,1488
 sovereign/logs.py,sha256=DZK6F3LMxhch96qFasdXA6NPlQHJcKbjD83_S8W6Rds,4340
@@ -10,12 +10,12 @@ 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/schemas.py,sha256=jCW9WSjZ7SP8ycloYtC-6KG0Vj0VRBOesSTKa0kymrQ,27367
-sovereign/server.py,sha256=K9Zfw2d-I20s0F8-DeFHTg0B65IRluDalqSyJHQo67Y,825
+sovereign/server.py,sha256=z8Uz1UYIZix0S40Srk774WIMDN2jl2SozO8irib0wc4,1402
 sovereign/sources/__init__.py,sha256=g9hEpFk8j5i1ApHQpbc9giTyJW41Ppgsqv5P9zGxOJk,78
 sovereign/sources/file.py,sha256=A4UWoRU39v2Ex5Mtdl_uw53iMkslYylF4CiiwW7LOpk,689
 sovereign/sources/inline.py,sha256=bNqVZyelcUofYBWHFOUIhOUU9az32CdBEfaYRzNzFFE,1002
 sovereign/sources/lib.py,sha256=LIbnlKkL0bQT10y4GT2E8yypjYxqfJYbB9FkGB5C2oc,1030
-sovereign/sources/poller.py,sha256=u1XMjkw6oCXWL8Uh3TPuHYKwIIj-86VF-iVzlHPkIKU,11044
+sovereign/sources/poller.py,sha256=byxlEfhB1m2Uhzpi3wlknNLKRRQ47o56VuYLZrrFq1Q,10940
 sovereign/static/sass/style.scss,sha256=tPHPEm3sZeBFGDyyn3pHcA-nbaKT-h-UsSTsf6dHNDU,1158
 sovereign/static/style.css,sha256=vG8HPsbCbPIZfHgy7gSeof97Pnp0okkyaXyJzIEEW-8,447517
 sovereign/statistics.py,sha256=Xfj4oWMfCkbYc2ibF7rDUpbw6Zw6dI4N5BpCLDQc4j4,2336
@@ -28,6 +28,7 @@ sovereign/utils/auth.py,sha256=9rruWP-Ok8ec9l_MzWY3oUZKI8s7jt0Dmx3kHWnTRgQ,1772
 sovereign/utils/crypto.py,sha256=jNM3YRgdkxmTEeEDftkXnn33rr2qmT1-_3n3DUUdzRE,3438
 sovereign/utils/dictupdate.py,sha256=JkDjg16u7sW6A_4Q2oX1PY_MtJU7m1VivZWn9VLZ9V8,2559
 sovereign/utils/eds.py,sha256=3NwvQpFMxeWJ8pT1XhzqikrgT26HjObms4Ieh3hivOM,3894
+sovereign/utils/entry_point_loader.py,sha256=BEVodk-um70RvT1nSOu_IB-hr1K4ppthXod0VZEiZJ8,526
 sovereign/utils/mock.py,sha256=UCWiZ7PsRxvDL9OmSXUuzuGPri2s69IABXLALZHWGII,1269
 sovereign/utils/templates.py,sha256=FE_H_oE7VrS3X_VN1z_g10b9-rpmi1_gL-cMxi5XtXU,1057
 sovereign/utils/timer.py,sha256=_dUtEasj0BKbWYuQ_T3HFIyjurXXj-La-dNSMAwKMSo,795
@@ -39,8 +40,8 @@ sovereign/views/crypto.py,sha256=nxp6bkPU9GZw_zOk0fsJdz_XRQPXxPI6cXQDL9-cigU,204
 sovereign/views/discovery.py,sha256=dPX0auMsQCCura7eIq-jEGQoS92Avs9QPAsPGDjWL5I,5902
 sovereign/views/healthchecks.py,sha256=_WkMunlrFpqGTLgtNtRr7gCsDCv5kiuYxCyTi-dMEKM,1357
 sovereign/views/interface.py,sha256=2wXb5Kf5CbY_X37dr1v-3Uoep04abvv8x7BaUTNqsPg,7093
-sovereign-0.18.1.dist-info/entry_points.txt,sha256=kOn848ucVbNvtsGABDuwzOHmNiOb0Ey8dV85Z3dLv3Y,222
-sovereign-0.18.1.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
-sovereign-0.18.1.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
-sovereign-0.18.1.dist-info/METADATA,sha256=-acGNjvQvlkw8E_JTwPPQaWpOlz0CqE66ltLOArvvDA,6417
-sovereign-0.18.1.dist-info/RECORD,,
+sovereign-0.19.1.dist-info/entry_points.txt,sha256=kOn848ucVbNvtsGABDuwzOHmNiOb0Ey8dV85Z3dLv3Y,222
+sovereign-0.19.1.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
+sovereign-0.19.1.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
+sovereign-0.19.1.dist-info/METADATA,sha256=gUIo4dFBvurdReBiftpAOL1Je9CbcitbtcigturyikU,6417
+sovereign-0.19.1.dist-info/RECORD,,