pycityagent 2.0.0a36__tar.gz → 2.0.0a37__tar.gz

{pycityagent-2.0.0a36 → pycityagent-2.0.0a37}/PKG-INFO

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

{pycityagent-2.0.0a36 → pycityagent-2.0.0a37}/pycityagent/agent.py

@@ -688,6 +688,28 @@ class InstitutionAgent(Agent):
             _id = random.randint(100000, 999999)
             self._agent_id = _id
             self.memory.set_agent_id(_id)
+            map_header = self.simulator.map.header
+            # TODO: remove random position assignment
+            await self.memory.update(
+                "position",
+                {
+                    "xy_position": {
+                        "x": float(
+                            random.randrange(
+                                start=int(map_header["west"]),
+                                stop=int(map_header["east"]),
+                            )
+                        ),
+                        "y": float(
+                            random.randrange(
+                                start=int(map_header["south"]),
+                                stop=int(map_header["north"]),
+                            )
+                        ),
+                    }
+                },
+                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])

{pycityagent-2.0.0a36 → pycityagent-2.0.0a37}/pycityagent/simulation/agentgroup.py

@@ -134,8 +134,8 @@ class AgentGroup:
                 agent.memory.set_embedding_model(self.embedding_model)
 
     async def __aexit__(self, exc_type, exc_value, traceback):
-        self.message_dispatch_task.cancel()
-        await asyncio.gather(self.message_dispatch_task, return_exceptions=True)
+        self.message_dispatch_task.cancel()  # type: ignore
+        await asyncio.gather(self.message_dispatch_task, return_exceptions=True)  # type: ignore
 
     async def init_agents(self):
         logger.debug(f"-----Initializing Agents in AgentGroup {self._uuid} ...")
@@ -418,8 +418,11 @@ class AgentGroup:
                     # institution
                     for agent in self.agents:
                         _date_time = datetime.now(timezone.utc)
+                        position = await agent.memory.get("position")
+                        x = position["xy_position"]["x"]
+                        y = position["xy_position"]["y"]
+                        lng, lat = self.projector(x, y, inverse=True)
                         # ATTENTION: no valid position for an institution
-                        lng, lat = -1, -1
                         parent_id = -1
                         try:
                             nominal_gdp = await agent.memory.get("nominal_gdp")

{pycityagent-2.0.0a36 → pycityagent-2.0.0a37}/pyproject.toml

@@ -3,7 +3,7 @@ in-project = true
 
 [tool.poetry]
 name = "pycityagent"
-version = "2.0.0a36"
+version = "2.0.0a37"
 description = "LLM-based城市环境agent构建库"
 authors = ["Yuwei Yan <pinkgranite86@gmail.com>","Junbo Yan <yanjb20thu@gmali.com>"]
 license = "MIT"