sovereign 1.0.0b127__tar.gz → 1.0.0b128__tar.gz

{sovereign-1.0.0b127 → sovereign-1.0.0b128}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: sovereign
-Version: 1.0.0b127
+Version: 1.0.0b128
 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 → sovereign-1.0.0b128}/pyproject.toml

@@ -1,10 +1,11 @@
 [tool.poetry]
 name = "sovereign"
-version = "1.0.0b127"
+version = "1.0.0b128"
 description = "Envoy Proxy control-plane written in Python"
 license = "Apache-2.0"
 packages = [
-    { include = "sovereign", from = "src", format = "sdist" }
+    { include = "sovereign", from = "src", format = "sdist" },
+    { include = "sovereign-files", from = "src", format = "sdist" },
 ]
 readme = "README.md"
 #include = ["CHANGELOG.md", "CODE_OF_CONDUCT.md"]

{sovereign-1.0.0b127 → sovereign-1.0.0b128}/src/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-1.0.0b127 → sovereign-1.0.0b128}/src/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-1.0.0b127 → sovereign-1.0.0b128}/src/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,