Update configure scripts

Author: danielcampagnolitg

bin/aider

@@ -2,11 +2,17 @@
 source ./variables/local.env
 
 export VERTEXAI_PROJECT=$GCLOUD_PROJECT
-export VERTEXAI_LOCATION=$GCLOUD_REGION # $GCLOUD_CLAUDE_REGION
-echo $VERTEXAI_PROJECT $VERTEXAI_LOCATION
+export VERTEXAI_LOCATION=$GCLOUD_REGION
 export OPENAI_API_KEY=$OPENAI_API_KEY
 export DEEPSEEK_API_KEY=$DEEPSEEK_API_KEY
 export OPENROUTER_API_KEY=$OPENROUTER_API_KEY
 export GEMINI_API_KEY=$GEMINI_API_KEY
 
-aider --model vertex_ai/gemini-2.5-pro-exp-03-25 --no-auto-accept-architect --test-cmd "npm run test && cd frontend && npm run build" --auto-test --lint-cmd "npm run lint"
+MODEL=vertex_ai/gemini-2.5-pro
+#MODEL=o3
+EDITOR_MODEL=vertex_ai/gemini-2.5-flash
+WEAK_MODEL=vertex_ai/gemini-2.5-flash
+
+echo $MODEL $EDITOR_MODEL $VERTEXAI_PROJECT $VERTEXAI_LOCATION
+
+aider --model $MODEL  --editor-model $EDITOR_MODEL --weak-model $WEAK_MODEL --no-auto-accept-architect --test-cmd "npm run test && cd frontend && npm run build" --auto-test

bin/configure

@@ -1,6 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e # Exit immediately if a command exits with a non-zero status.
 
+# This script should support running in bash or zsh
+
 echo "Starting TypedAI configuration script..."
 echo "---------------------------------------------------------------------"
 
@@ -26,21 +28,19 @@ update_env_variable() {
         echo "$var_name=$new_value" >> "$file_path"
         echo "Added $var_name to $file_path."
     fi
-    [ -f "$temp_file" ] && rm -f "$temp_file"
+    rm -f "$temp_file"
 }
 
 # --- Python Setup ---
 echo ""
 echo "--- Stage 1: Python Environment Setup ---"
-# Source the script part. Use '|| exit 1' to ensure main script exits if part fails.
 source ./bin/configure_parts/python_setup || exit 1
 echo "Python environment setup complete."
 echo "---------------------------------------------------------------------"
 
 # --- Node.js Setup ---
 echo ""
 echo "--- Node.js Environment Setup (using fnm) ---"
-# Source the script part. Use '|| exit 1' to ensure main script exits if part fails.
 source ./bin/configure_parts/nodejs_setup || exit 1
 echo "Node.js environment setup complete."
 echo "---------------------------------------------------------------------"
@@ -78,50 +78,15 @@ echo "---------------------------------------------------------------------"
 # --- Google Cloud Platform Services Configuration ---
 echo ""
 echo "--- Google Cloud Platform (GCP) Services Configuration ---"
-USE_GCP_SERVICES=false
-GCP_SETUP_SUCCESS=false
-
-# Check current GCLOUD_PROJECT to suggest default for GCP usage
-# Source local.env carefully to get existing values without erroring on unset variables
-(set +e; set +u; source ./variables/local.env)
-CURRENT_GCLOUD_PROJECT=${GCLOUD_PROJECT:-} # Use parameter expansion for robustness
-
-GCP_PROMPT_DEFAULT="n"
-if [ -n "$CURRENT_GCLOUD_PROJECT" ]; then # If project is already set, assume user wants GCP
-    GCP_PROMPT_DEFAULT="y"
-fi
-
-read -r -p "Do you plan to use any Google Cloud services (e.g., Vertex AI, Gemini, Cloud Tracing)? (Y/n, default: $GCP_PROMPT_DEFAULT) " gcp_choice
-gcp_choice_lower=$(echo "$gcp_choice" | tr '[:upper:]' '[:lower:]')
-
-if [[ "$gcp_choice_lower" == "y" ]] || ([[ -z "$gcp_choice" ]] && [[ "$GCP_PROMPT_DEFAULT" == "y" ]]); then
-    echo "Configuring Google Cloud services..."
-    # Source the script part. Check its exit code.
-    if source ./bin/configure_parts/gcp_services_setup; then
-        update_env_variable "./variables/local.env" "TRACE_AGENT_ENABLED" "true"
-        USE_GCP_SERVICES=true # Mark that GCP services are configured for this session
-        GCP_SETUP_SUCCESS=true
-        echo "GCP services configured. TRACE_AGENT_ENABLED set to true."
-    else
-        echo "GCP services setup failed or was exited by the user. TRACE_AGENT_ENABLED will be set to false."
-        update_env_variable "./variables/local.env" "TRACE_AGENT_ENABLED" "false"
-        GCP_SETUP_SUCCESS=false
-    fi
-else
-    echo "Skipping Google Cloud services configuration."
-    update_env_variable "./variables/local.env" "TRACE_AGENT_ENABLED" "false"
-    GCP_SETUP_SUCCESS=false
-fi
-
-# Refresh GCLOUD_PROJECT in case gcp_services_setup set it
-(set +e; set +u; source ./variables/local.env)
-CURRENT_GCLOUD_PROJECT=${GCLOUD_PROJECT:-}
+# This script will ask the user if they want to set up GCP and handle the full flow.
+# It exports GCP_SETUP_SUCCESS and CURRENT_GCLOUD_PROJECT for use in later steps.
+source ./bin/configure_parts/gcp_services_setup || exit 1
+echo "GCP services check complete."
 echo "---------------------------------------------------------------------"
 
 # --- Application Setup (local.env, Angular, CLI paths) ---
 echo ""
 echo "--- Application Configuration and Frontend ---"
