Fix linter errors and update scheduling logic

Author: BhaveshKukreja29

mxgo/prompts/template_prompts.py

@@ -1144,6 +1144,13 @@
 - month (1-12)
 - day of week (0-7, Sunday=0 or 7)
 
+**CRITICAL: ONE-TIME vs. RECURRING LOGIC**
+- **For Recurring Tasks** (e.g. "Every day"): Use wildcards for day/month.
+  - Example: `0 14 * * *` (Daily at 2 PM UTC)
+- **For ONE-TIME Future Tasks** (e.g. "Tomorrow at 1pm"): You **MUST** calculate the specific Day and Month relative to the current date. **DO NOT** use wildcards `* *`, or it will run every day.
+  - BAD: `0 13 * * *` (Runs every day)
+  - GOOD: `0 13 16 12 *` (Runs ONLY on Dec 16th at 1pm UTC)
+
 **Common Patterns:**
 - **Daily at specific time**: `0 9 * * *` (9 AM daily)
 - **Weekly**: `0 9 * * 1` (9 AM every Monday)
@@ -1712,10 +1719,10 @@
 
 # News Search Process
 
-## STEP 1: Intent Analysis - Recurring vs. One-Time
-- **Analyze the user's request**: Does the user ask for news "every day", "weekly", "every hour", or use other recurring language?
-- **If recurring**: Your goal is to use the `scheduled_tasks` tool. You must determine the correct cron expression and the `distilled_future_task_instructions`. Proceed to the execution step for recurring tasks.
-- **If one-time**: Your goal is to use the `news_search` tool to get the news immediately. Proceed with the query analysis and search strategy below.
+## STEP 1: Intent Analysis - Immediate vs. Future Execution
+- **Analyze the user's request**: Does the user want news *now* (e.g., "what's the latest," "give me news from the past day") or at a *future* time (e.g., "tomorrow morning," "every Friday at 5pm," "in 3 hours")?
+- **If for a future time (either one-time or recurring)**: Your goal is to use the `scheduled_tasks` tool. You must determine the correct cron expression.
+- **If for now**: Your goal is to use the `news_search` tool to get the news immediately.
 
 ## STEP 2: Query Analysis & Optimization
 - **Understand the request**: Identify specific topics, companies, regions, or themes
@@ -1725,15 +1732,18 @@
 
 ## STEP 3: News Search Strategy
 
-### For One-Time News Requests:
+### For Immediate News Requests:
 - **Topic-specific searches**: Use the news_search tool with targeted queries
 - **Time filtering**: Apply appropriate freshness filters (pd=past day, pw=past week, pm=past month, py=past year)
 - **Multiple perspectives**: Search for different angles or related topics if needed
 - **Source diversity**: Ensure variety in news sources and perspectives
 - After getting the results, proceed to Step 4 for analysis and synthesis.
 
-### For Recurring News Requests:
+### For Future News Requests (One-Time or Recurring):
 - **CRITICAL**: You must convert any user-specified time and timezone (e.g., 10pm IST) to a UTC-based cron expression.
+- **CRON LOGIC**:
+  - If **Recurring** (e.g. "Every day"): Use `* *` for day/month.
+  - If **One-Time Future** (e.g. "Tomorrow"): You **MUST** use the specific Day and Month integers (e.g., `15 12` for Dec 15th). Do NOT use `* *`.
 - Use the `scheduled_tasks` tool with the following parameters:
   - `cron_expression`: The generated UTC cron expression.
   - `distilled_future_task_instructions`: A clear command for the future task, e.g., "Search for the latest news about [topic] and send a summary."

mxgo/routed_litellm_model.py

@@ -4,12 +4,12 @@
 from typing import Any
 
 from dotenv import load_dotenv
+from smolagents import ChatMessage, LiteLLMRouterModel, Tool
 
 import mxgo.schemas
 from mxgo import exceptions
 from mxgo._logging import get_logger
 from mxgo.schemas import ProcessingInstructions
-from smolagents import ChatMessage, LiteLLMRouterModel, Tool
 
 load_dotenv()
 

mxgo/tools/scheduled_tasks_tool.py

@@ -220,6 +220,63 @@ def __init__(self, context: RequestContext):
         # Create dedicated scheduling instance for this tool
         self.scheduler = Scheduler()
 
