Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions db/models.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
from sqlalchemy import Column,Integer,String,Float
from sqlalchemy import Column, Integer, String, Float, DateTime, ForeignKey
from datetime import datetime
from db.database import Base


class QuizResult(Base):
__tablename__ = "quiz_results"

id = Column(Integer, primary_key=True, index=True)
user_id = Column(Integer, ForeignKey("users.id")) # NEW
topic = Column(String)
Comment on lines 9 to 11
difficulty = Column(String)
score = Column(Integer)
total = Column(Integer)
percentage = Column(Float)


class User(Base):
__tablename__ = "users"

Expand All @@ -21,10 +24,19 @@ class User(Base):
password = Column(String)


class UserSession(Base):
__tablename__ = "sessions"

id = Column(Integer, primary_key=True, index=True)
session_id = Column(String, unique=True, index=True)
user_id = Column(Integer, ForeignKey("users.id"))
created_at = Column(DateTime, default=datetime.utcnow)
Comment on lines +30 to +33


class ChatHistory(Base):
__tablename__ = "chat_history"

id = Column(Integer, primary_key=True)
user_id = Column(Integer)
user_id = Column(Integer, ForeignKey("users.id")) # Better than plain Integer
question = Column(String)
answer = Column(String)
84 changes: 81 additions & 3 deletions main.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from fastapi import FastAPI,UploadFile,File,Depends,HTTPException
from fastapi import FastAPI,UploadFile,File,Depends,HTTPException,Response,Cookie

from rag.loader import load_pdf
from rag.splitter import split_documents
Expand All @@ -7,13 +7,13 @@
from rag.chatbot import ask_rag
from rag.quiz_generator import generate_quiz,evaluate_quiz

from schemas import ChatRequest,ChatResponse,QuizRequest,QuizSubmission,QuizStore
from schemas import ChatRequest,ChatResponse,QuizRequest,QuizSubmission,QuizStore,UserLogin
from fastapi.middleware.cors import CORSMiddleware
from pydantic import BaseModel
from ml import difficulty,classifier

from db.database import engine,Base,SessionLocal
from db.models import QuizResult
from db.models import QuizResult, User, UserSession
from sqlalchemy.orm import Session
from analytics import get_analytics,analyze_topics,recommend_topics
import os
Expand Down Expand Up @@ -52,6 +52,84 @@ def home():
"message":"StudyMate Running"
}


@app.post("/login")
def login(
request: UserLogin,
response: Response,
db: Session = Depends(get_db)
):
Comment on lines +56 to +61

# Find user
user = db.query(User).filter(
User.email == request.email
).first()

if user is None:
raise HTTPException(
status_code=401,
detail="Invalid email or password"
)

# Verify password
if user.password != request.password:
raise HTTPException(
status_code=401,
detail="Invalid email or password"
)
Comment on lines +74 to +79

# Generate session id
session_id = str(uuid.uuid4())

# Store session in database
session = UserSession(
session_id=session_id,
user_id=user.id
)

db.add(session)
db.commit()

# Send session id as cookie
response.set_cookie(
key="session_id",
value=session_id,
httponly=True,
samesite="lax"
)
Comment on lines +94 to +99

return {
"message": "Login Successful"
}


@app.post("/logout")
def logout(
response: Response,
session_id: str = Cookie(None),
db: Session = Depends(get_db)
):
if session_id is None:
raise HTTPException(
status_code=401,
detail="No active session"
)

session = db.query(UserSession).filter(
UserSession.session_id == session_id
).first()

if session:
db.delete(session)
db.commit()

response.delete_cookie("session_id")

return {
"message": "Logout Successful"
}


@app.post("/upload")
async def upload_pdf(
file: UploadFile = File(...)
Expand Down
20 changes: 10 additions & 10 deletions schemas.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
from pydantic import BaseModel
from pydantic import BaseModel, EmailStr

# Chat

class ChatRequest(BaseModel):
question: str

class ChatResponse(BaseModel):
answer: str

# Quiz

class QuizRequest(BaseModel):
topic: str
difficulty: str
Expand All @@ -15,23 +19,19 @@ class QuizSubmission(BaseModel):
questions: list
answers: list


class QuizStore(BaseModel):
topic: str
difficulty: str
score: int
total: int

#for user login
# User

class UserCreate(BaseModel):
username: str
email: str
email: EmailStr
password: str

class UserLogin(BaseModel):
email: str
password: str

class Token(BaseModel):
access_token: str
token_type: str
email: EmailStr
password: str
Loading