pavanjava · Oct 28, 2024 · Oct 28, 2024 · Oct 28, 2024
diff --git a/...es/llamaindex/rag_with_controllable_agents_with_observability/docker-compose-langfuse.yml b/...es/llamaindex/rag_with_controllable_agents_with_observability/docker-compose-langfuse.yml
@@ -2,11 +2,10 @@ version: '3.8'
 
 services:
   postgres:
-    image: postgres:13
+    image: postgres:latest
     container_name: postgres
     environment:
-      POSTGRES_USER: admin
-      POSTGRES_PASSWORD: admin@123
+      POSTGRES_PASSWORD: postgres
       POSTGRES_DB: langfuse
     volumes:
       - postgres_data:/var/lib/postgresql/data
@@ -17,7 +16,7 @@ services:
     image: langfuse/langfuse:latest
     container_name: langfuse
     environment:
-      DATABASE_URL: postgresql://hello:mysecretpassword@postgres:5432/langfuse
+      DATABASE_URL: postgresql://postgres:postgres@postgres:5432/langfuse
       NEXTAUTH_URL: http://localhost:3000
       NEXTAUTH_SECRET: mysecret
       SALT: mysalt

diff --git a/bootstraprag/templates/llamaindex/rag_with_hyde/.env b/bootstraprag/templates/llamaindex/rag_with_hyde/.env
@@ -1,6 +1,6 @@
 DB_URL='http://localhost:6333'
 DB_API_KEY='th3s3cr3tk3y'
-COLLECTION_NAME='YOUR_COLLECTION'
+COLLECTION_NAME='HYDE_COLLECTION'
 
 OPENAI_API_KEY=''
 OPENAI_EMBED_MODEL=''

