5/17 api & script mode

BookWorld.py

@@ -135,6 +135,19 @@ class Server():
                 if self.language == "zh" else f"{self.role_agents[role_code].nickname} is now located at {self.world_agent.find_location_name(init_locations_code[i])}"
             self.log(info_text)
     
+    def reset_llm(self, role_llm_name, world_llm_name):
+        self.role_llm = get_models(role_llm_name)
+        for role_code in self.role_codes:
+            self.role_agents[role_code].llm = self.role_llm
+            self.role_agents[role_code].llm_name = role_llm_name
+        if world_llm_name == role_llm_name:
+            self.world_llm = self.role_llm
+        else:
+            self.world_llm = get_models(world_llm_name)
+        self.world_agent.llm = self.world_llm
+        self.role_llm_name = role_llm_name
+        self.world_llm_name = world_llm_name
+        
     # Simulation        
     def simulate_generator(self, 
                  rounds: int = 10, 
@@ -218,12 +231,11 @@ class Server():
             # Characters in next scene
             if scene_mode:
                 group = self._name2code(
-                    self.world_agent.decide_screen_actors(
+                    self.world_agent.decide_scene_actors(
                         self._get_locations_info(False),
                         self.history_manager.get_recent_history(5),
                         self.event,
                         list(set(selected_role_codes + list(self.moving_roles_info.keys())))))
-                
                 selected_role_codes += group
                 if len(selected_role_codes) > len(self.role_codes):
                     selected_role_codes = []
@@ -232,7 +244,6 @@ class Server():
             self.current_status['group'] = group
             self.current_status['location_code'] = self.role_agents[group[0]].location_code
             self.scene_characters[str(current_round)] = group
-            
             # Prologue 
             # if current_round == 0 and len(group) > 0 
             #     prologue = self.world_agent.generate_location_prologue(location_code=self.role_agents[group[0]].location_code, history_text=self._get_history_text(group),event=self.event,location_info_text=self._find_roles_at_location(self.role_agents[group[0]].location_code,name=True))
@@ -601,7 +612,7 @@ class Server():
             Dict[str, Any]: Instruction for each role.
         """
         roles_info_text = self._get_group_members_info_text(self.role_codes,status=True)
-        history_text = "\n".join([self.role_agents[role_code].history_manager.get_recent_history(1)[0] for role_code in self.role_codes])
+        history_text = self.history_manager.get_recent_history(top_k)
     
         instruction = self.world_agent.get_script_instruction(
                                 roles_info_text=roles_info_text, 
@@ -990,6 +1001,7 @@ class BookWorld():
         else:
             location_name,location_description = self.server.world_agent.find_location_name(location_code),self.server.world_agent.locations_info[location_code]["description"]
         status['location'] = {'name': location_name, 'description': location_description}
+        status['characters'] = self.get_characters_info()
         return status
     
     def handle_message_edit(self,record_id,new_text):

app.py

@@ -205,29 +205,6 @@ async def websocket_endpoint(websocket: WebSocket, client_id: str):
                     }
                 })
                 
-            elif message['type'] == 'api_settings':
-                # 处理API设置
-                settings = message['data']
-                # 设置环境变量
-                os.environ[settings['envKey']] = settings['apiKey']
-                
-                # 更新BookWorld的设置
-                manager.bw.update_api_settings(
-                    provider=settings['provider'],
-                    model=settings['model']
-                )
-                
-                # 发送确认消息
-                await websocket.send_json({
-                    'type': 'message',
-                    'data': {
-                        'username': 'System',
-                        'timestamp': datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
-                        'text': f'已更新 {settings["provider"]} API设置',
-                        'icon': default_icon_path,
-                        'type': 'system'
-                    }
-                })
     except Exception as e:
         print(f"WebSocket error: {e}")
     finally:
@@ -257,22 +234,9 @@ async def save_config(request: Request):
         elif 'openrouter' in llm_provider.lower():
             os.environ['OPENROUTER_API_KEY'] = api_key
             
-        if "preset_path" in config and config["preset_path"] and os.path.exists(config["preset_path"]):
-            preset_path = config["preset_path"]
-        elif "genre" in config and config["genre"]:
-            genre = config["genre"]
-            preset_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),f"./config/experiment_{genre}.json")
-        else:
-            raise ValueError("Please set the preset_path in `config.json`.")
-        manager.bw = BookWorld(preset_path = preset_path,
-                world_llm_name = config["world_llm_name"],
-                role_llm_name = config["world_llm_name"])
-        manager.bw.set_generator(rounds = config["rounds"], 
-                    save_dir = config["save_dir"], 
-                    if_save = config["if_save"],
-                    mode = config["mode"],
-                    scene_mode = config["scene_mode"],)
+        manager.bw.server.reset_llm(model,model)
         return {"status": "success", "message": llm_provider + " 配置已保存"}
+    
     except Exception as e:
         print(f"保存配置失败: {e}")
         raise HTTPException(status_code=500, detail="保存配置失败")

bw_utils.py

@@ -9,21 +9,23 @@ import random
 import base64
 
 MODEL_NAME_DICT = {
-    "gpt3":"openai/gpt-3.5-turbo",
+    "gpt-3.5":"openai/gpt-3.5-turbo",
     "gpt-4":"openai/gpt-4",
     "gpt-4o":"openai/gpt-4o",
     "gpt-4o-mini":"openai/gpt-4o-mini",
     "gpt-3.5-turbo":"openai/gpt-3.5-turbo",
     "deepseek-r1":"deepseek/deepseek-r1",
     "deepseek-v3":"deepseek/deepseek-chat",
-    "gemini-2":"google/gemini-2.0-flash-001",
-    "gemini-1.5":"google/gemini-flash-1.5",
+    "gemini-2.0-flash":"google/gemini-2.0-flash-001",
+    "gemini-1.5-flash":"google/gemini-flash-1.5",
     "llama3-70b": "meta-llama/llama-3.3-70b-instruct",
     "qwen-turbo":"qwen/qwen-turbo",
     "qwen-plus":"qwen/qwen-plus",
     "qwen-max":"qwen/qwen-max",
     "qwen-2.5-72b":"qwen/qwen-2.5-72b-instruct",
+    "claude-3.5-haiku": "anthropic/claude-3.5-haiku",
     "claude-3.5-sonnet":"anthropic/claude-3.5-sonnet",
+    "claude-3.7-sonnet":"anthropic/claude-3.7-sonnet",
     "phi-4":"microsoft/phi-4",
 }
 
@@ -31,38 +33,47 @@ def get_models(model_name):
     if os.getenv("OPENROUTER_API_KEY", default="") and model_name in MODEL_NAME_DICT:
         from modules.llm.OpenRouter import OpenRouter
         return OpenRouter(model=MODEL_NAME_DICT[model_name])
-    elif model_name.startswith('gpt-3.5'):
+    elif model_name.startswith('gpt'):
         from modules.llm.LangChainGPT import LangChainGPT
-        return LangChainGPT(model="gpt-3.5-turbo")
-    elif model_name == 'gpt-4':
-        from modules.llm.LangChainGPT import LangChainGPT
-        return LangChainGPT(model="gpt-4")
-    elif model_name == 'gpt-4-turbo':
-        from modules.llm.LangChainGPT import LangChainGPT
-        return LangChainGPT(model="gpt-4")
-    elif model_name == 'gpt-4o':
-        from modules.llm.LangChainGPT import LangChainGPT
-        return LangChainGPT(model="gpt-4o")
-    elif model_name == "gpt-4o-mini":
-        from modules.llm.LangChainGPT import LangChainGPT
-        return LangChainGPT(model="gpt-4o-mini")
+        if model_name.startswith('gpt-3.5'):
+            return LangChainGPT(model="gpt-3.5-turbo")
+        elif model_name == 'gpt-4' or model_name == 'gpt-4-turbo':
+            return LangChainGPT(model="gpt-4")
+        elif model_name == 'gpt-4o':
+            return LangChainGPT(model="gpt-4o")
+        elif model_name == "gpt-4o-mini":
+            return LangChainGPT(model="gpt-4o-mini")
     elif model_name.startswith("claude"):
-        from modules.llm.LangChainGPT import LangChainGPT
-        return LangChainGPT(model="claude-3-5-sonnet-20241022")
+        from modules.llm.Claude import Claude
+        if model_name.startswith("claude-3.5-sonnet"):
+            return Claude(model="claude-3-5-sonnet-latest")
+        elif model_name.startswith("claude-3.7-sonnet"):
+            return Claude(model="claude-3-7-sonnet-latest")
+        elif model_name.startswith("claude-3.5-haiku"):
+            return Claude(model="claude-3-5-haiku-latest")
+        return Claude()
     elif model_name.startswith('qwen'):
         from modules.llm.Qwen import Qwen
         return Qwen(model = model_name)
     elif model_name.startswith('deepseek'):
         from modules.llm.DeepSeek import DeepSeek
-        return DeepSeek()
+        return DeepSeek(model = model_name)
     elif model_name.startswith('doubao'):
         from modules.llm.Doubao import Doubao
         return Doubao()
     elif model_name.startswith('gemini'):
         from modules.llm.Gemini import Gemini
+        if model_name.startswith('gemini-2.0'):
+            return Gemini(model="gemini-2.0-flash")
+        elif model_name.startswith('gemini-1.5'):
+            return Gemini(model="gemini-1.5-flash")
+        elif model_name.startswith('gemini-2.5-flash'):
+            return Gemini(model="gemini-2.5-flash-preview-04-17")
+        elif model_name.startswith('gemini-2.5-pro'):
+            return Gemini(model="gemini-2.5-pro-preview-05-06")
         return Gemini()
     else:
-        print(f'Warning! undefined model {model_name}, use gpt-3.5-turbo instead.')
+        print(f'Warning! undefined model {model_name}, use gpt-4o-mini instead.')
         from modules.llm.LangChainGPT import LangChainGPT
         return LangChainGPT()
     

config.json

@@ -1,6 +1,6 @@
 {
-    "role_llm_name": "gemini-2",
-    "world_llm_name": "gemini-2",
+    "role_llm_name": "gemini-2.0-flash",
+    "world_llm_name": "gemini-2.0-flash",
     "embedding_model_name":"bge-m3",
     "preset_path":"./experiment_presets/experiment_icefire.json",
     "if_save": 0,

experiment_presets/example_script.json

@@ -1,12 +1,11 @@
 {
     "experiment_subname": "script",
-    "world_file_path":"./data/worlds/example_world.json",
+    "world_file_path":"./data/worlds/example_world/general.json",
     "map_file_path":"./data/maps/example_map.csv",
     "loc_file_path":"./data/locations/example_locations.json",
     "role_file_dir":"./data/roles/",
     "role_agent_codes":["Lacia-en","Trek-en"],
-    "intervention":"",
-    "script":"",
+    "script":"One day, an enigmatic signal from an unknown source reached Lacia and Trek. The pattern resembled Trek’s early consciousness digitization code—but far more evolved. Tracing its origin to lunar orbit, the two found themselves divided: Lacia urged caution, fearing the dangers of an unknown intelligence, while Trek saw it as proof that human evolution had already begun elsewhere. As they followed the signal, ideological tension grew—one seeking to contain it, the other longing to embrace it.",
     "source":"example_world",
     "language":"en"
 

frontend/js/right-section/api-panel.js

@@ -73,10 +73,10 @@ class APIPanel {
 
         const provider = this.providerSelect.value;
         const models = {
-            openai: ['gpt-3.5-turbo', 'gpt-4'],
-            anthropic: ['claude-3-opus', 'claude-3-sonnet'],
-            alibaba: ['qwen-turbo', 'qwen-max'],
-            openrouter: ['gpt-4o-mini']
+            openai: ['gpt-4o-mini', 'gpt-4o', 'gpt-4'],
+            anthropic: ['claude-3.5-sonnet', 'claude-3.7-sonnet', 'claude-3.5-haiku'],
+            alibaba: ['qwen-turbo', 'qwen-max','qwen-plus'],
+            openrouter: ['gpt-4o-mini','gpt-4o','gemini-2.0-flash','claude-3.5-sonnet','deepseek-r1']
         };
 
         const currentModelValue = this.modelSelect.value;

modules/llm/Claude.py

@@ -8,7 +8,7 @@ from .BaseLLM import BaseLLM
 
 class Claude(BaseLLM):
 
-    def __init__(self, model="claude-3-5-sonnet-20240620"):
+    def __init__(self, model="claude-3-5-sonnet-latest"):
         super(Claude, self).__init__()
         self.model_name = model
         self.client = anthropic.Anthropic(

modules/llm/Gemini.py

@@ -1,14 +1,12 @@
 from .BaseLLM import BaseLLM
-import google.generativeai as genai
+from google import genai
 import os
 import time
 
 class Gemini(BaseLLM):
-    def __init__(self, model="gemini-1.5-flash"):
+    def __init__(self, model="gemini-2.0-flash"):
         super(Gemini, self).__init__()
-        genai.configure(api_key=os.getenv("GEMINI_API_KEY"))
         self.model_name = model
-        self.model = genai.GenerativeModel(model)
         self.messages = []
 
 
@@ -16,29 +14,26 @@ class Gemini(BaseLLM):
         self.messages = []
 
     def ai_message(self, payload):
-        self.messages.append({"role": "model", "parts": payload})
+        self.messages.append(payload)
 
     def system_message(self, payload):
-        self.messages.append({"role": "system", "parts": payload})
+        self.messages.append(payload)
 
     def user_message(self, payload):
-        self.messages.append({"role": "user", "parts": payload})
+        self.messages.append(payload)
 
     def get_response(self,temperature = 0.8):
-        time.sleep(3)
-        chat = self.model.start_chat(
-            history = self.messages
+        response = genai.Client(api_key=os.getenv("GEMINI_API_KEY")).models.generate_content(
+        model=self.model_name, contents="".join(self.messages), temperature = temperature
         )
-        response = chat.send_message(generation_config=genai.GenerationConfig(
-        temperature=temperature,
-        ))
-        
         return response.text
     
     def chat(self,text):
-        chat = self.model.start_chat()
-        response = chat.send_message(text)
-        return response.text
+        self.initialize_message()
+        self.user_message(text)
+        response = self.get_response()
+        
+        return response
     
     def print_prompt(self):
         for message in self.messages:

modules/world_agent.py

@@ -153,7 +153,7 @@ class WorldAgent:
         
         return response["if_end"],response["detail"]
         
-    def decide_screen_actors(self,roles_info_text, history_text, event, previous_role_codes):
+    def decide_scene_actors(self,roles_info_text, history_text, event, previous_role_codes):
         prompt = self._SELECT_SCREEN_ACTORS_PROMPT.format(**{
             "roles_info":roles_info_text,
             "history_text":history_text,

requirements.txt

@@ -13,5 +13,5 @@ transformers
 uvicorn
 pillow
 faiss-cpu
-google-generativeai
+google-genai
 huggingface_hub[cli]