Spaces:

AEUPH
/

NeuralOS-Hypervisor

Sleeping

App Files Files Community

AEUPH commited on Jan 23

Commit

79c30ac

verified ·

1 Parent(s): 8431283

Update Dockerfile

Browse files

Files changed (1) hide show

Dockerfile +92 -88

Dockerfile CHANGED Viewed

@@ -4,12 +4,18 @@ FROM python:3.10-slim
 # Set working directory
 WORKDIR /app
-# 1. Install System Dependencies
-# 'git' is often needed by Diffusers/Transformers to load models
-RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/*
-# 2. Install Python Dependencies
-# We include 'accelerate' and 'transformers' which are required by 'diffusers'
 RUN pip install --no-cache-dir \
     torch \
     flask \
@@ -20,49 +26,27 @@ RUN pip install --no-cache-dir \
     safetensors \
     scipy
-# 3. Create a non-root user (Required for Hugging Face Spaces)
 RUN useradd -m -u 1000 user
 USER user
 ENV HOME=/home/user \
     PATH=/home/user/.local/bin:$PATH
-# 4. Write the Monolith Application to disk
-# We use 'COPY <<'EOF' app.py' to preserve all special characters, quotes, and backslashes exactly.
 COPY --chown=user <<'EOF' app.py
 import sys
 import os
-import subprocess
 import time
 # ============================================================================
-# 1. PORTABLE ENVIRONMENT SELF-CORRECTION (Legacy Support)
-# ============================================================================
-def ensure_portable_env():
-    """
-    Checks if a local 'py312' folder exists.
-    If yes, and we aren't running from it, RESTART script using that Python.
-    """
-    base_dir = os.path.dirname(os.path.abspath(__file__))
-    portable_python = os.path.join(base_dir, "py312", "python.exe")
-    if os.path.exists(portable_python):
-        current_exe = os.path.normpath(sys.executable).lower()
-        target_exe = os.path.normpath(portable_python).lower()
-        if current_exe != target_exe:
-            print(f"[*] SWITCHING TO PORTABLE KERNEL: {portable_python}")
-            args = [portable_python, __file__] + sys.argv[1:]
-            subprocess.call(args)
-            sys.exit(0)
-    else:
-        print(f"[*] Portable 'py312' not found. Using system Python: {sys.executable}")
-ensure_portable_env()
-# ============================================================================
-# 2. DEPENDENCY CHECK & IMPORTS
 # ============================================================================
-print(f"[*] NeuralOS Monolith Bootloader v9.2 (Running in: {sys.executable})")
 try:
     import torch
@@ -75,7 +59,7 @@ except ImportError as e:
     sys.exit(1)
 # ============================================================================
-# 3. EMBEDDED GUI
 # ============================================================================
 HTML_TEMPLATE = """
@@ -83,6 +67,7 @@ HTML_TEMPLATE = """
 <html lang="en">
 <head>
     <meta charset="UTF-8">
     <title>NeuralOS | Monolith</title>
     <style>
         @import url('https://fonts.googleapis.com/css2?family=VT323&display=swap');
@@ -90,29 +75,43 @@ HTML_TEMPLATE = """
         body {
             background: #050505;
             margin: 0;
             overflow: hidden;
             display: flex;
             justify-content: center;
             align-items: center;
-            height: 100vh;
             font-family: 'VT323', monospace;
         }
         .monitor-case {
             background: #1a1a1a;
-            padding: 20px;
-            border-radius: 20px;
-            box-shadow: 0 0 0 5px #222, 0 0 50px rgba(0,0,0,0.8), inset 0 0 20px rgba(0,0,0,0.5);
             position: relative;
         }
         .screen-container {
-            width: 1024px;
-            height: 1024px;
             position: relative;
             background: #000;
             overflow: hidden;
-            border-radius: 4px;
         }
         .crt-overlay {
@@ -138,43 +137,47 @@ HTML_TEMPLATE = """
         @keyframes scanline { 0% { bottom: 100%; } 100% { bottom: -100px; } }
         #display {
             width: 100%;
             height: 100%;
             object-fit: contain;
-            image-rendering: pixelated;
         }
         .controls {
-            position: absolute;
-            bottom: -60px;
-            right: 20px;
             display: flex;
-            gap: 10px;
         }
         .pwr-btn {
             background: #333;
             color: #0f0;
-            border: 2px solid #222;
-            padding: 10px 20px;
             font-family: 'VT323';
             cursor: pointer;
             text-transform: uppercase;
-            box-shadow: 0 4px 0 #111;
         }
-        .pwr-btn:active { transform: translateY(4px); box-shadow: none; }
         .led {
-            width: 8px;
-            height: 8px;
             border-radius: 50%;
             background: #111;
-            margin-top: 15px;
-            box-shadow: 0 0 2px #000;
         }
-        .led.on { background: #0f0; box-shadow: 0 0 5px #0f0; }
-        .led.busy { background: #f00; box-shadow: 0 0 5px #f00; animation: blink 0.1s infinite; }
         @keyframes blink { 0% { opacity: 0.5; } 100% { opacity: 1; } }
     </style>
 </head>
@@ -183,12 +186,12 @@ HTML_TEMPLATE = """
         <div class="screen-container">
             <div class="crt-overlay"></div>
             <div class="scanline"></div>
-            <img id="display" src="" alt="AWAITING NEURAL SIGNAL..." />
         </div>
         <div class="controls">
             <div class="led on"></div>
             <div id="hdd-led" class="led"></div>
-            <button class="pwr-btn" onclick="location.reload()">HARD RESET</button>
         </div>
     </div>
     <script>
@@ -214,7 +217,9 @@ HTML_TEMPLATE = """
         display.addEventListener('mousedown', (e) => {
             if (!ws) return;
             const rect = display.getBoundingClientRect();
             const x = Math.floor(((e.clientX - rect.left) / rect.width) * 128);
             const y = Math.floor(((e.clientY - rect.top) / rect.height) * 128);
             ws.send(JSON.stringify({ type: 'click', x: x, y: y }));
@@ -235,15 +240,9 @@ HTML_TEMPLATE = """
 """
 # ============================================================================
-# 4. KERNEL & HARDWARE
 # ============================================================================
-from dataclasses import dataclass, field
-from typing import Dict, List
-import io
-import json
-import base64
 DRIVERS = {
     "TITLE_BAR": torch.zeros((1, 4, 4, 32), dtype=torch.float16),
     "CLOSE_BTN": torch.zeros((1, 4, 4, 4), dtype=torch.float16),
@@ -325,11 +324,11 @@ class OSKernel:
         buf = []
         if app_type == "cmd":
-            buf = ["NEURAL OS [Version 9.2]", "(C) Monolith Corp", "", f"{self.current_dir}>"]
         elif app_type == "notepad":
             buf = ["_"]
         elif app_type == "doom":
-            buf = ["[INIT] LOADING TEXTURES...", "[INIT] CONNECTING NEURAL NET..."]
         self.processes[pid] = Process(
             pid, app.name, app_type, (x, y), app.default_size,
@@ -401,19 +400,24 @@ class OSKernel:
         return out
 # ============================================================================
-# 5. SERVER
 # ============================================================================
 app = Flask(__name__)
 sock = Sock(app)
 pipe = None
 kernel = OSKernel()
 def init_ai():
     global pipe
     print("[*] Loading Neural Graphics Pipeline...")
-    # AUTO-DETECT DEVICE
     if torch.cuda.is_available():
         device = "cuda"
         dtype = torch.float16
@@ -455,30 +459,35 @@ def render_frame(k_obj):
     else:
         pil_img = Image.new('RGB', (128, 128), (0,0,0))
     pil_img = pil_img.resize((1024, 1024), resample=Image.NEAREST)
     draw = ImageDraw.Draw(pil_img)
-    font = ImageFont.load_default()
     if k_obj.system_state == "BOOT":
         y = 50
         for log in k_obj.boot_log:
-            draw.text((50, y), log, fill=(0, 255, 0), font=font)
-            y += 20
     scale = 8
     for p in k_obj.processes.values():
         wx, wy = p.position
-        cx = (wx * scale) + 10
-        cy = (wy * scale) + 30
-        draw.text(((wx*scale)+5, (wy*scale)+5), p.name, fill=(255,255,255), font=font)
         if p.text_buffer:
-            for i, line in enumerate(p.text_buffer[-20:]):
                 col = (0, 255, 0) if p.app_type == "cmd" else (0,0,0)
                 if p.app_type == "doom": col = (255, 50, 50)
-                draw.text((cx, cy + (i*15)), line, fill=col, font=font)
     buf = io.BytesIO()
-    pil_img.save(buf, format="JPEG", quality=85)
     return base64.b64encode(buf.getvalue()).decode()
 @app.route('/')
@@ -546,14 +555,9 @@ def websocket_kernel(ws):
             break
 if __name__ == "__main__":
-    print("="*50)
-    print("  NEURAL OS MONOLITH v9.2")
-    print("  http://0.0.0.0:7860")
-    print("="*50)
-    # Updated to port 7860 for Hugging Face
     app.run(host="0.0.0.0", port=7860, threaded=True)
 EOF
-# 5. Launch the Monolith
 EXPOSE 7860
 CMD ["python", "app.py"]

 # Set working directory
 WORKDIR /app
+# 1. Install System Dependencies & Fonts
+# We add 'curl' to download the font and 'git' for diffusers compatibility.
+RUN apt-get update && apt-get install -y \
+    git \
+    curl \
+    && rm -rf /var/lib/apt/lists/*
+# 2. Download Retro Font (VT323) for Python PIL
+# This fixes the "text too small" issue by allowing us to load a specific large font size.
+RUN curl -L -o /app/VT323.ttf https://github.com/google/fonts/raw/main/ofl/vt323/VT323-Regular.ttf
+# 3. Install Python Dependencies
 RUN pip install --no-cache-dir \
     torch \
     flask \
     safetensors \
     scipy
+# 4. Create a non-root user (Required for Hugging Face Spaces)
 RUN useradd -m -u 1000 user
 USER user
 ENV HOME=/home/user \
     PATH=/home/user/.local/bin:$PATH
+# 5. Write the Monolith Application to disk
 COPY --chown=user <<'EOF' app.py
 import sys
 import os
 import time
+import io
+import json
+import base64
+from dataclasses import dataclass, field
+from typing import Dict, List
 # ============================================================================
+# 1. DEPENDENCY CHECK & IMPORTS
 # ============================================================================
+print(f"[*] NeuralOS Monolith v9.3 OPTIMIZED (Running in: {sys.executable})")
 try:
     import torch
     sys.exit(1)
 # ============================================================================
+# 2. OPTIMIZED EMBEDDED GUI (Responsive & High-DPI Ready)
 # ============================================================================
 HTML_TEMPLATE = """
 <html lang="en">
 <head>
     <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
     <title>NeuralOS | Monolith</title>
     <style>
         @import url('https://fonts.googleapis.com/css2?family=VT323&display=swap');
         body {
             background: #050505;
             margin: 0;
+            padding: 0;
+            width: 100vw;
+            height: 100vh;
             overflow: hidden;
             display: flex;
             justify-content: center;
             align-items: center;
             font-family: 'VT323', monospace;
         }
+        /* Responsive Monitor Case */
         .monitor-case {
             background: #1a1a1a;
+            padding: 1.5vmin; /* Responsive padding */
+            border-radius: 1vmin;
+            box-shadow: 0 0 0 0.4vmin #222, 0 0 4vmin rgba(0,0,0,0.8), inset 0 0 2vmin rgba(0,0,0,0.5);
             position: relative;
+            /* Responsive Sizing Logic */
+            width: auto;
+            height: auto;
+            max-width: 95vw;
+            max-height: 90vh;
+            aspect-ratio: 1 / 1; /* Force Square Aspect Ratio */
+            display: flex;
+            flex-direction: column;
         }
         .screen-container {
+            width: 100%;
+            height: 100%;
             position: relative;
             background: #000;
             overflow: hidden;
+            border-radius: 0.5vmin;
+            flex-grow: 1;
         }
         .crt-overlay {
         @keyframes scanline { 0% { bottom: 100%; } 100% { bottom: -100px; } }
+        /* KEY FIX: Ensure pixel art stays sharp when scaled down */
         #display {
             width: 100%;
             height: 100%;
             object-fit: contain;
+            image-rendering: pixelated;
+            image-rendering: crisp-edges;
+            display: block;
         }
         .controls {
             display: flex;
+            justify-content: flex-end;
+            align-items: center;
+            gap: 1vmin;
+            padding-top: 1vmin;
+            height: 4vmin;
         }
         .pwr-btn {
             background: #333;
             color: #0f0;
+            border: 0.2vmin solid #222;
+            padding: 0.5vmin 1.5vmin;
             font-family: 'VT323';
+            font-size: 2vmin;
             cursor: pointer;
             text-transform: uppercase;
+            box-shadow: 0 0.4vmin 0 #111;
         }
