pycityagent 2.0.0a53__cp310-cp310-macosx_11_0_arm64.whl → 2.0.0a55__cp310-cp310-macosx_11_0_arm64.whl

pycityagent/cli/wrapper.py

@@ -6,6 +6,7 @@ import signal
 _script_dir = os.path.dirname(os.path.abspath(__file__))
 _parent_dir = os.path.dirname(_script_dir)
 
+
 def wrapper(bin: str):
     binary_path = os.path.join(_parent_dir, bin)
     if not os.path.exists(binary_path):
@@ -21,12 +22,14 @@ def wrapper(bin: str):
         stdout=sys.stdout,
         stderr=sys.stderr,
     )
+
     # register signal handler
     def signal_handler(sig, frame):
         if p.poll() is None:
             p.send_signal(sig)
         else:
             sys.exit(p.poll())
+
     signals = [signal.SIGINT, signal.SIGTERM, signal.SIGHUP]
     for sig in signals:
         signal.signal(sig, signal_handler)
@@ -40,5 +43,6 @@ def wrapper(bin: str):
 def pycityagent_sim():
     wrapper("pycityagent-sim")
 
+
 def pycityagent_ui():
     wrapper("pycityagent-ui")

pycityagent/economy/econ_client.py

@@ -8,8 +8,6 @@ import pycityproto.city.economy.v2.org_service_pb2 as org_service
 import pycityproto.city.economy.v2.org_service_pb2_grpc as org_grpc
 from google.protobuf import descriptor
 
-economyv2.ORG_TYPE_BANK
-
 __all__ = [
     "EconomyClient",
 ]

pycityagent/environment/__init__.py

@@ -4,4 +4,10 @@ from .sence.static import LEVEL_ONE_PRE, POI_TYPE_DICT
 from .sim import AoiService, PersonService
 from .simulator import Simulator
 
-__all__ = ["Simulator", "POI_TYPE_DICT", "LEVEL_ONE_PRE", "PersonService", "AoiService"]
+__all__ = [
+    "Simulator",
+    "POI_TYPE_DICT",
+    "LEVEL_ONE_PRE",
+    "PersonService",
+    "AoiService",
+]

pycityagent/environment/sim/sim_env.py

@@ -1,7 +1,8 @@
+import atexit
 import logging
 import os
 import time
-import atexit
+import warnings
 from subprocess import DEVNULL, Popen
 from typing import Optional
 
@@ -51,7 +52,7 @@ class ControlSimEnv:
         log_dir: str,
         min_step_time: int = 1000,
         timeout: int = 5,
-        simuletgo_addr: Optional[str] = None,
+        sim_addr: Optional[str] = None,
     ):
         self._task_name = task_name
         self._map_file = map_file
@@ -66,47 +67,38 @@ class ControlSimEnv:
         地图数据
         """
 
-        # 检查二进制文件是否存在
-        # simulet-go: ~/.local/bin/simulet-go
-        self._simuletgo_path = os.path.expanduser("~/.local/bin/simulet-go")
-        if not os.path.exists(os.path.expanduser(self._simuletgo_path)):
-            raise FileNotFoundError("simulet-go not found, please install it first")
-
-        self._simuletgo_config = _generate_yaml_config(map_file, start_step, total_step)
-        self.simuletgo_port = None
-        self._simuletgo_proc = None
-        self._traffic_client = None
-
+        self._sim_config = _generate_yaml_config(map_file, start_step, total_step)
+        # sim
+        self.sim_port = None
+        self._sim_proc = None
         os.makedirs(log_dir, exist_ok=True)
 
-        self.simuletgo_addr = self.reset(simuletgo_addr)
+        self.sim_addr = self.reset(sim_addr)
 
     def reset(
         self,
-        simuletgo_addr: Optional[str] = None,
+        sim_addr: Optional[str] = None,
     ):
         """
         Args:
