pycityagent 2.0.0a21__py3-none-any.whl → 2.0.0a22__py3-none-any.whl

pycityagent/agent.py

@@ -458,13 +458,16 @@ class Agent(ABC):
         topic = f"exps/{self._exp_id}/agents/{to_agent_uuid}/{sub_topic}"
         await self._messager.send_message(topic, payload)
 
-    async def send_message_to_agent(self, to_agent_uuid: str, content: str):
+    async def send_message_to_agent(self, to_agent_uuid: str, content: str, type: str = "social"):
         """通过 Messager 发送消息"""
         if self._messager is None:
             raise RuntimeError("Messager is not set")
+        if type not in ["social", "economy"]:
+            logger.warning(f"Invalid message type: {type}, sent from {self._uuid}")
         payload = {
             "from": self._uuid,
             "content": content,
+            "type": type,
             "timestamp": int(datetime.now().timestamp() * 1000),
             "day": await self.simulator.get_simulator_day(),
             "t": await self.simulator.get_simulator_second_from_start_of_day(),
@@ -485,11 +488,11 @@ class Agent(ABC):
         auros.append(_message_dict)
         pg_list.append((_message_dict, _date_time))
         # Avro
-        if self._avro_file is not None:
+        if self._avro_file is not None and type == "social":
             with open(self._avro_file["dialog"], "a+b") as f:
                 fastavro.writer(f, DIALOG_SCHEMA, auros, codec="snappy")
         # Pg
-        if self._pgsql_writer is not None:
+        if self._pgsql_writer is not None and type == "social":
             if self._last_asyncio_pg_task is not None:
                 await self._last_asyncio_pg_task
             _keys = ["id", "day", "t", "type", "speaker", "content", "created_at"]

pycityagent/environment/sim/aoi_service.py

@@ -1,4 +1,5 @@
-from typing import Any, Awaitable, Coroutine, cast, Union, Dict
+from collections.abc import Awaitable, Coroutine
+from typing import Any, Dict, Union, cast
 
 import grpc
 from google.protobuf.json_format import ParseDict

pycityagent/environment/sim/clock_service.py

@@ -1,4 +1,5 @@
-from typing import Any, Awaitable, Coroutine, cast, Union, Dict
+from collections.abc import Awaitable, Coroutine
+from typing import Any, Dict, Union, cast
 
 import grpc
 from google.protobuf.json_format import ParseDict

pycityagent/environment/sim/economy_services.py

@@ -1,4 +1,5 @@
-from typing import Any, Awaitable, Coroutine, cast, Union, Dict
+from typing import Any, cast, Union
+from collections.abc import Awaitable, Coroutine
 
 import grpc
 from google.protobuf.json_format import ParseDict
@@ -25,7 +26,7 @@ class EconomyPersonService:
         self,
         req: Union[person_service.GetPersonRequest, dict],
         dict_return: bool = True,
-    ) -> Coroutine[Any, Any, Union[Dict[str, Any], person_service.GetPersonResponse]]:
+    ) -> Coroutine[Any, Any, Union[dict[str, Any], person_service.GetPersonResponse]]:
         """
         批量查询人的经济情况（资金、雇佣关系）
         Query person’s economic situation (funds, employment relationship) in batches
@@ -48,7 +49,7 @@ class EconomyPersonService:
         req: Union[person_service.UpdatePersonMoneyRequest, dict],
         dict_return: bool = True,
     ) -> Coroutine[
-        Any, Any, Union[Dict[str, Any], person_service.UpdatePersonMoneyResponse]
+        Any, Any, Union[dict[str, Any], person_service.UpdatePersonMoneyResponse]
     ]:
         """
         批量修改人的资金
@@ -80,7 +81,7 @@ class EconomyOrgService:
 
     def GetOrg(
         self, req: Union[org_service.GetOrgRequest, dict], dict_return: bool = True
-    ) -> Coroutine[Any, Any, Union[Dict[str, Any], org_service.GetOrgResponse]]:
+    ) -> Coroutine[Any, Any, Union[dict[str, Any], org_service.GetOrgResponse]]:
         """
         批量查询组织的经济情况（员工、岗位、资金、货物）
         Query the economic status of the organization (employees, positions, funds, goods) in batches
@@ -100,7 +101,7 @@ class EconomyOrgService:
         self,
         req: Union[org_service.UpdateOrgMoneyRequest, dict],
         dict_return: bool = True,
-    ) -> Coroutine[Any, Any, Union[Dict[str, Any], org_service.UpdateOrgMoneyResponse]]:
+    ) -> Coroutine[Any, Any, Union[dict[str, Any], org_service.UpdateOrgMoneyResponse]]:
         """
         批量修改组织的资金
         Modify organization’s money in batches
@@ -123,7 +124,7 @@ class EconomyOrgService:
         self,
         req: Union[org_service.UpdateOrgGoodsRequest, dict],
         dict_return: bool = True,
