Spaces:

DinoPLayZ
/

Event_Stacker

Sleeping

App Files Files Community

DinoPLayZ commited on 4 days ago

Commit

62b4c70

verified ·

1 Parent(s): 29e7786

Update main.py

Browse files

Files changed (1) hide show

main.py +39 -87

main.py CHANGED Viewed

@@ -752,6 +752,17 @@ async def root(request: Request):
     health_data = await health_check()
     assistant_data = await internal_assistant()
     # Format nicely as JSON strings
     health_json = json.dumps(health_data, indent=2)
     assistant_json = json.dumps(assistant_data, indent=2)
@@ -877,6 +888,23 @@ async def root(request: Request):
             .null {{ color: #ff7b72; }}
             .key {{ color: #7ee787; font-weight: 600; }}
             @keyframes fadeIn {{
                 from {{ opacity: 0; transform: translateY(5px); }}
                 to {{ opacity: 1; transform: translateY(0); }}
@@ -900,7 +928,7 @@ async def root(request: Request):
             <div class="tabs">
                 <button class="tab-btn active" onclick="switchTab('health')">🏥 Health</button>
                 <button class="tab-btn" onclick="switchTab('assistant')">🤖 Assistant</button>
-                <a href="/logs" target="_blank" class="tab-btn" style="text-decoration: none; display: inline-block;">📜 View Logs</a>
             </div>
             <div id="health" class="tab-content active">
@@ -910,6 +938,10 @@ async def root(request: Request):
             <div id="assistant" class="tab-content">
                 <pre class="code-block" id="assistant-json">{assistant_json}</pre>
             </div>
             <p class="footer">Cloud Notifier Interface</p>
         </div>
@@ -924,6 +956,12 @@ async def root(request: Request):
                 // Update content
                 document.querySelectorAll('.tab-content').forEach(content => content.classList.remove('active'));
                 document.getElementById(tabId).classList.add('active');
             }}
             // Basic JSON Syntax Highlighter
@@ -955,92 +993,6 @@ async def root(request: Request):
     """
-@app.get("/logs", response_class=HTMLResponse)
-async def view_logs():
-    """Returns the application logs."""
-    try:
-        with open("app.log", "r") as f:
-            lines = f.readlines()
-            # Show last 1000 lines
-            log_content = "".join(lines[-1000:])
-            # Escape HTML to prevent injection if logs contain < >
-            log_content = log_content.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
-    except Exception as e:
-        log_content = f"Error reading logs: {e}"
-    return f"""
-    <!DOCTYPE html>
-    <html lang="en">
-    <head>
-        <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>Application Logs</title>
-        <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600;700&display=swap" rel="stylesheet">
-        <style>
-            body {{
-                font-family: 'Inter', sans-serif;
-                background: #0f172a;
-                color: #f8fafc;
-                margin: 0;
-                padding: 20px;
-            }}
-            .header {{
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                margin-bottom: 20px;
-                border-bottom: 1px solid rgba(255, 255, 255, 0.1);
-                padding-bottom: 10px;
-            }}
-            .header h1 {{
-                margin: 0;
-                font-size: 1.5rem;
-                color: #60a5fa;
-            }}
-            .btn-back {{
-                background: rgba(255, 255, 255, 0.1);
-                color: white;
-                text-decoration: none;
-                padding: 8px 16px;
-                border-radius: 6px;
-                font-weight: 600;
-                transition: background 0.3s;
-            }}
-            .btn-back:hover {{
-                background: rgba(255, 255, 255, 0.2);
-            }}
-            .log-container {{
-                background: #0d1117;
-                border: 1px solid rgba(255, 255, 255, 0.1);
-                padding: 15px;
-                border-radius: 8px;
-                font-family: 'Consolas', 'Monaco', monospace;
-                font-size: 0.9rem;
-                line-height: 1.5;
-                white-space: pre-wrap;
-                word-wrap: break-word;
-                color: #a5d6ff;
-                max-height: 80vh;
-                overflow-y: auto;
-            }}
-        </style>
-    </head>
-    <body>
-        <div class="header">
-            <h1>📜 Application Logs (Last 1000 lines)</h1>
-            <a href="/" class="btn-back">&larr; Back to Dashboard</a>
-        </div>
-        <div class="log-container" id="log-container">{{log_content}}</div>
-        <script>
-            // Auto-scroll to bottom of the logs
-            var logContainer = document.getElementById("log-container");
-            logContainer.scrollTop = logContainer.scrollHeight;
-        </script>
-    </body>
-    </html>
-    """.replace("{{log_content}}", log_content)
 @app.get("/assistant")
 async def internal_assistant():
     load_dotenv(override=True)

     health_data = await health_check()
     assistant_data = await internal_assistant()
+    # Fetch logs internally
+    try:
+        with open("app.log", "r") as f:
+            lines = f.readlines()
+            # Show last 1000 lines
+            log_content = "".join(lines[-1000:])
+            # Escape HTML
+            log_content = log_content.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
+    except Exception as e:
+        log_content = f"Error reading logs: {e}"
     # Format nicely as JSON strings
     health_json = json.dumps(health_data, indent=2)
     assistant_json = json.dumps(assistant_data, indent=2)
             .null {{ color: #ff7b72; }}
             .key {{ color: #7ee787; font-weight: 600; }}
+            /* Logs Container Styling */
+            .log-container {{
+                background: #0d1117;
+                border: 1px solid rgba(255, 255, 255, 0.1);
+                padding: 15px;
+                border-radius: 8px;
+                font-family: 'Consolas', 'Monaco', monospace;
+                font-size: 0.9rem;
+                line-height: 1.5;
+                white-space: pre-wrap;
+                word-wrap: break-word;
+                color: #a5d6ff;
+                max-height: 60vh;
+                overflow-y: auto;
+                box-shadow: inset 0 2px 4px rgba(0,0,0,0.5);
+            }}
             @keyframes fadeIn {{
                 from {{ opacity: 0; transform: translateY(5px); }}
                 to {{ opacity: 1; transform: translateY(0); }}
             <div class="tabs">
                 <button class="tab-btn active" onclick="switchTab('health')">🏥 Health</button>
                 <button class="tab-btn" onclick="switchTab('assistant')">🤖 Assistant</button>
+                <button class="tab-btn" onclick="switchTab('logs')">📜 Logs</button>
             </div>
             <div id="health" class="tab-content active">
             <div id="assistant" class="tab-content">
                 <pre class="code-block" id="assistant-json">{assistant_json}</pre>
             </div>
+            <div id="logs" class="tab-content">
+                <div class="log-container" id="log-container-view">{{log_content}}</div>
+            </div>
             <p class="footer">Cloud Notifier Interface</p>
         </div>
                 // Update content
                 document.querySelectorAll('.tab-content').forEach(content => content.classList.remove('active'));
                 document.getElementById(tabId).classList.add('active');
+                // Auto-scroll logs when tab is opened
+                if (tabId === 'logs') {{
+                    var logContainer = document.getElementById('log-container-view');
+                    logContainer.scrollTop = logContainer.scrollHeight;
+                }}
             }}
             // Basic JSON Syntax Highlighter
     """
 @app.get("/assistant")
 async def internal_assistant():
     load_dotenv(override=True)