-# Source the script part. Use '|| exit 1' to ensure main script exits if it fails.
 # This part is expected to create ./variables/local.env if it doesn't exist.
 source ./bin/configure_parts/app_setup || exit 1
 echo "Application configuration and frontend setup complete."
@@ -130,117 +95,21 @@ echo "---------------------------------------------------------------------"
 
 # --- Database Setup ---
 echo ""
-echo "--- Stage 5: Database Setup ---"
-# Source local.env again to ensure we have the latest DATABASE_TYPE if it was set previously
-(set +e; set +u; source ./variables/local.env)
-CURRENT_DB_TYPE=${DATABASE_TYPE:-}
-
-echo "Choose a database type for TypedAI."
-echo "Current setting in ./variables/local.env: DATABASE_TYPE=${CURRENT_DB_TYPE:-Not set}"
-echo ""
-PS3="Select database option: " # Prompt for select
-OPTIONS=()
-OPTION_ACTIONS=() # Parallel array to store actions
-
-# Option 1: Firestore (only if GCP services are configured OR GCLOUD_PROJECT is already set from a previous run)
-# Check if GCP setup was successful in this run OR if GCLOUD_PROJECT is already present in local.env
-if [ "$GCP_SETUP_SUCCESS" = true ] || [ -n "$CURRENT_GCLOUD_PROJECT" ]; then
-    OPTIONS+=("Firestore (Native Mode, via Google Cloud)")
-    OPTION_ACTIONS+=("firestore")
-else
-    echo "Note: Firestore (Native Mode) option is unavailable because GCP services are not configured or GCLOUD_PROJECT is not set."
-fi
-
-OPTIONS+=("PostgreSQL (Requires Docker or a separate PostgreSQL instance)")
-OPTION_ACTIONS+=("postgres")
-OPTIONS+=("In-Memory (Data is lost when the application stops; for quick testing only)")
-OPTION_ACTIONS+=("inmemory")
-
-if [ -n "$CURRENT_DB_TYPE" ]; then
-    OPTIONS+=("Keep current setting ($CURRENT_DB_TYPE)")
-    OPTION_ACTIONS+=("keep")
-fi
-OPTIONS+=("Exit configuration")
-OPTION_ACTIONS+=("exit")
-
-# Use a loop to handle invalid input and re-prompt
-while true; do
-    select opt in "${OPTIONS[@]}"; do
-        choice_idx=$((REPLY - 1))
-        ACTION=${OPTION_ACTIONS[$choice_idx]}
-
-        if [ -n "$ACTION" ]; then
-            case $ACTION in
-                firestore)
-                    echo "You selected Firestore."
-                    update_env_variable "./variables/local.env" "DATABASE_TYPE" "firestore"
-                    # Ensure GCLOUD_PROJECT is available for firestore_setup
-                    # This check is also inside firestore_setup, but good to have here too.
-                    (set +e; set +u; source ./variables/local.env) # Re-source in case it was just set
-                    if [ -z "$GCLOUD_PROJECT" ]; then
-                         echo "Error: GCLOUD_PROJECT not set. Firestore setup cannot proceed."
-                         echo "Please re-run ./bin/configure and enable GCP services with a project ID."
-                         exit 1 # Critical for Firestore
-                    fi
-                    # Source the script part. Use '|| exit 1' to ensure main script exits if part fails.
-                    source ./bin/configure_parts/firestore_setup || exit 1
-                    break 2 # Break out of select and while loop
-                    ;;
-                postgres)
-                    echo "You selected PostgreSQL."
-                    update_env_variable "./variables/local.env" "DATABASE_TYPE" "postgres"
-                    # Source the script part. Use '|| exit 1' to ensure main script exits if part fails.
-                    source ./bin/configure_parts/postgres_setup || exit 1
-                    break 2 # Break out of select and while loop
-                    ;;
-                inmemory)
-                    echo "You selected In-Memory database."
-                    update_env_variable "./variables/local.env" "DATABASE_TYPE" "memory"
-                    echo "In-Memory database selected. No further setup needed for the database itself."
-                    break 2 # Break out of select and while loop
-                    ;;
-                keep)
-                    echo "Keeping current database setting: $CURRENT_DB_TYPE."
-                    # Optionally re-run setup for current DB type if it's Firestore or Postgres
-                    if [ "$CURRENT_DB_TYPE" == "firestore" ]; then
-                        read -r -p "Re-run Firestore setup/check steps? (y/N) " rerun_fs
-                        if [[ "$rerun_fs" =~ ^[Yy]$ ]]; then
-                            # Ensure GCLOUD_PROJECT is available before re-running Firestore setup
-                            (set +e; set +u; source ./variables/local.env)
-                            if [ -z "$GCLOUD_PROJECT" ]; then
-                                echo "Error: GCLOUD_PROJECT not set. Cannot re-run Firestore setup."
-                                echo "Please ensure it's set in ./variables/local.env."
-                            else
-                                source ./bin/configure_parts/firestore_setup || echo "Warning: Re-running Firestore setup failed."
-                            fi
-                        fi
-                    elif [ "$CURRENT_DB_TYPE" == "postgres" ]; then
-                        read -r -p "Re-run PostgreSQL setup/check steps? (y/N) " rerun_pg
-                        if [[ "$rerun_pg" =~ ^[Yy]$ ]]; then source ./bin/configure_parts/postgres_setup || echo "Warning: Re-running PostgreSQL setup failed."; fi
-                    fi
-                    break 2 # Break out of select and while loop
-                    ;;
-                exit)
-                    echo "Exiting configuration as requested."
-                    exit 0
-                    ;;
-                *) echo "Invalid option $REPLY"; continue ;; # Invalid input, stay in select
-            esac
-        else
-            echo "Invalid option $REPLY" # Should not happen with select, but for safety
-            continue # Stay in select
-        fi
-    done
-done # End while true loop for select
-
-echo "Database setup choice processed."
+echo "--- Database Setup ---"
+source ./bin/configure_parts/db_setup || exit 1
 echo "---------------------------------------------------------------------"
 
