diff --git a/src/backend/server/scheduler_manage.py b/src/backend/server/scheduler_manage.py index bdb78982..53b342e9 100644 --- a/src/backend/server/scheduler_manage.py +++ b/src/backend/server/scheduler_manage.py @@ -7,7 +7,7 @@ from backend.server.constants import NODE_STATUS_AVAILABLE, NODE_STATUS_WAITING from backend.server.rpc_connection_handler import RPCConnectionHandler from backend.server.static_config import get_model_info, get_node_join_command -from common.static_config import PUBLIC_INITIAL_PEERS, PUBLIC_RELAY_SERVERS +from parallax.cli import PUBLIC_INITIAL_PEERS, PUBLIC_RELAY_SERVERS from parallax.p2p.server import TransformerConnectionHandler from parallax_utils.logging_config import get_logger from scheduling.node import RequestSignal diff --git a/src/common/static_config.py b/src/common/static_config.py deleted file mode 100644 index c87237d1..00000000 --- a/src/common/static_config.py +++ /dev/null @@ -1,18 +0,0 @@ -PUBLIC_INITIAL_PEERS = [ - "/dns4/bootstrap-lattica.gradient.network/udp/18080/quic-v1/p2p/12D3KooWJHXvu8TWkFn6hmSwaxdCLy4ZzFwr4u5mvF9Fe2rMmFXb", - "/dns4/bootstrap-lattica.gradient.network/tcp/18080/p2p/12D3KooWJHXvu8TWkFn6hmSwaxdCLy4ZzFwr4u5mvF9Fe2rMmFXb", -] - -PUBLIC_RELAY_SERVERS = [ - "/dns4/relay-lattica.gradient.network/udp/18080/quic-v1/p2p/12D3KooWDaqDAsFupYvffBDxjHHuWmEAJE4sMDCXiuZiB8aG8rjf", - "/dns4/relay-lattica.gradient.network/tcp/18080/p2p/12D3KooWDaqDAsFupYvffBDxjHHuWmEAJE4sMDCXiuZiB8aG8rjf", -] - - -def get_relay_params(): - return [ - "--relay-servers", - *PUBLIC_RELAY_SERVERS, - "--initial-peers", - *PUBLIC_INITIAL_PEERS, - ] diff --git a/src/parallax/cli.py b/src/parallax/cli.py index b039855a..c47ad534 100644 --- a/src/parallax/cli.py +++ b/src/parallax/cli.py @@ -14,11 +14,28 @@ import sys from common.file_util import get_project_root -from common.static_config import get_relay_params from parallax_utils.logging_config import get_logger logger = get_logger("parallax.cli") +PUBLIC_INITIAL_PEERS = [ + "/dns4/bootstrap-lattica.gradient.network/udp/18080/quic-v1/p2p/12D3KooWJHXvu8TWkFn6hmSwaxdCLy4ZzFwr4u5mvF9Fe2rMmFXb", + "/dns4/bootstrap-lattica.gradient.network/tcp/18080/p2p/12D3KooWJHXvu8TWkFn6hmSwaxdCLy4ZzFwr4u5mvF9Fe2rMmFXb", + "/dns4/bootstrap-lattica-us.gradient.network/udp/18080/quic-v1/p2p/12D3KooWFD8NoyHfmVxLVCocvXJBjwgE9RZ2bgm2p5WAWQax4FoQ", + "/dns4/bootstrap-lattica-us.gradient.network/tcp/18080/p2p/12D3KooWFD8NoyHfmVxLVCocvXJBjwgE9RZ2bgm2p5WAWQax4FoQ", + "/dns4/bootstrap-lattica-eu.gradient.network/udp/18080/quic-v1/p2p/12D3KooWCNuEF4ro95VA4Lgq4NvjdWfJFoTcvWsBA7Z6VkBByPtN", + "/dns4/bootstrap-lattica-eu.gradient.network/tcp/18080/p2p/12D3KooWCNuEF4ro95VA4Lgq4NvjdWfJFoTcvWsBA7Z6VkBByPtN", +] + +PUBLIC_RELAY_SERVERS = [ + "/dns4/relay-lattica.gradient.network/udp/18080/quic-v1/p2p/12D3KooWDaqDAsFupYvffBDxjHHuWmEAJE4sMDCXiuZiB8aG8rjf", + "/dns4/relay-lattica.gradient.network/tcp/18080/p2p/12D3KooWDaqDAsFupYvffBDxjHHuWmEAJE4sMDCXiuZiB8aG8rjf", + "/dns4/relay-lattica-us.gradient.network/udp/18080/quic-v1/p2p/12D3KooWHMXi6SCfaQzLcFt6Th545EgRt4JNzxqmDeLs1PgGm3LU", + "/dns4/relay-lattica-us.gradient.network/tcp/18080/p2p/12D3KooWHMXi6SCfaQzLcFt6Th545EgRt4JNzxqmDeLs1PgGm3LU", + "/dns4/relay-lattica-eu.gradient.network/udp/18080/quic-v1/p2p/12D3KooWRAuR7rMNA7Yd4S1vgKS6akiJfQoRNNexTtzWxYPiWfG5", + "/dns4/relay-lattica-eu.gradient.network/tcp/18080/p2p/12D3KooWRAuR7rMNA7Yd4S1vgKS6akiJfQoRNNexTtzWxYPiWfG5", +] + def check_python_version(): """Check if Python version is 3.11 or higher.""" @@ -141,6 +158,15 @@ def _force_kill_handler(signum, frame): sys.exit(0) +def _get_relay_params(): + return [ + "--relay-servers", + *PUBLIC_RELAY_SERVERS, + "--initial-peers", + *PUBLIC_INITIAL_PEERS, + ] + + def run_command(args, passthrough_args: list[str] | None = None): """Run the scheduler (equivalent to scripts/start.sh).""" check_python_version() @@ -164,7 +190,7 @@ def run_command(args, passthrough_args: list[str] | None = None): if args.init_nodes_num: cmd.extend(["--init-nodes-num", str(args.init_nodes_num)]) if args.use_relay: - cmd.extend(get_relay_params()) + cmd.extend(_get_relay_params()) # Append any passthrough args (unrecognized by this CLI) directly to the command if passthrough_args: @@ -208,7 +234,7 @@ def join_command(args, passthrough_args: list[str] | None = None): args.scheduler_addr != "auto" and not str(args.scheduler_addr).startswith("/") ): logger.info("Using public relay servers") - cmd.extend(get_relay_params()) + cmd.extend(_get_relay_params()) # Append any passthrough args (unrecognized by this CLI) directly to the command if passthrough_args: