feat: add brain_id and complete brain history openapi test

Author: PurposeAchiever6

.gitignore

@@ -8,7 +8,6 @@ log.txt
 
 
 
-
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies

backend/core/llm/base.py

@@ -22,7 +22,7 @@ class BaseBrainPicking(BaseModel):
 
     # Default class attributes
     model: str = None  # pyright: ignore reportPrivateUsage=none
-    temperature: float = 0.0
+    temperature: float = 0.5
     chat_id: str = None  # pyright: ignore reportPrivateUsage=none
     brain_id: str = None  # pyright: ignore reportPrivateUsage=none
     max_tokens: int = 256

backend/core/llm/qa_base.py

@@ -218,6 +218,7 @@ async def wrap_done(fn: Awaitable, event: asyncio.Event):
 
         streamed_chat_history = update_chat_history(
             chat_id=self.chat_id,
+            brain_id=self.brain_id,
             user_message=question,
             assistant="",
         )

backend/core/main.py

@@ -24,6 +24,34 @@
 
 logger = get_logger(__name__)
 
+
+# ## GPTCache
+# from gptcache import Cache
+# from gptcache.manager.factory import manager_factory
+# from gptcache.adapter.api import init_similar_cache
+# from gptcache.processor.pre import get_prompt
+# from langchain.cache import GPTCache
+# import hashlib
+# import langchain
+# import time
+# from langchain.llms import OpenAI
+# from gptcache.adapter.langchain_models import LangChainLLMs
+
+
+# def get_hashed_name(name):
+#     return hashlib.sha256(name.encode()).hexdigest()
+
+
+# def init_gptcache(cache_obj: Cache, llm: str):
+#     hashed_llm = get_hashed_name(llm)
+#     # init_similar_cache(cache_obj=cache_obj, data_dir=f"similar_cache_{hashed_llm}")
+#     cache_obj.init(
+#         pre_embedding_func=get_prompt,
+#         data_manager=manager_factory()
+#     )
+
+# langchain.llm_cache = GPTCache(init_gptcache)
+
 sentry_dsn = os.getenv("SENTRY_DSN")
 if sentry_dsn:
     sentry_sdk.init(

backend/core/models/chat.py

@@ -26,6 +26,7 @@ def __init__(self, chat_dict: dict):
 @dataclass
 class ChatHistory:
     chat_id: str
+    brain_id: str
     message_id: str
     user_message: str
     assistant: str
@@ -35,6 +36,9 @@ def __init__(self, chat_dict: dict):
         self.chat_id = chat_dict.get(
             "chat_id"
         )  # pyright: ignore reportPrivateUsage=none
+        self.brain_id = chat_dict.get(
+            "brain_id"
+        )  # pyright: ignore reportPrivateUsage=none
         self.message_id = chat_dict.get(
             "message_id"
         )  # pyright: ignore reportPrivateUsage=none

backend/core/models/databases/supabase/chats.py

@@ -29,6 +29,17 @@ def get_chat_history(self, chat_id: str):
 
         return reponse
 
+    def get_brain_history(self, brain_id: str):
+        reponse = (
+            self.db.from_("chat_history")
+            .select("*")
+            .filter("brain_id", "eq", brain_id)
+            .order("message_time", desc=False)  # Add the ORDER BY clause
+            .execute()
+        )
+
+        return reponse
+
     def get_user_chats(self, user_id: str):
         response = (
             self.db.from_("chats")
@@ -38,12 +49,13 @@ def get_user_chats(self, user_id: str):
         )
         return response
 
-    def update_chat_history(self, chat_id: str, user_message: str, assistant: str):
+    def update_chat_history(self, chat_id: str, brain_id: str, user_message: str, assistant: str):
         response = (
             self.db.table("chat_history")
             .insert(
                 {
                     "chat_id": str(chat_id),
+                    "brain_id": str(brain_id),
                     "user_message": user_message,
                     "assistant": assistant,
                 }

backend/core/repository/brain/get_default_user_brain.py

@@ -12,7 +12,7 @@ def get_user_default_brain(user_id: UUID) -> BrainEntity | None:
     supabase_db = get_supabase_db()
     brain_id = supabase_db.get_default_user_brain_id(user_id)
 
-    logger.info("Default brain response:", brain_id)
+    # logger.info("Default brain response:", brain_id)
 
     if brain_id is None:
         return None

backend/core/repository/chat/get_brain_history.py

@@ -0,0 +1,16 @@
+from typing import List
+
+from models.chat import ChatHistory
+from models.settings import get_supabase_db  # For type hinting
+
+
+def get_brain_history(brain_id: str) -> List[ChatHistory]:
+    supabase_db = get_supabase_db()
+    history: List[ChatHistory] = supabase_db.get_brain_history(brain_id).data
+    if history is None:
+        return []
+    else:
+        return [
+            ChatHistory(message)  # pyright: ignore reportPrivateUsage=none
+            for message in history
+        ]

backend/core/repository/chat/update_chat_history.py

@@ -5,10 +5,10 @@
 from models.settings import get_supabase_db
 
 
-def update_chat_history(chat_id: str, user_message: str, assistant: str) -> ChatHistory:
+def update_chat_history(chat_id: str, brain_id: str, user_message: str, assistant: str) -> ChatHistory:
     supabase_db = get_supabase_db()
     response: List[ChatHistory] = (
-        supabase_db.update_chat_history(chat_id, user_message, assistant)
+        supabase_db.update_chat_history(chat_id, brain_id, user_message, assistant)
     ).data
     if len(response) == 0:
         raise HTTPException(

backend/core/routes/chat_routes.py

@@ -21,6 +21,7 @@
 from repository.chat.create_chat import CreateChatProperties, create_chat
 from repository.chat.get_chat_by_id import get_chat_by_id
 from repository.chat.get_chat_history import get_chat_history
+from repository.chat.get_brain_history import get_brain_history
 from repository.chat.get_user_chats import get_user_chats
 from repository.chat.update_chat import ChatUpdatableProperties, update_chat
 from repository.user_identity.get_user_identity import get_user_identity
@@ -295,3 +296,13 @@ async def get_chat_history_handler(
 ) -> List[ChatHistory]:
     # TODO: RBAC with current_user
     return get_chat_history(chat_id)  # pyright: ignore reportPrivateUsage=none
+
+# get brain history
+@chat_router.get(
+    "/chat/{brain_id}/brain_history", dependencies=[Depends(AuthBearer())], tags=["Chat"]
+)
+async def get_brain_history_handler(
+    brain_id: UUID,
+) -> List[ChatHistory]:
+    # TODO: RBAC with current_user
+    return get_brain_history(brain_id)  # pyright: ignore reportPrivateUsage=none

migration.sh

@@ -38,7 +38,8 @@ if $prompt_for_db_info ; then
 fi
 
 # Ask user whether to create tables or run migrations
-CHOICE=$(gum choose --header "Choose an option" "Create all tables" "Run Migrations")
+# CHOICE=$(gum choose --header "Choose an option" "Create all tables" "Run Migrations")
+CHOICE="Create all tables"
 
 if [ "$CHOICE" == "Create all tables" ]; then
     # Running the tables.sql file to create tables

openapi-brain.yaml

@@ -0,0 +1,210 @@
+---
+openapi: "3.0.1"
+info:
+  title: "MyGPT API test"
+  description: "This is openapi file for mygpt apis."
+  version: 3.0.1
+servers:
+- url: "http://walletgpt.info:5050"
+tags: 
+  - name: brain
+paths:
+  /brains/:
+    post:
+      tags: 
+        - brain
+      parameters: []
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/CreateBrainProperties'
+      responses:
+        "200":
+          description: "Generated by SwaggerHub Explore"
+      security:
+      - TokenCredentials: []
+  /upload:
+    post:
+      tags: 
+        - upload
+      parameters:
+        - in: query
+          name: brain_id
+          required: true
+          description: ID for the brain
+          schema:
+            type: string
+            default: "780dc579-49a2-4b2f-82d0-5cca26515179"
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                uploadFile:
+                  type: string
+                  format: binary
+      responses:
+        "200":
+          description: "Generated by SwaggerHub Explore"
+      security:
+      - TokenCredentials: []
+  /crawl:
+    post:
+      tags: 
+        - crawl
+      parameters:
+        - in: query
+          name: brain_id
+          required: true
+          description: ID for the brain
+          schema:
+            type: string
+            default: "780dc579-49a2-4b2f-82d0-5cca26515179"
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/CrawlWebsite'
+      responses:
+        "200":
+          description: "Generated by SwaggerHub Explore"
+      security:
+      - TokenCredentials: []
+  /chat/{chat_id}/question/stream:
+    post:
+      tags: 
+        - chat
+      parameters:
+        - name: chat_id
+          in: path
+          required: true
+          description: ID of the chat
+          schema:
+            type: string
+            default: "021a43da-22cd-4218-a037-5f2f1ac43056"
+        - name: brain_id
+          in: query
+          required: true
+          description: ID for the brain
+          schema:
+            type: string
+            default: "780dc579-49a2-4b2f-82d0-5cca26515179"
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                question:
+                  type: string
+                  default: "What is python?"
+      responses:
+        "200":
+          description: "Generated by SwaggerHub Explore"
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ChatHistoryList'
+      security:
+      - TokenCredentials: []
+  /chat/{chat_id}/history:
+    get:
+      tags: 
+        - chat
+      parameters:
+        - name: chat_id
+          in: path
+          required: true
+          description: ID of the chat
+          schema:
+            type: string
+            default: "a9e343fb-f37c-449f-ab68-e51332c498e8"
+      responses:
+        "200":
+          description: "Generated by SwaggerHub Explore"
+      security:
+      - TokenCredentials: []
+  /chat/{brain_id}/brain_history:
+    get:
+      tags: 
+        - chat
+      parameters:
+        - name: brain_id
+          in: path
+          required: true
+          description: ID of the brain
+          schema:
+            type: string
+            default: "780dc579-49a2-4b2f-82d0-5cca26515179"
+      responses:
+        "200":
+          description: "Generated by SwaggerHub Explore"
+      security:
+      - TokenCredentials: []
+components:
+  schemas:
+    CreateBrainProperties:
+      type: object
+      properties:
+        description:
+          type: string 
+          default: "Swagger API test"
+        name:
+          type: string
+          default: "Default swagger brain"
+        model:
+          type: string
+          default: "gpt-3.5-turbo-0613"
+        max_tokens:
+          type: integer
+          default: 378
+        openai_api_key:
+          type: string
+          default: "sk-"
+        temperature:
+          type: string
+          default: "0.75"
+    CrawlWebsite:
+      type: object
+      properties:
+        depth:
+          type: integer
+          default: 1
+        js:
+          type: boolean
+          default: false
+        max_pages:
+          type: integer
+          default: 100
+        max_time:
+          type: integer
+          default: 60
+        url:
+          type: string
+          default: "https://medium.com/codingthesmartway-com-blog/quivr-the-open-source-ai-project-thats-your-second-brain-in-the-cloud-17e3541fe45c"
+    ChatHistory:
+      type: object
+      properties:
+        chat_id: 
+          type: string
+        message_id: 
+          type: string
+        user_message: 
+          type: string
+        assistant:
+          type: string
+        message_time:
+          type: string
+    ChatHistoryList:
+      type: array
+      items:
+        $ref: '#/components/schemas/ChatHistory'
+  securitySchemes:
+    TokenCredentials:
+      type: "http"
+      scheme: "bearer"