Implement bug fixes, and style changes

Author: BhaveshKukreja29

docker/worker.dockerfile

@@ -26,9 +26,6 @@ RUN poetry config virtualenvs.create false && poetry install --no-root --no-inte
 # Copy application code
 COPY mxgo ./mxgo
 
-# Copy test code into the container
-COPY ./tests /app/tests 
-
 # Create directories
 RUN mkdir -p /app/attachments
 

mxgo/api.py

@@ -25,6 +25,7 @@
     send_email_reply,
 )
 from mxgo.models import TaskStatus
+from mxgo.prompts.template_prompts import NEWSLETTER_TEMPLATE
 from mxgo.reply_generation import generate_replies
 from mxgo.scheduling.scheduled_task_executor import execute_scheduled_task
 from mxgo.scheduling.scheduler import Scheduler, is_one_time_task
@@ -880,17 +881,34 @@ async def generate_email_replies(
 
 # Helper functions for create_newsletter
 def _build_newsletter_instructions(request: CreateNewsletterRequest) -> str:
-    """Builds the full instruction string from the request."""
-    full_instructions = [f"PROMPT: {request.prompt}"]
+    """Builds the full instruction string from the request using the NEWSLETTER template."""
+    user_instructions = []
     if request.estimated_read_time:
-        full_instructions.append(f"ESTIMATED READ TIME: {request.estimated_read_time} minutes")
+        user_instructions.append(
+            f"- **Target Read Time**: The newsletter should be concise enough to be read in approximately {request.estimated_read_time} minutes."
+        )
     if request.sources:
-        full_instructions.append(f"SOURCES: {', '.join(request.sources)}")
+        user_instructions.append(
+            f"- **Prioritize Sources**: When researching, give priority to information from the following sources: {', '.join(request.sources)}."
+        )
     if request.geographic_locations:
-        full_instructions.append(f"GEOGRAPHIC FOCUS: {', '.join(request.geographic_locations)}")
+        user_instructions.append(
+            f"- **Geographic Focus**: The content should be primarily relevant to the following locations: {', '.join(request.geographic_locations)}."
+        )
     if request.formatting_instructions:
-        full_instructions.append(f"FORMATTING INSTRUCTIONS: {request.formatting_instructions}")
-    return "\n\n".join(full_instructions)
+        user_instructions.append(
+            f"- **Formatting Rules**: Strictly follow these formatting instructions: {request.formatting_instructions}."
+        )
+
+    if user_instructions:
+        user_instructions_section = "\n".join(user_instructions)
+    else:
+        user_instructions_section = (
+            "No specific user instructions were provided. Use your best judgment to create a high-quality newsletter."
+        )
+
+    # This becomes the detailed, distilled instructions for the agent.
+    return NEWSLETTER_TEMPLATE.format(prompt=request.prompt, user_instructions_section=user_instructions_section)
 
 
 async def _validate_newsletter_limits(user_email: str, cron_expressions: list[str]):
@@ -953,7 +971,16 @@ def _create_and_schedule_task(user_email: str, cron_expr: str, distilled_instruc
         )
 
     scheduler = Scheduler()
-    scheduler.add_job(job_id=scheduler_job_id, cron_expression=cron_expr, func=execute_scheduled_task, args=[task_id])
+    try:
+        scheduler.add_job(
+            job_id=scheduler_job_id, cron_expression=cron_expr, func=execute_scheduled_task, args=[task_id]
+        )
+    except Exception as e:
+        logger.error(f"Failed to schedule task {task_id}: {e}")
+
+        with db_connection.get_session() as session:
+            crud.delete_task(session, task_id)
+        raise
 
     with db_connection.get_session() as session:
         crud.update_task_status(session, task_id, TaskStatus.ACTIVE)
@@ -983,7 +1010,7 @@ async def _handle_post_creation_action(
             parent_message_id=f"<newsletter-parent-{first_task_id}@mxgo.ai>",
         )
         process_email_task.send(
-            sample_email_request.model_dump(),
+            sample_email_request.model_dump(by_alias=True),
             email_attachments_dir="",
             attachment_info=[],
             scheduled_task_id=first_task_id,
@@ -1018,17 +1045,14 @@ async def create_newsletter(
                 f"Duplicate request_id {request.request_id} detected for {user_email}, returning existing tasks from Redis"
             )
             existing_task_ids = json.loads(existing_task_ids_json)
-            return Response(
-                content=json.dumps(
-                    {
-                        "message": "This request has already been processed.",
-                        "status": "duplicate",
-                        "request_id": request.request_id,
-                        "scheduled_task_ids": existing_task_ids,
-                    }
-                ),
+            raise HTTPException(
                 status_code=status.HTTP_409_CONFLICT,
-                media_type="application/json",
+                detail={
+                    "message": "This request has already been processed.",
+                    "status": "duplicate",
+                    "request_id": request.request_id,
+                    "scheduled_task_ids": existing_task_ids,
+                },
             )
 
     distilled_instructions = _build_newsletter_instructions(request)
@@ -1064,7 +1088,10 @@ async def create_newsletter(
                 except Exception as scheduler_e:
                     logger.error(f"Failed to remove scheduler job for task {tid}: {scheduler_e}")
 
-        raise HTTPException(status_code=500, detail="Failed to schedule one or more newsletter tasks.") from e
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail="Failed to schedule one or more newsletter tasks.",
+        ) from e
 
     sample_email_sent = False
     if created_task_ids:

mxgo/config.py

@@ -58,6 +58,35 @@
         },
     },
 }
