Update entity_relationship_generator.py

entity_relationship_generator.py

@@ -332,27 +332,12 @@ def generate_entity_relationship_diagram(json_input: str, output_format: str) ->
             {"name": "nombre_depto", "type": "regular"}
           ]
         },
-        {
-          "name": "TECNICO",
-          "type": "strong",
-          "attributes": [
-            {"name": "nivel", "type": "regular"}
-          ]
-        },
-        {
-          "name": "ADMINISTRATIVO",
-          "type": "strong", 
-          "attributes": []
-        },
         {
           "name": "PROYECTO",
           "type": "strong",
           "attributes": [
             {"name": "cod_proyecto", "type": "primary_key"},
-            {"name": "nombre_proyecto", "type": "regular"},
-            {"name": "cliente", "type": "regular"},
-            {"name": "fecha_inicio", "type": "regular"},
-            {"name": "fecha_fin", "type": "regular"}
+            {"name": "nombre_proyecto", "type": "regular"}
           ]
         }
       ],
@@ -364,24 +349,14 @@ def generate_entity_relationship_diagram(json_input: str, output_format: str) ->
           "cardinalities": {
             "EMPLEADO": "N",
             "DEPARTAMENTO": "1"
-          },
-          "attributes": [
-            {"name": "fecha_asignacion", "type": "regular"},
-            {"name": "fecha_cese", "type": "regular"}
-          ]
-        },
-        {
-          "name": "Es_un",
-          "type": "isa",
-          "parent": "EMPLEADO",
-          "children": ["TECNICO", "ADMINISTRATIVO"]
+          }
         },
         {
           "name": "Trabaja_en",
           "type": "regular",
-          "entities": ["TECNICO", "PROYECTO"],
+          "entities": ["EMPLEADO", "PROYECTO"],
           "cardinalities": {
-            "TECNICO": "M",
+            "EMPLEADO": "M",
             "PROYECTO": "N"
           }
         }
@@ -400,25 +375,16 @@ 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 estilo mejorado
+        # Crear grafo con configuración simple y funcional
         dot = graphviz.Graph(comment='ER Diagram', engine='dot')
-        dot.attr(
-            rankdir='TB', 
-            bgcolor='white', 
-            pad='0.8',
-            nodesep='1.2', 
-            ranksep='1.8',
-            fontname='Arial'
-        )
-        
-        # Configuración base de nodos y aristas
-        dot.attr('node', fontname='Arial', fontsize='11', color='#404040')
-        dot.attr('edge', fontname='Arial', fontsize='10', color='#404040')
+        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')
         
         entities = data.get('entities', [])
         relationships = data.get('relationships', [])
         
-        # Crear entidades con estilo profesional
+        # Crear entidades
         for entity in entities:
             entity_name = entity.get('name')
             entity_type = entity.get('type', 'strong')
@@ -427,21 +393,26 @@ def generate_entity_relationship_diagram(json_input: str, output_format: str) ->
                 continue
             
             if entity_type == 'weak':
-                # Entidad débil: doble rectángulo (simulado con tabla HTML)
-                label = f'<<TABLE BORDER="3" CELLBORDER="1" CELLSPACING="0" CELLPADDING="8" BGCOLOR="#f0f0f0"><TR><TD><B>{entity_name}</B></TD></TR></TABLE>>'
-                dot.node(entity_name, label, shape='plaintext')
+                # 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 con estilo
+                # Entidad fuerte: rectángulo simple
                 dot.node(
                     entity_name, 
                     entity_name, 
                     shape='box', 
-                    style='filled,rounded', 
+                    style='filled', 
                     fillcolor='#e8e8e8',
                     color='#404040',
-                    penwidth='2',
-                    fontsize='12',
-                    fontcolor='#000000'
+                    penwidth='1'
                 )
         
         # Crear atributos para cada entidad
@@ -459,45 +430,41 @@ def generate_entity_relationship_diagram(json_input: str, output_format: str) ->
                     # Clave primaria: elipse con texto subrayado
                     dot.node(
                         attr_id, 
-                        f'<U><B>{attr_name}</B></U>', 
+                        f'{attr_name}', 
                         shape='ellipse', 
                         style='filled',
-                        fillcolor='#d0d0d0',
+                        fillcolor='#d8d8d8',
                         color='#404040',
-                        penwidth='2'
+                        xlabel=f'PK: {attr_name}'
                     )
                 elif attr_type == 'partial_key':
-                    # Clave parcial: elipse con línea punteada
+                    # Clave parcial
                     dot.node(
                         attr_id, 
-                        f'<U>{attr_name}</U>', 
+                        attr_name, 
                         shape='ellipse', 
                         style='filled,dashed',
-                        fillcolor='#d0d0d0',
-                        color='#404040',
-                        penwidth='2'
+                        fillcolor='#d8d8d8',
+                        color='#404040'
                     )
                 elif attr_type == 'multivalued':
-                    # Atributo multivaluado: doble elipse (tabla HTML)
-                    label = f'<<TABLE BORDER="2" CELLBORDER="0" CELLSPACING="0" CELLPADDING="4" BGCOLOR="#d8d8d8"><TR><TD>{attr_name}</TD></TR></TABLE>>'
-                    dot.node(attr_id, label, shape='plaintext')
-                elif attr_type == 'derived':
-                    # Atributo derivado: elipse con línea punteada
+                    # Atributo multivaluado: doble elipse (simulado con penwidth)
                     dot.node(
                         attr_id, 
-                        f'/{attr_name}/', 
+                        attr_name, 
                         shape='ellipse', 
-                        style='filled,dashed',
+                        style='filled',
                         fillcolor='#d8d8d8',
-                        color='#404040'
+                        color='#404040',
+                        penwidth='3'
                     )
-                elif attr_type == 'composite':
-                    # Atributo compuesto
+                elif attr_type == 'derived':
+                    # Atributo derivado
                     dot.node(
                         attr_id, 
-                        attr_name, 
+                        f'/{attr_name}/', 
                         shape='ellipse', 
-                        style='filled',
+                        style='filled,dashed',
                         fillcolor='#d8d8d8',
                         color='#404040'
                     )
@@ -513,12 +480,18 @@ def generate_entity_relationship_diagram(json_input: str, output_format: str) ->
                     )
                 
                 # Conectar atributo con entidad
-                dot.edge(entity_name, attr_id, color='#404040', penwidth='1')
+                dot.edge(entity_name, attr_id, color='#404040')
         
         # Crear relaciones
         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)
@@ -526,53 +499,52 @@ def generate_entity_relationship_diagram(json_input: str, output_format: str) ->
                 children = relationship.get('children', [])
                 
                 if parent and children:
-                    # Crear nodo ISA como triángulo
-                    isa_id = f"isa_{rel_name}"
+                    # Crear nodo ISA
                     dot.node(
-                        isa_id, 
+                        rel_name, 
                         'ISA', 
                         shape='triangle', 
                         style='filled',
-                        fillcolor='#c0c0c0',
-                        color='#404040',
-                        penwidth='2'
+                        fillcolor='#c8c8c8',
+                        color='#404040'
                     )
                     
                     # Conectar padre con ISA
-                    dot.edge(parent, isa_id, color='#404040', penwidth='2')
+                    dot.edge(parent, rel_name, color='#404040')
                     
                     # Conectar ISA con hijos
                     for child in children:
-                        dot.edge(isa_id, child, color='#404040', penwidth='2')
+                        dot.edge(rel_name, child, color='#404040')
                 
-            else:
-                # Relación 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
+            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'
+                )
                 
-                rel_type_style = relationship.get('type', 'regular')
+                # Conectar entidades
+                for entity in entities_involved:
+                    cardinality = cardinalities.get(entity, '1')
+                    dot.edge(entity, rel_name, label=cardinality, color='#404040')
                 
-                if rel_type_style == 'identifying':
-                    # Relación identificadora: doble rombo
-                    label = f'<<TABLE BORDER="3" CELLBORDER="0" CELLSPACING="0" CELLPADDING="6" BGCOLOR="#c8c8c8"><TR><TD><B>{rel_name}</B></TD></TR></TABLE>>'
-                    dot.node(rel_name, label, shape='plaintext')
-                else:
-                    # Relación regular: rombo simple
-                    dot.node(
-                        rel_name, 
-                        rel_name, 
-                        shape='diamond', 
-                        style='filled',
-                        fillcolor='#c8c8c8',
-                        color='#404040',
-                        penwidth='2'
-                    )
+            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
+                # 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}"
@@ -590,29 +562,7 @@ def generate_entity_relationship_diagram(json_input: str, output_format: str) ->
                 # Conectar entidades con la relación
                 for entity in entities_involved:
                     cardinality = cardinalities.get(entity, '1')
-                    
-                    if len(entities_involved) == 2 and entities_involved[0] == entities_involved[1]:
-                        # Relación reflexiva
-                        dot.edge(
-                            entity, 
-                            rel_name, 
-                            label=cardinality, 
-                            color='#404040',
-                            penwidth='2',
-                            fontsize='10',
-                            fontcolor='#000000'
-                        )
-                    else:
-                        # Relación normal
-                        dot.edge(
-                            entity, 
-                            rel_name, 
-                            label=cardinality, 
-                            color='#404040',
-                            penwidth='2',
-                            fontsize='10',
-                            fontcolor='#000000'
-                        )
+                    dot.edge(entity, rel_name, label=cardinality, color='#404040')
 
         # Renderizar el diagrama
         with NamedTemporaryFile(delete=False, suffix=f'.{output_format}') as tmp:
@@ -622,4 +572,4 @@ def generate_entity_relationship_diagram(json_input: str, output_format: str) ->
     except json.JSONDecodeError:
         return "Error: Invalid JSON format"
     except Exception as e:
-        return f"Error: {str(e)}"
+        return f"Error: {str(e)}"