Test new sdk

.github/workflows/test-integration.yml

@@ -20,7 +20,8 @@ on:
 
 jobs:
   tests:
-    runs-on: [self-hosted, linux, ARM64, langflow-ai-arm64-40gb]
+    runs-on:
+      labels: ["self-hosted", "linux", "ARM64", "langflow-ai-arm64-40gb-ephemeral"]
     env:
       # Prefer repository/environment variable first, then secret, then a sane fallback
       OPENSEARCH_PASSWORD: ${{ vars.OPENSEARCH_PASSWORD || secrets.OPENSEARCH_PASSWORD || 'OpenRag#2025!' }}

Dockerfile.langflow

@@ -1,4 +1,6 @@
-FROM langflowai/langflow-nightly:1.7.0.dev21
+FROM langflowai/langflow:1.8.0
+
+RUN pip install uv
 
 EXPOSE 7860
 

Makefile

@@ -19,6 +19,7 @@ REPO ?= https://github.com/langflow-ai/langflow.git
 
 # Auto-detect container runtime: prefer docker, fall back to podman
 CONTAINER_RUNTIME := $(shell command -v docker >/dev/null 2>&1 && echo "docker" || echo "podman")
+OPENRAG_IMAGE_REPOS := langflowai/openrag-backend langflowai/openrag-frontend langflowai/openrag-langflow langflowai/openrag-opensearch langflowai/openrag-dashboards langflow/langflow opensearchproject/opensearch opensearchproject/opensearch-dashboards
 # Only pass --env-file if the file actually exists
 ifneq (,$(wildcard $(ENV_FILE)))
   COMPOSE_CMD := $(CONTAINER_RUNTIME) compose --env-file $(ENV_FILE)
@@ -73,7 +74,7 @@ endef
 # PHONY TARGETS
 ######################
 .PHONY: help check_tools help_docker help_dev help_test help_local help_utils \
-       dev dev-cpu dev-local dev-local-cpu stop clean build logs \
+       dev dev-cpu dev-local dev-local-cpu dev-local-build-lf dev-local-build-lf-cpu stop clean build logs \
        shell-backend shell-frontend install \
        test test-unit test-integration test-ci test-ci-local test-sdk test-os-jwt lint \
        backend frontend docling docling-stop install-be install-fe build-be build-fe build-os build-lf logs-be logs-fe logs-lf logs-os \
@@ -177,6 +178,8 @@ help_dev: ## Show development environment commands
 	@echo "$(PURPLE)Infrastructure Only:$(NC)"
 	@echo "  $(PURPLE)make dev-local$(NC)       - Start infrastructure only (for local backend/frontend)"
 	@echo "  $(PURPLE)make dev-local-cpu$(NC)   - Start infrastructure for local backend/frontend with CPU only"
+	@echo "  $(PURPLE)make dev-local-build-lf$(NC) - Start infrastructure, building only Langflow image"
+	@echo "  $(PURPLE)make dev-local-build-lf-cpu$(NC) - Same as above, with CPU only"
 	@echo ''
 	@echo "$(PURPLE)Branch Development (build Langflow from source):$(NC)"
 	@echo "  $(PURPLE)make dev-branch$(NC)      - Build & run with custom Langflow branch"
@@ -358,6 +361,32 @@ dev-local-cpu: ## Start infrastructure for local development, with CPU only
 	@echo ""
 	@echo "$(YELLOW)Now run 'make backend' and 'make frontend' in separate terminals$(NC)"
 
