sovereign 0.24.3__py3-none-any.whl → 0.24.4__py3-none-any.whl

sovereign/context.py

@@ -25,6 +25,7 @@ from sovereign.utils.timer import poll_forever, poll_forever_cron
 class LoadContextResponse(NamedTuple):
     context_name: str
     context: Dict[str, Any]
+    success: bool = True
 
 
 class TemplateContext:
@@ -52,7 +53,8 @@ class TemplateContext:
         self.logger = logger
         self.stats = stats
         # initial load
-        self.context = asyncio.run(self.load_context_variables())
+        self.context: Dict[str, Any] = {}
+        asyncio.run(self.load_context_variables())
 
     async def start_refresh_context(self) -> NoReturn:
         if self.refresh_cron is not None:
@@ -63,7 +65,7 @@ class TemplateContext:
         raise RuntimeError("Failed to start refresh_context, this should never happen")
 
     async def refresh_context(self) -> None:
-        self.context = await self.load_context_variables()
+        await self.load_context_variables()
 
     async def _load_context(
         self,
@@ -96,13 +98,11 @@ class TemplateContext:
                         "context.refresh.error",
                         tags=[f"context:{context_name}"],
                     )
-                    return LoadContextResponse(context_name, context_response)
+                    return LoadContextResponse(context_name, context_response, False)
                 else:
                     await asyncio.sleep(refresh_retry_interval_secs)
 
-    async def load_context_variables(self) -> Dict[str, Any]:
-        context_response: Dict[str, Any] = dict()
-
+    async def load_context_variables(self) -> None:
         context_coroutines: list[Awaitable[LoadContextResponse]] = []
         for context_name, context_config in self.configured_context.items():
             context_coroutines.append(
@@ -117,12 +117,16 @@ class TemplateContext:
         context_results: list[LoadContextResponse] = await asyncio.gather(
             *context_coroutines
         )
-        for context_result in context_results:
-            context_response[context_result.context_name] = context_result.context
 
-        if "crypto" not in context_response and self.crypto:
-            context_response["crypto"] = self.crypto
-        return context_response
+        for context_result in context_results:
+            if (
+                context_result.success
+                or context_result.context_name not in self.context
+            ):
+                self.context[context_result.context_name] = context_result.context
+
+        if "crypto" not in self.context and self.crypto:
+            self.context["crypto"] = self.crypto
 
     def build_new_context_from_instances(self, node_value: str) -> Dict[str, Any]:
         matches = self.poller.match_node(node_value=node_value)

{sovereign-0.24.3.dist-info → sovereign-0.24.4.dist-info}/METADATA

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

{sovereign-0.24.3.dist-info → sovereign-0.24.4.dist-info}/RECORD

@@ -3,7 +3,7 @@ sovereign/app.py,sha256=uozeEQJjefBUV6dZfIooTBJgDhEE4bd2ozRxWVdVMK4,4085
 sovereign/config_loader.py,sha256=ZLKlyuvJ8Wqhsg6xZI-zp_5ABslB3Tc9zEdpds7-d7Q,6349
 sovereign/configuration.py,sha256=rpZWNgn5ySNO1bdHlUix02yzo3wOefJaWkif5_4HjyE,2665
 sovereign/constants.py,sha256=qdWD1lTvkaW5JGF7TmZhfksQHlRAJFVqbG7v6JQA9k8,46
-sovereign/context.py,sha256=zpkYSfGLhFNKQEGLGjcDnYaR-GF5TorlG646glttGBw,6427
+sovereign/context.py,sha256=dsKEUK7yrOpXGMY_YzxuaoBDmGXIh0fvtVBoh3Dd8SY,6509
 sovereign/discovery.py,sha256=TPecAoUDHx6SbS5hE2K73uEgDro0Uzz3qsvOQMpFtGI,5899
 sovereign/error_info.py,sha256=r2KXBYq9Fo7AI2pmIpATWFm0pykr2MqfrKH0WWW5Sfk,1488
 sovereign/logging/access_logger.py,sha256=JMMzQvi7doFJGA__YYqyasdfAT9W31Ycu_oZ2ovAMis,2565
@@ -48,8 +48,8 @@ sovereign/views/crypto.py,sha256=nxp6bkPU9GZw_zOk0fsJdz_XRQPXxPI6cXQDL9-cigU,204
 sovereign/views/discovery.py,sha256=DzFfG8fdFHKAZzmWZi9YzFP2PYLCf3tPlEAY3udNyNg,5980
 sovereign/views/healthchecks.py,sha256=_WkMunlrFpqGTLgtNtRr7gCsDCv5kiuYxCyTi-dMEKM,1357
 sovereign/views/interface.py,sha256=Y2fbR26cSF8eKQHfTbnv5WKEdgqaGNwys0lEGUTjXqw,7041
-sovereign-0.24.3.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
-sovereign-0.24.3.dist-info/METADATA,sha256=0ZcPwabVSA4JB76jk4fLNDj3xExVK8ErJyZHRFfNakg,6420
-sovereign-0.24.3.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-sovereign-0.24.3.dist-info/entry_points.txt,sha256=kOn848ucVbNvtsGABDuwzOHmNiOb0Ey8dV85Z3dLv3Y,222
-sovereign-0.24.3.dist-info/RECORD,,
+sovereign-0.24.4.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
+sovereign-0.24.4.dist-info/METADATA,sha256=LqqpmlxRdURu6o4bvIiNo_0_zOWbD4hWsck8Fpn0HDY,6420
+sovereign-0.24.4.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+sovereign-0.24.4.dist-info/entry_points.txt,sha256=kOn848ucVbNvtsGABDuwzOHmNiOb0Ey8dV85Z3dLv3Y,222
+sovereign-0.24.4.dist-info/RECORD,,