update space

.idea/workspace.xml

@@ -5,7 +5,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="27c9ae1a-a6fa-4472-8bcd-a7087620894b" name="Changes" comment="update space">
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/models/schemas/health_record_schema.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/services/health_alerts_service.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/templates/health_dashboard.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/routes/administration.py" beforeDir="false" afterPath="$PROJECT_DIR$/routes/administration.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/routes/disease_detection.py" beforeDir="false" afterPath="$PROJECT_DIR$/routes/disease_detection.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -119,15 +124,7 @@
       <workItem from="1730305361670" duration="2425000" />
       <workItem from="1730378091154" duration="2435000" />
       <workItem from="1730381153348" duration="8786000" />
-      <workItem from="1730397485849" duration="8040000" />
-    </task>
-    <task id="LOCAL-00033" summary="update space">
-      <option name="closed" value="true" />
-      <created>1730356036066</created>
-      <option name="number" value="00033" />
-      <option name="presentableId" value="LOCAL-00033" />
-      <option name="project" value="LOCAL" />
-      <updated>1730356036066</updated>
+      <workItem from="1730397485849" duration="9041000" />
     </task>
     <task id="LOCAL-00034" summary="update space">
       <option name="closed" value="true" />
@@ -513,7 +510,15 @@
       <option name="project" value="LOCAL" />
       <updated>1730409232117</updated>
     </task>
-    <option name="localTasksCounter" value="82" />
+    <task id="LOCAL-00082" summary="update space">
+      <option name="closed" value="true" />
+      <created>1730433894107</created>
+      <option name="number" value="00082" />
+      <option name="presentableId" value="LOCAL-00082" />
+      <option name="project" value="LOCAL" />
+      <updated>1730433894107</updated>
+    </task>
+    <option name="localTasksCounter" value="83" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

models/schemas/health_record_schema.py

@@ -0,0 +1,51 @@
+# models/schemas/health_record_schema.py
+
+from pydantic import BaseModel, Field, validator
+from datetime import datetime
+from bson import ObjectId
+from typing import Optional
+
+class PyObjectId(ObjectId):
+    """Custom ObjectId type for Pydantic to enable validation and proper MongoDB support."""
+    @classmethod
+    def __get_validators__(cls):
+        yield cls.validate
+
+    @classmethod
+    def validate(cls, value):
+        if not ObjectId.is_valid(value):
+            raise ValueError("Invalid ObjectId format")
+        return ObjectId(value)
+
+class HealthRecord(BaseModel):
+    id: PyObjectId = Field(default_factory=PyObjectId, alias="_id")
+    bird_id: str = Field(..., description="Unique identifier for a specific bird or batch of birds")
+    date: datetime = Field(default_factory=datetime.utcnow, description="Timestamp of the health record entry")
+    weight: float = Field(..., gt=0, description="Weight measurement in kilograms")
+    mortality_rate: float = Field(..., ge=0, le=100, description="Mortality rate as a percentage")
+    feed_intake: float = Field(..., ge=0, description="Daily feed intake in kilograms")
+    disease_detected: Optional[str] = Field(None, description="Detected disease name, if any")
+    status: str = Field(default="Healthy", description="Health status determined by metrics")
+    treatment_recommendation: Optional[str] = Field(None, description="Suggested treatment based on diagnosis")
+
+    @validator('status')
+    def validate_status(cls, value):
+        allowed_statuses = {"Healthy", "At Risk", "Critical"}
+        if value not in allowed_statuses:
+            raise ValueError(f"Status must be one of {allowed_statuses}")
+        return value
+
+    class Config:
+        json_encoders = {ObjectId: str}
+        schema_extra = {
+            "example": {
+                "bird_id": "batch_123",
+                "date": "2024-11-01T14:30:00Z",
+                "weight": 1.5,
+                "mortality_rate": 2.0,
+                "feed_intake": 0.4,
+                "disease_detected": "Coccidiosis",
+                "status": "Critical",
+                "treatment_recommendation": "Administer anti-coccidial medication and improve hygiene"
+            }
+        }

routes/administration.py

@@ -1,7 +1,8 @@
+# routes/administration.py
+
 import io
 from datetime import datetime
-from typing import Optional, List
-
+from typing import List, Optional
 import pandas as pd
 from bson import ObjectId
 from fastapi import APIRouter, Depends, Request, HTTPException, status
@@ -9,7 +10,6 @@ from fastapi.responses import HTMLResponse, JSONResponse, StreamingResponse, Fil
 from fastapi.templating import Jinja2Templates
 from reportlab.lib.pagesizes import letter
 from reportlab.pdfgen import canvas
-
 from models.schemas.todo_schema import ToDoItem, ToDoCreate, ToDoUpdate
 from services.auth_service import get_current_user, is_admin_user
 from services.health_monitoring_service import evaluate_health_data
@@ -33,11 +33,8 @@ async def health_dashboard(request: Request, current_user: str = Depends(get_cur
     """
     Display health metrics with real-time and historical alerts on the dashboard.
     """
-    current_health_metrics = {
-        "weight_loss_percentage": 4,
-        "mortality_rate": 1,
-        "reduced_feed_intake_percentage": 8
-    }
+    # Retrieve current metrics and alerts
+    current_health_metrics = {"weight_loss_percentage": 4, "mortality_rate": 1, "reduced_feed_intake_percentage": 8}
     real_time_alerts = evaluate_health_data(current_health_metrics).get("notifications", [])
     historical_alerts = list(health_collection.find().sort("timestamp", -1).limit(20))
 
@@ -50,6 +47,15 @@ async def health_dashboard(request: Request, current_user: str = Depends(get_cur
     return templates.TemplateResponse("dashboard.html", context)
 
 
+@dashboard_router.get("/health_dashboard", response_class=HTMLResponse)
+async def health_dashboard_view(request: Request):
+    """
+    Render the health dashboard with the latest 10 health records.
+    """
+    health_records = list(health_collection.find().sort("date", -1).limit(10))
+    return templates.TemplateResponse("health_dashboard.html", {"request": request, "health_records": health_records})
+
+
 # --- Admin Task Management Routes ---
 
 @dashboard_router.get("/tasks", response_class=HTMLResponse)
@@ -62,12 +68,7 @@ async def manage_tasks(request: Request, current_user: str = Depends(get_current
 
     tasks = list(todo_collection.find({}))
     farmers = list(user_collection.find({"role": "farmer"}))
-
-    context = {
-        "request": request,
-        "tasks": tasks,
-        "farmers": farmers,
-    }
+    context = {"request": request, "tasks": tasks, "farmers": farmers}
     return templates.TemplateResponse("admin_tasks.html", context)
 
 
@@ -80,12 +81,7 @@ async def assign_task(todo_data: ToDoCreate, assigned_to: str, current_user: str
         raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Admin privileges required.")
 
     task = todo_data.dict()
-    task.update({
-        "assigned_to": assigned_to,
-        "created_by": current_user,
-        "is_completed": False,
-        "created_at": datetime.utcnow()
-    })
+    task.update({"assigned_to": assigned_to, "created_by": current_user, "is_completed": False, "created_at": datetime.utcnow()})
 
     result = todo_collection.insert_one(task)
     if result.inserted_id:
@@ -103,15 +99,10 @@ async def create_todo_item(todo_data: ToDoCreate, current_user: str = Depends(ge
         raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Admin privileges required.")
 
     todo_item = todo_data.dict()
-    todo_item.update({
-        "is_completed": False,
-        "created_by": current_user,
-        "created_at": datetime.utcnow(),
-    })
+    todo_item.update({"is_completed": False, "created_by": current_user, "created_at": datetime.utcnow()})
     result = todo_collection.insert_one(todo_item)
     if result.inserted_id:
-        return JSONResponse(status_code=status.HTTP_201_CREATED,
-                            content={"message": "To-do item created successfully."})
+        return JSONResponse(status_code=status.HTTP_201_CREATED, content={"message": "To-do item created successfully."})
     else:
         raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="Failed to create to-do item.")
 
@@ -123,7 +114,6 @@ async def get_all_todo_items(current_user: str = Depends(get_current_user)):
     """
     if not is_admin_user(current_user):
         raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Admin privileges required.")
-
     return list(todo_collection.find({}))
 
 
@@ -175,11 +165,9 @@ async def complete_assigned_todo_item(todo_id: str, current_user: str = Depends(
     """
     todo = todo_collection.find_one({"_id": ObjectId(todo_id), "assigned_to": current_user})
     if not todo:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND,
-                            detail="To-do item not found or not assigned to you.")
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="To-do item not found or not assigned to you.")
 
-    todo_collection.update_one({"_id": ObjectId(todo_id)},
-                               {"$set": {"is_completed": True, "completed_at": datetime.utcnow()}})
+    todo_collection.update_one({"_id": ObjectId(todo_id)}, {"$set": {"is_completed": True, "completed_at": datetime.utcnow()}})
     return {"message": f"To-do item '{todo.get('title')}' marked as completed."}
 
 
@@ -242,8 +230,7 @@ async def export_health_pdf(current_user: str = Depends(get_current_user)):
     buffer.seek(0)
 
     log_activity("Exported health records as PDF", current_user)
-    return StreamingResponse(buffer, media_type="application/pdf",
-                             headers={"Content-Disposition": "attachment;filename=health_records.pdf"})
+    return StreamingResponse(buffer, media_type="application/pdf", headers={"Content-Disposition": "attachment;filename=health_records.pdf"})
 
 
 @dashboard_router.get("/export/health/xls")
@@ -260,6 +247,4 @@ async def export_health_xls(current_user: str = Depends(get_current_user)):
     df.to_excel(file_path, index=False)
 
     log_activity("Exported health records as XLS", current_user)
-    return FileResponse(file_path, media_type="application/vnd.ms-excel",
-                        headers={"Content-Disposition": "attachment;filename=health_records.xlsx"})
-
+    return FileResponse(file_path, media_type="application/vnd.ms-excel", headers={"Content-Disposition": "attachment;filename=health_records.xlsx"})

routes/disease_detection.py

@@ -1,67 +1,87 @@
 # routes/disease_detection.py
 
+import datetime
 import logging
+import io
 from fastapi import APIRouter, UploadFile, File, HTTPException
 from fastapi.responses import JSONResponse
 from PIL import Image
 import numpy as np
-import io
+
+from routes.administration import health_collection
 from services.disease_detection_service import bot
+from services.health_alerts_service import check_health_thresholds
 
-# Set up logging for this module
+# Configure logging for this module
 logger = logging.getLogger(__name__)
 
 # Initialize the disease detection router
 disease_router = APIRouter()
 
+
 @disease_router.post("/detect_disease", response_class=JSONResponse)
 async def detect_disease(file: UploadFile = File(...)):
     """
-    Detect disease from an uploaded poultry fecal image and provide treatment suggestions.
+    Detect disease from an uploaded poultry image and provide treatment recommendations.
 
     Parameters:
         file (UploadFile): The image file to analyze.
 
     Returns:
-        JSONResponse: A JSON response with disease prediction details, including:
-            - disease: Name of the detected disease
-            - status: Severity of the detected disease
-            - confidence: Confidence level of the prediction
-            - recommendation: Suggested treatment based on the diagnosis
-            - details: Additional information about the disease
+        JSONResponse: JSON with disease prediction, confidence, treatment recommendation,
+        and other details.
     """
-    logger.info("Disease detection request received.")
+    logger.info("Received disease detection request.")
 
-    # Validate file type
+    # Step 1: Validate the uploaded file type
     if file.content_type not in ["image/jpeg", "image/png"]:
-        logger.warning(f"Invalid file type received: {file.content_type}")
+        logger.warning(f"Invalid file type: {file.content_type}")
         raise HTTPException(status_code=400, detail="Invalid file type. Please upload a JPEG or PNG image.")
 
     try:
-        # Attempt to read and process the image
+        # Step 2: Read and process the image
         image_data = await file.read()
         image = Image.open(io.BytesIO(image_data)).convert("RGB")
         image_np = np.array(image)
-        logger.info("Image successfully loaded and converted to RGB.")
+        logger.info("Image successfully loaded and converted to RGB format.")
     except Exception as e:
-        error_message = f"Error loading image: {e}"
-        logger.error(error_message)
-        raise HTTPException(status_code=500, detail=error_message)
+        logger.error(f"Failed to load image: {e}")
+        raise HTTPException(status_code=500, detail="Error processing the uploaded image.")
 
-    # Use the bot to diagnose disease and generate a detailed response
+    # Step 3: Perform disease detection
     try:
         detailed_response, disease_name, status, recommendation, confidence = bot.diagnose_and_respond(image_np)
-        logger.info(f"Disease detection completed: {disease_name} with {confidence:.2f}% confidence.")
+        logger.info(f"Disease detected: {disease_name} with {confidence:.2f}% confidence.")
     except Exception as e:
-        logger.error(f"Error during disease detection: {e}")
+        logger.error(f"Error in disease detection: {e}")
         raise HTTPException(status_code=500, detail="Error processing the image for disease detection.")
 
-    # Verify if a valid disease was detected
-    if disease_name is None:
-        logger.warning("Disease detection failed; no disease identified in the image.")
-        return JSONResponse(content={"error": "Unable to detect disease. Please try again."}, status_code=500)
+    # Step 4: Check if a valid disease was detected
+    if not disease_name:
+        logger.warning("No disease detected in the image.")
+        return JSONResponse(content={"error": "Unable to detect disease. Please try a different image."},
+                            status_code=500)
+
+    # Step 5: Log the detected disease and recommended treatment in health records
+    record = {
+        "bird_id": "batch_123",  # Placeholder, replace with actual bird/batch ID
+        "date": datetime.datetime.utcnow(),
+        "disease_detected": disease_name,
+        "status": status,
+        "confidence": confidence,
+        "treatment_recommendation": recommendation,
+        "weight": 1.4,  # Placeholder, replace with actual weight measurement
+        "mortality_rate": 0.5,  # Placeholder, replace with actual mortality rate
+        "feed_intake": 0.35  # Placeholder, replace with actual feed intake
+    }
+    health_collection.insert_one(record)
+    logger.info("Disease and treatment recommendation logged in health records.")
+
+    # Step 6: Check for health alerts based on recorded data
+    check_health_thresholds(record)
+    logger.info("Health thresholds checked for potential alerts.")
 
-    # Return the response as JSON
+    # Step 7: Construct and return response
     response_content = {
         "disease": disease_name,
         "status": status,
@@ -69,5 +89,5 @@ async def detect_disease(file: UploadFile = File(...)):
         "recommendation": recommendation,
         "details": detailed_response
     }
-    logger.info(f"Disease detection response: {response_content}")
+    logger.info(f"Response content prepared: {response_content}")
     return JSONResponse(content=response_content)

services/health_alerts_service.py

@@ -0,0 +1,42 @@
+# services/health_alerts_service.py
+
+import os
+from services.utils import db
+from datetime import datetime
+
+health_collection = db.get_collection("health_records")
+alert_collection = db.get_collection("alerts")
+
+# Define thresholds for automated alerts
+THRESHOLDS = {
+    "weight": 1.0,  # Example: Weight below 1.0 kg triggers alert
+    "mortality_rate": 2.0,  # Mortality rate over 2% triggers alert
+    "feed_intake": 0.3  # Feed intake below 0.3 kg triggers alert
+}
+
+def check_health_thresholds(record):
+    alerts = []
+    if record["weight"] < THRESHOLDS["weight"]:
+        alerts.append("Low weight detected")
+
+    if record["mortality_rate"] > THRESHOLDS["mortality_rate"]:
+        alerts.append("High mortality rate detected")
+
+    if record["feed_intake"] < THRESHOLDS["feed_intake"]:
+        alerts.append("Reduced feed intake detected")
+
+    if alerts:
+        alert_record = {
+            "bird_id": record["bird_id"],
+            "date": datetime.utcnow(),
+            "alerts": alerts,
+            "status": record["status"],
+            "treatment_recommendation": record["treatment_recommendation"]
+        }
+        alert_collection.insert_one(alert_record)
+        # Send alert notification (e.g., email or SMS)
+        send_alert_notification(alert_record)
+
+def send_alert_notification(alert):
+    farmer_email = os.getenv("FARMER_EMAIL")
+    # Logic to send notification via email or SMS

templates/health_dashboard.html

@@ -0,0 +1,36 @@
+{% extends "base.html" %}
+
+{% block content %}
+<div class="container">
+    <h1>Health & Disease Dashboard</h1>
+
+    <table class="table table-striped table-bordered">
+        <thead>
+            <tr>
+                <th>Bird ID</th>
+                <th>Date</th>
+                <th>Weight (kg)</th>
+                <th>Mortality Rate (%)</th>
+                <th>Feed Intake (kg)</th>
+                <th>Disease Detected</th>
+                <th>Status</th>
+                <th>Treatment Recommendation</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for record in health_records %}
+            <tr>
+                <td>{{ record.bird_id }}</td>
+                <td>{{ record.date.strftime('%Y-%m-%d') }}</td>
+                <td>{{ record.weight }}</td>
+                <td>{{ record.mortality_rate }}</td>
+                <td>{{ record.feed_intake }}</td>
+                <td>{{ record.disease_detected or 'N/A' }}</td>
+                <td>{{ record.status }}</td>
+                <td>{{ record.treatment_recommendation or 'N/A' }}</td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
+{% endblock %}