Spaces:

Jofthomas
/

twitch_streaming

Running

App Files Files Community

Joffrey THOMAS commited on Jul 3

Commit

2eeeb39

1 Parent(s): 8665f5d

change server

Browse files

Files changed (1) hide show

main.py +33 -15

main.py CHANGED Viewed

@@ -21,12 +21,24 @@ from poke_env import AccountConfiguration, ServerConfiguration
 # Import the actual agent classes
 from agents import OpenAIAgent, GeminiAgent, MistralAgent
-# --- Configuration ---
-CUSTOM_SERVER_URL = "wss://jofthomas.com/showdown/websocket"
-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"
 LAST_ACTION_FILE = "last_action.txt" # --- ADDED FOR /last_action --- (Filename)
 # Define available agents with their corresponding classes
@@ -79,9 +91,7 @@ def get_active_battle(agent: Player):
 def create_battle_iframe(battle_id: str) -> str:
     """Creates JUST the HTML for the battle iframe tag."""
     print("Creating iframe content for battle ID: ", battle_id)
-    # Use the official client URL unless you specifically need the test client
-    # battle_url = f"https://play.pokemonshowdown.com/{battle_id}"
-    battle_url = f"https://jofthomas.com/play.pokemonshowdown.com/testclient.html#{battle_id}" # Using your custom URL
     # Return ONLY the iframe tag with a class for styling
     return f"""
@@ -532,20 +542,26 @@ class ConnectionManager:
 manager = ConnectionManager()
 # --- API Routes ---
 @app.get("/", response_class=HTMLResponse)
 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
-    # (Existing HTML content remains unchanged)
-    return """
     <!DOCTYPE html>
     <html lang="en">
     <head>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>Pokemon Battle Livestream</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=Poppins:wght@400;700&family=Press+Start+2P&display=swap" rel="stylesheet">
@@ -596,7 +612,7 @@ async def get_homepage():
             /* Idle Screen Specific Styling */
             .idle-container {
                  /* Ensure the background covers the entire container */
-                background-image: url('/static/pokemon_huggingface.png');
                 background-size: cover;
                 background-position: center;
                 background-repeat: no-repeat;
@@ -717,6 +733,8 @@ async def get_homepage():
     </body>
     </html>
     """
 @app.get("/last_action", response_class=HTMLResponse)
 async def get_last_action():

 # Import the actual agent classes
 from agents import OpenAIAgent, GeminiAgent, MistralAgent
+# --- Configuration (override via environment variables) ---
+# Showdown WebSocket URL, e.g. wss://my-app.fly.dev/showdown/websocket
+CUSTOM_SERVER_URL = os.environ.get(
+    "SHOWDOWN_WS_URL",
+    "wss://deploy-lingering-grove-7264.fly.dev/showdown/websocket",
+)
+# Action endpoint for poke-env (official login server is fine for custom servers)
+CUSTOM_ACTION_URL = os.environ.get(
+    "SHOWDOWN_ACTION_URL",
+    "https://play.pokemonshowdown.com/action.php?",
+)
+# Battle iframe URL template — {battle_id} is replaced at runtime
+CUSTOM_BATTLE_VIEW_URL_TEMPLATE = os.environ.get(
+    "BATTLE_VIEW_URL",
+    "https://deploy-lingering-grove-7264.fly.dev/#{battle_id}",
+)
 custom_config = ServerConfiguration(CUSTOM_SERVER_URL, CUSTOM_ACTION_URL)
+DEFAULT_BATTLE_FORMAT = os.environ.get("BATTLE_FORMAT", "gen9randombattle")
 LAST_ACTION_FILE = "last_action.txt" # --- ADDED FOR /last_action --- (Filename)
 # Define available agents with their corresponding classes
 def create_battle_iframe(battle_id: str) -> str:
     """Creates JUST the HTML for the battle iframe tag."""
     print("Creating iframe content for battle ID: ", battle_id)
+    battle_url = CUSTOM_BATTLE_VIEW_URL_TEMPLATE.format(battle_id=battle_id)
     # Return ONLY the iframe tag with a class for styling
     return f"""
 manager = ConnectionManager()
+BACKGROUND_FILE = os.getenv('BACKGROUND_FILE', 'option1.jpg')
+IDLE_BG_URL = f'/static/{BACKGROUND_FILE}'
+def idle_background_url() -> str:
+	return IDLE_BG_URL
 # --- API Routes ---
 @app.get("/", response_class=HTMLResponse)
 async def get_homepage():
+	"""Serves the main HTML page with WebSocket connection and improved styling."""
+	bg_url = idle_background_url()
+	html = """
     <!DOCTYPE html>
     <html lang="en">
     <head>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>PokéLLM Arena</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=Poppins:wght@400;700&family=Press+Start+2P&display=swap" rel="stylesheet">
             /* Idle Screen Specific Styling */
             .idle-container {
                  /* Ensure the background covers the entire container */
+                background-image: url('__IDLE_BG_URL__');
                 background-size: cover;
                 background-position: center;
                 background-repeat: no-repeat;
     </body>
     </html>
     """
+	return html.replace('__IDLE_BG_URL__', bg_url)
 @app.get("/last_action", response_class=HTMLResponse)
 async def get_last_action():