diff --git a/bootstraprag/templates/llamaindex/rag_with_hyde/base_rag.py b/bootstraprag/templates/llamaindex/rag_with_hyde/base_rag.py
@@ -65,7 +65,7 @@ def __init__(self, data_path: str, chunk_size: int = 512, chunk_overlap: int = 2
         Settings.llm = llm
         Settings.transformations = [self.text_parser]
 
-        self.rag_evaluator = RAGEvaluator
+        self.rag_evaluator = RAGEvaluator()
 
         self.text_chunks = []
         self.doc_ids = []

diff --git a/...traprag/templates/llamaindex/rag_with_hyde_with_observability/docker-compose-langfuse.yml b/...traprag/templates/llamaindex/rag_with_hyde_with_observability/docker-compose-langfuse.yml
@@ -2,11 +2,10 @@ version: '3.8'
 
 services:
   postgres:
-    image: postgres:13
+    image: postgres:latest
     container_name: postgres
     environment:
-      POSTGRES_USER: admin
-      POSTGRES_PASSWORD: admin@123
+      POSTGRES_PASSWORD: postgres
       POSTGRES_DB: langfuse
     volumes:
       - postgres_data:/var/lib/postgresql/data
@@ -17,7 +16,7 @@ services:
     image: langfuse/langfuse:latest
     container_name: langfuse
     environment:
-      DATABASE_URL: postgresql://hello:mysecretpassword@postgres:5432/langfuse
+      DATABASE_URL: postgresql://postgres:postgres@postgres:5432/langfuse
       NEXTAUTH_URL: http://localhost:3000
       NEXTAUTH_SECRET: mysecret
       SALT: mysalt

diff --git a/bootstraprag/templates/llamaindex/rag_with_mlflow/__init__.py b/bootstraprag/templates/llamaindex/rag_with_mlflow/__init__.py
diff --git a/bootstraprag/templates/llamaindex/rag_with_mlflow/readme.md b/bootstraprag/templates/llamaindex/rag_with_mlflow/readme.md
@@ -0,0 +1 @@
+## In progress
diff --git a/...raprag/templates/llamaindex/rag_with_react_with_observability/docker-compose-langfuse.yml b/...raprag/templates/llamaindex/rag_with_react_with_observability/docker-compose-langfuse.yml
@@ -2,11 +2,10 @@ version: '3.8'
 
 services:
   postgres:
-    image: postgres:13
+    image: postgres:latest
     container_name: postgres
     environment:
-      POSTGRES_USER: admin
-      POSTGRES_PASSWORD: admin@123
+      POSTGRES_PASSWORD: postgres
       POSTGRES_DB: langfuse
     volumes:
       - postgres_data:/var/lib/postgresql/data
@@ -17,7 +16,7 @@ services:
     image: langfuse/langfuse:latest
     container_name: langfuse
     environment:
-      DATABASE_URL: postgresql://hello:mysecretpassword@postgres:5432/langfuse
+      DATABASE_URL: postgresql://postgres:postgres@postgres:5432/langfuse
       NEXTAUTH_URL: http://localhost:3000
       NEXTAUTH_SECRET: mysecret
       SALT: mysalt

diff --git a/...plates/llamaindex/rag_with_self_correction_with_observability/docker-compose-langfuse.yml b/...plates/llamaindex/rag_with_self_correction_with_observability/docker-compose-langfuse.yml
@@ -2,11 +2,10 @@ version: '3.8'
 
 services:
   postgres:
-    image: postgres:13
+    image: postgres:latest
     container_name: postgres
     environment:
-      POSTGRES_USER: admin
-      POSTGRES_PASSWORD: admin@123
+      POSTGRES_PASSWORD: postgres
       POSTGRES_DB: langfuse
     volumes:
       - postgres_data:/var/lib/postgresql/data
@@ -17,7 +16,7 @@ services:
     image: langfuse/langfuse:latest
     container_name: langfuse
     environment:
-      DATABASE_URL: postgresql://hello:mysecretpassword@postgres:5432/langfuse
+      DATABASE_URL: postgresql://postgres:postgres@postgres:5432/langfuse
       NEXTAUTH_URL: http://localhost:3000
       NEXTAUTH_SECRET: mysecret
       SALT: mysalt

diff --git a/bootstraprag/templates/llamaindex/rag_with_vision/__init__.py b/bootstraprag/templates/llamaindex/rag_with_vision/__init__.py
diff --git a/bootstraprag/templates/llamaindex/rag_with_vision/readme.md b/bootstraprag/templates/llamaindex/rag_with_vision/readme.md
@@ -0,0 +1 @@
+## In progress
diff --git a/bootstraprag/templates/llamaindex/simple_rag_with_observability/docker-compose-langfuse.yml b/bootstraprag/templates/llamaindex/simple_rag_with_observability/docker-compose-langfuse.yml
@@ -0,0 +1,36 @@
+version: '3.8'
+
+services:
+  postgres:
+    image: postgres:latest
+    container_name: postgres
+    environment:
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: langfuse
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    networks:
+      - langfuse-network
+
+  langfuse:
+    image: langfuse/langfuse:latest
+    container_name: langfuse
+    environment:
+      DATABASE_URL: postgresql://postgres:postgres@postgres:5432/langfuse
+      NEXTAUTH_URL: http://localhost:3000
+      NEXTAUTH_SECRET: mysecret
+      SALT: mysalt
+      ENCRYPTION_KEY: 98637d42c277ef10b8a324e25d492daa8eee8f769574124ba25132f71481f183
+    ports:
+      - "3000:3000"
+    depends_on:
+      - postgres
+    networks:
+      - langfuse-network
+
+volumes:
+  postgres_data:
+
+networks:
+  langfuse-network:
+    driver: bridge
diff --git a/bootstraprag/templates/llamaindex/simple_rag_with_observability/requirements.txt b/bootstraprag/templates/llamaindex/simple_rag_with_observability/requirements.txt
@@ -1,13 +1,13 @@
 python-dotenv==1.0.1
-llama-index==0.11.7
-llama-index-llms-openai==0.2.3
-llama-index-llms-ollama==0.3.1
-llama-index-embeddings-openai==0.2.4
-llama-index-embeddings-ollama==0.3.0
-llama-index-vector-stores-qdrant==0.3.0
-qdrant-client==1.11.1
-arize-phoenix==4.33.1
-llama-index-callbacks-arize-phoenix==0.2.1
-pydantic==2.9.0
-litserve==0.2.2
-deepeval==1.3.2
+llama-index==0.11.19
+llama-index-llms-openai==0.2.16
+llama-index-llms-ollama==0.3.4
+llama-index-embeddings-openai==0.2.5
+llama-index-embeddings-ollama==0.3.1
+llama-index-vector-stores-qdrant==0.3.2
+qdrant-client==1.12.0
+pydantic==2.9.2
+litserve==0.2.3
+deepeval==1.4.4
+# observability
+langfuse==2.52.2
diff --git a/bootstraprag/templates/llamaindex/simple_rag_with_observability/simple_rag.py b/bootstraprag/templates/llamaindex/simple_rag_with_observability/simple_rag.py
@@ -9,23 +9,22 @@
 from llama_index.core.agent import ReActAgent
 from llama_index.llms.ollama import Ollama
 from llama_index.core.base.response.schema import Response, StreamingResponse, AsyncStreamingResponse, PydanticResponse
+from langfuse.llama_index import LlamaIndexInstrumentor
 from rag_evaluator import RAGEvaluator
 from dotenv import load_dotenv, find_dotenv
 from typing import Union
 import qdrant_client
 import logging
 import os
-import llama_index
-import phoenix as px
 
 _ = load_dotenv(find_dotenv())
 
 logging.basicConfig(level=int(os.environ['INFO']))
 logger = logging.getLogger(__name__)
 
 # instrumenting observability
-session = px.launch_app()
-llama_index.core.set_global_handler("arize_phoenix")
+instrumentor = LlamaIndexInstrumentor()
+instrumentor.start()
 
 
 class SimpleRAG: