Update network_graph_generator.py

network_graph_generator.py

@@ -16,26 +16,31 @@ def generate_network_graph(json_input: str, output_format: str) -> str:
         dot = graphviz.Graph(
             name='NetworkGraph',
             format='png',
-            engine='neato',
+            engine='dot',
             graph_attr={
-                'overlap': 'false',
-                'splines': 'true',
+                'rankdir': 'TB',
+                'splines': 'ortho',
                 'bgcolor': 'white',
                 'pad': '0.5',
-                'layout': 'neato'
-            },
-            node_attr={
-                'fixedsize': 'false'
+                'nodesep': '1.5',
+                'ranksep': '2.0'
             }
         )
         
         base_color = '#19191a'
-        lightening_factor = 0.12
+        
+        type_colors = {
+            'server': base_color,
+            'service': '#4a90e2',
+            'database': '#a0a0a0',
+            'user': '#f39c12',
+            'default': base_color
+        }
         
         nodes = data.get('nodes', [])
         connections = data.get('connections', [])
         
-        for i, node in enumerate(nodes):
+        for node in nodes:
             node_id = node.get('id')
             label = node.get('label')
             node_type = node.get('type', 'default')
@@ -43,48 +48,39 @@ def generate_network_graph(json_input: str, output_format: str) -> str:
             if not all([node_id, label]):
                 raise ValueError(f"Invalid node: {node}")
             
-            current_depth = node.get('depth', i % 5)
+            node_color = type_colors.get(node_type, type_colors['default'])
             
-            if not isinstance(base_color, str) or not base_color.startswith('#') or len(base_color) != 7:
-                base_color_safe = '#19191a'
+            if node_type == 'database' or node_color == '#a0a0a0':
+                font_color = 'black'
+            elif node_color == '#f39c12':
+                font_color = 'black'
             else:
-                base_color_safe = base_color
-                
-            base_r = int(base_color_safe[1:3], 16)
-            base_g = int(base_color_safe[3:5], 16)
-            base_b = int(base_color_safe[5:7], 16)
-            
-            current_r = base_r + int((255 - base_r) * current_depth * lightening_factor)
-            current_g = base_g + int((255 - base_g) * current_depth * lightening_factor)
-            current_b = base_b + int((255 - base_b) * current_depth * lightening_factor)
-            
-            current_r = min(255, current_r)
-            current_g = min(255, current_g)
-            current_b = min(255, current_b)
-            
-            node_color = f'#{current_r:02x}{current_g:02x}{current_b:02x}'
-            font_color = 'white' if current_depth * lightening_factor < 0.6 else 'black'
-            font_size = max(9, 14 - (current_depth * 1))
+                font_color = 'white'
             
             if node_type == 'server':
                 shape = 'box'
+                style = 'filled,rounded'
             elif node_type == 'database':
                 shape = 'cylinder'
+                style = 'filled'
             elif node_type == 'user':
                 shape = 'ellipse'
+                style = 'filled'
             elif node_type == 'service':
                 shape = 'hexagon'
+                style = 'filled'
             else:
                 shape = 'circle'
+                style = 'filled'
             
             dot.node(
                 node_id,
                 label,
                 shape=shape,
-                style='filled',
+                style=style,
                 fillcolor=node_color,
                 fontcolor=font_color,
-                fontsize=str(font_size)
+                fontsize='12'
             )
         
         for connection in connections: