Update services/report_data_handler.py

services/report_data_handler.py

@@ -12,101 +12,123 @@ from config import (
 import json # For handling JSON data
 from typing import List, Dict, Any, Optional, Tuple
 
+# It's good practice to configure the logger at the application entry point,
+# but setting a default handler here prevents "No handler found" warnings.
+logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-def fetch_latest_agentic_analysis(org_urn: str):
+def fetch_latest_agentic_analysis(org_urn: str) -> Tuple[Optional[pd.DataFrame], Optional[str]]:
     """
     Fetches all agentic analysis data for a given org_urn from Bubble.
-    Returns the full dataframe and any error, or None, None.
+    Returns the full dataframe and any error message, or None, None.
     """
+    logger.info(f"Starting fetch_latest_agentic_analysis for org_urn: {org_urn}")
     if not org_urn:
         logger.warning("fetch_latest_agentic_analysis: org_urn is missing.")
-        return None, None
-    
-    report_data_df, error = fetch_linkedin_posts_data_from_bubble(
-        data_type=BUBBLE_REPORT_TABLE_NAME,
-        org_urn=org_urn
-    )
-    
-    if error or report_data_df is None or report_data_df.empty:
-        logger.info(f"No existing agentic analysis found in Bubble for org_urn {org_urn} or error: {error}")
-        return None, None
-    
-    logger.info(f"Agentic analysis data fetched for org_urn {org_urn}")
-    return report_data_df, None  # Return full dataframe and no error
+        return None, "org_urn is missing."
+
+    try:
+        report_data_df, error = fetch_linkedin_posts_data_from_bubble(
+            data_type=BUBBLE_REPORT_TABLE_NAME,
+            org_urn=org_urn
+        )
+
+        if error:
+            logger.error(f"Error fetching data from Bubble for org_urn {org_urn}: {error}")
+            return None, str(error)
+
+        if report_data_df is None or report_data_df.empty:
+            logger.info(f"No existing agentic analysis found in Bubble for org_urn {org_urn}.")
+            return None, None
+
+        logger.info(f"Successfully fetched {len(report_data_df)} records for org_urn {org_urn}")
+        return report_data_df, None  # Return full dataframe and no error
+
+    except Exception as e:
+        logger.exception(f"An unexpected error occurred in fetch_latest_agentic_analysis for org_urn {org_urn}: {e}")
+        return None, str(e)
 
 
 def save_report_results(
     org_urn: str,
     report_markdown: str,
-    quarter,
-    year,
+    quarter: int,
+    year: int,
     report_type: str,
-):
-    """Saves the agentic pipeline results to Bubble."""
+) -> Optional[str]:
+    """Saves the agentic pipeline results to Bubble. Returns the new record ID or None."""
+    logger.info(f"Starting save_report_results for org_urn: {org_urn}")
     if not org_urn:
-        logger.error("Cannot save agentic results: org_urn missing.")
-        return False
-
-    payload = {
-        "organization_urn": org_urn,
-        "report_text": report_markdown if report_markdown else "N/A",
-        "quarter": quarter,
-        "year": year,
-        "report_type": report_type,
-    }
-    logger.info(f"Attempting to save agentic analysis to Bubble for org_urn: {org_urn}")
-    success_ids = bulk_upload_to_bubble([payload], BUBBLE_REPORT_TABLE_NAME)
-
-    if success_ids: # bulk_upload_to_bubble returns list of IDs or False
-        logger.info(f"Successfully saved agentic analysis to Bubble. Record ID: {success_ids}")
-        return success_ids['id']
-    else:
-        logger.error(f"Failed to save agentic analysis to Bubble. {success_ids}")
-        return False
+        logger.error("Cannot save agentic results: org_urn is missing.")
+        return None
+
+    try:
+        payload = {
+            "organization_urn": org_urn,
+            "report_text": report_markdown if report_markdown else "N/A",
+            "quarter": quarter,
+            "year": year,
+            "report_type": report_type,
+        }
+        logger.info(f"Attempting to save agentic analysis to Bubble for org_urn: {org_urn}")
+        response = bulk_upload_to_bubble([payload], BUBBLE_REPORT_TABLE_NAME)
+
+        # Assuming bulk_upload_to_bubble returns a list of IDs on success and None or False on failure
+        if response and isinstance(response, list) and len(response) > 0:
+            record_id = response[0]
+            logger.info(f"Successfully saved agentic analysis to Bubble. Record ID: {record_id}")
+            return record_id
+        else:
+            logger.error(f"Failed to save agentic analysis to Bubble. Response: {response}")
+            return None
+            
+    except Exception as e:
+        logger.exception(f"An unexpected error occurred in save_report_results for org_urn {org_urn}: {e}")
+        return None
 
 
 # --- Data Saving Functions ---
 
 def save_objectives(
     org_urn: str,
-    report_id,
+    report_id: str,
     objectives_data: List[Dict[str, Any]]
 ) -> Optional[List[str]]:
     """
     Saves Objective records to Bubble.
-
-    Args:
-        org_urn: The URN of the organization to associate these objectives with.
-        objectives_data: A list of objective dictionaries from the main data structure.
-
-    Returns:
-        A list of the newly created Bubble record IDs for the objectives, or None on failure.
+    Returns a list of the newly created Bubble record IDs for the objectives, or None on failure.
     """
+    logger.info(f"Starting save_objectives for report_id: {report_id}")
     if not objectives_data:
         logger.info("No objectives to save.")
         return []
 
-    payloads = []
-    for objective in objectives_data:
-        payloads.append({
-            #"organization_urn": org_urn,
-            "objective_description": objective.get("objective_description"),
-            "objective_timeline": objective.get("objective_timeline"),
-            "objective_owner": objective.get("objective_owner"),
-            "report": report_id
-        })
-
-    logger.info(f"Attempting to save {len(payloads)} objectives for org_urn: {org_urn}")
-    objective_ids = bulk_upload_to_bubble(payloads, BUBBLE_OBJECTIVES_TABLE_NAME)
-
-    if objective_ids is None:
-        logger.error("Failed to save objectives to Bubble.")
+    try:
+        payloads = [
+            {
+                "objective_description": obj.get("objective_description"),
+                "objective_timeline": obj.get("objective_timeline"),
+                "objective_owner": obj.get("objective_owner"),
+                "report": report_id,
+                 # "organization_urn": org_urn # Assuming 'report' links to the org
+            }
+            for obj in objectives_data
+        ]
+
+        logger.info(f"Attempting to save {len(payloads)} objectives for report_id: {report_id}")
+        objective_ids = bulk_upload_to_bubble(payloads, BUBBLE_OKR_TABLE_NAME) # Corrected table name
+
+        if objective_ids is None:
+            logger.error(f"Failed to save objectives to Bubble for report_id: {report_id}. The upload function returned None.")
+            return None
+
+        logger.info(f"Successfully saved {len(objective_ids)} objectives.")
+        return objective_ids
+        
+    except Exception as e:
+        logger.exception(f"An unexpected error occurred in save_objectives for report_id {report_id}: {e}")
         return None
 
-    logger.info(f"Successfully saved {len(objective_ids)} objectives.")
-    return objective_ids
-
 
 def save_key_results(
     org_urn: str,
@@ -114,49 +136,48 @@ def save_key_results(
 ) -> Optional[List[Tuple[Dict[str, Any], str]]]:
     """
     Saves Key Result records to Bubble, linking them to their parent objectives.
-
-    Args:
-        org_urn: The URN of the organization.
-        objectives_with_ids: A list of tuples, where each tuple contains an
-                             original objective dictionary and its new Bubble ID.
-                             Example: [(objective_dict, 'bubble_id_123'), ...]
-
-    Returns:
-        A list of tuples containing the original key result data and its new Bubble ID,
-        or None on failure. This is needed to save the tasks in the next step.
+    Returns a list of tuples containing the original key result data and its new Bubble ID, or None on failure.
     """
+    logger.info(f"Starting save_key_results for {len(objectives_with_ids)} objectives.")
     key_result_payloads = []
     # This list preserves the original KR data in the correct order to match the returned IDs
     key_results_to_process = []
-
-    for objective_data, parent_objective_id in objectives_with_ids:
-        for kr in objective_data.get("key_results", []):
-            key_results_to_process.append(kr)
-            key_result_payloads.append({
-                #"organization_urn": org_urn,
-                "okr": parent_objective_id, # Link to parent
-                "description": kr.get("key_result_description"),
-                "target_metric": kr.get("target_metric"),
-                "target_value": kr.get("target_value"),
-                "kr_type": kr.get("key_result_type"),
-                "data_subject": kr.get("data_subject"),
-            })
-
-    if not key_result_payloads:
-        logger.info("No key results to save.")
+    
+    if not objectives_with_ids:
+        logger.info("No objectives provided to save_key_results.")
         return []
 
-    logger.info(f"Attempting to save {len(key_result_payloads)} key results for org_urn: {org_urn}")
-    key_result_ids = bulk_upload_to_bubble(key_result_payloads, BUBBLE_KEY_RESULTS_TABLE_NAME)
-
-    if key_result_ids is None:
-        logger.error("Failed to save key results to Bubble.")
+    try:
+        for objective_data, parent_objective_id in objectives_with_ids:
+            for kr in objective_data.get("key_results", []):
+                key_results_to_process.append(kr)
+                key_result_payloads.append({
+                    "okr": parent_objective_id,
+                    "description": kr.get("key_result_description"),
+                    "target_metric": kr.get("target_metric"),
+                    "target_value": kr.get("target_value"),
+                    "kr_type": kr.get("key_result_type"),
+                    "data_subject": kr.get("data_subject"),
+                })
+
+        if not key_result_payloads:
+            logger.info("No key results to save.")
+            return []
+
+        logger.info(f"Attempting to save {len(key_result_payloads)} key results for org_urn: {org_urn}")
+        key_result_ids = bulk_upload_to_bubble(key_result_payloads, BUBBLE_KEY_RESULTS_TABLE_NAME)
+
+        if key_result_ids is None:
+            logger.error(f"Failed to save key results to Bubble for org_urn: {org_urn}.")
+            return None
+
+        logger.info(f"Successfully saved {len(key_result_ids)} key results.")
+        return list(zip(key_results_to_process, key_result_ids))
+
+    except Exception as e:
+        logger.exception(f"An unexpected error occurred in save_key_results for org_urn {org_urn}: {e}")
         return None
 
-    logger.info(f"Successfully saved {len(key_result_ids)} key results.")
-    # Combine the original KR data with their new IDs
-    return list(zip(key_results_to_process, key_result_ids))
-
 
 def save_tasks(
     org_urn: str,
@@ -164,80 +185,91 @@ def save_tasks(
 ) -> Optional[List[str]]:
     """
     Saves Task records to Bubble, linking them to their parent key results.
-
-    Args:
-        org_urn: The URN of the organization.
-        key_results_with_ids: A list of tuples from the save_key_results function.
-                              Example: [(key_result_dict, 'bubble_id_456'), ...]
-
-    Returns:
-        A list of the newly created Bubble record IDs for the tasks, or None on failure.
+    Returns a list of the newly created Bubble record IDs for the tasks, or None on failure.
     """
-    task_payloads = []
-    for key_result_data, parent_key_result_id in key_results_with_ids:
-        for task in key_result_data.get("tasks", []):
-            task_payloads.append({
-                #"organization_urn": org_urn,
-                "key_result": parent_key_result_id, # Link to parent
-                "description": task.get("task_description"),
-                "objective_deliverable": task.get("objective_deliverable"),
-                "category": task.get("task_category"),
-                #"task_type": task.get("task_type"),
-                "priority": task.get("priority"),
-                "priority_justification": task.get("priority_justification"),
-                "effort": task.get("effort"),
-                "timeline": task.get("timeline"),
-                #"data_subject": task.get("data_subject"),
-                "responsible_party": task.get("responsible_party"),
-                "success_criteria_metrics": task.get("success_criteria_metrics"),
-                "dependencies": task.get("dependencies_prerequisites"),
-                "why": task.get("why_proposed"),
-            })
-
-    if not task_payloads:
-        logger.info("No tasks to save.")
+    logger.info(f"Starting save_tasks for {len(key_results_with_ids)} key results.")
+    if not key_results_with_ids:
+        logger.info("No key results provided to save_tasks.")
         return []
-
-    logger.info(f"Attempting to save {len(task_payloads)} tasks for org_urn: {org_urn}")
-    task_ids = bulk_upload_to_bubble(task_payloads, BUBBLE_TASKS_TABLE_NAME)
-
-    if task_ids is None:
-        logger.error("Failed to save tasks to Bubble.")
+        
+    try:
+        task_payloads = []
+        for key_result_data, parent_key_result_id in key_results_with_ids:
+            for task in key_result_data.get("tasks", []):
+                task_payloads.append({
+                    "key_result": parent_key_result_id,
+                    "description": task.get("task_description"),
+                    "objective_deliverable": task.get("objective_deliverable"),
+                    "category": task.get("task_category"),
+                    "priority": task.get("priority"),
+                    "priority_justification": task.get("priority_justification"),
+                    "effort": task.get("effort"),
+                    "timeline": task.get("timeline"),
+                    "responsible_party": task.get("responsible_party"),
+                    "success_criteria_metrics": task.get("success_criteria_metrics"),
+                    "dependencies": task.get("dependencies_prerequisites"),
+                    "why": task.get("why_proposed"),
+                })
+
+        if not task_payloads:
+            logger.info("No tasks to save.")
+            return []
+
+        logger.info(f"Attempting to save {len(task_payloads)} tasks for org_urn: {org_urn}")
+        task_ids = bulk_upload_to_bubble(task_payloads, BUBBLE_TASKS_TABLE_NAME)
+
+        if task_ids is None:
+            logger.error(f"Failed to save tasks to Bubble for org_urn: {org_urn}.")
+            return None
+
+        logger.info(f"Successfully saved {len(task_ids)} tasks.")
+        return task_ids
+
+    except Exception as e:
+        logger.exception(f"An unexpected error occurred in save_tasks for org_urn {org_urn}: {e}")
         return None
 
-    logger.info(f"Successfully saved {len(task_ids)} tasks.")
-    return task_ids
-
 
 # --- Orchestrator Function ---
 
-def save_actionable_okrs(org_urn: str, actionable_okrs: Dict[str, Any], report_id):
+def save_actionable_okrs(org_urn: str, actionable_okrs: Dict[str, Any], report_id: str):
     """
     Orchestrates the sequential saving of objectives, key results, and tasks.
-
-    This function shows how to correctly call the individual save functions
-    in the right order, passing the IDs from one step to the next.
     """
-    logger.info(f"--- Starting OKR save process for org_urn: {org_urn} ---")
-    objectives_data = actionable_okrs.get("okrs", [])
-
-    # Step 1: Save the top-level objectives
-    objective_ids = save_objectives(org_urn, objectives_data, report_id)
-    if objective_ids is None:
-        logger.error("OKR save process aborted due to failure in saving objectives.")
-        return
-
-    # Combine the original objective data with their new IDs for the next step
-    objectives_with_ids = list(zip(objectives_data, objective_ids))
-
-    # Step 2: Save the key results, linking them to the objectives
-    key_results_with_ids = save_key_results(org_urn, objectives_with_ids)
-    if key_results_with_ids is None:
-        logger.error("OKR save process aborted due to failure in saving key results.")
-        return
-
-    # Step 3: Save the tasks, linking them to the key results
-    save_tasks(org_urn, key_results_with_ids)
-
-    logger.info(f"--- OKR save process completed for org_urn: {org_urn} ---")
+    logger.info(f"--- Starting OKR save process for org_urn: {org_urn}, report_id: {report_id} ---")
+    
+    try:
+        objectives_data = actionable_okrs.get("okrs", [])
+        if not objectives_data:
+            logger.warning(f"No OKRs found in the input for org_urn: {org_urn}. Aborting save process.")
+            return
+
+        # Step 1: Save the top-level objectives
+        # Corrected the argument order from your original code.
+        objective_ids = save_objectives(org_urn, report_id, objectives_data)
+        if objective_ids is None:
+            logger.error("OKR save process aborted due to failure in saving objectives.")
+            return
+
+        # Combine the original objective data with their new IDs for the next step
+        objectives_with_ids = list(zip(objectives_data, objective_ids))
+
+        # Step 2: Save the key results, linking them to the objectives
+        key_results_with_ids = save_key_results(org_urn, objectives_with_ids)
+        if key_results_with_ids is None:
+            logger.error("OKR save process aborted due to failure in saving key results.")
+            return
+
+        # Step 3: Save the tasks, linking them to the key results
+        task_ids = save_tasks(org_urn, key_results_with_ids)
+        if task_ids is None:
+            logger.error("Task saving failed, but objectives and key results were saved.")
+            # Decide if you want to consider the whole process a failure.
+            # For now, we just log the error and complete.
+            return
+
+        logger.info(f"--- OKR save process completed successfully for org_urn: {org_urn} ---")
+        
+    except Exception as e:
+        logger.exception(f"An unhandled exception occurred during the save_actionable_okrs orchestration for org_urn {org_urn}: {e}")