lemonade-sdk 8.1.8__py3-none-any.whl → 8.1.10__py3-none-any.whl

lemonade/tools/server/static/js/models.js

@@ -42,53 +42,90 @@ async function checkModelHealth() {
     }
 }
 
+// Populate the model dropdown with all installed models
+function populateModelDropdown() {
+	const indicator = document.getElementById('model-status-indicator');
+    const select = document.getElementById('model-select');
+    select.innerHTML = '';
+    
+    // Add the default option
+    const defaultOption = document.createElement('option');
+    defaultOption.value = '';
+    defaultOption.textContent = 'Click to select a model ▼';
+    select.appendChild(defaultOption);
+
+	// Add the hidden 'Server Offline' option
+	const hiddenOption = document.createElement('option');
+	hiddenOption.value = 'server-offline';
+	hiddenOption.textContent = 'Server Offline';
+	hiddenOption.hidden = true;
+	select.appendChild(hiddenOption);
+	
+    // Get all installed models from the global set
+    const sortedModels = Array.from(installedModels).sort();
+    
+    // Add options for each installed model
+    sortedModels.forEach(modelId => {
+        const option = document.createElement('option');
+        option.value = modelId;
+        option.textContent = modelId;
+        select.appendChild(option);
+    });
+}
+
 // Update model status indicator
 async function updateModelStatusIndicator() {
     const indicator = document.getElementById('model-status-indicator');
-    const statusText = document.getElementById('model-status-text');
-    const unloadBtn = document.getElementById('model-unload-btn');
-    
+    const select = document.getElementById('model-select');
+	const buttonIcons = document.querySelectorAll('button');
+      
     // Fetch both health and installed models
     const [health] = await Promise.all([
         checkModelHealth(),
         fetchInstalledModels()
     ]);
-    
-    // Refresh model dropdown in chat after fetching installed models
-    if (window.initializeModelDropdown) {
-        window.initializeModelDropdown();
-    }
-    
-    // Update system message when model status changes
-    if (window.displaySystemMessage) {
-        window.displaySystemMessage();
-    }
-    
+	
+	// Populate the dropdown with the newly fetched installed models
+    populateModelDropdown();
+
     // Refresh model management UI if we're on the models tab
     const modelsTab = document.getElementById('content-models');
     if (modelsTab && modelsTab.classList.contains('active')) {
         // Use the display-only version to avoid re-fetching data we just fetched
         refreshModelMgmtUIDisplay();
     }
-    
-    // Remove any click handlers
-    indicator.onclick = null;
-    
+	
     if (health && health.model_loaded) {
         // Model is loaded - show model name with online status
+		indicator.classList.remove('online', 'offline', 'loading'); 
         currentLoadedModel = health.model_loaded;
-        updateStatusIndicator(health.model_loaded, 'loaded');
-        unloadBtn.style.display = 'block';
-    } else if (health) {
+        indicator.classList.add('loaded');
+        select.value = currentLoadedModel;
+        select.disabled = false;
+		buttonIcons.forEach(btn => btn.disabled = false);
+    } else if (health !== null) {
         // Server is online but no model loaded
+		indicator.classList.remove('loaded', 'offline', 'loading');
         currentLoadedModel = null;
-        updateStatusIndicator('Server Online', 'online');
-        unloadBtn.style.display = 'none';
+        indicator.classList.add('online');
+        select.value = ''; // Set to the "Click to select a model ▼" option
+        select.disabled = false;
+		buttonIcons.forEach(btn => btn.disabled = false);
     } else {
         // Server is offline
+		indicator.classList.remove('loaded', 'online', 'loading');
         currentLoadedModel = null;
-        updateStatusIndicator('Server Offline', 'offline');
-        unloadBtn.style.display = 'none';
+		// Add the hidden 'Server Offline' option
+		const hiddenOption = document.createElement('option');
+		hiddenOption.value = 'server-offline';
+		hiddenOption.textContent = 'Server Offline';
+		hiddenOption.hidden = true;
+		select.appendChild(hiddenOption);
+        indicator.classList.add('offline');
+        select.value = 'server-offline';
+        select.disabled = true;
+		buttonIcons.forEach(btn => btn.disabled = true);
+		return;
     }
 }
 
