Update entity_relationship_generator.py

entity_relationship_generator.py

@@ -331,14 +331,6 @@ def generate_entity_relationship_diagram(json_input: str, output_format: str) ->
             {"name": "cod_depto", "type": "primary_key"},
             {"name": "nombre_depto", "type": "regular"}
           ]
-        },
-        {
-          "name": "PROYECTO",
-          "type": "strong",
-          "attributes": [
-            {"name": "cod_proyecto", "type": "primary_key"},
-            {"name": "nombre_proyecto", "type": "regular"}
-          ]
         }
       ],
       "relationships": [
@@ -350,15 +342,6 @@ def generate_entity_relationship_diagram(json_input: str, output_format: str) ->
             "EMPLEADO": "N",
             "DEPARTAMENTO": "1"
           }
-        },
-        {
-          "name": "Trabaja_en",
-          "type": "regular",
-          "entities": ["EMPLEADO", "PROYECTO"],
-          "cardinalities": {
-            "EMPLEADO": "M",
-            "PROYECTO": "N"
-          }
         }
       ]
     }
@@ -375,112 +358,68 @@ def generate_entity_relationship_diagram(json_input: str, output_format: str) ->
         if 'entities' not in data:
             raise ValueError("Missing required field: entities")
 
-        # Crear grafo con configuración simple y funcional
-        dot = graphviz.Graph(comment='ER Diagram', engine='dot')
-        dot.attr(rankdir='TB', bgcolor='white', pad='0.5', nodesep='1.0', ranksep='1.5')
-        dot.attr('node', fontname='Arial', fontsize='10')
-        dot.attr('edge', fontname='Arial', fontsize='9')
+        # Usar Digraph para mejor control del layout
+        dot = graphviz.Digraph(comment='ER Diagram', engine='dot')
+        dot.attr(
+            rankdir='TB',
+            bgcolor='white', 
+            pad='0.5',
+            nodesep='0.5',
+            ranksep='1.0',
+            splines='ortho'
+        )
+        dot.attr('node', fontname='Arial', fontsize='10', color='#404040')
+        dot.attr('edge', fontname='Arial', fontsize='9', color='#404040')
         
         entities = data.get('entities', [])
         relationships = data.get('relationships', [])
         
-        # Crear entidades
+        # Crear entidades con atributos incluidos en la tabla
         for entity in entities:
             entity_name = entity.get('name')
             entity_type = entity.get('type', 'strong')
+            attributes = entity.get('attributes', [])
             
             if not entity_name:
                 continue
             
-            if entity_type == 'weak':
-                # Entidad débil: rectángulo con doble borde
-                dot.node(
-                    entity_name, 
-                    entity_name, 
-                    shape='box', 
-                    style='filled', 
-                    fillcolor='#e8e8e8',
-                    color='#404040',
-                    penwidth='3'
-                )
-            else:
-                # Entidad fuerte: rectángulo simple
-                dot.node(
-                    entity_name, 
-                    entity_name, 
-                    shape='box', 
-                    style='filled', 
-                    fillcolor='#e8e8e8',
-                    color='#404040',
-                    penwidth='1'
-                )
-        
-        # Crear atributos para cada entidad
-        for entity in entities:
-            entity_name = entity.get('name')
-            attributes = entity.get('attributes', [])
-            
-            for i, attr in enumerate(attributes):
-                attr_name = attr.get('name', '')
-                attr_type = attr.get('type', 'regular')
+            # Construir tabla HTML para entidad con atributos
+            if attributes:
+                # Crear tabla con nombre de entidad y atributos
+                attr_rows = []
+                for attr in attributes:
+                    attr_name = attr.get('name', '')
+                    attr_type = attr.get('type', 'regular')
+                    
+                    if attr_type == 'primary_key':
+                        attr_rows.append(f'<TR><TD><U><B>{attr_name}</B></U></TD></TR>')
+                    elif attr_type == 'partial_key':
+                        attr_rows.append(f'<TR><TD><U>{attr_name}</U></TD></TR>')
+                    elif attr_type == 'multivalued':
+                        attr_rows.append(f'<TR><TD>{{{attr_name}}}</TD></TR>')
+                    elif attr_type == 'derived':
+                        attr_rows.append(f'<TR><TD>/{attr_name}/</TD></TR>')
+                    else:
+                        attr_rows.append(f'<TR><TD>{attr_name}</TD></TR>')
                 
