diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index f73f89bb7..a25a75b5f 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -29,6 +29,17 @@ jobs: LANGFLOW_AUTO_LOGIN: "True" LANGFLOW_NEW_USER_IS_ACTIVE: "True" LANGFLOW_ENABLE_SUPERUSER_CLI: "True" + OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }} + ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }} + WATSONX_API_KEY: ${{ secrets.WATSONX_API_KEY }} + WATSONX_ENDPOINT: ${{ secrets.WATSONX_ENDPOINT }} + WATSONX_PROJECT_ID: ${{ secrets.WATSONX_PROJECT_ID }} + OLLAMA_ENDPOINT: ${{ secrets.OLLAMA_ENDPOINT }} + GOOGLE_OAUTH_CLIENT_ID: ${{ secrets.GOOGLE_OAUTH_CLIENT_ID }} + GOOGLE_OAUTH_CLIENT_SECRET: ${{ secrets.GOOGLE_OAUTH_CLIENT_SECRET }} + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + OPENSEARCH_PASSWORD: ${{ vars.OPENSEARCH_PASSWORD || secrets.OPENSEARCH_PASSWORD || 'OpenRag#2025!' }} steps: - name: Cleanup Docker cache @@ -151,6 +162,7 @@ jobs: OPENSEARCH_HOST: localhost OPENSEARCH_PORT: "9200" OPENSEARCH_USERNAME: admin + OPENSEARCH_PASSWORD: ${{ env.OPENSEARCH_PASSWORD }} GOOGLE_OAUTH_CLIENT_ID: "" GOOGLE_OAUTH_CLIENT_SECRET: "" run: npx playwright test diff --git a/Makefile b/Makefile index ac37c4a9a..ab14d3f65 100644 --- a/Makefile +++ b/Makefile @@ -527,12 +527,14 @@ factory-reset: ## Complete reset (stop, remove volumes, clear data, remove image fi; \ if [ -d "config" ]; then \ echo "Removing config..."; \ + $(CONTAINER_RUNTIME) run --rm -v "$$(pwd)/config:/data" alpine sh -c "rm -rf /data/*" 2>/dev/null || true; \ rm -rf config; \ echo "$(PURPLE)config removed$(NC)"; \ fi; \ - if [ -f "keys/private_key.pem" ] || [ -f "keys/public_key.pem" ]; then \ - echo "Removing JWT keys..."; \ - rm -f keys/private_key.pem keys/public_key.pem; \ + if [ -d "keys" ]; then \ + echo "Removing keys..."; \ + $(CONTAINER_RUNTIME) run --rm -v "$$(pwd)/keys:/data" alpine sh -c "rm -rf /data/*" 2>/dev/null || true; \ + rm -rf keys; \ echo "$(PURPLE)JWT keys removed$(NC)"; \ fi; \ echo "$(YELLOW)Removing OpenRAG images...$(NC)"; \ diff --git a/docker-compose.yml b/docker-compose.yml index 0aef3a172..5751b2d72 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -124,6 +124,8 @@ services: context: . dockerfile: Dockerfile.langflow container_name: langflow + extra_hosts: + - "host.docker.internal:host-gateway" ports: - "${LANGFLOW_PORT:-7860}:7860" environment: diff --git a/frontend/.env.test.example b/frontend/.env.test.example index f53600840..aaeb9a02d 100644 --- a/frontend/.env.test.example +++ b/frontend/.env.test.example @@ -2,6 +2,12 @@ DISABLE_INGEST_WITH_LANGFLOW=false INGEST_SAMPLE_DATA=true +# Langflow Configuration +LANGFLOW_CHAT_FLOW_ID='1098eea1-6649-4e1d-aed1-b77249fb8dd0' +LANGFLOW_INGEST_FLOW_ID='5488df7c-b93f-4f87-a446-b67028bc0813' +LANGFLOW_URL_INGEST_FLOW_ID='72c3d17c-2dac-4a73-b48a-6518473d7830' +NUDGES_FLOW_ID='ebc01d31-1976-46ce-a385-b0240327226c' + # Auth OPENSEARCH_PASSWORD= diff --git a/frontend/app/chat/_components/chat-input.tsx b/frontend/app/chat/_components/chat-input.tsx index a52678186..4ca46a1c8 100644 --- a/frontend/app/chat/_components/chat-input.tsx +++ b/frontend/app/chat/_components/chat-input.tsx @@ -446,6 +446,7 @@ export const ChatInput = forwardRef( autoComplete="off" minRows={1} placeholder="Ask a question..." + data-testid="chat-input" disabled={loading} className={`w-full text-sm bg-transparent focus-visible:outline-none resize-none`} rows={1} @@ -499,6 +500,7 @@ export const ChatInput = forwardRef( size="iconSm" disabled={(!input.trim() && !uploadedFile) || loading} className="!rounded-md h-8 w-8 p-0" + data-testid="send-button" > {loading ? ( diff --git a/frontend/app/chat/_components/nudges.tsx b/frontend/app/chat/_components/nudges.tsx index 3528e47db..5651edbdc 100644 --- a/frontend/app/chat/_components/nudges.tsx +++ b/frontend/app/chat/_components/nudges.tsx @@ -29,6 +29,7 @@ export default function Nudges({ {nudges.map((suggestion: string, index: number) => (