QuivrHQ/quivr
1
1
Fork 0
mirror of https://github.com/QuivrHQ/quivr.git synced 2024-09-11 14:36:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(usersettings): Fix bugs with user settings in the back always gpt-3.5-turbo (#1183)

Browse Source 
* fix

* feat(gpt4): added support for gpt4
This commit is contained in:
Stan Girard 2023-09-16 00:22:42 +02:00 committed by GitHub
parent 4d41901106
commit 4fb8c34efd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 66 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/llm/openai.py
View File

@ -2,9 +2,8 @@ from typing import Optional
from uuid import UUID
from langchain.embeddings.openai import OpenAIEmbeddings
from logger import get_logger
from llm.qa_base import QABaseBrainPicking
from logger import get_logger
logger = get_logger(__name__)
@ -16,7 +15,7 @@ class OpenAIBrainPicking(QABaseBrainPicking):
"""
# Default class attributes
model: str = "gpt-3.5-turbo"
model: str
def __init__(
self,

2
backend/models/brains.py
View File

@ -16,7 +16,7 @@ class Brain(BaseModel):
name: Optional[str] = "Default brain"
description: Optional[str] = "This is a description"
status: Optional[str] = "private"
model: Optional[str] = "gpt-3.5-turbo"
model: Optional[str]
temperature: Optional[float] = 0.0
max_tokens: Optional[int] = 256
openai_api_key: Optional[str] = None

2
backend/models/chats.py
View File

@ -5,7 +5,7 @@ from pydantic import BaseModel
class ChatMessage(BaseModel):
model: str = "gpt-3.5-turbo-16k"
model: str
question: str
# A list of tuples where each tuple is (speaker, text)
history: List[Tuple[str, str]]

2
backend/models/databases/supabase/brains.py
View File

@ -13,7 +13,7 @@ class CreateBrainProperties(BaseModel):
name: Optional[str] = "Default brain"
description: Optional[str] = "This is a description"
status: Optional[str] = "private"
model: Optional[str] = "gpt-3.5-turbo"
model: Optional[str]
temperature: Optional[float] = 0.0
max_tokens: Optional[int] = 256
openai_api_key: Optional[str] = None

49
backend/routes/chat_routes.py
View File

@ -185,6 +185,15 @@ async def create_question_handler(
# Retrieve user's OpenAI API key
current_user.openai_api_key = request.headers.get("Openai-Api-Key")
brain = Brain(id=brain_id)
brain_details: BrainEntity | None = None
userDailyUsage = UserUsage(
id=current_user.id,
email=current_user.email,
openai_api_key=current_user.openai_api_key,
)
userSettings = userDailyUsage.get_user_settings()
is_model_ok = (brain_details or chat_question).model in userSettings.models # type: ignore
if not current_user.openai_api_key and brain_id:
brain_details = get_brain_details(brain_id)
@ -210,12 +219,12 @@ async def create_question_handler(
try:
check_user_requests_limit(current_user)
is_model_ok = (brain_details or chat_question).model in userSettings.get("models", ["gpt-3.5-turbo"]) # type: ignore
gpt_answer_generator: HeadlessQA | OpenAIBrainPicking
if brain_id:
gpt_answer_generator = OpenAIBrainPicking(
chat_id=str(chat_id),
model=chat_question.model,
model=chat_question.model if is_model_ok else "gpt-3.5-turbo", # type: ignore
max_tokens=chat_question.max_tokens,
temperature=chat_question.temperature,
brain_id=str(brain_id),
@ -224,7 +233,7 @@ async def create_question_handler(
)
else:
gpt_answer_generator = HeadlessQA(
model=chat_question.model,
model=chat_question.model if is_model_ok else "gpt-3.5-turbo", # type: ignore
temperature=chat_question.temperature,
max_tokens=chat_question.max_tokens,
user_openai_api_key=current_user.openai_api_key,
@ -264,6 +273,13 @@ async def create_stream_question_handler(
current_user.openai_api_key = request.headers.get("Openai-Api-Key")
brain = Brain(id=brain_id)
brain_details: BrainEntity | None = None
userDailyUsage = UserUsage(
id=current_user.id,
email=current_user.email,
openai_api_key=current_user.openai_api_key,
)
userSettings = userDailyUsage.get_user_settings()
if not current_user.openai_api_key and brain_id:
brain_details = get_brain_details(brain_id)
if brain_details:
@ -290,18 +306,15 @@ async def create_stream_question_handler(
logger.info(f"Streaming request for {chat_question.model}")
check_user_requests_limit(current_user)
gpt_answer_generator: HeadlessQA | OpenAIBrainPicking
# TODO check if model is in the list of models available for the user
print(userSettings.get("models", ["gpt-3.5-turbo"])) # type: ignore
is_model_ok = (brain_details or chat_question).model in userSettings.get("models", ["gpt-3.5-turbo"]) # type: ignore
if brain_id:
gpt_answer_generator = OpenAIBrainPicking(
chat_id=str(chat_id),
model=(brain_details or chat_question).model
if current_user.openai_api_key
else "gpt-3.5-turbo", # type: ignore
max_tokens=(brain_details or chat_question).max_tokens
if current_user.openai_api_key
else 256, # type: ignore
temperature=(brain_details or chat_question).temperature
if current_user.openai_api_key
else 0, # type: ignore
model=(brain_details or chat_question).model if is_model_ok else "gpt-3.5-turbo", # type: ignore
max_tokens=(brain_details or chat_question).max_tokens, # type: ignore
temperature=(brain_details or chat_question).temperature, # type: ignore
brain_id=str(brain_id),
user_openai_api_key=current_user.openai_api_key, # pyright: ignore reportPrivateUsage=none
streaming=True,
@ -309,15 +322,9 @@ async def create_stream_question_handler(
)
else:
gpt_answer_generator = HeadlessQA(
model=chat_question.model
if current_user.openai_api_key
else "gpt-3.5-turbo",
temperature=chat_question.temperature
if current_user.openai_api_key
else 0,
max_tokens=chat_question.max_tokens
if current_user.openai_api_key
else 256,
model=chat_question.model if is_model_ok else "gpt-3.5-turbo", # type: ignore
temperature=chat_question.temperature,
max_tokens=chat_question.max_tokens,
user_openai_api_key=current_user.openai_api_key, # pyright: ignore reportPrivateUsage=none
chat_id=str(chat_id),
streaming=True,

18
frontend/lib/components/AddBrainModal/AddBrainModal.tsx
View File

@ -1,5 +1,5 @@
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
/* eslint-disable max-lines */
/* eslint-disable */
import { useTranslation } from "react-i18next";
import { MdAdd } from "react-icons/md";
@ -8,11 +8,10 @@ import Button from "@/lib/components/ui/Button";
import Field from "@/lib/components/ui/Field";
import { Modal } from "@/lib/components/ui/Modal";
import { defineMaxTokens } from "@/lib/helpers/defineMaxTokens";
import { freeModels, paidModels } from "@/lib/types/brainConfig";
import { useAddBrainModal } from "./hooks/useAddBrainModal";
import { Divider } from "../ui/Divider";
import { TextArea } from "../ui/TextArea";
import { useAddBrainModal } from "./hooks/useAddBrainModal";
export const AddBrainModal = (): JSX.Element => {
const { t } = useTranslation(["translation", "brain", "config"]);
@ -27,6 +26,7 @@ export const AddBrainModal = (): JSX.Element => {
model,
isPending,
pickPublicPrompt,
accessibleModels,
} = useAddBrainModal();
return (
@ -89,13 +89,11 @@ export const AddBrainModal = (): JSX.Element => {
{...register("model")}
className="px-5 py-2 dark:bg-gray-700 bg-gray-200 rounded-md"
>
{(openAiKey !== undefined ? paidModels : freeModels).map(
(availableModel) => (
<option value={availableModel} key={availableModel}>
{availableModel}
</option>
)
)}
{accessibleModels.map((availableModel) => (
<option value={availableModel} key={availableModel}>
{availableModel}
</option>
))}
</select>
</fieldset>

26
frontend/lib/components/AddBrainModal/hooks/useAddBrainModal.ts
View File

@ -1,4 +1,4 @@
/* eslint-disable max-lines */
/* eslint-disable */
import axios from "axios";
import { useEffect, useState } from "react";
import { useForm } from "react-hook-form";
@ -6,10 +6,17 @@ import { useTranslation } from "react-i18next";
import { useBrainApi } from "@/lib/api/brain/useBrainApi";
import { usePromptApi } from "@/lib/api/prompt/usePromptApi";
import { USER_DATA_KEY } from "@/lib/api/user/config";
import { useUserApi } from "@/lib/api/user/useUserApi";
import { defaultBrainConfig } from "@/lib/config/defaultBrainConfig";
import { useBrainContext } from "@/lib/context/BrainProvider/hooks/useBrainContext";
import { defineMaxTokens } from "@/lib/helpers/defineMaxTokens";
import { getAccessibleModels } from "@/lib/helpers/getAccessibleModels";
import { useToast } from "@/lib/hooks";
import { useQuery } from "@tanstack/react-query";
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
export const useAddBrainModal = () => {
@ -21,6 +28,13 @@ export const useAddBrainModal = () => {
const { createPrompt } = usePromptApi();
const [isShareModalOpen, setIsShareModalOpen] = useState(false);
const { getUser } = useUserApi();
const { data: userData } = useQuery({
queryKey: [USER_DATA_KEY],
queryFn: getUser,
});
const defaultValues = {
...defaultBrainConfig,
name: "",
@ -32,6 +46,10 @@ export const useAddBrainModal = () => {
},
};
const { register, getValues, reset, watch, setValue } = useForm({
defaultValues,
});
@ -41,6 +59,11 @@ export const useAddBrainModal = () => {
const temperature = watch("temperature");
const maxTokens = watch("maxTokens");
const accessibleModels = getAccessibleModels({
openAiKey,
userData,
});
useEffect(() => {
setValue("maxTokens", Math.min(maxTokens, defineMaxTokens(model)));
}, [maxTokens, model, setValue]);
@ -155,6 +178,7 @@ export const useAddBrainModal = () => {
temperature,
maxTokens,
isPending,
accessibleModels,
pickPublicPrompt,
};
};