ratio1 3.4.107__tar.gz → 3.4.109__tar.gz

{ratio1-3.4.107 → ratio1-3.4.109}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ratio1
-Version: 3.4.107
+Version: 3.4.109
 Summary: `ratio1` or Ration1 SDK is the Python SDK required for client app development for the Ratio1 ecosystem
 Project-URL: Homepage, https://github.com/Ratio1/ratio1_sdk
 Project-URL: Bug Tracker, https://github.com/Ratio1/ratio1_sdk/issues

{ratio1-3.4.107 → ratio1-3.4.109}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ratio1"
-version = "3.4.107"
+version = "3.4.109"
 authors = [
   { name="Andrei Ionut Damian", email="andrei.damian@ratio1.ai" },
   { name="Cristan Bleotiu", email="cristian.bleotiu@ratio1.ai" },

{ratio1-3.4.107 → ratio1-3.4.109}/ratio1/_ver.py

@@ -1,4 +1,4 @@
-__VER__ = "3.4.107"
+__VER__ = "3.4.109"
 
 if __name__ == "__main__":
   with open("pyproject.toml", "rt") as fd:

{ratio1-3.4.107 → ratio1-3.4.109}/ratio1/cli/cli_commands.py

@@ -149,7 +149,7 @@ CLI_COMMANDS = {
             "--skip-seeds": "Skip the seed nodes in the rollout (flag)",
             "--skip-oracles": "Skip the oracle nodes in the rollout (flag)",
             "--skip-workers": "Skip the remaining edge worker nodes in the rollout (flag)",
-            "--no-timeout": "Do not wait between nodes restarts (flag)",
+            "--timeout": "Wait between worker nodes restarts (flag)",
         }
     },
     "inspect": {

{ratio1-3.4.107 → ratio1-3.4.109}/ratio1/cli/oracles.py

@@ -222,13 +222,13 @@ if True:
     skip_seeds = args.skip_seeds
     skip_oracles = args.skip_oracles
     skip_workers = getattr(args, "skip_workers", False)
-    no_timeout = args.no_timeout
+    no_timeout = not args.timeout
     run_seed_nodes = not skip_seeds
     run_oracle_nodes = not skip_oracles
     run_edge_nodes = not skip_workers
 
     # Adjust these values to tweak pauses and restart pacing across node groups.
-    pause_after_seed_seconds = 60
+    pause_after_seed_seconds = 120
     pause_after_oracle_seconds = 60
     worker_timeout_min_seconds = 5
     worker_timeout_max_seconds = 25
@@ -255,11 +255,11 @@ if True:
     log_with_color("======================================================", color='b')
     log_with_color("Starting Oracle Rollout...", color='g')
     log_with_color("======================================================", color='b')
+    
     session = Session(
       silent=True
     )
     current_network = session.bc_engine.current_evm_network
-    session.close()
 
     restart_plan_display = " -> ".join(restart_groups)
     confirmation_keyword = "RESTART ALL" if len(restart_groups) == 3 else f"RESTART {', '.join(restart_groups)}"
@@ -282,11 +282,11 @@ if True:
       log_with_color("Aborted by user...", color='y')
       return
 
-    session = Session(
-      silent=silent
-    )
+    session.log.silent = silent
+    session.silent = silent
 
     seed_nodes_addresses = _get_seed_nodes(current_network)
+    seed_nodes_aliases = [session.get_node_alias(addr) for addr in seed_nodes_addresses]
 
     all_online_nodes = _get_all_online_nodes()
     remaining_nodes = [
@@ -301,25 +301,36 @@ if True:
 
     if run_seed_nodes:
       # 1. Send restart command to Seed Nodes.
-      log_with_color(f"Sending restart commands to {len(seed_nodes_addresses)} seed nodes: {seed_nodes_addresses}",
-                     color='b')
+      log_with_color(
+        f"Sending restart commands to {len(seed_nodes_addresses)} seed nodes: {seed_nodes_aliases}",
+        color='b'
+      )
       _send_restart_command(session=session, nodes=seed_nodes_addresses)
+      
+      # now check heartbeats for SHUTDOWN confirmation individually
+      # ... we display one by one the status with timeout `pause_after_seed_seconds`
+      # here all seeds restarted so we check recent heartbeats for each of them
+      # ... we display one by one the status with timeout `pause_after_seed_seconds`
+      # now finally we confirm all seeds are back online
       restarted_seed_nodes_count = len(seed_nodes_addresses)
 
       # Remove seed node addresses from all_nodes_addresses
       if run_oracle_nodes or run_edge_nodes:
         if pause_after_seed_seconds > 0:
           log_with_color(
-            f"Seed nodes restarted. Waiting {pause_after_seed_seconds} seconds before sending restart commands to the next group of nodes.",
-            color='g')
-          sleep(pause_after_seed_seconds)
+            f"Seed nodes restarting. Waiting {pause_after_seed_seconds} seconds before sending restart commands to the next group of nodes.",
+            color='g'
+          )
+          sleep(pause_after_seed_seconds) # maybe obsolete due to per-node wait above
         else:
           log_with_color(
-            "Seed nodes restarted. Continuing without wait before the next group of nodes.",
-            color='g')
+            "Seed nodes restarting. Continuing without wait before the next group of nodes.",
+            color='g'
+          )
     else:
       log_with_color("Skipping Seed Nodes restart as per user request.", color='y')
