sovereign 1.0.0b127.post6__tar.gz → 1.0.0b129__tar.gz

{sovereign-1.0.0b127.post6 → sovereign-1.0.0b129}/PKG-INFO

@@ -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 → sovereign-1.0.0b129}/pyproject.toml

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

{sovereign-1.0.0b127.post6 → sovereign-1.0.0b129}/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.post6 → sovereign-1.0.0b129}/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.post6 → sovereign-1.0.0b129}/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,

sovereign-1.0.0b127.post6/src/sovereign/static/darkmode.js

@@ -1,51 +0,0 @@
-document.addEventListener('DOMContentLoaded', function() {
-    const darkmode = "theme-dark";
-    const lightmode = "theme-light";
-    const toggle = document.getElementById('dark-mode-toggle');
-    const htmlTag = document.documentElement;
-
-    function preferredTheme() {
-        const preference = localStorage.getItem("theme");
-        if (preference) {
-            return preference;
-        }
-        if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
-            return "dark";
-        } else {
-            return "light";
-        };
-    }
-
-    function currentTheme() {
-        if (htmlTag.classList.contains(darkmode)) {
-            return "dark"
-        } else {
-            return "light"
-        }
-    }
-
-    function setTheme(theme) {
-        localStorage.setItem("theme", theme);
-        if (theme === "dark") {
-            htmlTag.classList.remove(lightmode);
-            htmlTag.classList.add(darkmode);
-            toggle.textContent = '🌘';
-        } else {
-            htmlTag.classList.remove(darkmode);
-            htmlTag.classList.add(lightmode);
-            toggle.textContent = '🌞';
-        }
-    }
-
-    setTheme(preferredTheme());
-
-    toggle.addEventListener("click", function() {
-        let current = currentTheme();
-        console.log("Current theme: " + current);
-        if (current === "dark") {
-            setTheme("light");
-        } else {
-            setTheme("dark");
-        }
-    });
-});

sovereign-1.0.0b127.post6/src/sovereign/static/node_expression.js

@@ -1,42 +0,0 @@
-const input = document.getElementById('filterInput');
-const inputMessage = document.getElementById('filterMessage');
-const form = document.getElementById('filterForm');
-
-function validateInput(inputString) {
-  if (!inputString || inputString.trim() === '') {
-    return "empty";
-  }
-  const validationRegex = /^(?:(?:id|cluster|metadata\.[\w\.\=\-]+|locality\.?(?:zone|sub_zone|region))=[a-zA-Z0-9_-]+ ?)*$/;
-  return validationRegex.test(inputString);
-}
-
-window.addEventListener('DOMContentLoaded', () => {
-  const match = document.cookie.match(/(?:^|; )node_expression=([^;]*)/);
-  if (match) {
-    input.value = match[1];
-  }
-});
-
-input.addEventListener('input', (event) => {
-  const result = validateInput(event.target.value);
-  if (result === "empty") {
-    input.className = "input is-dark";
-    inputMessage.className = "help is-dark";
-    inputMessage.innerHTML = "";
-  } else if (result === true) {
-    input.className = "input is-success";
-    inputMessage.className = "help is-success";
-    inputMessage.innerHTML = "Press enter to apply filter expression";
-  } else {
-    input.className = "input is-danger";
-    inputMessage.className = "help is-danger";
-    inputMessage.innerHTML = "The node filter expression may have no effect, or be invalid";
-  }
-});
-
-form.addEventListener('submit', (event) => {
-  event.preventDefault();
-  const value = input.value.trim();
-  document.cookie = `node_expression=${value}; path=/ui/resources/; max-age=31536000`;
-  location.reload();
-});

sovereign-1.0.0b127.post6/src/sovereign/static/panel.js

@@ -1,76 +0,0 @@
-document.addEventListener('DOMContentLoaded', function() {
-    let currentTabFilter = 'all'; // Track the current tab filter
-    
-    function clearSearch() {
-        const searchInput = document.getElementById('searchInput');
-        if (searchInput) {
-            searchInput.value = '';
-        }
-    }
-
-    // Function to apply both tab and search filters
-    function applyFilters() {
-        const searchInput = document.getElementById('searchInput');
-        const query = searchInput ? searchInput.value.toLowerCase() : '';
-        const virtualHosts = document.querySelectorAll('.virtualhost');
-        
-        virtualHosts.forEach(vh => {
-            const text = vh.textContent.toLowerCase();
-            const category = vh.getAttribute("data-category");
-            
-            // Check if it passes the tab filter
-            const passesTabFilter = (currentTabFilter === 'all') || (category === currentTabFilter);
-            
-            // Check if it passes the search filter
-            const passesSearchFilter = query === '' || text.includes(query);
-            
-            // Show only if it passes both filters
-            if (passesTabFilter && passesSearchFilter) {
-                vh.classList.remove('filtered');
-            } else {
-                vh.classList.add('filtered');
-            }
-        });
-    }
-
-    // Function to hide all panels except active
-    function updateVisibility() {
-        const panelBlocks = document.querySelectorAll('.virtualhost');
-        panelBlocks.forEach(block => {
-            if (!block.classList.contains('is-active')) {
-                block.classList.add('filtered');
-            } else {
-                block.classList.remove('filtered');
-            }
-        });
-    }
-    updateVisibility();
-
-    window.filterTabs = function(element, filter) {
-        const tabs = document.querySelectorAll('.panel-tabs a');
-        tabs.forEach(tab => tab.classList.remove('is-active'));
-        element.classList.add('is-active');
-        
-        currentTabFilter = filter; // Update the current tab filter
-        
-        // Clear virtual hosts search input when switching tabs
-        const searchInput = document.getElementById('searchInput');
-        if (searchInput) {
-            searchInput.value = null;
-        }
-        
-        applyFilters();
-    };
-
-    const searchInput = document.getElementById('searchInput');
-    if (searchInput) {
-        searchInput.addEventListener('input', function() {
-            applyFilters(); // Apply both filters when searching
-        });
-    }
-
-    const allTab = document.querySelector('.panel-tabs a.is-active');
-    if (allTab) {
-        filterTabs(allTab, 'all');
-    }
-});

sovereign-1.0.0b127.post6/src/sovereign/static/resources.css

