update requirements

Author: Reason-Wang

agents/agents/agents/templates/templates.py

@@ -523,6 +523,8 @@ def _convert_single_message_to_hf_format(self, message: Dict) -> Dict:
                     pass
 
     def convert_to_hf_format_messages(self, messages: List[Dict]) -> List[Dict]:
+        if messages is None:
+            return None
         role_label, content_label = self._detect_labels(messages)
         hf_messages = []
         for message in messages:
@@ -628,6 +630,16 @@ def get_template(name: str) -> Template:
     )
 )
 
+register_template(
+    Template(
+        name="deepseek-prover",
+        system_template="{system_message}\n",
+        system_message="You are an AI programming assistant, utilizing the Deepseek Coder model, developed by Deepseek Company, and you only answer questions related to computer science. For politically sensitive questions, security and privacy issues, and other non-computer science questions, you will refuse to answer.",
+        user_template="### Instruction:\n{content}\n",
+        assistant_template="### Response:\n{content}\n<|EOT|>\n",
+        stop_words=["<|EOT|>"],
+    )
+)
 
 # register_conv_template(
 #     Template(

agents/agents/envs/__init__.py

@@ -2,10 +2,12 @@
 from .alfworld_env import ALFWorldEnv
 from .webshop_text_env import WebAgentTextEnv
 from .scienceworld_env import ScienceWorldEnv
+from .manager.enroot import clear_enroot_containers
 
 __all__ = [
     "PythonSandboxEnv",
     "ALFWorldEnv",
     "WebAgentTextEnv",
     "ScienceWorldEnv",
+    "clear_enroot_containers",
 ]

agents/agents/envs/manager/enroot.py

@@ -348,6 +348,10 @@ def api(self):
     def close(self):
         pass
 
-
 def from_env() -> EnrootClient:
     return EnrootClient()
+
+
+def clear_enroot_containers() -> None:
+    _run_enroot(["remove", "--force", "$(enroot list)"], capture=False)
+    print("Cleared all enroot containers")

agents/agents/envs/manager/env_manager.py

@@ -60,7 +60,9 @@ async def release(cls,
             cls._acquired_envs.pop(id)
             await cls._pools[key].release(env, finished=finished)
         else:
-            warnings.warn(f"Environment {id} not found during release. Skipped it.")
+            # This should be generally safe to skip
+            # warnings.warn(f"Environment {id} not found during release. Skipped it.")
+            pass
 
     @classmethod
     async def reset(cls, env: BaseEnv, env_args: dict | None = None):

agents/agents/tools/__init__.py

@@ -11,7 +11,7 @@
 from .src.search.async_dense_retriever import asyncdense_retrieve
 # from .src.search.http_retriever import http_retrieve
 from .src.webshop.tools import webshop_browser
-from .src.react.tools import answer
+from .src.react.tools import answer_qa, answer_math
 from .src.search.async_dense_retriever import asyncdense_retrieve
 from .src.scienceworld.tools import scienceworld_explorer
 
@@ -25,7 +25,8 @@
     "alfworld_reset", 
     "alfworld_get_admissible_commands",
     "google_search_serper",
-    "answer",
+    "answer_qa",
+    "answer_math",
     "hallucination_tool",
     "invalid_input_tool",
     "submit_tool_call",
@@ -49,7 +50,8 @@
     "alfworld_get_task_objective": alfworld_get_task_objective,
     "alfworld_get_admissible_commands": alfworld_get_admissible_commands,
     "google_search": google_search_serper,
-    "answer": answer,
+    "answer_qa": answer_qa,
+    "answer_math": answer_math,
     "hallucination_tool": hallucination_tool,
     "invalid_input_tool": invalid_input_tool,
     "dense_retrieve": dense_retrieve

agents/agents/tools/src/react/tools.py

@@ -1,12 +1,24 @@
 from ...tool_base import tool
 
 @tool(name="answer", description="Give the final answer. The answer should be put inside the \\boxed{} tag.", status="finish")
-def answer(answer: str):
+def answer_math(answer: str):
     """
     A helper tool to give the final answer. The answer should be put inside the \\boxed{} tag.
     Args:
         answer (str): The final answer to the question.
     Returns:
         str: The final answer to the question.
     """
+    return str(answer)
+
+
+@tool(name="answer", description="Give the final answer. The answer should be a simple, short, and direct.", status="finish")
+def answer_qa(answer: str):
+    """
+    A helper tool to give the final answer. The answer should be a simple, short, and direct.
+    Args:
+        answer (str): The final answer to the question.
+    Returns:
+        str: The final answer to the question.
+    """
     return str(answer)

agents/agents/tools/src/search/async_dense_retriever.py

@@ -26,7 +26,7 @@
 
 from .faiss_indexer import Indexer
 from ...tool_base import tool
-from ....__init__ import AGENT_DATA_DIR
+from ....__init__ import AGENT_CACHE_DIR
 import builtins
 import numpy as np
 import importlib
@@ -575,7 +575,7 @@ def _ensure_corpus_loaded(self):
     max_length=4096,
 )
 async def asyncdense_retrieve(query: str):
-    global GLOBAL_RETRIEVER, AGENT_DATA_DIR
+    global GLOBAL_RETRIEVER, AGENT_CACHE_DIR
 
     if not query.startswith("query:"):
         query = "query: " + query
@@ -584,10 +584,10 @@ async def asyncdense_retrieve(query: str):
     if GLOBAL_RETRIEVER is None:
         GLOBAL_RETRIEVER = DenseRetriever(
             corpus_file=os.path.join(
-                AGENT_DATA_DIR, "search", "wiki-18.jsonl"
+                AGENT_CACHE_DIR, "data", "search", "wiki-18.jsonl"
             ),
             index_file=os.path.join(
-                AGENT_DATA_DIR, "search", "e5_Flat.index"
+                AGENT_CACHE_DIR, "data", "search", "e5_Flat.index"
             ),
         )
 

agents/agents/tools/utils/data.py

@@ -0,0 +1,46 @@
+import gzip
+import os
+from huggingface_hub import hf_hub_download
+import shutil
+from ... import AGENT_CACHE_DIR
+
+def download_tool_data(tool_name: str):
+    """
+    This is used to download tool-related data.
+    """
+    global AGENT_CACHE_DIR
+    if tool_name == "asyncdense_retrieve":
+        data_dir = os.path.join(AGENT_CACHE_DIR, "data", "search")
+        corpus_file = os.path.join(data_dir, "wiki-18.jsonl")
+        index_file = os.path.join(data_dir, "e5_Flat.index")
+        if not os.path.exists(corpus_file):
+            if not os.path.exists(os.path.join(data_dir, "wiki-18.jsonl.gz")):
+                repo_id = "PeterJinGo/wiki-18-corpus"
+                hf_hub_download(
+                        repo_id=repo_id,
+                        filename="wiki-18.jsonl.gz",
+                        repo_type="dataset",
+                        local_dir=data_dir,
+                )
+            # Unzip the file
+            print(f"Unzipping {os.path.join(data_dir, 'wiki-18.jsonl.gz')}")
+            gz_path = os.path.join(data_dir, "wiki-18.jsonl.gz")
+            if os.path.exists(gz_path):
+                with gzip.open(gz_path, 'rb') as f_in, open(corpus_file, 'wb') as f_out:
+                    shutil.copyfileobj(f_in, f_out)
+
+        if not os.path.exists(index_file):
+            if not os.path.exists(os.path.join(data_dir, "part_aa")):
+                repo_id = "PeterJinGo/wiki-18-e5-index"
+                for file in ["part_aa", "part_ab"]:
+                    hf_hub_download(
+                        repo_id=repo_id,
+                        filename=file,  # e.g., "e5_Flat.index"
+                        repo_type="dataset",
+                        local_dir=data_dir,
+                    )
+            print(f"Concatenating {os.path.join(data_dir, 'part_*')} > {os.path.join(data_dir, 'e5_Flat.index')}")
+            os.system(f"cat {os.path.join(data_dir, 'part_*')} > {os.path.join(data_dir, 'e5_Flat.index')}")
+
+if __name__ == "__main__":
+    download_tool_data("asyncdense_retrieve")

agents/requirements.txt

@@ -6,11 +6,12 @@ redis
 docker
 openai
 faiss-cpu
-vllm==0.9.1
+vllm==0.9.2
 termcolor
 tenacity
 nest-asyncio
 pytest
 pytest-asyncio
 bs4
 qwen_vl_utils
+onnxruntime

pyproject.toml

@@ -8,7 +8,7 @@ include = ["agents", "verl"]
 [project]
 name = "AgentFly"
 version = "0.0.1"
-description = "A simple Python project"
+description = "Agent reinforcement learning framework."
 readme = "README.md"
 requires-python = ">=3.10,<3.11"
 license = { text = "Apache-2.0" }
@@ -27,6 +27,7 @@ dependencies = [
     "tenacity",
     "bs4",
     "qwen_vl_utils",
+    "onnxruntime",
 ]
 
 [project.optional-dependencies]