Update process_flow_generator.py

process_flow_generator.py

@@ -25,35 +25,39 @@ def generate_process_flow_diagram(json_input: str, base_color: str) -> str:
           "id": "step1",
           "label": "Gather Requirements",
           "type": "process",
-          "relationship": "Next",
-          "subnodes": [
-            {"id": "step1_1", "label": "Define Scope", "type": "process", "relationship": "Then"}
-          ]
+          "relationship": "Next"
         },
         {
           "id": "decision1",
           "label": "Is Data Available?",
           "type": "decision",
-          "relationship": "Check",
-          "subnodes": [
-            {"id": "path_yes", "label": "Process Data", "type": "process", "relationship": "Yes"},
-            {"id": "path_no", "label": "Collect More Data", "type": "process", "relationship": "No"}
-          ]
+          "relationship": "Check"
+        },
+        {
+          "id": "path_yes",
+          "label": "Process Data",
+          "type": "process",
+          "relationship": "Yes"
+        },
+        {
+          "id": "path_no",
+          "label": "Collect More Data",
+          "type": "process",
+          "relationship": "No"
         },
         {
           "id": "end_node",
           "label": "End Process",
-          "type": "end",
-          "relationship": "Concludes"
+          "type": "end"
         }
       ],
       "connections": [
-        {"from": "start_node", "to": "step1"},
-        {"from": "step1", "to": "decision1"},
+        {"from": "start_node", "to": "step1", "label": "Start"},
+        {"from": "step1", "to": "decision1", "label": "Continue"},
         {"from": "decision1", "to": "path_yes", "label": "Yes"},
         {"from": "decision1", "to": "path_no", "label": "No"},
-        {"from": "path_yes", "to": "end_node"},
-        {"from": "path_no", "to": "end_node"}
+        {"from": "path_yes", "to": "end_node", "label": "Done"},
+        {"from": "path_no", "to": "end_node", "label": "Done"}
       ]
     }
     """
@@ -65,13 +69,13 @@ def generate_process_flow_diagram(json_input: str, base_color: str) -> str:
         
         # Determine specific node shapes for flowchart types
         node_shapes = {
-            "process": "box",
-            "decision": "diamond",
-            "start": "Mrecord", # Rounded box for start/end
-            "end": "Mrecord",    # Rounded box for start/end
-            "io": "parallelogram", # Input/Output
-            "document": "note",
-            "default": "box"
+            "process": "box",          # Rectangle for processes
+            "decision": "diamond",     # Diamond for decisions
+            "start": "oval",           # Oval for start
+            "end": "oval",             # Oval for end
+            "io": "parallelogram",     # Input/Output
+            "document": "note",        # Document symbol
+            "default": "box"           # Fallback
         }
 
         dot = graphviz.Digraph(
@@ -81,45 +85,41 @@ def generate_process_flow_diagram(json_input: str, base_color: str) -> str:
                 'rankdir': 'TB',        # Top-to-Bottom flow is common for flowcharts
                 'splines': 'ortho',     # Straight lines with 90-degree bends
                 'bgcolor': 'white',     # White background
-                'pad': '0.5'            # Padding around the graph
-            },
-            node_attr={'style': 'filled,rounded', 'fontcolor': 'white', 'fontsize': '12'} # Default node style
+                'pad': '0.5',           # Padding around the graph
+                'nodesep': '0.6',       # Spacing between nodes on same rank
+                'ranksep': '0.8'        # Spacing between ranks
+            }
         )
         
+        # Ensure base_color is valid, fallback if not
+        if not isinstance(base_color, str) or not base_color.startswith('#') or len(base_color) != 7:
+            base_color = '#19191a' # Fallback to default dark if invalid
+
         # Add all nodes based on JSON structure
-        all_nodes = {}
+        all_nodes_data = {}
+        # Special handling for start_node if defined separately
         if 'start_node' in data:
-            all_nodes[data['start_node']] = {"label": data['start_node'], "type": "start"}
+            all_nodes_data[data['start_node']] = {"label": data['start_node'], "type": "start"}
         
         for node_data in data.get('nodes', []):
-            all_nodes[node_data['id']] = node_data
+            all_nodes_data[node_data['id']] = node_data
 
-        # Add nodes with specific shapes and styles
-        for node_id, node_info in all_nodes.items():
+        for node_id, node_info in all_nodes_data.items():
             node_type = node_info.get("type", "default")
             shape = node_shapes.get(node_type, "box") # Default to box if type is unknown
 
-            # Calculate color for current node based on a simplified depth or fixed for process flow
-            # For simplicity in process flow, let's keep the base color for all primary nodes for now,
-            # or apply a subtle gradient if depth is truly defined in a meaningful way.
-            # Here, we'll use the base_color for all nodes, making the color selection more direct.
-            
-            # Simple color lightening for sub-levels if 'subnodes' are used in a nested process
-            # This logic mimics graph_generator_utils but is adapted for the specific flow structure
-            # For a pure flowchart, often nodes are all the same color.
-            # If you want gradient for subprocesses, the current_depth logic needs to be more robust for different node types.
-            
-            # Let's use base_color directly for all main nodes and only apply gradient for 'subnodes'
-            # For now, we'll pass current_depth=0 to add_nodes_and_edges when called recursively
-            # to ensure the main flow nodes are consistent.
+            # Use base_color for all nodes for consistent flowchart look
+            # You can adapt add_nodes_and_edges if you want color gradient per depth for flowcharts too
+            fill_color_for_node = base_color
+            font_color_for_node = 'white' if base_color == '#19191a' else 'black' # Keep text readable
 
             dot.node(
                 node_id,
                 node_info['label'],
                 shape=shape,
-                style='filled,rounded',
-                fillcolor=base_color, # Use the selected base color
-                fontcolor='white' if base_color == '#19191a' else 'black', # Adjust for readability
+                style='filled,rounded', # Keep rounded corners
+                fillcolor=fill_color_for_node, 
+                fontcolor=font_color_for_node,
                 fontsize='14'
             )
 
@@ -134,13 +134,6 @@ def generate_process_flow_diagram(json_input: str, base_color: str) -> str:
                 fontsize='10'
             )
         
-        # If there's a start_node, ensure it's visually marked
-        if 'start_node' in data:
-            dot.node(data['start_node'], data['start_node'], shape=node_shapes['start'], style='filled,rounded', fillcolor='#2196F3', fontcolor='white', fontsize='14')
-        if 'end_node' in data and data['end_node'] in all_nodes:
-             dot.node(data['end_node'], all_nodes[data['end_node']]['label'], shape=node_shapes['end'], style='filled,rounded', fillcolor='#F44336', fontcolor='white', fontsize='14')
-
-
         # Save to temporary file
         with NamedTemporaryFile(delete=False, suffix='.png') as tmp:
             dot.render(tmp.name, format='png', cleanup=True)