sovereign 0.31.0__py3-none-any.whl → 0.32.2__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of sovereign might be problematic. Click here for more details.

Files changed (6) hide show
  1. sovereign/views/discovery.py +13 -5
  2. {sovereign-0.31.0.dist-info → sovereign-0.32.2.dist-info}/METADATA +4 -3
  3. {sovereign-0.31.0.dist-info → sovereign-0.32.2.dist-info}/RECORD +6 -6
  4. {sovereign-0.31.0.dist-info → sovereign-0.32.2.dist-info}/LICENSE.txt +0 -0
  5. {sovereign-0.31.0.dist-info → sovereign-0.32.2.dist-info}/WHEEL +0 -0
  6. {sovereign-0.31.0.dist-info → sovereign-0.32.2.dist-info}/entry_points.txt +0 -0
sovereign/views/discovery.py CHANGED
@@ -1,3 +1,4 @@
1
+ import os
1
2
  from typing import Dict
2
3
 
3
4
  from fastapi import Body, Header
@@ -117,8 +118,6 @@ async def perform_discovery(
117
118
  authenticate(req)
118
119
  if discovery_cache.enabled:
119
120
  logs.access_logger.queue_log_fields(CACHE_XDS_HIT=False)
120
- metadata_keys = discovery_cache.extra_keys.get("metadata", [])
121
- extra_metadata = [req.node.metadata.get(key, None) for key in metadata_keys]
122
121
  hash_keys = [
123
122
  api_version,
124
123
  resource_type,
@@ -130,11 +129,20 @@ async def perform_discovery(
130
129
  req.node.cluster,
131
130
  req.node.locality,
132
131
  # TODO: this is very bad and everyone should feel bad. Remove this in the next breaking release
133
- req.node.metadata.get("auth", None),
134
- req.node.metadata.get("num_cpus", None),
132
+ req.node.metadata.get("auth"),
133
+ req.node.metadata.get("num_cpus"),
135
134
  ]
135
+
136
+ metadata_keys = discovery_cache.extra_keys.get("metadata", [])
137
+ extra_metadata = [req.node.metadata.get(key) for key in metadata_keys]
136
138
  hash_keys += extra_metadata
137
- cache_key = compute_hash(hash_keys)
139
+
140
+ env_keys = discovery_cache.extra_keys.get("env_vars", [])
141
+ env_var_values = [os.getenv(key) for key in env_keys]
142
+ hash_keys += env_var_values
143
+
144
+ cache_key = compute_hash(*hash_keys)
145
+
138
146
  if template := await cache.get(key=cache_key, default=None):
139
147
  logs.access_logger.queue_log_fields(CACHE_XDS_HIT=True)
140
148
  return template # type: ignore[no-any-return]
{sovereign-0.31.0.dist-info → sovereign-0.32.2.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: sovereign
3
- Version: 0.31.0
3
+ Version: 0.32.2
4
4
  Summary: Envoy Proxy control-plane written in Python
5
5
  Home-page: https://pypi.org/project/sovereign/
6
6
  License: Apache-2.0
@@ -40,16 +40,17 @@ Requires-Dist: cachetools (>=5.3.2,<6.0.0)
40
40
  Requires-Dist: cashews[redis] (>=6.3.0,<7.0.0) ; extra == "caching"
41
41
  Requires-Dist: croniter (>=1.4.1,<2.0.0)
42
42
  Requires-Dist: cryptography (>=42.0.0,<43.0.0)
43
- Requires-Dist: datadog (>=0.47.0,<0.48.0) ; extra == "statsd"
43
+ Requires-Dist: datadog (>=0.50.1) ; extra == "statsd"
44
44
  Requires-Dist: fastapi (>=0.115.2,<0.116.0)
45
45
  Requires-Dist: glom (>=23.3.0,<24.0.0)
46
46
  Requires-Dist: gunicorn (>=23.0.0,<24.0.0)
47
+ Requires-Dist: h11 (>=0.16.0,<0.17.0)
47
48
  Requires-Dist: httptools (>=0.6.0,<0.7.0) ; extra == "httptools"
48
49
  Requires-Dist: orjson (>=3.9.15,<4.0.0) ; extra == "orjson"
49
50
  Requires-Dist: pydantic (>=2.7.2,<3.0.0)
50
51
  Requires-Dist: pydantic-settings (<2.6.0)
51
52
  Requires-Dist: redis (<=5.0.0)
52
- Requires-Dist: requests (>=2.31.0,<3.0.0)
53
+ Requires-Dist: requests (>=2.32.4,<3.0.0)
53
54
  Requires-Dist: sentry-sdk (>=2.14.0,<3.0.0) ; extra == "sentry"
54
55
  Requires-Dist: starlette-context (>=0.3.6,<0.4.0)
55
56
  Requires-Dist: structlog (>=23.1.0,<24.0.0)
{sovereign-0.31.0.dist-info → sovereign-0.32.2.dist-info}/RECORD RENAMED
@@ -55,11 +55,11 @@ sovereign/utils/weighted_clusters.py,sha256=bPzuRE7Qgvv04HcR2AhMDvBrFlZ8AfteweLK
55
55
  sovereign/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
56
56
  sovereign/views/admin.py,sha256=LQhz5CPFfEa8PjAp-SSQ_zce1sq-B95x4cG0BC_j-_s,4807
57
57
  sovereign/views/crypto.py,sha256=7y0eHWtt-bbr2CwHEkH7odPaJ1IEviU-71U-MYJD0Kc,3360
58
- sovereign/views/discovery.py,sha256=BmsHsBe_N33_VahkLQda3CfuIqJZAHSA0Bndg9KagQM,6187
58
+ sovereign/views/discovery.py,sha256=S8Mp3TfcEyfyFfr234xmXSUxH5x27OdBZ5NzrOsiIu0,6348
59
59
  sovereign/views/healthchecks.py,sha256=8BA11nigm1btnBOdtXGN1B04Ow2uswWNNsuKoPLXgh0,1393
60
60
  sovereign/views/interface.py,sha256=KoLB3YIZGulrYOV6MA6ucmQzlmSDrYEO8uq045awy1Q,7712
61
- sovereign-0.31.0.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
62
- sovereign-0.31.0.dist-info/METADATA,sha256=_3lQ9SMGUe-JRSnoRuyqg-Jd8w1tGouGpJqh6WazXsA,6194
63
- sovereign-0.31.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
64
- sovereign-0.31.0.dist-info/entry_points.txt,sha256=CTCjlomxNz2Ii4hYbN-gEZPBrZNUCcmJcb7NYqm4Nn8,1328
65
- sovereign-0.31.0.dist-info/RECORD,,
61
+ sovereign-0.32.2.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
62
+ sovereign-0.32.2.dist-info/METADATA,sha256=K-NRRrmpbP6200InynS0dCNo7VABTiD0KC2ayIB0MJ0,6224
63
+ sovereign-0.32.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
64
+ sovereign-0.32.2.dist-info/entry_points.txt,sha256=CTCjlomxNz2Ii4hYbN-gEZPBrZNUCcmJcb7NYqm4Nn8,1328
65
+ sovereign-0.32.2.dist-info/RECORD,,