pycityagent 2.0.0a15__py3-none-any.whl → 2.0.0a17__py3-none-any.whl

pycityagent/agent.py

@@ -9,7 +9,7 @@ from enum import Enum
 import logging
 import random
 import uuid
-from typing import Dict, List, Optional
+from typing import Dict, List, Optional,Any
 
 import fastavro
 
@@ -80,6 +80,7 @@ class Agent(ABC):
         self._simulator = simulator
         self._memory = memory
         self._exp_id = -1
+        self._agent_id = -1
         self._has_bound_to_simulator = False
         self._has_bound_to_economy = False
         self._blocked = False
@@ -224,8 +225,8 @@ class Agent(ABC):
             return
         response_to_avro = [{
             "id": self._uuid,
-            "day": await self._simulator.get_simulator_day(),
-            "t": await self._simulator.get_simulator_second_from_start_of_day(),
+            "day": await self.simulator.get_simulator_day(),
+            "t": await self.simulator.get_simulator_second_from_start_of_day(),
             "survey_id": survey["id"],
             "result": survey_response,
             "created_at": int(datetime.now().timestamp() * 1000),
@@ -273,8 +274,8 @@ class Agent(ABC):
     async def _process_interview(self, payload: dict):
         auros = [{
             "id": self._uuid,
-            "day": await self._simulator.get_simulator_day(),
-            "t": await self._simulator.get_simulator_second_from_start_of_day(),
+            "day": await self.simulator.get_simulator_day(),
+            "t": await self.simulator.get_simulator_second_from_start_of_day(),
             "type": 2,
             "speaker": "user",
             "content": payload["content"],
@@ -284,8 +285,8 @@ class Agent(ABC):
         response = await self.generate_user_chat_response(question)
         auros.append({
             "id": self._uuid,
-            "day": await self._simulator.get_simulator_day(),
-            "t": await self._simulator.get_simulator_second_from_start_of_day(),
+            "day": await self.simulator.get_simulator_day(),
+            "t": await self.simulator.get_simulator_second_from_start_of_day(),
             "type": 2,
             "speaker": "",
             "content": response,
@@ -297,7 +298,9 @@ class Agent(ABC):
             fastavro.writer(f, DIALOG_SCHEMA, auros, codec="snappy")
 
     async def process_agent_chat_response(self, payload: dict) -> str:
-        logger.info(f"Agent {self._uuid} received agent chat response: {payload}")
+        resp = f"Agent {self._uuid} received agent chat response: {payload}"
+        logger.info(resp)
+        return resp
 
     async def _process_agent_chat(self, payload: dict):
         auros = [{
@@ -334,7 +337,7 @@ class Agent(ABC):
         logger.info(f"Agent {self._uuid} received user survey message: {payload}")
         asyncio.create_task(self._process_survey(payload["data"]))
 
-    async def handle_gather_message(self, payload: str):
+    async def handle_gather_message(self, payload: Any):
         raise NotImplementedError
 
     # MQTT send message
@@ -357,14 +360,14 @@ class Agent(ABC):
             "from": self._uuid,
             "content": content,
             "timestamp": int(datetime.now().timestamp() * 1000),
-            "day": await self._simulator.get_simulator_day(),
-            "t": await self._simulator.get_simulator_second_from_start_of_day(),
+            "day": await self.simulator.get_simulator_day(),
+            "t": await self.simulator.get_simulator_second_from_start_of_day(),
         }
         await self._send_message(to_agent_uuid, payload, "agent-chat")
         auros = [{
             "id": self._uuid,
-            "day": await self._simulator.get_simulator_day(),
-            "t": await self._simulator.get_simulator_second_from_start_of_day(),
+            "day": await self.simulator.get_simulator_day(),
+            "t": await self.simulator.get_simulator_second_from_start_of_day(),
             "type": 1,
             "speaker": self._uuid,
             "content": content,
@@ -440,8 +443,8 @@ class CitizenAgent(Agent):
                 "pedestrian_attribute",
                 "bike_attribute",
             }
-            simulator = self._simulator
-            memory = self._memory
+            simulator = self.simulator
+            memory = self.memory
             person_id = await memory.get("id")
             # ATTENTION:模拟器分配的id从0开始
             if person_id >= 0:
@@ -478,11 +481,11 @@ class CitizenAgent(Agent):
                     await self._economy_client.remove_agents([self._agent_id])
                 except:
                     pass
-                person_id = await self._memory.get("id")
+                person_id = await self.memory.get("id")
                 await self._economy_client.add_agents(
                     {
                         "id": person_id,
-                        "currency": await self._memory.get("currency"),
+                        "currency": await self.memory.get("currency"),
                     }
                 )
                 self._has_bound_to_economy = True
@@ -543,62 +546,63 @@ class InstitutionAgent(Agent):
             # TODO: More general id generation
             _id = random.randint(100000, 999999)
             self._agent_id = _id
-            await self._memory.update("id", _id, protect_llm_read_only_fields=False)
+            await self.memory.update("id", _id, protect_llm_read_only_fields=False)
             try:
                 await self._economy_client.remove_orgs([self._agent_id])
             except:
                 pass
             try:
-                id = await self._memory.get("id")
-                type = await self._memory.get("type")
+                _memory = self.memory
+                _id = await _memory.get("id")
+                _type = await _memory.get("type")
                 try:
-                    nominal_gdp = await self._memory.get("nominal_gdp")
+                    nominal_gdp = await _memory.get("nominal_gdp")
                 except:
                     nominal_gdp = []
                 try:
-                    real_gdp = await self._memory.get("real_gdp")
+                    real_gdp = await _memory.get("real_gdp")
                 except:
                     real_gdp = []
                 try:
-                    unemployment = await self._memory.get("unemployment")
+                    unemployment = await _memory.get("unemployment")
                 except:
                     unemployment = []
                 try:
-                    wages = await self._memory.get("wages")
+                    wages = await _memory.get("wages")
                 except:
                     wages = []
                 try:
-                    prices = await self._memory.get("prices")
+                    prices = await _memory.get("prices")
                 except:
                     prices = []
                 try:
-                    inventory = await self._memory.get("inventory")
+                    inventory = await _memory.get("inventory")
                 except:
                     inventory = 0
                 try:
-                    price = await self._memory.get("price")
+                    price = await _memory.get("price")
                 except:
                     price = 0
                 try:
-                    currency = await self._memory.get("currency")
+                    currency = await _memory.get("currency")
                 except:
                     currency = 0.0
                 try:
-                    interest_rate = await self._memory.get("interest_rate")
+                    interest_rate = await _memory.get("interest_rate")
                 except:
                     interest_rate = 0.0
                 try:
-                    bracket_cutoffs = await self._memory.get("bracket_cutoffs")
+                    bracket_cutoffs = await _memory.get("bracket_cutoffs")
                 except:
                     bracket_cutoffs = []
                 try:
-                    bracket_rates = await self._memory.get("bracket_rates")
+                    bracket_rates = await _memory.get("bracket_rates")
                 except:
                     bracket_rates = []
                 await self._economy_client.add_orgs(
                     {
-                        "id": id,
-                        "type": type,
+                        "id": _id,
+                        "type": _type,
                         "nominal_gdp": nominal_gdp,
                         "real_gdp": real_gdp,
                         "unemployment": unemployment,

pycityagent/economy/econ_client.py

@@ -307,3 +307,12 @@ class EconomyClient:
         )
         # current agent ids and org ids
         return (list(response.agent_ids), list(response.org_ids))
+
+    async def get_org_entity_ids(self, org_type: economyv2.OrgType)->list[int]:
+        request = org_service.GetOrgEntityIdsRequest(
+            type=org_type,
+        )
+        response: org_service.GetOrgEntityIdsResponse = (
+            await self._aio_stub.GetOrgEntityIds(request)
+        )
+        return list(response.org_ids)

pycityagent/simulation/agentgroup.py

@@ -20,7 +20,7 @@ logger = logging.getLogger("pycityagent")
 
 @ray.remote
 class AgentGroup:
-    def __init__(self, agents: list[Agent], config: dict, exp_id: str|UUID, enable_avro: bool, avro_path: Path, logging_level: int = logging.WARNING):
+    def __init__(self, agents: list[Agent], config: dict, exp_id: str|UUID, enable_avro: bool, avro_path: Path, logging_level: int):
         logger.setLevel(logging_level)
         self._uuid = str(uuid.uuid4())
         self.agents = agents
@@ -64,20 +64,20 @@ class AgentGroup:
             self.economy_client = None
 
         for agent in self.agents:
-            agent.set_exp_id(self.exp_id)
+            agent.set_exp_id(self.exp_id) # type: ignore
             agent.set_llm_client(self.llm)
             agent.set_simulator(self.simulator)
             if self.economy_client is not None:
                 agent.set_economy_client(self.economy_client)
             agent.set_messager(self.messager)
             if self.enable_avro:
-                agent.set_avro_file(self.avro_file)
+                agent.set_avro_file(self.avro_file) # type: ignore
 
     async def init_agents(self):
         logger.debug(f"-----Initializing Agents in AgentGroup {self._uuid} ...")
         logger.debug(f"-----Binding Agents to Simulator in AgentGroup {self._uuid} ...")
         for agent in self.agents:
-            await agent.bind_to_simulator()
+            await agent.bind_to_simulator() # type: ignore
         self.id2agent = {agent._uuid: agent for agent in self.agents}
         logger.debug(f"-----Binding Agents to Messager in AgentGroup {self._uuid} ...")
         await self.messager.connect()

pycityagent/simulation/simulation.py

@@ -2,19 +2,22 @@ import asyncio
 import json
 import logging
 import os
-from pathlib import Path
+import random
 import uuid
+from collections.abc import Sequence
+from concurrent.futures import ThreadPoolExecutor
 from datetime import datetime, timezone
-import random
-from typing import Dict, List, Optional, Callable, Union,Any
-from mosstool.map._map_util.const import AOI_START_ID
+from pathlib import Path
+from typing import Any, Callable, Dict, List, Optional, Union
+
 import pycityproto.city.economy.v2.economy_pb2 as economyv2
+import yaml
+from mosstool.map._map_util.const import AOI_START_ID
+
 from pycityagent.environment.simulator import Simulator
 from pycityagent.memory.memory import Memory
 from pycityagent.message.messager import Messager
 from pycityagent.survey import Survey
-import yaml
-from concurrent.futures import ThreadPoolExecutor
 
 from ..agent import Agent, InstitutionAgent
 from .agentgroup import AgentGroup
@@ -31,7 +34,7 @@ class AgentSimulation:
         config: dict,
         agent_prefix: str = "agent_",
         exp_name: str = "default_experiment",
-        logging_level: int = logging.WARNING
+        logging_level: int = logging.WARNING,
     ):
         """
         Args:
@@ -50,8 +53,8 @@ class AgentSimulation:
         self._simulator = Simulator(config["simulator_request"])
         self.agent_prefix = agent_prefix
         self._agents: Dict[uuid.UUID, Agent] = {}
-        self._groups: Dict[str, AgentGroup] = {}
-        self._agent_uuid2group: Dict[uuid.UUID, AgentGroup] = {}
+        self._groups: Dict[str, AgentGroup] = {}  # type:ignore
+        self._agent_uuid2group: Dict[uuid.UUID, AgentGroup] = {}  # type:ignore
         self._agent_uuids: List[uuid.UUID] = []
         self._user_chat_topics: Dict[uuid.UUID, str] = {}
         self._user_survey_topics: Dict[uuid.UUID, str] = {}
@@ -89,33 +92,44 @@ class AgentSimulation:
             "cur_t": 0.0,
             "config": json.dumps(config),
             "error": "",
-            "created_at": datetime.now(timezone.utc).isoformat()
+            "created_at": datetime.now(timezone.utc).isoformat(),
         }
-        
+
         # 创建异步任务保存实验信息
         self._exp_info_file = self._avro_path / "experiment_info.yaml"
-        with open(self._exp_info_file, 'w') as f:
+        with open(self._exp_info_file, "w") as f:
             yaml.dump(self._exp_info, f)
 
     @property
     def agents(self):
         return self._agents
-    
+
     @property
     def groups(self):
         return self._groups
-    
+
     @property
     def agent_uuids(self):
         return self._agent_uuids
-    
+
     @property
     def agent_uuid2group(self):
         return self._agent_uuid2group
-    
-    def create_remote_group(self, group_name: str, agents: list[Agent], config: dict, exp_id: str, enable_avro: bool, avro_path: Path, logging_level: int = logging.WARNING):
+
+    def create_remote_group(
+        self,
+        group_name: str,
+        agents: list[Agent],
+        config: dict,
+        exp_id: str,
+        enable_avro: bool,
+        avro_path: Path,
+        logging_level: int = logging.WARNING,
+    ):
         """创建远程组"""
-        group = AgentGroup.remote(agents, config, exp_id, enable_avro, avro_path, logging_level)
+        group = AgentGroup.remote(
+            agents, config, exp_id, enable_avro, avro_path, logging_level
+        )
         return group_name, group, agents
 
     async def init_agents(
@@ -164,7 +178,7 @@ class AgentSimulation:
         # 使用线程池并行创建 AgentGroup
         group_creation_params = []
         class_init_index = 0
-        
+
         # 首先收集所有需要创建的组的参数
         for i in range(len(self.agent_class)):
             agent_class = self.agent_class[i]
@@ -175,9 +189,7 @@ class AgentSimulation:
 
                 # 获取Memory配置
                 extra_attributes, profile, base = memory_config_func_i()
-                memory = Memory(
-                    config=extra_attributes, profile=profile, base=base
-                )
+                memory = Memory(config=extra_attributes, profile=profile, base=base)
 
                 # 创建智能体时传入Memory配置
                 agent = agent_class(
@@ -190,34 +202,36 @@ class AgentSimulation:
 
             # 计算需要的组数,向上取整以处理不足一组的情况
             num_group = (agent_count_i + group_size - 1) // group_size
-            
+
             for k in range(num_group):
                 start_idx = class_init_index + k * group_size
                 end_idx = min(
                     class_init_index + (k + 1) * group_size,  # 修正了索引计算
-                    class_init_index + agent_count_i
+                    class_init_index + agent_count_i,
                 )
-                
+
                 agents = list(self._agents.values())[start_idx:end_idx]
                 group_name = f"AgentType_{i}_Group_{k}"
-                
+
                 # 收集创建参数
-                group_creation_params.append((
-                    group_name, 
-                    agents
-                ))
-            
+                group_creation_params.append((group_name, agents))
+
             class_init_index += agent_count_i
 
         # 收集所有创建组的参数
         creation_tasks = []
         for group_name, agents in group_creation_params:
             # 直接创建异步任务
-            group = AgentGroup.remote(agents, self.config, self.exp_id, 
-                                    self._enable_avro, self._avro_path, 
-                                    self.logging_level)
+            group = AgentGroup.remote(
+                agents,
+                self.config,
+                self.exp_id,
+                self._enable_avro,
+                self._avro_path,
+                self.logging_level,
+            )
             creation_tasks.append((group_name, group, agents))
-        
+
         # 更新数据结构
         for group_name, group, agents in creation_tasks:
             self._groups[group_name] = group
@@ -233,7 +247,9 @@ class AgentSimulation:
         # 设置用户主题
         for uuid, agent in self._agents.items():
             self._user_chat_topics[uuid] = f"exps/{self.exp_id}/agents/{uuid}/user-chat"
-            self._user_survey_topics[uuid] = f"exps/{self.exp_id}/agents/{uuid}/user-survey"
+            self._user_survey_topics[uuid] = (
+                f"exps/{self.exp_id}/agents/{uuid}/user-survey"
+            )
 
     async def gather(self, content: str):
         """收集智能体的特定信息"""
@@ -250,7 +266,18 @@ class AgentSimulation:
     def default_memory_config_institution(self):
         """默认的Memory配置函数"""
         EXTRA_ATTRIBUTES = {
-            "type": (int, random.choice([economyv2.ORG_TYPE_BANK, economyv2.ORG_TYPE_GOVERNMENT, economyv2.ORG_TYPE_FIRM, economyv2.ORG_TYPE_NBS, economyv2.ORG_TYPE_UNSPECIFIED])),
+            "type": (
+                int,
+                random.choice(
+                    [
+                        economyv2.ORG_TYPE_BANK,
+                        economyv2.ORG_TYPE_GOVERNMENT,
+                        economyv2.ORG_TYPE_FIRM,
+                        economyv2.ORG_TYPE_NBS,
+                        economyv2.ORG_TYPE_UNSPECIFIED,
+                    ]
+                ),
+            ),
             "nominal_gdp": (list, [], True),
             "real_gdp": (list, [], True),
             "unemployment": (list, [], True),
@@ -364,29 +391,35 @@ class AgentSimulation:
         }
 
         return EXTRA_ATTRIBUTES, PROFILE, BASE
-    
-    async def send_survey(self, survey: Survey, agent_uuids: Optional[List[uuid.UUID]] = None):
+
+    async def send_survey(
+        self, survey: Survey, agent_uuids: Optional[List[uuid.UUID]] = None
+    ):
         """发送问卷"""
-        survey = survey.to_dict()
+        survey_dict = survey.to_dict()
         if agent_uuids is None:
             agent_uuids = self._agent_uuids
         payload = {
             "from": "none",
-            "survey_id": survey["id"],
+            "survey_id": survey_dict["id"],
             "timestamp": int(datetime.now().timestamp() * 1000),
-            "data": survey,
+            "data": survey_dict,
         }
         for uuid in agent_uuids:
             topic = self._user_survey_topics[uuid]
             await self._messager.send_message(topic, payload)
 
-    async def send_interview_message(self, content: str, agent_uuids: Union[uuid.UUID, List[uuid.UUID]]):
+    async def send_interview_message(
+        self, content: str, agent_uuids: Union[uuid.UUID, List[uuid.UUID]]
+    ):
         """发送面试消息"""
         payload = {
             "from": "none",
             "content": content,
             "timestamp": int(datetime.now().timestamp() * 1000),
         }
+        if not isinstance(agent_uuids, Sequence):
+            agent_uuids = [agent_uuids]
         for uuid in agent_uuids:
             topic = self._user_chat_topics[uuid]
             await self._messager.send_message(topic, payload)
@@ -405,7 +438,7 @@ class AgentSimulation:
     async def _save_exp_info(self) -> None:
         """异步保存实验信息到YAML文件"""
         try:
-            with open(self._exp_info_file, 'w') as f:
+            with open(self._exp_info_file, "w") as f:
                 yaml.dump(self._exp_info, f)
         except Exception as e:
             logger.error(f"保存实验信息失败: {str(e)}")
@@ -418,20 +451,22 @@ class AgentSimulation:
 
     async def _monitor_exp_status(self, stop_event: asyncio.Event):
         """监控实验状态并更新
-        
+
         Args:
             stop_event: 用于通知监控任务停止的事件
         """
         try:
-            while not stop_event.is_set():  
+            while not stop_event.is_set():
                 # 更新实验状态
                 # 假设所有group的cur_day和cur_t是同步的，取第一个即可
                 self._exp_info["cur_day"] = await self._simulator.get_simulator_day()
-                self._exp_info["cur_t"] = await self._simulator.get_simulator_second_from_start_of_day()
+                self._exp_info["cur_t"] = (
+                    await self._simulator.get_simulator_second_from_start_of_day()
+                )
                 await self._save_exp_info()
-                
+
                 await asyncio.sleep(1)  # 避免过于频繁的更新
-        except asyncio.CancelError:
+        except asyncio.CancelledError:
             # 正常取消，不需要特殊处理
             pass
         except Exception as e:
@@ -446,12 +481,12 @@ class AgentSimulation:
         try:
             self._exp_info["num_day"] += day
             await self._update_exp_status(1)  # 更新状态为运行中
-            
+
             # 创建停止事件
             stop_event = asyncio.Event()
             # 创建监控任务
             monitor_task = asyncio.create_task(self._monitor_exp_status(stop_event))
-            
+
             try:
                 tasks = []
                 for group in self._groups.values():
@@ -459,13 +494,13 @@ class AgentSimulation:
 
                 # 等待所有group运行完成
                 await asyncio.gather(*tasks)
-                
+
             finally:
                 # 设置停止事件
                 stop_event.set()
                 # 等待监控任务结束
                 await monitor_task
-            
+
             # 运行成功后更新状态
             await self._update_exp_status(2)
 

pycityagent/survey/manager.py

@@ -1,17 +1,16 @@
-from typing import List, Dict, Optional
-from datetime import datetime
-import uuid
 import json
-from .models import Survey, Question, QuestionType, Page
+import uuid
+from datetime import datetime
+from typing import Optional
+
+from .models import Page, Question, QuestionType, Survey
 
 
 class SurveyManager:
     def __init__(self):
-        self._surveys: Dict[str, Survey] = {}
+        self._surveys: dict[str, Survey] = {}
 
-    def create_survey(
-        self, title: str, description: str, pages: List[dict]
-    ) -> Survey:
+    def create_survey(self, title: str, description: str, pages: list[dict]) -> Survey:
         """创建新问卷"""
         survey_id = uuid.uuid4()
 
@@ -32,11 +31,8 @@ class SurveyManager:
                     max_rating=q.get("max_rating", 5),
                 )
                 questions.append(question)
-            
-            page = Page(
-                name=page_data["name"],
-                elements=questions
-            )
+
+            page = Page(name=page_data["name"], elements=questions)
             survey_pages.append(page)
 
         survey = Survey(
@@ -53,6 +49,6 @@ class SurveyManager:
         """获取指定问卷"""
         return self._surveys.get(survey_id)
 
-    def get_all_surveys(self) -> List[Survey]:
+    def get_all_surveys(self) -> list[Survey]:
         """获取所有问卷"""
         return list(self._surveys.values())

pycityagent/survey/models.py

@@ -1,9 +1,9 @@
+import json
+import uuid
 from dataclasses import dataclass, field
-from typing import List, Dict, Optional
 from datetime import datetime
 from enum import Enum
-import uuid
-import json
+from typing import Any
 
 
 class QuestionType(Enum):
@@ -20,19 +20,20 @@ class Question:
     name: str
     title: str
     type: QuestionType
-    choices: List[str] = field(default_factory=list)
-    columns: List[str] = field(default_factory=list)
-    rows: List[str] = field(default_factory=list)
+    choices: list[str] = field(default_factory=list)
+    columns: list[str] = field(default_factory=list)
+    rows: list[str] = field(default_factory=list)
+    required: bool = True
     min_rating: int = 1
     max_rating: int = 5
 
     def to_dict(self) -> dict:
-        base_dict = {
+        base_dict: dict[str, Any] = {
             "type": self.type.value,
             "name": self.name,
             "title": self.title,
         }
-        
+
         if self.type in [QuestionType.RADIO, QuestionType.CHECKBOX]:
             base_dict["choices"] = self.choices
         elif self.type == QuestionType.MATRIX:
@@ -41,20 +42,17 @@ class Question:
         elif self.type == QuestionType.RATING:
             base_dict["min_rating"] = self.min_rating
             base_dict["max_rating"] = self.max_rating
-            
+
         return base_dict
 
 
 @dataclass
 class Page:
     name: str
-    elements: List[Question]
+    elements: list[Question]
 
     def to_dict(self) -> dict:
-        return {
-            "name": self.name,
-            "elements": [q.to_dict() for q in self.elements]
-        }
+        return {"name": self.name, "elements": [q.to_dict() for q in self.elements]}
 
 
 @dataclass
@@ -62,8 +60,8 @@ class Survey:
     id: uuid.UUID
     title: str
     description: str
-    pages: List[Page]
-    responses: Dict[str, dict] = field(default_factory=dict)
+    pages: list[Page]
+    responses: dict[str, dict] = field(default_factory=dict)
     created_at: datetime = field(default_factory=datetime.now)
 
     def to_dict(self) -> dict:
@@ -83,12 +81,12 @@ class Survey:
             "description": self.description,
             "pages": [p.to_dict() for p in self.pages],
             "responses": self.responses,
-            "created_at": self.created_at.isoformat()
+            "created_at": self.created_at.isoformat(),
         }
         return json.dumps(survey_dict)
 
     @classmethod
-    def from_json(cls, json_str: str) -> 'Survey':
+    def from_json(cls, json_str: str) -> "Survey":
         """Create a Survey instance from a JSON string"""
         data = json.loads(json_str)
         pages = [
@@ -104,17 +102,19 @@ class Survey:
                         columns=q.get("columns", []),
                         rows=q.get("rows", []),
                         min_rating=q.get("min_rating", 1),
-                        max_rating=q.get("max_rating", 5)
-                    ) for q in p["elements"]
-                ]
-            ) for p in data["pages"]
+                        max_rating=q.get("max_rating", 5),
+                    )
+                    for q in p["elements"]
+                ],
+            )
+            for p in data["pages"]
         ]
-        
+
         return cls(
             id=uuid.UUID(data["id"]),
             title=data["title"],
             description=data["description"],
             pages=pages,
             responses=data.get("responses", {}),
-            created_at=datetime.fromisoformat(data["created_at"])
+            created_at=datetime.fromisoformat(data["created_at"]),
         )

pycityagent/workflow/tool.py

@@ -139,7 +139,7 @@ class UpdateWithSimulator(Tool):
         if agent._simulator is None:
             return
         if not agent._has_bound_to_simulator:
-            await self._bind_to_simulator()
+            await agent._bind_to_simulator() # type: ignore
         simulator = agent.simulator
         memory = agent.memory
         person_id = await memory.get("id")

{pycityagent-2.0.0a15.dist-info → pycityagent-2.0.0a17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycityagent
-Version: 2.0.0a15
+Version: 2.0.0a17
 Summary: LLM-based城市环境agent构建库
 License: MIT
 Author: Yuwei Yan
@@ -24,6 +24,7 @@ Requires-Dist: fastavro (>=1.10.0,<2.0.0)
 Requires-Dist: geojson (==3.1.0)
 Requires-Dist: gradio (>=5.7.1,<6.0.0)
 Requires-Dist: grpcio (==1.67.1)
+Requires-Dist: langchain-core (>=0.3.28,<0.4.0)
 Requires-Dist: matplotlib (==3.8.3)
 Requires-Dist: mosstool (==1.0.24)
 Requires-Dist: networkx (==3.2.1)
@@ -33,7 +34,7 @@ Requires-Dist: pandavro (>=1.8.0,<2.0.0)
 Requires-Dist: poetry (>=1.2.2)
 Requires-Dist: protobuf (<=4.24.0)
 Requires-Dist: pycitydata (==1.0.0)
-Requires-Dist: pycityproto (==2.0.7)
+Requires-Dist: pycityproto (>=2.1.4,<3.0.0)
 Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
 Requires-Dist: ray (>=2.40.0,<3.0.0)
 Requires-Dist: sidecar (==0.7.0)

{pycityagent-2.0.0a15.dist-info → pycityagent-2.0.0a17.dist-info}/RECORD

@@ -1,7 +1,7 @@
 pycityagent/__init__.py,sha256=EDxt3Su3lH1IMh9suNw7GeGL7UrXeWiZTw5KWNznDzc,637
-pycityagent/agent.py,sha256=fcuKX6FtMzjNP8lVep9pG-9KHzHQwJ8IymJbmLKMfu0,23109
+pycityagent/agent.py,sha256=t9W9sKxtQ0EkMxL78kAjAu-rXigEK6gyLY0IEA4DbnQ,23143
 pycityagent/economy/__init__.py,sha256=aonY4WHnx-6EGJ4WKrx4S-2jAkYNLtqUA04jp6q8B7w,75
-pycityagent/economy/econ_client.py,sha256=wcuNtcpkSijJwNkt2mXw3SshYy4SBy6qbvJ0VQ7Aovo,10854
+pycityagent/economy/econ_client.py,sha256=DE11Ng_NO_foW65A-LxFW0VED-HLrnn4GwUf_Xn-Tlg,11189
 pycityagent/environment/__init__.py,sha256=awHxlOud-btWbk0FCS4RmGJ13W84oVCkbGfcrhKqihA,240
 pycityagent/environment/interact/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycityagent/environment/interact/interact.py,sha256=ifxPPzuHeqLHIZ_6zvfXMoBOnBsXNIP4bYp7OJ7pnEQ,6588
@@ -46,11 +46,11 @@ pycityagent/memory/utils.py,sha256=wLNlNlZ-AY9VB8kbUIy0UQSYh26FOQABbhmKQkit5o8,8
 pycityagent/message/__init__.py,sha256=TCjazxqb5DVwbTu1fF0sNvaH_EPXVuj2XQ0p6W-QCLU,55
 pycityagent/message/messager.py,sha256=W_OVlNGcreHSBf6v-DrEnfNCXExB78ySr0w26MSncfU,2541
 pycityagent/simulation/__init__.py,sha256=jYaqaNpzM5M_e_ykISS_M-mIyYdzJXJWhgpfBpA6l5k,111
-pycityagent/simulation/agentgroup.py,sha256=JwfssUtVrOgSnJCan4jcIcSHLjWBCwYxqOPT-AXA2sE,12514
-pycityagent/simulation/simulation.py,sha256=G68P1EJ3JceA3zID2O6AGd_KdhhYy5XVZVUgkfJHypc,18897
+pycityagent/simulation/agentgroup.py,sha256=M19XWJRWyjMAYS0_RIOBQ2C7I1MuVYIaX3DgehGZL2Y,12541
+pycityagent/simulation/simulation.py,sha256=TndrMZSm6qe_wgfv9h6mL9oAiAEHbq6KHBwdwUGG_3k,19261
 pycityagent/survey/__init__.py,sha256=rxwou8U9KeFSP7rMzXtmtp2fVFZxK4Trzi-psx9LPIs,153
-pycityagent/survey/manager.py,sha256=N4-Q8vve4L-PLaFikAgVB4Z8BNyFDEd6WjEk3AyMTgs,1764
-pycityagent/survey/models.py,sha256=Z2gHEazQRj0TkTz5qbh4Uy_JrU_FZGWpOLwjN0RoUrY,3547
+pycityagent/survey/manager.py,sha256=S5IkwTdelsdtZETChRcfCEczzwSrry_Fly9MY4s3rbk,1681
+pycityagent/survey/models.py,sha256=YE50UUt5qJ0O_lIUsSY6XFCGUTkJVNu_L1gAhaCJ2fs,3546
 pycityagent/utils/__init__.py,sha256=xXEMhVfFeOJUXjczaHv9DJqYNp57rc6FibtS7CfrVbA,305
 pycityagent/utils/avro_schema.py,sha256=DHM3bOo8m0dJf8oSwyOWzVeXrH6OERmzA_a5vS4So4M,4255
 pycityagent/utils/decorators.py,sha256=Gk3r41hfk6awui40tbwpq3C7wC7jHaRmLRlcJFlLQCE,3160
@@ -62,8 +62,8 @@ pycityagent/utils/survey_util.py,sha256=Be9nptmu2JtesFNemPgORh_2GsN7rcDYGQS9Zfvc
 pycityagent/workflow/__init__.py,sha256=EyCcjB6LyBim-5iAOPe4m2qfvghEPqu1ZdGfy4KPeZ8,551
 pycityagent/workflow/block.py,sha256=6EmiRMLdOZC1wMlmLMIjfrp9TuiI7Gw4s3nnXVMbrnw,6031
 pycityagent/workflow/prompt.py,sha256=tY69nDO8fgYfF_dOA-iceR8pAhkYmCqoox8uRPqEuGY,2956
-pycityagent/workflow/tool.py,sha256=zMvz3BV4QBs5TqyQ3ziJxj4pCfL2uqUI3A1FbT1gd3Q,6626
+pycityagent/workflow/tool.py,sha256=_bCluIX8HTC8ZW6a-wrMB3Uhx2yzD8sM8XFDI3vd0MM,6642
 pycityagent/workflow/trigger.py,sha256=t5X_i0WtL32bipZSsq_E3UUyYYudYLxQUpvxbgClp2s,5683
-pycityagent-2.0.0a15.dist-info/METADATA,sha256=8ONKHaTIPOGja6FKJDE9tZ-pLZL2aeXQufB-LWkElR8,7705
-pycityagent-2.0.0a15.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pycityagent-2.0.0a15.dist-info/RECORD,,
+pycityagent-2.0.0a17.dist-info/METADATA,sha256=fxmJlP11NGtkwMyZr8QB1U2_0lgynLasG6z7GOEZCus,7760
+pycityagent-2.0.0a17.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pycityagent-2.0.0a17.dist-info/RECORD,,