valknar/runpod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: reorganize webdav-sync into dedicated directory

Browse Source 
Clean up project structure by organizing WebDAV sync service properly.

Changes:
- Move scripts/comfyui_webdav_sync.py → webdav-sync/webdav_sync.py
- Create webdav-sync/requirements.txt with watchdog and webdavclient3
- Remove webdav dependencies from model-orchestrator/requirements.txt
- Delete unused scripts/ folder (start-all.sh, status.sh, stop-all.sh)
- Update supervisord.conf to use new path /workspace/ai/webdav-sync/webdav_sync.py

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Sebastian Krüger
2025-11-22 19:03:48 +01:00
parent 79442bd62e
commit 18cd87fbd1
7 changed files with 4 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
model-orchestrator/requirements.txt
View File

@@ -4,5 +4,3 @@ httpx==0.25.1
docker==6.1.3
pyyaml==6.0.1
pydantic==2.5.0
watchdog==3.0.0
webdavclient3==3.14.6

77
scripts/start-all.sh
View File

@@ -1,77 +0,0 @@
#!/bin/bash
#
# Start AI Services with Supervisor
# Starts supervisor daemon which manages ComfyUI and orchestrator
#
set -e
WORKSPACE_DIR="${WORKSPACE_DIR:-/workspace}"
SUPERVISORD_CONF="${WORKSPACE_DIR}/supervisord.conf"
AI_DIR="${WORKSPACE_DIR}/ai"
cd "${AI_DIR}"
echo "========================================="
echo " Starting AI Services with Supervisor"
echo "========================================="
echo ""
# Check for .env file
if [ ! -f .env ]; then
echo "Warning: .env file not found"
echo "Copy .env.example to .env and add your configuration"
echo ""
fi
# Source .env if it exists
if [ -f .env ]; then
set -a
source .env
set +a
fi
# Check if supervisord is already running
if [ -f "${WORKSPACE_DIR}/supervisord.pid" ]; then
PID=$(cat "${WORKSPACE_DIR}/supervisord.pid")
if ps -p "$PID" > /dev/null 2>&1; then
echo "Supervisor is already running (PID: $PID)"
echo ""
echo "Checking service status..."
supervisorctl -c "${SUPERVISORD_CONF}" status
exit 0
else
echo "Removing stale PID file..."
rm -f "${WORKSPACE_DIR}/supervisord.pid"
fi
fi
# Start supervisord
echo "Starting Supervisor daemon..."
supervisord -c "${SUPERVISORD_CONF}"
# Wait a moment for supervisor to start
sleep 2
# Check status
echo ""
echo "Service Status:"
echo "---------------"
supervisorctl -c "${SUPERVISORD_CONF}" status
echo ""
echo "========================================="
echo "Services started successfully!"
echo "========================================="
echo ""
echo "Useful commands:"
echo " supervisorctl status - Check status"
echo " supervisorctl start orchestrator - Start orchestrator"
echo " supervisorctl restart comfyui - Restart ComfyUI"
echo " supervisorctl stop all - Stop all services"
echo " supervisorctl tail -f comfyui - Follow ComfyUI logs"
echo ""
echo "Web interface: http://localhost:9001"
echo " Username: admin"
echo " Password: runpod2024"
echo ""

47
scripts/status.sh
View File

@@ -1,47 +0,0 @@
#!/bin/bash
#
# Check AI Services Status
# Shows status of all services managed by Supervisor
#
WORKSPACE_DIR="${WORKSPACE_DIR:-/workspace}"
SUPERVISORD_CONF="${WORKSPACE_DIR}/supervisord.conf"
echo "========================================="
echo " AI Services Status"
echo "========================================="
echo ""
# Check if supervisord is running
if [ ! -f "${WORKSPACE_DIR}/supervisord.pid" ]; then
echo "❌ Supervisor is not running"
echo ""
echo "To start services, run:"
echo " bash scripts/start-all.sh"
exit 1
fi
PID=$(cat "${WORKSPACE_DIR}/supervisord.pid")
if ! ps -p "$PID" > /dev/null 2>&1; then
echo "❌ Supervisor PID file exists but process is not running"
echo ""
echo "To start services, run:"
echo " bash scripts/start-all.sh"
exit 1
fi
echo "✅ Supervisor is running (PID: $PID)"
echo ""
# Show service status
echo "Service Status:"
echo "---------------"
supervisorctl -c "${SUPERVISORD_CONF}" status
echo ""
echo "Useful commands:"
echo " supervisorctl start orchestrator - Start orchestrator"
echo " supervisorctl restart comfyui - Restart ComfyUI"
echo " supervisorctl stop all - Stop all services"
echo " supervisorctl tail -f comfyui - Follow ComfyUI logs"
echo ""

49
scripts/stop-all.sh
View File

@@ -1,49 +0,0 @@
#!/bin/bash
#
# Stop AI Services
# Gracefully stops all services managed by Supervisor
#
set -e
WORKSPACE_DIR="${WORKSPACE_DIR:-/workspace}"
SUPERVISORD_CONF="${WORKSPACE_DIR}/supervisord.conf"
echo "========================================="
echo " Stopping AI Services"
echo "========================================="
echo ""
# Check if supervisord is running
if [ ! -f "${WORKSPACE_DIR}/supervisord.pid" ]; then
echo "Supervisor is not running (no PID file found)"
echo "Cleaning up any stray processes..."
pkill -f "orchestrator_subprocess.py" || echo " - Orchestrator not running"
pkill -f "ComfyUI.*main.py" || echo " - ComfyUI not running"
echo ""
echo "All services stopped"
exit 0
fi
PID=$(cat "${WORKSPACE_DIR}/supervisord.pid")
if ! ps -p "$PID" > /dev/null 2>&1; then
echo "Supervisor PID file exists but process is not running"
echo "Removing stale PID file..."
rm -f "${WORKSPACE_DIR}/supervisord.pid"
echo ""
echo "All services stopped"
exit 0
fi
# Stop all supervised services
echo "Stopping all supervised services..."
supervisorctl -c "${SUPERVISORD_CONF}" stop all
sleep 2
# Shutdown supervisord
echo "Shutting down Supervisor daemon..."
supervisorctl -c "${SUPERVISORD_CONF}" shutdown
echo ""
echo "All services stopped"

4
supervisord.conf
View File

@@ -58,8 +58,8 @@ stopwaitsecs=30
# ComfyUI WebDAV Sync Service
[program:webdav-sync]
command=python3 /workspace/ai/scripts/comfyui_webdav_sync.py
directory=/workspace/ai
command=python3 /workspace/ai/webdav-sync/webdav_sync.py
directory=/workspace/ai/webdav-sync
autostart=true
autorestart=true
startretries=3

2
webdav-sync/requirements.txt Normal file
View File

@@ -0,0 +1,2 @@
watchdog==3.0.0
webdavclient3==3.14.6

0
scripts/comfyui_webdav_sync.py → webdav-sync/webdav_sync.py
View File