+    def _parse_and_validate_times(
+        self, start_time_str: str | None, end_time_str: str | None, task_description: str
+    ) -> tuple[datetime | None, datetime | None, dict | None]:
+        """
+        Parse start/end times and validate that start is before end.
+        """
+        parsed_start_time = None
+        parsed_end_time = None
+
+        if start_time_str:
+            try:
+                parsed_start_time = datetime.fromisoformat(start_time_str)
+                parsed_start_time = round_to_nearest_minute(parsed_start_time)
+            except Exception as e:
+                logger.warning(f"Could not parse start_time: {e}")
+
+        if end_time_str:
+            try:
+                parsed_start_time = datetime.fromisoformat(end_time_str)
+                parsed_start_time = round_to_nearest_minute(parsed_start_time)
+            except Exception as e:
+                logger.warning(f"Could not parse start_time: {e}")
+
+        # Validate that start_time is before end_time if both are provided
+        if parsed_start_time and parsed_end_time and parsed_start_time >= parsed_end_time:
+            return (
+                None,
+                None,
+                {
+                    "success": False,
+                    "error": "Invalid time range",
+                    "message": "start_time must be before end_time",
+                    "task_description": task_description,
+                },
+            )
+
+        return parsed_start_time, parsed_end_time, None
+    
+    def _configure_email_request(self, email_request, input_data: ScheduledTaskInput) -> None:
+        """
+        Configure email request with task instructions and alias.
+        """
+        email_request.distilled_processing_instructions = input_data.distilled_future_task_instructions
+        email_request.task_description = input_data.distilled_future_task_instructions
+
+        if input_data.future_handle_alias:
+            try:
+                email_request.distilled_alias = HandlerAlias(input_data.future_handle_alias)
+                logger.info(f"Using specified handle alias: {input_data.future_handle_alias}")
+            except ValueError:
+                logger.warning(f"Invalid handle alias '{input_data.future_handle_alias}', defaulting to ASK")
+                email_request.distilled_alias = HandlerAlias.ASK
+        else:
+            email_request.distilled_alias = HandlerAlias.ASK
+
+        email_request.parent_message_id = email_request.messageId
+
     def forward(
         self,
         cron_expression: str,
@@ -277,38 +334,18 @@ def forward(
                 time_until_execution = next_execution_time - datetime.now(timezone.utc)
                 logger.info(f"One-time task will execute at: {next_execution_time} (in {time_until_execution})")
 
+            # Parse and validate times (Refactored to helper)
+            parsed_start_time, parsed_end_time, time_error = self._parse_and_validate_times(
+                input_data.start_time, input_data.end_time, distilled_future_task_instructions
+            )
+            if time_error:
+                return time_error
+
             db_connection = init_db_connection()
             # Generate unique task ID
             task_id = str(uuid.uuid4())
             email_id = email_request.from_email
 
-            # Parse start_time and end_time if provided
-            parsed_start_time = None
-            parsed_end_time = None
-
-            if input_data.start_time:
-                try:
-                    parsed_start_time = datetime.fromisoformat(input_data.start_time)
-                    parsed_start_time = round_to_nearest_minute(parsed_start_time)
-                except Exception as e:
-                    logger.warning(f"Could not parse start_time: {e}")
-
-            if input_data.end_time:
-                try:
-                    parsed_end_time = datetime.fromisoformat(input_data.end_time)
-                    parsed_end_time = round_to_nearest_minute(parsed_end_time)
-                except Exception as e:
-                    logger.warning(f"Could not parse end_time: {e}")
-
-            # Validate that start_time is before end_time if both are provided
-            if parsed_start_time and parsed_end_time and parsed_start_time >= parsed_end_time:
-                return {
-                    "success": False,
-                    "error": "Invalid time range",
-                    "message": "start_time must be before end_time",
-                    "task_description": distilled_future_task_instructions,
-                }
-
             # Calculate next execution time from cron expression
             cron_iter = croniter(input_data.cron_expression, datetime.now(timezone.utc))
             next_execution = round_to_nearest_minute(datetime.fromtimestamp(cron_iter.get_next(), tz=timezone.utc))
@@ -317,19 +354,7 @@ def forward(
             scheduler_job_id = f"task_{task_id}"
 
             # Save distilled instructions and task description to email request
-            email_request.distilled_processing_instructions = input_data.distilled_future_task_instructions
-            email_request.task_description = distilled_future_task_instructions
-            if input_data.future_handle_alias:
-                try:
-                    email_request.distilled_alias = HandlerAlias(input_data.future_handle_alias)
-                    logger.info(f"Using specified handle alias: {input_data.future_handle_alias}")
-                except ValueError:
-                    logger.warning(f"Invalid handle alias '{input_data.future_handle_alias}', defaulting to ASK")
-                    email_request.distilled_alias = HandlerAlias.ASK
-            else:
-                email_request.distilled_alias = HandlerAlias.ASK
-
-            email_request.parent_message_id = email_request.messageId
+            self._configure_email_request(email_request, input_data)
 
             # Store task in database using CRUD
             try: