more-compute 0.3.3__tar.gz → 0.4.1__tar.gz

{more_compute-0.3.3 → more_compute-0.4.1}/MANIFEST.in

@@ -1,5 +1,9 @@
 include README.md
+include LICENSE
 recursive-include morecompute/static *
 recursive-include frontend *
 prune frontend/node_modules
 prune frontend/.next
+global-exclude .DS_Store
+global-exclude *.pyc
+global-exclude __pycache__

{more_compute-0.3.3/more_compute.egg-info → more_compute-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: more-compute
-Version: 0.3.3
+Version: 0.4.1
 Summary: An interactive notebook environment for local and GPU computing
 Home-page: https://github.com/DannyMang/MORECOMPUTE
 Author: MoreCompute Team
@@ -15,12 +15,10 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: fastapi>=0.104.0
@@ -41,22 +39,20 @@ Dynamic: requires-python
 # more-compute
 
 [![PyPI version](https://badge.fury.io/py/more-compute.svg)](https://pypi.org/project/more-compute/)
-[![Python 3.8+](https://img.shields.io/badge/python-3.8+-blue.svg)](https://www.python.org/downloads/)
+[![Python 3.10+](https://img.shields.io/badge/python-3.10+-blue.svg)](https://www.python.org/downloads/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 
-An interactive notebook environment, similar to Marimo and Google Colab, that runs locally. It works with standard `.ipynb` files, similar to Jupyter Lab but more awesome.
-
-
+An interactive Python notebook environment, similar to Marimo and Google Colab, that runs locally.
 
 
 https://github.com/user-attachments/assets/8c7ec716-dade-4de2-ad37-71d328129c97
 
 
-
-
 ## Installation
 
-**Prerequisites:** [Node.js](https://nodejs.org/) >= 20.10.0 required for web interface
+**Prerequisites:**
+- [Node.js](https://nodejs.org/) >= 20.10.0 required for web interface
+- Python >= 3.10 (uv installs this automatically, pip users need to install manually)
 
 ### Using uv (Recommended)
 
@@ -83,40 +79,46 @@ pip install more-compute
 ## Usage
 
 ```bash
-more-compute notebook.ipynb  # Open existing notebook
-more-compute                 # Create and open new notebook
+more-compute notebook.py     # Open existing notebook
+more-compute new             # Create new notebook
 more-compute --debug         # Show logs
 ```
 
-Opens automatically at http://localhost:8000
+Opens automatically at http://localhost:3141
 
-## Troubleshooting
+### Converting Between Formats
 
-**Command not found:**
-```bash
-uv tool update-shell  # Fixes PATH automatically
-```
+MoreCompute uses `.py` notebooks with `# %%` cell markers, but you can convert to/from `.ipynb`:
 
-**Manual PATH fix (macOS/Linux):**
+**From .ipynb to .py:**
 ```bash
-echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.bashrc
-source ~/.bashrc
-```
+# Auto-detect output name (notebook.ipynb -> notebook.py)
+more-compute convert notebook.ipynb
 
-**Manual PATH fix (Windows):**
-```powershell
-$pythonScripts = python -c "import site; print(site.USER_BASE)"
-$userPath = [Environment]::GetEnvironmentVariable("Path", "User")
-[Environment]::SetEnvironmentVariable("Path", "$userPath;$pythonScripts\Scripts", "User")
-# Restart PowerShell
+# Or specify output
+more-compute convert notebook.ipynb -o my_notebook.py
+
+# Then open in MoreCompute
+more-compute my_notebook.py
 ```
 
-**Port in use:**
+The converter automatically extracts dependencies from `!pip install` commands and adds UV inline script metadata.
+
+**From .py to .ipynb:**
 ```bash
-export MORECOMPUTE_PORT=8080  # macOS/Linux
-$env:MORECOMPUTE_PORT = "8080"  # Windows
+# Auto-detect output name (notebook.py -> notebook.ipynb)
+more-compute convert notebook.py
+
+# Or specify output
+more-compute convert notebook.py -o colab_notebook.ipynb
 ```
 
+This makes your notebooks compatible with Google Colab, Jupyter, and other tools that require `.ipynb` format.
+
+## Troubleshooting
+
+will add things here as things progress...
+
 ## Development
 
 ```bash
@@ -125,7 +127,7 @@ cd MORECOMPUTE
 uv venv && source .venv/bin/activate
 uv pip install -e .
 cd frontend && npm install && cd ..
-python kernel_run.py notebook.ipynb
+more-compute notebook.py
 ```
 
 ## License

more_compute-0.4.1/README.md

@@ -0,0 +1,97 @@
+# more-compute
+
+[![PyPI version](https://badge.fury.io/py/more-compute.svg)](https://pypi.org/project/more-compute/)
+[![Python 3.10+](https://img.shields.io/badge/python-3.10+-blue.svg)](https://www.python.org/downloads/)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
+
+An interactive Python notebook environment, similar to Marimo and Google Colab, that runs locally.
+
+
+https://github.com/user-attachments/assets/8c7ec716-dade-4de2-ad37-71d328129c97
+
+
+## Installation
+
+**Prerequisites:**
+- [Node.js](https://nodejs.org/) >= 20.10.0 required for web interface
+- Python >= 3.10 (uv installs this automatically, pip users need to install manually)
+
+### Using uv (Recommended)
+
+```bash
+# macOS/Linux
+curl -LsSf https://astral.sh/uv/install.sh | sh
+uv tool install more-compute
+
+# Windows
+powershell -c "irm https://astral.sh/uv/install.ps1 | iex"
+uv tool install more-compute
+```
+
+### Using pip
+
+```bash
+pip install more-compute
+
+# Add to PATH if needed:
+# macOS/Linux: echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.bashrc
+# Windows: See troubleshooting below
+```
+
+## Usage
+
+```bash
+more-compute notebook.py     # Open existing notebook
+more-compute new             # Create new notebook
+more-compute --debug         # Show logs
+```
+
+Opens automatically at http://localhost:3141
+
+### Converting Between Formats
+
+MoreCompute uses `.py` notebooks with `# %%` cell markers, but you can convert to/from `.ipynb`:
+
+**From .ipynb to .py:**
+```bash
+# Auto-detect output name (notebook.ipynb -> notebook.py)
+more-compute convert notebook.ipynb
+
+# Or specify output
+more-compute convert notebook.ipynb -o my_notebook.py
+
+# Then open in MoreCompute
+more-compute my_notebook.py
+```
+
+The converter automatically extracts dependencies from `!pip install` commands and adds UV inline script metadata.
+
+**From .py to .ipynb:**
+```bash
+# Auto-detect output name (notebook.py -> notebook.ipynb)
+more-compute convert notebook.py
+
+# Or specify output
+more-compute convert notebook.py -o colab_notebook.ipynb
+```
+
+This makes your notebooks compatible with Google Colab, Jupyter, and other tools that require `.ipynb` format.
+
+## Troubleshooting
+
+will add things here as things progress...
+
+## Development
+
+```bash
+git clone https://github.com/DannyMang/MORECOMPUTE.git
+cd MORECOMPUTE
+uv venv && source .venv/bin/activate
+uv pip install -e .
+cd frontend && npm install && cd ..
+more-compute notebook.py
+```
+
+## License
+
+MIT - see [LICENSE](LICENSE)

{more_compute-0.3.3 → more_compute-0.4.1}/frontend/app/globals.css

@@ -643,7 +643,8 @@ body {
 }
 
 .markdown-rendered code {
-    background: #f3f4f6;
+    background: var(--mc-secondary);
+    color: var(--mc-text-color);
     padding: 2px 4px;
     border-radius: 3px;
     font-family: 'Fira', 'SF Mono', Monaco, 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
@@ -651,7 +652,7 @@ body {
 }
 
 .markdown-rendered pre {
-    background: #f9fafb;
+    background: var(--mc-secondary);
     padding: 12px;
     border-radius: 6px;
     margin: 12px 0;
@@ -665,7 +666,7 @@ body {
 }
 
 .markdown-rendered blockquote {
-    border-left: 3px solid #d1d5db;
+    border-left: 3px solid var(--mc-border);
     padding-left: 12px;
     margin: 12px 0;
     color: var(--mc-markdown-paragraph-color);
@@ -684,7 +685,7 @@ body {
 }
 
 .markdown-rendered .empty-markdown {
-    color: #9ca3af;
+    color: var(--mc-line-number-color);
     font-style: italic;
 }
 
@@ -697,19 +698,20 @@ body {
     flex-direction: column;
     align-items: center;
     font-size: 11px;
-    color: #6b7280;
+    color: var(--mc-line-number-color);
     width: 30px;
 }
 
 .execution-count {
     font-family: 'Fira', 'SF Mono', Monaco, 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
     font-size: 10px;
-    color: #9ca3af;
+    color: var(--mc-line-number-color);
 }
 
 .execution-time {
     font-size: 9px;
-    color: #d1d5db;
+    color: var(--mc-line-number-color);
+    opacity: 0.7;
     margin-top: 2px;
 }
 

{more_compute-0.3.3 → more_compute-0.4.1}/frontend/app/layout.tsx

@@ -8,6 +8,7 @@ import PackagesPopup from "@/components/popups/PackagesPopup";
 import ComputePopup from "@/components/popups/ComputePopup";
 import MetricsPopup from "@/components/popups/MetricsPopup";
 import SettingsPopup from "@/components/popups/SettingsPopup";
+import ConfirmModal from "@/components/modals/ConfirmModal";
 import { ConnectionBanner } from "@/components/layout/ConnectionBanner";
 import {
   PodWebSocketProvider,
@@ -22,6 +23,7 @@ const POLL_MS = 3000;
 function AppContent({ children }: { children: React.ReactNode }) {
   const [appSettings, setAppSettings] = useState<NotebookSettings>(() => loadSettings());
   const [activePopup, setActivePopup] = useState<string | null>(null);
+  const [showRestartModal, setShowRestartModal] = useState(false);
   const { connectionState, gpuPods, connectingPodId } = usePodWebSocket();
 
   // Persistent metrics collection
@@ -84,6 +86,15 @@ function AppContent({ children }: { children: React.ReactNode }) {
     setActivePopup(null);
   };
 
+  const handleRestartKernel = () => {
+    // Send reset kernel command via WebSocket
+    const ws = new WebSocket('ws://127.0.0.1:3141/ws');
+    ws.onopen = () => {
+      ws.send(JSON.stringify({ type: 'reset_kernel' }));
+      setTimeout(() => ws.close(), 100);
+    };
+  };
+
   const renderPopup = () => {
     if (!activePopup) return null;
 
@@ -176,7 +187,28 @@ function AppContent({ children }: { children: React.ReactNode }) {
               id="kernel-status-dot"
               className="status-dot connecting"
             ></span>
-            <span id="kernel-status-text" className="status-text">
+            <span
+              id="kernel-status-text"
+              className="status-text"
+              data-original-text="Connecting..."
+              style={{
+                cursor: 'pointer',
+                transition: 'all 0.15s ease',
+              }}
+              onMouseEnter={(e) => {
+                const originalText = e.currentTarget.textContent || '';
+                e.currentTarget.setAttribute('data-original-text', originalText);
+                e.currentTarget.textContent = 'Restart Kernel';
+                e.currentTarget.style.color = 'var(--mc-primary)';
+              }}
+              onMouseLeave={(e) => {
+                const originalText = e.currentTarget.getAttribute('data-original-text') || 'Connecting...';
+                e.currentTarget.textContent = originalText;
+                e.currentTarget.style.color = '';
+              }}
+              onClick={() => setShowRestartModal(true)}
+              title="Click to restart kernel"
+            >
               Connecting...
             </span>
           </div>
@@ -197,6 +229,16 @@ function AppContent({ children }: { children: React.ReactNode }) {
           />
         </div>
       </div>
+      <ConfirmModal
+        isOpen={showRestartModal}
+        onClose={() => setShowRestartModal(false)}
+        onConfirm={handleRestartKernel}
+        title="Restart Kernel"
+        message="Are you sure you want to restart the kernel? All variables will be lost."
+        confirmLabel="Restart"
+        cancelLabel="Cancel"
+        isDangerous={true}
+      />
     </>
   );
 }

{more_compute-0.3.3 → more_compute-0.4.1}/frontend/components/Notebook.tsx

@@ -276,10 +276,18 @@ function notebookReducer(
     case "EXECUTION_COMPLETE": {
       const payload = action.payload || {};
       const cell_index = payload.cell_index;
+
+      console.log(`[EXECUTION_COMPLETE] Processing completion for cell ${cell_index}`, payload);
+
       // Support both shapes: { result: {...} } and flat payload {...}
       const result = payload && payload.result ? payload.result : payload || {};
+
+      console.log(`[EXECUTION_COMPLETE] result.status=${result.status}, result.error=`, result.error);
+
+      // ALWAYS remove cell from executingCells when completion arrives
       const newExecuting = new Set(state.executingCells);
       newExecuting.delete(cell_index);
+
       return {
         ...state,
         executingCells: newExecuting,
@@ -310,8 +318,13 @@ function notebookReducer(
 
     case "EXECUTION_ERROR": {
       const { cell_index, error } = action.payload;
+
+      console.log(`[EXECUTION_ERROR] Processing error for cell ${cell_index}`);
+
+      // ALWAYS remove cell from executingCells when error arrives
       const newExecuting = new Set(state.executingCells);
       newExecuting.delete(cell_index);
+
       const normalizedError = normalizeError(error);
       return {
         ...state,
@@ -348,6 +361,8 @@ function notebookReducer(
           ...cell,
           outputs: [],
           execution_count: null,
+          execution_time: null,
+          error: null,
         })),
       };
 
@@ -435,6 +450,10 @@ export const Notebook: React.FC<NotebookProps> = ({
     dispatch({ type: "NOTEBOOK_UPDATED", payload: data });
   }, []);
 
+  const handleKernelRestarted = useCallback(() => {
+    dispatch({ type: "RESET_KERNEL" });
+  }, []);
+
   const handleHeartbeat = useCallback((data: any) => {
     // Heartbeat received - execution still in progress
     // Cell spinner already showing via executingCells set
@@ -473,7 +492,7 @@ export const Notebook: React.FC<NotebookProps> = ({
     wsRef.current = ws;
     handleKernelStatusUpdate("connecting");
 
-    ws.connect("ws://127.0.0.1:8000/ws")
+    ws.connect("ws://127.0.0.1:3141/ws")
       .then(() => {
         ws.loadNotebook(notebookName || "default");
       })
@@ -486,6 +505,7 @@ export const Notebook: React.FC<NotebookProps> = ({
     ws.on("disconnect", () => handleKernelStatusUpdate("disconnected"));
     ws.on("notebook_loaded", handleNotebookLoaded);
     ws.on("notebook_updated", handleNotebookUpdate);
+    ws.on("kernel_restarted", handleKernelRestarted);
     ws.on("execution_start", handleExecutionStart);
     ws.on("stream_output", handleStreamOutput);
     ws.on("execution_complete", handleExecutionComplete);
@@ -499,6 +519,7 @@ export const Notebook: React.FC<NotebookProps> = ({
     handleKernelStatusUpdate,
     handleNotebookLoaded,
     handleNotebookUpdate,
+    handleKernelRestarted,
     handleExecutionStart,
     handleStreamOutput,
     handleExecuteResult,

{more_compute-0.3.3 → more_compute-0.4.1}/frontend/components/cell/CellButton.tsx

@@ -22,7 +22,8 @@ export const CellButton: React.FC<CellButtonProps> = ({
   const [isHovered, setIsHovered] = useState(false);
 
   const handleClick = (e: React.MouseEvent) => {
-    if (onClick && !disabled && !isLoading) {
+    if (onClick && !disabled) {
+      // Allow clicks even when loading (for stop/interrupt functionality)
       onClick(e);
     }
   };
@@ -34,7 +35,7 @@ export const CellButton: React.FC<CellButtonProps> = ({
       onClick={handleClick}
       onMouseEnter={() => setIsHovered(true)}
       onMouseLeave={() => setIsHovered(false)}
-      disabled={disabled || isLoading}
+      disabled={disabled}
       title={title}
       style={{
         width: '28px',
@@ -45,9 +46,9 @@ export const CellButton: React.FC<CellButtonProps> = ({
         display: 'flex',
         alignItems: 'center',
         justifyContent: 'center',
-        cursor: disabled || isLoading ? 'not-allowed' : 'pointer',
+        cursor: disabled ? 'not-allowed' : 'pointer',
         transition: 'background-color 0.15s ease',
-        opacity: disabled ? 0.5 : 1
+        opacity: disabled ? 0.5 : isLoading ? 0.8 : 1
       }}
     >
       {icon}

{more_compute-0.3.3 → more_compute-0.4.1}/frontend/components/cell/MonacoCell.tsx

@@ -12,6 +12,7 @@ import {
   UpdateIcon,
   LinkBreak2Icon,
   PlayIcon,
+  StopIcon,
   ChevronUpIcon,
   ChevronDownIcon,
 } from "@radix-ui/react-icons";
@@ -269,13 +270,13 @@ export const MonacoCell: React.FC<CellProps> = ({
       onExecute(indexRef.current);
       setIsEditing(false);
     } else {
-      if (isExecuting) {
-        onInterrupt(indexRef.current);
-      } else {
-        onExecute(indexRef.current);
-      }
+      onExecute(indexRef.current);
     }
-  }, [cell.cell_type, isExecuting, onExecute, onInterrupt]);
+  }, [cell.cell_type, onExecute]);
+
+  const handleInterrupt = useCallback(() => {
+    onInterrupt(indexRef.current);
+  }, [onInterrupt]);
 
   const handleCellClick = () => {
     onSetActive(indexRef.current);
@@ -583,15 +584,26 @@ export const MonacoCell: React.FC<CellProps> = ({
         <div className="cell-hover-controls">
           <div className="cell-actions-right">
             {!isMarkdownWithContent && (
-              <CellButton
-                icon={<PlayIcon className="w-6 h-6" />}
-                onClick={(e) => {
-                  e.stopPropagation();
-                  handleExecute();
-                }}
-                title={isExecuting ? "Stop execution" : "Run cell"}
-                isLoading={isExecuting}
-              />
+              <>
+                <CellButton
+                  icon={<PlayIcon className="w-6 h-6" />}
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    handleExecute();
+                  }}
+                  title="Run cell"
+                  disabled={isExecuting}
+                />
+                <CellButton
+                  icon={<StopIcon className="w-6 h-6" />}
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    handleInterrupt();
+                  }}
+                  title="Stop execution"
+                  disabled={!isExecuting}
+                />
+              </>
             )}
             <CellButton
               icon={<ChevronUpIcon className="w-6 h-6" />}
@@ -599,8 +611,8 @@ export const MonacoCell: React.FC<CellProps> = ({
                 e.stopPropagation();
                 onMoveUp(indexRef.current);
               }}
-              title="Move cell up"
-              disabled={index === 0}
+              title={isExecuting ? "Cannot move while executing" : "Move cell up"}
+              disabled={isExecuting || index === 0}
             />
             <CellButton
               icon={<ChevronDownIcon className="w-6 h-6" />}
@@ -608,16 +620,25 @@ export const MonacoCell: React.FC<CellProps> = ({
                 e.stopPropagation();
                 onMoveDown(indexRef.current);
               }}
-              title="Move cell down"
-              disabled={index === totalCells - 1}
+              title={isExecuting ? "Cannot move while executing" : "Move cell down"}
+              disabled={isExecuting || index === totalCells - 1}
             />
             <CellButton
               icon={<LinkBreak2Icon className="w-5 h-5" />}
               onClick={(e) => {
                 e.stopPropagation();
-                onDelete(indexRef.current);
+                // If cell is executing, interrupt it first
+                if (isExecuting) {
+                  onInterrupt(indexRef.current);
+                  // Wait a bit for interrupt to complete, then delete
+                  setTimeout(() => {
+                    onDelete(indexRef.current);
+                  }, 500);
+                } else {
+                  onDelete(indexRef.current);
+                }
               }}
-              title="Delete cell"
+              title={isExecuting ? "Stop and delete cell" : "Delete cell"}
             />
           </div>
         </div>

{more_compute-0.3.3 → more_compute-0.4.1}/frontend/components/output/ErrorDisplay.tsx

@@ -165,7 +165,20 @@ const TypedErrorDisplay: FC<{ error: ErrorOutput }> = ({ error }) => {
             margin: 0
           }}
         >
-          {error.traceback?.join('\n') || ''}
+          {/* Always show error name and message */}
+          {error.ename && (
+            <div style={{ fontWeight: 600, marginBottom: '4px' }}>
+              {error.ename}: {error.evalue}
+            </div>
+          )}
+          {/* Show traceback if available */}
+          {error.traceback && error.traceback.length > 0 && (
+            <div>{error.traceback.join('\n')}</div>
+          )}
+          {/* Fallback if no traceback */}
+          {(!error.traceback || error.traceback.length === 0) && !error.ename && (
+            <div>An unknown error occurred</div>
+          )}
         </div>
       </div>
     </div>

{more_compute-0.3.3 → more_compute-0.4.1}/frontend/contexts/PodWebSocketContext.tsx

@@ -95,7 +95,7 @@ export const PodWebSocketProvider: React.FC<PodWebSocketProviderProps> = ({ chil
       wsRef.current = null;
     }
 
-    const wsUrl = 'ws://127.0.0.1:8000/ws';
+    const wsUrl = 'ws://127.0.0.1:3141/ws';
     const ws = new WebSocket(wsUrl);
 
     ws.onopen = () => {

{more_compute-0.3.3 → more_compute-0.4.1}/frontend/lib/websocket.ts

@@ -53,12 +53,12 @@ export class WebSocketService {
     };
   }
 
-  connect(url: string = 'ws://localhost:8000'): Promise<void> {
+  connect(url: string = 'ws://localhost:3141'): Promise<void> {
     return new Promise((resolve, reject) => {
       // For development, connect directly to the backend WebSocket
       const wsUrl = process.env.NODE_ENV === 'production'
         ? '/ws'
-        : 'ws://localhost:8000/ws';
+        : 'ws://localhost:3141/ws';
 
       // Use native WebSocket for FastAPI compatibility
       const ws = new WebSocket(wsUrl);

{more_compute-0.3.3 → more_compute-0.4.1}/frontend/next.config.mjs

@@ -4,11 +4,11 @@ const nextConfig = {
     return [
       {
         source: '/ws/:path*',
-        destination: 'http://localhost:8000/ws/:path*',
+        destination: 'http://localhost:3141/ws/:path*',
       },
       {
         source: '/api/:path*',
-        destination: 'http://localhost:8000/api/:path*',
+        destination: 'http://localhost:3141/api/:path*',
       },
     ];
   },