diff --git a/deploy/storyforge-fnos-collector.compose.yaml b/deploy/storyforge-fnos-collector.compose.yaml index 2f70b6c..634bdcb 100644 --- a/deploy/storyforge-fnos-collector.compose.yaml +++ b/deploy/storyforge-fnos-collector.compose.yaml @@ -28,7 +28,7 @@ services: WEB_AUTOLOGIN_ACCOUNT_USERNAME: ${WEB_AUTOLOGIN_ACCOUNT_USERNAME:-kris} WEB_AUTOLOGIN_USERNAME: ${WEB_AUTOLOGIN_USERNAME:-} WEB_AUTOLOGIN_PASSWORD: ${WEB_AUTOLOGIN_PASSWORD:-} - ORCHESTRATOR_SHARED_SECRET: ${ORCHESTRATOR_SHARED_SECRET:-storyforge-fnos-dev-secret} + ORCHESTRATOR_SHARED_SECRET: ${ORCHESTRATOR_SHARED_SECRET:-storyforge-local-secret} CUTVIDEO_BASE_URL: ${CUTVIDEO_BASE_URL:-http://192.168.31.18:7860} CUTVIDEO_API_KEY: ${CUTVIDEO_API_KEY:-} CUTVIDEO_BASE_CONFIG: ${CUTVIDEO_BASE_CONFIG:-example.job.yaml} diff --git a/scripts/deploy_fnos_storyforge_collector.sh b/scripts/deploy_fnos_storyforge_collector.sh index 669372b..ba77c89 100755 --- a/scripts/deploy_fnos_storyforge_collector.sh +++ b/scripts/deploy_fnos_storyforge_collector.sh @@ -11,6 +11,18 @@ export FNOS_SCP="${FNOS_SCP:-$FNOS_SKILL/scripts/fnos_scp.sh}" export AG_SERVER_SKILL="${AG_SERVER_SKILL:-$CODEX_HOME/skills/ai-glasses-server-debug}" export AG_SERVER="${AG_SERVER:-$AG_SERVER_SKILL/scripts/server_ssh.sh}" +detect_host_lan_ip() { + local ip + ip="$(ipconfig getifaddr en0 2>/dev/null || true)" + if [ -z "$ip" ]; then + ip="$(ipconfig getifaddr en1 2>/dev/null || true)" + fi + if [ -z "$ip" ]; then + ip="$(ifconfig | awk '/inet 192\\.168\\./ {print $2; exit}')" + fi + printf '%s' "$ip" +} + FNOS_HOST="${FNOS_HOST:-192.168.31.188}" FNOS_USER="${FNOS_USER:-krisolo}" AG_HOST="${AG_HOST:-111.231.132.51}" @@ -29,18 +41,19 @@ REMOTE_IMAGE_ARCHIVE="$REMOTE_IMAGE_DIR/storyforge-collector-dev-fnos.tar.gz" COLLECTOR_PORT="${STORYFORGE_COLLECTOR_DEV_PORT:-19193}" FRONTEND_PORT="${STORYFORGE_WEB_V4_DEV_PORT:-19192}" BACKEND_URL="${STORYFORGE_FNOS_COLLECTOR_URL:-http://$FNOS_HOST:$COLLECTOR_PORT}" +HOST_LAN_IP="${STORYFORGE_LOCAL_HOST_IP:-$(detect_host_lan_ip)}" DEPLOY_MODE="${STORYFORGE_FNOS_COLLECTOR_DEPLOY_MODE:-prebuilt_local}" COLLECTOR_IMAGE="${STORYFORGE_COLLECTOR_IMAGE:-storyforge-collector-dev:fnos}" COLLECTOR_LOCAL_BASE_IMAGE="${STORYFORGE_COLLECTOR_LOCAL_BASE_IMAGE:-python:3.11-slim}" COLLECTOR_BASE_IMAGE="${STORYFORGE_COLLECTOR_BASE_IMAGE:-docker.m.daocloud.io/library/python:3.11-slim}" WEB_AUTOLOGIN_ACCOUNT_USERNAME="${WEB_AUTOLOGIN_ACCOUNT_USERNAME:-kris}" -ORCHESTRATOR_SHARED_SECRET="${ORCHESTRATOR_SHARED_SECRET:-storyforge-fnos-dev-secret}" -LOCAL_OPENAI_BASE_URL="${LOCAL_OPENAI_BASE_URL:-}" +ORCHESTRATOR_SHARED_SECRET="${ORCHESTRATOR_SHARED_SECRET:-storyforge-local-secret}" +LOCAL_OPENAI_BASE_URL="${LOCAL_OPENAI_BASE_URL:-${HOST_LAN_IP:+http://$HOST_LAN_IP:8317/v1}}" LOCAL_OPENAI_MODEL="${LOCAL_OPENAI_MODEL:-GLM-5}" LOCAL_OPENAI_API_KEY="${LOCAL_OPENAI_API_KEY:-}" -N8N_BASE_URL="${N8N_BASE_URL:-}" -ASR_HTTP_BASE_URL="${ASR_HTTP_BASE_URL:-}" -HUOBAO_BASE_URL="${HUOBAO_BASE_URL:-}" +N8N_BASE_URL="${N8N_BASE_URL:-${HOST_LAN_IP:+http://$HOST_LAN_IP:5670}}" +ASR_HTTP_BASE_URL="${ASR_HTTP_BASE_URL:-${HOST_LAN_IP:+http://$HOST_LAN_IP:8088}}" +HUOBAO_BASE_URL="${HUOBAO_BASE_URL:-${HOST_LAN_IP:+http://$HOST_LAN_IP:5678}}" CUTVIDEO_BASE_URL="${CUTVIDEO_BASE_URL:-http://192.168.31.18:7860}" LIVE_RECORDER_BASE_URL="${LIVE_RECORDER_BASE_URL:-http://192.168.31.188:19106}" CLOUD_DB_PATH="${CLOUD_DB_PATH:-/home/ubuntu/storyforge/data/collector/storyforge.db}"