Adding build options

.dockerignore

@@ -28,8 +28,8 @@ yarn-debug.log*
 yarn-error.log*
 
 # local env files
-.env
-.env*.local
+*.env
+*.env*.local
 
 # vercel
 .vercel

Dockerfile

@@ -6,7 +6,7 @@ RUN apt-get install -y python3 pip
 
 WORKDIR /code
 
-COPY server/* /code/server/
+COPY server/ /code/server/
 
 RUN pip install --no-cache-dir --upgrade -r /code/server/requirements.txt --break-system-packages
 

server/app.py

@@ -1,6 +1,38 @@
+from fastapi import FastAPI
+from fastapi.middleware.cors import CORSMiddleware
 from inference import rag_chain
+from pydantic import BaseModel
+from fastapi.staticfiles import StaticFiles 
+
+class Body(BaseModel):
+    subject: str
+
+
+app = FastAPI()
+
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
+@app.post("/generate_questions")
+async def generate_questions(body: Body):
+    subject = body.subject
+    query = f"Quero que você gere questões de biologia, sendo do assunto: {subject}."
+    res = rag_chain.invoke(f"""{query}""")
+    return res
+
+app.mount("/", StaticFiles(directory="static", html=True), name="static")
+
+if __name__ == "__main__":
+    import uvicorn
+    uvicorn.run("app:app", host="0.0.0.0", port=8000)
+
+
+
+
+
+
 
-assunto = "Bioquimica e Biofisica"
-query = f"Quero que você gere questões de biologia, sendo do assunto: {assunto}."
-res = rag_chain.invoke(f"""{query}""")
-print(res)

server/data/load_data.py

@@ -6,33 +6,44 @@ from langchain.retrievers.self_query.base import SelfQueryRetriever
 from llm.gemini import gemini_embeddings, llm
 from utils.questions_parser import parse_question
 
-if "DATA_PATH" not in os.environ:
-    raise ValueError("DATA_PATH environment variable is not set")
+try:
 
-DATA_PATH = os.environ["DATA_PATH"]
+    vectorstore = Chroma(
+        persist_directory="./chroma_db", embedding_function=gemini_embeddings
+    )
 
-data_loader = TextLoader(DATA_PATH, encoding = 'UTF-8').load()
+except Exception as e:
 
-questions = list(
-    map(lambda x: "##Questão" + x, data_loader[0].page_content.split("##Questão"))
-)
+    print(e)
 
-docs = []
+    if "DATA_PATH" not in os.environ:
+        raise ValueError("DATA_PATH environment variable is not set")
 
-for question in questions:
-    try:
-        docs.append(parse_question(question))
-    except Exception as e:
-        print(e, question)
+    DATA_PATH = os.environ["DATA_PATH"]
 
-db = Chroma.from_documents(docs, gemini_embeddings)
-vectorstore = Chroma.from_documents(
-    documents=docs, embedding=gemini_embeddings, persist_directory="./chroma_db"
-)
+    data_loader = TextLoader(DATA_PATH, encoding="UTF-8").load()
+
+    questions = list(
+        map(lambda x: "##Questão" + x, data_loader[0].page_content.split("##Questão"))
+    )
+
+    docs = []
+
+    for question in questions:
+        try:
+            docs.append(parse_question(question))
+        except Exception as e:
+            print(e, question)
+
+    db = Chroma.from_documents(docs, gemini_embeddings)
+    vectorstore = Chroma.from_documents(
+        documents=docs, embedding=gemini_embeddings, persist_directory="./chroma_db"
+    )
+
+    vectorstore_disk = Chroma(
+        persist_directory="./chroma_db", embedding_function=gemini_embeddings
+    )
 
-vectorstore_disk = Chroma(
-    persist_directory="./chroma_db", embedding_function=gemini_embeddings
-)
 metadata_field_info = [
     AttributeInfo(
         name="topico",

server/requirements.txt

@@ -2,9 +2,8 @@ langchain==0.1.6
 chromadb==0.5.0
 lark==1.1.9
 langchain-google-genai==1.0.1
-# langchain-text-splitters==0.0.1
 langchain-core==0.1.22
 langchain-community==0.0.20
 langsmith==0.0.87
-python-daemon==2.1.2
-localstack==0.12.0
+# python-daemon==2.1.2
+# langchain-text-splitters==0.0.1

web/package-lock.json

@@ -9,11 +9,13 @@
       "version": "0.0.0",
       "dependencies": {
         "@radix-ui/react-select": "^2.0.0",
+        "@radix-ui/react-separator": "^1.0.3",
         "class-variance-authority": "^0.7.0",
         "clsx": "^2.1.1",
         "lucide-react": "^0.377.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
+        "react-toastify": "^10.0.5",
         "tailwind-merge": "^2.3.0",
         "tailwindcss-animate": "^1.0.7"
       },
@@ -1349,6 +1351,29 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-separator": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.0.3.tgz",
+      "integrity": "sha512-itYmTy/kokS21aiV5+Z56MZB54KrhPgn6eHDKkFeOLR34HMN2s8PaN47qZZAGnvupcjxHaFZnW4pQEh0BvvVuw==",
+      "dependencies": {
+        "@babel/runtime": "^7.13.10",
+        "@radix-ui/react-primitive": "1.0.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0",
+        "react-dom": "^16.8 || ^17.0 || ^18.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-slot": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz",
@@ -4789,6 +4814,18 @@
         }
       }
     },
+    "node_modules/react-toastify": {
+      "version": "10.0.5",
+      "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-10.0.5.tgz",
+      "integrity": "sha512-mNKt2jBXJg4O7pSdbNUfDdTsK9FIdikfsIE/yUCxbAEXl4HMyJaivrVFcn3Elvt5xvCQYhUZm+hqTIu1UXM3Pw==",
+      "dependencies": {
+        "clsx": "^2.1.0"
+      },
+      "peerDependencies": {
+        "react": ">=18",
+        "react-dom": ">=18"
+      }
+    },
     "node_modules/read-cache": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",

web/package.json

@@ -11,11 +11,13 @@
   },
   "dependencies": {
     "@radix-ui/react-select": "^2.0.0",
+    "@radix-ui/react-separator": "^1.0.3",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "lucide-react": "^0.377.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "react-toastify": "^10.0.5",
     "tailwind-merge": "^2.3.0",
     "tailwindcss-animate": "^1.0.7"
   },

web/src/App.jsx

@@ -6,38 +6,82 @@ import {
   SelectValue,
 } from "@/components/ui/select"
 import { ChevronLeft, Menu } from "lucide-react"
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useState } from "react";
+import { ToastContainer, toast } from "react-toastify"
+import 'react-toastify/dist/ReactToastify.css';
 
 function App() {
 
-  const selectRef = useRef(null);
   const [subject, setSubject] = useState("");
 
   const [menuState, setMenuState] = useState(true);
   const [isLoading, setIsLoading] = useState(false);
-  const [questions, setQuestions] = useState("");
+  const [questions, setQuestions] = useState([
+    {
+      question: "Qual a cor do céu?",
+      options: ["Azul", "Verde", "Amarelo", "Vermelho"],
+      answer: "Azul"
+    },
+    {
+      question: "Qual a cor da grama?",
+      options: ["Azul", "Verde", "Amarelo", "Vermelho"],
+      answer: "Verde"
+    },
+    {
+      question: "Qual a cor do sol?",
+      options: ["Azul", "Verde", "Amarelo", "Vermelho"],
+      answer: "Amarelo"
+    },
+    {
+      question: "Qual a cor do sangue?",
+      options: ["Azul", "Verde", "Amarelo", "Vermelho"],
+      answer: "Vermelho"
+    }
+  
+  ]);
 
   const handleSubmit = async (e) => {
     e.preventDefault();
     setIsLoading(true);
     try {
-      const res = await fetch("https://abac-35-243-250-231.ngrok-free.app/question" + "/" + subject, {
+      const res = await fetch("/generate_questions", {
         method: "POST",
         headers: {
           "Content-Type": "application/json"
         },
-        // body: JSON.stringify({
-        //   assunto: subject
-        // })
+        body: JSON.stringify({
+          subject
+        })
       });
       console.log(res)
       if (res.ok) {
         const data = await res.json();
         console.log(data)
-        setQuestions(data.question.split("###"));
+        setQuestions(data.questions);
+      } else {
+        toast.error("Erro ao gerar questões", {
+          position: "top-right",
+          autoClose: 5000,
+          hideProgressBar: false,
+          closeOnClick: true,
+          pauseOnHover: true,
+          draggable: true,
+          progress: undefined,
+          className: "bg-slate-900 text-white font-semibold",
+        });
       }
     } catch (err) {
       console.error(err);
+      toast.error("Erro ao gerar questões", {
+        position: "top-right",
+        autoClose: 5000,
+        hideProgressBar: false,
+        closeOnClick: true,
+        pauseOnHover: true,
+        draggable: true,
+        progress: undefined,
+        className: "bg-slate-900 text-white font-semibold",
+      });
     }
     setIsLoading(false);
   }
@@ -51,26 +95,25 @@ function App() {
         setMenuState(false);
       }
     }
-    // console.log(selectRef.current.value)
     window.addEventListener("resize", handleResize);
     return () => window.removeEventListener("resize", handleResize);
   }
     , []);
 
   return (
-    <div className="font-sans text-white min-h-screen bg-slate-900 flex flex-col relative">
+    <div className="font-sans h-screen text-white min-h-screen bg-slate-900 flex flex-col relative overflow-hidden">
       <header className="p-10 flex items-center gap-2.5">
-        <Menu className="md:hidden" onClick={e => setMenuState(prev => !prev)} />
+        <Menu className="md:hidden" onClick={() => setMenuState(prev => !prev)} />
         <h1 className="text-3xl font-bold">
-          PerguntAI
+          Pergunt.<span className="text-transparent bg-clip-text bg-gradient-to-r from-green-300 to bg-blue-500">AÍ</span>
         </h1>
       </header>
-      <main className="flex-1 flex">
+      <main className="flex-1 flex overflow-hidden">
         {
           menuState &&
           <form
             onSubmit={handleSubmit}
-            className="p-10 flex flex-col gap-2.5  absolute top-0 bg-black/70 h-full z-10 md:static md:h-full md:bg-transparent">
+            className="p-10 flex flex-col gap-2.5  absolute top-0 bg-black/95 h-full z-10 md:static md:h-full md:bg-transparent">
             <div className="md:sr-only">
               <ChevronLeft className="w-10 h-10" onClick={e => setMenuState(prev => !prev)} />
             </div>
@@ -95,24 +138,35 @@ function App() {
               </SelectContent>
             </Select>
             <button className="h-10 bg-purple-500 rounded px-2.5 py-1 mt-5 hover:brightness-110 transition-all flex items-center justify-center disabled:hover:brightness-75 disabled:brightness-75"
-              disabled={isLoading}>
+              disabled={isLoading || !subject}>
               {
                 isLoading ?
-                  <div className="animate-spin h-5 w-5 border-2 border-white border-r-purple-500 rounded-full  "></div>
+                  <div className="animate-spin h-5 w-5 border-2 border-white border-r-purple-500 rounded-full"></div>
                   :
                   "Enviar"
               }
             </button>
           </form>
         }
-        <section className="p-10 flex-1 md:border-l-2 md:border-l-white flex flex-col gap-2.5">
+        <section className="p-10 flex-1 md:border-l-2 md:border-l-white flex flex-col gap-2.5 ">
           <h2 className="text-2xl font-bold">Questões</h2>
-          <div className="w-full h-full flex flex-col gap-5 ring-2 ring-white rounded bg-slate-950 p-2.5">
+          <div className="w-full h-full flex flex-col gap-5 rounded p-2.5 overflow-y-scroll">
             {questions ?
-              questions.map((question, index) => <p className="" key={index}>{question}</p>)
-              : "Ainda sem questões"}
+              questions.map(({ question, options, answer }, index) => (
+                <div key={index} className="bg-slate-950 ring-2 ring-white p-2.5 rounded">
+                  {question}<br /><br />
+                  {options.map((option, i) => (
+                    <div key={i}>
+                      {option}
+                    </div>
+                  ))}<br />
+                  Resposta correta: {answer}
+                </div>
+              ))
+              : <div className="p-2.5 bg-slate-950 ring-2 ring-white rounded">{"Ainda sem questões"}</div>}
           </div>
         </section>
+        <ToastContainer />
       </main>
     </div>
   )

web/src/components/ui/separator.jsx

@@ -0,0 +1,25 @@
+"use client"
+
+import * as React from "react"
+import * as SeparatorPrimitive from "@radix-ui/react-separator"
+
+import { cn } from "@/lib/utils"
+
+const Separator = React.forwardRef((
+  { className, orientation = "horizontal", decorative = true, ...props },
+  ref
+) => (
+  <SeparatorPrimitive.Root
+    ref={ref}
+    decorative={decorative}
+    orientation={orientation}
+    className={cn(
+      "shrink-0 bg-border",
+      orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
+      className
+    )}
+    {...props} />
+))
+Separator.displayName = SeparatorPrimitive.Root.displayName
+
+export { Separator }

web/src/index.css

@@ -27,3 +27,19 @@
     --radius: 0.5rem;
   }
 }
+
+::-webkit-scrollbar {
+  /* Customize the scrollbar width */
+  width: .5rem;
+  background-color: transparent;
+}
+
+::-webkit-scrollbar-track {
+  /* Customize the scrollbar track */
+}
+
+::-webkit-scrollbar-thumb {
+  /* Customize the scrollbar thumb */
+  background-color: #C0C0C0;
+  border-radius: .5rem;
+}