Offer two database options - SQLite and Postgres

.gitignore

@@ -59,3 +59,8 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 pnpm-debug.log*
+
+
+# Local db files
+chroma_db/
+opengpts.db

backend/Makefile

@@ -17,7 +17,7 @@ start:
 	poetry run uvicorn app.server:app --reload --port 8100
 
 migrate:
-	migrate -database postgres://$(POSTGRES_USER):$(POSTGRES_PASSWORD)@$(POSTGRES_HOST):$(POSTGRES_PORT)/$(POSTGRES_DB)?sslmode=disable -path ./migrations up
+	migrate -database sqlite3://$(PWD)/opengpts.db -path ./migrations up
 
 test:
 	# We need to update handling of env variables for tests

backend/app/agent.py

@@ -11,7 +11,7 @@
 from app.agent_types.tools_agent import get_tools_agent_executor
 from app.agent_types.xml_agent import get_xml_agent_executor
 from app.chatbot import get_chatbot_executor
-from app.checkpoint import PostgresCheckpoint
+from app.checkpoint import SQLiteCheckpoint
 from app.llms import (
     get_anthropic_llm,
     get_google_llm,
@@ -70,7 +70,7 @@ class AgentType(str, Enum):
 
 DEFAULT_SYSTEM_MESSAGE = "You are a helpful assistant."
 
-CHECKPOINTER = PostgresCheckpoint(at=CheckpointAt.END_OF_STEP)
+CHECKPOINTER = SQLiteCheckpoint(at=CheckpointAt.END_OF_STEP)
 
 
 def get_agent_executor(

backend/app/api/assistants.py

@@ -25,9 +25,9 @@ class AssistantPayload(BaseModel):
 
 
 @router.get("/")
-async def list_assistants(user: AuthedUser) -> List[Assistant]:
+def list_assistants(user: AuthedUser) -> List[Assistant]:
     """List all assistants for the current user."""
-    return await storage.list_assistants(user["user_id"])
+    return storage.list_assistants(user["user_id"])
 
 
 @router.get("/public/")
@@ -37,7 +37,7 @@ async def list_public_assistants(
     ] = None,
 ) -> List[Assistant]:
     """List all public assistants."""
-    return await storage.list_public_assistants(
+    return storage.list_public_assistants(
         FEATURED_PUBLIC_ASSISTANTS + ([shared_id] if shared_id else [])
     )
 
@@ -48,7 +48,7 @@ async def get_assistant(
     aid: AssistantID,
 ) -> Assistant:
     """Get an assistant by ID."""
-    assistant = await storage.get_assistant(user["user_id"], aid)
+    assistant = storage.get_assistant(user["user_id"], aid)
     if not assistant:
         raise HTTPException(status_code=404, detail="Assistant not found")
     return assistant
@@ -60,7 +60,7 @@ async def create_assistant(
     payload: AssistantPayload,
 ) -> Assistant:
     """Create an assistant."""
-    return await storage.put_assistant(
+    return storage.put_assistant(
         user["user_id"],
         str(uuid4()),
         name=payload.name,
@@ -76,7 +76,7 @@ async def upsert_assistant(
     payload: AssistantPayload,
 ) -> Assistant:
     """Create or update an assistant."""
-    return await storage.put_assistant(
+    return storage.put_assistant(
         user["user_id"],
         aid,
         name=payload.name,

backend/app/api/runs.py

@@ -31,11 +31,11 @@ class CreateRunPayload(BaseModel):
 
 
 async def _run_input_and_config(payload: CreateRunPayload, user_id: str):
-    thread = await get_thread(user_id, payload.thread_id)
+    thread = get_thread(user_id, payload.thread_id)
     if not thread:
         raise HTTPException(status_code=404, detail="Thread not found")
 
-    assistant = await get_assistant(user_id, str(thread["assistant_id"]))
+    assistant = get_assistant(user_id, str(thread["assistant_id"]))
     if not assistant:
         raise HTTPException(status_code=404, detail="Assistant not found")
 

backend/app/api/threads.py

@@ -1,4 +1,3 @@
-import asyncio
 from typing import Annotated, Any, Dict, List, Sequence, Union
 from uuid import uuid4
 
@@ -32,7 +31,7 @@ class ThreadPostRequest(BaseModel):
 @router.get("/")
 async def list_threads(user: AuthedUser) -> List[Thread]:
     """List all threads for the current user."""
-    return await storage.list_threads(user["user_id"])
+    return storage.list_threads(user["user_id"])
 
 
 @router.get("/{tid}/state")
@@ -41,10 +40,8 @@ async def get_thread_state(
     tid: ThreadID,
 ):
     """Get state for a thread."""
-    thread, state = await asyncio.gather(
-        storage.get_thread(user["user_id"], tid),
-        storage.get_thread_state(user["user_id"], tid),
-    )
+    thread = storage.get_thread(user["user_id"], tid)
+    state = storage.get_thread_state(user["user_id"], tid)
     if not thread:
         raise HTTPException(status_code=404, detail="Thread not found")
     return state
@@ -57,10 +54,10 @@ async def add_thread_state(
     payload: ThreadPostRequest,
 ):
     """Add state to a thread."""
-    thread = await storage.get_thread(user["user_id"], tid)
+    thread = storage.get_thread(user["user_id"], tid)
     if not thread:
         raise HTTPException(status_code=404, detail="Thread not found")
-    return await storage.update_thread_state(user["user_id"], tid, payload.values)
+    return storage.update_thread_state(user["user_id"], tid, payload.values)
 
 
 @router.get("/{tid}/history")
@@ -69,10 +66,8 @@ async def get_thread_history(
     tid: ThreadID,
 ):
     """Get all past states for a thread."""
-    thread, history = await asyncio.gather(
-        storage.get_thread(user["user_id"], tid),
-        storage.get_thread_history(user["user_id"], tid),
-    )
+    thread = storage.get_thread(user["user_id"], tid)
+    history = storage.get_thread_history(user["user_id"], tid)
     if not thread:
         raise HTTPException(status_code=404, detail="Thread not found")
     return history
@@ -84,7 +79,7 @@ async def get_thread(
     tid: ThreadID,
 ) -> Thread:
     """Get a thread by ID."""
-    thread = await storage.get_thread(user["user_id"], tid)
+    thread = storage.get_thread(user["user_id"], tid)
     if not thread:
         raise HTTPException(status_code=404, detail="Thread not found")
     return thread
@@ -96,7 +91,7 @@ async def create_thread(
     thread_put_request: ThreadPutRequest,
 ) -> Thread:
     """Create a thread."""
-    return await storage.put_thread(
+    return storage.put_thread(
         user["user_id"],
         str(uuid4()),
         assistant_id=thread_put_request.assistant_id,
@@ -111,7 +106,7 @@ async def upsert_thread(
     thread_put_request: ThreadPutRequest,
 ) -> Thread:
     """Update a thread."""
-    return await storage.put_thread(
+    return storage.put_thread(
         user["user_id"],
         tid,
         assistant_id=thread_put_request.assistant_id,
@@ -125,5 +120,5 @@ async def delete_thread(
     tid: ThreadID,
 ):
     """Delete a thread by ID."""
-    await storage.delete_thread(user["user_id"], tid)
+    storage.delete_thread(user["user_id"], tid)
     return {"status": "ok"}

backend/app/auth/handlers.py

@@ -23,7 +23,7 @@ class NOOPAuth(AuthHandler):
 
     async def __call__(self, request: Request) -> User:
         sub = request.cookies.get("opengpts_user_id") or self._default_sub
-        user, _ = await storage.get_or_create_user(sub)
+        user, _ = storage.get_or_create_user(sub)
         return user
 
 
@@ -37,7 +37,7 @@ async def __call__(self, request: Request) -> User:
         except jwt.PyJWTError as e:
             raise HTTPException(status_code=401, detail=str(e))
 
-        user, _ = await storage.get_or_create_user(payload["sub"])
+        user, _ = storage.get_or_create_user(payload["sub"])
         return user
 
     @abstractmethod