fx deployment.

Author: azep-ninja

Dockerfile

@@ -65,4 +65,4 @@ ENV SERVER_PORT=8080
 EXPOSE 8080
 
 # Modified command to fetch character file from GCS before starting
-CMD sh -c "gsutil cp gs://$BUCKET_NAME/$CHARACTER_FILE characters/character.json && pnpm start --non-interactive --characters=characters/character.json"
+CMD sh -c "gsutil cp gs://$AGENTS_BUCKET_NAME/$CHARACTER_FILE characters/$CHARACTER_FILE && pnpm start --non-interactive --characters=characters/$CHARACTER_FILE"

cloudbuild.yaml

@@ -16,17 +16,31 @@ steps:
     else
       full_name="${agent_name}"
     fi
-    # Add timestamp for versioning
-    timestamp=$(date +%Y%m%d-%H%M%S)
     echo "${agent_name}" > /workspace/agent_name
     echo "${full_name}" > /workspace/full_name
+    # Add timestamp for versioning
+    timestamp=$(date +%Y%m%d-%H%M%S)
     echo "${timestamp}" > /workspace/version
     echo "Agent name will be: ${full_name}"
     echo "Version will be: ${timestamp}"
     ls -la
     pwd
 
-# Build the container image for Artifact Registry
+# Verify secrets access
+- name: 'gcr.io/cloud-builders/gcloud'
+  entrypoint: 'bash'
+  args:
+  - '-c'
+  - |
+    echo "Verifying secrets access..."
+    echo "Testing secret access..."
+    if ! gcloud secrets versions access latest --secret="small-google-model"; then
+      echo "Failed to access secrets"
+      exit 1
+    fi
+    echo "Secret access verified"
+
+# Build the container image
 - name: 'gcr.io/cloud-builders/docker'
   entrypoint: 'bash'
   args:
@@ -40,7 +54,7 @@ steps:
     docker build -t us-central1-docker.pkg.dev/$PROJECT_ID/qi-agents/${full_name}:${version} . || { echo "Docker build failed"; exit 1; }
     echo "Docker build completed"
 
-# Push the container image to Artifact Registry
+# Push the container image
 - name: 'gcr.io/cloud-builders/docker'
   entrypoint: 'bash'
   args:
@@ -90,8 +104,8 @@ substitutions:
   _DISK_SIZE: 30GB
   _NETWORK: agents-vpc
   _SUBNET: agents-subnet
-  _CHARACTER_FILE: default.character.json  # Default value
-  _SUFFIX: agent  # Default value
+  _CHARACTER_FILE: defalt.character.json
+  _SUFFIX: agent
 
 options:
   logging: CLOUD_LOGGING_ONLY

startup.sh

@@ -3,30 +3,72 @@
 # Log startup for debugging
 echo "Starting initialization script..."
 
-# Use /mnt/stateful_partition which is writable in GCE
-mkdir -p /mnt/stateful_partition/agent/data
-chmod 777 /mnt/stateful_partition/agent/data
+# Create parent directories first with error checking
+echo "Creating directory structure..."
+sudo mkdir -p /mnt/stateful_partition || {
+    echo "Failed to create stateful_partition directory"
+    exit 1
+}
 
-# Verify directory creation
+# Create qi-agents directory
+sudo mkdir -p /mnt/stateful_partition/qi-agents || {
+    echo "Failed to create qi-agents directory"
+    exit 1
+}
+
+# Create data directory
+sudo mkdir -p /mnt/stateful_partition/qi-agents/data || {
+    echo "Failed to create data directory"
+    exit 1
+}
+
+# Set permissions
+echo "Setting directory permissions..."
+sudo chmod -R 777 /mnt/stateful_partition/qi-agents || {
+    echo "Failed to set permissions"
+    exit 1
+}
+
+# Verify directory structure
+echo "Verifying directory structure..."
 ls -la /mnt/stateful_partition/qi-agents/
 
-# Pull latest image
+# Pull latest image with verification
 echo "Pulling latest image..."
-docker pull us-central1-docker.pkg.dev/${PROJECT_ID}/${FULL_NAME}:${version}
+if ! docker pull us-central1-docker.pkg.dev/${PROJECT_ID}/${FULL_NAME}:${version}; then
+    echo "Failed to pull image"
+    exit 1
+fi
+
+# Get secrets from Secret Manager
+echo "Fetching secrets..."
+AGENTS_BUCKET_NAME=$(gcloud secrets versions access latest --secret="agents-bucket-name")
+SMALL_GOOGLE_MODEL=$(gcloud secrets versions access latest --secret="small-google-model")
+MEDIUM_GOOGLE_MODEL=$(gcloud secrets versions access latest --secret="medium-google-model")
+GOOGLE_GENERATIVE_AI_API_KEY=$(gcloud secrets versions access latest --secret="google-generative-ai-key")
 
 # Run container with persistent storage and restart policy
 echo "Starting container..."
 docker run -d \
     --name ${FULL_NAME} \
     --restart=always \
-    -v /mnt/stateful_partition/agent/data:/app/agent/data \
-    -e AGENTS_BUCKET_NAME="gs://$AGENTS_BUCKET_NAME" \
-    -e CHARACTER_FILE="$CHARACTER_FILE" \
-    -e SMALL_GOOGLE_MODEL="$SMALL_GOOGLE_MODEL" \
-    -e MEDIUM_GOOGLE_MODEL="$MEDIUM_GOOGLE_MODEL" \
-    -e GOOGLE_GENERATIVE_AI_API_KEY="$GOOGLE_GENERATIVE_AI_API_KEY" \
+    -v /mnt/stateful_partition/qi-agents/data:/app/agent/data \
+    -e AGENTS_BUCKET_NAME="${AGENTS_BUCKET_NAME}" \
+    -e CHARACTER_FILE="${CHARACTER_FILE}" \
+    -e SMALL_GOOGLE_MODEL="${SMALL_GOOGLE_MODEL}" \
+    -e MEDIUM_GOOGLE_MODEL="${MEDIUM_GOOGLE_MODEL}" \
+    -e GOOGLE_GENERATIVE_AI_API_KEY="${GOOGLE_GENERATIVE_AI_API_KEY}" \
+    -e PORT="8080" \
+    -e SERVER_PORT="8080" \
     us-central1-docker.pkg.dev/${PROJECT_ID}/${FULL_NAME}:${version}
 
-# Log container status
+# Verify container is running
 echo "Container started. Checking status..."
-docker ps | grep ${FULL_NAME}
+if ! docker ps | grep ${FULL_NAME}; then
+    echo "Container failed to start. Checking logs:"
+    docker logs ${FULL_NAME}
+    exit 1
+fi
+
+# Log success
+echo "Startup script completed successfully"