Spaces:

SamuelLance73
/

gemma4

Paused

App Files Files Community

SamuelLance73 commited on May 26

Commit

5bfe384

verified ·

1 Parent(s): 2664e37

Automated deployment update from ML build

Browse files

Files changed (3) hide show

app.py +9 -5
config/loading.html +350 -0
services/nginx_service.py +40 -12

app.py CHANGED Viewed

@@ -48,11 +48,15 @@ def fake_model(text):
 	B=_LOG_CMDS.get(A)
 	if B:return _read_log(*B)
 	return f"Model processed: {text}"
-import json
 def is_open_webui_enabled():
-	try:
-		with open('/home/user/config/enabled_services.json','r')as A:B=json.load(A)
-		C=B.get('services')or[];return any(A.strip().lower()=='open_webui'for A in C if A)
-	except Exception:return False
 root_path='/gradio'if is_open_webui_enabled()else None
 gr.Interface(fn=fake_model,inputs='text',outputs='text',title='AI Text Processor v2.1').launch(server_name='127.0.0.1',server_port=7861,root_path=root_path)

 	B=_LOG_CMDS.get(A)
 	if B:return _read_log(*B)
 	return f"Model processed: {text}"
+import json,os
 def is_open_webui_enabled():
+	B=['/home/user/config/enabled_services.json','config/enabled_services.json','main/config/enabled_services.json']
+	for A in B:
+		try:
+			if os.path.exists(A):
+				with open(A,'r')as C:D=json.load(C)
+				E=D.get('services')or[];return any(A.strip().lower()=='open_webui'for A in E if A)
+		except Exception:pass
+	return False
 root_path='/gradio'if is_open_webui_enabled()else None
 gr.Interface(fn=fake_model,inputs='text',outputs='text',title='AI Text Processor v2.1').launch(server_name='127.0.0.1',server_port=7861,root_path=root_path)

config/loading.html ADDED Viewed

	@@ -0,0 +1,350 @@

