Spaces:

imseldrith
/

udemyBot

Paused

App Files Files Community

imseldrith commited on Jan 30, 2025

Commit

3a2ce2a

verified ·

1 Parent(s): 5c6037b

Update app.py

Browse files

Files changed (1) hide show

app.py +75 -76

app.py CHANGED Viewed

@@ -3,52 +3,68 @@ from apscheduler.schedulers.background import BackgroundScheduler
 import subprocess
 from datetime import datetime
 import logging
-from io import StringIO
 app = Flask(__name__)
-# In-memory log storage
-log_buffer = StringIO()
-log_entries = []
 def run_cli_script():
-    """Execute python cli.py and capture logs"""
     timestamp = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S UTC")
-    entry = {"time": timestamp, "content": []}
     try:
-        entry["content"].append(f"{timestamp} - Starting script execution")
         result = subprocess.run(
             ["python", "cli.py"],
-            check=True,
             capture_output=True,
-            text=True
         )
-        # Capture stdout
-        if result.stdout:
-            entry["content"].append("Output:\n" + result.stdout)
-        # Capture stderr
         if result.stderr:
-            entry["content"].append("Errors:\n" + result.stderr)
-        entry["content"].append(f"{timestamp} - Script completed successfully")
-    except subprocess.CalledProcessError as e:
-        entry["content"].append(f"Error: {str(e)}\n" + e.stderr)
     except Exception as e:
-        entry["content"].append(f"Unexpected error: {str(e)}")
     finally:
-        log_entries.append(entry)
-        # Keep only last 50 entries
-        if len(log_entries) > 50:
-            log_entries.pop(0)
-# Configure scheduler
-scheduler = BackgroundScheduler()
-scheduler.add_job(run_cli_script, 'interval', hours=3)
-scheduler.start()
 @app.route('/')
 def home():
@@ -57,65 +73,48 @@ def home():
         <html>
         <head>
             <title>Script Scheduler</title>
-            <meta http-equiv="refresh" content="5">
             <style>
-                body { font-family: Arial, sans-serif; margin: 20px; }
-                .log-container {
-                    background: #1a1a1a;
-                    color: #00ff00;
                     padding: 15px;
                     border-radius: 5px;
                     white-space: pre-wrap;
-                    max-width: 800px;
-                    margin: 20px 0;
                 }
-                a { color: #4CAF50; text-decoration: none; }
             </style>
         </head>
         <body>
-            <h1>Scheduler Status</h1>
-            <p>Python script runs every 3 hours</p>
-            <p>Next run: {{ scheduler.next_run_time if scheduler else 'N/A' }}</p>
-            <p><a href="/logs">View Live Logs</a></p>
         </body>
         </html>
-    ''', scheduler=scheduler)
-@app.route('/logs')
-def show_logs():
-    return render_template_string('''
-        <!DOCTYPE html>
-        <html>
-        <head>
-            <title>Live Logs</title>
-            <meta http-equiv="refresh" content="5">
-            <style>
-                body { font-family: monospace; margin: 20px; }
-                .log-entry {
-                    background: #1a1a1a;
-                    color: #00ff00;
-                    padding: 15px;
-                    border-radius: 5px;
-                    margin-bottom: 10px;
-                    white-space: pre-wrap;
-                }
-                .timestamp { color: #888; font-size: 0.9em; }
-            </style>
-        </head>
-        <body>
-            <h1>Execution Logs</h1>
-            <a href="/">← Back to Status</a>
-            {% for entry in logs|reverse %}
-                <div class="log-entry">
-                    <div class="timestamp">{{ entry.time }}</div>
-                    {% for line in entry.content %}
-                        {{ line }}<br>
-                    {% endfor %}
-                </div>
-            {% endfor %}
-        </body>
-        </html>
-    ''', logs=log_entries)
 if __name__ == '__main__':
-    app.run(host='0.0.0.0', port=7860)

 import subprocess
 from datetime import datetime
 import logging
+import sys
+import time
 app = Flask(__name__)
+# Configure basic logging
+logging.basicConfig(stream=sys.stdout, level=logging.INFO)
+app.logger.addHandler(logging.StreamHandler(sys.stdout))
+# Global log storage
+execution_logs = []
+MAX_LOG_ENTRIES = 20
 def run_cli_script():
+    """Execute the script and store logs with timestamp"""
     timestamp = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S UTC")
+    log_entry = {
+        'time': timestamp,
+        'output': '',
+        'error': ''
+    }
     try:
+        app.logger.info(f"Starting script execution at {timestamp}")
         result = subprocess.run(
             ["python", "cli.py"],
             capture_output=True,
+            text=True,
+            timeout=300  # 5 minutes timeout
         )
+        log_entry['output'] = result.stdout
         if result.stderr:
+            log_entry['error'] = result.stderr
+        app.logger.info("Script execution completed")
     except Exception as e:
+        error_msg = f"Execution failed: {str(e)}"
+        log_entry['error'] = error_msg
+        app.logger.error(error_msg)
     finally:
+        # Maintain log history
+        execution_logs.append(log_entry)
+        if len(execution_logs) > MAX_LOG_ENTRIES:
+            execution_logs.pop(0)
+# Initialize scheduler
+def init_scheduler():
+    scheduler = BackgroundScheduler()
+    scheduler.add_job(run_cli_script, 'interval', hours=3)
+    scheduler.start()
+    # Initial immediate run for testing
+    run_cli_script()
+    return scheduler
+# Start scheduler when app starts
+try:
+    scheduler = init_scheduler()
+except Exception as e:
+    app.logger.error(f"Failed to initialize scheduler: {e}")
 @app.route('/')
 def home():
         <html>
         <head>
             <title>Script Scheduler</title>
+            <meta http-equiv="refresh" content="10">
             <style>
+                body { font-family: Arial, sans-serif; padding: 20px; }
+                .log-box {
+                    background: #000;
+                    color: #0f0;
                     padding: 15px;
                     border-radius: 5px;
+                    margin-top: 20px;
                     white-space: pre-wrap;
                 }
+                .timestamp { color: #888; margin-bottom: 10px; }
+                .error { color: #ff4444; }
             </style>
         </head>
         <body>
+            <h1>Script Scheduler</h1>
+            <p>Next run: {{ scheduler.next_run_time.strftime('%Y-%m-%d %H:%M:%S UTC') if scheduler else 'N/A' }}</p>
+            <h2>Latest Execution Logs</h2>
+            <div class="log-box">
+                {% for log in logs|reverse %}
+                    <div class="timestamp">{{ log.time }}</div>
+                    {% if log.output %}
+                        <div class="output">{{ log.output }}</div>
+                    {% endif %}
+                    {% if log.error %}
+                        <div class="error">{{ log.error }}</div>
+                    {% endif %}
+                    <hr>
+                {% else %}
+                    <div>No logs available yet</div>
+                {% endfor %}
+            </div>
         </body>
         </html>
+    ''', scheduler=scheduler, logs=execution_logs)
+@app.route('/force-run')
+def force_run():
+    """Manual trigger endpoint for testing"""
+    run_cli_script()
+    return "Script executed manually", 200
 if __name__ == '__main__':
+    app.run(host='0.0.0.0', port=7860, debug=True)