-    ) -> Coroutine[Any, Any, Union[Dict[str, Any], org_service.UpdateOrgGoodsResponse]]:
+    ) -> Coroutine[Any, Any, Union[dict[str, Any], org_service.UpdateOrgGoodsResponse]]:
         """
         批量修改组织的货物
         Modify organization’s goods in batches
@@ -147,7 +148,7 @@ class EconomyOrgService:
         req: Union[org_service.UpdateOrgEmployeeRequest, dict],
         dict_return: bool = True,
     ) -> Coroutine[
-        Any, Any, Union[Dict[str, Any], org_service.UpdateOrgEmployeeResponse]
+        Any, Any, Union[dict[str, Any], org_service.UpdateOrgEmployeeResponse]
     ]:
         """
         批量修改组织的员工
@@ -171,7 +172,7 @@ class EconomyOrgService:
         self,
         req: Union[org_service.UpdateOrgJobRequest, dict],
         dict_return: bool = True,
-    ) -> Coroutine[Any, Any, Union[Dict[str, Any], org_service.UpdateOrgJobResponse]]:
+    ) -> Coroutine[Any, Any, Union[dict[str, Any], org_service.UpdateOrgJobResponse]]:
         """
         批量修改组织的岗位
         Modify organization’s jobs in batches

pycityagent/environment/sim/lane_service.py

@@ -1,4 +1,5 @@
-from typing import Any, Awaitable, Coroutine, cast, Union, Dict
+from typing import Any,cast, Union
+from collections.abc import Awaitable, Coroutine
 
 import grpc
 from google.protobuf.json_format import ParseDict
@@ -21,7 +22,7 @@ class LaneService:
 
     def GetLane(
         self, req: Union[lane_service.GetLaneRequest, dict], dict_return: bool = True
-    ) -> Coroutine[Any, Any, Union[Dict[str, Any], lane_service.GetLaneResponse]]:
+    ) -> Coroutine[Any, Any, Union[dict[str, Any], lane_service.GetLaneResponse]]:
         """
         获取Lane的信息
         Get Lane's information
@@ -41,7 +42,7 @@ class LaneService:
         self,
         req: Union[lane_service.SetLaneMaxVRequest, dict],
         dict_return: bool = True,
-    ) -> Coroutine[Any, Any, Union[Dict[str, Any], lane_service.SetLaneMaxVResponse]]:
+    ) -> Coroutine[Any, Any, Union[dict[str, Any], lane_service.SetLaneMaxVResponse]]:
         """
         设置Lane的最大速度（限速）
         Set the maximum speed of Lane (speed limit)
@@ -64,7 +65,7 @@ class LaneService:
         req: Union[lane_service.SetLaneRestrictionRequest, dict],
         dict_return: bool = True,
     ) -> Coroutine[
-        Any, Any, Union[Dict[str, Any], lane_service.SetLaneRestrictionResponse]
+        Any, Any, Union[dict[str, Any], lane_service.SetLaneRestrictionResponse]
     ]:
         """
         设置Lane的限制
@@ -89,7 +90,7 @@ class LaneService:
         req: Union[lane_service.GetLaneByLongLatBBoxRequest, dict],
         dict_return: bool = True,
     ) -> Coroutine[
-        Any, Any, Union[Dict[str, Any], lane_service.GetLaneByLongLatBBoxResponse]
+        Any, Any, Union[dict[str, Any], lane_service.GetLaneByLongLatBBoxResponse]
     ]:
         """
         获取特定区域内的Lane的信息

pycityagent/environment/sim/light_service.py

@@ -1,9 +1,11 @@
-from typing import Any, Awaitable, Coroutine, cast, Union, Dict
+from collections.abc import Awaitable, Coroutine
+from typing import Any, Union, cast
 
 import grpc
 from google.protobuf.json_format import ParseDict
 from pycityproto.city.map.v2 import traffic_light_service_pb2 as light_service
-from pycityproto.city.map.v2 import traffic_light_service_pb2_grpc as light_grpc
+from pycityproto.city.map.v2 import \
+    traffic_light_service_pb2_grpc as light_grpc
 
 from ..utils.protobuf import async_parse
 
@@ -21,10 +23,10 @@ class LightService:
 
     def GetTrafficLight(
         self,
-        req: Union[light_service.GetTrafficLightRequest, Dict[str, Any]],
+        req: Union[light_service.GetTrafficLightRequest, dict[str, Any]],
         dict_return: bool = True,
     ) -> Coroutine[
-        Any, Any, Union[Dict[str, Any], light_service.GetTrafficLightResponse]
+        Any, Any, Union[dict[str, Any], light_service.GetTrafficLightResponse]
     ]:
         """
         获取路口的红绿灯信息
@@ -46,10 +48,10 @@ class LightService:
 
     def SetTrafficLight(
         self,
-        req: Union[light_service.SetTrafficLightRequest, Dict[str, Any]],
+        req: Union[light_service.SetTrafficLightRequest, dict[str, Any]],
         dict_return: bool = True,
     ) -> Coroutine[
-        Any, Any, Union[Dict[str, Any], light_service.SetTrafficLightResponse]
+        Any, Any, Union[dict[str, Any], light_service.SetTrafficLightResponse]
     ]:
         """
         设置路口的红绿灯信息
@@ -74,7 +76,7 @@ class LightService:
         req: Union[light_service.SetTrafficLightPhaseRequest, dict],
         dict_return: bool = True,
     ) -> Coroutine[
-        Any, Any, Union[Dict[str, Any], light_service.SetTrafficLightPhaseResponse]
+        Any, Any, Union[dict[str, Any], light_service.SetTrafficLightPhaseResponse]
     ]:
         """
         设置路口的红绿灯相位
