@@ -107,20 +107,38 @@ def both(config: Config) -> None:
107107 ray .get (trainer .log_finalize .remote (step = train_iter_num ))
108108
109109
110- def activate_data_module (config_path : str ):
110+ def activate_data_module (data_workflow_url : str , config_path : str ):
111111 """Check whether to activate data module and preprocess datasets."""
112- from trinity .data .client import LOCAL_SERVER_URL , request
112+ from trinity .cli .client import request
113113
114114 logger .info ("Activating data module..." )
115115 res = request (
116- url = LOCAL_SERVER_URL ,
116+ url = data_workflow_url ,
117117 configPath = config_path ,
118118 )
119119 if res ["return_code" ] != 0 :
120120 logger .error (f"Failed to activate data module: { res ['return_msg' ]} ." )
121121 return
122122
123123
124+ def run (config_path : str ):
125+ config = load_config (config_path )
126+ config .check_and_update ()
127+ # try to activate data module
128+ data_config = config .data
129+ if data_config .data_workflow_url and (
130+ data_config .dj_config_path or data_config .dj_process_desc
131+ ):
132+ activate_data_module (data_config .data_workflow_url , config_path )
133+ ray .init ()
134+ if config .mode == "explore" :
135+ explore (config )
136+ elif config .mode == "train" :
137+ train (config )
138+ elif config .mode == "both" :
139+ both (config )
140+
141+
124142def main () -> None :
125143 """The main entrypoint."""
126144 parser = argparse .ArgumentParser ()
@@ -135,19 +153,7 @@ def main() -> None:
135153 args = parser .parse_args ()
136154 if args .command == "run" :
137155 # TODO: support parse all args from command line
138- config = load_config (args .config )
139- config .check_and_update ()
140- # try to activate data module
141- data_config = config .data
142- if data_config .dj_config_path or data_config .dj_process_desc :
143- activate_data_module (args .config )
144- ray .init ()
145- if config .mode == "explore" :
146- explore (config )
147- elif config .mode == "train" :
148- train (config )
149- elif config .mode == "both" :
150- both (config )
156+ run (args .config )
151157
152158
153159if __name__ == "__main__" :
0 commit comments