minor updates

Author: Logende

README.md

@@ -3,8 +3,8 @@
 This project provides a schema conversion platform that supports converting between various data modeling formats (like JSON Schema, LinkML, XSD, DTD, RDF, etc.) using a software architecture that supports different programming languages due to subprocess calling. It consists of:
 
 * 🐍 A central **Flask Orchestrator** (main API + smart pathfinding + schema feature matching + converters in Python)
-* ☕ A **Java** converters
-* 🪦 A **Node.js TypeScript** converters
+* ☕ **Java** converters
+* 🪦 **Node.js TypeScript** converters
 
 
 ## Features

schema-conversion-orchestrator/app.py

@@ -1,21 +1,20 @@
 from conversion_strategies import convert_with_strategy_most_features_preserved, ConversionStrategy, \
     convert_with_strategy_least_character_loss
-from converter import (Converter, ConverterExternal)
-from schema_types import schema_language_from_string, SchemaLanguagesFeatures
+from converter import (Converter, ConverterExternal, prepare_conversion_results_for_serializing)
+from schema_types import schema_language_from_string
 from logic import build_conversion_graph, find_paths
 from register_converters import register_converters
 from flask import Flask, request
 from typing import List, Dict
-from schema_languages_loader import load_schema_language_features
+import json
 
 app = Flask(__name__)
 
-DETAILED_ERROR_OUTPUT = False
 CONVERSION_STRATEGY = ConversionStrategy.LeastCharacterLoss
 
 converters: List[Converter] = register_converters()
 conversion_graph: Dict[str, List[Converter]] = build_conversion_graph(converters)
-schema_languages_features: SchemaLanguagesFeatures = load_schema_language_features()
+# schema_languages_features: SchemaLanguagesFeatures = load_schema_language_features()
 
 print("Started Schema Conversion Orchestrator with the following converters:")
 for conv in converters:
@@ -52,12 +51,14 @@ def convert():
     target = data["targetFormat"]
     schema = data["schema"]
 
-    source = schema_language_from_string(source)
-    target = schema_language_from_string(target)
+    try:
+        source = schema_language_from_string(source)
+        target = schema_language_from_string(target)
+    except ValueError as e:
+        return {"error": str(e)}, 400
 
     # if schema is an object, convert it to string
     if isinstance(schema, dict):
-        import json
         schema = json.dumps(schema)
 
     all_paths = find_paths(source, target, conversion_graph)
@@ -78,7 +79,7 @@ def convert():
 
     if not success:
         # return error message of all attempts together with the attempt number (1 to n)
-        return {"error": "All conversion paths failed.", attempts: attempts}, 500
+        return {"error": "All conversion paths failed.", "attempts": prepare_conversion_results_for_serializing(attempts)}, 500
 
     return {"schema": schema}, 200
 

schema-conversion-orchestrator/conversion_strategies.py

@@ -5,7 +5,8 @@
 from converter import (ConversionResult, ConversionResults, ConversionPaths, Converter, conversion_path_to_string, ConversionsCache)
 from schema_types import SchemaLanguage
 from logic import identify_schema_features, rank_paths
-from app import DETAILED_ERROR_OUTPUT
+
+DETAILED_ERROR_OUTPUT = False
 
 
 class ConversionStrategy(StrEnum):

schema-conversion-orchestrator/converter.py

@@ -182,3 +182,15 @@ def convert(self, schema: str) -> str:
 
 def conversion_path_to_string(path: ConversionPath) -> str:
     return " -> ".join([f"{conv.source_format.value} to {conv.target_format.value} via {conv.service_name}" for conv in path])
+
+
+def prepare_conversion_results_for_serializing(results: ConversionResults) -> dict:
+    serialized_results = {}
+    for idx, (success, schema_or_error, path) in enumerate(results):
+        path_str = conversion_path_to_string(path)
+        serialized_results[f"Attempt {idx + 1}"] = {
+            "success": success,
+            "schema_or_error": schema_or_error,
+            "conversion_path": path_str
+        }
+    return serialized_results

test/send_test_request.py

@@ -4,9 +4,9 @@
 
 # --- Configuration ---
 SERVER_URL = "http://localhost:5002/convert"
-SOURCE_FORMAT = "Shacl"
-TARGET_FORMAT = "JsonSchema"
-SCHEMA_FILE = Path("schemas/owl.ttl")
+SOURCE_FORMAT = "JsonSchema"
+TARGET_FORMAT = "SHACL"
+SCHEMA_FILE = Path("schemas/preciceAdapterConfigSchema.schema.json")
 
 
 def main():