Update entity_relationship_generator.py

entity_relationship_generator.py

@@ -310,36 +310,27 @@ def generate_entity_relationship_diagram(json_input: str, output_format: str) ->
 
     Args:
         json_input (str): A JSON string describing the entity relationship diagram structure.
-                          It must follow the Expected JSON Format Example below.
 
     Expected JSON Format Example:
     {
       "entities": [
         {
-          "name": "EMPLEADO",
-          "type": "strong",
-          "attributes": [
-            {"name": "num_empleado", "type": "primary_key"},
-            {"name": "nombre", "type": "regular"}
-          ]
+          "name": "CUSTOMER",
+          "type": "strong"
         },
         {
-          "name": "DEPARTAMENTO", 
-          "type": "strong",
-          "attributes": [
-            {"name": "cod_depto", "type": "primary_key"},
-            {"name": "nombre_depto", "type": "regular"}
-          ]
+          "name": "ORDER", 
+          "type": "strong"
         }
       ],
       "relationships": [
         {
-          "name": "Pertenece",
+          "name": "Places",
           "type": "regular",
-          "entities": ["EMPLEADO", "DEPARTAMENTO"],
+          "entities": ["CUSTOMER", "ORDER"],
           "cardinalities": {
-            "EMPLEADO": "N",
-            "DEPARTAMENTO": "1"
+            "CUSTOMER": "1",
+            "ORDER": "N"
           }
         }
       ]
@@ -357,22 +348,22 @@ def generate_entity_relationship_diagram(json_input: str, output_format: str) ->
         if 'entities' not in data:
             raise ValueError("Missing required field: entities")
 
-        # Configuración simple y limpia
+        # Configuración simple y funcional
         dot = graphviz.Graph(comment='ER Diagram', engine='neato')
         dot.attr(
             bgcolor='white',
             pad='1.0',
             overlap='false',
             splines='true',
-            sep='+25'
+            sep='+15'
         )
-        dot.attr('node', fontname='Arial', fontsize='11', color='#505050')
-        dot.attr('edge', fontname='Arial', fontsize='10', color='#505050')
+        dot.attr('node', fontname='Arial', fontsize='11', color='#404040')
+        dot.attr('edge', fontname='Arial', fontsize='10', color='#404040')
         
         entities = data.get('entities', [])
         relationships = data.get('relationships', [])
         
-        # Crear solo las entidades principales (sin atributos separados)
+        # Crear solo las entidades principales (sin atributos por ahora)
         for entity in entities:
             entity_name = entity.get('name')
             entity_type = entity.get('type', 'strong')
@@ -381,13 +372,13 @@ def generate_entity_relationship_diagram(json_input: str, output_format: str) ->
                 continue
             
             if entity_type == 'weak':
-                # Entidad débil: doble rectángulo
+                # Entidad débil: rectángulo con doble borde
                 dot.node(
                     entity_name, 
                     entity_name, 
                     shape='box', 
-                    style='filled,bold', 
-                    fillcolor='#f0f0f0',
+                    style='filled', 
+                    fillcolor='#e8e8e8',
                     color='#404040',
                     penwidth='3',
                     width='1.5',
@@ -402,133 +393,102 @@ def generate_entity_relationship_diagram(json_input: str, output_format: str) ->
                     style='filled', 
                     fillcolor='#e8e8e8',
                     color='#404040',
-                    penwidth='2',
+                    penwidth='1',
                     width='1.5',
                     height='0.8'
                 )
         
-        # Crear relaciones simples
+        # 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', {})
             
-            if not rel_name or len(entities_involved) < 2:
+            if not rel_name:
                 continue
             
             if rel_type == 'isa':
-                # Relación ISA - triángulo
+                # Relación ISA - crear triángulo y conectar correctamente
                 parent = relationship.get('parent')
                 children = relationship.get('children', [])
                 
                 if parent and children:
+                    # Crear triángulo ISA
+                    isa_node = f"ISA_{rel_name}"
                     dot.node(
-                        rel_name, 
+                        isa_node, 
                         'ISA', 
                         shape='triangle', 
                         style='filled',
                         fillcolor='#d0d0d0',
                         color='#404040',
                         penwidth='2',
-                        width='1.0',
+                        width='0.8',
                         height='0.6'
                     )
                     
-                    # Conectar padre con ISA (sin cardinalidad)
-                    dot.edge(parent, rel_name, len='1.5', color='#404040', penwidth='2')
+                    # Conectar padre con triángulo ISA
+                    dot.edge(parent, isa_node, color='#404040', penwidth='2')
                     
-                    # Conectar ISA con hijos (sin cardinalidad)
+                    # Conectar triángulo ISA con cada hijo
                     for child in children:
-                        dot.edge(rel_name, child, len='1.5', color='#404040', penwidth='2')
+                        dot.edge(isa_node, child, color='#404040', penwidth='2')
                 
-            elif rel_type == 'identifying':
-                # 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'
-                )
+            elif len(entities_involved) >= 2:
+                # Relaciones regulares e identificadoras
+                entity1, entity2 = entities_involved[0], entities_involved[1]
+                card1 = cardinalities.get(entity1, '1')
+                card2 = cardinalities.get(entity2, '1')
                 
-                # Conectar entidades con cardinalidades posicionadas correctamente
-                if len(entities_involved) >= 2:
-                    entity1, entity2 = entities_involved[0], entities_involved[1]
-                    card1 = cardinalities.get(entity1, '1')
-                    card2 = cardinalities.get(entity2, '1')
-                    
-                    # Primera entidad -> relación (cardinalidad cerca de la entidad)
-                    dot.edge(
-                        entity1, 
+                if rel_type == 'identifying':
+                    # Relación identificadora - rombo con doble borde
+                    dot.node(
                         rel_name, 
-                        taillabel=card1,
-                        len='2.0',
+                        rel_name, 
+                        shape='diamond', 
+                        style='filled',
+                        fillcolor='#d8d8d8',
                         color='#404040',
-                        penwidth='2',
-                        fontcolor='#000000',
-                        fontsize='12'
+                        penwidth='3',
+                        width='1.5',
+                        height='0.8'
                     )
-                    
-                    # Relación -> segunda entidad (cardinalidad cerca de la entidad)
-                    dot.edge(
-                        rel_name,
-                        entity2, 
-                        headlabel=card2,
-                        len='2.0',
+                else:
+                    # Relación regular - rombo simple
+                    dot.node(
+                        rel_name, 
+                        rel_name, 
+                        shape='diamond', 
+                        style='filled',
+                        fillcolor='#d8d8d8',
                         color='#404040',
-                        penwidth='2',
-                        fontcolor='#000000',
-                        fontsize='12'
+                        penwidth='1',
+                        width='1.5',
+                        height='0.8'
                     )
                 
-            else:
-                # Relación regular - rombo simple
-                dot.node(
+                # Conectar primera entidad con relación
+                dot.edge(
+                    entity1, 
                     rel_name, 
-                    rel_name, 
-                    shape='diamond', 
-                    style='filled',
-                    fillcolor='#d8d8d8',
+                    taillabel=f' {card1} ',
                     color='#404040',
                     penwidth='2',
-                    width='1.8',
-                    height='1.0'
+                    fontcolor='#000000',
+                    fontsize='12'
                 )
                 
-                # Conectar entidades con cardinalidades posicionadas correctamente
-                if len(entities_involved) >= 2:
-                    entity1, entity2 = entities_involved[0], entities_involved[1]
-                    card1 = cardinalities.get(entity1, '1')
-                    card2 = cardinalities.get(entity2, '1')
-                    
-                    # Primera entidad -> relación (cardinalidad cerca de la entidad)
-                    dot.edge(
-                        entity1, 
-                        rel_name, 
-                        taillabel=card1,
-                        len='2.0',
-                        color='#404040',
-                        penwidth='2',
-                        fontcolor='#000000',
-                        fontsize='12'
-                    )
-                    
-                    # Relación -> segunda entidad (cardinalidad cerca de la entidad)
-                    dot.edge(
-                        rel_name,
-                        entity2, 
-                        headlabel=card2,
-                        len='2.0',
-                        color='#404040',
-                        penwidth='2',
-                        fontcolor='#000000',
-                        fontsize='12'
-                    )
+                # Conectar relación con segunda entidad
+                dot.edge(
+                    rel_name,
+                    entity2, 
+                    headlabel=f' {card2} ',
+                    color='#404040',
+                    penwidth='2',
+                    fontcolor='#000000',
+                    fontsize='12'
+                )
 
         # Renderizar
         with NamedTemporaryFile(delete=False, suffix=f'.{output_format}') as tmp: