pycityagent 2.0.0a95__cp312-cp312-macosx_11_0_arm64.whl → 2.0.0a96__cp312-cp312-macosx_11_0_arm64.whl

pycityagent/agent/agent_base.py

@@ -260,20 +260,16 @@ class Agent(ABC):
             - Recursively updates or creates top-level Blocks as specified in the configuration.
             - Raises a `KeyError` if a required Block is not found in the agent.
         """
-        # 使用配置更新当前Agent实例的Block层次结构。
-        # 更新当前Agent的基础参数
         for field in self.configurable_fields:
             if field in config["config"]:
                 if config["config"][field] != "default_value":
                     setattr(self, field, config["config"][field])
 
-        # 递归更新或创建顶层Block
         for block_data in config.get("blocks", []):
             block_name = block_data["name"]
             existing_block = getattr(self, block_name, None)  # type:ignore
 
             if existing_block:
-                # 如果Block已经存在，则递归更新
                 existing_block.load_from_config(block_data)
             else:
                 raise KeyError(

pycityagent/configs/exp_config.py

@@ -29,7 +29,7 @@ class AgentConfig(BaseModel):
     number_of_nbs: int = Field(1, description="Number of neighborhood-based services")
     group_size: int = Field(100, description="Size of agent groups")
     embedding_model: Any = Field(None, description="Embedding model")
-    agent_class_configs: Optional[dict[Any, dict[str, list[dict]]]] = None
+    agent_class_configs: Optional[dict[Any, dict[str, Any]]] = None
     memory_config_func: Optional[dict[type["Any"], Callable]] = None
     memory_config_init_func: Optional[Callable] = Field(None)
     init_func: Optional[list[Callable[["AgentSimulation"], None]]] = None
@@ -47,7 +47,7 @@ class AgentConfig(BaseModel):
         number_of_nbs: int = 1,
         group_size: int = 100,
         embedding_model: Any = None,
-        agent_class_configs: Optional[dict[Any, dict[str, list[dict]]]] = None,
+        agent_class_configs: Optional[dict[Any, dict[str, Any]]] = None,
         enable_institution: bool = True,
         memory_config_func: Optional[dict[type["Any"], Callable]] = None,
         memory_config_init_func: Optional[Callable] = None,

pycityagent/simulation/agentgroup.py

@@ -192,7 +192,7 @@ class AgentGroup:
                     self.agent_config_file is not None
                     and self.agent_config_file[agent_class_i]
                 ):
-                    agent.load_from_file(self.agent_config_file[agent_class_i])
+                    agent.load_from_config(self.agent_config_file[agent_class_i])
                 if self._message_interceptor is not None:
                     agent.set_message_interceptor(self._message_interceptor)
                 self.agents.append(agent)

{pycityagent-2.0.0a95.dist-info → pycityagent-2.0.0a96.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pycityagent
-Version: 2.0.0a95
+Version: 2.0.0a96
 Summary: LLM-based city environment agent building library
 Author-email: Yuwei Yan <pinkgranite86@gmail.com>, Junbo Yan <yanjb20thu@gmali.com>, Jun Zhang <zhangjun990222@gmali.com>
 License: MIT License

{pycityagent-2.0.0a95.dist-info → pycityagent-2.0.0a96.dist-info}/RECORD

@@ -20,7 +20,7 @@ pycityagent/memory/faiss_query.py,sha256=KPeyzIjD0dzkxr-TlOeCiIlkdh1WAyyipCAXUEt
 pycityagent/memory/state.py,sha256=JFCBuK1AS-HqscvdGS9ATF9AUU8t29_2leDY_6iO2_4,5158
 pycityagent/simulation/simulation.py,sha256=GrD5VWaEvrKrBFwhEKUUfQfk2rweTEZnROaBZJXSni0,47134
 pycityagent/simulation/__init__.py,sha256=u1WpgwVxPboXWMxrUQKMXJNmTKQYAeCaqZv9HmSxESY,118
-pycityagent/simulation/agentgroup.py,sha256=JFDEywmFziq-I8aUDZ3QhVD8cXliVsUSav482BmPDO4,36812
+pycityagent/simulation/agentgroup.py,sha256=DYx68TckA5ox9x_GHID-3Gg19qABY-NR9QAO2BKKfMc,36814
 pycityagent/simulation/storage/pg.py,sha256=xRshSOGttW-p0re0fNBOjOpb-nQ5msIE2LsdT79_E_Y,8425
 pycityagent/message/message_interceptor.py,sha256=Z7I1vqs4BrKadPAtQi-nfbkgboBAflXDSIcbIpDAxB8,17777
 pycityagent/message/__init__.py,sha256=f5QH7DKPqEAMyfSlBMnl3uouOKlsoel909STlIe7nUk,276
@@ -35,7 +35,7 @@ pycityagent/utils/parsers/__init__.py,sha256=AN2xgiPxszWK4rpX7zrqRsqNwfGF3WnCA5-
 pycityagent/utils/parsers/code_block_parser.py,sha256=jy6wHx9zypvJTWneCKuUaLQL19d4yLK6C_awc7y8A-k,1179
 pycityagent/utils/parsers/parser_base.py,sha256=ZbqRcqOBL9hfHVZSltQSQmJnWrtuJS9aYeOJU-FlJ0E,1725
 pycityagent/utils/parsers/json_parser.py,sha256=sakKohUuMcUH2toR85CAG_37D02ZoAn6LlzLgftUjmo,2923
-pycityagent/agent/agent_base.py,sha256=MM_kBWheTk9Y3pKoDo6Yl1Bvn2usT6v2icloYx_ykCM,39467
+pycityagent/agent/agent_base.py,sha256=Fmp9wYwiDskEQxslweO3Jc-1OwbB9vgjv1VfZZIHSGI,39252
 pycityagent/agent/__init__.py,sha256=U20yKu9QwSqAx_PHk5JwipfODkDfxONtumVfnsKjWFg,180
 pycityagent/agent/agent.py,sha256=zJs09Tzz53av59SzmrlJj6Yd-XId6voCYaxguLbbq3s,18991
 pycityagent/cli/wrapper.py,sha256=bAwmfWTXbGld-uiMnIMhKp22IVRQjhLUToknyUDk9rQ,1147
@@ -43,7 +43,7 @@ pycityagent/workflow/__init__.py,sha256=WVBMF-UT3iOBoyFihRrkeqAyLvD_Iibn2axAPOIM
 pycityagent/workflow/prompt.py,sha256=rzenP4EFGxbWE1aq-x2036b6umKvi5cQx2xtWULwgIk,3392
 pycityagent/workflow/block.py,sha256=phr5julVru-Yv-oWyUNMNmm4okhPMNZIF7Up71aoUY0,12249
 pycityagent/workflow/trigger.py,sha256=4nzAwywGQsFabgo6gzp-vD2EV4wII7Z0LHGEAsflSEY,7608
-pycityagent/configs/exp_config.py,sha256=D_OyUBxBx-I5Eyaot52Kl6hb5wEvF5CjwcBUDM6agG8,7319
+pycityagent/configs/exp_config.py,sha256=5cVEfCgBQIXNeidXttvRw31wDIlksWGiwcB0JbyHMb8,7305
 pycityagent/configs/__init__.py,sha256=JAvFkZ6yKTtWvkgO2FaeQfpR-NsStDZPadLH9FOIROU,486
 pycityagent/configs/utils.py,sha256=ILVL5wjLJqxyBVGkV1QOkqp4b9EulSmNrNbD0JQIVqc,429
 pycityagent/configs/sim_config.py,sha256=cCdVu0IypmyOEeWiOLsocL7y7d8uBnLjXsH4_t-pXDk,8209
@@ -93,9 +93,9 @@ pycityagent/cityagent/blocks/mobility_block.py,sha256=rrWzJO6mCMxUFfl1txOqq9BY7F
 pycityagent/survey/models.py,sha256=g3xni4GcA1Py3vlGt6z4ltutjgQ4G0uINYAM8vKRJAw,5225
 pycityagent/survey/__init__.py,sha256=rxwou8U9KeFSP7rMzXtmtp2fVFZxK4Trzi-psx9LPIs,153
 pycityagent/survey/manager.py,sha256=QZEApC6tKe-g1waDa_O4Eg4CFkyL8KWa7tUGZnT_7WI,3397
-pycityagent-2.0.0a95.dist-info/RECORD,,
-pycityagent-2.0.0a95.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a95.dist-info/WHEEL,sha256=VujM3ypTCyUW6hcTDdK2ej0ARVMxlU1Djlh_zWnDgqk,109
-pycityagent-2.0.0a95.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a95.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a95.dist-info/METADATA,sha256=WUcWf5gbldc2LyaR71a_QS8cZuGgUs9q0hrbXOdZ8_o,8657
+pycityagent-2.0.0a96.dist-info/RECORD,,
+pycityagent-2.0.0a96.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
+pycityagent-2.0.0a96.dist-info/WHEEL,sha256=VujM3ypTCyUW6hcTDdK2ej0ARVMxlU1Djlh_zWnDgqk,109
+pycityagent-2.0.0a96.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
+pycityagent-2.0.0a96.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
+pycityagent-2.0.0a96.dist-info/METADATA,sha256=DAlWpG0FCdi2l-ae2kPICBXklMtezwsG1H_lFKHpi2E,8657