+
+# System capabilities - extracted from email handles and their templates
+SYSTEM_CAPABILITIES = """## Available Email Processing Handles
+
+- **summarize**: Systematically analyze and summarize content from all sources with clear structure and action focus. Processes email content, attachments, and external references to provide executive summaries, main points, action items, and additional context.
+
+- **research**: Conduct comprehensive research and provide detailed analysis with proper sections and citations. Uses deep research tools to gather current information, analyze findings, and provide supporting evidence with academic tone.
+
+- **simplify**: Transform complex content into clear, accessible explanations using simple language and relatable examples. Breaks down technical jargon, adds helpful analogies, and makes content understandable to general audiences.
+
+- **ask**: Execute custom tasks and workflows systematically with research, analysis, and professional presentation. Handles any custom request, research needs, content creation, and provides comprehensive solutions with proper formatting.
+
+- **fact-check**: Systematically verify claims and statements with comprehensive source validation and transparent uncertainty handling. Extracts all verifiable claims, searches for evidence, cross-references multiple sources, and provides clear verification status.
+
+- **background-research**: Conduct comprehensive business intelligence research on individuals and organizations. Provides strategic insights for business decisions, company analysis, professional profiles, and competitive context.
+
+- **translate**: Provide accurate translations with cultural context preservation and clear explanation of translation decisions. Detects source language, chooses appropriate translation approach, and provides cultural adaptations.
+
+- **meeting**: Intelligently extract, research, and schedule meetings or appointments with proper validation. Handles participant research, time resolution, and generates calendar invitations with comprehensive meeting details.
+
+- **pdf**: Intelligently analyze email content and create professional PDF document exports. Removes email metadata, preserves content structure, and generates clean, formatted documents for sharing or archiving.
+
+- **schedule**: Analyze email content to extract scheduling requirements for future or recurring task processing. Creates appropriate cron expressions for reminders, recurring tasks, and future email processing.
+
+- **delete**: Analyze email content to identify and delete scheduled tasks. Handles task ID extraction and provides clear confirmation of task removal.
+
+- **news**: Search for current news and breaking stories with comprehensive analysis and grouping. Provides structured news summaries with source citations, grouped by themes to avoid repetition.
+"""
+
 RATE_LIMIT_PER_DOMAIN_HOUR = {  # Consistent structure for domain limits
     "hour": {"limit": 50, "period_seconds": 3600, "expiry_seconds": 3600 * 2}
 }

mxgo/instruction_resolver.py

@@ -48,7 +48,7 @@ def register_handles(self, instructions_list: list[ProcessingInstructions], *, o
             for name in all_names:
                 if name in self.handle_map and not overwrite:
                     msg = f"Handle or alias '{name}' already registered. Use `overwrite=True` to replace."
-                    raise exceptions.HandleAlreadyExistsException(msg)
+                    raise exceptions.HandleAlreadyExistsError(msg)
                 self.handle_map[name] = instructions
 
     def add_custom_handle(self, custom_instruction: ProcessingInstructions, *, overwrite: bool = False):

mxgo/prompts/template_prompts.py

@@ -2,6 +2,8 @@
 Template prompts for different email processing handlers.
 """
 
+from mxgo.config import SYSTEM_CAPABILITIES
+
 # Summarize email handler template
 SUMMARIZE_TEMPLATE = """
 Systematically analyze and summarize content from all available sources with clear structure and action focus.
@@ -1108,7 +1110,7 @@
 """
 
 # Future handler template
-FUTURE_TEMPLATE = """
+FUTURE_TEMPLATE = f"""
 Analyze email content to extract scheduling requirements for future or recurring task processing and create appropriate cron expressions.
 
 # Future Task Scheduling Process
@@ -1177,14 +1179,8 @@
 - **distilled_future_task_instructions**: Clear, detailed instructions about how the task should be processed when executed in the future. This should include the processing approach, any specific requirements, and what the expected outcome should be. **CRITICAL: If the original email contains attachments, you MUST include detailed context about the attachments in these instructions since attachments will not be available during scheduled execution. Include attachment names, types, sizes, and any relevant content or context from the attachments.**
 - **start_time**: (Optional) Start time for the task in ISO 8601 format - task will not execute before this time (e.g., "2024-09-01T00:00:00Z")
 - **end_time**: (Optional) End time for the task in ISO 8601 format - task will not execute after this time (e.g., "2024-12-31T23:59:59Z")
-- **future_handle_alias**: The specific email handle to use for the future task. Select one of the following based on the user's instructions:
-    - **`ask`**: (Default) For general questions, custom tasks, or when no other handle fits.
-    - **`news`**: For fetching the latest news on a specific topic (e.g., "send me the news on AI every Friday").
-    - **`research`**: For conducting in-depth research on a topic at a later time.
-    - **`summarize`**: For summarizing the content of the email at a future date.
-    - **`fact-check`**: For verifying claims in the email content later.
-    - **`simplify`**: For explaining the content of the email in simple terms at a scheduled time.
-    - **`translate`**: For translating the email content at a future time.
+- **future_handle_alias**: The specific email handle to use for the future task. Select one of the available email processing handles based on the user's instructions:
+    {SYSTEM_CAPABILITIES}
 
 **Response (Successful Scheduling):**
 1. Confirmation message with:
@@ -1441,7 +1437,7 @@
 3. **Detailed processing instructions** - create comprehensive distilled_future_task_instructions
 4. **User-friendly confirmation** - explain what was scheduled and when it will happen
 5. **Error handling** - validate timing requests and provide alternatives if invalid
-"""
+"""  # noqa: S608
 
 # Delete handler template
 DELETE_TEMPLATE = """
@@ -1835,3 +1831,34 @@
 - Focus on **actionable insights** and current developments
 - Maintain **professional news analysis** tone
 """
+
+NEWSLETTER_TEMPLATE = """
+## Primary Goal: Generate a high-quality, engaging, and well-researched newsletter.
+
+## STEP 1: Deconstruct the Request & Plan the Outline
+- **Analyze the Core Topic**: Identify the central theme from the user's prompt: **"{prompt}"**.
+- **Review Specific Instructions**: Carefully read all user-provided instructions below regarding sources, formatting, and geographic focus.
+- **Create a Research Outline**: Based on the topic, generate a logical 3-5 section outline for the newsletter. This will be your plan for research. The outline should be more than just keywords; it should represent the narrative flow of the newsletter.
+
+## STEP 2: Conduct Comprehensive Research (Per Section)
+- For EACH section in your outline, use the `web_search` tool to gather detailed, current, and authoritative information.
+- **Prioritize Sources**: If the user has specified sources, you MUST prioritize them in your search.
+- **Data & Evidence**: Focus on finding specific data, statistics, expert quotes, and verifiable facts. Avoid vague generalizations.
+
+## STEP 3: Synthesize and Draft the Newsletter
+- **Introduction**: Write a compelling opening that introduces the topic and hooks the reader.
+- **Body**: Draft each section from your outline, synthesizing the research findings into a coherent narrative. Do not simply list facts. Weave them together to tell a story or build an argument.
+- **Conclusion**: Write a concise summary or a forward-looking statement to conclude the newsletter.
+- **Adhere to User Instructions**: Ensure the draft meets all specific user instructions.
+
+## STEP 4: Final Review and Formatting
+- **Apply Markdown**: Format the entire newsletter using professional Markdown, including headings (`###`), bullet points, and bold/italic text for emphasis.
+- **Check for Quality**: Review the draft for clarity, accuracy, and engagement. Ensure it directly addresses the user's core prompt.
+- **Source Attribution**: The system will handle the final "References" section. You do not need to add manual citations in the text.
+
+---
+
+## Specific Instructions for This Newsletter
+You MUST adhere to the following user-provided instructions:
+{user_instructions_section}
+"""

mxgo/schemas.py

@@ -503,7 +503,9 @@ class ScheduleType(str, Enum):
 
 
 class RecurringWeekly(BaseModel):
-    days: list[int] = Field(..., description="List of weekdays as integers (0=Sunday, 1=Monday, ..., 6=Saturday)")
+    days: list[int] = Field(
+        ..., min_length=1, description="List of weekdays as integers (0=Sunday, 1=Monday, ..., 6=Saturday)"
+    )
     time: str = Field(..., description="Time in HH:MM format, e.g., '09:30'")
 
     @field_validator("days")
@@ -531,7 +533,7 @@ def validate_time(cls, v):
 class ScheduleOptions(BaseModel):
     type: ScheduleType
     specific_datetime: str | None = Field(
-        None, description="List of ISO 8601 datetime string for a specific, non-recurring schedules."
+        None, description="ISO 8601 datetime string for a specific, non-recurring schedule."
     )
     weekly_schedule: RecurringWeekly | None = Field(None, description="Configuration for a recurring weekly schedule.")
 

mxgo/suggestions.py

@@ -5,6 +5,7 @@
 from typing import TYPE_CHECKING
 
 from mxgo._logging import get_logger
+from mxgo.config import SYSTEM_CAPABILITIES
 from mxgo.email_handles import DEFAULT_EMAIL_HANDLES
 from mxgo.routed_litellm_model import RoutedLiteLLMModel
 from mxgo.schemas import EmailSuggestionRequest, EmailSuggestionResponse, RiskAnalysisResponse, SuggestionDetail
@@ -18,34 +19,6 @@
 MIN_SUGGESTIONS = 3
 MAX_SUGGESTIONS = 7
 
-# System capabilities - extracted from email handles and their templates
-SYSTEM_CAPABILITIES = """## Available Email Processing Handles
-
-- **summarize**: Systematically analyze and summarize content from all sources with clear structure and action focus. Processes email content, attachments, and external references to provide executive summaries, main points, action items, and additional context.
-
-- **research**: Conduct comprehensive research and provide detailed analysis with proper sections and citations. Uses deep research tools to gather current information, analyze findings, and provide supporting evidence with academic tone.
-
-- **simplify**: Transform complex content into clear, accessible explanations using simple language and relatable examples. Breaks down technical jargon, adds helpful analogies, and makes content understandable to general audiences.
-
-- **ask**: Execute custom tasks and workflows systematically with research, analysis, and professional presentation. Handles any custom request, research needs, content creation, and provides comprehensive solutions with proper formatting.
-
-- **fact-check**: Systematically verify claims and statements with comprehensive source validation and transparent uncertainty handling. Extracts all verifiable claims, searches for evidence, cross-references multiple sources, and provides clear verification status.
-
-- **background-research**: Conduct comprehensive business intelligence research on individuals and organizations. Provides strategic insights for business decisions, company analysis, professional profiles, and competitive context.
-
-- **translate**: Provide accurate translations with cultural context preservation and clear explanation of translation decisions. Detects source language, chooses appropriate translation approach, and provides cultural adaptations.
-
-- **meeting**: Intelligently extract, research, and schedule meetings or appointments with proper validation. Handles participant research, time resolution, and generates calendar invitations with comprehensive meeting details.
-
-- **pdf**: Intelligently analyze email content and create professional PDF document exports. Removes email metadata, preserves content structure, and generates clean, formatted documents for sharing or archiving.
-
-- **schedule**: Analyze email content to extract scheduling requirements for future or recurring task processing. Creates appropriate cron expressions for reminders, recurring tasks, and future email processing.
-
-- **delete**: Analyze email content to identify and delete scheduled tasks. Handles task ID extraction and provides clear confirmation of task removal.
-
-- **news**: Search for current news and breaking stories with comprehensive analysis and grouping. Provides structured news summaries with source citations, grouped by themes to avoid repetition.
-"""
-
 SUGGESTION_INSTRUCTIONS = f"""## Email Analysis and Suggestion Guidelines
 
 You are an intelligent email assistant that analyzes email content to provide a crisp overview and suggest appropriate processing handles.

mxgo/tools/scheduled_tasks_tool.py

@@ -175,7 +175,7 @@ def _parse_and_validate_times(
                 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:
+        if parsed_start_time and parsed_end_time and parsed_start_time > parsed_end_time:
             return (
                 None,
                 None,
@@ -250,7 +250,6 @@ def forward(
 
         try:
             # Resolve the handle alias before validation
-            resolved_handle_alias = future_handle_alias
             if future_handle_alias:
                 try:
                     # Resolve the provided alias (e.g., 'remind') to its canonical handle (e.g., 'schedule')