lemonade-sdk 8.1.11__py3-none-any.whl → 8.2.2__py3-none-any.whl

lemonade/tools/server/static/js/shared.js

@@ -54,23 +54,53 @@ function renderMarkdown(text) {
 
 // Display an error message in the banner
 function showErrorBanner(msg) {
+    showBanner(msg, 'error');
+}
+
+// Display a banner with a specific type (error, warning, success)
+function showBanner(msg, type = 'error') {
     // If DOM isn't ready, wait for it
     if (document.readyState === 'loading') {
         document.addEventListener('DOMContentLoaded', () => {
-            showErrorBanner(msg);
+            showBanner(msg, type);
         });
         return;
     }
-    
+
     const banner = document.getElementById('error-banner');
     if (!banner) return;
     const msgEl = document.getElementById('error-banner-msg');
-    const fullMsg = msg + '\nCheck the Lemonade Server logs via the system tray app for more information.';
+    const logsUrl = window.location.origin + '/static/logs.html';
+
+    // Determine the full message and styling based on type
+    let fullMsg = msg;
+    let backgroundColor, color;
+
+    switch(type) {
+        case 'success':
+            backgroundColor = '#27ae60'; // green
+            color = '#ffffff';
+            break;
+        case 'warning':
+            backgroundColor = '#8d5803ff'; // yellow/orange
+            color = '#ffffff';
+            break;
+        case 'error':
+        default:
+            backgroundColor = '#b10819ff'; // red
+            color = '#ffffff';
+            fullMsg = `${msg}<br>Check the Lemonade Server logs <a href="${logsUrl}" target="_blank" rel="noopener noreferrer">on the browser</a> or via the system tray app for more information.`;
+            break;
+    }
+    
     if (msgEl) {
-        msgEl.textContent = fullMsg;
+        msgEl.innerHTML = fullMsg;
     } else {
-        banner.textContent = fullMsg;
+        banner.innerHTML = fullMsg;
     }
+
+    banner.style.backgroundColor = backgroundColor;
+    banner.style.color = color;
     banner.style.display = 'flex';
 }
 
@@ -177,6 +207,11 @@ async function loadModelStandardized(modelId, options = {}) {
     // Store original states for restoration on error
     const originalStatusText = document.getElementById('model-status-text')?.textContent || '';
     
+    // Track this load operation as active to prevent polling interference
+    if (window.activeOperations) {
+        window.activeOperations.add(modelId);
+    }
+    
     try {
         // Update load button if provided
         if (loadButton) {
@@ -189,7 +224,7 @@ async function loadModelStandardized(modelId, options = {}) {
         
         // Update chat dropdown and send button to show loading state
         const modelSelect = document.getElementById('model-select');
-        const sendBtn = document.getElementById('send-btn');
+        const sendBtn = document.getElementById('toggle-btn');
         if (modelSelect && sendBtn) {
             // Ensure the model exists in the dropdown options
             let modelOption = modelSelect.querySelector(`option[value="${modelId}"]`);
@@ -222,10 +257,18 @@ async function loadModelStandardized(modelId, options = {}) {
         }
         
         // Make the API call to load the model
+        // Include mmproj if the model has it defined
+        const loadPayload = { model_name: modelId };
+        const allModels = window.SERVER_MODELS || {};
+        const modelData = allModels[modelId];
+        if (modelData && modelData.mmproj) {
+            loadPayload.mmproj = modelData.mmproj;
+        }
+
         await httpRequest(getServerBaseUrl() + '/api/v1/load', {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ model_name: modelId })
+            body: JSON.stringify(loadPayload)
         });
         
         // Update model status indicator after successful load
@@ -273,6 +316,11 @@ async function loadModelStandardized(modelId, options = {}) {
             onSuccess(modelId);
         }
         
+        // Remove from active operations on success
+        if (window.activeOperations) {
+            window.activeOperations.delete(modelId);
+        }
+        
         return true;
         
     } catch (error) {
@@ -290,7 +338,7 @@ async function loadModelStandardized(modelId, options = {}) {
         
         // Reset chat controls on error
         const modelSelect = document.getElementById('model-select');
-        const sendBtn = document.getElementById('send-btn');
+        const sendBtn = document.getElementById('toggle-btn');
         if (modelSelect && sendBtn) {
             modelSelect.disabled = false;
             sendBtn.disabled = false;
@@ -320,6 +368,11 @@ async function loadModelStandardized(modelId, options = {}) {
         // Always show error banner to ensure user sees the error
         showErrorBanner('Failed to load model: ' + error.message);
         
+        // Remove from active operations on error too
+        if (window.activeOperations) {
+            window.activeOperations.delete(modelId);
+        }
+        
         return false;
     }
 }

lemonade/tools/server/static/logs.html

@@ -22,26 +22,170 @@
 <body>
     <div id="log-container"></div>
 
-    <script>
-        function stripAnsi(str) {
-            return str.replace(/\x1B\[[0-9;]*[A-Za-z]/g, '');
+<script>
+    /**
+     * LogStreamer - Backwards-compatible log streaming client
+     * Supports both WebSocket (Python server) and SSE (C++ server)
+     * Tries WebSocket first, falls back to SSE if unavailable
+     */
+    class LogStreamer {
+        constructor(baseUrl, onMessage, onError = null) {
+            this.baseUrl = baseUrl;
+            this.onMessage = onMessage;
+            this.onError = onError;
+            this.connection = null;
+            this.type = null; // 'websocket' or 'sse'
         }
-        const logContainer = document.getElementById("log-container");
-        const ws = new WebSocket(`ws://${location.host}/api/v1/logs/ws`);
+        
+        async connect() {
+            // Try WebSocket first (Python server)
+            try {
+                await this.connectWebSocket();
+                console.log('[LogStreamer] Connected via WebSocket');
+                return;
+            } catch (wsError) {
+                console.log('[LogStreamer] WebSocket failed, trying SSE...', wsError);
+            }
+            
+            // Fallback to SSE (C++ server)
+            try {
+                this.connectSSE();
+                console.log('[LogStreamer] Connected via SSE');
+            } catch (sseError) {
+                console.error('[LogStreamer] Both WebSocket and SSE failed', sseError);
+                if (this.onError) {
+                    this.onError(new Error('Unable to connect to log stream'));
+                }
+            }
+        }
+        
+        connectWebSocket() {
+            return new Promise((resolve, reject) => {
+                const wsUrl = this.baseUrl
+                    .replace('http://', 'ws://')
+                    .replace('https://', 'wss://') + '/api/v1/logs/ws';
+                
+                const ws = new WebSocket(wsUrl);
+                let connectionTimeout = setTimeout(() => {
+                    reject(new Error('WebSocket connection timeout'));
+                    ws.close();
+                }, 3000); // 3 second timeout
+                
+                ws.onopen = () => {
+                    clearTimeout(connectionTimeout);
+                    this.connection = ws;
+                    this.type = 'websocket';
+                    resolve();
+                };
+                
+                ws.onmessage = (event) => {
+                    this.onMessage(event.data);
+                };
+                
+                ws.onerror = (error) => {
+                    clearTimeout(connectionTimeout);
+                    if (this.onError && this.connection) {
+                        this.onError(error);
+                    }
+                    reject(error);
+                };
+                
+                ws.onclose = () => {
+                    if (this.type === 'websocket') {
+                        console.log('[LogStreamer] WebSocket closed');
+                        if (this.onError) {
+                            this.onError(new Error('WebSocket connection closed'));
+                        }
+                    }
+                };
+            });
+        }
+        
+        connectSSE() {
+            const sseUrl = this.baseUrl + '/api/v1/logs/stream';
+            const eventSource = new EventSource(sseUrl);
+            
+            eventSource.onopen = () => {
+                this.connection = eventSource;
+                this.type = 'sse';
+            };
+            
+            eventSource.onmessage = (event) => {
+                this.onMessage(event.data);
+            };
+            
+            eventSource.onerror = (error) => {
+                console.error('[LogStreamer] SSE error:', error);
+                if (this.onError) {
+                    this.onError(error);
+                }
+            };
+        }
+        
+        disconnect() {
+            if (!this.connection) return;
+            
+            if (this.type === 'websocket') {
+                this.connection.close();
+            } else if (this.type === 'sse') {
+                this.connection.close();
+            }
+            
+            this.connection = null;
+            this.type = null;
+        }
+        
+        getConnectionType() {
+            return this.type;
+        }
+    }
 
-        ws.onmessage = (event) => {
+    // Utility functions
+    function stripAnsi(str) {
+        return str.replace(/\x1B\[[0-9;]*[A-Za-z]/g, '');
+    }
+
+    function isNearBottom() {
+        const threshold = 50; // px from bottom
+        return logContainer.scrollTop + logContainer.clientHeight >= logContainer.scrollHeight - threshold;
+    }
+
+    // Initialize log streaming
+    const logContainer = document.getElementById("log-container");
+    const baseUrl = `${location.protocol}//${location.host}`;
+    
+    const logStreamer = new LogStreamer(
+        baseUrl,
+        (logLine) => {
+            // Handle incoming log line
             const line = document.createElement("div");
-            line.textContent = stripAnsi(event.data);
+            line.textContent = stripAnsi(logLine);
             logContainer.appendChild(line);
-            logContainer.scrollTop = logContainer.scrollHeight; // auto scroll
-        };
 
-        ws.onclose = () => {
+            // Only autoscroll if the user is already at (or near) the bottom
+            if (isNearBottom()) {
+                logContainer.scrollTop = logContainer.scrollHeight;
+            }
+        },
+        (error) => {
+            // Handle error
             const msg = document.createElement("div");
-            msg.textContent = "[Disconnected from log stream]";
+            msg.textContent = `[Connection error: ${error.message}]`;
             msg.style.color = "red";
             logContainer.appendChild(msg);
-        };
-    </script>
+        }
+    );
+    
+    // Connect to log stream
+    logStreamer.connect();
+    
+    // Show connection type in console
+    setTimeout(() => {
+        const type = logStreamer.getConnectionType();
+        if (type) {
+            console.log(`[LogViewer] Connected via ${type === 'websocket' ? 'WebSocket' : 'Server-Sent Events'}`);
+        }
+    }, 100);
+</script>
 </body>
 </html>

lemonade/tools/server/static/styles.css

@@ -1288,6 +1288,62 @@ button:disabled {
   transform: translateY(-1px);
   box-shadow: 0 2px 8px rgba(91, 141, 184, 0.3);
 }
+.checkpoint-input-group {
+  display: flex;
+  align-items: stretch;
+  flex: 1;
+  border-radius: 6px;
+  overflow: hidden;
+  transition: box-shadow 0.2s ease;
+  min-width: 0;
+}
+
+.checkpoint-input-group:focus-within {
+  box-shadow: 0 2px 12px rgba(230,184,0,0.25);
+}
+
+.checkpoint-input-group #register-checkpoint {
+  border-radius: 6px 0 0 6px;
+  border: 1px solid #d5d5d5;
+  border-right: none;
+  padding: 0.6em 0.8em;
+  font-size: 0.95em;
+  background: #fff;
+  color: #222;
+  flex: 1;
+  transition: border-color 0.2s ease, box-shadow 0.2s ease;
+  outline: none;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.06);
+  box-sizing: border-box;
+  min-width: 0;
+}
+
+.checkpoint-input-group #register-checkpoint:focus {
+  border-color: #e6b800;
+  box-shadow: 0 2px 12px rgba(230,184,0,0.25);
+}
+
+.folder-select-btn {
+  background: #f8f9fa;
+  border: 1px solid #d5d5d5;
+  border-left: none;
+  border-radius: 0 6px 6px 0;
+  padding: 0.6em 0.8em;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  font-size: 1rem;
+  color: #666;
+  min-width: 48px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.folder-select-btn:hover {
+  background: #e9ecef;
+  color: #333;
+}
+/*  */
 
 #register-mmproj, #register-checkpoint {
   border-radius: 6px;
@@ -1960,6 +2016,154 @@ button:disabled {
   opacity: 0.8;
 }
 
+/* Migration banner - reuses error-banner structure with warning color */
+.migration-banner {
+  position: fixed;
+  top: 10px;
+  left: 50%;
+  transform: translateX(-50%);
+  background-color: #ffa500;
+  color: #222;
+  padding: 0.6em 1.2em;
+  border-radius: 6px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.2);
+  z-index: 10000;
+  font-weight: 600;
+  display: none;
+  animation: fadeIn 0.2s ease;
+  align-items: center;
+  gap: 0.8em;
+}
+
+.migration-action-btn {
+  background: #222;
+  color: #ffa500;
+  border: none;
+  padding: 0.4em 0.8em;
+  border-radius: 4px;
+  cursor: pointer;
+  font-weight: 600;
+  transition: background 0.2s;
+}
+
+.migration-action-btn:hover {
+  background: #444;
+}
+
+.migration-banner .close-btn {
+  background: none;
+  border: none;
+  color: #222;
+  font-size: 1.2em;
+  margin-left: 0.8em;
+  cursor: pointer;
+  padding: 0;
+  line-height: 1;
+}
+
+/* Modal styles */
+.modal {
+  position: fixed;
+  z-index: 10001;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0,0,0,0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.modal-content {
+  background: #fff;
+  border-radius: 8px;
+  max-width: 600px;
+  width: 90%;
+  max-height: 80vh;
+  display: flex;
+  flex-direction: column;
+  box-shadow: 0 4px 20px rgba(0,0,0,0.3);
+}
+
+.modal-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 1.2rem 1.5rem;
+  border-bottom: 1px solid #e0e0e0;
+}
+
+.modal-header h2 {
+  margin: 0;
+  font-size: 1.3rem;
+}
+
+.modal-close {
+  background: none;
+  border: none;
+  font-size: 1.5rem;
+  cursor: pointer;
+  color: #666;
+  padding: 0;
+}
+
+.modal-body {
+  padding: 1.5rem;
+  overflow-y: auto;
+  flex: 1;
+}
+
+.migration-model-list {
+  margin: 1rem 0;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+  max-height: 300px;
+  overflow-y: auto;
+}
+
+.migration-model-item {
+  padding: 0.75rem 1rem;
+  border-bottom: 1px solid #f0f0f0;
+  display: flex;
+  justify-content: space-between;
+}
+
+.migration-model-item:last-child {
+  border-bottom: none;
+}
+
+.migration-summary {
+  margin-top: 1rem;
+  padding: 0.75rem;
+  background: #f8f9fa;
+  border-radius: 4px;
+  text-align: center;
+}
+
+.modal-footer {
+  padding: 1rem 1.5rem;
+  border-top: 1px solid #e0e0e0;
+  display: flex;
+  justify-content: flex-end;
+  gap: 0.75rem;
+}
+
+.delete-btn {
+  padding: 0.6em 1.5em;
+  background: var(--danger-primary);
+  color: white;
+  border: none;
+  border-radius: 4px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: background 0.2s;
+}
+
+.delete-btn:hover {
+  background: var(--danger-hover);
+}
+
 /* === Model Settings === */
 .model-settings-container {
   max-width: 600px;

lemonade/tools/server/static/webapp.html

@@ -29,6 +29,11 @@
         <span id="error-banner-msg"></span>
         <button class="close-btn" onclick="hideErrorBanner()">&times;</button>
     </div>
+    <div id="migration-banner" class="migration-banner" style="display:none;">
+        <span id="migration-banner-msg"></span>
+        <button class="migration-action-btn" onclick="showMigrationModal()">Clean Up Now</button>
+        <button class="close-btn" onclick="hideMigrationBanner()">&times;</button>
+    </div>
     <main class="main">
         <div class="tab-content-wrapper">
         <div class="tab-container"> 
@@ -135,6 +140,12 @@
                             <input type="number" id="setting-repeat-penalty" min="0.5" max="2" step="0.05" placeholder="default" />
                             <span class="setting-description">Penalty for repeating tokens (1 = no penalty, >1 = less repetition)</span>
                         </div>
+                       <div class="setting-field">
+                         <label for="enable-thinking">Enable Thinking:</label> 
+                         <input type="checkbox" id="enable-thinking"> 
+                         <br>
+                            <span class="setting-description">Determines whether hybrid reasoning models, such as Qwen3, will use thinking.</span> 
+                        </div>
                         <div class="setting-actions">
                             <button id="reset-settings-btn" class="reset-btn">Reset to Defaults</button>
                         </div>
@@ -207,7 +218,11 @@
                                         Checkpoint
                                         <span class="tooltip-icon" data-tooltip="Specify the model checkpoint path from Hugging Face (e.g., org-name/model-name:variant).">ⓘ</span>
                                     </label>
+                                    <div class="checkpoint-input-group">
                                     <input type="text" id="register-checkpoint" name="checkpoint" placeholder="unsloth/gemma-3-12b-it-GGUF:Q4_0" class="register-textbox" autocomplete="off">
+                                    <button type="button" id="select-folder-btn" class="folder-select-btn" title="Select local folder">📁</button>
+                                    </div>
+                                    <input type="file" id="folder-input" webkitdirectory directory style="display: none;">
                                 </div>
                                 <div class="register-form-row">
                                     <label class="register-label">
@@ -258,10 +273,33 @@
     </footer>
     
     <!-- External libraries -->
-    <script src="https://cdn.jsdelivr.net/npm/openai@4.21.0/dist/openai.min.js"></script> 
+    <script src="https://cdn.jsdelivr.net/npm/openai@6.7.0/dist/openai.min.js"></script> 
     <script src="https://cdn.jsdelivr.net/npm/marked@9.1.0/marked.min.js"></script>
     <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
     
+    <!-- Migration Cleanup Modal -->
+    <div id="migration-modal" class="modal" style="display:none;">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h2>Clean Up Incompatible Models</h2>
+                <button class="modal-close" onclick="hideMigrationModal()">&times;</button>
+            </div>
+            <div class="modal-body">
+                <p>The following RyzenAI models are incompatible with RyzenAI 1.6 and can be safely deleted:</p>
+                <p class="migration-instructions">
+                    After deleting, you can re-download compatible Ryzen AI 1.6 models from the <em>OGA NPU</em> and <em>OGA Hybrid</em> tabs.</p>
+                <div id="migration-model-list" class="migration-model-list"></div>
+                <div class="migration-summary">
+                    <strong>Total space to free: <span id="migration-total-size"></span></strong>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button class="cancel-btn" onclick="hideMigrationModal()">Cancel</button>
+                <button class="delete-btn" onclick="deleteIncompatibleModels()">Delete All</button>
+            </div>
+        </div>
+    </div>
+
     <!-- Application JavaScript -->
     <script src="/static/js/shared.js"></script>
     <script src="/static/js/models.js"></script>

lemonade/version.py

@@ -1 +1 @@
-__version__ = "8.1.11"
+__version__ = "8.2.2"