update space

.idea/workspace.xml

@@ -4,7 +4,16 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="27c9ae1a-a6fa-4472-8bcd-a7087620894b" name="Changes" comment="update space" />
+    <list default="true" id="27c9ae1a-a6fa-4472-8bcd-a7087620894b" name="Changes" comment="update space">
+      <change afterPath="$PROJECT_DIR$/backend/app/static/css/chat.css" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/backend/app/static/js/chat.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/backend/app/routes/chat.py" beforeDir="false" afterPath="$PROJECT_DIR$/backend/app/routes/chat.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/backend/app/routes/dashboard.py" beforeDir="false" afterPath="$PROJECT_DIR$/backend/app/routes/dashboard.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/backend/app/static/js/dashboard.js" beforeDir="false" afterPath="$PROJECT_DIR$/backend/app/static/js/dashboard.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/backend/app/templates/chat/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/backend/app/templates/chat/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/requirements.txt" beforeDir="false" afterPath="$PROJECT_DIR$/requirements.txt" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -14,10 +23,10 @@
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Dockerfile" />
-        <option value="JavaScript File" />
-        <option value="CSS File" />
         <option value="HTML File" />
         <option value="Python Script" />
+        <option value="CSS File" />
+        <option value="JavaScript File" />
       </list>
     </option>
   </component>
@@ -38,25 +47,25 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;DefaultHtmlFileTemplate&quot;: &quot;HTML File&quot;,
-    &quot;FastAPI.Unnamed.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
-    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/git/Generative_AI_with_poultry_disease_detection_system_v2/models&quot;,
-    &quot;list.type.of.created.stylesheet&quot;: &quot;CSS&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;swagger&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "DefaultHtmlFileTemplate": "HTML File",
+    "FastAPI.Unnamed.executor": "Run",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "git-widget-placeholder": "main",
+    "ignore.virus.scanning.warn.message": "true",
+    "last_opened_file_path": "C:/git/poultry/Generative_AI_with_poultry_disease_detection_system_v2/backend/app/main.py",
+    "list.type.of.created.stylesheet": "CSS",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "swagger",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\git\Generative_AI_with_poultry_disease_detection_system_v2\models" />
@@ -75,14 +84,14 @@
   </component>
   <component name="RunManager">
     <configuration name="Unnamed" type="Python.FastAPI" nameIsGenerated="true">
-      <option name="file" value="C:\git\Generative_AI_with_poultry_disease_detection_system_v2\app.py" />
+      <option name="file" value="C:\git\poultry\Generative_AI_with_poultry_disease_detection_system_v2\backend\app\main.py" />
       <module name="Generative_AI_with_poultry_disease_detection_system_v2" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="$PROJECT_DIR$/.venv/Scripts/python.exe" />
+      <option name="SDK_HOME" value="" />
       <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
+      <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
@@ -125,14 +134,6 @@
       <workItem from="1730454506390" duration="12672000" />
       <workItem from="1730494385249" duration="17097000" />
     </task>
-    <task id="LOCAL-00104" summary="update space">
-      <option name="closed" value="true" />
-      <created>1730471112648</created>
-      <option name="number" value="00104" />
-      <option name="presentableId" value="LOCAL-00104" />
-      <option name="project" value="LOCAL" />
-      <updated>1730471112648</updated>
-    </task>
     <task id="LOCAL-00105" summary="update space">
       <option name="closed" value="true" />
       <created>1730471205719</created>
@@ -517,7 +518,15 @@
       <option name="project" value="LOCAL" />
       <updated>1731737347454</updated>
     </task>
-    <option name="localTasksCounter" value="153" />
+    <task id="LOCAL-00153" summary="update space">
+      <option name="closed" value="true" />
+      <created>1731738406662</created>
+      <option name="number" value="00153" />
+      <option name="presentableId" value="LOCAL-00153" />
+      <option name="project" value="LOCAL" />
+      <updated>1731738406662</updated>
+    </task>
+    <option name="localTasksCounter" value="154" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -541,6 +550,6 @@
     <option name="LAST_COMMIT_MESSAGE" value="update space" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/Generative_AI_with_poultry_disease_detection_system_v2$Unnamed.coverage" NAME="Unnamed Coverage Results" MODIFIED="1730337647536" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
+    <SUITE FILE_PATH="coverage/Generative_AI_with_poultry_disease_detection_system_v2$Unnamed.coverage" NAME="Unnamed Coverage Results" MODIFIED="1731741961150" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
   </component>
 </project>

backend/app/routes/chat.py

@@ -18,24 +18,22 @@ async def chat_with_ai(message: str, current_user: dict = Depends(get_current_us
     Process user messages using Llama-3.2 and return a response.
     """
     try:
-        user_id = ObjectId(current_user["_id"])
-        session_id = ObjectId()
+        user_id = ObjectId(current_user["user_id"])
 
         # Retrieve the latest chat session for context
         chat_session = db.chat_histories.find_one({"user_id": user_id}, sort=[("updated_at", -1)])
-        session_id = chat_session["session_id"] if chat_session else session_id
+        session_id = chat_session["session_id"] if chat_session else ObjectId()
 
         # Process the message with Llama-3.2
-        response = process_message(user_id, session_id, message)
+        response = process_message(message, chat_session["messages"] if chat_session else [])
 
         # Save the chat to history
         chat_entry = {
-            "user_id": user_id,
-            "session_id": session_id,
             "user_message": message,
             "assistant_response": response,
             "timestamp": datetime.now(timezone.utc)
         }
+
         db.chat_histories.update_one(
             {"user_id": user_id, "session_id": session_id},
             {"$push": {"messages": chat_entry}, "$set": {"updated_at": datetime.now(timezone.utc)}},
@@ -44,25 +42,29 @@ async def chat_with_ai(message: str, current_user: dict = Depends(get_current_us
 
         return {"response": response}
     except Exception as e:
-        raise HTTPException(status_code=500, detail="Error processing message.")
+        raise HTTPException(status_code=500, detail=f"Error processing message: {str(e)}")
 
 
+# routes/chat.py
+
 @router.post("/upload")
 async def upload_image(file: UploadFile = File(...), current_user: dict = Depends(get_current_user)):
     """
     Upload an image for disease detection and return the analysis result.
     """
     try:
+        user_id = ObjectId(current_user["user_id"])
+
         # Read and analyze the image
         file_bytes = await file.read()
         analysis_result = detect_disease(file_bytes)
 
-        if analysis_result["name"] == "Unknown Image":
+        if analysis_result.get("name") == "Unknown Image":
             raise HTTPException(status_code=400, detail="Invalid image format.")
 
         # Save the analysis result to the database
         analysis_entry = {
-            "user_id": ObjectId(current_user["_id"]),
+            "user_id": user_id,
             "file_name": file.filename,
             "analysis_result": analysis_result,
             "timestamp": datetime.now(timezone.utc)
@@ -71,8 +73,7 @@ async def upload_image(file: UploadFile = File(...), current_user: dict = Depend
 
         return {"analysis_result": analysis_result}
     except Exception as e:
-        raise HTTPException(status_code=500, detail="Error analyzing image.")
-
+        raise HTTPException(status_code=500, detail=f"Error analyzing image: {str(e)}")
 
 @router.get("/history")
 async def get_chat_history(current_user: dict = Depends(get_current_user)):
@@ -80,25 +81,30 @@ async def get_chat_history(current_user: dict = Depends(get_current_user)):
     Retrieve previous chat history for the logged-in user.
     """
     try:
-        user_id = ObjectId(current_user["_id"])
+        user_id = ObjectId(current_user["user_id"])
         history = list(db.chat_histories.find({"user_id": user_id}).sort("updated_at", -1))
 
         # Convert ObjectId to string for JSON serialization
+        formatted_history = []
         for chat in history:
-            chat["_id"] = str(chat["_id"])
-            chat["session_id"] = str(chat["session_id"])
-            chat["messages"] = [
-                {
-                    "user_message": msg["user_message"],
-                    "assistant_response": msg["assistant_response"],
-                    "timestamp": msg["timestamp"].isoformat()
-                }
-                for msg in chat["messages"]
-            ]
-
-        return history
+            formatted_chat = {
+                "_id": str(chat["_id"]),
+                "session_id": str(chat["session_id"]),
+                "updated_at": chat["updated_at"].isoformat(),
+                "messages": [
+                    {
+                        "user_message": msg["user_message"],
+                        "assistant_response": msg["assistant_response"],
+                        "timestamp": msg["timestamp"].isoformat()
+                    }
+                    for msg in chat["messages"]
+                ]
+            }
+            formatted_history.append(formatted_chat)
+
+        return formatted_history
     except Exception as e:
-        raise HTTPException(status_code=500, detail="Error retrieving chat history.")
+        raise HTTPException(status_code=500, detail=f"Error retrieving chat history: {str(e)}")
 
 
 @router.post("/new")
@@ -107,10 +113,9 @@ async def start_new_chat(current_user: dict = Depends(get_current_user)):
     Start a new chat session by clearing context.
     """
     try:
-        # Create a new session entry without history
         session_id = ObjectId()
         db.chat_histories.insert_one({
-            "user_id": ObjectId(current_user["_id"]),
+            "user_id": ObjectId(current_user["user_id"]),
             "session_id": session_id,
             "messages": [],
             "created_at": datetime.now(timezone.utc),
@@ -119,4 +124,4 @@ async def start_new_chat(current_user: dict = Depends(get_current_user)):
 
         return {"message": "New chat started. Previous context cleared.", "session_id": str(session_id)}
     except Exception as e:
-        raise HTTPException(status_code=500, detail="Error starting new chat.")
+        raise HTTPException(status_code=500, detail=f"Error starting new chat: {str(e)}")

backend/app/routes/dashboard.py

@@ -1,16 +1,64 @@
-# backend/app/routes/dashboard.py
-
-from datetime import datetime
+from datetime import datetime, timezone
 import logging
+from bson import ObjectId
 from fastapi import APIRouter, Depends, HTTPException
 from backend.app.config.database import get_database
 from backend.app.middleware.auth_middleware import get_current_user
+from backend.app.schemas.task_schema import TaskSchema
 
 # Initialize router and logger
 router = APIRouter()
 db = get_database()
 logger = logging.getLogger(__name__)
 
+def parse_datetime(date):
+    """
+    Parse a date field into ISO format. If it's already a string, return it.
+    If it's None, return a default value.
+    """
+    if isinstance(date, str):
+        try:
+            # Attempt to parse the string as a datetime
+            parsed_date = datetime.fromisoformat(date)
+            return parsed_date.astimezone(timezone.utc).isoformat()
+        except ValueError:
+            return date  # Return the original string if parsing fails
+    elif isinstance(date, datetime):
+        return date.astimezone(timezone.utc).isoformat()
+    else:
+        return datetime.now(timezone.utc).isoformat()  # Default to now if no valid date
+
+
+def format_health_records(records_cursor):
+    """
+    Format health records for response.
+    """
+    return [
+        {
+            "_id": str(record["_id"]),
+            "disease_type": record.get("disease_type", "N/A"),
+            "diagnosis_date": parse_datetime(record.get("diagnosis_date"))
+        }
+        for record in records_cursor
+    ]
+
+
+def format_tasks(tasks_cursor):
+    """
+    Format tasks for response using TaskSchema.
+    """
+    return [
+        TaskSchema(
+            id=task["_id"],
+            task_description=task.get("task_description", "N/A"),
+            assigned_to=task.get("assigned_to"),
+            status=task.get("status", "pending"),
+            created_at=task.get("created_at"),
+            due_date=task.get("due_date")
+        ).model_dump(by_alias=True)
+        for task in tasks_cursor
+    ]
+
 
 @router.get("/data")
 async def get_dashboard_data(current_user: dict = Depends(get_current_user)):
@@ -27,7 +75,11 @@ async def get_dashboard_data(current_user: dict = Depends(get_current_user)):
 
         # Fetch user details
         user_role = current_user.get("role")
-        user_farm_id = current_user.get("farm_id")
+        user_farm_id = ObjectId(current_user["farm_id"])
+        user_id = ObjectId(current_user["user_id"])
+        logger.debug("User ID: %s", user_id)
+        logger.debug("User Role: %s", user_role)
+        logger.debug("Farm ID: %s", user_farm_id)
 
         # Initialize response data
         response_data = {
@@ -38,60 +90,33 @@ async def get_dashboard_data(current_user: dict = Depends(get_current_user)):
             "recentHealthRecords": []
         }
 
-        # Fetch data based on user role
+        # Fetch counts and recent data based on user role
         if user_role == "admin":
-            response_data["tasksCount"] = db.tasks.count_documents({"created_by": current_user["user_id"]})
+            response_data["tasksCount"] = db.tasks.count_documents({})
             response_data["inventoryCount"] = db.inventory.count_documents({"farm_id": user_farm_id})
             response_data["healthRecordsCount"] = db.health_records.count_documents({"farm_id": user_farm_id})
 
-            # Recent tasks and health records (admin)
-            response_data["recentTasks"] = list(
-                db.tasks.find({"created_by": current_user["user_id"]})
-                .sort("created_at", -1)
-                .limit(5)
-            )
-            response_data["recentHealthRecords"] = list(
-                db.health_records.find({"farm_id": user_farm_id})
-                .sort("diagnosis_date", -1)
-                .limit(5)
-            )
+            # Fetch and format recent tasks and health records
+            recent_tasks_cursor = db.tasks.find({}).sort("created_at", -1).limit(5)
+            response_data["recentTasks"] = format_tasks(recent_tasks_cursor)
+
+            recent_health_records_cursor = db.health_records.find({"farm_id": user_farm_id}).sort("diagnosis_date", -1).limit(5)
+            response_data["recentHealthRecords"] = format_health_records(recent_health_records_cursor)
 
         elif user_role == "farmer":
-            response_data["tasksCount"] = db.tasks.count_documents({"assigned_to": current_user["user_id"]})
+            response_data["tasksCount"] = db.tasks.count_documents({"assigned_to": user_id})
             response_data["healthRecordsCount"] = db.health_records.count_documents({"farm_id": user_farm_id})
 
-            # Recent tasks and health records (farmer)
-            response_data["recentTasks"] = list(
-                db.tasks.find({"assigned_to": current_user["user_id"]})
-                .sort("created_at", -1)
-                .limit(5)
-            )
-            response_data["recentHealthRecords"] = list(
-                db.health_records.find({"farm_id": user_farm_id})
-                .sort("diagnosis_date", -1)
-                .limit(5)
-            )
-
-        # Convert MongoDB ObjectId to strings and ensure datetime fields are serialized correctly
-        for task in response_data["recentTasks"]:
-            task["_id"] = str(task["_id"])
-            # Safely handle due_date
-            if isinstance(task.get("due_date"), datetime):
-                task["due_date"] = task["due_date"].isoformat()
-            else:
-                task["due_date"] = task.get("due_date", "N/A")
-
-        for record in response_data["recentHealthRecords"]:
-            record["_id"] = str(record["_id"])
-            # Safely handle diagnosis_date
-            if isinstance(record.get("diagnosis_date"), datetime):
-                record["diagnosis_date"] = record["diagnosis_date"].isoformat()
-            else:
-                record["diagnosis_date"] = record.get("diagnosis_date", "N/A")
+            # Fetch and format recent tasks and health records
+            recent_tasks_cursor = db.tasks.find({"assigned_to": user_id}).sort("created_at", -1).limit(5)
+            response_data["recentTasks"] = format_tasks(recent_tasks_cursor)
+
+            recent_health_records_cursor = db.health_records.find({"farm_id": user_farm_id}).sort("diagnosis_date", -1).limit(5)
+            response_data["recentHealthRecords"] = format_health_records(recent_health_records_cursor)
 
         logger.info("Dashboard data fetched successfully for user: %s", current_user["email"])
         return response_data
 
     except Exception as e:
-        logger.error("Error fetching dashboard data: %s", str(e))
+        logger.error("Error fetching dashboard data: %s", str(e), exc_info=True)
         raise HTTPException(status_code=500, detail="Internal server error")

backend/app/static/css/chat.css

@@ -0,0 +1,324 @@
+/* General Reset */
+
+body {
+    margin: 0;
+    font-family: Arial, sans-serif;
+    background-color: #f7f8fc;
+    display: flex;
+    height: 100vh;
+    overflow: hidden;
+}
+
+.chatgpt-clone {
+    display: flex;
+    width: 100%;
+    height: 100%;
+}
+
+/* Sidebar Styling */
+.chat-sidebar {
+    width: 25%;
+    background-color: #2c2c54;
+    color: white;
+    display: flex;
+    flex-direction: column;
+    padding: 20px;
+    overflow-y: auto;
+}
+
+.chat-sidebar h2 {
+    margin-top: 0;
+    font-size: 20px;
+    border-bottom: 1px solid #4e4e8f;
+    padding-bottom: 10px;
+}
+
+.chat-sidebar ul {
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+    flex: 1;
+    overflow-y: auto;
+}
+
+.chat-sidebar ul li {
+    padding: 10px;
+    margin: 5px 0;
+    background-color: #393975;
+    border-radius: 5px;
+    cursor: pointer;
+    transition: background-color 0.3s;
+}
+
+.chat-sidebar ul li:hover {
+    background-color: #5050a5;
+}
+
+.new-chat-button {
+    padding: 10px;
+    background-color: #5050a5;
+    border: none;
+    color: white;
+    border-radius: 5px;
+    cursor: pointer;
+    font-size: 16px;
+    margin-top: 10px;
+}
+
+.new-chat-button:hover {
+    background-color: #7070c0;
+}
+
+/* Main Chat Interface */
+.chat-main {
+    width: 75%;
+    display: flex;
+    flex-direction: column;
+    background-color: #ffffff;
+}
+
+.chat-header {
+    background-color: #f7f8fc;
+    padding: 20px;
+    border-bottom: 1px solid #e2e2e2;
+}
+
+.chat-header h1 {
+    margin: 0;
+    font-size: 22px;
+    color: #2c2c54;
+}
+
+.chat-window {
+    flex: 1;
+    overflow-y: auto;
+    padding: 20px;
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+    background-color: #f5f5f5;
+}
+
+.chat-bubble {
+    max-width: 70%;
+    padding: 15px;
+    border-radius: 15px;
+    word-wrap: break-word;
+    box-shadow: 0px 4px 6px rgba(0, 0, 0, 0.1);
+}
+
+.user-message {
+    align-self: flex-end;
+    background-color: #3b82f6;
+    color: white;
+    border-bottom-right-radius: 0;
+}
+
+.bot-response {
+    align-self: flex-start;
+    background-color: #e2e8f0;
+    color: #2c2c54;
+    border-bottom-left-radius: 0;
+}
+
+.chat-footer {
+    padding: 10px 20px;
+    background-color: #f7f8fc;
+    display: flex;
+    align-items: center;
+    border-top: 1px solid #e2e2e2;
+}
+
+textarea#messageInput {
+    flex: 1;
+    resize: none;
+    border: 1px solid #d1d5db;
+    border-radius: 5px;
+    padding: 10px;
+    font-size: 16px;
+}
+
+.send-button {
+    background-color: #3b82f6;
+    color: white;
+    border: none;
+    padding: 10px 15px;
+    margin-left: 10px;
+    border-radius: 5px;
+    cursor: pointer;
+}
+
+.send-button i {
+    font-size: 18px;
+}
+
+.send-button:hover {
+    background-color: #2563eb;
+}
+
+/* chat.css */
+
+/* ... Existing styles ... */
+
+/* Attachment Icon */
+.attachment-icon {
+    color: #3b82f6;
+    font-size: 20px;
+    margin-right: 10px;
+    cursor: pointer;
+    align-self: center;
+}
+
+.attachment-icon:hover {
+    color: #2563eb;
+}
+
+/* Loading Indicator */
+.loading-indicator {
+    align-self: center;
+    font-size: 24px;
+    color: #999;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.loading-indicator img {
+    width: 40px;
+    height: 40px;
+}
+
+/* Chat Image */
+.chat-image {
+    max-width: 100%;
+    height: auto;
+    border-radius: 5px;
+}
+/* chat.css */
+
+/* Chat Interface Layout */
+.chat-interface {
+    display: flex;
+    height: 100vh;
+    overflow: hidden;
+}
+
+.chat-sidebar {
+    width: 25%;
+    background: #f4f4f4;
+    border-right: 1px solid #ddd;
+    overflow-y: auto;
+    padding: 15px;
+}
+
+.chat-sidebar h2 {
+    margin-bottom: 15px;
+}
+
+.chat-sidebar ul {
+    list-style: none;
+    padding: 0;
+}
+
+.chat-sidebar ul li {
+    padding: 10px;
+    background: #fff;
+    border: 1px solid #ddd;
+    margin-bottom: 10px;
+    cursor: pointer;
+    border-radius: 5px;
+}
+
+.chat-sidebar ul li:hover {
+    background: #e9ecef;
+}
+
+/* Chat Main Section */
+.chat-main {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+}
+
+.chat-header {
+    background: #007bff;
+    color: #fff;
+    padding: 10px;
+    text-align: center;
+    font-size: 18px;
+}
+
+.chat-window {
+    flex: 1;
+    overflow-y: auto;
+    padding: 15px;
+    display: flex;
+    flex-direction: column-reverse;
+    background: #f9f9f9;
+}
+
+/* Chat Footer */
+.chat-footer {
+    display: flex;
+    align-items: center;
+    padding: 10px;
+    background: #f1f1f1;
+    border-top: 1px solid #ddd;
+}
+
+.chat-footer textarea {
+    flex: 1;
+    height: 40px;
+    padding: 10px;
+    border: 1px solid #ddd;
+    border-radius: 5px;
+    margin-right: 10px;
+}
+
+.chat-footer .send-button {
+    background: #007bff;
+    color: #fff;
+    border: none;
+    padding: 10px 15px;
+    border-radius: 5px;
+    cursor: pointer;
+}
+
+.chat-footer .send-button:hover {
+    background: #0056b3;
+}
+
+.chat-footer .attachment-icon {
+    font-size: 18px;
+    margin-right: 10px;
+    cursor: pointer;
+}
+
+/* Chat Bubbles */
+.chat-bubble {
+    max-width: 70%;
+    margin: 10px 0;
+    padding: 10px 15px;
+    border-radius: 10px;
+    position: relative;
+}
+
+.user-message {
+    background: #007bff;
+    color: #fff;
+    align-self: flex-end;
+    border-bottom-right-radius: 0;
+}
+
+.bot-response {
+    background: #e9ecef;
+    align-self: flex-start;
+    border-bottom-left-radius: 0;
+}
+
+/* Chat Image */
+.chat-image {
+    max-width: 100%;
+    border-radius: 5px;
+}
+

backend/app/static/js/chat.js

@@ -0,0 +1,110 @@
+// chat.js
+
+// Fetch chat history and populate the sidebar
+async function fetchChatHistory() {
+    try {
+        const response = await fetch("/chat/history", {
+            method: "GET",
+            headers: { "Authorization": "Bearer " + sessionStorage.getItem("access_token") }
+        });
+
+        if (!response.ok) throw new Error("Failed to fetch chat history.");
+
+        const history = await response.json();
+        const historyList = document.getElementById("chatHistoryList");
+        historyList.innerHTML = "";
+
+        history.forEach(session => {
+            const listItem = document.createElement("li");
+            listItem.textContent = `Chat started at ${new Date(session.created_at).toLocaleString()}`;
+            listItem.dataset.sessionId = session.session_id;
+            listItem.onclick = () => loadChatSession(session.session_id);
+            historyList.appendChild(listItem);
+        });
+    } catch (error) {
+        console.error("Error fetching chat history:", error);
+    }
+}
+
+// Load a specific chat session
+async function loadChatSession(sessionId) {
+    try {
+        const response = await fetch(`/chat/history/${sessionId}`, {
+            method: "GET",
+            headers: { "Authorization": "Bearer " + sessionStorage.getItem("access_token") }
+        });
+
+        if (!response.ok) throw new Error("Failed to load chat session.");
+
+        const session = await response.json();
+        const chatWindow = document.getElementById("chatWindow");
+        chatWindow.innerHTML = "";
+
+        session.messages.forEach(msg => {
+            addMessageToChatWindow(msg.user_message, "user-message");
+            addMessageToChatWindow(msg.assistant_response, "bot-response");
+        });
+    } catch (error) {
+        console.error("Error loading chat session:", error);
+    }
+}
+
+// Send a new message
+async function sendMessage(event) {
+    event.preventDefault();
+    const messageInput = document.getElementById("messageInput");
+    const message = messageInput.value.trim();
+    if (!message) return;
+
+    addMessageToChatWindow(message, "user-message");
+    messageInput.value = "";
+
+    const loadingIndicator = addLoadingIndicator();
+
+    try {
+        const response = await fetch("/chat", {
+            method: "POST",
+            headers: { "Content-Type": "application/json", "Authorization": "Bearer " + sessionStorage.getItem("access_token") },
+            body: JSON.stringify({ message })
+        });
+
+        if (!response.ok) throw new Error("Failed to fetch AI response.");
+
+        const data = await response.json();
+        removeLoadingIndicator(loadingIndicator);
+        addMessageToChatWindow(data.response, "bot-response");
+    } catch (error) {
+        console.error("Error sending message:", error);
+        removeLoadingIndicator(loadingIndicator);
+        addMessageToChatWindow("An error occurred while processing your message.", "bot-response");
+    }
+}
+
+// Add message to chat window
+function addMessageToChatWindow(content, className) {
+    const chatWindow = document.getElementById("chatWindow");
+    const bubble = document.createElement("div");
+    bubble.className = `chat-bubble ${className}`;
+    bubble.textContent = content;
+    chatWindow.prepend(bubble);
+}
+
+// Add loading indicator
+function addLoadingIndicator() {
+    const chatWindow = document.getElementById("chatWindow");
+    const indicator = document.createElement("div");
+    indicator.className = "loading-indicator";
+    indicator.textContent = "Typing...";
+    chatWindow.prepend(indicator);
+    return indicator;
+}
+
+// Remove loading indicator
+function removeLoadingIndicator(indicator) {
+    indicator.remove();
+}
+
+// Initialize chat on page load
+document.addEventListener("DOMContentLoaded", () => {
+    fetchChatHistory();
+});

backend/app/static/js/dashboard.js

@@ -1,20 +1,47 @@
 async function loadDashboardData() {
+    /**
+     * Fetch and load dashboard data including tasks, inventory count, and health records.
+     */
     const token = sessionStorage.getItem('access_token');
     if (!token) {
-        window.location.href = "/login";
+        window.location.href = "/login"; // Redirect to login if token is missing
         return;
     }
 
     try {
         const response = await fetch('/dashboard/data', {
-            headers: {'Authorization': 'Bearer ' + token}
+            headers: { 'Authorization': 'Bearer ' + token }
         });
 
         if (response.ok) {
             const data = await response.json();
-            document.getElementById('recentTasks').innerHTML = data.recentTasks.map(task => `<li>${task.description}</li>`).join('');
-            document.getElementById('inventoryCount').innerText = data.inventoryCount;
-            document.getElementById('healthRecordsCount').innerText = data.healthRecordsCount;
+
+            // Update Statistics Section
+            document.getElementById('tasksCount').innerText = data.tasksCount || 0;
+            document.getElementById('inventoryCount').innerText = data.inventoryCount || 0;
+            document.getElementById('healthRecordsCount').innerText = data.healthRecordsCount || 0;
+
+            // Update Recent Tasks Section
+            const recentTasks = data.recentTasks || [];
+            document.getElementById('recentTasks').innerHTML = recentTasks.length
+                ? recentTasks.map(task => `
+                    <li class="list-group-item">
+                        ${task.description} 
+                        (Due: ${new Date(task.due_date).toLocaleDateString()})
+                    </li>
+                `).join('')
+                : '<li class="list-group-item">No recent tasks available.</li>';
+
+            // Update Recent Health Records Section
+            const recentHealthRecords = data.recentHealthRecords || [];
+            document.getElementById('recentHealthRecords').innerHTML = recentHealthRecords.length
+                ? recentHealthRecords.map(record => `
+                    <li class="list-group-item">
+                        ${record.disease_type} 
+                        (Logged: ${new Date(record.diagnosis_date).toLocaleDateString()})
+                    </li>
+                `).join('')
+                : '<li class="list-group-item">No recent health records available.</li>';
         } else {
             console.error("Error fetching dashboard data:", response.statusText);
         }
@@ -23,4 +50,5 @@ async function loadDashboardData() {
     }
 }
 
+// Load dashboard data when the DOM is fully loaded
 document.addEventListener("DOMContentLoaded", loadDashboardData);

backend/app/templates/chat/index.html

@@ -3,279 +3,47 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>AI Chat</title>
-
+    <title>ChatGPT Clone</title>
+    <link rel="stylesheet" href="/static/css/chat.css">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
-    <style>
-        /* General Reset */
-
-        body {
-            margin: 0;
-            font-family: Arial, sans-serif;
-            background-color: #f7f8fc;
-            display: flex;
-            height: 100vh;
-            overflow: hidden;
-        }
-
-        .chatgpt-clone {
-            display: flex;
-            width: 100%;
-            height: 100%;
-        }
-
-        /* Sidebar Styling */
-        .chat-sidebar {
-            width: 25%;
-            background-color: #2c2c54;
-            color: white;
-            display: flex;
-            flex-direction: column;
-            padding: 20px;
-            overflow-y: auto;
-        }
-
-        .chat-sidebar h2 {
-            margin-top: 0;
-            font-size: 20px;
-            border-bottom: 1px solid #4e4e8f;
-            padding-bottom: 10px;
-        }
-
-        .chat-sidebar ul {
-            list-style-type: none;
-            padding: 0;
-            margin: 0;
-            flex: 1;
-            overflow-y: auto;
-        }
-
-        .chat-sidebar ul li {
-            padding: 10px;
-            margin: 5px 0;
-            background-color: #393975;
-            border-radius: 5px;
-            cursor: pointer;
-            transition: background-color 0.3s;
-        }
-
-        .chat-sidebar ul li:hover {
-            background-color: #5050a5;
-        }
-
-        .new-chat-button {
-            padding: 10px;
-            background-color: #5050a5;
-            border: none;
-            color: white;
-            border-radius: 5px;
-            cursor: pointer;
-            font-size: 16px;
-            margin-top: 10px;
-        }
-
-        .new-chat-button:hover {
-            background-color: #7070c0;
-        }
-
-        /* Main Chat Interface */
-        .chat-main {
-            width: 75%;
-            display: flex;
-            flex-direction: column;
-            background-color: #ffffff;
-        }
-
-        .chat-header {
-            background-color: #f7f8fc;
-            padding: 20px;
-            border-bottom: 1px solid #e2e2e2;
-        }
-
-        .chat-header h1 {
-            margin: 0;
-            font-size: 22px;
-            color: #2c2c54;
-        }
-
-        .chat-window {
-            flex: 1;
-            overflow-y: auto;
-            padding: 20px;
-            display: flex;
-            flex-direction: column;
-            gap: 15px;
-            background-color: #f5f5f5;
-        }
-
-        .chat-bubble {
-            max-width: 70%;
-            padding: 15px;
-            border-radius: 15px;
-            word-wrap: break-word;
-            box-shadow: 0px 4px 6px rgba(0, 0, 0, 0.1);
-        }
-
-        .user-message {
-            align-self: flex-end;
-            background-color: #3b82f6;
-            color: white;
-            border-bottom-right-radius: 0;
-        }
-
-        .bot-response {
-            align-self: flex-start;
-            background-color: #e2e8f0;
-            color: #2c2c54;
-            border-bottom-left-radius: 0;
-        }
-
-        .chat-footer {
-            padding: 10px 20px;
-            background-color: #f7f8fc;
-            display: flex;
-            align-items: center;
-            border-top: 1px solid #e2e2e2;
-        }
-
-        textarea#messageInput {
-            flex: 1;
-            resize: none;
-            border: 1px solid #d1d5db;
-            border-radius: 5px;
-            padding: 10px;
-            font-size: 16px;
-        }
-
-        .send-button {
-            background-color: #3b82f6;
-            color: white;
-            border: none;
-            padding: 10px 15px;
-            margin-left: 10px;
-            border-radius: 5px;
-            cursor: pointer;
-        }
-
-        .send-button i {
-            font-size: 18px;
-        }
-
-        .send-button:hover {
-            background-color: #2563eb;
-        }
-    </style>
 </head>
 <body>
-<div class="chatgpt-clone">
-    <!-- Sidebar for Chat History -->
-    <aside class="chat-sidebar">
-        <h2>Chat History</h2>
-        <ul id="chatHistoryList">
-            <!-- Chat history dynamically loaded here -->
-        </ul>
-        <button class="new-chat-button" onclick="startNewChat()">+ New Chat</button>
-    </aside>
-
-    <!-- Main Chat Interface -->
-    <main class="chat-main">
-        <header class="chat-header">
-            <h1>AI Assistant</h1>
-        </header>
-
-        <div class="chat-window" id="chatWindow">
-            <!-- Chat messages dynamically loaded here -->
-        </div>
-
-        <footer class="chat-footer">
+    <div class="chat-interface">
+        <!-- Sidebar for Chat History -->
+        <aside class="chat-sidebar">
+            <h2>Chat History</h2>
+            <ul id="chatHistoryList">
+                <!-- Chat history dynamically loaded here -->
+            </ul>
+        </aside>
+
+        <!-- Main Chat Section -->
+        <main class="chat-main">
+            <header class="chat-header">
+                <h1>AI Assistant</h1>
+            </header>
+
+            <div class="chat-window" id="chatWindow">
+                <!-- Chat bubbles dynamically added here -->
+            </div>
+
+            <footer class="chat-footer">
+                <label for="fileInput" class="attachment-icon">
+                    <i class="fas fa-paperclip"></i>
+                </label>
+                <input type="file" id="fileInput" accept="image/*" style="display: none;" onchange="uploadImage(event)">
                 <textarea
-                        id="messageInput"
-                        placeholder="Type your message..."
-                        onkeydown="if (event.key === 'Enter' && !event.shiftKey) sendMessage(event);"
+                    id="messageInput"
+                    placeholder="Type your message..."
+                    onkeydown="if (event.key === 'Enter' && !event.shiftKey) sendMessage(event);"
                 ></textarea>
-            <button class="send-button" onclick="sendMessage(event)">
-                <i class="fas fa-paper-plane"></i>
-            </button>
-        </footer>
-    </main>
-</div>
-<script>
-    // Fetch chat history and populate the sidebar
-    async function fetchChatHistory() {
-        try {
-            const response = await fetch("/chat/history");
-            if (!response.ok) {
-                throw new Error("Failed to fetch chat history.");
-            }
-
-            const history = await response.json();
-            const historyList = document.getElementById("chatHistoryList");
-            historyList.innerHTML = "";
-
-            history.forEach(chat => {
-                const listItem = document.createElement("li");
-                listItem.textContent = chat.message;
-                listItem.onclick = () => loadChat(chat);
-                historyList.appendChild(listItem);
-            });
-        } catch (error) {
-            console.error("Error fetching chat history:", error);
-        }
-    }
-
-    // Send a new message
-    async function sendMessage(event) {
-        event.preventDefault();
-        const messageInput = document.getElementById("messageInput");
-        const message = messageInput.value.trim();
-
-        if (!message) return;
-
-        // Add user message to the chat window
-        addMessageToChatWindow(message, "user-message");
-
-        try {
-            const response = await fetch("/chat", {
-                method: "POST",
-                headers: {"Content-Type": "application/json"},
-                body: JSON.stringify({message}),
-            });
-
-            const data = await response.json();
-            addMessageToChatWindow(data.response, "bot-response");
-        } catch (error) {
-            console.error("Error sending message:", error);
-        }
-
-        messageInput.value = "";
-    }
-
-    // Add a message to the chat window
-    function addMessageToChatWindow(message, className) {
-        const chatWindow = document.getElementById("chatWindow");
-        const bubble = document.createElement("div");
-        bubble.className = `chat-bubble ${className}`;
-        bubble.textContent = message;
-        chatWindow.appendChild(bubble);
-        chatWindow.scrollTop = chatWindow.scrollHeight;
-    }
-
-    // Start a new chat session
-    async function startNewChat() {
-        try {
-            await fetch("/chat/new", {method: "POST"});
-            const chatWindow = document.getElementById("chatWindow");
-            chatWindow.innerHTML = "";
-        } catch (error) {
-            console.error("Error starting new chat:", error);
-        }
-    }
-
-    // Initialize
-    document.addEventListener("DOMContentLoaded", () => {
-        fetchChatHistory();
-    });
-
-</script>
+                <button class="send-button" onclick="sendMessage(event)">
+                    <i class="fas fa-paper-plane"></i>
+                </button>
+            </footer>
+        </main>
+    </div>
+
+    <script src="/static/js/chat.js"></script>
 </body>
 </html>

requirements.txt

@@ -3,7 +3,7 @@ opencv-python-headless
 fastapi~=0.112.4
 passlib[bcrypt]
 pydantic[email]~=2.9.2
-pymongo~=4.8.0
+pymongo~=4.10.1
 python-dotenv~=1.0.1
 python-jose[cryptography]
 starlette