+        .pwr-btn:active { transform: translateY(0.4vmin); box-shadow: none; }
         .led {
+            width: 1.5vmin;
+            height: 1.5vmin;
             border-radius: 50%;
             background: #111;
+            box-shadow: 0 0 0.2vmin #000;
         }
+        .led.on { background: #0f0; box-shadow: 0 0 0.5vmin #0f0; }
+        .led.busy { background: #f00; box-shadow: 0 0 0.5vmin #f00; animation: blink 0.1s infinite; }
         @keyframes blink { 0% { opacity: 0.5; } 100% { opacity: 1; } }
     </style>
 </head>
         <div class="screen-container">
             <div class="crt-overlay"></div>
             <div class="scanline"></div>
+            <img id="display" src="" alt="AWAITING SIGNAL..." />
         </div>
         <div class="controls">
             <div class="led on"></div>
             <div id="hdd-led" class="led"></div>
+            <button class="pwr-btn" onclick="location.reload()">RESET</button>
         </div>
     </div>
     <script>
         display.addEventListener('mousedown', (e) => {
             if (!ws) return;
+            // Responsive coordinate calculation
             const rect = display.getBoundingClientRect();
+            // Map the clicked position (0 to rect.width) to internal resolution (0 to 128)
             const x = Math.floor(((e.clientX - rect.left) / rect.width) * 128);
             const y = Math.floor(((e.clientY - rect.top) / rect.height) * 128);
             ws.send(JSON.stringify({ type: 'click', x: x, y: y }));
 """
 # ============================================================================
+# 3. KERNEL & HARDWARE
 # ============================================================================
 DRIVERS = {
     "TITLE_BAR": torch.zeros((1, 4, 4, 32), dtype=torch.float16),
     "CLOSE_BTN": torch.zeros((1, 4, 4, 4), dtype=torch.float16),
         buf = []
         if app_type == "cmd":
+            buf = ["NEURAL OS [v9.3]", "(C) Monolith", "", f"{self.current_dir}>"]
         elif app_type == "notepad":
             buf = ["_"]
         elif app_type == "doom":
+            buf = ["[INIT] LOADING...", "[INIT] CONNECTING..."]
         self.processes[pid] = Process(
             pid, app.name, app_type, (x, y), app.default_size,
         return out
 # ============================================================================
+# 4. SERVER & RENDERER
 # ============================================================================
 app = Flask(__name__)
 sock = Sock(app)
 pipe = None
 kernel = OSKernel()
+# Load the font downloaded in Dockerfile. Size 32 is large enough for 1024px render.
+try:
+    SYSTEM_FONT = ImageFont.truetype("/app/VT323.ttf", 32)
+except Exception:
+    print("[!] Font load failed, using default")
+    SYSTEM_FONT = ImageFont.load_default()
 def init_ai():
     global pipe
     print("[*] Loading Neural Graphics Pipeline...")
     if torch.cuda.is_available():
         device = "cuda"
         dtype = torch.float16
     else:
         pil_img = Image.new('RGB', (128, 128), (0,0,0))
+    # Keep 1024px render for high detail, but Font Size 32 makes it readable
     pil_img = pil_img.resize((1024, 1024), resample=Image.NEAREST)
     draw = ImageDraw.Draw(pil_img)
     if k_obj.system_state == "BOOT":
         y = 50
         for log in k_obj.boot_log:
+            draw.text((50, y), log, fill=(0, 255, 0), font=SYSTEM_FONT)
+            y += 35 # Increased spacing for larger font
     scale = 8
     for p in k_obj.processes.values():
         wx, wy = p.position
+        cx = (wx * scale) + 16 # Padding adjusted for scale
+        cy = (wy * scale) + 40
+        # Draw Title
+        draw.text(((wx*scale)+10, (wy*scale)+5), p.name, fill=(255,255,255), font=SYSTEM_FONT)
         if p.text_buffer:
+            # Show fewer lines because font is larger, ensuring it fits in window
+            lines_to_show = p.text_buffer[-12:]
+            for i, line in enumerate(lines_to_show):
                 col = (0, 255, 0) if p.app_type == "cmd" else (0,0,0)
                 if p.app_type == "doom": col = (255, 50, 50)
+                draw.text((cx, cy + (i*30)), line, fill=col, font=SYSTEM_FONT)
     buf = io.BytesIO()
+    pil_img.save(buf, format="JPEG", quality=80)
     return base64.b64encode(buf.getvalue()).decode()
 @app.route('/')
             break
 if __name__ == "__main__":
     app.run(host="0.0.0.0", port=7860, threaded=True)
 EOF
+# 6. Launch the Monolith
 EXPOSE 7860
 CMD ["python", "app.py"]