pycityagent 2.0.0a47__cp311-cp311-macosx_11_0_arm64.whl → 2.0.0a49__cp311-cp311-macosx_11_0_arm64.whl

pycityagent/workflow/block.py

@@ -1,8 +1,12 @@
+from __future__ import annotations
 import asyncio
 import functools
 import inspect
 from collections.abc import Awaitable, Callable, Coroutine
-from typing import Any, Optional, Union
+import json
+from typing import Any, List, Optional, Union
+
+from pyparsing import Dict
 
 from ..environment.simulator import Simulator
 from ..llm import LLM
@@ -139,6 +143,9 @@ def trigger_class():
 
 # Define a Block, similar to a layer in PyTorch
 class Block:
+    configurable_fields: List[str] = []
+    default_values: dict[str, Any] = {}
+
     def __init__(
         self,
         name: str,
@@ -157,6 +164,64 @@ class Block:
             trigger.initialize()  # 立即初始化trigger
         self.trigger = trigger
 
+    def export_config(self) -> Dict[str, Optional[str]]:
+        return {
+            field: self.default_values.get(field, "default_value")
+            for field in self.configurable_fields
+        }
+
+    @classmethod
+    def export_class_config(cls) -> Dict[str, str]:
+        return {
+            field: cls.default_values.get(field, "default_value")
+            for field in cls.configurable_fields
+        }
+
+    @classmethod
+    def import_config(cls, config: Dict[str, str]) -> "Block":
+        instance = cls(name=config["name"])
+        for field, value in config["config"].items():
+            if field in cls.configurable_fields:
+                setattr(instance, field, value)
+
+        # 递归创建子Block
+        for child_config in config.get("children", []):
+            child_block = Block.import_config(child_config)
+            setattr(instance, child_block.name.lower(), child_block)
+
+        return instance
+    
+    def load_from_config(self, config: Dict[str, List[Dict]]) -> None:
+        """
+        使用配置更新当前Block实例的参数，并递归更新子Block。
+        """
+        # 更新当前Block的参数
+        for field in self.configurable_fields:
+            if field in config["config"]:
+                if config["config"][field] != "default_value":
+                    setattr(self, field, config["config"][field])
+
+        def build_or_update_block(block_data: Dict) -> Block:
+            block_name = block_data["name"].lower()
+            existing_block = getattr(self, block_name, None)
+
+            if existing_block:
+                # 递归更新子Block
+                existing_block.load_from_config(block_data)
+                return existing_block
+            else:
+                # 创建新的子Block
+                block_cls = globals().get(block_data["name"])
+                if block_cls is None:
+                    raise KeyError(f"Block class '{block_data['name']}' not found.")
+                block_instance = block_cls.import_config(block_data)
+                setattr(self, block_name, block_instance)
+                return block_instance
+
+        # 递归遍历子Block配置
+        for block_data in config.get("blocks", []):
+            build_or_update_block(block_data)
+
     async def forward(self):
         """
         Each block performs a specific reasoning task.

pycityagent/workflow/tool.py

@@ -1,3 +1,4 @@
+import asyncio
 import time
 from collections import defaultdict
 from collections.abc import Callable, Sequence
@@ -6,6 +7,7 @@ from typing import Any, Optional, Union
 from mlflow.entities import Metric
 
 from ..agent import Agent
+from ..utils.decorators import lock_decorator
 from ..environment import (LEVEL_ONE_PRE, POI_TYPE_DICT, AoiService,
                            PersonService)
 from ..workflow import Block
@@ -136,7 +138,7 @@ class SencePOI(Tool):
 
 class UpdateWithSimulator(Tool):
     def __init__(self) -> None:
-        pass
+        self._lock = asyncio.Lock()
 
     async def _update_motion_with_sim(
         self,
@@ -160,6 +162,7 @@ class UpdateWithSimulator(Tool):
             except KeyError as e:
                 continue
 
+    @lock_decorator
     async def __call__(
         self,
     ):
@@ -169,8 +172,9 @@ class UpdateWithSimulator(Tool):
 
 class ResetAgentPosition(Tool):
     def __init__(self) -> None:
-        pass
+        self._lock = asyncio.Lock()
 
+    @lock_decorator
     async def __call__(
         self,
         aoi_id: Optional[int] = None,
@@ -194,7 +198,8 @@ class ExportMlflowMetrics(Tool):
         self._log_batch_size = log_batch_size
         # TODO: support other log types
         self.metric_log_cache: dict[str, list[Metric]] = defaultdict(list)
-
+        self._lock = asyncio.Lock()
+    @lock_decorator
     async def __call__(
         self,
         metric: Union[Sequence[Union[Metric, dict]], Union[Metric, dict]],
@@ -226,7 +231,7 @@ class ExportMlflowMetrics(Tool):
                 _cache = _cache[batch_size:]
         if clear_cache:
             await self._clear_cache()
-
+    @lock_decorator
     async def _clear_cache(
         self,
     ):

{pycityagent-2.0.0a47.dist-info → pycityagent-2.0.0a49.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: pycityagent
-Version: 2.0.0a47
-Summary: LLM-based城市环境agent构建库
+Version: 2.0.0a49
+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.0a47.dist-info → pycityagent-2.0.0a49.dist-info}/RECORD

@@ -1,13 +1,7 @@
-pycityagent-2.0.0a47.dist-info/RECORD,,
-pycityagent-2.0.0a47.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a47.dist-info/WHEEL,sha256=DQkJubmXvyOE1DlaPsfq9czNuGB2yvzYGbMABjt_JVM,109
-pycityagent-2.0.0a47.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a47.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a47.dist-info/METADATA,sha256=YwAfusA9UF3yJ6mdI8cVU81n5gZJISLcSK7dPiDE0W4,9125
 pycityagent/pycityagent-sim,sha256=n96jlVZRINlBec5SPOGAdUmeLWMoEKGgoH29iOVJ0wE,34081890
-pycityagent/__init__.py,sha256=fv0mzNGbHBF6m550yYqnuUpB8iQPWS-7EatYRK7DO4s,693
+pycityagent/__init__.py,sha256=9sHyzo8monlBPDe7LTlxCIHeNPYj8HJJDCeuJrYJLsQ,750
 pycityagent/pycityagent-ui,sha256=cHZjqtrQ4Fh4qtRahFNCNbT2DNHLmUexiDAa-72Z3RQ,40333378
-pycityagent/agent.py,sha256=A40nN1xUJ6AqhoQ4pXt5yAehc15BYHwLMRpIGAmMLLc,30051
+pycityagent/agent.py,sha256=iaF83y344V29-jghx5bJD3yY8kMuSzInBPNi7cVxYiA,34026
 pycityagent/metrics/mlflow_client.py,sha256=g_tHxWkWTDijtbGL74-HmiYzWVKb1y8-w12QrY9jL30,4449
 pycityagent/metrics/__init__.py,sha256=X08PaBbGVAd7_PRGLREXWxaqm7nS82WBQpD1zvQzcqc,128
 pycityagent/metrics/utils/const.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -18,7 +12,7 @@ pycityagent/llm/__init__.py,sha256=iWs6FLgrbRVIiqOf4ILS89gkVCTvS7HFC3vG-MWuyko,2
 pycityagent/llm/llm.py,sha256=owTYuXmnHZnvXaAvwiiyD511P3wpU3K04xZArhhiJF0,15700
 pycityagent/llm/embeddings.py,sha256=Nhf_tUIlaYJAZ93wW2QTCtS1wq7e8fUgdn2JketEAuQ,7600
 pycityagent/llm/utils.py,sha256=hoNPhvomb1u6lhFX0GctFipw74hVKb7bvUBDqwBzBYw,160
-pycityagent/memory/memory.py,sha256=UBh4yANNHDzYZwrsvyX4ZMSHXINbu1U6g0HLNCOOCk8,17883
+pycityagent/memory/memory.py,sha256=RV54r9uE3H7RIfz5ifaeXiD7RrOJotxJNhAOguZrYUk,17273
 pycityagent/memory/profile.py,sha256=q8ZS9IBmHCg_X1GONUvXK85P6tCepTKQgXKuvuXYNXw,5203
 pycityagent/memory/__init__.py,sha256=_Vfdo1HcLWsuuz34_i8e91nnLVYADpMlHHSVaB3xgIk,297
 pycityagent/memory/memory_base.py,sha256=QG_j3BxZvkadFEeE3uBR_kjl_xcXD1aHUVs8GEF3d6w,5654
@@ -27,12 +21,12 @@ pycityagent/memory/utils.py,sha256=oJWLdPeJy_jcdKcDTo9JAH9kDZhqjoQhhv_zT9qWC0w,8
 pycityagent/memory/const.py,sha256=6zpJPJXWoH9-yf4RARYYff586agCoud9BRn7sPERB1g,932
 pycityagent/memory/faiss_query.py,sha256=Z0JS4udyPYCIzHMq464QtHscnswu35gh9fQptikAwkQ,12976
 pycityagent/memory/state.py,sha256=TYItiyDtehMEQaSBN7PpNrnNxdDM5jGppr9R9Ufv3kA,5134
-pycityagent/simulation/simulation.py,sha256=Vrt2hr9AsKG9VEwY90R9mmUR9TxifshUfSYpzW5LOXo,23317
+pycityagent/simulation/simulation.py,sha256=7Y1r5DAFaB1vuDd3l_85NWpHQUy2GLkFEb800xsJr0E,25565
 pycityagent/simulation/__init__.py,sha256=P5czbcg2d8S0nbbnsQXFIhwzO4CennAhZM8OmKvAeYw,194
-pycityagent/simulation/agentgroup.py,sha256=-MnrM8pH7dyGTj2DL6TRH4AD9HsvEZ1dEF3xOfmbs_4,25933
+pycityagent/simulation/agentgroup.py,sha256=DGN6q9S65K9gSv_ihBeT6iJ__LJhl27yXBFyLEk55t0,29302
 pycityagent/simulation/storage/pg.py,sha256=5itxKOkNPlOzN7z2_3oKU1ZK0uLTDugfld8ZkRbD69I,8407
 pycityagent/message/__init__.py,sha256=TCjazxqb5DVwbTu1fF0sNvaH_EPXVuj2XQ0p6W-QCLU,55
-pycityagent/message/messager.py,sha256=uKXArXOMZGK2fE86XiMtVrI_N0yTLA1EL3KdtCVK5uk,3217
+pycityagent/message/messager.py,sha256=78K31EPKfC5IxbISc-Lc2babC7VOh9Vbe3c0sO-YDLA,3333
 pycityagent/utils/avro_schema.py,sha256=AlADbzV8FxiSfvhQhiX9KhrwMjrx0lGT-lED4TI1gJM,4152
 pycityagent/utils/__init__.py,sha256=xli0FuRffR9Wp4aRcMnlfeDHuGxB8Y5paDjyAt0UoeE,462
 pycityagent/utils/survey_util.py,sha256=Be9nptmu2JtesFNemPgORh_2GsN7rcDYGQS9Zfvc5OI,2169
@@ -45,8 +39,8 @@ pycityagent/utils/parsers/json_parser.py,sha256=tjwyPluYfkWgsvLi0hzfJwFhO3L6yQfZ
 pycityagent/cli/wrapper.py,sha256=2Tb52gOlEVgn11Ekt6ZkRXr_BGzte-EPyBKnR6g6hQ4,1143
 pycityagent/workflow/__init__.py,sha256=QNkUV-9mACMrR8c0cSKna2gC1mMZdxXbxWzjE-Uods0,621
 pycityagent/workflow/prompt.py,sha256=6jI0Rq54JLv3-IXqZLYug62vse10wTI83xvf4ZX42nk,2929
-pycityagent/workflow/block.py,sha256=C2aWdVRffb3LknP955GvPcBMsm3VPXN9ZuAtCgITFTo,7181
-pycityagent/workflow/tool.py,sha256=xADxhNgVsjNiMxlhdwn3xGUstFOkLEG8P67ez8VmwSI,8555
+pycityagent/workflow/block.py,sha256=8pK17DGX8MnFJHq5lJ4susdZ-CDAEIjlTV_2mJxhbbw,9600
+pycityagent/workflow/tool.py,sha256=ChuN5Sm-yltesemewjnTOYaxN6NUjfi2MezVuclf6Tc,8776
 pycityagent/workflow/trigger.py,sha256=Df-MOBEDWBbM-v0dFLQLXteLsipymT4n8vqexmK2GiQ,5643
 pycityagent/environment/__init__.py,sha256=awHxlOud-btWbk0FCS4RmGJ13W84oVCkbGfcrhKqihA,240
 pycityagent/environment/simulator.py,sha256=1OUfODDzM4EN6Lw_Wzq4KeQb-EpcUBioZYc9fxfSPn0,12070
@@ -76,6 +70,31 @@ pycityagent/environment/sim/clock_service.py,sha256=fgYXacf_-ixhVAn5uKUvqvemBS6A
 pycityagent/environment/sim/road_service.py,sha256=bKyn3_me0sGmaJVyF6eNeFbdU-9C1yWsa9L7pieDJzg,1285
 pycityagent/environment/interact/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycityagent/environment/interact/interact.py,sha256=ifxPPzuHeqLHIZ_6zvfXMoBOnBsXNIP4bYp7OJ7pnEQ,6588
+pycityagent/cityagent/memory_config.py,sha256=tI4SbzDdjVqIt5cTqx-CwNHu0xnbVAhIenZgwYa9wf8,10429
+pycityagent/cityagent/bankagent.py,sha256=IC4Qf-zgHg9Q65ecb_UAKjw-HbizYEDuzfhlPIske9Y,2166
+pycityagent/cityagent/__init__.py,sha256=gcBQ-a50XegFtjigQ7xDXRBZrywBKqifiQFSRnEF8gM,572
+pycityagent/cityagent/firmagent.py,sha256=cV2X1wtj6vbXEGNcFlhb9Nsp544coe2lyEjLwOmLOPE,3635
+pycityagent/cityagent/nbsagent.py,sha256=VFxz0FsjPN9hAir-VxXYVE8WR4zsEXF7oRn0G8SYNfo,4647
+pycityagent/cityagent/initial.py,sha256=_sKZicZ0wfuBN_hLOW82_Yp3wOMMlygEvcGT0sYXE6c,4538
+pycityagent/cityagent/societyagent.py,sha256=-O_lk2xk9-ldE9MTX48tqbRyJFIqcpYnmfMsrGUvRvw,13958
+pycityagent/cityagent/governmentagent.py,sha256=WdM-80YkRohYuNj1hB07ZZ_dgRN_uiVU8YkoS7Cs6vg,2713
+pycityagent/cityagent/blocks/dispatcher.py,sha256=mEa1r3tRS3KI1BMZR_w_sbUGzOj6aUJuiUrsHv1n2n0,2943
+pycityagent/cityagent/blocks/needs_block.py,sha256=pPPjdVFCqFvAV0RM1LVevQIH5d0GALnB6xLekvplutE,13113
+pycityagent/cityagent/blocks/cognition_block.py,sha256=CGIYwuF1twS5g3DNhCkaSFT2s1IQXF5NjJO38EX6FLg,15633
+pycityagent/cityagent/blocks/time_block.py,sha256=M7ng1jQ14gz4Xle0DC-kWeZmetq9lYQ2HzgEgsu-eX8,4337
+pycityagent/cityagent/blocks/social_block.py,sha256=AkI9wLm9WUEFe5Hc5uDfLfwJtWe1TpLLsWdjm__9KM0,14012
+pycityagent/cityagent/blocks/__init__.py,sha256=j8aKIrSEkoMjoWKPQbyRqmeHaB-bjaJObyfrEagq8MI,503
+pycityagent/cityagent/blocks/economy_block.py,sha256=yysi4E_k47sNmeMorbHVJydYymyTqo9J6hdQnzJ4HN8,20793
+pycityagent/cityagent/blocks/utils.py,sha256=BYf15pDynAQw8eeXyn1iVfVDDdkkoRz9e6eiSGUnz4g,2031
+pycityagent/cityagent/blocks/other_block.py,sha256=ETgtj_EpYbAocIJq12LB-SPcHAY-b7TRsm9llo3ZIrc,3845
+pycityagent/cityagent/blocks/plan_block.py,sha256=Ad_K2m0gYwH5qJi1HOETgEe83uRX06TXconAR8RIZHU,11479
+pycityagent/cityagent/blocks/mobility_block.py,sha256=ZebloDhvZJYbV0YSWhAbnOLToiL-4fG7vKNq3kh37M4,10788
 pycityagent/survey/models.py,sha256=YE50UUt5qJ0O_lIUsSY6XFCGUTkJVNu_L1gAhaCJ2fs,3546
 pycityagent/survey/__init__.py,sha256=rxwou8U9KeFSP7rMzXtmtp2fVFZxK4Trzi-psx9LPIs,153
 pycityagent/survey/manager.py,sha256=S5IkwTdelsdtZETChRcfCEczzwSrry_Fly9MY4s3rbk,1681
+pycityagent-2.0.0a49.dist-info/RECORD,,
+pycityagent-2.0.0a49.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
+pycityagent-2.0.0a49.dist-info/WHEEL,sha256=DQkJubmXvyOE1DlaPsfq9czNuGB2yvzYGbMABjt_JVM,109
+pycityagent-2.0.0a49.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
+pycityagent-2.0.0a49.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
+pycityagent-2.0.0a49.dist-info/METADATA,sha256=AArJCX11voHGW5AlMrin1qZoj8iVGdOD9XLODRcQwUY,9139