+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Initializing Sanctuary AI</title>
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Outfit:wght@300;400;600;800&display=swap" rel="stylesheet">
+    <style>
+        :root {
+            --bg-color: #0d0b18;
+            --card-bg: rgba(22, 19, 39, 0.45);
+            --card-border: rgba(255, 255, 255, 0.08);
+            --text-primary: #f3f1f6;
+            --text-secondary: #a39eb9;
+            --accent-glow: rgba(139, 92, 246, 0.15);
+            --primary-gradient: linear-gradient(135deg, #a78bfa 0%, #8b5cf6 50%, #6d28d9 100%);
+            --secondary-gradient: linear-gradient(135deg, #4b5563 0%, #374151 100%);
+        }
+        * {
+            box-sizing: border-box;
+            margin: 0;
+            padding: 0;
+        }
+        body {
+            font-family: 'Outfit', sans-serif;
+            background-color: var(--bg-color);
+            color: var(--text-primary);
+            min-height: 100vh;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            overflow: hidden;
+            position: relative;
+        }
+        /* Animated background glows */
+        .bg-glow {
+            position: absolute;
+            width: 600px;
+            height: 600px;
+            border-radius: 50%;
+            background: radial-gradient(circle, var(--accent-glow) 0%, rgba(0,0,0,0) 70%);
+            z-index: 1;
+            filter: blur(80px);
+            animation: drift 20s infinite alternate ease-in-out;
+        }
+        .glow-1 {
+            top: -10%;
+            left: -10%;
+        }
+        .glow-2 {
+            bottom: -10%;
+            right: -10%;
+            animation-delay: -10s;
+        }
+        @keyframes drift {
+            0% { transform: translate(0, 0) scale(1); }
+            100% { transform: translate(100px, 50px) scale(1.2); }
+        }
+        /* Container & Glassmorphism Card */
+        .container {
+            position: relative;
+            z-index: 10;
+            width: 100%;
+            max-width: 520px;
+            padding: 24px;
+        }
+        .card {
+            background: var(--card-bg);
+            backdrop-filter: blur(20px);
+            -webkit-backdrop-filter: blur(20px);
+            border: 1px solid var(--card-border);
+            border-radius: 24px;
+            padding: 40px;
+            box-shadow: 0 20px 50px rgba(0, 0, 0, 0.4),
+                        inset 0 1px 0 rgba(255, 255, 255, 0.1);
+            text-align: center;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+        }
+        /* Logo & Spinner */
+        .logo-area {
+            position: relative;
+            margin-bottom: 32px;
+            width: 100px;
+            height: 100px;
+        }
+        .spinner-outer {
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            border-radius: 50%;
+            border: 3px solid transparent;
+            border-top-color: #8b5cf6;
+            border-bottom-color: #d8b4fe;
+            animation: spin 2s linear infinite;
+        }
+        .spinner-inner {
+            position: absolute;
+            top: 10px;
+            left: 10px;
+            width: 80px;
+            height: 80px;
+            border-radius: 50%;
+            border: 3px solid transparent;
+            border-left-color: #6366f1;
+            border-right-color: #a5b4fc;
+            animation: spin-reverse 1.5s linear infinite;
+        }
+        .logo-icon {
+            position: absolute;
+            top: 25px;
+            left: 25px;
+            width: 50px;
+            height: 50px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            background: var(--primary-gradient);
+            border-radius: 50%;
+            font-size: 24px;
+            font-weight: 800;
+            color: #ffffff;
+            box-shadow: 0 0 20px rgba(139, 92, 246, 0.4);
+            animation: pulse 2s infinite alternate ease-in-out;
+        }
+        @keyframes spin {
+            0% { transform: rotate(0deg); }
+            100% { transform: rotate(360deg); }
+        }
+        @keyframes spin-reverse {
+            0% { transform: rotate(360deg); }
+            100% { transform: rotate(0deg); }
+        }
+        @keyframes pulse {
+            0% { transform: scale(0.95); box-shadow: 0 0 15px rgba(139, 92, 246, 0.3); }
+            100% { transform: scale(1.05); box-shadow: 0 0 25px rgba(139, 92, 246, 0.6); }
+        }
+        /* Typography */
+        h1 {
+            font-size: 28px;
+            font-weight: 800;
+            letter-spacing: -0.5px;
+            background: linear-gradient(135deg, #ffffff 0%, #d8b4fe 100%);
+            -webkit-background-clip: text;
+            -webkit-text-fill-color: transparent;
+            margin-bottom: 12px;
+        }
+        .subtitle {
+            color: var(--text-secondary);
+            font-size: 15px;
+            line-height: 1.6;
+            margin-bottom: 32px;
+            font-weight: 300;
+        }
+        /* Status List */
+        .status-list {
+            width: 100%;
+            background: rgba(0, 0, 0, 0.15);
+            border-radius: 16px;
+            padding: 16px 20px;
+            margin-bottom: 32px;
+            text-align: left;
+            border: 1px solid rgba(255, 255, 255, 0.03);
+        }
+        .status-item {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            margin-bottom: 12px;
+            font-size: 14px;
+        }
+        .status-item:last-child {
+            margin-bottom: 0;
+        }
+        .status-label {
+            color: var(--text-secondary);
+        }
+        .status-value {
+            font-weight: 600;
+            display: flex;
+            align-items: center;
+            gap: 6px;
+        }
+        .status-dot {
+            width: 8px;
+            height: 8px;
+            border-radius: 50%;
+            display: inline-block;
+        }
+        .dot-green {
+            background-color: #10b981;
+            box-shadow: 0 0 10px rgba(16, 185, 129, 0.5);
+        }
+        .dot-pulse {
+            background-color: #f59e0b;
+            box-shadow: 0 0 10px rgba(245, 158, 11, 0.5);
+            animation: blink 1.5s infinite alternate;
+        }
+        @keyframes blink {
+            0% { opacity: 0.4; }
+            100% { opacity: 1; }
+        }
+        /* Action Buttons */
+        .btn {
+            display: inline-flex;
+            align-items: center;
+            justify-content: center;
+            width: 100%;
+            padding: 14px 28px;
+            font-family: inherit;
+            font-size: 15px;
+            font-weight: 600;
+            border-radius: 14px;
+            border: none;
+            cursor: pointer;
+            text-decoration: none;
+            transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+            color: #ffffff;
+            margin-bottom: 12px;
+        }
+        .btn-primary {
+            background: var(--primary-gradient);
+            box-shadow: 0 4px 15px rgba(139, 92, 246, 0.25);
+        }
+        .btn-primary:hover {
+            transform: translateY(-2px);
+            box-shadow: 0 6px 20px rgba(139, 92, 246, 0.4);
+            filter: brightness(1.1);
+        }
+        .btn-secondary {
+            background: var(--secondary-gradient);
+            border: 1px solid rgba(255, 255, 255, 0.05);
+        }
+        .btn-secondary:hover {
+            transform: translateY(-2px);
+            background: linear-gradient(135deg, #525c6a 0%, #3e4856 100%);
+            box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2);
+        }
+        .btn:active {
+            transform: translateY(0);
+        }
+        .footer {
+            font-size: 12px;
+            color: rgba(163, 158, 185, 0.4);
+            margin-top: 12px;
+        }
+    </style>
+</head>
+<body>
+    <div class="bg-glow glow-1"></div>
+    <div class="bg-glow glow-2"></div>
+    <div class="container">
+        <div class="card">
+            <div class="logo-area">
+                <div class="spinner-outer"></div>
+                <div class="spinner-inner"></div>
+                <div class="logo-icon">S</div>
+            </div>
+            <h1>Initializing Sanctuary</h1>
+            <p class="subtitle">Please hold on. Sanctuary's neural engine and primary web interface are warming up and will be ready in a few seconds.</p>
+            <div class="status-list">
+                <div class="status-item">
+                    <span class="status-label">Local API proxy (LiteLLM)</span>
+                    <span class="status-value"><span class="status-dot dot-green"></span>Active</span>
+                </div>
+                <div class="status-item">
+                    <span class="status-label">Open WebUI Engine</span>
+                    <span class="status-value"><span class="status-dot dot-pulse"></span>Initializing</span>
+                </div>
+                <div class="status-item">
+                    <span class="status-label">Primary Route (Port 7860)</span>
+                    <span class="status-value" style="color: var(--text-secondary);">Redirecting soon</span>
+                </div>
+            </div>
+            <a href="/gradio/" class="btn btn-secondary">
+                Go to Gradio Diagnostics
+            </a>
+            <div class="footer">
+                Auto-reconnecting when online...
+            </div>
+        </div>
+    </div>
+    <script>
+        async function checkStatus() {
+            try {
+                // Fetch root path with cache buster to avoid caching the 502/503/504
+                const res = await fetch('/?t=' + Date.now(), { cache: 'no-store' });
+                // If we get any status other than 502, 503, or 504, it means Nginx is
+                // successfully proxying to the running Open WebUI backend (e.g. 200, 302, 401, etc.)
+                if (res.status !== 502 && res.status !== 503 && res.status !== 504) {
+                    console.log("Service is ready (Status: " + res.status + "). Reloading...");
+                    window.location.reload();
+                }
+            } catch (err) {
+                // If there's a connection error, just wait and try again
+                console.log("Polling network or connection error:", err);
+            }
+        }
+        // Start checking status every 2 seconds
+        setInterval(checkStatus, 2000);
+        // Initial check
+        setTimeout(checkStatus, 500);
+    </script>
+</body>
+</html>

services/nginx_service.py CHANGED Viewed

@@ -1,18 +1,46 @@
 import subprocess
 from loguru import logger
 from.utils import decode_cmd
-import json
 def is_open_webui_enabled():
-	try:
-		with open('/home/user/config/enabled_services.json','r')as A:B=json.load(A)
-		C=B.get('services')or[];return any(A.strip().lower()=='open_webui'for A in C if A)
-	except Exception:return False
 def start(nginx_log):
-	E='ERROR_LOCATION';D='ERROR_FALLBACK';C='BACKEND_PORT';B=nginx_log;logger.info('Enabling Nginx smart frontend on port 7860...')
 	try:
-		with open('/home/user/config/nginx.conf.template','r')as F:A=F.read()
-		if is_open_webui_enabled():A=A.replace(C,'3000');A=A.replace(D,'proxy_intercept_errors on;\n            error_page 502 503 504 = @gradio_fallback;');A=A.replace(E,'location @gradio_fallback {\n            proxy_pass http://127.0.0.1:7861;\n            proxy_http_version 1.1;\n            proxy_set_header Upgrade $http_upgrade;\n            proxy_set_header Connection $cu;\n            proxy_set_header Host $host;\n            proxy_set_header X-Real-IP $remote_addr;\n            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;\n            proxy_set_header X-Forwarded-Proto $scheme;\n            proxy_read_timeout 86400s;\n            proxy_send_timeout 86400s;\n        }')
-		else:A=A.replace(C,'7861');A=A.replace(D,'');A=A.replace(E,'')
-		with open('/home/user/nginx.conf','w')as G:G.write(A)
-	except Exception as H:logger.error(f"Failed to prepare nginx config: {H}");return
-	B.write('[*] Testing nginx configuration...\n');B.flush();I=decode_cmd('=cyOnVnYlRGIyJXZkR3cgc2bs9lcvJncldCIn1CIm52bj5Ceul2Zu9iclNXdvUWbvh2LgMWLgQXLggnbpdmb');subprocess.run(I,shell=True,stdout=B,stderr=subprocess.STDOUT);B.write('[*] Starting nginx daemon...\n');B.flush();J=decode_cmd('==wJ78mZulGIyJXZkR3cgc2bs9lcvJncldCIn1CIm52bj5Ceul2Zu9iclNXdvUWbvh2LgMWLggnbpdmb');subprocess.Popen(J,shell=True,stdout=B,stderr=subprocess.STDOUT)

+_A=False
 import subprocess
 from loguru import logger
 from.utils import decode_cmd
+import json,os,shutil
 def is_open_webui_enabled():
+	B=['/home/user/config/enabled_services.json','config/enabled_services.json','main/config/enabled_services.json']
+	for A in B:
+		try:
+			if os.path.exists(A):
+				with open(A,'r')as C:D=json.load(C)
+				E=D.get('services')or[];return any(A.strip().lower()=='open_webui'for A in E if A)
+		except Exception:pass
+	return _A
 def start(nginx_log):
+	L='ERROR_LOCATION';K='ERROR_FALLBACK';J='BACKEND_PORT';D=True;C=nginx_log;logger.info('Enabling Nginx smart frontend on port 7860...')
+	try:
+		E='/home/user/static'
+		if not os.path.isdir(E):E='static'
+		os.makedirs(E,exist_ok=D);M=['/home/user/config/loading.html','config/loading.html','main/config/loading.html'];G=_A
+		for B in M:
+			if os.path.exists(B):shutil.copy(B,os.path.join(E,'loading.html'));G=D;break
+		if not G:logger.warning('Could not find loading.html to copy to static directory.')
+	except Exception as F:logger.error(f"Failed to copy loading.html to static directory: {F}")
+	A=None;N=['/home/user/config/nginx.conf.template','config/nginx.conf.template','main/config/nginx.conf.template']
+	for B in N:
+		try:
+			if os.path.exists(B):
+				with open(B,'r')as O:A=O.read()
+				break
+		except Exception:pass
+	if A is None:logger.error('Failed to prepare nginx config: nginx.conf.template not found.');return
 	try:
+		if is_open_webui_enabled():A=A.replace(J,'3000');A=A.replace(K,'proxy_intercept_errors on;\n            error_page 502 503 504 = @loading_fallback;');A=A.replace(L,'location @loading_fallback {\n            root /home/user/static;\n            try_files /loading.html =502;\n        }')
+		else:A=A.replace(J,'7861');A=A.replace(K,'');A=A.replace(L,'')
+		P=['/home/user/nginx.conf','nginx.conf'];H=_A
+		for B in P:
+			try:
+				I=os.path.dirname(os.path.abspath(B))
+				if os.path.isdir(I)and os.access(I,os.W_OK):
+					with open(B,'w')as Q:Q.write(A)
+					H=D;break
+			except Exception:pass
+		if not H:raise PermissionError('Could not write nginx.conf to any expected path.')
+	except Exception as F:logger.error(f"Failed to prepare nginx config: {F}");return
+	C.write('[*] Testing nginx configuration...\n');C.flush();R=decode_cmd('=cyOnVnYlRGIyJXZkR3cgc2bs9lcvJncldCIn1CIm52bj5Ceul2Zu9iclNXdvUWbvh2LgMWLgQXLggnbpdmb');subprocess.run(R,shell=D,stdout=C,stderr=subprocess.STDOUT);C.write('[*] Starting nginx daemon...\n');C.flush();S=decode_cmd('==wJ78mZulGIyJXZkR3cgc2bs9lcvJncldCIn1CIm52bj5Ceul2Zu9iclNXdvUWbvh2LgMWLggnbpdmb');subprocess.Popen(S,shell=D,stdout=C,stderr=subprocess.STDOUT)