pycityagent 2.0.0a89__cp39-cp39-macosx_11_0_arm64.whl → 2.0.0a91__cp39-cp39-macosx_11_0_arm64.whl

pycityagent/environment/sim/sim_env.py

@@ -13,7 +13,9 @@ from ..utils import encode_to_base64, find_free_port
 __all__ = ["ControlSimEnv"]
 
 
-def _generate_yaml_config(map_file: str, max_day: int, start_step: int, total_step: int) -> str:
+def _generate_yaml_config(
+    map_file: str, max_day: int, start_step: int, total_step: int
+) -> str:
     map_file = os.path.abspath(map_file)
     return f"""
 input:
@@ -48,6 +50,7 @@ class ControlSimEnv:
         start_step: int,
         total_step: int,
         log_dir: str,
+        primary_node_ip: str,
         min_step_time: int = 1000,
         timeout: int = 5,
         max_process: int = 32,
@@ -68,9 +71,12 @@ class ControlSimEnv:
         self._log_dir = log_dir
         self._min_step_time = min_step_time
         self._timeout = timeout
+        self._primary_node_ip = primary_node_ip
         self._max_procs = max_process
 
-        self._sim_config = _generate_yaml_config(map_file, max_day, start_step, total_step)
+        self._sim_config = _generate_yaml_config(
+            map_file, max_day, start_step, total_step
+        )
         # sim
         self.sim_port = None
         self._sim_proc = None
@@ -102,6 +108,7 @@ class ControlSimEnv:
             self.sim_port = find_free_port()
             config_base64 = encode_to_base64(self._sim_config)
             os.environ["GOMAXPROCS"] = str(self._max_procs)
+            sim_addr = self._primary_node_ip.rstrip("/") + f":{self.sim_port}"
             self._sim_proc = Popen(
                 [
                     "pycityagent-sim",
@@ -110,7 +117,7 @@ class ControlSimEnv:
                     "-job",
                     self._task_name,
                     "-listen",
-                    f":{self.sim_port}",
+                    sim_addr,
                     "-run.min_step_time",
                     f"{self._min_step_time}",
                     "-run.pause_after_one_day",
@@ -125,9 +132,8 @@ class ControlSimEnv:
                 # stdout=DEVNULL,
             )
             logging.info(
-                f"start pycityagent-sim at localhost:{self.sim_port}, PID={self._sim_proc.pid}"
+                f"start pycityagent-sim at {sim_addr}, PID={self._sim_proc.pid}"
             )
-            sim_addr = f"http://localhost:{self.sim_port}"
             atexit.register(self.close)
             time.sleep(0.3)
         else:

pycityagent/environment/simulator.py

@@ -126,10 +126,10 @@ class Simulator:
                     ),
                     log_dir=config["simulator"].get("log_dir", "./log"),
                     min_step_time=config["simulator"].get("min_step_time", 1000),
+                    primary_node_ip=config["simulator"].get("primary_node_ip", "localhost"),
                     sim_addr=config["simulator"].get("server", None),
                 )
-                primary_node_ip = config["simulator"].get("ad", "http://localhost")
-                self.server_addr = primary_node_ip.rstrip("/")+f":{sim_env.sim_port}"
+                self.server_addr = sim_env.sim_addr
                 config["simulator"]["server"] = self.server_addr
                 config["simulator"]["_server_activated"] = True
                 # using local client

{pycityagent-2.0.0a89.dist-info → pycityagent-2.0.0a91.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pycityagent
-Version: 2.0.0a89
+Version: 2.0.0a91
 Summary: LLM-based city environment agent building library
 Author-email: Yuwei Yan <pinkgranite86@gmail.com>, Junbo Yan <yanjb20thu@gmali.com>, Jun Zhang <zhangjun990222@gmali.com>
 License: MIT License

{pycityagent-2.0.0a89.dist-info → pycityagent-2.0.0a91.dist-info}/RECORD

@@ -1,3 +1,9 @@
+pycityagent-2.0.0a91.dist-info/RECORD,,
+pycityagent-2.0.0a91.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
+pycityagent-2.0.0a91.dist-info/WHEEL,sha256=md3JO_ifs5j508p3TDNMgtQVtnQblpGEt_Wo4W56l8Y,107
+pycityagent-2.0.0a91.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
+pycityagent-2.0.0a91.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
+pycityagent-2.0.0a91.dist-info/METADATA,sha256=p0o_OmiXN5jeCeFL-Yp9qt5TVb0nj2bmu-HSkagl9r8,9110
 pycityagent/pycityagent-sim,sha256=Ax6cjHjT8VcT5t07VboL_Ruor2eXSdSEml4Jvv-L5dQ,36972594
 pycityagent/__init__.py,sha256=PUKWTXc-xdMG7px8oTNclodsILUgypANj2Z647sY63k,808
 pycityagent/pycityagent-ui,sha256=Ur95yZygIaZ5l_CDqP9394M5GQ66iV5PkcNPYFWqzvk,41225346
@@ -46,7 +52,7 @@ pycityagent/workflow/prompt.py,sha256=rzenP4EFGxbWE1aq-x2036b6umKvi5cQx2xtWULwgI
 pycityagent/workflow/block.py,sha256=WJfCeL8e117GzkVPJCRNsQZZinccMnVyEubkwrf-17U,12295
 pycityagent/workflow/trigger.py,sha256=4nzAwywGQsFabgo6gzp-vD2EV4wII7Z0LHGEAsflSEY,7608
 pycityagent/environment/__init__.py,sha256=fFIth2jxxgZ92cXm-aoM2igHgaSqsYGwtBhyb7opjzk,166
-pycityagent/environment/simulator.py,sha256=ubOsoeyo81LZKfOSeS4eGrpn-7lC-hrdCBbcLH9NbK8,23324
+pycityagent/environment/simulator.py,sha256=4QVwi40I9AwJ9YIDK3-fqmlz2Q5ykkWBHpz78xAo22c,23299
 pycityagent/environment/utils/port.py,sha256=3OM6kSUt3PxvDUOlgyiendBtETaWU8Mzk_8H0TzTmYg,295
 pycityagent/environment/utils/grpc.py,sha256=_lB4-k4dTKuNvApaDiYgFxiLTPtYG42DVQtG9yOj9pQ,2022
 pycityagent/environment/utils/base64.py,sha256=hoREzQo3FXMN79pqQLO2jgsDEvudciomyKii7MWljAM,374
@@ -58,7 +64,7 @@ pycityagent/environment/utils/const.py,sha256=1LqxnYJ8FSmq37fN5kIFlWLwycEDzFa8SF
 pycityagent/environment/sim/pause_service.py,sha256=UUTa4pTBOX_MGKki9QDgKId7scch0waAWF9xRVmNlAs,1701
 pycityagent/environment/sim/person_service.py,sha256=T1pRi5jDcivSInX7iGZoHKYZmgO7_t5MYtLhU12_LC4,10793
 pycityagent/environment/sim/aoi_service.py,sha256=bYVJDrOfDn8hgOORDU7PxMaT-fpqXA5Z0A080l2EPBc,1242
-pycityagent/environment/sim/sim_env.py,sha256=4CW9lv9CyRUFsa0mwZ3AQsBps3i1Qh1KIRSgHdZWy0U,4658
+pycityagent/environment/sim/sim_env.py,sha256=iXdM2fQo-StbB55WcRDlY4Y4MbZ7ApZp7fAv58Cg9Rk,4758
 pycityagent/environment/sim/lane_service.py,sha256=bmf0zOWkxDzMEDlhTdHNRJRiTFGgzjbeqmex387gHZs,3964
 pycityagent/environment/sim/client.py,sha256=x4REWPRFG_C2s0-CWz8MnYalD_esfu2pPHf_vpsCG78,2852
 pycityagent/environment/sim/__init__.py,sha256=CyJc5Tey9MgzomZv0ynAcV0yaUlSE3bPbegYXar8wJc,601
@@ -89,9 +95,3 @@ pycityagent/cityagent/blocks/mobility_block.py,sha256=OZoA-swFdX0Ezpzkyp8jJMNPQ5
 pycityagent/survey/models.py,sha256=g3xni4GcA1Py3vlGt6z4ltutjgQ4G0uINYAM8vKRJAw,5225
 pycityagent/survey/__init__.py,sha256=rxwou8U9KeFSP7rMzXtmtp2fVFZxK4Trzi-psx9LPIs,153
 pycityagent/survey/manager.py,sha256=tHkdeq4lTfAHwvgf4-udsXri0z2l6E00rEbvwl7SqRs,3439
-pycityagent-2.0.0a89.dist-info/RECORD,,
-pycityagent-2.0.0a89.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a89.dist-info/WHEEL,sha256=md3JO_ifs5j508p3TDNMgtQVtnQblpGEt_Wo4W56l8Y,107
-pycityagent-2.0.0a89.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a89.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a89.dist-info/METADATA,sha256=ePWFzp7BbUYZs_AtmsewHwFGrmPbUyMwamMc1KJQfno,9110