@@ -97,9 +134,18 @@ async function unloadModel() {
     if (!currentLoadedModel) return;
     
     try {
+        // Set loading state
+        const indicator = document.getElementById('model-status-indicator');
+        const select = document.getElementById('model-select');
+        indicator.classList.remove('loaded', 'online', 'offline');
+        indicator.classList.add('loading');
+        select.disabled = true;
+        select.value = currentLoadedModel; // Keep the selected model visible during unload
+
         await httpRequest(getServerBaseUrl() + '/api/v1/unload', {
             method: 'POST'
         });
+        
         await updateModelStatusIndicator();
         
         // Refresh model list to show updated button states
@@ -109,6 +155,7 @@ async function unloadModel() {
     } catch (error) {
         console.error('Error unloading model:', error);
         showErrorBanner('Failed to unload model: ' + error.message);
+        await updateModelStatusIndicator(); // Revert state on error
     }
 }
 
@@ -326,10 +373,14 @@ function createModelItem(modelId, modelData, container) {
             actions.appendChild(unloadBtn);
         } else {
             const loadBtn = document.createElement('button');
+			const modelSelect = document.getElementById('model-select');
             loadBtn.className = 'model-item-btn load';
             loadBtn.textContent = '🚀';
             loadBtn.title = 'Load';
-            loadBtn.onclick = () => loadModel(modelId);
+            loadBtn.onclick = () => {
+				modelSelect.value = modelId;
+				modelSelect.dispatchEvent(new Event('change', { bubbles: true }));
+				};
             actions.appendChild(loadBtn);
         }
         
@@ -399,6 +450,15 @@ async function installModel(modelId) {
 
 // Load model
 async function loadModel(modelId) {
+    const indicator = document.getElementById('model-status-indicator');
+    const select = document.getElementById('model-select');
+    
+    // Set loading state for indicator
+	modelSelect.value = 'loading-model';
+    indicator.classList.remove('loaded', 'online', 'offline');
+    indicator.classList.add('loading');
+    select.disabled = true;
+
     // Find the load button and show loading state
     const modelItems = document.querySelectorAll('.model-item');
     let loadBtn = null;
@@ -409,6 +469,12 @@ async function loadModel(modelId) {
             loadBtn = item.querySelector('.model-item-btn.load');
         }
     });
+
+    if (loadBtn) {
+        loadBtn.disabled = true;
+        loadBtn.textContent = '⏳';
+        loadBtn.classList.add('loading');
+    }
     
     // Use the standardized load function
     const success = await loadModelStandardized(modelId, {
@@ -494,6 +560,8 @@ function createModelNameWithLabels(modelId, serverModels) {
                 labelClass = 'reranking';
             } else if (labelLower === 'coding') {
                 labelClass = 'coding';
+            } else if (labelLower === 'tool-calling') {
+                labelClass = 'tool-calling';
             }
             labelSpan.className = `model-label ${labelClass}`;
             labelSpan.textContent = label;
@@ -514,11 +582,21 @@ document.addEventListener('DOMContentLoaded', async function() {
         unloadBtn.onclick = unloadModel;
     }
     
+    const modelSelect = document.getElementById('model-select');
+    if (modelSelect) {
+        modelSelect.addEventListener('change', async function() {
+            const modelId = this.value;
+            if (modelId) {
+                await loadModel(modelId);
+            }
+        });
+    }
+    
     // Initial fetch of model data - this will populate installedModels
     await updateModelStatusIndicator();
     
     // Set up periodic refresh of model status
-    setInterval(updateModelStatusIndicator, 5000); // Check every 5 seconds
+    setInterval(updateModelStatusIndicator, 1000); // Check every 1 seconds
     
     // Initialize model browser with hot models
     displayHotModels();
@@ -683,7 +761,6 @@ async function refreshModelMgmtUI() {
                 }
             };
             tdBtn.appendChild(btn);
-            
             tr.appendChild(tdName);
             tr.appendChild(tdBtn);
             installedTbody.appendChild(tr);
@@ -873,4 +950,4 @@ window.showAddModelForm = showAddModelForm;
 window.unloadModel = unloadModel;
 window.installModel = installModel;
 window.loadModel = loadModel;
-window.deleteModel = deleteModel;
+window.deleteModel = deleteModel;

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

@@ -258,7 +258,7 @@ async function loadModelStandardized(modelId, options = {}) {
             // Reset the default option text
             const defaultOption = modelSelect.querySelector('option[value=""]');
             if (defaultOption) {
-                defaultOption.textContent = 'Pick a model';
+                defaultOption.textContent = 'Click to select a model ▼';
             }
         }
         
@@ -302,7 +302,7 @@ async function loadModelStandardized(modelId, options = {}) {
             // Reset the default option text
             const defaultOption = modelSelect.querySelector('option[value=""]');
             if (defaultOption) {
-                defaultOption.textContent = 'Pick a model';
+                defaultOption.textContent = 'Click to select a model ▼';
             }
         }
         
@@ -482,6 +482,8 @@ function createModelNameWithLabels(modelId, allModels) {
                 labelClass = 'reranking';
             } else if (labelLower === 'coding') {
                 labelClass = 'coding';
+            } else if (labelLower === 'tool-calling') {
+                labelClass = 'tool-calling';
             }
             labelSpan.className = `model-label ${labelClass}`;
             labelSpan.textContent = label;

lemonade/tools/server/static/styles.css

@@ -35,6 +35,12 @@
   --purple-hover: #744f7e;
   --purple-light: #f5f1f6;
   
+  /* Status Colors */
+  --status-green: #28a745;
+  --status-red: #dc3545;
+  --status-yellow: #ffc107;
+  --status-gray: #6c757d;
+
   /* Transitions */
   --transition-fast: 0.2s ease;
   --transition-medium: 0.3s ease;
@@ -229,49 +235,44 @@ body::before {
   animation: pulse-glow 2s infinite;
 }
 
-/* Online status (green) */
+/* Online model unloaded status (yellow) */
 .model-status-indicator.online .status-light {
-  background: #28a745;
+  background:  var(--status-yellow);
   box-shadow: 0 0 8px rgba(40, 167, 69, 0.6);
 }
 
 .model-status-indicator.online .status-light::before {
-  background: #28a745;
+  background:  var(--status-yellow);
 }
 
-.model-status-indicator.online .model-status-text {
-  color: #28a745;
-  font-weight: 600;
+/* Online model loading status (yellow) */
+.model-status-indicator.loading .status-light {
+  background:  var(--status-yellow);
+  box-shadow: 0 0 8px rgba(40, 167, 69, 0.6);
+}
+
+.model-status-indicator.loading .status-light::before {
+  background:  var(--status-yellow);
 }
 
 /* Offline status (red) */
 .model-status-indicator.offline .status-light {
-  background: #dc3545;
+  background: var(--status-red);
   box-shadow: 0 0 8px rgba(220, 53, 69, 0.6);
 }
 
 .model-status-indicator.offline .status-light::before {
-  background: #dc3545;
+  background: var(--status-red);
 }
 
-.model-status-indicator.offline .model-status-text {
-  color: #dc3545;
-  font-weight: 600;
-}
-
-/* Model loaded status (same as online but with model name) */
+/* Online model loaded status (with model name) */
 .model-status-indicator.loaded .status-light {
-  background: #28a745;
+  background: var(--status-green);
   box-shadow: 0 0 8px rgba(40, 167, 69, 0.6);
 }
 
 .model-status-indicator.loaded .status-light::before {
-  background: #28a745;
-}
-
-.model-status-indicator.loaded .model-status-text {
-  color: #28a745;
-  font-weight: 600;
+  background: var(--status-green);
 }
 
 @keyframes pulse-glow {
@@ -285,25 +286,99 @@ body::before {
   }
 }
 
-.model-status-text {
-  font-weight: 600;
+/* Base styles for the select element */
+.model-select {
+  padding: 0.5rem 0.75rem;
+  border: 1px solid #ddd;
+  border-radius: 6px;
+  background: #fafafa;
   font-size: 0.9rem;
+  min-width: 180px;
+  cursor: pointer;
+  transition: all var(--transition-fast);
+  text-align-last: center;
+  -moz-appearance: none;
+  -webkit-appearance: none;
+  appearance: none;
+}
+
+.model-select:focus {
+  outline: none;
+  border-color: var(--accent-gold);
+  box-shadow: 0 0 0 2px rgba(255, 193, 7, 0.2);
+}
+
+/* Existing styles for selective coloring based on status */
+.model-status-indicator.loaded .model-select {
+  color: var(--status-green); /* Green for loaded model */
+  font-weight: bold;
+}
+
+.model-status-indicator.loading .model-select {
+  color: var(--status-gray); /* Gray for loading */
+  font-style: italic;
+  cursor: wait;
+}
+
+.model-status-indicator.online .model-select {
+  color: var(--status-yellow); /* Yellow when online but no model loaded */
+  font-weight: bold;
+}
+
+.model-status-indicator.offline .model-select {
+  color: var(--status-red); /* Red when offline */
+  font-weight: bold;
+}
+
+/* Ensure options in the list are not affected by the select's styling */
+.model-select option {
+  color: var(--text-primary); 
+  font-weight: normal;
+  font-style: normal;
+  background-color: white; 
+  padding: 0.5rem;
+}
+
+/* Highlight the selected option ONLY in the open list (if desired) */
+.model-select option:checked {
+  background-color: #f0f0f0; 
+  color: var(--text-primary);
+}
+
+.model-select option:checked.server-offline {
+  background-color: #f0f0f0; 
+  color: var(--status-red);
+}
+
+.model-select:disabled {
+  background: #f5f5f5;
+  cursor: not-allowed;
+  opacity: 0.7;
+}
+/* When server is offline all buttons are disabled and appear muted */
+button:disabled {
+  cursor: not-allowed;
+  opacity: 0.6;
+  background-color: #cccccc;
+  color: #666666;
 }
 
 .model-action-btn {
-  display: flex;
+  display: none; /* Hide by default */
   align-items: center;
   justify-content: center;
-  width: 24px;
-  height: 24px;
+  width: 1.1em;
+  height: 1.1em;
   background: transparent;
   border: none;
   border-radius: 50%;
   cursor: pointer;
   transition: all var(--transition-fast);
-  font-size: 0.9rem;
+  font-size: 1.5rem;
   color: #666;
-  margin-left: 0.2rem;
+  margin-left: 0.1rem;
+  margin-right: 0.2rem;
+  line-height: 1;
 }
 
 .model-action-btn:hover {
@@ -311,6 +386,11 @@ body::before {
   color: #333;
 }
 
+/* Unload button is only visible when a model is loaded */
+.model-status-indicator.loaded .model-action-btn {
+  display: flex;
+}
+
 .tab-content {
   display: none;
   padding: 2em;
@@ -874,6 +954,10 @@ body::before {
   background-color: var(--info-primary);
 }
 
+.model-label.tool-calling {
+  background-color: #FFB74D;
+}
+
 .model-label.other {
   background-color: var(--success-primary);
 }
@@ -1106,6 +1190,7 @@ body::before {
 
 #register-model-name:focus {
   border-color: #e6b800;
+  box-shadow: 0 2px 12px rgba(230,184,0,0.25);
 }
 
 .form-input-wrapper {
@@ -2190,43 +2275,4 @@ body::before {
     0 8px 25px rgba(200, 88, 108, 0.2),
     0 3px 10px rgba(0, 0, 0, 0.1),
     inset 0 1px 0 rgba(255, 255, 255, 0.9);
-}
-
-/* Model select dropdown in chat */
-.model-select {
-  padding: 0.5rem 0.75rem;
-  border: 1px solid #ddd;
-  border-radius: 6px;
-  background: white;
-  font-size: 0.9rem;
-  min-width: 180px;
-  margin-right: 0.75rem;
-  cursor: pointer;
-  transition: all var(--transition-fast);
-}
-
-.model-select:focus {
-  outline: none;
-  border-color: var(--accent-gold);
-  box-shadow: 0 0 0 2px rgba(255, 193, 7, 0.2);
-}
-
-.model-select:disabled {
-  background: #f5f5f5;
-  cursor: not-allowed;
-  opacity: 0.7;
-}
-
-.model-select option {
-  padding: 0.5rem;
-}
-
-.chat-input-row {
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-}
-
-.input-with-indicator {
-  flex: 1;
-}
+}

lemonade/tools/server/static/webapp.html

@@ -32,25 +32,23 @@
         <div class="tab-container"> 
             <div class="tabs"> 
                 <div class="tab-group">
-                    <button class="tab active" id="tab-chat" onclick="showTab('chat')">LLM Chat</button> 
-                    <button class="tab" id="tab-model-settings" onclick="showTab('settings')">Model Settings</button>
-                    <button class="tab" id="tab-models" onclick="showTab('models')">Model Management</button> 
-                </div>
-                
-                <!-- Model Status Indicator integrated into tab bar -->
-                <div class="model-status-indicator" id="model-status-indicator">
-                    <div class="status-light" id="status-light"></div>
-                    <span class="model-status-text" id="model-status-text">Loading...</span>
-                    <button class="model-action-btn" id="model-unload-btn" style="display: none;" title="Unload model">⏏</button>
-                </div>
-            </div> 
-            <div class="tab-content active" id="content-chat"> 
-                <div class="chat-container"> 
-                    <div class="chat-history" id="chat-history"></div> 
-                    <div class="chat-input-row"> 
-                        <select id="model-select" class="model-select">
-                            <option value="">Pick a model</option>
-                        </select>
+					<button class="tab active" id="tab-chat" onclick="showTab('chat')">LLM Chat</button>
+					<button class="tab" id="tab-model-settings" onclick="showTab('settings')">Model Settings</button>
+					<button class="tab" id="tab-models" onclick="showTab('models')">Model Management</button>
+				</div>
+
+				<div class="model-status-indicator" id="model-status-indicator">
+					<div class="status-light" id="status-light"></div>
+					<select id="model-select" class="model-select">
+						<option value="">Pick a model</option>
+					</select>
+					<button class="model-action-btn" id="model-unload-btn" title="Unload model" style="display: flex;">⏏</button>
+				</div>
+			</div>
+            <div class="tab-content active" id="content-chat">
+                <div class="chat-container">
+                    <div class="chat-history" id="chat-history"></div>
+                    <div class="chat-input-row">
                         <div class="input-with-indicator">
                             <textarea id="chat-input" placeholder="Type your message..." rows="1"></textarea> 
                         </div>
@@ -142,7 +140,6 @@
                             </div>
                             <div class="category-content expanded" id="category-hot"></div>
                         </div>
-                        
                         <div class="model-category-section">
                             <div class="section-header">
                                 <span class="section-icon">🔧</span>
@@ -155,7 +152,6 @@
                                 <div class="subcategory" data-recipe="oga-cpu" onclick="selectRecipe('oga-cpu')">OGA CPU</div>
                             </div>
                         </div>
-                        
                         <div class="model-category-section">
                             <div class="section-header">
                                 <span class="section-icon">🏷️</span>
@@ -165,12 +161,12 @@
                                 <div class="subcategory" data-label="coding" onclick="selectLabel('coding')">Coding</div>
                                 <div class="subcategory" data-label="vision" onclick="selectLabel('vision')">Vision</div>
                                 <div class="subcategory" data-label="reasoning" onclick="selectLabel('reasoning')">Reasoning</div>
+                                <div class="subcategory" data-label="tool-calling" onclick="selectLabel('tool-calling')">Tool Calling</div>
                                 <div class="subcategory" data-label="reranking" onclick="selectLabel('reranking')">Reranking</div>
                                 <div class="subcategory" data-label="embeddings" onclick="selectLabel('embeddings')">Embeddings</div>
                                 <div class="subcategory" data-label="custom" onclick="selectLabel('custom')">Custom</div>
                             </div>
                         </div>
-                        
                         <div class="model-category" data-category="add">
                             <div class="category-header" onclick="showAddModelForm()">
                                 <span class="category-icon">➕</span>
@@ -178,7 +174,6 @@
                             </div>
                         </div>
                     </div>
-                    
                     <div class="model-browser-main">
                         <div class="model-list" id="model-list"></div>
                         
@@ -255,3 +250,4 @@
     <script src="/static/js/chat.js"></script>
 </body>
 </html>
+</html>