pycityagent 1.1.0__py3-none-any.whl → 1.1.1__py3-none-any.whl

pycityagent/brain/sence.py

@@ -297,7 +297,8 @@ class Sence(BrainFunction):
         - List[dict]: 可达位置列表
             - lane_id (int)
             - s (float)
-            - longlat (Tuple[float, float]): [longitude, latitude]
+            - xy (Tuple[float, float]): (x, y)
+            - longlat (Tuple[float, float]): (longitude, latitude)
             - type (str): 'driving' / 'walking' / 'unspecified'
         '''
         radius_ = self._sence_radius
@@ -318,6 +319,7 @@ class Sence(BrainFunction):
                 positions.append({
                     'lane_id': driving_positions[i]['lane_id'], 
                     's': driving_positions[i]['s'],
+                    'xy': (driving_gates[i]['x'], driving_gates[i]['y']),
                     'longlat': longlat,
                     'type': 'driving'
                 })
@@ -326,6 +328,7 @@ class Sence(BrainFunction):
                 positions.append({
                     'lane_id': walking_positions[i]['lane_id'], 
                     's': walking_positions[i]['s'],
+                    'xy': (walking_gates[i]['x'], walking_gates[i]['y']),
                     'longlat': longlat,
                     'type': 'walking'
                 })
@@ -343,7 +346,11 @@ class Sence(BrainFunction):
                 x, y = get_xy_in_lane(nodes, tmp_s)
                 longlat = self._agent._simulator.map.xy2lnglat(x=x, y=y)
                 type = copy.deepcopy(self._lane_type_mapping.get(lane['type'], 'unspecified'))
-                positions += [{'lane_id': lane_id, 's': tmp_s, 'longlat': longlat, 'type': type}]
+                positions += [{'lane_id': lane_id, 
+                               's': tmp_s, 
+                               'xy': (x, y),
+                               'longlat': longlat, 
+                               'type': type}]
 
                 # 2. 前驱道路
                 pre_lanes = lane['predecessors']
@@ -356,7 +363,11 @@ class Sence(BrainFunction):
                     x, y = get_xy_in_lane(pre_lane_nodes, tmp_s, 'back')
                     longlat = self._agent._simulator.map.xy2lnglat(x=x, y=y)
                     type = self._lane_type_mapping.get(pre_lane_['type'], 'unspecified')
-                    positions += [{'lane_id': pre_lane_id, 's': tmp_s, 'longlat': longlat, 'type': type}]
+                    positions += [{'lane_id': pre_lane_id, 
+                                   's': tmp_s, 
+                                   'xy': (x, y),
+                                   'longlat': longlat, 
+                                   'type': type}]
             elif agent_s == lane['length']:
                 # 处于当前道路的尾部端点位置
                 # 1. 当前道路
@@ -365,7 +376,11 @@ class Sence(BrainFunction):
                 x, y = get_xy_in_lane(nodes, tmp_s, 'back')
                 longlat = self._agent._simulator.map.xy2loglat(x=x, y=y)
                 type = self._lane_type_mapping.get(lane['type'], 'unspecified')
-                positions += [{'lane_id': lane_id, 's': tmp_s, 'longlat': longlat, 'type': type}]
+                positions += [{'lane_id': lane_id, 
+                               's': tmp_s, 
+                               'xy': (x, y),
+                               'longlat': longlat, 
+                               'type': type}]
 
                 # 2. 后继道路
                 suc_lanes = lane['successors']
@@ -378,7 +393,11 @@ class Sence(BrainFunction):
                     x, y = get_xy_in_lane(suc_lane_nodes, tmp_s)
                     longlat = self._agent._simulator.map.xy2loglat(x=x, y=y)
                     type = self._lane_type_mapping.get(lane['type'], 'unspecified')
-                    positions += [{'lane_id': suc_lane_id, 's': tmp_s, 'longlat': longlat, 'type': type}]
+                    positions += [{'lane_id': suc_lane_id, 
+                                   's': tmp_s, 
+                                   'xy': (x, y),
+                                   'longlat': longlat, 
+                                   'type': type}]
             else:
                 # 非端点位置
                 neg_s = agent_s - radius_
@@ -386,14 +405,22 @@ class Sence(BrainFunction):
                 x, y = get_xy_in_lane(nodes, neg_s, 'back')
                 longlat = self._agent._simulator.map.xy2loglat(x=x, y=y)
                 type = self._lane_type_mapping.get(lane['type'], 'unspecified')
-                positions += [{'lans_id': lane_id, 's': neg_s, 'longlat': longlat, 'type': type}]
+                positions += [{'lans_id': lane_id, 
+                               's': neg_s, 
+                               'xy': (x, y),
+                               'longlat': longlat, 
+                               'type': type}]
 
                 pos_s = agent_s + radius_
                 pos_s = pos_s if pos_s <= lane['length'] else lane['length']
                 x, y = get_xy_in_lane(nodes, pos_s)
                 longlat = self._agent._simulator.map.xy2loglat(x=x, y=y)
                 type = self._lane_type_mapping.get(lane['type'], 'unspecified')
-                positions += [{'lans_id': lane_id, 's': neg_s, 'longlat': longlat, 'type': type}]
+                positions += [{'lans_id': lane_id, 
+                               's': neg_s, 
+                               'xy': (x, y),
+                               'longlat': longlat, 
+                               'type': type}]
         return positions
 
     async def PerceivePoi(self, radius:int=None, category:str=None):

pycityagent/urbanllm/urbanllm.py

@@ -82,7 +82,7 @@ class UrbanLLM:
         """
         ppt = "如何理解这幅图像？"
         if prompt != None:
-            ppt += prompt
+            ppt = prompt
         dialog = [{
             'role': 'user',
             'content': [
@@ -101,7 +101,7 @@ class UrbanLLM:
             print(response.code)  # The error code.
             return "Error"
 
-    def img_generate(self, prompt, size:str='512*512', quantity:int = 1):
+    def img_generate(self, prompt:str, size:str='512*512', quantity:int = 1):
         """
         图像生成
         Image generation

{pycityagent-1.1.0.dist-info → pycityagent-1.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycityagent
-Version: 1.1.0
+Version: 1.1.1
 Summary: LLM-based城市模拟器agent构建库
 Author-email: Yuwei Yan <pinkgranite86@gmail.com>
 License: MIT License
@@ -60,7 +60,7 @@ Requires-Dist: transitions >=0.9.0
 - ![framwork](./static/framework.png)
 
 ### Workflow of CityAgent
-- ![workflow](./static/workflow.png)
+- ![workflow](./static/workflow_1.png)
 
 ## Hands On - By An Easy Demo
 ### Apply for your App

{pycityagent-1.1.0.dist-info → pycityagent-1.1.1.dist-info}/RECORD

@@ -24,7 +24,7 @@ pycityagent/brain/brain.py,sha256=WlIcp79ZbiWL47ubdVeXtUvQmzb0Rzluwq3tT2LjHBo,10
 pycityagent/brain/brainfc.py,sha256=XoiNUQgP4P7ui9dRZWTfzyzBVTDYZf10XqM7kot0Dbg,252
 pycityagent/brain/memory.py,sha256=MhTO8qzhogi-vA12eN3Y3H8gdflYf01XQmIM92N-RaI,21934
 pycityagent/brain/scheduler.py,sha256=56T78XrIdZb7qdlKPkNB-ibKH36ooEqHyHcp2jlID90,18492
-pycityagent/brain/sence.py,sha256=w_K5URVDy48Hh9wS4stoE7mH2ZWV5H5Ske1GkYf7CeA,27610
+pycityagent/brain/sence.py,sha256=taHdFT1o6ckK36WLOkyFMdRh72EJHkeBtb90cL4S6Mw,28683
 pycityagent/brain/static.py,sha256=vvPaJGKqTBqNe_N3LTFdDjgjjdeZb5niFrYUhGBsGD4,29081
 pycityagent/brain/persistence/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycityagent/brain/persistence/social.py,sha256=6hJi14sFm4LOU1JlnX8Vq_jFv7VII1uHDM9lrt7-JDA,27
@@ -50,9 +50,9 @@ pycityagent/image/image.py,sha256=KyOBoX8I1KSi82lBCBku-NXgXX4gIFHi2cGEe7yQ-lI,53
 pycityagent/st/__init__.py,sha256=YzsQXrgqRvmoQ4dWqAztAriKd8wvnQVe0FOpX_oZmiY,109
 pycityagent/st/st.py,sha256=z6yDo7ADOjostLg0mLmQ0oa_VysaCXFm4MnzC2H9nsI,5154
 pycityagent/urbanllm/__init__.py,sha256=D24mYFXdIEL2vbvB7Cp_BGgJvg-tvEnCgtEAAGaqGDY,56
-pycityagent/urbanllm/urbanllm.py,sha256=XEmU4fpdxA7zZlSfdXnXd9SIsPF0eC1SjxPKHAjxuAE,4341
-pycityagent-1.1.0.dist-info/LICENSE,sha256=Yo9QmwLDFU3VoOc0W8aYSCa5Yj5sJyqM3FEcbC2jMQQ,1063
-pycityagent-1.1.0.dist-info/METADATA,sha256=3OfZWBCVFmVhtdme8hQnZhNz_0I33PZtjtQKDp3WwB4,7458
-pycityagent-1.1.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-pycityagent-1.1.0.dist-info/top_level.txt,sha256=mf70CsOn3eVJBwHQ_TjCesoc-elD0Bj2WLsi5APRjlU,12
-pycityagent-1.1.0.dist-info/RECORD,,
+pycityagent/urbanllm/urbanllm.py,sha256=6PHRNSlYHrbHyzC_Pv2An71S7hkm-6XmAN7pJTozwas,4344
+pycityagent-1.1.1.dist-info/LICENSE,sha256=Yo9QmwLDFU3VoOc0W8aYSCa5Yj5sJyqM3FEcbC2jMQQ,1063
+pycityagent-1.1.1.dist-info/METADATA,sha256=mauUBRmAFcENHHhwi8FZ7f8n03ZnZAtdfk8M88YmGiE,7460
+pycityagent-1.1.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+pycityagent-1.1.1.dist-info/top_level.txt,sha256=mf70CsOn3eVJBwHQ_TjCesoc-elD0Bj2WLsi5APRjlU,12
+pycityagent-1.1.1.dist-info/RECORD,,