sovereign 1.0.0b127.post6__py3-none-any.whl → 1.0.0b129__py3-none-any.whl

sovereign/app.py

@@ -101,7 +101,7 @@ def init_app() -> FastAPI:
 
     @application.get("/static/{filename}", summary="Return a static asset")
     async def static(filename: str) -> Response:
-        return FileResponse(get_package_file("sovereign", f"static/{filename}"))  # type: ignore[arg-type]
+        return FileResponse(get_package_file("sovereign-files", f"static/{filename}"))  # type: ignore[arg-type]
 
     @application.get(
         "/admin/xds_dump",

sovereign/rendering.py

@@ -7,8 +7,8 @@ Functions used to render and return discovery responses to Envoy proxies.
 The templates are configurable. `todo See ref:Configuration#Templates`
 """
 
-import threading
-from multiprocessing import Process, Semaphore, cpu_count
+from concurrent.futures import ThreadPoolExecutor
+from multiprocessing import Process, cpu_count
 from typing import Any, Dict, List
 
 import yaml
@@ -30,7 +30,7 @@ from sovereign.schemas import (
 )
 
 # limit render jobs to number of cores
-RENDER_SEMAPHORE = Semaphore(cpu_count())
+POOL = ThreadPoolExecutor(max_workers=cpu_count())
 
 type_urls = {
     "v2": {
@@ -59,14 +59,12 @@ class RenderJob(pydantic.BaseModel):
     context: dict[str, Any]
 
     def spawn(self):
-        t = threading.Thread(target=self._run)
-        t.start()
+        POOL.submit(self._run)
 
     def _run(self):
-        with RENDER_SEMAPHORE:
-            proc = Process(target=generate, args=[self])
-            proc.start()
-            proc.join()
+        proc = Process(target=generate, args=[self])
+        proc.start()
+        proc.join()
 
 
 def generate(job: RenderJob) -> None:

sovereign/server.py

@@ -6,16 +6,15 @@ from pathlib import Path
 import uvicorn
 
 from sovereign import application_logger as log
-from sovereign.app import app
-from sovereign.worker import worker as worker_app
 from sovereign.schemas import SovereignAsgiConfig, SupervisordConfig
 
-
 asgi_config = SovereignAsgiConfig()
 supervisord_config = SupervisordConfig()
 
 
 def web() -> None:
+    from sovereign.app import app
+
     log.debug("Starting web server")
     uvicorn.run(
         app,
@@ -30,6 +29,8 @@ def web() -> None:
 
 
 def worker():
+    from sovereign.worker import worker as worker_app
+
     log.debug("Starting worker")
     uvicorn.run(
         worker_app,

{sovereign-1.0.0b127.post6.dist-info → sovereign-1.0.0b129.dist-info}/METADATA

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: sovereign
-Version: 1.0.0b127.post6
+Version: 1.0.0b129
 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
@@ -49,7 +49,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 +59,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.0b127.post6.dist-info → sovereign-1.0.0b129.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sovereign/__init__.py,sha256=m8MVzaMSW4AvAqHvUAsXFdp8Oas5oQ8X7BcVt7Hfcik,1431
-sovereign/app.py,sha256=fsf4Jgni2G4EYJO0oQSWfGRZVDBvE2Yfick4n2YR6K4,4876
+sovereign/app.py,sha256=wEvPbXwhArGrBrn2PrGLlBpah-9GNhAZ4p3pkTNuk2Y,4882
 sovereign/cache.py,sha256=f7d-x5ksRmd_tbSgdl5xKFXmwgUsMWECg98S5DZYc3w,5333
 sovereign/constants.py,sha256=qdWD1lTvkaW5JGF7TmZhfksQHlRAJFVqbG7v6JQA9k8,46
 sovereign/context.py,sha256=aoGJ5k1n8ytCk7jggQ6XTx6Hx_ocy7cEkvGOFS3gzzc,8912
@@ -15,23 +15,15 @@ sovereign/logging/types.py,sha256=rGqJAEVvgvzHy4aPfvEH6yQ-yblXNkEcWG7G8l9ALEA,28
 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=hxlu_K7h1fVNYRLVA4-YM_KY4rhaEOzHq-4dCVwgdWE,5688
+sovereign/rendering.py,sha256=zMaUMpH0oezFt1hXVuGTUrkGc5aI9W7RQ_SX-8pxfCU,5642
 sovereign/response_class.py,sha256=beMAFV-4L6DwyWzJzy71GkEW4gb7fzH1jd8-Tul13cU,427
 sovereign/schemas.py,sha256=Jf_w2mAX1b31eCAtJuxSZgy9KMVRKntmnEbbCZGZCxQ,38067
-sovereign/server.py,sha256=uviXN0mX-Wbhv36xjWlHiybzIlZrJsCwRf4xyRnibXQ,2970
+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/darkmode.js,sha256=3ip-eKGctDvNhN7UgmaHhzls7r5qIY-Jvh2EpefHbQ0,1449
-sovereign/static/node_expression.js,sha256=GKxKTSRc_96IbL3H4L_31ueJFXq4N7scm5R1RNqxP24,1489
-sovereign/static/panel.js,sha256=i5mGExjv-I4Gtt9dQiTyFwPZa8pg5rXeuTeidXNUiTE,2695
-sovereign/static/resources.css,sha256=Rt_ir_FkoI-VIAOqPhk0vILy8kB2egAYbQU26SOs1io,4500
-sovereign/static/resources.js,sha256=-TaXZ6tohyKA1SkX5YwrTcV5M8mOZ68cvEXpvZWznTo,24506
-sovereign/static/sass/style.scss,sha256=LdGXXuHi_tyMc7XhijIOrlIxyfLt827AAs2Z7DYpFpg,990
-sovereign/static/style.css,sha256=kmvkJ2820RKehWxhddkucbgFkvnpUgBMteOtpEuXjvQ,601347
-sovereign/static/style.css.map,sha256=h1ufjfDVX-8z-FuJqFG2-U9AVdi66U-e8uyiGdUZjDw,66576
 sovereign/statistics.py,sha256=QhDB0bs5kZDGjy248AOIv_bzNbz_c2U7xmJ0hoUNOmw,2033
 sovereign/templates/base.html,sha256=MMhhvvClTixKibYfhXm8Ezx6ttu6Sqki44niciCPMO4,2990
 sovereign/templates/err.html,sha256=a3cEzOqyqWOIe3YxfTEjkxbTfxBxq1knD6GwzEFljfs,603
@@ -64,7 +56,16 @@ sovereign/views/discovery.py,sha256=B_D1ckfbN1dSKBvuFCTyfB79GUUriCADTB53OwZ8D4Q,
 sovereign/views/healthchecks.py,sha256=TaXbxkX679jyQ8v5FxtBa2Qa0Z7KuqQ10WgAqfuVGUc,1743
 sovereign/views/interface.py,sha256=o6DaOqoh2M09_SsZrCOxr9rCVxMUZHXRXj4TNq800Ho,6999
 sovereign/worker.py,sha256=Y4le54cZU1Enj8scu1G1sM_KPVPUmZ7vmTuxpd59X2Q,5855
-sovereign-1.0.0b127.post6.dist-info/METADATA,sha256=hpa3Z9VRRb17W23iRWYirqwdNe6z0JiLCyKsX8fVJTU,6310
-sovereign-1.0.0b127.post6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-sovereign-1.0.0b127.post6.dist-info/entry_points.txt,sha256=VKJdnnN_HNL8xYQMXsFXfFmN6QkdXMEk5S964avxQJI,1404
-sovereign-1.0.0b127.post6.dist-info/RECORD,,
+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.0b129.dist-info/METADATA,sha256=b5VqWN9o3SbkhpkxcCBDt0X2FyMbWu06sOoflmVoeYs,6336
+sovereign-1.0.0b129.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+sovereign-1.0.0b129.dist-info/entry_points.txt,sha256=VKJdnnN_HNL8xYQMXsFXfFmN6QkdXMEk5S964avxQJI,1404
+sovereign-1.0.0b129.dist-info/RECORD,,

{sovereign-1.0.0b127.post6.dist-info → sovereign-1.0.0b129.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