Merge branch 'main' into client-dev

ai_server/ai_server/settings.py

@@ -40,6 +40,7 @@
     "rest_framework",
     "corsheaders",
     "chat",
+    "toxicity", 
 ]
 
 MIDDLEWARE = [
@@ -126,4 +127,7 @@
 
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
-CORS_ORIGIN_ALLOW_ALL = True
+CORS_ALLOWED_ORIGINS = [
+    "http://localhost:4000",
+    "https://thalia.vercel.app",  
+]

ai_server/ai_server/urls.py

@@ -19,7 +19,8 @@
 
 urlpatterns = [
     # path("admin/", admin.site.urls),
-    path("", include("chat.urls"))
+    path("chat", include("chat.urls")),
+    path("toxic", include("toxicity.urls")),
 ]
 
 handler404 = "utils.exception_handler.error_404"

ai_server/chat/llm_call.py

@@ -5,26 +5,41 @@
 from langchain_core.output_parsers import StrOutputParser
 from .prompt import PROMPT
 
-def call(input: str) -> Dict[str, Union[bool, str]]:
-    if "OPENAI_API_KEY" not in os.environ:
+def call(user_input: str) -> Dict[str, Union[bool, str]]:
+    """
+    Calls the OpenAI Chat API to generate a response.
+
+    Args:
+        user_input (str): The input text to generate a response for.
+
+    Returns:
+        Dict[str, Union[bool, str]]: A dictionary containing the success status and the generated response.
+    """
+    if "OPENAI_API_KEY" not in os.environ or not os.environ["OPENAI_API_KEY"]:
         return {
             "success": False,
-            "message": "OpenAI API key not found",
-            }
+            "message": "OpenAI API key not found or empty",
+        }
 
     prompt = ChatPromptTemplate.from_template(PROMPT)
     model = ChatOpenAI(temperature=0)
-    chain  = prompt | model | StrOutputParser()
-
-    response:str = chain.invoke({"prompt": input})
+    chain = prompt | model | StrOutputParser()
 
+    try:
+        response: str = chain.invoke({"prompt": user_input})
+    except Exception as e:
+        return {
+            "success": False,
+            "message": f"Error in generation: {str(e)}",
+        }
+
     if not response:
         return {
             "success": False,
             "message": "Error in generation",
-            }
+        }
 
     return {
         "success": True,
         "message": response,
-        }
+    }

ai_server/chat/urls.py

@@ -2,6 +2,5 @@
 from . import views
 
 urlpatterns = [
-    path("", views.home, name="home"),
-    path('chat', views.index, name="routes"),
+    path("", views.index, name="chat"),
 ]

ai_server/chat/views.py

@@ -4,13 +4,6 @@
 from rest_framework import status
 from .llm_call import call as llm_call
 
-@api_view(["GET", "POST"])
-def home(request):
-    return Response(
-        {"success":True ,"message":"connected successfully"},
-        status=status.HTTP_200_OK
-        )
-
 @api_view(["POST"])
 def index(request):
     content: dict = request.data

ai_server/toxicity/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

ai_server/toxicity/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class ToxicityConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "toxicity"

ai_server/toxicity/hf_call.py

@@ -0,0 +1,57 @@
+from typing import Dict, Union, List
+import requests
+import os
+
+RESPONSE_TYPE = Dict[str, Union[str, float]]
+
+
+def _transform_response(response: List[List[RESPONSE_TYPE]]) -> RESPONSE_TYPE:
+    """
+    Transforms the response from the API call.
+
+    Args:
+        response (List[List[RESPONSE_TYPE]]): The response from the API call.
+
+    Returns:
+        RESPONSE_TYPE: The transformed response.
+    """
+    if response[0][0]["score"] > response[0][1]["score"]:
+        return response[0][0]
+    return response[0][1]
+
+
+def call(text: str) -> RESPONSE_TYPE:
+    """
+    Calls the Hugging Face API to classify toxic comments.
+
+    Args:
+        text (str): The text to classify.
+
+    Returns:
+        RESPONSE_TYPE: The response from the API.
+    """
+    if "HF_TOKEN" not in os.environ or not os.environ["HF_TOKEN"]:
+        return {
+            "success": False,
+            "message": "Huggingface Token not found or empty",
+        }
+
+    HF_TOKEN = os.environ["HF_TOKEN"]
+    headers = {"Authorization": f"Bearer {HF_TOKEN}"}
+    api_url = (
+        "https://api-inference.huggingface.co/models/martin-ha/toxic-comment-model"
+    )
+
+    response = requests.post(api_url, headers=headers, json={"inputs": text})
+
+    if response.status_code != 200:
+        return {
+            "success": False,
+            "message": f"API returned status code {response.status_code}",
+        }
+
+    response_data = response.json()
+    transformed_response = _transform_response(response_data)
+    transformed_response["success"] = True
+
+    return transformed_response

ai_server/toxicity/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

ai_server/toxicity/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

ai_server/toxicity/urls.py

@@ -0,0 +1,6 @@
+from django.urls import path
+from . import views
+
+urlpatterns = [
+    path("", views.index, name="toxic"),
+]

ai_server/toxicity/views.py

@@ -0,0 +1,39 @@
+from typing import Dict, Union
+from rest_framework.decorators import api_view
+from rest_framework.response import Response
+from rest_framework import status
+from .hf_call import call as hf_call
+
+@api_view(["POST"])
+def index(request):
+    content: dict = request.data
+    text = content.get("text")
+    if text is None:
+        return Response(
+            {"success": False, "message": "text is required !"},
+            status=status.HTTP_400_BAD_REQUEST,
+        )
+    if not isinstance(text, str):
+        return Response(
+            {"success": False, "message": "text should be str !"},
+            status=status.HTTP_400_BAD_REQUEST,
+        )
+    if not text:
+        return Response(
+            {"success": False, "message": "query should not be empty"},
+            status=status.HTTP_400_BAD_REQUEST,
+        )
+
+    response:Dict[str, Union[bool, str]] = hf_call(text=text)
+
+    if not response["success"]:
+        return Response(
+            response,
+            status=status.HTTP_500_INTERNAL_SERVER_ERROR,
+        )
+
+    return Response(
+        response,
+        status=status.HTTP_200_OK,
+    )
+

client/src/Services/bodyServices.js

@@ -0,0 +1,38 @@
+import thaliaAPI from "../API/thaliaAPI";
+
+export const getTopics = async () => {
+    try {
+        const response = await thaliaAPI.get("/admin/my-body", { withCredentials: true });
+        return response.data;
+    } catch (error) {
+        return error;
+    }
+}
+
+export const addTopic = async (formData) => {
+    try {
+        const response = await thaliaAPI.post("/admin/my-body", formData, { withCredentials: true });
+        return response.data;
+    } catch (error) {
+        return error;
+    }
+}
+
+export const deleteBody = async (bodyId) => {
+    try {
+        const response = await thaliaAPI.delete(`/admin/my-body/${bodyId}`, { withCredentials: true });
+        return response.data;
+    } catch (error) {
+        return error;
+    }
+}
+
+export const editBody = async (formData, bodyId) => {
+    try {
+        const response = await thaliaAPI.put(`/admin/my-body/${bodyId}`, formData);
+        return response.data;
+    } catch (error) {
+        console.log("error=>", error)
+        return error;
+    }
+}

client/src/Services/rightServices.js

@@ -10,8 +10,6 @@ export const createRight = async (rightDetails) => {
 }
 export const editRight = async (rightDetails, rightId) => {
     try {
-        console.log("details", rightDetails)
-        console.log("right id", rightId)
         const response = await thaliaAPI.put(`/admin/rights/${rightId}`, rightDetails, { withCredentials: true });
         return response.data;
     } catch (error) {

client/src/Services/userService.js

@@ -0,0 +1,29 @@
+import thaliaAPI from "../API/thaliaAPI";
+
+export const getUsers = async () => {
+    try {
+        const response = await thaliaAPI.get("/admin/users", { withCredentials: true });
+        return response.data;
+    } catch (error) {
+        return error;
+    }
+}
+
+export const blockUser = async (userId) => {
+    try {
+        const response = await thaliaAPI.put(`/admin/users/block/${userId}`, { withCredentials: true });
+        return response.data;
+    } catch (error) {
+        return error;
+    }
+}
+
+export const unBlockUser = async (userId) => {
+    try {
+        const response = await thaliaAPI.put(`/admin/users/unblock/${userId}`, { withCredentials: true });
+        return response.data;
+    } catch (error) {
+        return error;
+    }
+}
+

client/src/components/AddBody/AddBody.jsx

@@ -1,10 +1,13 @@
 import { useState } from "react";
 import { Modal } from "flowbite-react";
+import { addTopic } from "../../Services/bodyServices";
+import { toast } from "react-toastify";
 
+// eslint-disable-next-line react/prop-types
 function AddBody({ openModal, setOpenModal }) {
   const [formData, setFormData] = useState({
-    body_name: "",
-    body_desc: "",
+    name: "",
+    content: "",
   });
   const handleChange = (e) => {
     const { name, value } = e.target;
@@ -13,6 +16,18 @@ function AddBody({ openModal, setOpenModal }) {
       [name]: value,
     });
   };
+  const handleAdd = () => {
+    const addNew = async () => {
+      const response = await addTopic(formData);
+      if (response.success === true) {
+        formData.name = "";
+        formData.content = "";
+        setOpenModal(false);
+        toast.success(response.message);
+      }
+    };
+    addNew();
+  };
   return (
     <>
       <Modal show={openModal} onClose={() => setOpenModal(false)}>
@@ -25,27 +40,30 @@ function AddBody({ openModal, setOpenModal }) {
               <h1 className="text-white py-2">Name of the Topic</h1>
               <input
                 type="text"
-                className="w-full rounded-md bg-gray-700 text-text"
-                value={formData.body_name}
+                className="w-full rounded-md bg-gray-800 text-text focus:ring-0"
+                value={formData.name}
                 onChange={handleChange}
-                name="body_name"
+                name="name"
               />
             </label>
           </div>
           <div className="w-full mt-3">
             <label htmlFor="">
               <h1 className="text-text py-2">Provide the Topic Description</h1>
               <textarea
-                name="body_desc"
-                value={formData.body_desc}
+                name="content"
+                value={formData.content}
                 onChange={handleChange}
                 id=""
                 rows={8}
-                className="w-full rounded-md bg-gray-700 text-white"
+                className="w-full rounded-md bg-gray-800 text-white focus:ring-0"
               ></textarea>
             </label>
           </div>
-          <button className="text-primary border-2 px-2 py-2 rounded-md float-end">
+          <button
+            className="text-primary border px-5 py-1 rounded-md float-end hover:bg-primary hover:text-background"
+            onClick={handleAdd}
+          >
             Add Topic
           </button>
         </Modal.Body>

client/src/components/AddRight/AddRight.jsx

@@ -68,7 +68,7 @@ function AddRight({ setOpenModal, openModal }) {
             </label>
           </div>
           <button
-            className="text-primary border-2 px-2 py-2 rounded-md float-end"
+            className="text-primary border-2 px-5 py-1 hover:bg-primary hover:text-black rounded-md float-end"
             onClick={handleCreate}
           >
             Add Right