@@ -60,9 +62,9 @@
{% for profile in source_profiles %}
- | {{ profile['key'] }} |
+ {{ profile['name'] ~ "|" ~ profile['version'] }} |
{% endfor %}
- {{ target_profile['key'] }} |
+ {{ target_profile['name'] ~ "|" ~ target_profile['version'] }} |
@@ -73,8 +75,8 @@
{% for profile in source_profiles + [target_profile] %}
- {% if entry.profiles[profile['key']].present %}
- {{ entry.profiles[profile['key']].min_cardinality }}..{{ entry.profiles[profile['key']].max_cardinality | format_cardinality }}
+ {% if entry.profiles[profile['key']] %}
+ {{ entry.profiles[profile['key']].min }}..{{ entry.profiles[profile['key']].max | format_cardinality }}
{% endif %}
|
{% endfor %}
diff --git a/service/src/structure_comparer/handler/mapping.py b/service/src/structure_comparer/handler/mapping.py
index 9b9ca65..0f07789 100644
--- a/service/src/structure_comparer/handler/mapping.py
+++ b/service/src/structure_comparer/handler/mapping.py
@@ -1,4 +1,4 @@
-from typing import List
+from typing import List, Optional
from ..action import Action
from ..data.mapping import MappingField
@@ -20,6 +20,7 @@
from ..model.mapping import MappingFieldMinimal as MappingFieldMinimalModel
from ..model.mapping import MappingFieldsOutput as MappingFieldsOutputModel
from .project import ProjectsHandler
+from ..results_html import create_results_html
class MappingHandler:
@@ -55,6 +56,27 @@ def get_field(
return field.to_model()
+ def get_html(
+ self,
+ project_key: str,
+ mapping_id: str,
+ show_remarks: bool,
+ show_warnings: bool,
+ html_output_dir: Optional[str] = None,
+ ) -> str:
+ mapping = self.get(project_key, mapping_id)
+ mappingDict = {mapping.name: mapping}
+
+ if html_output_dir is None:
+ html_output_dir = self.project_handler._get(
+ project_key
+ ).config.html_output_dir
+
+ return create_results_html(
+ mappingDict, html_output_dir, show_remarks, show_warnings
+ )
+ # return mapping
+
def set_field(
self,
project_key: str,
diff --git a/service/src/structure_comparer/handler/project.py b/service/src/structure_comparer/handler/project.py
index f57a6d2..f1da0e1 100644
--- a/service/src/structure_comparer/handler/project.py
+++ b/service/src/structure_comparer/handler/project.py
@@ -17,7 +17,7 @@
class ProjectsHandler:
def __init__(self, projects_dir: Path):
self.projs_dir = projects_dir
- self.__projs: Dict[str, Project]
+ self.__projs: Dict[str, Project] = {}
@property
def keys(self) -> List[str]:
@@ -35,13 +35,21 @@ def load(self) -> None:
logger.error(e.errors())
raise e
+ if not self.__projs:
+ path = self.projs_dir
+ if path.is_dir() and (path / "config.json").exists():
+ try:
+ self.__projs[path.name] = Project(path)
+ except ValidationError as e:
+ logger.error(e.errors())
+ raise e
+
def get_list(self) -> ProjectListModel:
projects = [p.to_overview_model() for p in self.__projs.values()]
return ProjectListModel(projects=projects)
def _get(self, project_key: str) -> Project:
proj = self.__projs.get(project_key)
-
if proj is None:
raise ProjectNotFound()
diff --git a/service/src/structure_comparer/output.py b/service/src/structure_comparer/output.py
new file mode 100644
index 0000000..5feef1c
--- /dev/null
+++ b/service/src/structure_comparer/output.py
@@ -0,0 +1,51 @@
+from .errors import (
+ MappingNotFound,
+ ProjectNotFound,
+)
+
+from .model.error import Error as ErrorModel
+from structure_comparer.data.config import ProjectConfig
+from .handler.mapping import MappingHandler, ProjectsHandler
+
+
+def output(project_dir: str, output_format: str = "html", mapping_id: str = None):
+ print("Generating output files...")
+
+ try:
+ config = ProjectConfig.from_json(project_dir / "config.json")
+
+ project_key = config.name
+ show_remarks = config.show_remarks
+ show_warnings = config.show_warnings
+
+ for mapping in config.mappings:
+ if mapping.id == mapping_id or mapping_id is None:
+ print(f"Processing mapping: {mapping.id}")
+ project_handler = ProjectsHandler(project_dir)
+ project_handler.load()
+ mapping_handler = MappingHandler(project_handler)
+
+ html_output_dir = project_dir / config.html_output_dir
+ if not html_output_dir.exists():
+ html_output_dir.mkdir(parents=True, exist_ok=True)
+
+ if output_format == "html":
+ print(f"Generating HTML for mapping: {mapping.id}")
+ mapping_handler.get_html(
+ project_key,
+ mapping.id,
+ show_remarks,
+ show_warnings,
+ html_output_dir,
+ ),
+ elif output_format == "json":
+ raise NotImplementedError("JSON not implemented yet")
+
+ except (ProjectNotFound, MappingNotFound, NotImplementedError) as e:
+ return ErrorModel.from_except(e)
+
+ print("Output files generated successfully.")
+
+
+if __name__ == "__main__":
+ output()
diff --git a/service/src/structure_comparer/results_html.py b/service/src/structure_comparer/results_html.py
index 7448eeb..e372cbb 100644
--- a/service/src/structure_comparer/results_html.py
+++ b/service/src/structure_comparer/results_html.py
@@ -4,10 +4,9 @@
from typing import Dict, List
from jinja2 import Environment, FileSystemLoader
-from structure_comparer.helpers import split_parent_child
from .action import Action
-from .data.mapping import Mapping
+from .model.mapping import MappingDetails as MappingDetailsModel
CSS_CLASS = {
Action.USE: "row-use",
@@ -37,7 +36,7 @@ def format_cardinality(value):
def create_results_html(
- structured_mapping: Dict[str, Mapping],
+ structured_mapping: Dict[str, MappingDetailsModel],
results_folder: str | Path,
show_remarks: bool,
show_warnings: bool,
@@ -64,21 +63,40 @@ def create_results_html(
entries = {}
number_of_warnings = 0 # Initialize the warning counter
- for field, entry in comp.fields.items():
+ fields = {field.name: field for field in comp.fields}
+ for entry in comp.fields:
+ field = entry.name
warnings = set() # Use a set to collect unique warnings
- target_min_card = entry.profiles[comp.target.key].min_cardinality
- target_max_card = entry.profiles[comp.target.key].max_cardinality
+ if comp.target.key not in entry.profiles:
+ warnings.add(
+ "The target profile does not contain this field, so it cannot be compared"
+ )
+ target_min_card = 0
+ target_max_card = 0
+ else:
+ target_min_card = entry.profiles[comp.target.key].min
+ target_max_card = entry.profiles[comp.target.key].max
if target_max_card == "*":
target_max_card = float("inf")
else:
target_max_card = int(target_max_card)
- parent, _ = split_parent_child(field)
- comparison_parent = comp.fields.get(parent)
+ match = re.search(r"[.:](?=[^.:]*$)", field)
+ if match:
+ parent = field[: match.start()]
+ else:
+ parent = field
+
+ comparison_parent = fields.get(parent)
for profile in comp.sources:
- source_min_card = entry.profiles[profile.key].min_cardinality
- source_max_card = entry.profiles[profile.key].max_cardinality
+ if profile.key in entry.profiles:
+ source_min_card = entry.profiles[profile.key].min
+ source_max_card = entry.profiles[profile.key].max
+ else:
+ source_min_card = 0
+ source_max_card = 0
+
if source_max_card == "*":
source_max_card = float("inf")
else:
@@ -118,23 +136,28 @@ def create_results_html(
entries[field] = {
"classification": entry.action,
"css_class": CSS_CLASS[entry.action],
- "extension": entry.extension,
+ "extension": None,
"extra": entry.other,
"profiles": entry.profiles,
"remark": entry.remark,
"warning": list(warnings), # Convert set back to list
}
+ inline_css = (styles_file).read_text()
data = {
- "css_file": STYLE_FILE_NAME,
+ "inline_css": inline_css,
"target_profile": {
"key": comp.target.key,
- "url": comp.target.simplifier_url,
+ "url": comp.target.url,
+ "name": comp.target.name,
+ "version": comp.target.version,
},
"source_profiles": [
{
"key": profile.key,
- "url": profile.simplifier_url,
+ "url": profile.url,
+ "name": profile.name,
+ "version": profile.version,
}
for profile in comp.sources
],
@@ -150,15 +173,14 @@ def create_results_html(
content = template.render(**data)
# HOTFIX: prevent filenames to contain '|' but use '#' instead
- source_profiles_flat = flatten_profiles(
- [profile["key"].replace("|", "#") for profile in data["source_profiles"]]
- )
html_file = (
results_folder
- / f"{source_profiles_flat}_to_{data['target_profile']['key'].replace("|", "#")}.html"
+ / f"{comp.name.replace("|", "#").replace(" -> ", "_to_")}.html"
)
html_file.write_text(content, encoding="utf-8")
+ return str(html_file)
+
def format_links(text: str) -> str:
if not text:
diff --git a/service/src/structure_comparer/serve.py b/service/src/structure_comparer/serve.py
index 05eb328..61a32c9 100644
--- a/service/src/structure_comparer/serve.py
+++ b/service/src/structure_comparer/serve.py
@@ -4,6 +4,7 @@
import uvicorn
from fastapi import FastAPI, Response, UploadFile
+from fastapi.responses import FileResponse
from fastapi.middleware.cors import CORSMiddleware
from .errors import (
@@ -798,6 +799,55 @@ async def get_mapping(
return ErrorModel.from_except(e)
+@app.get(
+ "/project/{project_key}/mapping/{mapping_id}/html",
+ tags=["Mappings"],
+ response_model_exclude_unset=True,
+ response_model_exclude_none=True,
+ responses={404: {}},
+)
+async def get_mapping_results(
+ project_key: str,
+ mapping_id: str,
+ show_remarks: bool,
+ show_warnings: bool,
+ response: Response,
+) -> FileResponse: # MappingDetailsModel | ErrorModel:
+ """
+ Get a static HTML page with the mappings
+ Returns a static HTML page with all mappings.
+ ---
+ produces:
+ - text/html
+ responses:
+ 200:
+ description: A static HTML page with the mappings
+ content:
+ text/html:
+ schema:
+ type: string
+ format: binary
+ headers:
+ Content-Disposition:
+ description: The filename of the HTML file
+ schema:
+ type: string
+ example: "mapping_results.html"
+ """
+ global mapping_handler
+ try:
+ return FileResponse(
+ mapping_handler.get_html(
+ project_key, mapping_id, show_remarks, show_warnings
+ ),
+ media_type="text/html",
+ )
+
+ except (ProjectNotFound, MappingNotFound) as e:
+ response.status_code = 404
+ return ErrorModel.from_except(e)
+
+
@app.get(
"/mapping/{id}/fields",
tags=["Fields"],