pycityagent 2.0.0a54__cp310-cp310-macosx_11_0_arm64.whl → 2.0.0a56__cp310-cp310-macosx_11_0_arm64.whl

pycityagent/environment/simulator.py

@@ -70,6 +70,9 @@ 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)
         else:
             logger.warning(
@@ -173,6 +176,7 @@ class Simulator:
             return formatted_time
         else:
             return int(now["t"])
+
     async def pause(self):
         await self._client.pause_service.pause()
 

pycityagent/metrics/mlflow_client.py

@@ -20,6 +20,7 @@ logger = logging.getLogger("mlflow")
 
 def init_mlflow_connection(
     config: dict,
+    experiment_uuid: str,
     mlflow_run_name: Optional[str] = None,
     experiment_name: Optional[str] = None,
     experiment_description: Optional[str] = None,
@@ -43,6 +44,7 @@ def init_mlflow_connection(
         experiment_tags = {}
     if experiment_description is not None:
         experiment_tags["mlflow.note.content"] = experiment_description
+        experiment_tags["experiment_id"] = experiment_uuid
 
     uri = config["mlflow_uri"]
     client = mlflow.MlflowClient(tracking_uri=uri)
@@ -75,6 +77,7 @@ class MlflowClient:
     def __init__(
         self,
         config: dict,
+        experiment_uuid: str,
         mlflow_run_name: Optional[str] = None,
         experiment_name: Optional[str] = None,
         experiment_description: Optional[str] = None,
@@ -89,6 +92,7 @@ class MlflowClient:
                 self._run_uuid,
             ) = init_mlflow_connection(
                 config=config,
+                experiment_uuid=experiment_uuid,
                 mlflow_run_name=mlflow_run_name,
                 experiment_name=experiment_name,
                 experiment_description=experiment_description,

pycityagent/simulation/simulation.py

@@ -85,9 +85,14 @@ class AgentSimulation:
         self._simulator = Simulator(config["simulator_request"])
         if enable_economy:
             self._economy_env = self._simulator._sim_env
-            _req_dict = self.config["simulator_request"]
+            _req_dict: dict = self.config["simulator_request"]
             if "economy" in _req_dict:
-                _req_dict["economy"]["server"] = self._economy_env.sim_addr
+                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
             else:
                 _req_dict["economy"] = {
                     "server": self._economy_env.sim_addr,
@@ -129,15 +134,17 @@ class AgentSimulation:
 
         # mlflow
         _mlflow_config: dict[str, Any] = config.get("metric_request", {}).get("mlflow")
-        mlflow_run_id, _ = init_mlflow_connection(
-            config=_mlflow_config,
-            mlflow_run_name=f"EXP_{self.exp_name}_{1000*int(time.time())}",
-            experiment_name=self.exp_name,
-        )
         if _mlflow_config:
             logger.info(f"-----Creating Mlflow client...")
+            mlflow_run_id, _ = init_mlflow_connection(
+                config=_mlflow_config,
+                experiment_uuid=self.exp_id,
+                mlflow_run_name=f"EXP_{self.exp_name}_{1000*int(time.time())}",
+                experiment_name=self.exp_name,
+            )
             self.mlflow_client = MlflowClient(
                 config=_mlflow_config,
+                experiment_uuid=self.exp_id,
                 mlflow_run_name=f"EXP_{exp_name}_{1000*int(time.time())}",
                 experiment_name=exp_name,
                 run_id=mlflow_run_id,
@@ -526,6 +533,7 @@ class AgentSimulation:
         _mlflow_config = self.config.get("metric_request", {}).get("mlflow")
         if _mlflow_config:
             mlflow_run_id, _ = init_mlflow_connection(
+                experiment_uuid=self.exp_id,
                 config=_mlflow_config,
                 mlflow_run_name=f"{self.exp_name}_{1000*int(time.time())}",
                 experiment_name=self.exp_name,

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

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

@@ -1,7 +1,7 @@
 pycityagent/pycityagent-sim,sha256=1Nu-QYC0AuZyVWciGNa2XkYsUntbwAS15Bo7l-y6eok,35449490
 pycityagent/__init__.py,sha256=PUKWTXc-xdMG7px8oTNclodsILUgypANj2Z647sY63k,808
 pycityagent/pycityagent-ui,sha256=cHZjqtrQ4Fh4qtRahFNCNbT2DNHLmUexiDAa-72Z3RQ,40333378
-pycityagent/metrics/mlflow_client.py,sha256=g_tHxWkWTDijtbGL74-HmiYzWVKb1y8-w12QrY9jL30,4449
+pycityagent/metrics/mlflow_client.py,sha256=bTrqYsRfNfjJd6l91hU8vN7JXzJC7DHiM2XbkhMuXIU,4613
 pycityagent/metrics/__init__.py,sha256=X08PaBbGVAd7_PRGLREXWxaqm7nS82WBQpD1zvQzcqc,128
 pycityagent/metrics/utils/const.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycityagent/economy/__init__.py,sha256=aonY4WHnx-6EGJ4WKrx4S-2jAkYNLtqUA04jp6q8B7w,75
@@ -22,7 +22,7 @@ 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=mgzghIaud8M-gUjTlA8vRZ7X7l3UJgXBRm68cT0Fy18,32781
+pycityagent/simulation/simulation.py,sha256=3wFJEiYSNGVnEMOgKBhp566M-jm1l-kwFKXau2QJFSQ,33161
 pycityagent/simulation/__init__.py,sha256=P5czbcg2d8S0nbbnsQXFIhwzO4CennAhZM8OmKvAeYw,194
 pycityagent/simulation/agentgroup.py,sha256=ANTQA2OFQpuNZBz2VRhy60pTPUM1lXHFJLzFgK1SvxQ,31633
 pycityagent/simulation/storage/pg.py,sha256=xRshSOGttW-p0re0fNBOjOpb-nQ5msIE2LsdT79_E_Y,8425
@@ -47,7 +47,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=gqkECMzhXRh4WHTyLFEL1_X1R7F1aX4g9881zUFv7DI,12136
+pycityagent/environment/simulator.py,sha256=yDh3oa2WfgYm4zhTNizlADhI4I1WyNcXfLh99ItqiSA,12265
 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 +97,9 @@ 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.0a54.dist-info/RECORD,,
-pycityagent-2.0.0a54.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a54.dist-info/WHEEL,sha256=ezfKMaDztqf77C8lvQ0NCnZxkTaOaKLprqJ8q932MhU,109
-pycityagent-2.0.0a54.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a54.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a54.dist-info/METADATA,sha256=rziSp1wXuaGcNbO3WTqNx6s7JqARZxLvFeNLvsChKUo,9110
+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=ezfKMaDztqf77C8lvQ0NCnZxkTaOaKLprqJ8q932MhU,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