app.py

app.py

@@ -82,7 +82,7 @@ def extract_climate_data(api_key, file_path=None, url=None):
 def process_climate_document(api_key, file, url_input):
     """
     The function `process_climate_document` extracts climate data from either a file or URL input and
-    generates a structured analysis report.
+    returns structured JSON data.
     
     :param api_key: The `api_key` parameter is typically a unique identifier or access token that allows
     you to authenticate and access a specific API or service. It is used in the
@@ -95,49 +95,20 @@ def process_climate_document(api_key, file, url_input):
     provide a URL input for extracting climate data. This URL should point to a document or webpage
     containing climate-related information that needs to be analyzed. The function will extract data
     from this URL if it is provided
-    :return: The function `process_climate_document` returns a formatted string containing the analysis
-    results of a climate document. The output includes information about the document type, title,
-    organization, publication date, structured data (in JSON format), extracted climate data, chart
-    analysis, and extracted text. If there is an error during the extraction process, it will return an
-    error message.
+    :return: The function `process_climate_document` returns a JSON object containing the analysis
+    results of a climate document including climate_data, chart_descriptions, and extracted_text.
     """
     if file:
         result = extract_climate_data(api_key, file_path=file.name)
     elif url_input.strip():
         result = extract_climate_data(api_key, url=url_input.strip())
     else:
-        return "Please provide either a file or URL"
+        return {"error": "Please provide either a file or URL"}
+    
     if "error" in result:
-        return f"Error: {result['error']}"
-    output = "# Climate Document Analysis Results\n\n"
-    if result.get("climate_data"):
-        data = result['climate_data']
-        if isinstance(data, dict):
-            output += f"## Document Overview:\n"
-            output += f"**Type:** {data.get('document_type', 'N/A')}\n"
-            output += f"**Title:** {data.get('title', 'N/A')}\n"
-            output += f"**Organization:** {data.get('organization', 'N/A')}\n"
-            output += f"**Date:** {data.get('publication_date', 'N/A')}\n\n"
-            output += "## Complete Structured Data:\n"
-            output += f"```json\n{json.dumps(data, indent=2)}\n```\n\n"
-        else:
-            output += "## Extracted Climate Data:\n"
-            output += f"```\n{str(data)}\n```\n\n"
-    if result.get("chart_descriptions"):
-        output += "## Chart Analysis:\n"
-        charts = result['chart_descriptions']
-        if isinstance(charts, list):
-            for i, chart in enumerate(charts, 1):
-                if isinstance(chart, dict):
-                    output += f"### Chart {i}:\n{json.dumps(chart, indent=2)}\n\n"
-                else:
-                    output += f"### Chart {i}:\n{str(chart)}\n\n"
-        else:
-            output += f"```\n{str(charts)}\n```\n\n"
-    if result.get("extracted_text"):
-        output += "## Extracted Text:\n"
-        output += f"{result['extracted_text']}...\n\n"
-    return output
+        return {"error": result['error']}
+    
+    return result
 
 def analyze_image(api_key, image):
     """
@@ -196,7 +167,7 @@ def analyze_image(api_key, image):
                 "temperature_anomaly": 0.0,
                 "description": "Error parsing model output."
             }
-        return json.dumps(result, indent=2)
+        return result
     except Exception as e:
         error_result = {
             "image_type": "error",
@@ -207,7 +178,7 @@ def analyze_image(api_key, image):
             "temperature_anomaly": 0.0,
             "description": f"Error processing image: {str(e)}"
         }
-        return json.dumps(error_result, indent=2)
+        return error_result
 
 with gr.Blocks(title="Climate Data and Image Analyzer") as demo:
     gr.Markdown("# Climate Data and Image Analysis Tool\nAnalyze climate documents or images using Mistral OCR and Pixtral models")
@@ -231,7 +202,7 @@ with gr.Blocks(title="Climate Data and Image Analyzer") as demo:
                     )
                     process_btn = gr.Button("Analyze Document", variant="primary")
                 with gr.Column():
-                    doc_output = gr.Markdown(label="Document Analysis Results")
+                    doc_output = gr.JSON(label="Document Analysis Results")
             process_btn.click(
                 fn=process_climate_document,
                 inputs=[api_key_input, file_input, url_input],