pycityagent 2.0.0a56__cp311-cp311-macosx_11_0_arm64.whl → 2.0.0a58__cp311-cp311-macosx_11_0_arm64.whl

pycityagent/environment/simulator.py

@@ -52,6 +52,8 @@ class Simulator:
                 f.write(_map_pb.SerializeToString())
 
         if "simulator" in config:
+            if config["simulator"] is None:
+                config["simulator"] = {}
             if "server" not in config["simulator"]:
                 self._sim_env = sim_env = ControlSimEnv(
                     task_name=config["simulator"].get("task", "citysim"),
@@ -62,7 +64,8 @@ class Simulator:
                     min_step_time=config["simulator"].get("min_step_time", 1000),
                     sim_addr=config["simulator"].get("server", None),
                 )
-
+                self.server_addr = sim_env.sim_addr
+                config["simulator"]["server"] = self.server_addr
                 # using local client
                 self._client = CityClient(sim_env.sim_addr, secure=False)
                 """
@@ -70,11 +73,10 @@ class Simulator:
                 - grpc client of simulator
                 """
             else:
-                raise ValueError(
-                    f"Passing Traffic Simulation address is not supported!"
-                )
                 self._client = CityClient(config["simulator"]["server"], secure=False)
+                self.server_addr = config["simulator"]["server"]
         else:
+            self.server_addr = None
             logger.warning(
                 "No simulator config found, no simulator client will be used"
             )

pycityagent/simulation/agentgroup.py

