pycityagent 2.0.0a36__py3-none-any.whl → 2.0.0a37__py3-none-any.whl

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/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.dist-info → pycityagent-2.0.0a37.dist-info}/METADATA

@@ -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.dist-info → pycityagent-2.0.0a37.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pycityagent/__init__.py,sha256=fv0mzNGbHBF6m550yYqnuUpB8iQPWS-7EatYRK7DO4s,693
-pycityagent/agent.py,sha256=r1uG4ib6fAmqzZXqGUiwswYdIOS8ybTFdbVqJWjhwuI,29047
+pycityagent/agent.py,sha256=_klNenWHt_AB6go57pjLqw4TcGW6AjoyZTUkmADT6q4,29910
 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
@@ -50,7 +50,7 @@ pycityagent/metrics/__init__.py,sha256=X08PaBbGVAd7_PRGLREXWxaqm7nS82WBQpD1zvQzc
 pycityagent/metrics/mlflow_client.py,sha256=g_tHxWkWTDijtbGL74-HmiYzWVKb1y8-w12QrY9jL30,4449
 pycityagent/metrics/utils/const.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycityagent/simulation/__init__.py,sha256=P5czbcg2d8S0nbbnsQXFIhwzO4CennAhZM8OmKvAeYw,194
-pycityagent/simulation/agentgroup.py,sha256=mZXznSf7VEHNjU0KM5TuPB-Z09DqMZ6VeQib7ciTLpo,23914
+pycityagent/simulation/agentgroup.py,sha256=e6K388TzfwBDyZmfPAxLl_Z1eKcyEn3qgvSlbyw-ggI,24158
 pycityagent/simulation/simulation.py,sha256=OVflF_Z_kZfE6c4z_6tHTGD53jq89Hewg8Yc5KflRI0,23008
 pycityagent/simulation/storage/pg.py,sha256=qGrYzJIAzjv8-d3-cle0rY0AN6XB6MgnHkFLBoLmKWU,7251
 pycityagent/survey/__init__.py,sha256=rxwou8U9KeFSP7rMzXtmtp2fVFZxK4Trzi-psx9LPIs,153
@@ -70,6 +70,6 @@ pycityagent/workflow/block.py,sha256=C2aWdVRffb3LknP955GvPcBMsm3VPXN9ZuAtCgITFTo
 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.0a36.dist-info/METADATA,sha256=aJH2tcaEccrMdJRwjgNmRS8bYla-E_TTMh1bgevmHEM,8046
-pycityagent-2.0.0a36.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pycityagent-2.0.0a36.dist-info/RECORD,,
+pycityagent-2.0.0a37.dist-info/METADATA,sha256=ibC4tsZ7FUxY1TK9t5sZGSe8sXE47C4ocnbd7QxSpGw,8046
+pycityagent-2.0.0a37.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pycityagent-2.0.0a37.dist-info/RECORD,,