* make sure the servers work

Author: HYLcool

environments/data.yaml

@@ -5,9 +5,11 @@ dependencies:
   - python=3.10
   - pip:
     - py-data-juicer
+    - agentscope
     - flask
     - omegaconf
     - sqlalchemy
     - psycopg2
     - networkx
     - transformers
+    - "-e ..[dev]"

environments/env_mapping.json

@@ -3,5 +3,10 @@
     "env_name": "trinity_data",
     "env_yaml": "environments/data.yaml",
     "env_entry": "trinity/data/server.py"
+  },
+  "trinity.training": {
+    "env_name": "trinity",
+    "env_yaml": "environments/training.yaml",
+    "env_entry": "trinity/cli/server.py"
   }
 }

environments/training.yaml

@@ -0,0 +1,7 @@
+name: trinity
+channels:
+  - defaults
+dependencies:
+  - python=3.10
+  - pip:
+    - "-e ..[dev]"

scripts/install.py

@@ -24,13 +24,13 @@ def main():
         env_mapping = json.load(f)
     for env_path, env_config in env_mapping.items():
         env_name = env_config["env_name"]
-        print(f"Installing dependencies for module {env_name}...")
+        print(f"Installing dependencies for module [{env_name}]...")
         # check if it's existing
         res = subprocess.run(
             f"{env_mng} env list | grep {env_name}", shell=True, text=True, stdout=subprocess.PIPE
         )
         if res.returncode == 0 and env_name in res.stdout:
-            print(f"Environment {env_name} already exists. Skipping...")
+            print(f"Environment [{env_name}] already exists. Skipping...")
         else:
             res = subprocess.run(
                 f'{env_mng} env create -f {env_config["env_yaml"]}'
@@ -39,9 +39,9 @@ def main():
                 shell=True,
             )
             if res.returncode == 0:
-                print(f"Environment {env_name} created successfully.")
+                print(f"Environment [{env_name}] created successfully.")
             else:
-                print(f"Failed to create environment {env_name} with exit code {res.returncode}.")
+                print(f"Failed to create environment [{env_name}] with exit code {res.returncode}.")
 
 
 if __name__ == "__main__":

scripts/start_servers.py

@@ -28,7 +28,7 @@ def main():
         env_mapping = json.load(f)
     for env_path, env_config in env_mapping.items():
         env_name = env_config["env_name"]
-        print(f"Starting server for module {env_name}...")
+        print(f"Starting server for module [{env_name}]...")
         timestamp = time.strftime("%Y%m%d%H%M%S", time.localtime(time.time()))
         with open(os.path.join(args.log_dir, f"{env_name}_{timestamp}_log.txt"), "w") as log_file:
             server = subprocess.Popen(
@@ -38,7 +38,7 @@ def main():
                 shell=True,
             )
             servers.append(server)
-            print(f"Server of module {env_name} is started with PID {server.pid}")
+            print(f"Server of module [{env_name}] is started with PID {server.pid}")
     for server in servers:
         server.wait()
 

trinity/cli/client.py

@@ -4,7 +4,7 @@
 LOCAL_TRINITY_TRAINING_SERVER_URL = "http://127.0.0.1:5006/trinity_training"
 
 
-def send_get_request(url: str, params: dict) -> None:
+def send_get_request(url: str, params: dict):
     """
     Send GET request with parameters.
 

trinity/data/core/dataset_db.py

@@ -8,7 +8,7 @@
 from trinity.common.config import DataConfig
 from trinity.common.schema import Base, RftDatasetModel
 from trinity.data.core.dataset import RftDataset
-from trinity.manager.sql_storage import retry_session
+from trinity.buffer.utils import retry_session
 from trinity.utils.log import get_logger
 
 logger = get_logger(__name__)