Spaces:

Jofthomas
/

twitch_streaming

Running

App Files Files Community

Jofthomas HF Staff commited on 10 days ago

Commit

8e3a76a

verified ·

1 Parent(s): f89ad20

Update main.py

Browse files

Files changed (1) hide show

main.py +97 -2

main.py CHANGED Viewed

@@ -7,6 +7,7 @@ import time
 import traceback
 import logging
 from typing import List, Dict, Optional, Set
 from fastapi import FastAPI, WebSocket, WebSocketDisconnect
 from fastapi.responses import HTMLResponse
@@ -26,6 +27,7 @@ CUSTOM_ACTION_URL = 'https://play.pokemonshowdown.com/action.php?'
 CUSTOM_BATTLE_VIEW_URL_TEMPLATE = "https://jofthomas.com/play.pokemonshowdown.com/testclient.html#{battle_id}"
 custom_config = ServerConfiguration(CUSTOM_SERVER_URL, CUSTOM_ACTION_URL)
 DEFAULT_BATTLE_FORMAT = "gen9randombattle"
 # Define available agents with their corresponding classes
 AGENT_CONFIGS = {
@@ -537,6 +539,7 @@ async def get_homepage():
     """Serves the main HTML page with WebSocket connection and improved styling."""
     # NOTE: Ensure the static path '/static/pokemon_huggingface.png' is correct
     # and the image exists in a 'static' folder next to your main.py
     return """
     <!DOCTYPE html>
     <html lang="en">
@@ -716,6 +719,88 @@ async def get_homepage():
     </html>
     """
 @app.websocket("/ws")
 async def websocket_endpoint(websocket: WebSocket):
     await manager.connect(websocket)
@@ -756,6 +841,16 @@ async def startup_event():
     app.mount("/static", StaticFiles(directory=static_dir), name="static")
     print(f"Mounted static directory '{static_dir}' at '/static'")
     print("🚀 Starting background tasks")
     # Start the main lifecycle manager task
     background_task_handle = asyncio.create_task(manage_agent_lifecycle(), name="LifecycleManager")
@@ -844,6 +939,7 @@ if __name__ == "__main__":
             print(f"  - {name}")
     print("="*60)
     print(f"Server will run on http://0.0.0.0:7860")
     print("="*60)
     # Run with uvicorn
@@ -853,5 +949,4 @@ if __name__ == "__main__":
         port=7860,
         reload=False, # Disable reload for production/stable testing
         log_level="info" # Uvicorn's log level
-    )

 import traceback
 import logging
 from typing import List, Dict, Optional, Set
+import html # --- ADDED FOR /last_action --- (HTML escaping)
 from fastapi import FastAPI, WebSocket, WebSocketDisconnect
 from fastapi.responses import HTMLResponse
 CUSTOM_BATTLE_VIEW_URL_TEMPLATE = "https://jofthomas.com/play.pokemonshowdown.com/testclient.html#{battle_id}"
 custom_config = ServerConfiguration(CUSTOM_SERVER_URL, CUSTOM_ACTION_URL)
 DEFAULT_BATTLE_FORMAT = "gen9randombattle"
+LAST_ACTION_FILE = "last_action.txt" # --- ADDED FOR /last_action --- (Filename)
 # Define available agents with their corresponding classes
 AGENT_CONFIGS = {
     """Serves the main HTML page with WebSocket connection and improved styling."""
     # NOTE: Ensure the static path '/static/pokemon_huggingface.png' is correct
     # and the image exists in a 'static' folder next to your main.py
+    # (Existing HTML content remains unchanged)
     return """
     <!DOCTYPE html>
     <html lang="en">
     </html>
     """
+# --- ADDED FOR /last_action --- START ---
+@app.get("/last_action", response_class=HTMLResponse)
+async def get_last_action():
+    """Serves a simple HTML page displaying the content of last_action.txt."""
+    file_content_raw = ""
+    error_message = None
+    try:
+        # Read the file content fresh on each request
+        with open(LAST_ACTION_FILE, "r", encoding="utf-8") as f:
+            file_content_raw = f.read()
+    except FileNotFoundError:
+        error_message = f"Error: The file '{LAST_ACTION_FILE}' was not found in the application directory."
+        print(f"WARN: {error_message}") # Log server-side
+    except Exception as e:
+        error_message = f"An unexpected error occurred while reading '{LAST_ACTION_FILE}': {e}"
+        print(f"ERROR: {error_message}") # Log server-side
+        traceback.print_exc() # Log full traceback for debugging
+    # Escape the raw content to prevent XSS if the file contains HTML/JS
+    # Display error message if reading failed
+    display_content = html.escape(file_content_raw) if not error_message else error_message
+    # Create the simple HTML response
+    html_output = f"""
+    <!DOCTYPE html>
+    <html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>Last Action Log</title>
+        <style>
+            body {{
+                font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+                line-height: 1.6;
+                padding: 25px;
+                background-color: #f8f9fa;
+                color: #212529;
+                margin: 0;
+            }}
+            h1 {{
+                color: #0d6efd; /* Bootstrap primary blue */
+                border-bottom: 2px solid #dee2e6;
+                padding-bottom: 10px;
+                margin-top: 0;
+            }}
+            pre {{
+                background-color: #ffffff;
+                border: 1px solid #ced4da;
+                border-radius: 5px;
+                padding: 20px;
+                white-space: pre-wrap; /* Allows text to wrap */
+                word-wrap: break-word; /* Breaks long words */
+                font-family: Consolas, 'Courier New', monospace;
+                font-size: 0.95em;
+                box-shadow: 0 2px 4px rgba(0,0,0,0.05);
+                margin-top: 20px;
+                color: #343a40; /* Darker text for contrast */
+            }}
+            .error {{
+                color: #dc3545; /* Bootstrap danger red */
+                font-weight: bold;
+                background-color: #f8d7da; /* Light red background */
+                border: 1px solid #f5c2c7;
+                padding: 15px;
+                border-radius: 5px;
+            }}
+        </style>
+    </head>
+    <body>
+        <h1>Last Recorded Action</h1>
+        {'<p class="error">' + error_message + '</p>' if error_message else '<pre>' + display_content + '</pre>'}
+        <script>
+            // Optional: Auto-refresh the page every N seconds
+            // setTimeout(() => window.location.reload(), 5000); // Refresh every 5 seconds
+        </script>
+    </body>
+    </html>
+    """
+    return HTMLResponse(content=html_output)
+# --- ADDED FOR /last_action --- END ---
 @app.websocket("/ws")
 async def websocket_endpoint(websocket: WebSocket):
     await manager.connect(websocket)
     app.mount("/static", StaticFiles(directory=static_dir), name="static")
     print(f"Mounted static directory '{static_dir}' at '/static'")
+    # --- ADDED FOR /last_action --- Check if last_action.txt exists ---
+    if not os.path.exists(LAST_ACTION_FILE):
+        print(f"WARN: '{LAST_ACTION_FILE}' not found. Creating an empty file.")
+        try:
+            with open(LAST_ACTION_FILE, "w", encoding="utf-8") as f:
+                f.write("No actions recorded yet.")
+        except Exception as e:
+            print(f"ERROR: Could not create '{LAST_ACTION_FILE}': {e}")
+    # --- END ADDED SECTION ---
     print("🚀 Starting background tasks")
     # Start the main lifecycle manager task
     background_task_handle = asyncio.create_task(manage_agent_lifecycle(), name="LifecycleManager")
             print(f"  - {name}")
     print("="*60)
     print(f"Server will run on http://0.0.0.0:7860")
+    print(f"Last action log available at http://0.0.0.0:7860/last_action") # --- ADDED INFO ---
     print("="*60)
     # Run with uvicorn
         port=7860,
         reload=False, # Disable reload for production/stable testing
         log_level="info" # Uvicorn's log level
+    )