fix rl model path issue

Author: ambroseling

.github/workflows/agent_battle_pipeline.yaml

@@ -91,6 +91,7 @@ jobs:
         env:
           AGENT1_PATH: agents/${{ github.event.inputs.username1 }}/my_agent.py
           AGENT2_PATH: agents/${{ github.event.inputs.username2 }}/my_agent.py
+          AI2_UNIQUE_MODEL: 1
         run: |
           echo "Running battle between:"
           echo "Agent 1: $AGENT1_PATH"

environment/agent.py

@@ -13,7 +13,7 @@
 from PIL import Image, ImageSequence
 import matplotlib.pyplot as plt
 
-import gdown, os, math, random, shutil, json
+import gdown, os, math, random, shutil, json, uuid
 
 import numpy as np
 import torch
@@ -57,6 +57,7 @@ def __init__(
         # If no supplied file_path, load from gdown (optional file_path returned)
         if file_path is None:
             file_path = self._gdown()
+            file_path = self._maybe_unique_model_path(file_path)
 
         self.file_path: Optional[str] = file_path
         self.initialized = False
@@ -71,6 +72,8 @@ def get_env_info(self, env):
         self.action_space = self_env.action_space
         self.act_helper = self_env.act_helper
         self.env = env
+        # Resolve model path (handles .zip duplication and fallbacks)
+        self.file_path = self._resolve_file_path(self.file_path)
         self._initialize()
         self.initialized = True
 
@@ -109,6 +112,120 @@ def _gdown(self) -> Optional[str]:
         """
         return
 
+    def _resolve_file_path(self, file_path: Optional[str]) -> Optional[str]:
+        """
+        Best-effort resolution of a provided model path.
+
+        - Converts to absolute path
+        - Tries sibling variants with/without the `.zip` suffix
+        - Looks in a few common folders (./, ./checkpoints, ./models, ./user/models)
+        - Falls back to calling _gdown() if nothing is found
+
+        Returns a path that exists, or None if unresolved.
+        """
+        try:
+            if file_path is None:
+                return None
+
+            # If a URL-like path is passed, skip straight to download
+            is_url = isinstance(file_path, str) and (
+                file_path.startswith('http://') or file_path.startswith('https://')
+                or 'drive.google.com' in file_path
+            )
+
+            candidates = []
+
+            if not is_url:
+                base = file_path
+                if not os.path.isabs(base):
+                    base = os.path.abspath(base)
+
+                candidates.append(base)
+                if base.endswith('.zip'):
+                    candidates.append(base[:-4])
+                else:
+                    candidates.append(base + '.zip')
+
+                # Probe a few common directories with both name variants
+                cwd = os.getcwd()
+                name = os.path.basename(base)
+                probe_dirs = [
+                    '.',
+                    'checkpoints',
+                    'models',
+                    os.path.join('user', 'models'),
+                ]
+                for d in probe_dirs:
+                    root = os.path.abspath(os.path.join(cwd, d))
+                    p1 = os.path.join(root, name)
+                    candidates.append(p1)
+                    if not name.endswith('.zip'):
+                        candidates.append(p1 + '.zip')
+
+            # Return the first existing candidate
+            for c in candidates:
+                if isinstance(c, str) and os.path.exists(c):
+                    return c
+
+            # Nothing found locally - try to download via _gdown
+            downloaded = self._gdown()
+            if isinstance(downloaded, str):
+                resolved = downloaded if os.path.isabs(downloaded) else os.path.abspath(downloaded)
+                if os.path.exists(resolved):
+                    # If a specific (non-existing) target was requested, copy to it
+                    if (file_path is not None and not is_url):
+                        target = file_path if os.path.isabs(file_path) else os.path.abspath(file_path)
+                        try:
+                            os.makedirs(os.path.dirname(target), exist_ok=True)
+                            shutil.copy2(resolved, target)
+                            return target
+                        except Exception as copy_e:
+                            warnings.warn(f"Failed to copy downloaded model to requested path: {copy_e}")
+                    # Optionally create a unique-named copy if requested by env
+                    env_toggle = os.environ.get('AI2_UNIQUE_MODEL', '0').lower() in ('1', 'true', 'yes')
+                    if env_toggle:
+                        base_dir = os.environ.get('AI2_MODEL_DIR', os.path.dirname(resolved))
+                        base_name = os.environ.get('AI2_MODEL_BASENAME', 'rl-model')
+                        unique = uuid.uuid4().hex[:8]
+                        target = os.path.abspath(os.path.join(base_dir, f"{base_name}-{unique}.zip"))
+                        try:
+                            os.makedirs(os.path.dirname(target), exist_ok=True)
+                            shutil.copy2(resolved, target)
+                            return target
+                        except Exception as e2:
+                            warnings.warn(f"Failed to create unique model copy: {e2}")
+                    return resolved
+        except Exception as e:
+            warnings.warn(f"Model path resolution failed: {e}")
+
+        return None
+
+    def _maybe_unique_model_path(self, path: Optional[str]) -> Optional[str]:
+        """
+        Optionally duplicate the downloaded model to a uniquely named path when
+        AI2_UNIQUE_MODEL is enabled. Returns the new path, or the original path
+        on any failure or when disabled.
+        """
+        try:
+            if path is None:
+                return None
+            env_toggle = os.environ.get('AI2_UNIQUE_MODEL', '0').lower() in ('1', 'true', 'yes')
+            if not env_toggle:
+                return path
+            abs_src = path if os.path.isabs(path) else os.path.abspath(path)
+            if not os.path.exists(abs_src):
+                return path
+            base_dir = os.environ.get('AI2_MODEL_DIR', os.path.dirname(abs_src))
+            base_name = os.environ.get('AI2_MODEL_BASENAME', 'rl-model')
+            unique = uuid.uuid4().hex[:8]
+            target = os.path.abspath(os.path.join(base_dir, f"{base_name}-{unique}.zip"))
+            os.makedirs(os.path.dirname(target), exist_ok=True)
+            shutil.copy2(abs_src, target)
+            return target
+        except Exception as e:
+            warnings.warn(f"Unique model naming failed: {e}")
+            return path
+
 
 # ### Agent Classes
 
@@ -638,15 +755,6 @@ def run_match(agent_1: Agent | partial,
 
     # Initialize agents
     if not agent_1.initialized: agent_1.get_env_info(env)
-
-    # rl_model_path = "rl-model.zip"
-    # if os.path.exists(rl_model_path):
-    #     try:
-    #         os.remove(rl_model_path)
-    #         print(f"Removed {rl_model_path}")
-    #     except Exception as e:
-    #         print(f"Warning: Could not remove {rl_model_path}: {e}")
-
     if not agent_2.initialized: agent_2.get_env_info(env)
     # 596, 336
     platform1 = env.objects["platform1"]