Skip to content

Commit 9b4e078

Browse files
committed
* after pre-commit
1 parent a0f62f9 commit 9b4e078

File tree

5 files changed

+15
-7
lines changed

5 files changed

+15
-7
lines changed

trinity/cli/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ def request(url, **kwargs):
3939
)
4040
if res:
4141
print(res)
42-
print(res['message'])
42+
print(res["message"])

trinity/cli/launcher.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ def activate_data_module(config_path: str):
111111
logger.error(f"Failed to activate data module: {res['return_msg']}.")
112112
return
113113

114+
114115
def run(config_path: str):
115116
# TODO: support parse all args from command line
116117
config = load_config(config_path)

trinity/cli/server.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import traceback
2+
23
from flask import Flask, jsonify, request
34

45
app = Flask(__name__)
56

6-
APP_NAME = 'trinity_training'
7+
APP_NAME = "trinity_training"
78
PORT = 5006
89

10+
911
@app.route(f"/{APP_NAME}", methods=["GET"])
1012
def trinity_training():
1113
config_path = request.args.get("configPath")
@@ -15,7 +17,7 @@ def trinity_training():
1517
run(config_path)
1618
ret = 0
1719
msg = "Training Success."
18-
except:
20+
except: # noqa: E722
1921
traceback.print_exc()
2022
msg = traceback.format_exc()
2123
ret = 1

trinity/data/core/dataset_db.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
from sqlalchemy.orm import sessionmaker
66
from sqlalchemy.pool import NullPool
77

8+
from trinity.buffer.utils import retry_session
89
from trinity.common.config import DataConfig
910
from trinity.common.schema import Base, RftDatasetModel
1011
from trinity.data.core.dataset import RftDataset
11-
from trinity.buffer.utils import retry_session
1212
from trinity.utils.log import get_logger
1313

1414
logger = get_logger(__name__)
@@ -55,7 +55,9 @@ def __init__(self, config: DataConfig) -> None:
5555
self.session = sessionmaker(bind=self.engine)
5656

5757
def add_entries(self, dataset: RftDataset):
58-
with retry_session(self) as session:
58+
with retry_session(
59+
self, self.config.max_retry_times, self.config.max_retry_interval
60+
) as session:
5961
session.add_all(rft_dataset_to_model(dataset))
6062

6163
def get_entries(self, num_entries: int, order_by: str = None, ascending: bool = False):
@@ -65,7 +67,9 @@ def get_entries(self, num_entries: int, order_by: str = None, ascending: bool =
6567
order_by_key = asc(order_by_key) if ascending else desc(order_by_key)
6668
else:
6769
order_by_key = None
68-
with retry_session(self) as session:
70+
with retry_session(
71+
self, self.config.max_retry_times, self.config.max_retry_interval
72+
) as session:
6973
entries = (
7074
session.query(RftDatasetModel)
7175
.order_by(order_by_key)

trinity/data/server.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
app = Flask(__name__)
44

5-
APP_NAME = 'data_workflow'
5+
APP_NAME = "data_workflow"
66
PORT = 5005
77

8+
89
@app.route(f"/{APP_NAME}", methods=["GET"])
910
def data_workflow():
1011
from trinity.common.config import load_config

0 commit comments

Comments
 (0)