Update entity_relationship_generator.py

entity_relationship_generator.py

@@ -319,9 +319,8 @@ def generate_entity_relationship_diagram(json_input: str, output_format: str) ->
           "name": "EMPLEADO",
           "type": "strong",
           "attributes": [
-            {"name": "num_matricula", "type": "primary_key"},
-            {"name": "nombre", "type": "regular"},
-            {"name": "direccion", "type": "regular"}
+            {"name": "num_empleado", "type": "primary_key"},
+            {"name": "nombre", "type": "regular"}
           ]
         },
         {
@@ -358,137 +357,148 @@ def generate_entity_relationship_diagram(json_input: str, output_format: str) ->
         if 'entities' not in data:
             raise ValueError("Missing required field: entities")
 
-        # Usar Digraph para mejor control del layout
-        dot = graphviz.Digraph(comment='ER Diagram', engine='dot')
+        # Configuración simple y limpia
+        dot = graphviz.Graph(comment='ER Diagram', engine='neato')
         dot.attr(
-            rankdir='TB',
-            bgcolor='white', 
-            pad='0.5',
-            nodesep='0.5',
-            ranksep='1.0',
-            splines='ortho'
+            bgcolor='white',
+            pad='1.0',
+            overlap='false',
+            splines='true',
+            sep='+25'
         )
-        dot.attr('node', fontname='Arial', fontsize='10', color='#404040')
-        dot.attr('edge', fontname='Arial', fontsize='9', color='#404040')
+        dot.attr('node', fontname='Arial', fontsize='11', color='#505050')
+        dot.attr('edge', fontname='Arial', fontsize='10', color='#505050')
         
         entities = data.get('entities', [])
         relationships = data.get('relationships', [])
         
-        # Crear entidades con atributos incluidos en la tabla
+        # Crear solo las entidades principales (sin atributos separados)
         for entity in entities:
             entity_name = entity.get('name')
             entity_type = entity.get('type', 'strong')
-            attributes = entity.get('attributes', [])
             
             if not entity_name:
                 continue
             
-            # 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_html = ''.join(attr_rows)
-                
-                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:
-                    # 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>>'
-                
-                dot.node(entity_name, label, shape='plaintext')
+            if entity_type == 'weak':
+                # Entidad débil: doble rectángulo
+                dot.node(
+                    entity_name, 
+                    entity_name, 
+                    shape='box', 
+                    style='filled,bold', 
+                    fillcolor='#f0f0f0',
+                    color='#404040',
+                    penwidth='3',
+                    width='1.5',
+                    height='0.8'
+                )
             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')
+                # Entidad fuerte: rectángulo simple
+                dot.node(
+                    entity_name, 
+                    entity_name, 
+                    shape='box', 
+                    style='filled', 
+                    fillcolor='#e8e8e8',
+                    color='#404040',
+                    penwidth='2',
+                    width='1.5',
+                    height='0.8'
+                )
         
-        # Crear relaciones
+        # Crear relaciones simples
         for relationship in relationships:
             rel_name = relationship.get('name')
             rel_type = relationship.get('type', 'regular')
             entities_involved = relationship.get('entities', [])
             cardinalities = relationship.get('cardinalities', {})
-            rel_attributes = relationship.get('attributes', [])
             
             if not rel_name or len(entities_involved) < 2:
                 continue
             
             if rel_type == 'isa':
-                # Relación ISA (jerarquía)
+                # Relación ISA - triángulo
                 parent = relationship.get('parent')
                 children = relationship.get('children', [])
                 
                 if parent and children:
-                    dot.node(rel_name, 'ISA', shape='triangle', style='filled',
-                            fillcolor='#c8c8c8', color='#404040')
+                    dot.node(
+                        rel_name, 
+                        'ISA', 
+                        shape='triangle', 
+                        style='filled',
+                        fillcolor='#d0d0d0',
+                        color='#404040',
+                        penwidth='2',
+                        width='1.0',
+                        height='0.6'
+                    )
                     
-                    dot.edge(parent, rel_name, dir='none', color='#404040')
+                    # Conectar padre con ISA
+                    dot.edge(parent, rel_name, len='1.5', color='#404040', penwidth='2')
                     
+                    # Conectar ISA con hijos
                     for child in children:
-                        dot.edge(rel_name, child, dir='none', color='#404040')
+                        dot.edge(rel_name, child, len='1.5', color='#404040', penwidth='2')
                 
             elif rel_type == 'identifying':
-                # 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')
+                # Relación identificadora - doble rombo
+                dot.node(
+                    rel_name, 
+                    rel_name, 
+                    shape='diamond', 
+                    style='filled,bold',
+                    fillcolor='#d8d8d8',
+                    color='#404040',
+                    penwidth='3',
+                    width='1.8',
+                    height='1.0'
+                )
                 
-                # Conectar entidades
+                # Conectar entidades con cardinalidades
                 for entity in entities_involved:
                     cardinality = cardinalities.get(entity, '1')
-                    dot.edge(entity, rel_name, label=cardinality, dir='none', color='#404040')
+                    dot.edge(
+                        entity, 
+                        rel_name, 
+                        label=f'  {cardinality}  ',
+                        len='2.0',
+                        color='#404040',
+                        penwidth='2',
+                        fontcolor='#000000',
+                        fontsize='12'
+                    )
                 
             else:
-                # 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>')
-                    
-                    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')
+                # Relación regular - rombo simple
+                dot.node(
+                    rel_name, 
+                    rel_name, 
+                    shape='diamond', 
+                    style='filled',
+                    fillcolor='#d8d8d8',
+                    color='#404040',
+                    penwidth='2',
+                    width='1.8',
+                    height='1.0'
+                )
                 
-                # Conectar entidades
+                # Conectar entidades con cardinalidades bien posicionadas
                 for entity in entities_involved:
                     cardinality = cardinalities.get(entity, '1')
-                    dot.edge(entity, rel_name, label=cardinality, dir='none', color='#404040')
+                    dot.edge(
+                        entity, 
+                        rel_name, 
+                        label=f'  {cardinality}  ',
+                        len='2.0',
+                        color='#404040',
+                        penwidth='2',
+                        fontcolor='#000000',
+                        fontsize='12'
+                    )
 
-        # Renderizar el diagrama
+        # Renderizar
         with NamedTemporaryFile(delete=False, suffix=f'.{output_format}') as tmp:
             dot.render(tmp.name, format=output_format, cleanup=True)
             return f"{tmp.name}.{output_format}"