sovereign 0.29.0a3__py3-none-any.whl → 0.29.2__py3-none-any.whl

sovereign/discovery.py

@@ -23,7 +23,6 @@ except ImportError:
 from sovereign import XDS_TEMPLATES, config, logs, template_context
 from sovereign.utils.version_info import compute_hash
 from sovereign.schemas import XdsTemplate, DiscoveryRequest, ProcessedTemplate
-from sovereign.tracing import Tracer
 
 
 try:
@@ -106,8 +105,7 @@ def response(request: DiscoveryRequest, xds_type: str) -> ProcessedTemplate:
         resource_names=request.resources,
         **template_context.get_context(request, template),
     )
-    with Tracer("template rendering"):
-        content = template(**context)
+    content = template(**context)
 
     # Deserialize YAML output from Jinja2
     if not template.is_python_source:
@@ -118,19 +116,13 @@ def response(request: DiscoveryRequest, xds_type: str) -> ProcessedTemplate:
         content = deserialize_config(content)
 
     # Early return if the template is identical
-    with Tracer("nested test"):
-        with Tracer("hashing"):
-            config_version = compute_hash(content)
-        if (
-            config_version == request.version_info
-            and not config.discovery_cache.enabled
-        ):
-            return ProcessedTemplate(version_info=config_version, resources=[])
-
-        if not isinstance(content, dict):
-            raise RuntimeError(f"Attempting to filter unstructured data: {content}")
-        with Tracer("filtering"):
-            resources = filter_resources(content["resources"], request.resources)
+    config_version = compute_hash(content)
+    if config_version == request.version_info and not config.discovery_cache.enabled:
+        return ProcessedTemplate(version_info=config_version, resources=[])
+
+    if not isinstance(content, dict):
+        raise RuntimeError(f"Attempting to filter unstructured data: {content}")
+    resources = filter_resources(content["resources"], request.resources)
     return ProcessedTemplate(resources=resources, version_info=config_version)
 
 

sovereign/dynamic_config/__init__.py

@@ -1,3 +1,4 @@
+import inspect
 from typing import Any, Dict, Optional
 
 from pydantic import BaseModel
@@ -13,20 +14,20 @@ class Loadable(BaseModel):
     serialization: Optional[str] = None
 
     def load(self, default: Any = None) -> Any:
-        if self.protocol not in custom_loaders:
+        if self.protocol not in LOADERS:
             raise KeyError(
-                f"Could not find CustomLoader {self.protocol}. Available: {custom_loaders}"
+                f"Could not find CustomLoader {self.protocol}. Available: {LOADERS}"
             )
-        loader_ = custom_loaders[self.protocol]
+        loader_ = LOADERS[self.protocol]
 
         ser = self.serialization
         if ser is None:
             ser = loader_.default_deser
-        if ser not in deserializers:
+        if ser not in DESERIALIZERS:
             raise KeyError(
-                f"Could not find Deserializer {ser}. Available: {deserializers}"
+                f"Could not find Deserializer {ser}. Available: {DESERIALIZERS}"
             )
-        deserializer = deserializers[ser]
+        deserializer = DESERIALIZERS[ser]
 
         try:
             data = loader_.load(self.path)
@@ -63,23 +64,25 @@ class Loadable(BaseModel):
         )
 
 
-custom_loaders: Dict[str, CustomLoader] = {}
-loader_entry_point = EntryPointLoader("loaders")
-for entry_point in loader_entry_point.groups["loaders"]:
+LOADERS: Dict[str, CustomLoader] = {}
+for entry_point in EntryPointLoader("loaders").groups["loaders"]:
     custom_loader = entry_point.load()
-    try:
-        func = custom_loader()
-    except AttributeError:
-        raise AttributeError("CustomLoader does not implement .load()")
-    custom_loaders[entry_point.name] = func
+    func = custom_loader()
+    method = getattr(func, "load")
+    if not inspect.ismethod(method):
+        raise AttributeError(
+            f"CustomLoader {entry_point.name} does not implement .load()"
+        )
+    LOADERS[entry_point.name] = func
 
 
-deserializers: Dict[str, ConfigDeserializer] = {}
-deser_entry_point = EntryPointLoader("deserializers")
-for entry_point in deser_entry_point.groups["deserializers"]:
+DESERIALIZERS: Dict[str, ConfigDeserializer] = {}
+for entry_point in EntryPointLoader("deserializers").groups["deserializers"]:
     deserializer = entry_point.load()
-    try:
-        func = deserializer()
-    except AttributeError:
-        raise AttributeError("Deserializer does not implement .deserialize()")
-    deserializers[entry_point.name] = func
+    func = deserializer()
+    method = getattr(func, "deserialize")
+    if not inspect.ismethod(method):
+        raise AttributeError(
+            f"Deserializer {entry_point.name} does not implement .deserialize()"
+        )
+    DESERIALIZERS[entry_point.name] = func

