pycityagent 2.0.0a21__tar.gz → 2.0.0a24__tar.gz

{pycityagent-2.0.0a21 → pycityagent-2.0.0a24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycityagent
-Version: 2.0.0a21
+Version: 2.0.0a24
 Summary: LLM-based城市环境agent构建库
 License: MIT
 Author: Yuwei Yan
@@ -20,10 +20,12 @@ Requires-Dist: aiohttp (==3.10.10)
 Requires-Dist: aiomqtt (>=2.3.0,<3.0.0)
 Requires-Dist: citystreetview (==1.2.4)
 Requires-Dist: dashscope (==1.14.1)
+Requires-Dist: faiss-cpu (>=1.9.0.post1,<2.0.0)
 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-community (>=0.3.13,<0.4.0)
 Requires-Dist: langchain-core (>=0.3.28,<0.4.0)
 Requires-Dist: matplotlib (==3.8.3)
 Requires-Dist: mlflow (>=2.19.0,<3.0.0)
@@ -40,6 +42,8 @@ Requires-Dist: pycityproto (>=2.1.5,<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)
+Requires-Dist: torch (>=2.5.1,<3.0.0)
+Requires-Dist: transformers (>=4.47.1,<5.0.0)
 Requires-Dist: zhipuai (>=2.1.5.20230904,<3.0.0.0)
 Description-Content-Type: text/markdown
 

{pycityagent-2.0.0a21 → pycityagent-2.0.0a24}/pycityagent/__init__.py

@@ -5,6 +5,7 @@ Pycityagent: 城市智能体构建框架
 from .agent import Agent, CitizenAgent, InstitutionAgent
 from .environment import Simulator
 import logging
+from .llm import SentenceEmbedding
 
 # 创建一个 pycityagent 记录器
 logger = logging.getLogger("pycityagent")
@@ -19,4 +20,4 @@ if not logger.hasHandlers():
     handler.setFormatter(formatter)
     logger.addHandler(handler)
 
-__all__ = ["Agent", "Simulator", "CitizenAgent", "InstitutionAgent"]
+__all__ = ["Agent", "Simulator", "CitizenAgent", "InstitutionAgent","SentenceEmbedding",]

{pycityagent-2.0.0a21 → pycityagent-2.0.0a24}/pycityagent/agent.py

@@ -236,7 +236,15 @@ class Agent(ABC):
 
         # 添加记忆上下文
         if self._memory:
-            relevant_memories = await self._memory.search(survey_prompt)
+            relevant_memories = await self.memory.search(survey_prompt)
+
+            formatted_results = []
+            # for result in top_results:
+            #     formatted_results.append(
+            #         f"- [{result['type']}] {result['content']} "
+            #         f"(相关度: {result['similarity']:.2f})"
+            #     )
+
             if relevant_memories:
                 dialog.append(
                     {
@@ -458,13 +466,18 @@ 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 +498,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"]
@@ -595,6 +608,7 @@ class CitizenAgent(Agent):
                 # 防止模拟器还没有到prepare阶段导致get_person出错
             self._has_bound_to_simulator = True
             self._agent_id = person_id
+            self.memory.set_agent_id(person_id)
 
     async def _bind_to_economy(self):
         if self._economy_client is None:

{pycityagent-2.0.0a21 → pycityagent-2.0.0a24}/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-2.0.0a21 → pycityagent-2.0.0a24}/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-2.0.0a21 → pycityagent-2.0.0a24}/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-2.0.0a21 → pycityagent-2.0.0a24}/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-2.0.0a21 → pycityagent-2.0.0a24}/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-2.0.0a21 → pycityagent-2.0.0a24}/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-2.0.0a21 → pycityagent-2.0.0a24}/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-2.0.0a21 → pycityagent-2.0.0a24}/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-2.0.0a21 → pycityagent-2.0.0a24}/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-2.0.0a24/pycityagent/llm/__init__.py

@@ -0,0 +1,11 @@
+"""LLM相关模块"""
+
+from .embeddings import SentenceEmbedding, SimpleEmbedding
+from .llm import LLM, LLMConfig
+
+__all__ = [
+    "LLM",
+    "LLMConfig",
+    "SentenceEmbedding",
+    "SimpleEmbedding",
+]