Update app.py

app.py

@@ -33,9 +33,9 @@ if not all([SALESFORCE_USERNAME, SALESFORCE_PASSWORD, SALESFORCE_SECURITY_TOKEN]
 # Initialize Flask app
 app = Flask(__name__)
 
-def fetch_salesforce_input():
+def fetch_salesforce_input(supervisor_id, project_id):
     """
-    Fetch the latest input data from Salesforce Supervisor_Input__c object.
+    Fetch input data from Salesforce for a given supervisor and project.
     """
     try:
         sf = Salesforce(
@@ -46,10 +46,11 @@ def fetch_salesforce_input():
         )
         logger.info("Connected to Salesforce for input fetch")
 
-        query = """
+        query = f"""
             SELECT Supervisor_ID__c, Role__c, Project_ID__c, Weather__c, Milestones__c, Reflection_Log__c
-            FROM Supervisor_Input__c
-            ORDER BY CreatedDate DESC
+            FROM Supervisor_AI_Coaching__c
+            WHERE Supervisor_ID__c = '{supervisor_id}' AND Project_ID__c = '{project_id}'
+            ORDER BY Generated_Date__c DESC
             LIMIT 1
         """
         result = sf.query(query)
@@ -60,15 +61,15 @@ def fetch_salesforce_input():
                 'role': record['Role__c'] or '',
                 'project_id': record['Project_ID__c'] or '',
                 'weather': record['Weather__c'] or '',
-                'milestones': record['Milestones__c'].split(',') if record['Milestones__c'] else [],
+                'milestones': record['Milestones__c'] or '',
                 'reflection': record['Reflection_Log__c'] or ''
             }
         else:
-            logger.info("No input data found in Salesforce")
+            logger.info("No input data found for supervisor %s and project %s", supervisor_id, project_id)
             return None
 
     except Exception as e:
-        logger.error("Salesforce input fetch error: %s", e)
+        logger.error("Salesforce fetch error: %s", e)
         return None
 
 def generate_coaching_output(data):
@@ -148,7 +149,7 @@ def save_to_salesforce(output, supervisor_id, project_id):
             security_token=SALESFORCE_SECURITY_TOKEN,
             domain=SALESFORCE_DOMAIN
         )
-        logger.info("Connected to Salesforce for saving output")
+        logger.info("Connected to Salesforce")
 
         coaching_record = {
             "Supervisor_ID__c": supervisor_id,
@@ -167,7 +168,7 @@ def save_to_salesforce(output, supervisor_id, project_id):
         return True
 
     except Exception as e:
-        logger.error("Salesforce save error: %s", e)
+        logger.error("Salesforce error: %s", e)
         return False
 
 @app.route('/', methods=['GET'])
@@ -180,44 +181,42 @@ def redirect_to_ui():
 @app.route('/ui', methods=['GET'])
 def ui():
     """
-    Fetch input from Salesforce, generate output, save to Salesforce, and display both.
+    Serve the HTML user interface, fetch input from Salesforce, generate output, and save to Salesforce.
     """
     form_data = {}
     output = {}
-    error = ""
-
-    # Step 1: Fetch input data from Salesforce
-    input_data = fetch_salesforce_input()
-    if not input_data:
-        error = "Error: No input data found in Salesforce or failed to connect."
-    else:
-        form_data = input_data
-        # Validate all fields
-        if not all([form_data['supervisor_id'], form_data['role'], form_data['project_id'], 
-                   form_data['weather'], form_data['milestones'], form_data['reflection']]):
-            error = "Error: Some required fields are missing in Salesforce input data."
-        else:
-            # Step 2: Generate coaching output
-            data = {
-                'supervisor_id': form_data['supervisor_id'],
-                'role': form_data['role'],
-                'project_id': form_data['project_id'],
-                'milestones': form_data['milestones'],
-                'reflection_log': form_data['reflection'],
-                'weather': form_data['weather']
-            }
-            coaching_output = generate_coaching_output(data)
-            if coaching_output:
-                # Step 3: Save output to Salesforce
-                success = save_to_salesforce(coaching_output, data['supervisor_id'], data['project_id'])
-                if success:
-                    output = coaching_output
-                else:
-                    error = "Error: Failed to save output to Salesforce."
+
+    # Hardcoded supervisor_id and project_id for demonstration
+    # In a real application, these should come from URL parameters, user session, or another source
+    supervisor_id = "SUP-001"
+    project_id = "PROJ-123"
+
+    # Fetch input data from Salesforce
+    sf_input = fetch_salesforce_input(supervisor_id, project_id)
+    if sf_input:
+        form_data = sf_input
+        # Prepare data for generating output
+        data = {
+            'supervisor_id': form_data['supervisor_id'],
+            'role': form_data['role'],
+            'project_id': form_data['project_id'],
+            'milestones': [m.strip() for m in form_data['milestones'].split(',') if m.strip()],
+            'reflection_log': form_data['reflection'],
+            'weather': form_data['weather']
+        }
+        # Generate output automatically
+        coaching_output = generate_coaching_output(data)
+        if coaching_output:
+            # Save the generated output to Salesforce
+            success = save_to_salesforce(coaching_output, supervisor_id, project_id)
+            if success:
+                output = coaching_output
             else:
-                error = "Error: Failed to generate coaching output."
+                logger.error("Failed to save generated output to Salesforce")
+        else:
+            logger.error("Failed to generate coaching output")
 
-    return render_template('index.html', form_data=form_data, output=output, error=error)
+    return render_template('index.html', form_data=form_data, output=output)
 
 @app.route('/health', methods=['GET'])
 def health_check():