@@ -87,6 +87,7 @@ class AgentGroup:
             logger.info(f"-----Creating Mlflow client in AgentGroup {self._uuid} ...")
             self.mlflow_client = MlflowClient(
                 config=_mlflow_config,
+                experiment_uuid=self.exp_id,  # type:ignore
                 mlflow_run_name=f"{exp_name}_{1000*int(time.time())}",
                 experiment_name=exp_name,
                 run_id=mlflow_run_id,

pycityagent/simulation/simulation.py

@@ -83,19 +83,28 @@ class AgentSimulation:
         self.config = config
         self.exp_name = exp_name
         self._simulator = Simulator(config["simulator_request"])
+        _simulator_config = config["simulator_request"].get("simulator", {})
+        if "server" in _simulator_config:
+            raise ValueError(f"Passing Traffic Simulation address is not supported!")
         if enable_economy:
-            self._economy_env = self._simulator._sim_env
+            self._economy_addr = economy_addr = self._simulator.server_addr
+            if economy_addr is None:
+                raise ValueError(
+                    f"`simulator` not provided in `simulator_request`, thus unable to activate economy!"
+                )
             _req_dict: dict = self.config["simulator_request"]
             if "economy" in _req_dict:
+                if _req_dict["economy"] is None:
+                    _req_dict["economy"] = {}
                 if "server" in _req_dict["economy"]:
                     raise ValueError(
                         f"Passing Economy Simulation address is not supported!"
                     )
                 else:
-                    _req_dict["economy"]["server"] = self._economy_env.sim_addr
+                    _req_dict["economy"]["server"] = economy_addr
             else:
                 _req_dict["economy"] = {
-                    "server": self._economy_env.sim_addr,
+                    "server": economy_addr,
                 }
         self.agent_prefix = agent_prefix
         self._groups: dict[str, AgentGroup] = {}  # type:ignore

{pycityagent-2.0.0a56.dist-info → pycityagent-2.0.0a58.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pycityagent
-Version: 2.0.0a56
+Version: 2.0.0a58
 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.0a56.dist-info → pycityagent-2.0.0a58.dist-info}/RECORD

@@ -1,3 +1,9 @@
+pycityagent-2.0.0a58.dist-info/RECORD,,
+pycityagent-2.0.0a58.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
+pycityagent-2.0.0a58.dist-info/WHEEL,sha256=NW1RskY9zow1Y68W-gXg0oZyBRAugI1JHywIzAIai5o,109
+pycityagent-2.0.0a58.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
+pycityagent-2.0.0a58.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
+pycityagent-2.0.0a58.dist-info/METADATA,sha256=AUgPOiWxGpZ5A9LMIruA_h9B0S41Zu_Z_eCY1_Z23iE,9110
 pycityagent/pycityagent-sim,sha256=1Nu-QYC0AuZyVWciGNa2XkYsUntbwAS15Bo7l-y6eok,35449490
 pycityagent/__init__.py,sha256=PUKWTXc-xdMG7px8oTNclodsILUgypANj2Z647sY63k,808
 pycityagent/pycityagent-ui,sha256=cHZjqtrQ4Fh4qtRahFNCNbT2DNHLmUexiDAa-72Z3RQ,40333378
@@ -22,9 +28,9 @@ pycityagent/memory/utils.py,sha256=oJWLdPeJy_jcdKcDTo9JAH9kDZhqjoQhhv_zT9qWC0w,8
 pycityagent/memory/const.py,sha256=6zpJPJXWoH9-yf4RARYYff586agCoud9BRn7sPERB1g,932
 pycityagent/memory/faiss_query.py,sha256=V3rIw6d1_xcpNqZBbAYz3qfjVNE7NfJ7xOS5SibPtVU,13180
 pycityagent/memory/state.py,sha256=TYItiyDtehMEQaSBN7PpNrnNxdDM5jGppr9R9Ufv3kA,5134
-pycityagent/simulation/simulation.py,sha256=3wFJEiYSNGVnEMOgKBhp566M-jm1l-kwFKXau2QJFSQ,33161
+pycityagent/simulation/simulation.py,sha256=RZvDC6QBHjbm4d4WVdBJICG-X7TOSiQ04elZQBJWbeo,33646
 pycityagent/simulation/__init__.py,sha256=P5czbcg2d8S0nbbnsQXFIhwzO4CennAhZM8OmKvAeYw,194
-pycityagent/simulation/agentgroup.py,sha256=ANTQA2OFQpuNZBz2VRhy60pTPUM1lXHFJLzFgK1SvxQ,31633
+pycityagent/simulation/agentgroup.py,sha256=UnWUQ3Ev4qDQCOasb-EN08aUQi4SWHmM6aNSdBc850Q,31693
 pycityagent/simulation/storage/pg.py,sha256=xRshSOGttW-p0re0fNBOjOpb-nQ5msIE2LsdT79_E_Y,8425
 pycityagent/message/message_interceptor.py,sha256=w8XTyZStQtMjILpeAX3VMhAWcYAuaxCgSMwXQU1OryM,8951
 pycityagent/message/__init__.py,sha256=f5QH7DKPqEAMyfSlBMnl3uouOKlsoel909STlIe7nUk,276
@@ -47,7 +53,7 @@ pycityagent/workflow/prompt.py,sha256=6jI0Rq54JLv3-IXqZLYug62vse10wTI83xvf4ZX42n
 pycityagent/workflow/block.py,sha256=4QufS8XnyP6SYp8g1gDODW-H0nAHA7lvivrPGUq1p-w,9922
 pycityagent/workflow/trigger.py,sha256=Df-MOBEDWBbM-v0dFLQLXteLsipymT4n8vqexmK2GiQ,5643
 pycityagent/environment/__init__.py,sha256=MyZBwsweDIHOKSX2iSZs748foNtaiyEcyg6sc747T2g,263
-pycityagent/environment/simulator.py,sha256=yDh3oa2WfgYm4zhTNizlADhI4I1WyNcXfLh99ItqiSA,12265
+pycityagent/environment/simulator.py,sha256=8imXFHhNxVhritO7YEZqM59x4VkKS8rc0Dwu6SHaREo,12439
 pycityagent/environment/message/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycityagent/environment/utils/port.py,sha256=3OM6kSUt3PxvDUOlgyiendBtETaWU8Mzk_8H0TzTmYg,295
 pycityagent/environment/utils/grpc.py,sha256=6EJwKXXktIWb1NcUiJzIRmfrY0S03QAXXGcCDHqAT00,1998
@@ -97,9 +103,3 @@ pycityagent/cityagent/blocks/mobility_block.py,sha256=xWbARMfJ3-6fddrW3VOUKJrXfM
 pycityagent/survey/models.py,sha256=YE50UUt5qJ0O_lIUsSY6XFCGUTkJVNu_L1gAhaCJ2fs,3546
 pycityagent/survey/__init__.py,sha256=rxwou8U9KeFSP7rMzXtmtp2fVFZxK4Trzi-psx9LPIs,153
 pycityagent/survey/manager.py,sha256=S5IkwTdelsdtZETChRcfCEczzwSrry_Fly9MY4s3rbk,1681
-pycityagent-2.0.0a56.dist-info/RECORD,,
-pycityagent-2.0.0a56.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a56.dist-info/WHEEL,sha256=NW1RskY9zow1Y68W-gXg0oZyBRAugI1JHywIzAIai5o,109
-pycityagent-2.0.0a56.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a56.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a56.dist-info/METADATA,sha256=hkVVU9cbagWMuXsPQ8p6SjB1QjxMs4xILhudf6AMHn0,9110