sovereign/schemas.py

@@ -112,6 +112,7 @@ class DiscoveryCacheConfig(BaseModel):
     suppress: bool = False  # False = Don't suppress connection errors. True = suppress connection errors
     socket_keepalive: bool = True  # Try to keep connections to redis around.
     ttl: int = 60
+    extra_keys: Dict[str, Any] = {}
 
     @model_validator(mode="after")
     def set_default_protocol(self) -> Self:
@@ -294,9 +295,7 @@ class Resources(List[str]):
     """
 
     def __contains__(self, item: object) -> bool:
-        if (
-            len(self) == 0
-        ):  # TODO: refactor to remove overriding __contains__; its being used in multiple places
+        if len(self) == 0:
             return True
         return super().__contains__(item)
 
@@ -316,7 +315,7 @@ class DiscoveryRequest(BaseModel):
     version_info: str = Field(
         "0", title="The version of the envoy clients current configuration"
     )
-    resource_names: Resources = Field(
+    resource_names: List[str] = Field(
         default_factory=resources_factory, title="List of requested resource names"
     )
     hide_private_keys: bool = False

sovereign/views/discovery.py

@@ -117,21 +117,24 @@ async def perform_discovery(
         authenticate(req)
     if discovery_cache.enabled:
         logs.access_logger.queue_log_fields(CACHE_XDS_HIT=False)
-        cache_key = compute_hash(
-            [
-                api_version,
-                resource_type,
-                req.envoy_version,
-                req.resource_names,
-                req.desired_controlplane,
-                req.hide_private_keys,
-                req.type_url,
-                req.node.cluster,
-                req.node.locality,
-                req.node.metadata.get("auth", None),
-                req.node.metadata.get("num_cpus", None),
-            ]
-        )
+        metadata_keys = discovery_cache.extra_keys.get("metadata", [])
+        extra_metadata = [req.node.metadata.get(key, None) for key in metadata_keys]
+        hash_keys = [
+            api_version,
+            resource_type,
+            req.envoy_version,
+            req.resource_names,
+            req.desired_controlplane,
+            req.hide_private_keys,
+            req.type_url,
+            req.node.cluster,
+            req.node.locality,
+            req.node.metadata.get("auth", None),
+            req.node.metadata.get("num_cpus", None),
+        ] + extra_metadata
+
+        cache_key = compute_hash(hash_keys)
+
         if template := await cache.get(key=cache_key, default=None):
             logs.access_logger.queue_log_fields(CACHE_XDS_HIT=True)
             return template  # type: ignore[no-any-return]

{sovereign-0.29.0a3.dist-info → sovereign-0.29.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sovereign
-Version: 0.29.0a3
+Version: 0.29.2
 Summary: Envoy Proxy control-plane written in Python
 Home-page: https://pypi.org/project/sovereign/
 License: Apache-2.0
@@ -18,6 +18,7 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
@@ -37,7 +38,7 @@ 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 (>=42.0.5,<43.0.0)
+Requires-Dist: cryptography (>=42.0.0,<43.0.0)
 Requires-Dist: datadog (>=0.47.0,<0.48.0) ; extra == "statsd"
 Requires-Dist: fastapi (>=0.110.0,<0.111.0)
 Requires-Dist: glom (>=23.3.0,<24.0.0)
@@ -48,7 +49,7 @@ Requires-Dist: pydantic (>=2.7.2,<3.0.0)
 Requires-Dist: pydantic-settings (>=2.3.1,<3.0.0)
 Requires-Dist: redis (<=5.0.0)
 Requires-Dist: requests (>=2.31.0,<3.0.0)
-Requires-Dist: sentry-sdk (>=1.23.1,<2.0.0) ; extra == "sentry"
+Requires-Dist: sentry-sdk (>=2.14.0,<3.0.0) ; extra == "sentry"
 Requires-Dist: structlog (>=23.1.0,<24.0.0)
 Requires-Dist: ujson (>=5.8.0,<6.0.0) ; extra == "ujson"
 Requires-Dist: uvicorn (>=0.23.2,<0.24.0)

{sovereign-0.29.0a3.dist-info → sovereign-0.29.2.dist-info}/RECORD

@@ -3,8 +3,8 @@ sovereign/app.py,sha256=udDhuprAcJdYNgXufl94-oh-G74H9hXVzr8cKhgdQYI,4087
 sovereign/configuration.py,sha256=BCezlWYIpTsFRZwQIBwU-XrfBk1MdjTKMLA8huN-VPg,2484
 sovereign/constants.py,sha256=qdWD1lTvkaW5JGF7TmZhfksQHlRAJFVqbG7v6JQA9k8,46
 sovereign/context.py,sha256=Vwr-Jmo1I_05rFraxv6GoYEC83oFl87LG16px4R7IfA,6461
-sovereign/discovery.py,sha256=iS34aeJHSTqGY4i0jIQG9Yd0LKS63VQELaMSyvJk6Y8,6198
-sovereign/dynamic_config/__init__.py,sha256=kxthEPcB-fiVZ-5qudkct5bphsAo3LuGAE7rU0J9M7Q,2781
+sovereign/discovery.py,sha256=KHnWXUlceUglbR9eV5Q6LjPOpGv2dcrGOSus9-QLQJM,5952
+sovereign/dynamic_config/__init__.py,sha256=QoRNcuCAqV26zeyHm0iavsR55K3TwMohabWpPGIq_rM,2838
 sovereign/dynamic_config/deser.py,sha256=CYTP9UNx8falCXU_bEaWGNatyQlYrV4T57NPXNhTn0o,1842
 sovereign/dynamic_config/loaders.py,sha256=HxDT-6hlqg_ewPjrFu2RaWi6O1mmJ_Mpnu8AQk_enNg,2923
 sovereign/error_info.py,sha256=r2KXBYq9Fo7AI2pmIpATWFm0pykr2MqfrKH0WWW5Sfk,1488
@@ -17,7 +17,7 @@ sovereign/middlewares.py,sha256=UoLdfhqMj_E6jXgtr-n0maQIBYe9n95s3BwaQZfebHo,3097
 sovereign/modifiers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sovereign/modifiers/lib.py,sha256=DbXsxrrjnFE4Y7rbwpeiM5tS5w5NBwSdYH58AtDTP0I,2884
 sovereign/response_class.py,sha256=beMAFV-4L6DwyWzJzy71GkEW4gb7fzH1jd8-Tul13cU,427
-sovereign/schemas.py,sha256=wikM9mt42lbbxKEC60N8emG8fLrwnDp9ikkbJMECGXQ,31516
+sovereign/schemas.py,sha256=U0PDgTPz1cY92sHyI-WzncyxXY3YjlpNhyAy1d1w7Yk,31441
 sovereign/server.py,sha256=z8Uz1UYIZix0S40Srk774WIMDN2jl2SozO8irib0wc4,1402
 sovereign/sources/__init__.py,sha256=g9hEpFk8j5i1ApHQpbc9giTyJW41Ppgsqv5P9zGxOJk,78
 sovereign/sources/file.py,sha256=prUThsDCSPNwZaZpkKXhAm-GVRZWbBoGKGU0It4HHXs,690
@@ -55,11 +55,11 @@ sovereign/utils/weighted_clusters.py,sha256=bPzuRE7Qgvv04HcR2AhMDvBrFlZ8AfteweLK
 sovereign/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sovereign/views/admin.py,sha256=9jUI3YqaU42AtzCCOCKDcfj_2JXoaMU6eOAD6WYPjoI,4312
 sovereign/views/crypto.py,sha256=o8NSyiUBy7v1pMOXt_1UBi68FNcGkXSlEVg9C18y8kY,3324
-sovereign/views/discovery.py,sha256=TVvWTMzWydsC-SNKL9WsSss_Hfnt2Ed4SVC2A8Na7Jo,5932
+sovereign/views/discovery.py,sha256=9TyXfS3nW7I7Bkeg-KdsTeCm1N9WSCvDj_pTAi1V4bo,6067
 sovereign/views/healthchecks.py,sha256=_WkMunlrFpqGTLgtNtRr7gCsDCv5kiuYxCyTi-dMEKM,1357
 sovereign/views/interface.py,sha256=TFXbYp5oXZPRkVnAo-NWQFBb8XMtB519FaV78ludCcI,7055
-sovereign-0.29.0a3.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
-sovereign-0.29.0a3.dist-info/METADATA,sha256=pvrbBMc76iClWyj0-xIP5vcy0T6XTmzBYNCHF9qeEEg,6558
-sovereign-0.29.0a3.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-sovereign-0.29.0a3.dist-info/entry_points.txt,sha256=2mUHQjqeXEokMF6ZjDmvqQ9Fxk-Or2S4eC0h70ZxKmk,1201
-sovereign-0.29.0a3.dist-info/RECORD,,
+sovereign-0.29.2.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
+sovereign-0.29.2.dist-info/METADATA,sha256=b_okuWSnbZzVsqLyuvpVIMVyeR2A_5gTruNhzRaKppY,6607
+sovereign-0.29.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+sovereign-0.29.2.dist-info/entry_points.txt,sha256=2mUHQjqeXEokMF6ZjDmvqQ9Fxk-Or2S4eC0h70ZxKmk,1201
+sovereign-0.29.2.dist-info/RECORD,,

{sovereign-0.29.0a3.dist-info → sovereign-0.29.2.dist-info}/WHEEL

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