@@ -99,7 +101,7 @@ class LightService:
         req: Union[light_service.SetTrafficLightStatusRequest, dict],
         dict_return: bool = True,
     ) -> Coroutine[
-        Any, Any, Union[Dict[str, Any], light_service.SetTrafficLightStatusResponse]
+        Any, Any, Union[dict[str, Any], light_service.SetTrafficLightStatusResponse]
     ]:
         """
         设置路口的红绿灯状态

pycityagent/environment/sim/person_service.py

@@ -1,5 +1,6 @@
 import warnings
-from typing import Any, Awaitable, Coroutine, Dict, Union, cast
+from collections.abc import Awaitable, Coroutine
+from typing import Any, Union, cast
 
 import grpc
 from google.protobuf.json_format import ParseDict
@@ -51,7 +52,7 @@ class PersonService:
         self,
         req: Union[person_service.GetPersonRequest, dict],
         dict_return: bool = True,
-    ) -> Coroutine[Any, Any, Union[Dict[str, Any], person_service.GetPersonResponse]]:
+    ) -> Coroutine[Any, Any, Union[dict[str, Any], person_service.GetPersonResponse]]:
         """
         获取person信息
         Get person information
@@ -73,7 +74,7 @@ class PersonService:
         self,
         req: Union[person_service.AddPersonRequest, dict],
         dict_return: bool = True,
-    ) -> Coroutine[Any, Any, Union[Dict[str, Any], person_service.AddPersonResponse]]:
+    ) -> Coroutine[Any, Any, Union[dict[str, Any], person_service.AddPersonResponse]]:
         """
         新增person
         Add a new person
@@ -95,7 +96,7 @@ class PersonService:
         self,
         req: Union[person_service.SetScheduleRequest, dict],
         dict_return: bool = True,
-    ) -> Coroutine[Any, Any, Union[Dict[str, Any], person_service.SetScheduleResponse]]:
+    ) -> Coroutine[Any, Any, Union[dict[str, Any], person_service.SetScheduleResponse]]:
         """
         修改person的schedule
         set person's schedule
@@ -118,7 +119,7 @@ class PersonService:
         self,
         req: Union[person_service.GetPersonsRequest, dict],
         dict_return: bool = True,
-    ) -> Coroutine[Any, Any, Union[Dict[str, Any], person_service.GetPersonsResponse]]:
+    ) -> Coroutine[Any, Any, Union[dict[str, Any], person_service.GetPersonsResponse]]:
         """
         获取多个person信息
         Get information of multiple persons
@@ -142,7 +143,7 @@ class PersonService:
         req: Union[person_service.GetPersonByLongLatBBoxRequest, dict],
         dict_return: bool = True,
     ) -> Coroutine[
-        Any, Any, Union[Dict[str, Any], person_service.GetPersonByLongLatBBoxResponse]
+        Any, Any, Union[dict[str, Any], person_service.GetPersonByLongLatBBoxResponse]
     ]:
         """
         获取特定区域内的person
@@ -167,7 +168,7 @@ class PersonService:
         req: Union[person_service.GetAllVehiclesRequest, dict],
         dict_return: bool = True,
     ) -> Coroutine[
-        Any, Any, Union[Dict[str, Any], person_service.GetAllVehiclesResponse]
+        Any, Any, Union[dict[str, Any], person_service.GetAllVehiclesResponse]
     ]:
         """
         获取所有车辆
@@ -192,7 +193,7 @@ class PersonService:
         req: Union[person_service.ResetPersonPositionRequest, dict],
         dict_return: bool = True,
     ) -> Coroutine[
-        Any, Any, Union[Dict[str, Any], person_service.ResetPersonPositionResponse]
+        Any, Any, Union[dict[str, Any], person_service.ResetPersonPositionResponse]
     ]:
         """
         重置人的位置（将停止当前正在进行的出行，转为sleep状态）
@@ -219,7 +220,7 @@ class PersonService:
         req: Union[person_service.SetControlledVehicleIDsRequest, dict],
         dict_return: bool = True,
     ) -> Coroutine[
-        Any, Any, Union[Dict[str, Any], person_service.SetControlledVehicleIDsResponse]
+        Any, Any, Union[dict[str, Any], person_service.SetControlledVehicleIDsResponse]
     ]:
         """
         设置由外部控制行为的vehicle
@@ -246,7 +247,7 @@ class PersonService:
     ) -> Coroutine[
         Any,
         Any,
-        Union[Dict[str, Any], person_service.FetchControlledVehicleEnvsResponse],
+        Union[dict[str, Any], person_service.FetchControlledVehicleEnvsResponse],
     ]:
         """
         获取由外部控制行为的vehicle的环境信息
