From 7a4ad41f3a586b49f814f81bf909dc5aab37b331 Mon Sep 17 00:00:00 2001 From: LeonWehrhahn Date: Thu, 9 Jan 2025 22:08:59 +0100 Subject: [PATCH] Change folder nameing --- .../core/generate_suggestions.py | 2 +- .../{helius_render => helios_renderer}/api.py | 8 ++++---- .../config/diagram_elements.json | 0 .../config/diagram_relationships.json | 0 .../config/markers.json | 0 .../models/bounds.py | 0 .../models/config_types.py | 0 .../models/diagram.py | 0 .../models/element.py | 0 .../models/relationship.py | 0 .../renderers/element_renderer.py | 8 ++++---- .../renderers/relationship_renderer.py | 10 +++++----- .../renderers/uml_renderer.py | 14 +++++++------- .../services/diagram_service.py | 6 +++--- .../services/path_service.py | 6 +++--- .../styles/styles.css | 0 .../templates/element.svg.jinja | 0 .../templates/relationship_path.svg.jinja | 0 .../utils/config_loader.py | 2 +- .../utils/constants.py | 0 .../utils/css_loader.py | 0 .../utils/template_manager.py | 0 22 files changed, 28 insertions(+), 28 deletions(-) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/api.py (73%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/config/diagram_elements.json (100%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/config/diagram_relationships.json (100%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/config/markers.json (100%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/models/bounds.py (100%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/models/config_types.py (100%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/models/diagram.py (100%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/models/element.py (100%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/models/relationship.py (100%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/renderers/element_renderer.py (81%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/renderers/relationship_renderer.py (89%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/renderers/uml_renderer.py (95%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/services/diagram_service.py (82%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/services/path_service.py (99%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/styles/styles.css (100%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/templates/element.svg.jinja (100%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/templates/relationship_path.svg.jinja (100%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/utils/config_loader.py (85%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/utils/constants.py (100%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/utils/css_loader.py (100%) rename modules/modeling/module_modeling_llm/module_modeling_llm/{helius_render => helios_renderer}/utils/template_manager.py (100%) diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/core/generate_suggestions.py b/modules/modeling/module_modeling_llm/module_modeling_llm/core/generate_suggestions.py index f28408b34..48724f87b 100644 --- a/modules/modeling/module_modeling_llm/module_modeling_llm/core/generate_suggestions.py +++ b/modules/modeling/module_modeling_llm/module_modeling_llm/core/generate_suggestions.py @@ -5,7 +5,7 @@ from athena import emit_meta from module_modeling_llm.config import BasicApproachConfig -from module_modeling_llm.helius_render.api import render_diagram +from module_modeling_llm.helios_renderer.api import render_diagram from module_modeling_llm.models.assessment_model import AssessmentModel from module_modeling_llm.prompts.apollon_format_description import apollon_format_description from llm_core.utils.predict_and_parse import predict_and_parse diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/api.py b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/api.py similarity index 73% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/api.py rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/api.py index 6cf1757d5..413d6fa2b 100644 --- a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/api.py +++ b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/api.py @@ -1,9 +1,9 @@ import json from typing import Dict, Optional, cast -from module_modeling_llm.helius_render.models.diagram import UMLDiagram -from module_modeling_llm.helius_render.utils.config_loader import load_all_configs -from module_modeling_llm.helius_render.renderers.uml_renderer import UMLRenderer -from module_modeling_llm.helius_render.utils.css_loader import load_css +from module_modeling_llm.helios_renderer.models.diagram import UMLDiagram +from module_modeling_llm.helios_renderer.utils.config_loader import load_all_configs +from module_modeling_llm.helios_renderer.renderers.uml_renderer import UMLRenderer +from module_modeling_llm.helios_renderer.utils.css_loader import load_css # Global initialization # Load configs and css once diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/config/diagram_elements.json b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/config/diagram_elements.json similarity index 100% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/config/diagram_elements.json rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/config/diagram_elements.json diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/config/diagram_relationships.json b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/config/diagram_relationships.json similarity index 100% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/config/diagram_relationships.json rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/config/diagram_relationships.json diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/config/markers.json b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/config/markers.json similarity index 100% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/config/markers.json rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/config/markers.json diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/models/bounds.py b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/models/bounds.py similarity index 100% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/models/bounds.py rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/models/bounds.py diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/models/config_types.py b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/models/config_types.py similarity index 100% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/models/config_types.py rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/models/config_types.py diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/models/diagram.py b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/models/diagram.py similarity index 100% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/models/diagram.py rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/models/diagram.py diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/models/element.py b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/models/element.py similarity index 100% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/models/element.py rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/models/element.py diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/models/relationship.py b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/models/relationship.py similarity index 100% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/models/relationship.py rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/models/relationship.py diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/renderers/element_renderer.py b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/renderers/element_renderer.py similarity index 81% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/renderers/element_renderer.py rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/renderers/element_renderer.py index 264bb0def..01e28ad39 100644 --- a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/renderers/element_renderer.py +++ b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/renderers/element_renderer.py @@ -2,10 +2,10 @@ import xml.etree.ElementTree as ET from jinja2 import Template -from module_modeling_llm.helius_render.models.bounds import Bounds -from module_modeling_llm.helius_render.models.config_types import ElementConfig, ElementConfigEntry -from module_modeling_llm.helius_render.models.element import Element -from module_modeling_llm.helius_render.utils.template_manager import TemplateManager +from module_modeling_llm.helios_renderer.models.bounds import Bounds +from module_modeling_llm.helios_renderer.models.config_types import ElementConfig, ElementConfigEntry +from module_modeling_llm.helios_renderer.models.element import Element +from module_modeling_llm.helios_renderer.utils.template_manager import TemplateManager class ElementRenderer: """ diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/renderers/relationship_renderer.py b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/renderers/relationship_renderer.py similarity index 89% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/renderers/relationship_renderer.py rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/renderers/relationship_renderer.py index 3eba6c7be..a9abb16d8 100644 --- a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/renderers/relationship_renderer.py +++ b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/renderers/relationship_renderer.py @@ -1,10 +1,10 @@ from typing import Dict, List, Tuple import xml.etree.ElementTree as ET -from module_modeling_llm.helius_render.services.path_service import compute_relationship_path -from module_modeling_llm.helius_render.models.element import Element -from module_modeling_llm.helius_render.models.relationship import Relationship -from module_modeling_llm.helius_render.models.config_types import RelationshipConfig -from module_modeling_llm.helius_render.utils.template_manager import TemplateManager +from module_modeling_llm.helios_renderer.services.path_service import compute_relationship_path +from module_modeling_llm.helios_renderer.models.element import Element +from module_modeling_llm.helios_renderer.models.relationship import Relationship +from module_modeling_llm.helios_renderer.models.config_types import RelationshipConfig +from module_modeling_llm.helios_renderer.utils.template_manager import TemplateManager class RelationshipRenderer: """ diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/renderers/uml_renderer.py b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/renderers/uml_renderer.py similarity index 95% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/renderers/uml_renderer.py rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/renderers/uml_renderer.py index a32a5b78f..5302abb5c 100644 --- a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/renderers/uml_renderer.py +++ b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/renderers/uml_renderer.py @@ -4,13 +4,13 @@ from PIL import Image, ImageDraw, ImageFont -from module_modeling_llm.helius_render.models.config_types import AllConfigs -from module_modeling_llm.helius_render.models.diagram import UMLDiagram -from module_modeling_llm.helius_render.services.diagram_service import compute_diagram_bounds -from module_modeling_llm.helius_render.renderers.element_renderer import ElementRenderer -from module_modeling_llm.helius_render.renderers.relationship_renderer import RelationshipRenderer -from module_modeling_llm.helius_render.utils.template_manager import template_manager -from module_modeling_llm.helius_render.utils.constants import DEFAULT_DPI +from module_modeling_llm.helios_renderer.models.config_types import AllConfigs +from module_modeling_llm.helios_renderer.models.diagram import UMLDiagram +from module_modeling_llm.helios_renderer.services.diagram_service import compute_diagram_bounds +from module_modeling_llm.helios_renderer.renderers.element_renderer import ElementRenderer +from module_modeling_llm.helios_renderer.renderers.relationship_renderer import RelationshipRenderer +from module_modeling_llm.helios_renderer.utils.template_manager import template_manager +from module_modeling_llm.helios_renderer.utils.constants import DEFAULT_DPI class UMLRenderer: diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/services/diagram_service.py b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/services/diagram_service.py similarity index 82% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/services/diagram_service.py rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/services/diagram_service.py index 1bd9a6950..ae08a7e40 100644 --- a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/services/diagram_service.py +++ b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/services/diagram_service.py @@ -1,7 +1,7 @@ -from module_modeling_llm.helius_render.models.diagram import UMLDiagram -from module_modeling_llm.helius_render.models.bounds import Bounds -from module_modeling_llm.helius_render.utils.constants import (PADDING_LEFT, PADDING_RIGHT, PADDING_TOP, PADDING_BOTTOM, MARKER_SIZE) +from module_modeling_llm.helios_renderer.models.diagram import UMLDiagram +from module_modeling_llm.helios_renderer.models.bounds import Bounds +from module_modeling_llm.helios_renderer.utils.constants import (PADDING_LEFT, PADDING_RIGHT, PADDING_TOP, PADDING_BOTTOM, MARKER_SIZE) def compute_diagram_bounds(diagram: UMLDiagram): """ diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/services/path_service.py b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/services/path_service.py similarity index 99% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/services/path_service.py rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/services/path_service.py index d5233e915..dc6e1d2e3 100644 --- a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/services/path_service.py +++ b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/services/path_service.py @@ -9,9 +9,9 @@ import math from typing import Dict, List, Optional, Any -from module_modeling_llm.helius_render.utils.constants import ENTITY_MARGIN, OVERLAP_THRESHOLD -from module_modeling_llm.helius_render.models.element import Element -from module_modeling_llm.helius_render.models.relationship import Relationship +from module_modeling_llm.helios_renderer.utils.constants import ENTITY_MARGIN, OVERLAP_THRESHOLD +from module_modeling_llm.helios_renderer.models.element import Element +from module_modeling_llm.helios_renderer.models.relationship import Relationship # Directions enumeration as used in the original code for port/connection directions class Direction: diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/styles/styles.css b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/styles/styles.css similarity index 100% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/styles/styles.css rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/styles/styles.css diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/templates/element.svg.jinja b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/templates/element.svg.jinja similarity index 100% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/templates/element.svg.jinja rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/templates/element.svg.jinja diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/templates/relationship_path.svg.jinja b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/templates/relationship_path.svg.jinja similarity index 100% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/templates/relationship_path.svg.jinja rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/templates/relationship_path.svg.jinja diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/utils/config_loader.py b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/utils/config_loader.py similarity index 85% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/utils/config_loader.py rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/utils/config_loader.py index 460849a39..58c8d270e 100644 --- a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/utils/config_loader.py +++ b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/utils/config_loader.py @@ -1,7 +1,7 @@ import os import json from typing import Dict -from module_modeling_llm.helius_render.models.config_types import AllConfigs, ElementConfigEntry, RelationshipConfigEntry, MarkerConfigEntry +from module_modeling_llm.helios_renderer.models.config_types import AllConfigs, ElementConfigEntry, RelationshipConfigEntry, MarkerConfigEntry def load_config(filename: str): base_dir = os.path.dirname(os.path.dirname(__file__)) diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/utils/constants.py b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/utils/constants.py similarity index 100% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/utils/constants.py rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/utils/constants.py diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/utils/css_loader.py b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/utils/css_loader.py similarity index 100% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/utils/css_loader.py rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/utils/css_loader.py diff --git a/modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/utils/template_manager.py b/modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/utils/template_manager.py similarity index 100% rename from modules/modeling/module_modeling_llm/module_modeling_llm/helius_render/utils/template_manager.py rename to modules/modeling/module_modeling_llm/module_modeling_llm/helios_renderer/utils/template_manager.py