modified

app.py

@@ -11,7 +11,7 @@ from dateutil import parser
 from collections import defaultdict
 from langchain_openai import ChatOpenAI
 from langchain_core.messages import HumanMessage, SystemMessage
-from typing import Annotated, List, Optional
+from typing import Annotated, List, Optional, Literal
 from pydantic import BaseModel, Field
 from typing_extensions import TypedDict
 from langgraph.graph import StateGraph, START, END
@@ -70,27 +70,62 @@ def process_task_data():
 
 def add_test(roadmap, date, physics = [], chemistry = [], maths = []):
     date = parser.parse(date).strftime("%Y-%m-%d")
+    found = False
     for i, day in enumerate(roadmap["schedule"]):
         if day["date"] == date:
-            roadmap["schedule"][i] = {
-                                      "dayNumber": day['dayNumber'],
-                                      "date": date,
-                                      "test_portion": [
-                                          {
-                                              "name": "Physics",
-                                              "chapters": physics
-                                          },
-                                          {
-                                              "name": "Chemistry",
-                                              "chapters": chemistry
-                                          },
-                                          {
-                                              "name": "Maths",
-                                              "chapters": maths
-                                          }
-                                      ],
-                                      "subjects": day['subjects']
-                                     }
+            found = True
+            day["test_portion"] = [{
+                                  "name": "Physics",
+                                  "chapters": physics
+                                  }, {
+                                  "name": "Chemistry",
+                                  "chapters": chemistry
+                                  }, {
+                                  "name": "Maths",
+                                  "chapters": maths
+                                  }]
+            break
+    if not found:
+        print("Kindly check the Entered Date(YYYY-MM-DD), it's not available in the roadmap")
+    return roadmap
+
+def add_tasks(roadmap, tasks):
+    from_date = datetime.strptime(parser.parse(tasks.from_date).strftime("%Y-%m-%d"), "%Y-%m-%d")
+    to_date = datetime.strptime(parser.parse(tasks.to_date).strftime("%Y-%m-%d"), "%Y-%m-%d")
+
+    current_date = from_date
+    date_found = False
+    while current_date <= to_date:
+        date_str = current_date.strftime("%Y-%m-%d")
+
+        # Find the day in the roadmap
+        day = next((d for d in roadmap["schedule"] if d["date"] == date_str), None)
+        if not day:
+            current_date += timedelta(days=1)
+            continue
+        date_found = True
+        # Ensure 'teacher_tasks' exists
+        if "teacher_tasks" not in day:
+            day["teacher_tasks"] = []
+
+        for subject_block in tasks.subjects:
+            subject_name = subject_block.subject
+            new_tasks = [task.model_dump() for task in subject_block.tasks]
+
+            # Check if subject already exists for the day
+            subject_entry = next((sub for sub in day["teacher_tasks"] if sub["name"] == subject_name), None)
+
+            if subject_entry:
+                subject_entry["tasks"].extend(new_tasks)
+            else:
+                day["teacher_tasks"].append({
+                    "name": subject_name,
+                    "tasks": new_tasks
+                })
+
+        current_date += timedelta(days=1)
+    if not date_found:
+        print("Kindly check the Entered Dates(YYYY-MM-DD), they are not available in the roadmap")
     return roadmap
 
 def check_tot_time(day):
@@ -516,11 +551,10 @@ def update_roadmap(current_roadmap, current_dayNumber, max_hours_per_day, depend
             ratio = (0, 100)
     else:
         # No upcoming test: Normal scheduling
-        if day_index + 4 <= len(current_roadmap['schedule']):
+        if day_index + 4 <= len(current_roadmap['schedule'])-1:
             before_checkpoint = current_roadmap['schedule'][day_index:day_index+4]
             after_checkpoint = current_roadmap['schedule'][day_index+4:]
         else:
-            print("Helloo")
             before_checkpoint = current_roadmap['schedule'][day_index:]
             after_checkpoint = []
         ratio = (80, 20)
@@ -570,6 +604,13 @@ def update_roadmap(current_roadmap, current_dayNumber, max_hours_per_day, depend
                 new_roadmap = current_roadmap['schedule'][:ckp_idx+1]
                 new_roadmap.extend(curr_roadmap[1:])
                 current_roadmap['schedule'] = new_roadmap
+                for tasks in extra_days:
+                    day = copy.deepcopy(new_roadmap[-1])
+                    day["dayNumber"] = current_roadmap['schedule'][-1]["dayNumber"] + 1
+                    day["date"] = (datetime.strptime(current_roadmap['schedule'][-1]["date"], "%Y-%m-%d")
+                                    + timedelta(days=1)).strftime("%Y-%m-%d")
+                    day['subjects'] = tasks['subjects']
+                    current_roadmap['schedule'].append(day)
             elif 0 < time_to_test <= (10 + extra_rev_days):
                 # Step 1: Add empty days at the end
                 last_day = current_roadmap['schedule'][-1]
@@ -597,7 +638,7 @@ def update_roadmap(current_roadmap, current_dayNumber, max_hours_per_day, depend
                     target_day["subjects"] = new_task_day["subjects"]
 
         else:
-            if day_index + 4 <= len(current_roadmap['schedule']):
+            if day_index + 4 <= len(current_roadmap['schedule'])-1:
                 new_checkpoint = copy.deepcopy(after_checkpoint)
                 day = copy.deepcopy(after_checkpoint[0])
                 for subject in day['subjects']:
@@ -621,6 +662,13 @@ def update_roadmap(current_roadmap, current_dayNumber, max_hours_per_day, depend
                 new_roadmap = current_roadmap['schedule'][:ckp_idx+1]
                 new_roadmap.extend(curr_roadmap[1:])
                 current_roadmap['schedule'] = new_roadmap
+                for tasks in extra_days:
+                    day = copy.deepcopy(new_roadmap[-1])
+                    day["dayNumber"] = current_roadmap['schedule'][-1]["dayNumber"] + 1
+                    day["date"] = (datetime.strptime(current_roadmap['schedule'][-1]["date"], "%Y-%m-%d")
+                                    + timedelta(days=1)).strftime("%Y-%m-%d")
+                    day['subjects'] = tasks['subjects']
+                    current_roadmap['schedule'].append(day)
             else:
                 for tasks in extra_day_tasks:
                     day = copy.deepcopy(new_roadmap[-1])
@@ -1197,13 +1245,38 @@ def testscheduler(
     maths : list = Query(["Limits,Continuity and Differentiability"], description="Enter the chapters for test in maths as a list"),
 ):
     """
-    Helps in Scheduling of Tests in the roadmap
+    Helps the teacher in Scheduling of Tests in the roadmap
     """
 
     session_state["data"] = add_test(session_state["data"], date, physics, chemistry, maths)
 
     return {"sucessful": "Test Succesfully Scheduled in the roadmap"}
 
+
+class Task(BaseModel):
+    chapter: str = Field(..., description="The chapter associated with this task.")
+    description: str = Field(..., description="A brief explanation of what needs to be done.")
+    estimated_time: int = Field(..., description="Estimated time in hours to complete the task.")
+
+class SubjectTasks(BaseModel):
+    subject: Literal["Physics", "Chemistry", "Maths"] = Field(..., description="The subject the tasks belong to.")
+    tasks: List[Task] = Field(default_factory=list, description="The list of tasks in this subject.")
+
+class Tasks(BaseModel):
+    from_date: str = Field(..., description="The start date for the tasks")
+    to_date: str = Field(..., description="The end date for the tasks.")
+    subjects: List[SubjectTasks] = Field(default_factory=list, description="Subjectwise Task list")
+
+@app.post("/taskadder")
+def taskadder(tasks: Tasks):
+    """
+    Helps the teacher in scheduling tasks in the roadmap.
+    If no tasks are given, the subject entry will still be added with an empty task list.
+    """
+    session_state["data"] = add_tasks(session_state["data"], tasks)
+
+    return {"successful": "Task successfully added to the roadmap"}
+
 # --- AGENT 2: Roadmap Manager (Roadmap Manager Page) ---
 @app.get("/agent2")
 def agent2(