Merge branch 'context_zane' of https://github.com/oscarqjh/TechFest2024

oscarqjh · Feb 5, 2024 · 834a1ee · 834a1ee
2 parents 435d9a1 + 3111cff
commit 834a1ee
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/frontend/src/api/chatbot.jsx b/frontend/src/api/chatbot.jsx
@@ -4,7 +4,7 @@ import { OpenAIHttp } from './common';
 import OpenAIService from './service/openAIService';
 import { Input } from "@/components/ui/input";
 
-const Chatbot = () => {
+const Chatbot = (props) => {
   const [input, setInput] = useState('');
   const [messages, setMessages] = useState([]);
 
@@ -36,7 +36,8 @@ const Chatbot = () => {
             role: "user",
             content: input
           }
-        ]
+        ],
+        recipe: props.context,
       }
       addItem(input)
       const thisresponse = await OpenAIService.askfrAIbot(data)

diff --git a/frontend/src/api/service/openAIService.js b/frontend/src/api/service/openAIService.js
@@ -36,6 +36,7 @@ const getRecipe = (data) => {
 const askfrAIbot = (data) => {
   const prompt = [];
   // console.log(data.messages)
+  // console.log(data.recipe)
   prompt.push(data.messages[0].content);
   prompt.push(
     "Please provide clear and concise answers. Reply this within 20-30 words."
@@ -49,6 +50,10 @@ const askfrAIbot = (data) => {
         role: "user",
         content: prompt.join(" "),
       },
+      {
+        role: "assistant",
+        content: data.recipe,
+      }
     ], 
   }
   return OpenAIHttp.post("/chat/completions", finalData)

diff --git a/frontend/src/components/Recipecard.jsx b/frontend/src/components/Recipecard.jsx
@@ -214,7 +214,7 @@ export default function RecipeCard() {
             <CardTitle className="flex justify-center">Ask frAI</CardTitle>
           </CardHeader>
           <CardContent className="flex justify-start mb-10 h-[600px] flex flex-col">
-            <Chatbot />
+            <Chatbot context={recipe}/>
           </CardContent>
 
         </Card>