-                attr_id = f"{entity_name}_attr_{i}"
+                attr_html = ''.join(attr_rows)
                 
-                if attr_type == 'primary_key':
-                    # Clave primaria: elipse con texto subrayado
-                    dot.node(
-                        attr_id, 
-                        f'{attr_name}', 
-                        shape='ellipse', 
-                        style='filled',
-                        fillcolor='#d8d8d8',
-                        color='#404040',
-                        xlabel=f'PK: {attr_name}'
-                    )
-                elif attr_type == 'partial_key':
-                    # Clave parcial
-                    dot.node(
-                        attr_id, 
-                        attr_name, 
-                        shape='ellipse', 
-                        style='filled,dashed',
-                        fillcolor='#d8d8d8',
-                        color='#404040'
-                    )
-                elif attr_type == 'multivalued':
-                    # Atributo multivaluado: doble elipse (simulado con penwidth)
-                    dot.node(
-                        attr_id, 
-                        attr_name, 
-                        shape='ellipse', 
-                        style='filled',
-                        fillcolor='#d8d8d8',
-                        color='#404040',
-                        penwidth='3'
-                    )
-                elif attr_type == 'derived':
-                    # Atributo derivado
-                    dot.node(
-                        attr_id, 
-                        f'/{attr_name}/', 
-                        shape='ellipse', 
-                        style='filled,dashed',
-                        fillcolor='#d8d8d8',
-                        color='#404040'
-                    )
+                if entity_type == 'weak':
+                    # Entidad débil con doble borde
+                    label = f'<<TABLE BORDER="3" CELLBORDER="1" CELLSPACING="0" CELLPADDING="6" BGCOLOR="#e8e8e8"><TR><TD COLSPAN="1"><B>{entity_name}</B></TD></TR><HR/>{attr_html}</TABLE>>'
                 else:
-                    # Atributo regular
-                    dot.node(
-                        attr_id, 
-                        attr_name, 
-                        shape='ellipse', 
-                        style='filled',
-                        fillcolor='#d8d8d8',
-                        color='#404040'
-                    )
+                    # Entidad fuerte
+                    label = f'<<TABLE BORDER="1" CELLBORDER="0" CELLSPACING="0" CELLPADDING="6" BGCOLOR="#e8e8e8"><TR><TD COLSPAN="1"><B>{entity_name}</B></TD></TR><HR/>{attr_html}</TABLE>>'
                 
-                # Conectar atributo con entidad
-                dot.edge(entity_name, attr_id, color='#404040')
+                dot.node(entity_name, label, shape='plaintext')
+            else:
+                # Entidad sin atributos
+                if entity_type == 'weak':
+                    dot.node(entity_name, entity_name, shape='box', style='filled', 
+                            fillcolor='#e8e8e8', color='#404040', penwidth='3')
+                else:
+                    dot.node(entity_name, entity_name, shape='box', style='filled', 
+                            fillcolor='#e8e8e8', color='#404040', penwidth='1')
         
         # Crear relaciones
         for relationship in relationships:
@@ -499,70 +438,55 @@ def generate_entity_relationship_diagram(json_input: str, output_format: str) ->
                 children = relationship.get('children', [])
                 
                 if parent and children:
-                    # Crear nodo ISA
-                    dot.node(
-                        rel_name, 
-                        'ISA', 
-                        shape='triangle', 
-                        style='filled',
-                        fillcolor='#c8c8c8',
-                        color='#404040'
-                    )
+                    dot.node(rel_name, 'ISA', shape='triangle', style='filled',
+                            fillcolor='#c8c8c8', color='#404040')
                     
-                    # Conectar padre con ISA
-                    dot.edge(parent, rel_name, color='#404040')
+                    dot.edge(parent, rel_name, dir='none', color='#404040')
                     
-                    # Conectar ISA con hijos
                     for child in children:
-                        dot.edge(rel_name, child, color='#404040')
+                        dot.edge(rel_name, child, dir='none', color='#404040')
                 
             elif rel_type == 'identifying':
-                # Relación identificadora: rombo con doble borde
-                dot.node(
-                    rel_name, 
-                    rel_name, 
-                    shape='diamond', 
-                    style='filled',
-                    fillcolor='#c8c8c8',
-                    color='#404040',
-                    penwidth='3'
-                )
+                # Relación identificadora
+                if rel_attributes:
+                    # Con atributos
+                    attr_rows = []
+                    for attr in rel_attributes:
+                        attr_name = attr.get('name', '')
+                        attr_rows.append(f'<TR><TD>{attr_name}</TD></TR>')
+                    
+                    attr_html = ''.join(attr_rows)
+                    label = f'<<TABLE BORDER="3" CELLBORDER="0" CELLSPACING="0" CELLPADDING="4" BGCOLOR="#c8c8c8"><TR><TD><B>{rel_name}</B></TD></TR>{attr_html}</TABLE>>'
+                    dot.node(rel_name, label, shape='plaintext')
+                else:
+                    dot.node(rel_name, rel_name, shape='diamond', style='filled',
+                            fillcolor='#c8c8c8', color='#404040', penwidth='3')
                 
                 # Conectar entidades
                 for entity in entities_involved:
                     cardinality = cardinalities.get(entity, '1')
-                    dot.edge(entity, rel_name, label=cardinality, color='#404040')
+                    dot.edge(entity, rel_name, label=cardinality, dir='none', color='#404040')
                 
             else:
-                # Relación regular: rombo simple
-                dot.node(
-                    rel_name, 
-                    rel_name, 
-                    shape='diamond', 
-                    style='filled',
-                    fillcolor='#c8c8c8',
-                    color='#404040'
-                )
-                
-                # Crear atributos de la relación si existen
-                for i, attr in enumerate(rel_attributes):
-                    attr_name = attr.get('name', '')
-                    attr_id = f"{rel_name}_attr_{i}"
+                # Relación regular
+                if rel_attributes:
+                    # Con atributos
+                    attr_rows = []
+                    for attr in rel_attributes:
+                        attr_name = attr.get('name', '')
+                        attr_rows.append(f'<TR><TD>{attr_name}</TD></TR>')
                     
-                    dot.node(
-                        attr_id, 
-                        attr_name, 
-                        shape='ellipse', 
-                        style='filled',
-                        fillcolor='#d8d8d8',
-                        color='#404040'
-                    )
-                    dot.edge(rel_name, attr_id, color='#404040')
+                    attr_html = ''.join(attr_rows)
+                    label = f'<<TABLE BORDER="1" CELLBORDER="0" CELLSPACING="0" CELLPADDING="4" BGCOLOR="#c8c8c8"><TR><TD><B>{rel_name}</B></TD></TR>{attr_html}</TABLE>>'
+                    dot.node(rel_name, label, shape='plaintext')
+                else:
+                    dot.node(rel_name, rel_name, shape='diamond', style='filled',
+                            fillcolor='#c8c8c8', color='#404040')
                 
-                # Conectar entidades con la relación
+                # Conectar entidades
                 for entity in entities_involved:
                     cardinality = cardinalities.get(entity, '1')
-                    dot.edge(entity, rel_name, label=cardinality, color='#404040')
+                    dot.edge(entity, rel_name, label=cardinality, dir='none', color='#404040')
 
         # Renderizar el diagrama
         with NamedTemporaryFile(delete=False, suffix=f'.{output_format}') as tmp: