popov/scripts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more tries to fix dht formatting

Browse Source
This commit is contained in:
Dobromir Popov
2023-08-30 23:27:52 +00:00
parent 7facee3e56
commit 86598c5922
1 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
docker/images.petals-ai.dockerfile
View File

@ -1,6 +1,6 @@
# dobromirpopov/petals-ai :latest full # dobromirpopov/petals-ai :latest full
# dobromirpopov/petals-ai:full # dobromirpopov/petals-ai:full
#
FROM python:slim FROM python:slim
# System dependencies # System dependencies
@ -18,11 +18,34 @@ ENV ENV_PARAMS=
# pull petals and bake it into the image. comment for lite image # pull petals and bake it into the image. comment for lite image
RUN git clone https://github.com/d-popov/health.petals.dev.git && cd /health.petals.dev && pip install -r requirements.txt RUN git clone https://github.com/d-popov/health.petals.dev.git && cd /health.petals.dev && pip install -r requirements.txt
# FORMATTED_PEERS=$$(echo $$DHT_PEERS | sed "s/[^ ]\+/\'&\'/g")\n\
# FORMATTED_PEERS=$$(echo $$DHT_PEERS | sed "s/[^ ]\\+/\\'&\\'/g")\n\
# Create the entrypoint script inside the Dockerfile # Create the entrypoint script inside the Dockerfile
RUN echo '#!/bin/sh\n\ RUN echo '#!/bin/sh\n\
echo "Script is starting..."\n\ echo "Script is starting..."\n\
echo "MODE is set to: $MODE"\n\ echo "MODE is set to: $MODE"\n\
echo "DHT_PEERS is set to: $DHT_PEERS"\n\ if [ "$MODE" = "monitor" ] && [ -n "$DHT_PEERS" ]; then\n\
echo "DHT_PEERS is set to: $DHT_PEERS"\n\
FORMATTED_PEERS=$DHT_PEERS\n\
echo "Debug FORMATTED_PEERS: $FORMATTED_PEERS"\n\
##
# # Convert space-separated string to comma-separated string\n\
# TEMP_PEERS=$(echo $DHT_PEERS | tr " " ",")\n\
# # Add single quotes around each element and make it Python list format\n\
# FORMATTED_PEERS=$(echo $TEMP_PEERS | sed "s/\\([^,]*\\)/\'\\1\'/g")\n\
# FORMATTED_PEERS="[$FORMATTED_PEERS]"\n\
##
echo "monitoring PRIVATE swarm. Initial F peers set to $FORMATTED_PEERS"\n\
echo "monitoring PRIVATE swarm. Initial peers set to $DHT_PEERS"\n\
echo "monitoring PRIVATE swarm. Initial peers set to ['"$DHT_PEERS"']"\n\
echo "INITIAL_PEERS = ['$DHT_PEERS']" >> /health.petals.dev/config.py\n\
echo "FORMATTED_PEERS = $FORMATTED_PEERS" >> /health.petals.dev/config.py\n\
else \n\
echo "monitor has no DHT peers. Monitoring public swarm."\n\
fi\n\
if [ ! -f "/initialized" ]; then\n\ if [ ! -f "/initialized" ]; then\n\
touch /initialized\n\ touch /initialized\n\
pip install --upgrade petals\n\ pip install --upgrade petals\n\
@ -40,25 +63,15 @@ if [ ! -f "/initialized" ]; then\n\
;;\n\ ;;\n\
esac\n\ esac\n\
fi\n\ fi\n\
if [ "$MODE" = "monitor" ] && [ -n "$DHT_PEERS" ]; then\n\
FORMATTED_PEERS=$(echo $DHT_PEERS | sed "s/ /','/g")\n\
echo "Debug FORMATTED_PEERS: $FORMATTED_PEERS"\n\
echo "INITIAL_PEERS = ['$FORMATTED_PEERS']" >> /health.petals.dev/config.py\n\
#echo "INITIAL_PEERS = ['$(echo $DHT_PEERS | sed "s/ /','/g")']" >> /health.petals.dev/config.py;\n\
echo "INITIAL_PEERS = ['"$FORMATTED_PEERS"']" >> /health.petals.dev/config.py\n\
#echo "monitorring private swarm. Initial peers set to ['$(echo $DHT_PEERS | sed "s/ /','/g")']"\n\
echo "monitoring private swarm. Initial peers set to ['"$FORMATTED_PEERS"']"\n\
else \n\
echo "monitor has no DHT peers. Monitoring public swarm."\n\
fi\n\
if [ -n "$HF_TOKEN" ]; then\n\ if [ -n "$HF_TOKEN" ]; then\n\
git config --global credential.helper store && \n\ git config --global credential.helper store && \n\
huggingface-cli login --token $HF_TOKEN --add-to-git-credential && \n\ huggingface-cli login --token $HF_TOKEN --add-to-git-credential && \n\
ENV_PARAMS="--use_auth_token $ENV_PARAMS"\n\ ENV_PARAMS="--use_auth_token $ENV_PARAMS"\n\
fi\n\ fi\n\
INITIAL_PEERS=""\n\ INITIAL_PEERS_ARG=""\n\
if [ -n "$DHT_PEERS" ]; then\n\ if [ -n "$DHT_PEERS" ]; then\n\
INITIAL_PEERS="--initial_peers $DHT_PEERS"\n\ INITIAL_PEERS_ARG="--initial_peers $DHT_PEERS"\n\
fi\n\ fi\n\
case "$MODE" in\n\ case "$MODE" in\n\
"monitor")\n\ "monitor")\n\
@ -70,10 +83,10 @@ case "$MODE" in\n\
exec gunicorn app:app --bind 0.0.0.0:8484 --workers 4 --threads 10\n\ exec gunicorn app:app --bind 0.0.0.0:8484 --workers 4 --threads 10\n\
;;\n\ ;;\n\
"dht")\n\ "dht")\n\
exec python -m petals.cli.run_dht --host_maddrs /ip4/0.0.0.0/tcp/31337 --identity_path bootstrap1.id $INITIAL_PEERS\n\ exec python -m petals.cli.run_dht --host_maddrs /ip4/0.0.0.0/tcp/31337 --identity_path bootstrap1.id $INITIAL_PEERS_ARG\n\
;;\n\ ;;\n\
"server" | *)\n\ "server" | *)\n\
exec python -m petals.cli.run_server $ENV_PARAMS $MODEL_NAME $INITIAL_PEERS\n\ exec python -m petals.cli.run_server $ENV_PARAMS $MODEL_NAME $INITIAL_PEERS_ARG\n\
;;\n\ ;;\n\
esac' > /entrypoint.sh && chmod +x /entrypoint.sh esac' > /entrypoint.sh && chmod +x /entrypoint.sh