-
+      
+      
     # 2. Send restart commands to all Oracle nodes, except seed nodes.
     oracle_nodes_addresses = [
       node['address']
@@ -330,8 +341,8 @@ if True:
     if run_oracle_nodes:
       log_with_color(
         f"Sending restart commands to {len(oracle_nodes_addresses)} Non-Seed Oracle nodes, except seed nodes: {remaining_nodes}",
-        color='b')
-
+        color='b'
+      )
       _send_restart_command(session=session, nodes=oracle_nodes_addresses)
       restarted_oracle_nodes_count = len(oracle_nodes_addresses)
       if run_edge_nodes:

ratio1-3.4.109/tutorials/25_cerviguard_war_loopback/cerviguard_test_ui.html

@@ -0,0 +1,516 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>CerviGuard WAR - Test UI</title>
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+
+        body {
+            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+            min-height: 100vh;
+            padding: 20px;
+        }
+
+        .container {
+            max-width: 900px;
+            margin: 0 auto;
+            background: white;
+            border-radius: 15px;
+            box-shadow: 0 20px 60px rgba(0,0,0,0.3);
+            padding: 40px;
+        }
+
+        h1 {
+            color: #667eea;
+            text-align: center;
+            margin-bottom: 10px;
+            font-size: 2.5em;
+        }
+
+        .subtitle {
+            text-align: center;
+            color: #666;
+            margin-bottom: 30px;
+            font-size: 1.1em;
+        }
+
+        .api-config {
+            background: #f8f9fa;
+            padding: 15px;
+            border-radius: 8px;
+            margin-bottom: 30px;
+        }
+
+        .api-config label {
+            display: block;
+            margin-bottom: 5px;
+            color: #333;
+            font-weight: 600;
+        }
+
+        .api-config input {
+            width: 100%;
+            padding: 10px;
+            border: 2px solid #ddd;
+            border-radius: 5px;
+            font-size: 14px;
+        }
+
+        .upload-section {
+            border: 3px dashed #667eea;
+            border-radius: 10px;
+            padding: 40px;
+            text-align: center;
+            margin-bottom: 30px;
+            background: #f8f9ff;
+            cursor: pointer;
+            transition: all 0.3s;
+        }
+
+        .upload-section:hover {
+            background: #e8edff;
+            border-color: #764ba2;
+        }
+
+        .upload-section.dragover {
+            background: #d0d9ff;
+            border-color: #764ba2;
+        }
+
+        #imageInput {
+            display: none;
+        }
+
+        .btn {
+            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+            color: white;
+            border: none;
+            padding: 12px 30px;
+            border-radius: 25px;
+            font-size: 16px;
+            font-weight: 600;
+            cursor: pointer;
+            transition: transform 0.2s;
+            margin: 5px;
+        }
+
+        .btn:hover {
+            transform: translateY(-2px);
+            box-shadow: 0 5px 15px rgba(102, 126, 234, 0.4);
+        }
+
+        .btn:active {
+            transform: translateY(0);
+        }
+
+        .btn:disabled {
+            opacity: 0.5;
+            cursor: not-allowed;
+        }
+
+        #preview {
+            max-width: 100%;
+            max-height: 300px;
+            margin: 20px auto;
+            display: none;
+            border-radius: 10px;
+            box-shadow: 0 5px 15px rgba(0,0,0,0.2);
+        }
+
+        .status {
+            padding: 15px;
+            border-radius: 8px;
+            margin: 10px 0;
+            font-weight: 500;
+        }
+
+        .status.info {
+            background: #d1ecf1;
+            color: #0c5460;
+            border: 1px solid #bee5eb;
+        }
+
+        .status.success {
+            background: #d4edda;
+            color: #155724;
+            border: 1px solid #c3e6cb;
+        }
+
+        .status.error {
+            background: #f8d7da;
+            color: #721c24;
+            border: 1px solid #f5c6cb;
+        }
+
+        .status.processing {
+            background: #fff3cd;
+            color: #856404;
+            border: 1px solid #ffeeba;
+        }
+
+        .results {
+            background: #f8f9fa;
+            padding: 20px;
+            border-radius: 10px;
+            margin-top: 20px;
+            display: none;
+        }
+
+        .results h3 {
+            color: #667eea;
+            margin-bottom: 15px;
+        }
+
+        .result-item {
+            padding: 10px;
+            margin: 5px 0;
+            background: white;
+            border-radius: 5px;
+            display: flex;
+            justify-content: space-between;
+        }
+
+        .result-label {
+            font-weight: 600;
+            color: #333;
+        }
+
+        .result-value {
+            color: #667eea;
+            font-family: 'Courier New', monospace;
+        }
+
+        .loader {
+            border: 4px solid #f3f3f3;
+            border-top: 4px solid #667eea;
+            border-radius: 50%;
+            width: 40px;
+            height: 40px;
+            animation: spin 1s linear infinite;
+            margin: 20px auto;
+            display: none;
+        }
+
+        @keyframes spin {
+            0% { transform: rotate(0deg); }
+            100% { transform: rotate(360deg); }
+        }
+
+        .footer {
+            text-align: center;
+            margin-top: 30px;
+            color: #666;
+            font-size: 14px;
+        }
+
+        .loopback-indicator {
+            background: #667eea;
+            color: white;
+            padding: 10px 20px;
+            border-radius: 25px;
+            display: inline-block;
+            margin: 20px 0;
+            font-weight: 600;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <h1>🔬 CerviGuard WAR</h1>
+        <p class="subtitle">Cervical Image Analysis - Loopback Pipeline Test</p>
+
+        <div style="text-align: center;">
+            <span class="loopback-indicator">🔄 LOOPBACK MODE ENABLED</span>
+        </div>
+
+        <!-- API Configuration -->
+        <div class="api-config">
+            <label for="apiUrl">API Base URL:</label>
+            <input type="text" id="apiUrl" value="http://localhost:5002" placeholder="http://localhost:5002">
+        </div>
+
+        <!-- Upload Section -->
+        <div class="upload-section" id="uploadZone">
+            <h3>📤 Upload Cervical Image</h3>
+            <p>Click to select or drag and drop an image here</p>
+            <p style="font-size: 12px; color: #666; margin-top: 10px;">Supported: PNG, JPG, JPEG</p>
+            <input type="file" id="imageInput" accept="image/*">
+        </div>
+
+        <!-- Image Preview -->
+        <img id="preview" alt="Image preview">
+
+        <!-- Action Buttons -->
+        <div style="text-align: center; margin: 20px 0;">
+            <button class="btn" id="submitBtn" disabled>Submit Image for Analysis</button>
+            <button class="btn" id="checkStatusBtn" style="background: linear-gradient(135deg, #11998e 0%, #38ef7d 100%);">
+                Check System Status
+            </button>
+        </div>
+
+        <!-- Loader -->
+        <div class="loader" id="loader"></div>
+
+        <!-- Status Messages -->
+        <div id="statusContainer"></div>
+
+        <!-- Results -->
+        <div class="results" id="resultsContainer">
+            <h3>📊 Analysis Results</h3>
+            <div id="resultsContent"></div>
+        </div>
+
+        <!-- Footer -->
+        <div class="footer">
+            <p>CerviGuard WAR Test Interface | Naeural Edge Node Loopback Demo</p>
+            <p style="font-size: 12px; margin-top: 5px;">
+                Flow: UI → API (localhost) → Loopback Queue → Processor → Results
+            </p>
+        </div>
+    </div>
+
+    <script>
+        const uploadZone = document.getElementById('uploadZone');
+        const imageInput = document.getElementById('imageInput');
+        const preview = document.getElementById('preview');
+        const submitBtn = document.getElementById('submitBtn');
+        const checkStatusBtn = document.getElementById('checkStatusBtn');
+        const loader = document.getElementById('loader');
+        const statusContainer = document.getElementById('statusContainer');
+        const resultsContainer = document.getElementById('resultsContainer');
+        const resultsContent = document.getElementById('resultsContent');
+        const apiUrlInput = document.getElementById('apiUrl');
+
+        let selectedImage = null;
+        let currentRequestId = null;
+
+        // Upload zone click
+        uploadZone.addEventListener('click', () => imageInput.click());
+
+        // Drag and drop
+        uploadZone.addEventListener('dragover', (e) => {
+            e.preventDefault();
+            uploadZone.classList.add('dragover');
+        });
+
+        uploadZone.addEventListener('dragleave', () => {
+            uploadZone.classList.remove('dragover');
+        });
+
+        uploadZone.addEventListener('drop', (e) => {
+            e.preventDefault();
+            uploadZone.classList.remove('dragover');
+            const files = e.dataTransfer.files;
+            if (files.length > 0) {
+                handleImageSelect(files[0]);
+            }
+        });
+
+        // File input change
+        imageInput.addEventListener('change', (e) => {
+            if (e.target.files.length > 0) {
+                handleImageSelect(e.target.files[0]);
+            }
+        });
+
+        // Handle image selection
+        function handleImageSelect(file) {
+            if (!file.type.startsWith('image/')) {
+                showStatus('Please select a valid image file', 'error');
+                return;
+            }
+
+            const reader = new FileReader();
+            reader.onload = (e) => {
+                selectedImage = e.target.result;
+                preview.src = selectedImage;
+                preview.style.display = 'block';
+                submitBtn.disabled = false;
+                showStatus(`Image loaded: ${file.name} (${(file.size / 1024).toFixed(2)} KB)`, 'info');
+            };
+            reader.readAsDataURL(file);
+        }
+
+        // Submit image
+        submitBtn.addEventListener('click', async () => {
+            if (!selectedImage) return;
+
+            submitBtn.disabled = true;
+            loader.style.display = 'block';
+            resultsContainer.style.display = 'none';
+
+            // Extract base64 data (remove data URL prefix)
+            const base64Data = selectedImage.split(',')[1];
+
+            const apiUrl = apiUrlInput.value;
+
+            try {
+                showStatus('Submitting image to CerviGuard API...', 'processing');
+
+                const response = await fetch(`${apiUrl}/cerviguard_submit_image`, {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                    },
+                    body: JSON.stringify({
+                        image_data: base64Data,
+                        metadata: {
+                            source: 'test_ui',
+                            timestamp: new Date().toISOString()
+                        }
+                    })
+                });
+
+                const data = await response.json();
+                const result = data.result;
+
+                if (result.status === 'submitted') {
+                    currentRequestId = result.request_id;
+                    showStatus(`Image submitted successfully! Request ID: ${currentRequestId}`, 'success');
+                    showStatus('Polling for results (loopback processing)...', 'processing');
+                    pollForResults(currentRequestId);
+                } else {
+                    showStatus(`Error: ${result.error || 'Unknown error'}`, 'error');
+                    loader.style.display = 'none';
+                    submitBtn.disabled = false;
+                }
+
+            } catch (error) {
+                showStatus(`Network Error: ${error.message}`, 'error');
+                showStatus('Make sure the API is running on the specified URL', 'error');
+                loader.style.display = 'none';
+                submitBtn.disabled = false;
+            }
+        });
+
+        // Poll for results
+        async function pollForResults(requestId, attempt = 1, maxAttempts = 20) {
+            const apiUrl = apiUrlInput.value;
+
+            try {
+                const response = await fetch(`${apiUrl}/cerviguard_get_result?request_id=${requestId}`);
+                const data = await response.json();
+                const result = data.result;
+
+                if (result.status === 'completed') {
+                    loader.style.display = 'none';
+                    showStatus('✓ Processing completed successfully!', 'success');
+                    displayResults(result.result);
+                    submitBtn.disabled = false;
+                } else if (result.status === 'processing') {
+                    showStatus(`⏳ Processing... (attempt ${attempt}/${maxAttempts})`, 'processing');
+                    if (attempt < maxAttempts) {
+                        setTimeout(() => pollForResults(requestId, attempt + 1, maxAttempts), 1000);
+                    } else {
+                        loader.style.display = 'none';
+                        showStatus('Timeout: Processing is taking too long', 'error');
+                        submitBtn.disabled = false;
+                    }
+                } else if (result.status === 'error') {
+                    loader.style.display = 'none';
+                    showStatus(`✗ Processing Error: ${result.error}`, 'error');
+                    submitBtn.disabled = false;
+                } else {
+                    loader.style.display = 'none';
+                    showStatus(`Unknown status: ${result.status}`, 'error');
+                    submitBtn.disabled = false;
+                }
+
+            } catch (error) {
+                loader.style.display = 'none';
+                showStatus(`Polling Error: ${error.message}`, 'error');
+                submitBtn.disabled = false;
+            }
+        }
+
+        // Display results
+        function displayResults(result) {
+            const imgInfo = result.image_info;
+
+            resultsContent.innerHTML = `
+                <div class="result-item">
+                    <span class="result-label">Width:</span>
+                    <span class="result-value">${imgInfo.width} pixels</span>
+                </div>
+                <div class="result-item">
+                    <span class="result-label">Height:</span>
+                    <span class="result-value">${imgInfo.height} pixels</span>
+                </div>
+                <div class="result-item">
+                    <span class="result-label">Channels:</span>
+                    <span class="result-value">${imgInfo.channels}</span>
+                </div>
+                <div class="result-item">
+                    <span class="result-label">Total Pixels:</span>
+                    <span class="result-value">${imgInfo.total_pixels.toLocaleString()}</span>
+                </div>
+                <div class="result-item">
+                    <span class="result-label">Size:</span>
+                    <span class="result-value">${imgInfo.size_mb} MB</span>
+                </div>
+                <div class="result-item">
+                    <span class="result-label">Data Type:</span>
+                    <span class="result-value">${imgInfo.dtype}</span>
+                </div>
+                <div class="result-item">
+                    <span class="result-label">Shape:</span>
+                    <span class="result-value">[${imgInfo.shape.join(', ')}]</span>
+                </div>
+                <div class="result-item">
+                    <span class="result-label">Processor Version:</span>
+                    <span class="result-value">${result.processor_version}</span>
+                </div>
+                <div class="result-item">
+                    <span class="result-label">Request ID:</span>
+                    <span class="result-value">${result.request_id}</span>
+                </div>
+            `;
+
+            resultsContainer.style.display = 'block';
+        }
+
+        // Check system status
+        checkStatusBtn.addEventListener('click', async () => {
+            const apiUrl = apiUrlInput.value;
+
+            try {
+                showStatus('Checking system status...', 'processing');
+                const response = await fetch(`${apiUrl}/cerviguard_status`);
+                const data = await response.json();
+                const status = data.result;
+
+                showStatus(`✓ System Online | Service: ${status.service} | Version: ${status.version}`, 'success');
+                showStatus(`Total Requests: ${status.total_requests} | Pending: ${status.pending_requests} | Uptime: ${Math.round(status.uptime_seconds)}s`, 'info');
+
+            } catch (error) {
+                showStatus(`✗ Cannot connect to API: ${error.message}`, 'error');
+            }
+        });
+
+        // Show status message
+        function showStatus(message, type) {
+            const statusDiv = document.createElement('div');
+            statusDiv.className = `status ${type}`;
+            statusDiv.textContent = message;
+            statusContainer.appendChild(statusDiv);
+
+            // Auto-remove old messages
+            if (statusContainer.children.length > 5) {
+                statusContainer.removeChild(statusContainer.firstChild);
+            }
+        }
+
+        // Initial status check
+        window.addEventListener('load', () => {
+            setTimeout(() => checkStatusBtn.click(), 500);
+        });
+    </script>
+</body>
+</html>