@@ -273,7 +274,7 @@ class PersonService:
     ) -> Coroutine[
         Any,
         Any,
-        Union[Dict[str, Any], person_service.SetControlledVehicleActionsResponse],
+        Union[dict[str, Any], person_service.SetControlledVehicleActionsResponse],
     ]:
         """
         设置由外部控制行为的vehicle的行为

pycityagent/environment/sim/road_service.py

@@ -1,4 +1,5 @@
-from typing import Any, Awaitable, Coroutine, cast, Union, Dict
+from collections.abc import Awaitable, Coroutine
+from typing import Any, Union, cast
 
 import grpc
 from google.protobuf.json_format import ParseDict
@@ -21,7 +22,7 @@ class RoadService:
 
     def GetRoad(
         self, req: Union[road_service.GetRoadRequest, dict], dict_return: bool = True
-    ) -> Coroutine[Any, Any, Union[Dict[str, Any], road_service.GetRoadResponse]]:
+    ) -> Coroutine[Any, Any, Union[dict[str, Any], road_service.GetRoadResponse]]:
         """
         查询道路信息
         Query road information

pycityagent/environment/sim/social_service.py

@@ -1,4 +1,5 @@
-from typing import Any, Awaitable, Coroutine, cast, Union, Dict
+from collections.abc import Awaitable, Coroutine
+from typing import Any, Union, cast
 
 import grpc
 from google.protobuf.json_format import ParseDict
@@ -21,7 +22,7 @@ class SocialService:
 
     def Send(
         self, req: Union[social_service.SendRequest, dict], dict_return: bool = True
-    ) -> Coroutine[Any, Any, Union[Dict[str, Any], social_service.SendResponse]]:
+    ) -> Coroutine[Any, Any, Union[dict[str, Any], social_service.SendResponse]]:
         """
         发送消息
         Send message
@@ -39,7 +40,7 @@ class SocialService:
 
     def Receive(
         self, req: Union[social_service.ReceiveRequest, dict], dict_return: bool = True
-    ) -> Coroutine[Any, Any, Union[Dict[str, Any], social_service.ReceiveResponse]]:
+    ) -> Coroutine[Any, Any, Union[dict[str, Any], social_service.ReceiveResponse]]:
         """
         接收消息
         Receive message

pycityagent/environment/utils/protobuf.py

@@ -1,13 +1,15 @@
-from typing import Any, Awaitable, TypeVar, Union, Dict
-from google.protobuf.message import Message
+from collections.abc import Awaitable
+from typing import Any, TypeVar, Union
+
 from google.protobuf.json_format import MessageToDict
+from google.protobuf.message import Message
 
 __all__ = ["parse", "async_parse"]
 
 T = TypeVar("T", bound=Message)
 
 
-def parse(res: T, dict_return: bool) -> Union[Dict[str, Any], T]:
+def parse(res: T, dict_return: bool) -> Union[dict[str, Any], T]:
     """
     将Protobuf返回值转换为dict或者原始值
     Convert Protobuf return value to dict or original value
@@ -23,7 +25,7 @@ def parse(res: T, dict_return: bool) -> Union[Dict[str, Any], T]:
         return res
 
 
-async def async_parse(res: Awaitable[T], dict_return: bool) -> Union[Dict[str, Any], T]:
+async def async_parse(res: Awaitable[T], dict_return: bool) -> Union[dict[str, Any], T]:
     """
     将Protobuf await返回值转换为dict或者原始值
     Convert Protobuf await return value to dict or original value

pycityagent/memory/memory_base.py

@@ -6,7 +6,8 @@ import asyncio
 import logging
 import time
 from abc import ABC, abstractmethod
-from typing import Any, Callable, Dict, Optional, Sequence, Union
+from collections.abc import Callable, Sequence
+from typing import Any, Optional, Union
 
 from .const import *
 
@@ -16,8 +17,8 @@ logger = logging.getLogger("pycityagent")
 class MemoryUnit:
     def __init__(
         self,
-        content: Optional[Dict] = None,
-        required_attributes: Optional[Dict] = None,
+        content: Optional[dict] = None,
+        required_attributes: Optional[dict] = None,
         activate_timestamp: bool = False,
     ) -> None:
         self._content = {}
@@ -52,7 +53,7 @@ class MemoryUnit:
         else:
             setattr(self, f"{SELF_DEFINE_PREFIX}{property_name}", property_value)
 
-    async def update(self, content: Dict) -> None:
+    async def update(self, content: dict) -> None:
         await self._lock.acquire()
         for k, v in content.items():
             if k in self._content:
@@ -111,14 +112,14 @@ class MemoryUnit:
 
     async def dict_values(
         self,
-    ) -> Dict[Any, Any]:
+    ) -> dict[Any, Any]:
         return self._content
 
 
 class MemoryBase(ABC):
 
     def __init__(self) -> None:
-        self._memories: Dict[Any, Dict] = {}
+        self._memories: dict[Any, dict] = {}
         self._lock = asyncio.Lock()
 
     @abstractmethod

pycityagent/memory/profile.py

