PyPI - lemonade-sdk - Versions diffs - 8.1.10__py3-none-any.whl → 8.1.11__py3-none-any.whl - Mend

lemonade-sdk 8.1.10py3-none-any.whl → 8.1.11py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of lemonade-sdk might be problematic. Click here for more details.

Files changed (30) hide show

lemonade/tools/flm/__init__.py +1 -0
lemonade/tools/flm/utils.py +255 -0
lemonade/tools/llamacpp/utils.py +58 -10
lemonade/tools/server/flm.py +137 -0
lemonade/tools/server/llamacpp.py +23 -5
lemonade/tools/server/serve.py +260 -135
lemonade/tools/server/static/js/chat.js +165 -82
lemonade/tools/server/static/js/models.js +87 -54
lemonade/tools/server/static/js/shared.js +5 -3
lemonade/tools/server/static/logs.html +47 -0
lemonade/tools/server/static/styles.css +159 -8
lemonade/tools/server/static/webapp.html +28 -10
lemonade/tools/server/tray.py +94 -38
lemonade/tools/server/utils/macos_tray.py +226 -0
lemonade/tools/server/utils/{system_tray.py → windows_tray.py} +13 -0
lemonade/tools/server/webapp.py +4 -1
lemonade/tools/server/wrapped_server.py +91 -25
lemonade/version.py +1 -1
lemonade_install/install.py +25 -2
{lemonade_sdk-8.1.10.dist-info → lemonade_sdk-8.1.11.dist-info}/METADATA +9 -6
{lemonade_sdk-8.1.10.dist-info → lemonade_sdk-8.1.11.dist-info}/RECORD +30 -25
lemonade_server/cli.py +103 -14
lemonade_server/model_manager.py +186 -45
lemonade_server/pydantic_models.py +25 -1
lemonade_server/server_models.json +162 -62
{lemonade_sdk-8.1.10.dist-info → lemonade_sdk-8.1.11.dist-info}/WHEEL +0 -0
{lemonade_sdk-8.1.10.dist-info → lemonade_sdk-8.1.11.dist-info}/entry_points.txt +0 -0
{lemonade_sdk-8.1.10.dist-info → lemonade_sdk-8.1.11.dist-info}/licenses/LICENSE +0 -0
{lemonade_sdk-8.1.10.dist-info → lemonade_sdk-8.1.11.dist-info}/licenses/NOTICE.md +0 -0
{lemonade_sdk-8.1.10.dist-info → lemonade_sdk-8.1.11.dist-info}/top_level.txt +0 -0

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