@@ -1,246 +0,0 @@
-/* Resources page styles */
-#filterInput {
-    font-family: monospace;
-}
-
-.filtered {
-    display: none;
-}
-
-.tooltip {
-    position: relative;
-    display: inline-block;
-    cursor: help;
-}
-
-.tooltip .tooltip-text {
-    visibility: hidden;
-    width: 220px;
-    background-color: #363636;
-    color: #fff;
-    text-align: left;
-    padding: 0.5rem;
-    border-radius: 6px;
-    position: absolute;
-    z-index: 1;
-    top: 125%;
-    left: 50%;
-    margin-left: -110px;
-    opacity: 0;
-    transition: opacity 0.3s;
-    font-size: 0.875rem;
-}
-
-.tooltip:hover .tooltip-text {
-    visibility: visible;
-    opacity: 1;
-}
-
-/* Side panel styles - using Bulma-compatible approach */
-.side-panel {
-    position: fixed;
-    top: 0;
-    right: -100%;
-    width: 95%;
-    max-width: 1200px;
-    min-width: 400px;
-    height: 100vh;
-    z-index: 1000;
-    transition: right 0.3s ease-in-out;
-    overflow-y: auto;
-}
-
-.side-panel.is-active {
-    right: 0;
-}
-
-/* Responsive side panel sizing */
-@media (min-width: 768px) {
-    .side-panel { width: 75%; right: -75%; }
-}
-
-@media (min-width: 1024px) {
-    .side-panel { width: 65%; right: -65%; }
-}
-
-@media (min-width: 1400px) {
-    .side-panel { width: 55%; right: -55%; }
-}
-
-@media (min-width: 1600px) {
-    .side-panel { width: 50%; right: -50%; }
-}
-
-@media (max-width: 480px) {
-    .side-panel { width: 95%; min-width: 300px; right: -95%; }
-}
-
-.json-container {
-    position: relative;
-}
-
-.json-header {
-    padding: 1rem;
-    border-bottom: 1px solid #555;
-    background-color: #2d2d2d;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}
-
-.json-content {
-    background-color: #1e1e1e;
-    border: none;
-    border-radius: 0;
-    padding: 1rem;
-    font-family: 'JetBrains Mono', 'Fira Code', 'SF Mono', 'Monaco', 'Inconsolata', 'Roboto Mono', 'Source Code Pro', 'Menlo', 'Consolas', monospace;
-    font-size: 0.875rem;
-    line-height: 1.5;
-    white-space: pre-wrap;
-    word-wrap: break-word;
-    max-height: calc(100vh - 250px);
-    overflow-y: auto;
-    color: #d4d4d4;
-    margin: 0;
-}
-
-/* JSON Syntax Highlighting - VS Code Dark+ theme colors */
-.json-key {
-    color: #9cdcfe;
-    font-weight: 400;
-}
-
-.json-string {
-    color: #ce9178;
-}
-
-.json-number {
-    color: #b5cea8;
-}
-
-.json-boolean {
-    color: #569cd6;
-    font-weight: 500;
-}
-
-.json-null {
-    color: #569cd6;
-    font-weight: 500;
-    font-style: italic;
-}
-
-.json-punctuation {
-    color: #d4d4d4;
-}
-
-/* Improve readability */
-.json-content::-webkit-scrollbar {
-    width: 8px;
-}
-
-.json-content::-webkit-scrollbar-track {
-    background: #2d2d2d;
-}
-
-.json-content::-webkit-scrollbar-thumb {
-    background: #555;
-    border-radius: 4px;
-}
-
-.json-content::-webkit-scrollbar-thumb:hover {
-    background: #666;
-}
-
-/* Collapsible JSON */
-.json-toggle {
-    cursor: pointer;
-    user-select: none;
-    color: #808080;
-    margin-right: 0.25rem;
-    font-family: monospace;
-    font-size: 0.875rem;
-}
-
-.json-toggle:hover {
-    color: #fff;
-}
-
-.json-collapsible {
-    margin-left: 1rem;
-}
-
-.json-collapsed {
-    display: none;
-}
-
-.loading-spinner {
-    display: inline-block;
-    width: 20px;
-    height: 20px;
-    border: 3px solid #f3f3f3;
-    border-top: 3px solid #433fca;
-    border-radius: 50%;
-    animation: spin 1s linear infinite;
-}
-
-@keyframes spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-}
-
-/* Prevent body scroll when side panel is open */
-body.side-panel-open {
-    overflow: hidden;
-}
-
-/* Backdrop overlay for side panel */
-.side-panel-backdrop {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(0, 0, 0, 0.5);
-    z-index: 999;
-    opacity: 0;
-    visibility: hidden;
-    transition: opacity 0.3s ease-in-out, visibility 0.3s ease-in-out;
-}
-
-.side-panel-backdrop.is-active {
-    opacity: 1;
-    visibility: visible;
-}
-
-/* Show backdrop on smaller screens */
-@media (max-width: 1024px) {
-    .side-panel-backdrop.is-active {
-        opacity: 1;
-        visibility: visible;
-    }
-}
-
-/* Minimal custom styles - using Bulma classes for most styling */
-.json-chunk-controls {
-    background-color: #2d2d2d;
-    border-bottom: 1px solid #555;
-}
-
-/* Preferences details styling */
-details summary {
-    list-style: none;
-}
-
-details summary::-webkit-details-marker {
-    display: none;
-}
-
-details summary::before {
-    content: "▶";
-    margin-right: 0.5rem;
-    transition: transform 0.2s;
-}
-
-details[open] summary::before {
-    transform: rotate(90deg);
-}