-        - simuletgo_addr: str, simulet-go的地址。如果为None，则启动一个新的simulet-go
+        - sim_addr: str, pycityagent-sim的地址。如果为None，则启动一个新的pycityagent-sim
         """
-
-        # 三个地址必须同时为None或者同时不为None
-        if simuletgo_addr is None:
-            # 1. 启动simulet-go
-            # ./simulet-go -config-data configbase64 -job test -syncer http://localhost:53001 -listen :51102
-            assert self.simuletgo_port is None
-            assert self._simuletgo_proc is None
-            self.simuletgo_port = find_free_port()
-            config_base64 = encode_to_base64(self._simuletgo_config)
-            self._simuletgo_proc = Popen(
+        if sim_addr is None:
+            # 启动pycityagent-sim
+            # pycityagent-sim -config-data configbase64 -job test -listen :51102
+            assert self.sim_port is None
+            assert self._sim_proc is None
+            self.sim_port = find_free_port()
+            config_base64 = encode_to_base64(self._sim_config)
+            self._sim_proc = Popen(
                 [
-                    self._simuletgo_path,
+                    "pycityagent-sim",
                     "-config-data",
                     config_base64,
                     "-job",
                     self._task_name,
                     "-listen",
-                    f":{self.simuletgo_port}",
+                    f":{self.sim_port}",
                     "-run.min_step_time",
                     f"{self._min_step_time}",
                     "-output",
@@ -120,26 +112,22 @@ class ControlSimEnv:
                 # stdout=DEVNULL,
             )
             logging.info(
-                f"start simulet-go at localhost:{self.simuletgo_port}, PID={self._simuletgo_proc.pid}"
+                f"start pycityagent-sim at localhost:{self.sim_port}, PID={self._sim_proc.pid}"
             )
-            simuletgo_addr = f"http://localhost:{self.simuletgo_port}"
+            sim_addr = f"http://localhost:{self.sim_port}"
             atexit.register(self.close)
-            time.sleep(1)
-        elif simuletgo_addr is not None:
-            pass
+            time.sleep(0.3)
         else:
-            # raise ValueError(
-            #     "simuletgo_addr, syncer_addr, routing_addr must be all None or all not None"
-            # )
-            pass
-        return simuletgo_addr
+            warnings.warn("单独启动模拟器模拟将被弃用", DeprecationWarning)
 
-    def close(self):
-        if self._simuletgo_proc is not None:
-            self._simuletgo_proc.terminate()
-            simuletgo_code = self._simuletgo_proc.wait()
-            logging.info(f"simulet-go exit with code {simuletgo_code}")
+        return sim_addr
 
-        self.simuletgo_port = None
-        self._simuletgo_proc = None
-        self._traffic_client = None
+    def close(self):
+        if self._sim_proc is not None:
+            self._sim_proc.terminate()
+            sim_code = self._sim_proc.wait()
+            logging.info(f"pycityagent-sim exit with code {sim_code}")
+
+        # sim
+        self.sim_port = None
+        self._sim_proc = None

pycityagent/environment/simulator.py

@@ -60,11 +60,11 @@ class Simulator:
                     total_step=2147000000,
                     log_dir=config["simulator"].get("log_dir", "./log"),
                     min_step_time=config["simulator"].get("min_step_time", 1000),
-                    simuletgo_addr=config["simulator"].get("server", None),
+                    sim_addr=config["simulator"].get("server", None),
                 )
 
                 # using local client
-                self._client = CityClient(sim_env.simuletgo_addr, secure=False)
+                self._client = CityClient(sim_env.sim_addr, secure=False)
                 """
                 - 模拟器grpc客户端
                 - grpc client of simulator
@@ -173,7 +173,6 @@ class Simulator:
             return formatted_time
         else:
             return int(now["t"])
-        
     async def pause(self):
         await self._client.pause_service.pause()
 

pycityagent/llm/llm.py

@@ -1,25 +1,27 @@
 """UrbanLLM: 智能能力类及其定义"""
 
 import json
-from openai import OpenAI, AsyncOpenAI, APIConnectionError, OpenAIError
-from zhipuai import ZhipuAI
 import logging
 
+from openai import APIConnectionError, AsyncOpenAI, OpenAI, OpenAIError
+from zhipuai import ZhipuAI
+
 logging.getLogger("zhipuai").setLevel(logging.WARNING)
 
 import asyncio
+import os
 from http import HTTPStatus
+from io import BytesIO
+from typing import Any, Optional, Union
+
 import dashscope
 import requests
 from dashscope import ImageSynthesis
 from PIL import Image
-from io import BytesIO
-from typing import Any, Optional, Union
+
 from .llmconfig import *
 from .utils import *
 
-import os
-
 os.environ["GRPC_VERBOSITY"] = "ERROR"
 
 
@@ -38,13 +40,13 @@ class LLM:
         self.request_number = 0
         self.semaphore = None
         self._current_client_index = 0
-        
+
         api_keys = self.config.text["api_key"]
         if not isinstance(api_keys, list):
             api_keys = [api_keys]
-            
+
         self._aclients = []
-        
+
         for api_key in api_keys:
             if self.config.text["request_type"] == "openai":
                 client = AsyncOpenAI(api_key=api_key, timeout=300)
@@ -62,6 +64,10 @@ class LLM:
                 )
             elif self.config.text["request_type"] == "zhipuai":
                 client = ZhipuAI(api_key=api_key, timeout=300)
+            else:
+                raise ValueError(
+                    f"Unsupported `request_type` {self.config.text['request_type']}!"
+                )
             self._aclients.append(client)
 
     def set_semaphore(self, number_of_coroutine: int):
@@ -118,7 +124,9 @@ Token Usage:
     def _get_next_client(self):
         """获取下一个要使用的客户端"""
         client = self._aclients[self._current_client_index]
-        self._current_client_index = (self._current_client_index + 1) % len(self._aclients)
+        self._current_client_index = (self._current_client_index + 1) % len(
+            self._aclients
+        )
         return client
 
     async def atext_request(