Update graph_tool.py

graph_tool.py

@@ -4,27 +4,40 @@ import matplotlib.pyplot as plt
 import numpy as np
 import json
 
-def generate_plot(data_json, labels_json, plot_type, title, x_label="", y_label=""):
+def generate_plot_single_input(plot_config_json):
     """
     Generates a plot (bar, line, or pie) and returns it as an HTML-formatted Base64-encoded image string.
     
     Args:
-        data_json (str): JSON string containing data dictionary where keys are labels and values are numerical data.
-        labels_json (str): JSON string containing list of labels for the data points.
-        plot_type (str): The type of plot to generate ('bar', 'line', or 'pie').
-        title (str): The title of the plot.
-        x_label (str): The label for the x-axis.
-        y_label (str): The label for the y-axis.
+        plot_config_json (str): JSON string containing all plot configuration:
+            {
+                "data": {"key1": value1, "key2": value2, ...},
+                "labels": ["label1", "label2", ...],
+                "plot_type": "bar|line|pie",
+                "title": "Plot Title",
+                "x_label": "X Axis Label" (optional),
+                "y_label": "Y Axis Label" (optional)
+            }
         
     Returns:
         str: An HTML img tag with Base64-encoded plot image.
     """
     try:
-        # Parse JSON strings
-        data = json.loads(data_json)
-        labels = json.loads(labels_json)
+        # Parse the main JSON configuration
+        config = json.loads(plot_config_json)
     except json.JSONDecodeError as e:
-        return f'<p style="color:red;">Error parsing JSON data: {e}</p>'
+        return f'<p style="color:red;">Error parsing JSON configuration: {e}</p>'
+    
+    # Extract parameters with defaults
+    try:
+        data = config.get("data", {})
+        labels = config.get("labels", [])
+        plot_type = config.get("plot_type", "bar")
+        title = config.get("title", "Untitled Plot")
+        x_label = config.get("x_label", "")
+        y_label = config.get("y_label", "")
+    except Exception as e:
+        return f'<p style="color:red;">Error extracting configuration parameters: {e}</p>'
     
     # Validate inputs
     if not isinstance(data, dict):
@@ -99,4 +112,15 @@ def generate_plot(data_json, labels_json, plot_type, title, x_label="", y_label=
          
     except Exception as e:
         plt.close('all')  # Clean up any open figures
-        return f'<p style="color:red;">Error generating plot: {str(e)}</p>'
+        return f'<p style="color:red;">Error generating plot: {str(e)}</p>'
+
+# Example usage:
+# plot_config = {
+#     "data": {"A": 10, "B": 20, "C": 15},
+#     "labels": ["Category A", "Category B", "Category C"],
+#     "plot_type": "bar",
+#     "title": "Sample Bar Chart",
+#     "x_label": "Categories",
+#     "y_label": "Values"
+# }
+# result = generate_plot_single_input(json.dumps(plot_config))