Merge branch 'main' of github.com:emagedoc/CodeClash

Author: john-b-yang

aws/setup/batch/launch_template_user_data.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Avoid consuming lots of storage by chatty docker logs
+
+set -euo pipefail
+
+# Configure Docker log rotation
+cat <<EOF > /etc/docker/daemon.json
+{
+  "log-driver": "json-file",
+  "log-opts": {
+    "max-size": "10m",
+    "max-file": "3"
+  }
+}
+EOF
+
+# Restart Docker to apply changes
+systemctl restart docker

aws/setup/batch/push.py

@@ -2,6 +2,7 @@
 """Push AWS resources defined in JSON files to AWS."""
 
 import argparse
+import base64
 import json
 import logging
 from pathlib import Path
@@ -194,20 +195,37 @@ def push_job_definition(job_data: dict, batch_client) -> None:
     logger.info(f"✅ Successfully pushed job definition: {job_name}:{revision}")
 
 
+def _add_user_data_to_launch_template(template_data: dict, user_data_path: Path) -> None:
+    """Add user data from the specified path to the template data."""
+    if user_data_path.exists():
+        logger.info(f"Adding user data from {user_data_path.name}")
+        user_data_script = user_data_path.read_text()
+        encoded_user_data = base64.b64encode(user_data_script.encode()).decode()
+        template_data["LaunchTemplateData"]["UserData"] = encoded_user_data
+    else:
+        logger.warning(f"User data file not found: {user_data_path}")
+
+
 def _update_launch_template(template_data: dict, existing_template: dict, ec2_client) -> None:
-    """Update existing launch template by creating a new version."""
+    """Update existing launch template by creating a new version and setting it as default."""
     template_name = template_data["LaunchTemplateName"]
+    template_id = existing_template["LaunchTemplateId"]
     logger.info(f"Launch template {template_name} already exists, creating new version")
 
     create_params = {
-        "LaunchTemplateId": existing_template["LaunchTemplateId"],
+        "LaunchTemplateId": template_id,
         "LaunchTemplateData": template_data["LaunchTemplateData"],
     }
 
     response = ec2_client.create_launch_template_version(**create_params)
     version = response["LaunchTemplateVersion"]["VersionNumber"]
 
-    logger.info(f"✅ Successfully created new version {version} for launch template: {template_name}")
+    # Set the new version as the default
+    ec2_client.modify_launch_template(LaunchTemplateId=template_id, DefaultVersion=str(version))
+
+    logger.info(
+        f"✅ Successfully created new version {version} for launch template: {template_name} and set as default"
+    )
 
 
 def _create_launch_template(template_data: dict, ec2_client) -> None:
@@ -227,10 +245,13 @@ def _create_launch_template(template_data: dict, ec2_client) -> None:
     logger.info(f"✅ Successfully created launch template: {template_name}")
 
 
-def push_launch_template(template_data: dict, ec2_client) -> None:
+def push_launch_template(template_data: dict, ec2_client, *, user_data_path: Path | None = None) -> None:
     """Push EC2 launch template to AWS."""
     template_name = template_data["LaunchTemplateName"]
 
+    if user_data_path is not None:
+        _add_user_data_to_launch_template(template_data, user_data_path)
+
     try:
         response = ec2_client.describe_launch_templates(LaunchTemplateNames=[template_name])
         existing_template = response["LaunchTemplates"][0]
@@ -257,7 +278,8 @@ def push_file(json_path: Path, region: str) -> None:
         case "job_definition.json":
             push_job_definition(data, boto3.client("batch", region_name=region))
         case "launch_template.json":
-            push_launch_template(data, boto3.client("ec2", region_name=region))
+            user_data_path = json_path.parent / "launch_template_user_data.sh"
+            push_launch_template(data, boto3.client("ec2", region_name=region), user_data_path=user_data_path)
         case _:
             logger.error(f"Unknown filename: {filename}")
             raise ValueError(f"Unknown filename: {filename}")

aws/setup/docker/README.md

@@ -0,0 +1,3 @@
+# Docker images for AWS
+
+tl;dr: Call `./build_and_push_all.sh`, then `./clean_old_tags.py`

codeclash/viewer/app.py

@@ -107,6 +107,25 @@ def get_models_from_metadata(log_dir: Path) -> list[str]:
     return models
 
 
+def get_game_name_from_metadata(log_dir: Path) -> str:
+    """Extract game name from metadata.json if it exists"""
+    metadata = load_metadata(log_dir)
+    if not metadata:
+        return ""
+
+    # Try to get game name from different possible locations in metadata
+    game_name = metadata.get("config", {}).get("game", {}).get("name")
+    if game_name:
+        return game_name
+
+    # Fallback to game.name if config.game.name doesn't exist
+    game_name = metadata.get("game", {}).get("name")
+    if game_name:
+        return game_name
+
+    return ""
+
+
 def get_readme_first_line(log_dir: Path) -> str:
     """Extract the first line from readme.txt if it exists"""
     readme_file = log_dir / "readme.txt"
@@ -168,6 +187,7 @@ def scan_directory(directory: Path, relative_path: str = ""):
                         round_info = get_round_count_from_metadata(item)
                         models = get_models_from_metadata(item)
                         readme_first_line = get_readme_first_line(item)
+                        game_name = get_game_name_from_metadata(item)
                         game_folders.add(current_relative)
                         all_folders.append(
                             {
@@ -176,6 +196,7 @@ def scan_directory(directory: Path, relative_path: str = ""):
                                 "round_info": round_info,  # Now stores (completed, total) tuple or None
                                 "models": models,
                                 "readme_first_line": readme_first_line,
+                                "game_name": game_name,
                                 "is_game": True,
                                 "depth": depth,
                                 "parent": relative_path if relative_path else None,
@@ -190,6 +211,7 @@ def scan_directory(directory: Path, relative_path: str = ""):
                                 "round_info": None,
                                 "models": [],
                                 "readme_first_line": "",
+                                "game_name": "",
                                 "is_game": False,
                                 "depth": depth,
                                 "parent": relative_path if relative_path else None,
@@ -670,6 +692,27 @@ def unescape_content(value):
     return value.replace("\\n", "\n")
 
 
+def get_folder_name(path):
+    """Extract the folder name from a path"""
+    if not path:
+        return ""
+    from pathlib import Path
+
+    return Path(path).name
+
+
+def get_parent_folder(path):
+    """Extract the parent folder name from a path"""
+    if not path:
+        return ""
+    from pathlib import Path
+
+    parent = Path(path).parent
+    if str(parent) == "." or str(parent) == "/":
+        return ""
+    return parent.name
+
+
 def get_navigation_info(selected_folder: str) -> dict[str, str | None]:
     """Get previous and next game folders for navigation"""
     # Get all game folders
@@ -733,6 +776,8 @@ def render_game_viewer(folder_path: Path, selected_folder: str) -> str:
 # Register the custom filters
 app.jinja_env.filters["nl2br"] = nl2br
 app.jinja_env.filters["unescape_content"] = unescape_content
+app.jinja_env.filters["get_folder_name"] = get_folder_name
+app.jinja_env.filters["get_parent_folder"] = get_parent_folder
 
 
 @app.route("/")