+dev-local-build-lf: ## Start infrastructure for local development, building only Langflow image
+	@echo "$(YELLOW)Building Langflow image...$(NC)"
+	$(COMPOSE_CMD) -f docker-compose.yml -f docker-compose.gpu.yml build langflow
+	@echo "$(YELLOW)Starting infrastructure only (for local development)...$(NC)"
+	$(COMPOSE_CMD) -f docker-compose.yml -f docker-compose.gpu.yml up -d opensearch openrag-backend dashboards langflow
+	@echo "$(PURPLE)Infrastructure started!$(NC)"
+	@echo "   $(CYAN)Backend:$(NC)    http://openrag-backend"
+	@echo "   $(CYAN)Langflow:$(NC)   http://localhost:7860"
+	@echo "   $(CYAN)OpenSearch:$(NC) http://localhost:9200"
+	@echo "   $(CYAN)Dashboards:$(NC) http://localhost:5601"
+	@echo ""
+	@echo "$(YELLOW)Now run 'make backend' and 'make frontend' in separate terminals$(NC)"
+
+dev-local-build-lf-cpu: ## Start infrastructure for local development, building only Langflow image with CPU only
+	@echo "$(YELLOW)Building Langflow image (CPU)...$(NC)"
+	$(COMPOSE_CMD) build langflow
+	@echo "$(YELLOW)Starting infrastructure only (for local development)...$(NC)"
+	$(COMPOSE_CMD) up -d opensearch openrag-backend dashboards langflow
+	@echo "$(PURPLE)Infrastructure started!$(NC)"
+	@echo "   $(CYAN)Backend:$(NC)    http://openrag-backend"
+	@echo "   $(CYAN)Langflow:$(NC)   http://localhost:7860"
+	@echo "   $(CYAN)OpenSearch:$(NC) http://localhost:9200"
+	@echo "   $(CYAN)Dashboards:$(NC) http://localhost:5601"
+	@echo ""
+	@echo "$(YELLOW)Now run 'make backend' and 'make frontend' in separate terminals$(NC)"
+
 ######################
 # BRANCH DEVELOPMENT
 ######################
@@ -447,10 +476,24 @@ stop: ## Stop and remove all OpenRAG containers
 
 restart: stop dev ## Restart all containers
 
+remove-openrag-images: ## Remove OpenRAG-related images and dependencies (may affect other projects using shared images)
+	@echo "$(YELLOW)Removing OpenRAG-related images and dependencies...$(NC)"
+	@removed=0; total=0; \
+	for repo in $(OPENRAG_IMAGE_REPOS); do \
+		ids=$$($(CONTAINER_RUNTIME) images "$$repo" -q 2>/dev/null | sort -u); \
+		for id in $$ids; do \
+			total=$$((total+1)); \
+			if $(CONTAINER_RUNTIME) rmi -f "$$id" >/dev/null 2>&1; then \
+				removed=$$((removed+1)); \
+			fi; \
+		done; \
+	done; \
+	echo "$(PURPLE)Removed $$removed/$$total OpenRAG image(s).$(NC)"
+
 clean: stop ## Stop containers and remove volumes
 	@echo "$(YELLOW)Cleaning up containers and volumes...$(NC)"
 	$(COMPOSE_CMD) down -v --remove-orphans
-	$(CONTAINER_RUNTIME) system prune -f
+	@$(MAKE) remove-openrag-images
 	@echo "$(PURPLE)Cleanup complete!$(NC)"
 
 factory-reset: ## Complete reset (stop, remove volumes, clear data, remove images)
@@ -461,7 +504,7 @@ factory-reset: ## Complete reset (stop, remove volumes, clear data, remove image
 	echo "  - Delete opensearch-data directory"; \
 	echo "  - Delete config directory"; \
 	echo "  - Delete JWT keys (private_key.pem, public_key.pem)"; \
-	echo "  - Remove local OpenRAG images"; \
+	echo "  - Remove OpenRAG images"; \
 	echo ""; \
 	echo ""; \
 	if [ "$(FORCE)" != "true" ]; then \
@@ -492,8 +535,8 @@ factory-reset: ## Complete reset (stop, remove volumes, clear data, remove image
 		rm -f keys/private_key.pem keys/public_key.pem; \
 		echo "$(PURPLE)JWT keys removed$(NC)"; \
 	fi; \
-	echo "$(YELLOW)Cleaning up system...$(NC)"; \
-	$(CONTAINER_RUNTIME) system prune -f; \
+	echo "$(YELLOW)Removing OpenRAG images...$(NC)"; \
+	$(MAKE) remove-openrag-images; \
 	echo ""; \
 	echo "$(PURPLE)Factory reset complete!$(NC)"; \
 	echo "$(CYAN)Run 'make dev' or 'make dev-cpu' to start fresh.$(NC)";

docker-compose.yml

@@ -68,6 +68,7 @@ services:
       - OPENSEARCH_USERNAME=${OPENSEARCH_USERNAME:-admin}
       - OPENSEARCH_PASSWORD=${OPENSEARCH_PASSWORD}
       - OPENAI_API_KEY=${OPENAI_API_KEY}
+      - OPENAI_API_BASE=${OPENAI_API_BASE:-None}
       - ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}
       - WATSONX_API_KEY=${WATSONX_API_KEY}
       - WATSONX_ENDPOINT=${WATSONX_ENDPOINT}
@@ -131,12 +132,13 @@ services:
       - LANGFUSE_PUBLIC_KEY=${LANGFUSE_PUBLIC_KEY:-}
       - LANGFUSE_HOST=${LANGFUSE_HOST:-}
       - LANGFLOW_DEACTIVATE_TRACING
-      - OPENAI_API_KEY=${OPENAI_API_KEY:-None}
-      - ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY:-None}
-      - WATSONX_API_KEY=${WATSONX_API_KEY:-None}
-      - WATSONX_ENDPOINT=${WATSONX_ENDPOINT:-None}
-      - WATSONX_PROJECT_ID=${WATSONX_PROJECT_ID:-None}
-      - OLLAMA_BASE_URL=${OLLAMA_ENDPOINT:-None}
+      - OPENAI_API_KEY=${OPENAI_API_KEY}
+      - OPENAI_API_BASE=${OPENAI_API_BASE}
+      - ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}
+      - WATSONX_API_KEY=${WATSONX_API_KEY}
+      - WATSONX_URL=${WATSONX_URL:-${WATSONX_ENDPOINT}}
+      - WATSONX_PROJECT_ID=${WATSONX_PROJECT_ID}
+      - OLLAMA_BASE_URL=${OLLAMA_ENDPOINT}
       - LANGFLOW_LOAD_FLOWS_PATH=/app/flows
       - LANGFLOW_SECRET_KEY=${LANGFLOW_SECRET_KEY}
       - JWT=None
@@ -159,8 +161,8 @@ services:
       - FILENAME=None
       - MIMETYPE=None
       - FILESIZE=0
-      - SELECTED_EMBEDDING_MODEL=${SELECTED_EMBEDDING_MODEL:-}
-      - LANGFLOW_VARIABLES_TO_GET_FROM_ENVIRONMENT=JWT,OPENRAG-QUERY-FILTER,OPENSEARCH_PASSWORD,OPENSEARCH_URL,DOCLING_SERVE_URL,OWNER,OWNER_NAME,OWNER_EMAIL,CONNECTOR_TYPE,DOCUMENT_ID,SOURCE_URL,ALLOWED_USERS,ALLOWED_GROUPS,FILENAME,MIMETYPE,FILESIZE,SELECTED_EMBEDDING_MODEL,OPENAI_API_KEY,ANTHROPIC_API_KEY,WATSONX_API_KEY,WATSONX_ENDPOINT,WATSONX_PROJECT_ID,OLLAMA_BASE_URL,OPENSEARCH_INDEX_NAME
+      - SELECTED_EMBEDDING_MODEL=${SELECTED_EMBEDDING_MODEL:-text-embedding-3-small}
+      - LANGFLOW_VARIABLES_TO_GET_FROM_ENVIRONMENT=JWT,OPENRAG-QUERY-FILTER,OPENSEARCH_PASSWORD,OPENSEARCH_URL,DOCLING_SERVE_URL,OWNER,OWNER_NAME,OWNER_EMAIL,CONNECTOR_TYPE,DOCUMENT_ID,SOURCE_URL,ALLOWED_USERS,ALLOWED_GROUPS,FILENAME,MIMETYPE,FILESIZE,SELECTED_EMBEDDING_MODEL,OPENAI_API_KEY,OPENAI_API_BASE,ANTHROPIC_API_KEY,WATSONX_API_KEY,WATSONX_URL,WATSONX_PROJECT_ID,OLLAMA_BASE_URL,OPENSEARCH_INDEX_NAME
       - LANGFLOW_LOG_LEVEL=DEBUG
       - LANGFLOW_WORKERS=${LANGFLOW_WORKERS:-1}
       - LANGFLOW_AUTO_LOGIN=${LANGFLOW_AUTO_LOGIN}