@@ -181,7 +181,7 @@ async function loadModelStandardized(modelId, options = {}) {
         // Update load button if provided
         if (loadButton) {
             loadButton.disabled = true;
-            loadButton.textContent = '⌛';
+            loadButton.textContent = '⏳';
         }
         // Update status indicator to show loading state
@@ -246,7 +246,8 @@ async function loadModelStandardized(modelId, options = {}) {
         // Reset load button if provided
         if (loadButton) {
             loadButton.disabled = false;
-            loadButton.textContent = 'Load';
+            loadButton.textContent = '🚀';
+            loadButton.classList.remove('loading');
         }
         // Reset chat controls
@@ -280,7 +281,8 @@ async function loadModelStandardized(modelId, options = {}) {
         // Reset load button if provided
         if (loadButton) {
             loadButton.disabled = false;
-            loadButton.textContent = 'Load';
+            loadButton.textContent = '🚀';
+            loadButton.classList.remove('loading');
         }
         // Reset status indicator on error

lemonade/tools/server/static/logs.html ADDED Viewed

@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Lemonade Server Logs</title>
+    <style>
+        body {
+            font-family: monospace;
+            background: #1e1e1e;
+            color: #d4d4d4;
+            margin: 0;
+            padding: 0;
+        }
+        #log-container {
+            padding: 10px;
+            height: 100vh;
+            overflow-y: auto;
+            white-space: pre-wrap;
+        }
+    </style>
+</head>
+<body>
+    <div id="log-container"></div>
+    <script>
+        function stripAnsi(str) {
+            return str.replace(/\x1B\[[0-9;]*[A-Za-z]/g, '');
+        }
+        const logContainer = document.getElementById("log-container");
+        const ws = new WebSocket(`ws://${location.host}/api/v1/logs/ws`);
+        ws.onmessage = (event) => {
+            const line = document.createElement("div");
+            line.textContent = stripAnsi(event.data);
+            logContainer.appendChild(line);
+            logContainer.scrollTop = logContainer.scrollHeight; // auto scroll
+        };
+        ws.onclose = () => {
+            const msg = document.createElement("div");
+            msg.textContent = "[Disconnected from log stream]";
+            msg.style.color = "red";
+            logContainer.appendChild(msg);
+        };
+    </script>
+</body>
+</html>

lemonade/tools/server/static/styles.css CHANGED Viewed

@@ -99,6 +99,15 @@ body::before {
 .brand-title a {
   color: inherit;
   text-decoration: none;
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+.brand-icon {
+  width: 1.5rem;
+  height: 1.5rem;
+  vertical-align: middle;
 }
 .navbar-links {
@@ -167,6 +176,9 @@ body::before {
   width: 100%;
   margin-left: 1rem;
   margin-right: 1rem;
+  /* Removing only the bottom border and shadow for the content tab gap to look nicer */
+  box-shadow: 0 -2px 8px rgba(0, 0, 0, 0);
+  border-bottom: none;
 }
 .tabs {
@@ -213,14 +225,24 @@ body::before {
   position: relative;
 }
+/* Wrapper for the select element with embedded status light */
+.model-select-wrapper {
+  position: relative;
+  display: flex;
+  align-items: center;
+}
 .status-light {
   width: 8px;
   height: 8px;
   border-radius: 50%;
-  position: relative;
+  position: absolute;
+  left: 8px;
+  top: 50%;
+  transform: translateY(-50%);
   transition: all var(--transition-fast);
   flex-shrink: 0;
-  align-self: center;
+  z-index: 10;
 }
 .status-light::before {
@@ -288,7 +310,7 @@ body::before {
 /* Base styles for the select element */
 .model-select {
-  padding: 0.5rem 0.75rem;
+  padding: 0.5rem 0.75rem 0.5rem 1.5rem;
   border: 1px solid #ddd;
   border-radius: 6px;
   background: #fafafa;
@@ -391,11 +413,18 @@ button:disabled {
   display: flex;
 }
+.tab-content-wrapper {
+   width: 85%;
+}
 .tab-content {
   display: none;
   padding: 2em;
   background: #fafafa;
   border-radius: 0 0 8px 8px;
+  /* adding border and shadow that was removed for the gap look from higher div */
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+  border: 1px solid #e0e0e0;
 }
 .tab-content.active {
@@ -406,7 +435,9 @@ button:disabled {
 .chat-container {
   display: flex;
   flex-direction: column;
-  min-height: 300px;
+  /* Max space available in viewport
+     This also prevents the chat-history section to resize lower than a certain point */
+  min-height: calc(100vh - 550px);
   min-width: 300px;
   max-width: 100%;
   width: 100%;
@@ -414,18 +445,37 @@ button:disabled {
   border: 1px solid #e0e0e0;
   border-radius: 8px;
   background: #fff;
-  resize: both;
-  overflow: auto;
+  /* Use a semi-fixed chat 'window' height so streaming content never expands the page.
+     The chat-history area inside will scroll. The CSS variable allows easy tuning. */
+  --chat-height: 520px;
+  /* Allow vertical resizing by the user while keeping horizontal size fixed.
+     Constrain the resize with min/max heights so it stays usable and doesn't overflow the viewport. */
+  resize: vertical;
+  height: var(--chat-height);
+  max-height: calc(100vh - 120px);
+  overflow: hidden; /* hide overflow at container level; chat-history will scroll */
+}
+/* Responsive fallback: if the viewport height is small, cap the chat window to fit */
+@media (max-height: 700px) {
+  .chat-container {
+    height: calc(100vh - 180px); /* leave space for navbar/footer */
+  }
 }
 .chat-history {
-  flex: 1;
+  /* Make chat history take remaining space in the chat container and scroll when content
+     exceeds this space. This prevents streaming text from expanding the overall layout. */
+  flex: 1 1 auto;
   overflow-y: auto;
+  -webkit-overflow-scrolling: touch;
   padding: 1em;
   border-bottom: 1px solid #e0e0e0;
   display: flex;
   flex-direction: column;
   gap: 0.5em;
+  /* Optional visual hint for scrollable content */
+  scrollbar-width: thin;
 }
 .chat-message {
@@ -1492,6 +1542,11 @@ button:disabled {
     font-size: 1.3rem;
   }
+  .brand-icon {
+    width: 1.3rem;
+    height: 1.3rem;
+  }
   .navbar-links {
     gap: 1.5rem;
     font-size: 1rem;
@@ -1507,6 +1562,11 @@ button:disabled {
     font-size: 1.2rem;
   }
+  .brand-icon {
+    width: 1.2rem;
+    height: 1.2rem;
+  }
   .navbar-links {
     gap: 1rem;
     font-size: 0.9rem;
@@ -1838,6 +1898,53 @@ button:disabled {
   align-items: center;
 }
+/* FastFlowLM notice styles */
+.flm-notice {
+  background: linear-gradient(135deg, #fff3cd 0%, #ffeaa7 100%);
+  border: 1px solid #ffeaa7;
+  border-left: 4px solid #f39c12;
+  border-radius: 8px;
+  margin-bottom: 1.5rem;
+  box-shadow: 0 2px 8px rgba(243, 156, 18, 0.1);
+  animation: fadeIn 0.3s ease;
+}
+.flm-notice-content {
+  display: flex;
+  align-items: flex-start;
+  gap: 0.75rem;
+  padding: 1rem 1.25rem;
+}
+.flm-notice-icon {
+  font-size: 1.2rem;
+  flex-shrink: 0;
+  margin-top: 0.1rem;
+}
+.flm-notice-text {
+  flex: 1;
+  font-size: 0.95rem;
+  line-height: 1.5;
+  color: #856404;
+}
+.flm-notice-text strong {
+  color: #6c5ce7;
+  font-weight: 600;
+}
+.flm-notice-text a {
+  color: var(--info-primary);
+  text-decoration: none;
+  font-weight: 500;
+}
+.flm-notice-text a:hover {
+  text-decoration: underline;
+  color: var(--info-hover);
+}
 .error-banner .close-btn {
   background: none;
   border: none;
@@ -2275,4 +2382,48 @@ button:disabled {
     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);
-}
+}
+/* Dropdown styling */
+.dropdown {
+    position: relative;
+    display: inline-block;
+}
+.dropbtn {
+    background-color: transparent;
+    border: none;
+    font-size: 16px;
+    cursor: pointer;
+}
+.dropdown-content {
+    display: none;
+    position: absolute;
+    right: 0;              /* align to the right edge of the parent */
+    left: auto;            /* prevent left alignment */
+    top: calc(100% + 1px); /* opens 8px below the button */
+    background-color: #ffe76c;
+    border-radius: 8px;
+    min-width: 140px;
+    box-shadow: 0px 8px 16px rgba(0,0,0,0.2);
+    z-index: 1000;
+    overflow: hidden;
+}
+.dropdown-content a {
+    color: black;
+    font-size: 12px;   /* smaller font */
+    padding: 8px 12px;
+    text-decoration: none;
+    display: block;
+}
+.dropdown-content a:hover {
+    background-color: #f6c146;
+}
+.dropdown:hover .dropdown-content {
+    display: block;
+}

lemonade/tools/server/static/webapp.html CHANGED Viewed

@@ -10,12 +10,13 @@
     window.SERVER_PORT = {{SERVER_PORT}};
     </script>
     {{SERVER_MODELS_JS}}
+    {{PLATFORM_JS}}
 </head>
 <body>
     <nav class="navbar" id="navbar">
         <div class="navbar-brand">
-            <span class="brand-title"><a href="https://lemonade-server.ai">🍋 Lemonade Server</a></span>
-        </div>
+            <span class="brand-title"><a href="https://lemonade-server.ai"><img src="/static/favicon.ico" alt="🍋" class="brand-icon"> Lemonade Server</a></span>
+        </div>
         <div class="navbar-links">
             <a href="https://github.com/lemonade-sdk/lemonade" target="_blank">GitHub</a>
             <a href="https://lemonade-server.ai/docs/" target="_blank">Docs</a>
@@ -29,6 +30,7 @@
         <button class="close-btn" onclick="hideErrorBanner()">&times;</button>
     </div>
     <main class="main">
+        <div class="tab-content-wrapper">
         <div class="tab-container">
             <div class="tabs">
                 <div class="tab-group">
@@ -38,23 +40,32 @@
 				</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>
+					<div class="model-select-wrapper">
+						<div class="status-light" id="status-light"></div>
+						<select id="model-select" class="model-select">
+							<option value="">Pick a model</option>
+						</select>
+					</div>
 					<button class="model-action-btn" id="model-unload-btn" title="Unload model" style="display: flex;">⏏</button>
+                    <!-- Dropdown -->
+                    <div class="dropdown">
+                        <button class="dropbtn" aria-label="Dropdown" style="display: flex;">🛠️</button>
+                        <div class="dropdown-content">
+                            <a href="/static/logs.html" target="_blank">View Logs</a>
+                        </div>
+                    </div>
 				</div>
-			</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-history" id="chat-history" style="overflow-y: auto;"></div>
                     <div class="chat-input-row">
                         <div class="input-with-indicator">
                             <textarea id="chat-input" placeholder="Type your message..." rows="1"></textarea>
                         </div>
                         <input type="file" id="file-attachment" style="display: none;" multiple accept="image/*">
                         <button id="attachment-btn" title="Attach files">&#x1F4CE;</button>
-                        <button id="send-btn">Send</button>
+                        <button id="toggle-btn" title="Start">Start</button>
                     </div>
                     <div class="attachments-preview-container" id="attachments-preview-container">
                         <div class="attachments-preview-row" id="attachments-preview-row"></div>
@@ -150,6 +161,7 @@
                                 <div class="subcategory" data-recipe="oga-hybrid" onclick="selectRecipe('oga-hybrid')">OGA Hybrid</div>
                                 <div class="subcategory" data-recipe="oga-npu" onclick="selectRecipe('oga-npu')">OGA NPU</div>
                                 <div class="subcategory" data-recipe="oga-cpu" onclick="selectRecipe('oga-cpu')">OGA CPU</div>
+                                <div class="subcategory" data-recipe="flm" onclick="selectRecipe('flm')">FastFlowLM NPU</div>
                             </div>
                         </div>
                         <div class="model-category-section">
@@ -204,6 +216,7 @@
                                     </label>
                                     <select id="register-recipe" name="recipe" required>
                                         <option value="llamacpp">llamacpp</option>
+                                        <option value="flm">flm</option>
                                         <option value="oga-npu">oga-npu</option>
                                         <option value="oga-hybrid">oga-hybrid</option>
                                         <option value="oga-cpu">oga-cpu</option>
@@ -221,6 +234,11 @@
                                         Reasoning
                                         <span class="tooltip-icon" data-tooltip="Enable to inform Lemonade Server that the model has reasoning capabilities that will use thinking tokens.">ⓘ</span>
                                     </label>
+                                    <label class="register-label reasoning-inline">
+                                        <input type="checkbox" id="register-vision" name="vision">
+                                        Vision
+                                        <span class="tooltip-icon" data-tooltip="Enable to inform Lemonade Server that the model has vision capabilities for processing images.">ⓘ</span>
+                                    </label>
                                 </div>
                                 <div class="register-form-row register-form-row-tight">
                                     <button type="submit" id="register-submit">Install</button>
@@ -231,6 +249,7 @@
                     </div>
                 </div>
             </div>
+            </div>
         </div>
     </main>
     <footer class="site-footer">
@@ -250,4 +269,3 @@
     <script src="/static/js/chat.js"></script>
 </body>
 </html>
-</html>

lemonade/tools/server/tray.py CHANGED Viewed

@@ -7,6 +7,7 @@ import webbrowser
 from pathlib import Path
 import logging
 import tempfile
+import platform
 import requests
 from packaging.version import parse as parse_version
@@ -14,7 +15,20 @@ from packaging.version import parse as parse_version
 from lemonade_server.pydantic_models import DEFAULT_CTX_SIZE
 from lemonade.version import __version__
-from lemonade.tools.server.utils.system_tray import SystemTray, Menu, MenuItem
+# Import the appropriate tray implementation based on platform
+if platform.system() == "Darwin":  # macOS
+    from lemonade.tools.server.utils.macos_tray import (
+        MacOSSystemTray as SystemTray,
+        Menu,
+        MenuItem,
+    )
+else:  # Windows/Linux
+    from lemonade.tools.server.utils.windows_tray import (
+        SystemTray,
+        Menu,
+        MenuItem,
+    )
 class OutputDuplicator:
@@ -87,6 +101,9 @@ class LemonadeTray(SystemTray):
         self.version_check_thread = None
         self.stop_version_check = threading.Event()
+        # Hook function for platform-specific initialization callback
+        self.on_ready = None
     def get_latest_version(self):
         """
         Update the latest version information.
@@ -191,15 +208,38 @@ class LemonadeTray(SystemTray):
         Show the log file in a new window.
         """
         try:
-            subprocess.Popen(
-                [
-                    "powershell",
-                    "Start-Process",
-                    "powershell",
-                    "-ArgumentList",
-                    f'"-NoExit", "Get-Content -Wait {self.log_file}"',
-                ]
-            )
+            system = platform.system().lower()
+            if system == "darwin":
+                # Use Terminal.app to show live logs on macOS
+                try:
+                    subprocess.Popen(
+                        [
+                            "osascript",
+                            "-e",
+                            f'tell application "Terminal" to do script "tail -f {self.log_file}"',
+                        ]
+                    )
+                except (subprocess.CalledProcessError, FileNotFoundError) as e:
+                    self.logger.error(f"Failed to open Terminal for logs: {e}")
+                    self.show_balloon_notification(
+                        "Error",
+                        f"Failed to open logs in Terminal. Log file: {self.log_file}",
+                    )
+            elif system == "windows":
+                # Use PowerShell on Windows
+                subprocess.Popen(
+                    [
+                        "powershell",
+                        "Start-Process",
+                        "powershell",
+                        "-ArgumentList",
+                        f'"-NoExit", "Get-Content -Wait {self.log_file}"',
+                    ]
+                )
+            else:
+                # Unsupported platform
+                self.logger.error(f"Log viewing not supported on platform: {system}")
         except Exception as e:  # pylint: disable=broad-exception-caught
             self.logger.error(f"Error opening logs: {str(e)}")
@@ -228,7 +268,7 @@ class LemonadeTray(SystemTray):
         try:
             response = requests.get(
                 f"http://localhost:{self.port}/api/v0/health",
-                timeout=0.1,  # Add timeout
+                timeout=0.1,
             )
             response.raise_for_status()
             response_data = response.json()
@@ -257,7 +297,9 @@ class LemonadeTray(SystemTray):
         """
         Change the server port and restart the server.
         """
         try:
             # Stop the current server
             if self.server_thread and self.server_thread.is_alive():
                 # Set should_exit flag on the uvicorn server instance
@@ -270,16 +312,17 @@ class LemonadeTray(SystemTray):
             # Update the port in both the tray and the server instance
             self.port = new_port
-            if self.server:
-                self.server.port = new_port
-            # Restart the server
+            # Clear the old server instance to ensure a fresh start
+            # This prevents middleware conflicts when restarting
+            self.server = None
             self.server_thread = threading.Thread(target=self.start_server, daemon=True)
             self.server_thread.start()
-            # Show notification
             self.show_balloon_notification(
-                "Port Changed", f"Lemonade Server is now running on port {self.port}"
+                "Port Changed",
+                f"Lemonade Server is now running on port {self.port}",
             )
         except Exception as e:  # pylint: disable=broad-exception-caught
@@ -539,6 +582,11 @@ class LemonadeTray(SystemTray):
         Start the uvicorn server.
         """
         self.server = self.server_factory()
+        # Ensure the server uses the current port from the tray
+        # This is important when changing ports
+        self.server.port = self.port
         self.server.uvicorn_server = self.server.run_in_thread(self.server.host)
         self.server.uvicorn_server.run()
@@ -547,16 +595,6 @@ class LemonadeTray(SystemTray):
         Run the Lemonade tray application.
         """
-        # Register window class and create window
-        self.register_window_class()
-        self.create_window()
-        # Set up Windows console control handler for CTRL+C
-        self.console_handler = self.setup_console_control_handler(self.logger)
-        # Add tray icon
-        self.add_tray_icon()
         # Start the background model mapping update thread
         self.model_update_thread = threading.Thread(
             target=self.update_downloaded_models_background, daemon=True
@@ -573,17 +611,27 @@ class LemonadeTray(SystemTray):
         self.server_thread = threading.Thread(target=self.start_server, daemon=True)
         self.server_thread.start()
-        # Show initial notification
-        self.show_balloon_notification(
-            "Woohoo!",
-            (
-                "Lemonade Server is running! "
-                "Right-click the tray icon below to access options."
-            ),
-        )
+        # Provide an on_ready hook that Windows base tray will call after
+        # the HWND/icon are created. macOS will call it immediately after run.
+        def _on_ready():
+            system = platform.system().lower()
+            if system == "darwin":
+                message = (
+                    "Lemonade Server is running! "
+                    "Click the tray icon above to access options."
+                )
+            else:  # Windows/Linux
+                message = (
+                    "Lemonade Server is running! "
+                    "Right-click the tray icon below to access options."
+                )
+            self.show_balloon_notification("Woohoo!", message)
-        # Run the message loop in the main thread
-        self.message_loop()
+        # Attach hook for both implementations to invoke after init
+        self.on_ready = _on_ready
+        # Call the parent run method which handles platform-specific initialization
+        super().run()
     def exit_app(self, icon, item):
         """
@@ -598,8 +646,16 @@ class LemonadeTray(SystemTray):
         if self.version_check_thread and self.version_check_thread.is_alive():
             self.version_check_thread.join(timeout=1)
-        # Call parent exit method
-        super().exit_app(icon, item)
+        # Platform-specific exit handling
+        system = platform.system().lower()
+        if system == "darwin":  # macOS
+            # For macOS, quit the rumps application
+            import rumps
+            rumps.quit_application()
+        else:
+            # Call parent exit method for Windows
+            super().exit_app(icon, item)
         # Stop the server using the CLI stop command to ensure a rigorous cleanup
         # This must be a subprocess to ensure the cleanup doesnt kill itself

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

Potentially problematic release.

lemonade-sdk 8.1.10py3-none-any.whl → 8.1.11py3-none-any.whl