+
 echo ""
 echo "--- Configuration Complete ---"
 echo "All selected setup steps have been processed."
 echo "Please review any specific instructions or warnings displayed above."
-echo "If you configured shell environments (e.g., for fnm), you might need to source your shell config or open a new terminal."
 echo ""
-echo "Next steps: 'npm run start:local' (backend) and 'cd frontend && npm run start:local' (frontend)."
+echo "✅ Configuration complete."
+echo "To apply the environment changes, you MUST open a new terminal window or run 'source ~/.zshrc' (or ~/.bashrc)."
+echo ""
+echo "Next steps:"
+echo "  - Backend a: 'npm run start:local'"
+echo "  - Frontend: 'cd frontend && npm run start:local'"
 echo "done"
+exit 0

bin/configure_parts/DOCS.md

@@ -0,0 +1,23 @@
+# Requirements for setup scripts (./bin/configure etc.)
+
+# Configure script
+
+`./bin/configure` is the project setup/configuration script that is run interactively by the user.
+
+It should support running in bash or zsh, and if running on OSX should update both the .bashrc and .zshrc files.
+
+
+# ./bin/configure_test
+
+Runs the `./bin/configure` script in a Docker container with a non-root user to test the configure scripts in a clean environment.
+
+When run interactively, it will prompt the user for input.
+
+Can pass `TYPEDAI_TEST_` prefixed environment variables to the script for non-interactive automated setup and testing.
+
+Example:
+`./configure_test TYPEDAI_TEST_DB_TYPE=postgres TYPEDAI_TEST_USE_GCP=n TYPEDAI_TEST_FNM_INSTALL_CHOICE=1 TYPEDAI_TEST_PYENV_INSTALL_CHOICE=1 TYPEDAI_TEST_RG_INSTALL_CHOICE=1`
+
+# ./bin/configure_parts/Dockerfile
+
+This is used from configure_test to manually test the setup script in a fresh environment

bin/configure_parts/Dockerfile

@@ -9,7 +9,7 @@ RUN apt-get update -y && \
     apt-get install -y sudo git curl unzip ca-certificates gnupg lsb-release rsync \
     make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev \
     libsqlite3-dev wget llvm libncursesw5-dev xz-utils tk-dev \
-    libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev && \
+    libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev cmake && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 

bin/configure_parts/app_setup

@@ -1,4 +1,6 @@
 #!/bin/bash
+# Source the helper function
+source ./bin/configure_parts/shell_helpers.sh
 # Application Configuration and Frontend Setup ---------------------------------
 echo "--- Starting Application Configuration and Frontend Setup ---"
 
@@ -37,13 +39,30 @@ if [ -z "$CURRENT_SINGLE_USER_EMAIL" ]; then
     echo "Attempting to set SINGLE_USER_EMAIL from gcloud config..."
     # Use --quiet to suppress output, check exit code
     GCLOUD_ACCOUNT=$(gcloud config get-value account --quiet 2>/dev/null)
+    # There could be version update output. If there is more than one line, take the first line
+    GCLOUD_ACCOUNT=$(echo "$GCLOUD_ACCOUNT" | head -n 1)
     # Basic check if GCLOUD_ACCOUNT looks like an email address
     if [[ "$GCLOUD_ACCOUNT" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$ ]]; then
       _update_app_env_var "./variables/local.env" "SINGLE_USER_EMAIL" "${GCLOUD_ACCOUNT}"
       echo "Set SINGLE_USER_EMAIL to ${GCLOUD_ACCOUNT} in ./variables/local.env"
     else
       echo "Could not automatically determine SINGLE_USER_EMAIL from gcloud config."
-      echo "Please manually update SINGLE_USER_EMAIL in ./variables/local.env"
+      user_email=""
+      if [ -n "$TYPEDAI_TEST_SINGLE_USER_EMAIL" ]; then
+          echo "Using TYPEDAI_TEST_SINGLE_USER_EMAIL. Value: $TYPEDAI_TEST_SINGLE_USER_EMAIL"
+          user_email="$TYPEDAI_TEST_SINGLE_USER_EMAIL"
+      else
+          read -r -p "Please enter the email address for the single user account: " user_email
+      fi
+
+      if [[ "$user_email" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$ ]]; then
+          _update_app_env_var "./variables/local.env" "SINGLE_USER_EMAIL" "$user_email"
+          echo "Set SINGLE_USER_EMAIL to $user_email in ./variables/local.env"
+      else
+          echo "Warning: Invalid email address provided for SINGLE_USER_EMAIL. Value was: \"$user_email\""
+          echo "Please manually update SINGLE_USER_EMAIL in ./variables/local.env"
+          exit 1
+      fi
     fi
 else
     echo "SINGLE_USER_EMAIL is already set in ./variables/local.env: $CURRENT_SINGLE_USER_EMAIL"
@@ -73,30 +92,9 @@ fi
 # CLI setup -------------
 
 echo "Setting up CLI environment variables in shell profiles..."
-# Setup for bash
-if [ -f ~/.bashrc ]; then
-    if ! grep -q "TYPEDAI_HOME" ~/.bashrc; then
-        echo "# TypedAI CLI environment" >> ~/.bashrc
-        echo "export TYPEDAI_HOME=$(pwd)" >> ~/.bashrc
-        echo "export PATH=\$TYPEDAI_HOME/bin/path:\$PATH" >> ~/.bashrc
-        echo "Added TypedAI CLI environment variables to ~/.bashrc"
-    else
-        echo "TypedAI CLI environment variables already present in ~/.bashrc"
-    fi
-fi
-
-# Setup for zsh
-if [ -f ~/.zshrc ]; then
-    if ! grep -q "TYPEDAI_HOME" ~/.zshrc; then
-        echo "# TypedAI CLI environment" >> ~/.zshrc
-        echo "export TYPEDAI_HOME=$(pwd)" >> ~/.zshrc
-        echo "export PATH=\$TYPEDAI_HOME/bin/path:\$PATH" >> ~/.zshrc
-        echo "Added TypedAI CLI environment variables to ~/.zshrc"
-    else
-        echo "TypedAI CLI environment variables already present in ~/.zshrc"
-    fi
-fi
+comment="# TypedAI CLI environment"
+content="export TYPEDAI_HOME=$(pwd)\nexport PATH=\$TYPEDAI_HOME/bin/path:\$PATH"
+update_shell_profiles "$comment" "$content"
 
 echo "Application Configuration and Frontend Setup complete."
-# Exit with 0 to indicate success of this part
 exit 0