@@ -2,8 +2,9 @@
 Agent Profile
 """
 
+from collections.abc import Callable, Sequence
 from copy import deepcopy
-from typing import Any, Callable, Dict, Optional, Sequence, Union, cast
+from typing import Any, Optional, Union, cast
 
 from ..utils.decorators import lock_decorator
 from .const import *
@@ -14,7 +15,7 @@ from .utils import convert_msg_to_sequence
 class ProfileMemoryUnit(MemoryUnit):
     def __init__(
         self,
-        content: Optional[Dict] = None,
+        content: Optional[dict] = None,
         activate_timestamp: bool = False,
     ) -> None:
         super().__init__(
@@ -28,7 +29,7 @@ class ProfileMemory(MemoryBase):
     def __init__(
         self,
         msg: Optional[
-            Union[ProfileMemoryUnit, Sequence[ProfileMemoryUnit], Dict, Sequence[Dict]]
+            Union[ProfileMemoryUnit, Sequence[ProfileMemoryUnit], dict, Sequence[dict]]
         ] = None,
         activate_timestamp: bool = False,
     ) -> None:
@@ -74,7 +75,7 @@ class ProfileMemory(MemoryBase):
     @lock_decorator
     async def load(
         self,
-        snapshots: Union[Dict, Sequence[Dict]],
+        snapshots: Union[dict, Sequence[dict]],
         reset_memory: bool = False,
     ) -> None:
         if reset_memory:
@@ -91,7 +92,7 @@ class ProfileMemory(MemoryBase):
     @lock_decorator
     async def export(
         self,
-    ) -> Sequence[Dict]:
+    ) -> Sequence[dict]:
         _res = []
         for m in self._memories.keys():
             m = cast(ProfileMemoryUnit, m)
@@ -145,7 +146,7 @@ class ProfileMemory(MemoryBase):
                     self._memories[unit] = {}
 
     @lock_decorator
-    async def update_dict(self, to_update_dict: Dict, store_snapshot: bool = False):
+    async def update_dict(self, to_update_dict: dict, store_snapshot: bool = False):
         _latest_memories = self._fetch_recent_memory()
         _latest_memory: ProfileMemoryUnit = _latest_memories[-1]
         if not store_snapshot:

pycityagent/memory/self_define.py

@@ -2,8 +2,9 @@
 Self Define Data
 """
 
+from collections.abc import Callable, Sequence
 from copy import deepcopy
-from typing import Any, Callable, Dict, Optional, Sequence, Union, cast
+from typing import Any, Optional, Union, cast
 
 from ..utils.decorators import lock_decorator
 from .const import *
@@ -14,8 +15,8 @@ from .utils import convert_msg_to_sequence
 class DynamicMemoryUnit(MemoryUnit):
     def __init__(
         self,
-        content: Optional[Dict] = None,
-        required_attributes: Optional[Dict] = None,
+        content: Optional[dict] = None,
+        required_attributes: Optional[dict] = None,
         activate_timestamp: bool = False,
     ) -> None:
         super().__init__(
@@ -29,7 +30,7 @@ class DynamicMemory(MemoryBase):
 
     def __init__(
         self,
-        required_attributes: Dict[Any, Any],
+        required_attributes: dict[Any, Any],
         activate_timestamp: bool = False,
     ) -> None:
         super().__init__()
@@ -69,7 +70,7 @@ class DynamicMemory(MemoryBase):
     @lock_decorator
     async def load(
         self,
-        snapshots: Union[Dict, Sequence[Dict]],
+        snapshots: Union[dict, Sequence[dict]],
         reset_memory: bool = False,
     ) -> None:
         if reset_memory:
@@ -86,7 +87,7 @@ class DynamicMemory(MemoryBase):
     @lock_decorator
     async def export(
         self,
-    ) -> Sequence[Dict]:
+    ) -> Sequence[dict]:
         _res = []
         for m in self._memories.keys():
             m = cast(DynamicMemoryUnit, m)
@@ -143,7 +144,7 @@ class DynamicMemory(MemoryBase):
                     self._memories[unit] = {}
 
     @lock_decorator
-    async def update_dict(self, to_update_dict: Dict, store_snapshot: bool = False):
+    async def update_dict(self, to_update_dict: dict, store_snapshot: bool = False):
         _latest_memories = self._fetch_recent_memory()
         _latest_memory: DynamicMemoryUnit = _latest_memories[-1]
         if not store_snapshot:

pycityagent/memory/state.py

@@ -2,8 +2,9 @@
 Agent State
 """
 
+from collections.abc import Callable, Sequence
 from copy import deepcopy
-from typing import Any, Callable, Dict, Optional, Sequence, Union, cast
+from typing import Any, Optional, Union, cast
 
 from ..utils.decorators import lock_decorator
 from .const import *
@@ -14,7 +15,7 @@ from .utils import convert_msg_to_sequence
 class StateMemoryUnit(MemoryUnit):
     def __init__(
         self,
-        content: Optional[Dict] = None,
+        content: Optional[dict] = None,
         activate_timestamp: bool = False,
     ) -> None:
         super().__init__(
@@ -28,7 +29,7 @@ class StateMemory(MemoryBase):
     def __init__(
         self,
         msg: Optional[
-            Union[MemoryUnit, Sequence[MemoryUnit], Dict, Sequence[Dict]]
+            Union[MemoryUnit, Sequence[MemoryUnit], dict, Sequence[dict]]
         ] = None,
         activate_timestamp: bool = False,
     ) -> None:
@@ -73,7 +74,7 @@ class StateMemory(MemoryBase):
     @lock_decorator
     async def load(
         self,
-        snapshots: Union[Dict, Sequence[Dict]],
+        snapshots: Union[dict, Sequence[dict]],
         reset_memory: bool = False,
     ) -> None:
 
@@ -91,7 +92,7 @@ class StateMemory(MemoryBase):
     @lock_decorator
     async def export(
         self,
-    ) -> Sequence[Dict]:
+    ) -> Sequence[dict]:
 
         _res = []
         for m in self._memories.keys():
@@ -151,7 +152,7 @@ class StateMemory(MemoryBase):
                     self._memories[unit] = {}
 
     @lock_decorator
-    async def update_dict(self, to_update_dict: Dict, store_snapshot: bool = False):
+    async def update_dict(self, to_update_dict: dict, store_snapshot: bool = False):
 
         _latest_memories = self._fetch_recent_memory()
         _latest_memory: StateMemoryUnit = _latest_memories[-1]

pycityagent/memory/utils.py

@@ -1,4 +1,5 @@
-from typing import Any, Sequence, Union
+from collections.abc import Sequence
+from typing import Any, Union
 
 from .memory_base import MemoryUnit
 

pycityagent/utils/parsers/json_parser.py

@@ -1,6 +1,6 @@
 import json
 import logging
-from typing import Any, Dict
+from typing import Any
 
 from .parser_base import ParserBase
 
@@ -67,14 +67,14 @@ class JsonDictParser(JsonObjectParser):
         """Initialize the JsonDictParser with default tags."""
         super().__init__()
 
-    def parse(self, response: str) -> Dict:
+    def parse(self, response: str) -> dict:
         """Parse the response string to extract and return a JSON object as a dictionary.
 
         Parameters:
             response (str): The response string containing the JSON object.
 
         Returns:
-            Dict: The parsed JSON object as a dictionary.
+            dict: The parsed JSON object as a dictionary.
         """
         parsed_json = super().parse(response)
         if not isinstance(parsed_json, dict):

pycityagent/workflow/block.py

@@ -1,7 +1,8 @@
 import asyncio
 import functools
 import inspect
-from typing import Any, Callable, Coroutine, Optional, Union
+from collections.abc import Awaitable, Callable, Coroutine
+from typing import Any, Optional, Union
 
 from ..environment.simulator import Simulator
 from ..llm import LLM

{pycityagent-2.0.0a21.dist-info → pycityagent-2.0.0a22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycityagent
-Version: 2.0.0a21
+Version: 2.0.0a22
 Summary: LLM-based城市环境agent构建库
 License: MIT
 Author: Yuwei Yan

{pycityagent-2.0.0a21.dist-info → pycityagent-2.0.0a22.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pycityagent/__init__.py,sha256=EDxt3Su3lH1IMh9suNw7GeGL7UrXeWiZTw5KWNznDzc,637
-pycityagent/agent.py,sha256=FMplKAgcz2Exkl8EiE2RwQ0Hd5U08krRZ3CFFLoF_4g,28450
+pycityagent/agent.py,sha256=TGW4vyaYBnNxYkr22FhGPwex3dLIeq3F-2rnELidNPA,28670
 pycityagent/economy/__init__.py,sha256=aonY4WHnx-6EGJ4WKrx4S-2jAkYNLtqUA04jp6q8B7w,75
 pycityagent/economy/econ_client.py,sha256=GuHK9ZBnhqW3Z7F8ViDJn_iN73yOBbbwFyJv1wLEBDk,12211
 pycityagent/environment/__init__.py,sha256=awHxlOud-btWbk0FCS4RmGJ13W84oVCkbGfcrhKqihA,240
@@ -11,16 +11,16 @@ pycityagent/environment/sence/static.py,sha256=9s7jz8HitstTrk-GqpnVB26oPrjuTyNeL
 pycityagent/environment/sidecar/__init__.py,sha256=RFbOf40aYBP4WwRpFkua5tlRE_OtMcMNyp1Lew_aaAU,235
 pycityagent/environment/sidecar/sidecarv2.py,sha256=beKlYZgt38EQbV1x6NWQo7xVXyB-5QHfbwJexyXu7Tg,3252
 pycityagent/environment/sim/__init__.py,sha256=JVG6sSD2Hbohl1TtKjuQi7_M7tKMrFh9vl3QV3VA5O0,724
-pycityagent/environment/sim/aoi_service.py,sha256=yM50xhYPLLExwjl5MDlnAuohqJpK0KbIvr_cWLZJEAk,1203
+pycityagent/environment/sim/aoi_service.py,sha256=2UjvUTF4CW4E_L30IRcdwv6t_q1ZdXN3TTLOKSOaaXE,1230
 pycityagent/environment/sim/client.py,sha256=MHR7Hhu-Cr7B61d3K_QDpSJh4HrUU9JQf6Cu7_8pdsE,3493
-pycityagent/environment/sim/clock_service.py,sha256=YG_A_IA7iJp9rOQE3bCPgppzuzzUwWMCzlxSUdOy088,1326
-pycityagent/environment/sim/economy_services.py,sha256=ZggCyAK4Tv5SS881lUBe0WyymKq-0PtdWpe8p_pTDiI,7085
-pycityagent/environment/sim/lane_service.py,sha256=6ljWiX_GbZd-a-fEcktDZncxBkraLA2LDE_pVV99uLs,3896
-pycityagent/environment/sim/light_service.py,sha256=ezYGcV_PkZ6I-yv48LNEjsytwwwQx-1Qp2QCWXWIhdQ,4215
-pycityagent/environment/sim/person_service.py,sha256=nIvOsoBoqOTDYtsiThg07-4ZBgkTUDEbb3dHyOjzyb8,10652
-pycityagent/environment/sim/road_service.py,sha256=phKTwTyhc_6Ht2mddEXpdENfl-lRXIVY0CHAlw1yHjI,1264
+pycityagent/environment/sim/clock_service.py,sha256=fgYXacf_-ixhVAn5uKUvqvemBS6A0oQK8JOZukkhXyY,1353
+pycityagent/environment/sim/economy_services.py,sha256=xoc-1_H8JmQwJ24oWRS1fD-hGYtz2I-x6BOkQ4yENzU,7106
+pycityagent/environment/sim/lane_service.py,sha256=N2dUe-3XuqqKLsNXt1k4NN8uV-J_ruo08yhaUd_hwOI,3916
+pycityagent/environment/sim/light_service.py,sha256=KVwt7ii_iLGA7gANZe3n6-4RiiPQt1w9H6ZOoizMI04,4242
+pycityagent/environment/sim/person_service.py,sha256=5r1F2Itn7dKJ2U4hSLovrk5p4qy-2n77MTAv_OlTIwA,10673
+pycityagent/environment/sim/road_service.py,sha256=bKyn3_me0sGmaJVyF6eNeFbdU-9C1yWsa9L7pieDJzg,1285
 pycityagent/environment/sim/sim_env.py,sha256=HI1LcS_FotDKQ6vBnx0e49prXSABOfA20aU9KM-ZkCY,4625
-pycityagent/environment/sim/social_service.py,sha256=6Iqvq6dz8H2jhLLdtaITc6Js9QnQw-Ylsd5AZgUj3-E,1993
+pycityagent/environment/sim/social_service.py,sha256=9EFJAwVdUuUQkNkFRn9qZRDfD1brh2fqkvasnXUEBhQ,2014
 pycityagent/environment/simulator.py,sha256=XjcxbyBIbB3Ht9z087z_oWIPAN6pP5Eq1lyf4W5atb8,12502
 pycityagent/environment/utils/__init__.py,sha256=1m4Q1EfGvNpUsa1bgQzzCyWhfkpElnskNImjjFD3Znc,237
 pycityagent/environment/utils/base64.py,sha256=hoREzQo3FXMN79pqQLO2jgsDEvudciomyKii7MWljAM,374
@@ -29,7 +29,7 @@ pycityagent/environment/utils/geojson.py,sha256=LVHAdEhnZM8d0BoUnuPiIL_gaeXBIIgl
 pycityagent/environment/utils/grpc.py,sha256=6EJwKXXktIWb1NcUiJzIRmfrY0S03QAXXGcCDHqAT00,1998
 pycityagent/environment/utils/map_utils.py,sha256=lYOEoCFFK6-e9N5txLMMq4HUlxMqc8Uw1YrGW5oJmgg,5749
 pycityagent/environment/utils/port.py,sha256=3OM6kSUt3PxvDUOlgyiendBtETaWU8Mzk_8H0TzTmYg,295
-pycityagent/environment/utils/protobuf.py,sha256=0jBvK_s96y_n7tuMbG22TOtQmg71SGV4ONDy2IGsU9o,1148
+pycityagent/environment/utils/protobuf.py,sha256=0BsM_G7x2B_6DMIBHe9bjVuQDOXUytNRQ03g9e05F3c,1170
 pycityagent/llm/__init__.py,sha256=7klKEmCcDWJIu-F4DoAukSuKfDbLhdczrSIhpwow-sY,145
 pycityagent/llm/embedding.py,sha256=2psX_EK67oPlYe77g43EYUYams4M9AiJqxpHTFHG0n8,4253
 pycityagent/llm/llm.py,sha256=vJaaGqVuyV-GlBxrnvGKZnMDlxeTT_sGUTdxz5tYwEE,15141
@@ -38,11 +38,11 @@ pycityagent/llm/utils.py,sha256=hoNPhvomb1u6lhFX0GctFipw74hVKb7bvUBDqwBzBYw,160
 pycityagent/memory/__init__.py,sha256=Hs2NhYpIG-lvpwPWwj4DydB1sxtjz7cuA4iDAzCXnjI,243
 pycityagent/memory/const.py,sha256=6zpJPJXWoH9-yf4RARYYff586agCoud9BRn7sPERB1g,932
 pycityagent/memory/memory.py,sha256=vJxHOI74aJDGZPFu2LbBr02ASfOYpig66fto6Gjr-6Q,18191
-pycityagent/memory/memory_base.py,sha256=euKZRCs4dbcKxjlZzpLCTnH066DAtRjj5g1JFKD40qQ,5633
-pycityagent/memory/profile.py,sha256=s4LnxSPGSjIGZXHXkkd8mMa6uYYZrytgyQdWjcaqGf4,5182
-pycityagent/memory/self_define.py,sha256=poPiexNhOLq_iTgK8s4mK_xoL_DAAcB8kMvInj7iE5E,5179
-pycityagent/memory/state.py,sha256=5W0c1yJ-aaPpE74B2LEcw3Ygpm77tyooHv8NylyrozE,5113
-pycityagent/memory/utils.py,sha256=wLNlNlZ-AY9VB8kbUIy0UQSYh26FOQABbhmKQkit5o8,850
+pycityagent/memory/memory_base.py,sha256=QG_j3BxZvkadFEeE3uBR_kjl_xcXD1aHUVs8GEF3d6w,5654
+pycityagent/memory/profile.py,sha256=q8ZS9IBmHCg_X1GONUvXK85P6tCepTKQgXKuvuXYNXw,5203
+pycityagent/memory/self_define.py,sha256=vpZ6CIxR2grNXEIOScdpsSc59FBg0mOKelwQuTElbtQ,5200
+pycityagent/memory/state.py,sha256=TYItiyDtehMEQaSBN7PpNrnNxdDM5jGppr9R9Ufv3kA,5134
+pycityagent/memory/utils.py,sha256=oJWLdPeJy_jcdKcDTo9JAH9kDZhqjoQhhv_zT9qWC0w,877
 pycityagent/message/__init__.py,sha256=TCjazxqb5DVwbTu1fF0sNvaH_EPXVuj2XQ0p6W-QCLU,55
 pycityagent/message/messager.py,sha256=W_OVlNGcreHSBf6v-DrEnfNCXExB78ySr0w26MSncfU,2541
 pycityagent/metrics/__init__.py,sha256=X08PaBbGVAd7_PRGLREXWxaqm7nS82WBQpD1zvQzcqc,128
@@ -60,15 +60,15 @@ pycityagent/utils/avro_schema.py,sha256=DHM3bOo8m0dJf8oSwyOWzVeXrH6OERmzA_a5vS4S
 pycityagent/utils/decorators.py,sha256=Gk3r41hfk6awui40tbwpq3C7wC7jHaRmLRlcJFlLQCE,3160
 pycityagent/utils/parsers/__init__.py,sha256=AN2xgiPxszWK4rpX7zrqRsqNwfGF3WnCA5-PFTvbaKk,281
 pycityagent/utils/parsers/code_block_parser.py,sha256=Cs2Z_hm9VfNCpPPll1TwteaJF-HAQPs-3RApsOekFm4,1173
-pycityagent/utils/parsers/json_parser.py,sha256=FZ3XN1g8z4Dr2TFraUOoah1oQcze4fPd2m01hHoX0Mo,2917
+pycityagent/utils/parsers/json_parser.py,sha256=tjwyPluYfkWgsvLi0hzfJwFhO3L6yQfZMKza20HaGrY,2911
 pycityagent/utils/parsers/parser_base.py,sha256=KBKO4zLZPNdGjPAGqIus8LseZ8W3Tlt2y0QxqeCd25Q,1713
 pycityagent/utils/pg_query.py,sha256=h5158xcrxjUTR0nKwAaG1neFfTHPbN5guLmaXpC8yvs,1918
 pycityagent/utils/survey_util.py,sha256=Be9nptmu2JtesFNemPgORh_2GsN7rcDYGQS9Zfvc5OI,2169
 pycityagent/workflow/__init__.py,sha256=QNkUV-9mACMrR8c0cSKna2gC1mMZdxXbxWzjE-Uods0,621
-pycityagent/workflow/block.py,sha256=WkE2On97DCZS_9n8aIgT8wxv9Oaff4Fdf2tLqbKfMtE,6010
+pycityagent/workflow/block.py,sha256=l-z9iJo9_USZQRyj4TLMfihK0-tnNDG0a6jVk9WhG0o,6048
 pycityagent/workflow/prompt.py,sha256=6jI0Rq54JLv3-IXqZLYug62vse10wTI83xvf4ZX42nk,2929
 pycityagent/workflow/tool.py,sha256=xADxhNgVsjNiMxlhdwn3xGUstFOkLEG8P67ez8VmwSI,8555
 pycityagent/workflow/trigger.py,sha256=Df-MOBEDWBbM-v0dFLQLXteLsipymT4n8vqexmK2GiQ,5643
-pycityagent-2.0.0a21.dist-info/METADATA,sha256=sowWsIPV6PFjNPeQI30Pn0J1Fqz5KfZ7sMydvfaOAX0,7848
-pycityagent-2.0.0a21.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pycityagent-2.0.0a21.dist-info/RECORD,,
+pycityagent-2.0.0a22.dist-info/METADATA,sha256=s_gC55n1d1ZUyt1kRcYhl7h9Ymp8BQQKXZHrg93V8sg,7848
+pycityagent-2.0.0a22.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pycityagent-2.0.0a22.dist-info/RECORD,,