changed prompt

python_code_executor_service.py

@@ -61,7 +61,6 @@ class PythonExecutor:
         self.df = df
         self.charts_folder = Path(charts_folder)
         self.charts_folder.mkdir(exist_ok=True)
-        self.exec_globals = None
         
     def execute_code(self, code: str) -> Dict[str, Any]:
         """
@@ -76,7 +75,6 @@ class PythonExecutor:
         output = ""
         error = None
         plots = []
-        locals_dict = {}
         
         # Capture stdout
         stdout = io.StringIO()
@@ -97,7 +95,7 @@ class PythonExecutor:
         
         try:
             # Create comprehensive execution context with data analysis libraries
-            self.exec_globals = {
+            exec_globals = {
                 # Core data analysis
                 'pd': pd,
                 'np': np,
@@ -125,13 +123,10 @@ class PythonExecutor:
             
             # Execute code and capture output
             with contextlib.redirect_stdout(stdout):
-                exec(code, self.exec_globals, locals_dict)
+                exec(code, exec_globals)
             
             output = stdout.getvalue()
             
-            # Merge any local variables into globals
-            self.exec_globals.update(locals_dict)
-            
         except Exception as e:
             error = {
                 "message": str(e),
@@ -144,8 +139,7 @@ class PythonExecutor:
         return {
             'output': output,
             'error': error,
-            'plots': plots,
-            'locals': self.exec_globals
+            'plots': plots
         }
     
     async def save_plot_to_supabase(self, plot_data: bytes, description: str, chat_id: str) -> str:
@@ -195,37 +189,40 @@ class PythonExecutor:
             '\n' in output and '=' in output  # Python console output
         )
     
-    def _format_result(self, result: Any) -> str:
-        """Format the result for display"""
-        if isinstance(result, (pd.DataFrame, pd.Series)):
-            return str(result)
-        elif isinstance(result, (dict, list)):
-            return json.dumps(result, indent=2)
-        return str(result)
-    
     async def process_response(self, response: CsvChatResult, chat_id: str) -> str:
-     """Process the response with proper variable handling"""
-     output_parts = [response.casual_response]
-    
-     for operation in response.analysis_operations:
-        execution_result = self.execute_code(operation.code.code)
+        """
+        Process the CsvChatResult response and generate formatted output
+        with markdown code blocks for structured data.
         
-        # First check locals, then globals for the result variable
-        result = execution_result['locals'].get(
-            operation.result_var,
-            self.exec_globals.get(operation.result_var)
-        )
+        Args:
+            response (CsvChatResult): Response from CSV analysis
+            chat_id (str): ID of the chat session
+            
+        Returns:
+            str: Formatted output with results and image URLs
+        """
+        output_parts = []
+        
+        # Add casual response
+        output_parts.append(response.casual_response)
         
-        if execution_result['error']:
-            output_parts.append(f"\nError in operation:")
-            output_parts.append("```python\n" + execution_result['error']['message'] + "\n```")
-        elif result is not None:
-            output_parts.append(f"\nResult from '{operation.result_var}':")
-            output_parts.append("```python\n" + self._format_result(result) + "\n```")
-        else:
-            output_parts.append(f"\nVariable '{operation.result_var}' not found. Showing output instead:")
-            if execution_result['output'].strip():
-                output_parts.append("```\n" + execution_result['output'].strip() + "\n```")
+        # Process analysis operations
+        for operation in response.analysis_operations:
+            # Execute the code
+            result = self.execute_code(operation.code.code)
+            
+            # Add operation description
+            output_parts.append(f"\n{operation.description}:")
+            
+            # Add output or error with markdown wrapping
+            if result['error']:
+                output_parts.append("```python\n" + f"Error: {result['error']['message']}" + "\n```")
+            else:
+                output = result['output'].strip()
+                if self._looks_like_structured_data(output):
+                    output_parts.append("```python\n" + output + "\n```")
+                else:
+                    output_parts.append(output)
         
         # Process charts
         if response.charts:
@@ -248,4 +245,8 @@ class PythonExecutor:
                     elif result['error']:
                         output_parts.append("```python\n" + f"Error generating {chart.image_description}: {result['error']['message']}" + "\n```")
         
-        return "\n".join(output_parts)
+        return "\n".join(output_parts)
+
+
+
+