pycityagent 1.1.9__py3-none-any.whl → 1.1.11__py3-none-any.whl

pycityagent/utils.py

@@ -0,0 +1,178 @@
+import math
+
+def get_angle(x, y):
+    return math.atan2(y, x)*180/math.pi
+
+def point_on_line_given_distance(start_node, end_node, distance):
+    """
+    Given two points (start_point and end_point) defining a line, and a distance s to travel along the line,
+    return the coordinates of the point reached after traveling s units along the line, starting from start_point.
+
+    Args:
+        start_point (tuple): Tuple of (x, y) representing the starting point on the line.
+        end_point (tuple): Tuple of (x, y) representing the ending point on the line.
+        distance (float): Distance to travel along the line, starting from start_point.
+
+    Returns:
+        tuple: Tuple of (x, y) representing the new point reached after traveling s units along the line.
+    """
+
+    x1, y1 = start_node['x'], start_node['y']
+    x2, y2 = end_node['x'], end_node['y']
+
+    # Calculate the slope m and the y-intercept b of the line
+    if x1 == x2:
+        # Vertical line, distance is only along the y-axis
+        return (x1, y1 + distance if distance >= 0 else y1 - abs(distance))
+    else:
+        m = (y2 - y1) / (x2 - x1)
+        b = y1 - m * x1
+
+        # Calculate the direction vector (dx, dy) along the line
+        dx = (x2 - x1) / math.sqrt((x2 - x1)**2 + (y2 - y1)**2)
+        dy = (y2 - y1) / math.sqrt((x2 - x1)**2 + (y2 - y1)**2)
+
+        # Scale the direction vector by the given distance
+        scaled_dx = dx * distance
+        scaled_dy = dy * distance
+
+        # Calculate the new point's coordinates
+        x = x1 + scaled_dx
+        y = y1 + scaled_dy
+
+        return [x, y]
+    
+def get_keyindex_in_lane(nodes, distance, direction:str='front'):
+    temp_sum = 0
+    if direction == 'front':
+        # 顺道路方向前进
+        if distance == 0:
+            return [nodes[0]['x'], nodes[0]['y']]
+        key_index = 0  # first node
+        for i in range(1, len(nodes)):
+            x1, y1 = nodes[i-1]['x'], nodes[i-1]['y']
+            x2, y2 = nodes[i]['x'], nodes[i]['y']
+            temp_sum += math.sqrt((x2 - x1)**2 + (y2-y1)**2)
+            if temp_sum > distance:
+                remain_s = distance - (temp_sum - math.sqrt((x2 - x1)**2 + (y2-y1)**2))
+                break;
+            key_index += 1
+    else:
+        # 逆道路方向前进
+        if distance == 0:
+            return [nodes[-1]['x'], nodes[-1]['y']]
+        key_index = len(nodes)-1  # last node
+        for i in range(len(nodes)-1, 0, -1):
+            x1, y1 = nodes[i]['x'], nodes[i]['y']
+            x2, y2 = nodes[i-1]['x'], nodes[i-1]['y']
+            temp_sum += math.sqrt((x2 - x1)**2 + (y2-y1)**2)
+            if temp_sum > distance:
+                remain_s = distance - (temp_sum - math.sqrt((x2 - x1)**2 + (y2-y1)**2))
+                break;
+            key_index -= 1
+    return key_index
+
+def get_xy_in_lane(nodes, distance, direction:str='front'):
+    temp_sum = 0
+    remain_s = 0
+    if direction == 'front':
+        # 顺道路方向前进
+        if distance == 0:
+            return [nodes[0]['x'], nodes[0]['y']]
+        key_index = 0  # first node
+        for i in range(1, len(nodes)):
+            x1, y1 = nodes[i-1]['x'], nodes[i-1]['y']
+            x2, y2 = nodes[i]['x'], nodes[i]['y']
+            temp_sum += math.sqrt((x2 - x1)**2 + (y2-y1)**2)
+            if temp_sum > distance:
+                remain_s = distance - (temp_sum - math.sqrt((x2 - x1)**2 + (y2-y1)**2))
+                break;
+            key_index += 1
+        if remain_s < 0.5:
+            return [nodes[key_index]['x'], nodes[key_index]['y']]
+        xy = point_on_line_given_distance(nodes[key_index], nodes[key_index+1], remain_s)
+        return xy
+    else:
+        # 逆道路方向前进
+        if distance == 0:
+            return [nodes[-1]['x'], nodes[-1]['y']]
+        key_index = len(nodes)-1  # last node
+        for i in range(len(nodes)-1, 0, -1):
+            x1, y1 = nodes[i]['x'], nodes[i]['y']
+            x2, y2 = nodes[i-1]['x'], nodes[i-1]['y']
+            temp_sum += math.sqrt((x2 - x1)**2 + (y2-y1)**2)
+            if temp_sum > distance:
+                remain_s = distance - (temp_sum - math.sqrt((x2 - x1)**2 + (y2-y1)**2))
+                break;
+            key_index -= 1
+        if remain_s < 0.5:
+            return [nodes[key_index]['x'], nodes[key_index]['y']]
+        xy = point_on_line_given_distance(nodes[key_index], nodes[key_index-1], remain_s)
+        return xy
+    
+def get_direction_by_s(nodes, distance, direction:str='front'):
+    temp_sum = 0
+    if direction == 'front':
+        # 顺道路方向前进
+        if distance == 0:
+            return [nodes[0]['x'], nodes[0]['y']]
+        key_index = 0  # first node
+        for i in range(1, len(nodes)):
+            x1, y1 = nodes[i-1]['x'], nodes[i-1]['y']
+            x2, y2 = nodes[i]['x'], nodes[i]['y']
+            temp_sum += math.sqrt((x2 - x1)**2 + (y2-y1)**2)
+            if temp_sum > distance:
+                break;
+            key_index += 1
+        if key_index == len(nodes)-1:
+            # 端点
+            x = nodes[key_index]['x']-nodes[key_index-1]['x']
+            y = nodes[key_index]['y']-nodes[key_index-1]['y']
+            return get_angle(x, y)
+        else:
+            # 中间点
+            x = nodes[key_index+1]['x'] - nodes[key_index]['x']
+            y = nodes[key_index+1]['y'] - nodes[key_index]['y']
+            return get_angle(x, y)
+    elif direction == 'back':
+        # 逆道路方向前进
+        if distance == 0:
+            return [nodes[-1]['x'], nodes[-1]['y']]
+        key_index = len(nodes)-1  # last node
+        for i in range(len(nodes)-1, 0, -1):
+            x1, y1 = nodes[i]['x'], nodes[i]['y']
+            x2, y2 = nodes[i-1]['x'], nodes[i-1]['y']
+            temp_sum += math.sqrt((x2 - x1)**2 + (y2-y1)**2)
+            if temp_sum > distance:
+                break;
+            key_index -= 1
+        if key_index == 0:
+            x = nodes[key_index]['x'] - nodes[key_index+1]['x']
+            y = nodes[key_index]['y'] - nodes[key_index+1]['y']
+            return get_angle(x, y)
+        else:
+            x = nodes[key_index-1]['x'] - nodes[key_index]['x']
+            y = nodes[key_index-1]['y'] - nodes[key_index]['y']
+            return get_angle(x, y)
+    else:
+        print("Warning: wroing direction, 'front' instead")
+        if distance == 0:
+            return [nodes[0]['x'], nodes[0]['y']]
+        key_index = 0  # first node
+        for i in range(1, len(nodes)):
+            x1, y1 = nodes[i-1]['x'], nodes[i-1]['y']
+            x2, y2 = nodes[i]['x'], nodes[i]['y']
+            temp_sum += math.sqrt((x2 - x1)**2 + (y2-y1)**2)
+            if temp_sum > distance:
+                break;
+            key_index += 1
+        if key_index == len(nodes)-1:
+            # 端点
+            x = nodes[key_index]['x']-nodes[key_index-1]['x']
+            y = nodes[key_index]['y']-nodes[key_index-1]['y']
+            return get_angle(x, y)
+        else:
+            # 中间点
+            x = nodes[key_index+1]['x'] - nodes[key_index]['x']
+            y = nodes[key_index+1]['y'] - nodes[key_index]['y']
+            return get_angle(x, y)

{pycityagent-1.1.9.dist-info → pycityagent-1.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycityagent
-Version: 1.1.9
+Version: 1.1.11
 Summary: LLM-based城市模拟器agent构建库
 Author-email: Yuwei Yan <pinkgranite86@gmail.com>
 License: MIT License
@@ -34,16 +34,16 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: dashscope >=1.14.0
-Requires-Dist: geojson >=3.1.0
-Requires-Dist: numpy >=1.26.3
-Requires-Dist: openai >=1.8.0
-Requires-Dist: Pillow >=10.2.0
-Requires-Dist: pycitysim >=1.12.2
-Requires-Dist: citystreetview >=1.1.0
-Requires-Dist: PyYAML >=6.0.1
-Requires-Dist: Requests >=2.31.0
-Requires-Dist: transitions >=0.9.0
+Requires-Dist: dashscope>=1.14.0
+Requires-Dist: geojson>=3.1.0
+Requires-Dist: numpy>=1.26.3
+Requires-Dist: openai>=1.8.0
+Requires-Dist: Pillow>=10.2.0
+Requires-Dist: pycitysim>=1.12.2
+Requires-Dist: citystreetview>=1.1.0
+Requires-Dist: PyYAML>=6.0.1
+Requires-Dist: Requests>=2.31.0
+Requires-Dist: transitions>=0.9.0
 
 # Pycityagent
 

{pycityagent-1.1.9.dist-info → pycityagent-1.1.11.dist-info}/RECORD

@@ -1,25 +1,27 @@
-pycityagent/__init__.py,sha256=6yaevzqXIKrV8oqWoVLCDpqmmRhXwneyx8jlBzIpyYM,236
-pycityagent/agent.py,sha256=YTskUtvgwzZ1ssHHXr0XVH-QtrDc8UN5CqxxYL32-fU,8767
-pycityagent/agent_citizen.py,sha256=jkr32fw54Pe14KMOBAbj98Jt8iS5SuYQLP8_zktSdC8,5213
-pycityagent/agent_func.py,sha256=_SzHeKAkcjjok3CYja5ixX5fLKbOjgBihjSIyuyW6cI,4747
-pycityagent/simulator.py,sha256=XQcIn3Kbvb63MyIT3NHybdhUxa-DWfSX2r23CSv2wkM,5810
-pycityagent/ac/__init__.py,sha256=ya2NEJ_GagbNc52uFkmPjTGm9FoFy5pRrhXlm0SCt3s,330
+pycityagent/__init__.py,sha256=Sod9d8kCbUtmiLbuQDly0PVrycvrG4vly05ZmmTRAJc,284
+pycityagent/agent.py,sha256=cLUXPAx4RJ6LDZZ-9sY1XDZ4uKG6rn3rdfV15H9Flpk,8814
+pycityagent/agent_citizen.py,sha256=TigLZHHompzcbhdd4sbpH9AaDDmC3IDWg3Uwaxv67No,5631
+pycityagent/agent_func.py,sha256=C9OCiMdiuP3CW0RQ8G37zkUl7ULS5HxGYoh0SzNWzqY,8901
+pycityagent/agent_group.py,sha256=Te4eOvZBYqHF33HhAw6gtiXGrtnYdv7wcKEk9Vdx7lE,2771
+pycityagent/simulator.py,sha256=gcTetyMh4HX4X-pmP6E7kOKWdIHT5I_MkfMPq5EvzwI,11711
+pycityagent/utils.py,sha256=bOPURrDOZGryZ-h09SPp1hML2_6cvMy-z2DscYlWZ1g,7111
+pycityagent/ac/__init__.py,sha256=v6QqrWtw11f1NbPifcGyTPI6wpPmn-S3zG0bMdWUWdc,314
 pycityagent/ac/ac.py,sha256=K4LNrGOxGLH5_WOWCu9yZavbZdFAnzmAYA8rkz6kwjk,2267
 pycityagent/ac/action.py,sha256=82HUiQzOCr1vE91ooq9ETWBvy_dapywNAiZXu0eMLa8,2095
 pycityagent/ac/action_stream.py,sha256=cUqLWBVbluIhuvTVi6kh2GWXuE1tHERRRa29OtvMchA,783
-pycityagent/ac/hub_actions.py,sha256=6irhXm5mbnfj--KTH8nsKGP4zG4moq_y4bFqqYH-Rqc,3258
+pycityagent/ac/hub_actions.py,sha256=9GACIlPavA1V3it9dD-0ks2QnJyXjBxPcsx77PJ6xlo,14658
 pycityagent/ac/sim_actions.py,sha256=01M8ceSCSNKW5PwqJpvqVB2gAi0I1cvHqVAbbA9IEsk,3880
 pycityagent/ac/citizen_actions/controled.py,sha256=co0YG7QMMpX-tpbbW_MasoPGm4RzDxkj3IkXFnsuxss,718
 pycityagent/ac/citizen_actions/converse.py,sha256=ocMFvw-_sOUJmucgQjI87NNTZT9dj9svloiiU2zWDBE,1431
 pycityagent/ac/citizen_actions/idle.py,sha256=zrKx8k6-YyT-4i-ZE8BuhsOJIJmCYGEO1WpUaPxWVWw,683
 pycityagent/ac/citizen_actions/shop.py,sha256=lhrVelTVWF_9oAENStcX2YBgz6-fQaK3hL1OL9cl8uY,4273
-pycityagent/ac/citizen_actions/trip.py,sha256=n_XiKqfYlexoxS4q-tMjf2LhIw9xyUFiQI5vSZjsUrw,1772
+pycityagent/ac/citizen_actions/trip.py,sha256=MyvYFd4_EgIdHmsBpUT9fa-YNrY8GTZaLwrLPDPKODM,1769
 pycityagent/brain/__init__.py,sha256=9K8nPU-xoAyN--1eRdttRUyf-Swu5MXSmEzdSSJj6YM,359
-pycityagent/brain/brain.py,sha256=G1Q98qZ6MH1SquC3BubgJqVvIBY-Vf7elgo7zzPEGwI,1079
+pycityagent/brain/brain.py,sha256=UtV7wgBEb_QR5xg863utUQ1QWQZ1RlRyw07tQHEGDr4,1088
 pycityagent/brain/brainfc.py,sha256=E1N9Kdjjmo7S_kgvv8pr_gFDbQvRmXxEn1BVn85hd1s,280
-pycityagent/brain/memory.py,sha256=UBZFeUYBnQ_03_QYgJhgdWRy4n5MnISopw8-Brk-sag,22067
-pycityagent/brain/scheduler.py,sha256=b8MRikIJn1meTiIYi0gb6C607QnlpQkNc-Q_E0K2_Ks,18593
-pycityagent/brain/sence.py,sha256=8l-5A0FJPMBdgv4W_tUKJHALB3FUmyYAMr70JZTGlJA,28858
+pycityagent/brain/memory.py,sha256=Blqm6Wwyy4EmzsQLrluKMJ-Wni_GfNViZRKwY7dqGv4,22097
+pycityagent/brain/scheduler.py,sha256=FS9IBQg0rJWJucS12OJhhObCxZAzrrfzFyFHjhOknHk,18625
+pycityagent/brain/sence.py,sha256=qYnwQ3xQxBL_E7WzO3Za1pPwcaXxOnqUYDNow22ILtk,26365
 pycityagent/brain/static.py,sha256=fdBjHKacNiDCKhvQkc9WgEYYSO0peMC5lb8CcXl9iNc,29101
 pycityagent/brain/persistence/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycityagent/brain/persistence/social.py,sha256=6hJi14sFm4LOU1JlnX8Vq_jFv7VII1uHDM9lrt7-JDA,27
@@ -38,16 +40,16 @@ pycityagent/cc/idle.py,sha256=RbqwG4BdSpLdZ-_13mLMbUs20q8r5drKB4wNIGWPOZw,474
 pycityagent/cc/shop.py,sha256=9c8XTcUZBV90N_0MF3Gi9jlUS0LqNR3vIazEkK8tA28,149
 pycityagent/cc/trip.py,sha256=ayTUnED7Kq6qiwEfCO_u-Hz6rRFNzBI25dZGUSV5dJY,312
 pycityagent/cc/user.py,sha256=nS9NFfZypvXf-vLzqnYzLc6ek-CS8WALtEb00s1nREI,285
-pycityagent/hubconnector/__init__.py,sha256=5dJc5993RPZ2gi4zaNdynt_a8rVVFskYVqE706AsV7M,76
-pycityagent/hubconnector/hubconnector.py,sha256=6h2nNV3gCLznTP8lkHCEjdd0tANgO-rOrL5eJITTZvk,4908
+pycityagent/hubconnector/__init__.py,sha256=agM9SRqOZUpG6L3VkALOMj02lzyWwzHzrnaQkodVyes,86
+pycityagent/hubconnector/hubconnector.py,sha256=-OULEn4v0Ce0nkzqxa4Msurvr6pCK_7CN1DBUMVzags,16483
 pycityagent/image/__init__.py,sha256=u_kDcScyo66FQs98aXo64h-aNBC1YqdEgB7hMhXtU2E,101
 pycityagent/image/image.py,sha256=ymOkow9rvWQ7oq4rynVFmHEPqp0BbxMRJLmkRX1nVyA,5501
 pycityagent/st/__init__.py,sha256=LN9UMUUI_tZKAW-cUHszpRA8MjP4KL3RM0YQJY1ugVs,108
 pycityagent/st/st.py,sha256=PxNsy_BEZng2mOETKCK0ira98p4LjGluM17W3QZ_9Xw,5210
 pycityagent/urbanllm/__init__.py,sha256=ew7bS1-jaRf_MDTkDxvTup9a9-9FLqL0SLoloxrNDkU,85
-pycityagent/urbanllm/urbanllm.py,sha256=P--xap2P-3eTXZbDAOlPdXynPGFpLSJYuhTTmYRIQP8,7579
-pycityagent-1.1.9.dist-info/LICENSE,sha256=Yo9QmwLDFU3VoOc0W8aYSCa5Yj5sJyqM3FEcbC2jMQQ,1063
-pycityagent-1.1.9.dist-info/METADATA,sha256=2AO08OSGM4gvLnW8Q2nKxczHbqA9SUNw1A6dj_Y5dhE,8249
-pycityagent-1.1.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-pycityagent-1.1.9.dist-info/top_level.txt,sha256=mf70CsOn3eVJBwHQ_TjCesoc-elD0Bj2WLsi5APRjlU,12
-pycityagent-1.1.9.dist-info/RECORD,,
+pycityagent/urbanllm/urbanllm.py,sha256=q5-1xoLtrBHiN8_1KG5M_eqD9hgx9WllOZrqFrZsOPM,21113
+pycityagent-1.1.11.dist-info/LICENSE,sha256=Yo9QmwLDFU3VoOc0W8aYSCa5Yj5sJyqM3FEcbC2jMQQ,1063
+pycityagent-1.1.11.dist-info/METADATA,sha256=cJcCGFUyDMcSyASYua01LjYHJtTbWLNDaxn1QeMMPOA,8240
+pycityagent-1.1.11.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+pycityagent-1.1.11.dist-info/top_level.txt,sha256=mf70CsOn3eVJBwHQ_TjCesoc-elD0Bj2WLsi5APRjlU,12
+pycityagent-1.1.11.dist-info/RECORD,,

{pycityagent-1.1.9.dist-info → pycityagent-1.1.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any