Clean up

Author: cwang39403

README.md

@@ -185,15 +185,15 @@ An example how to start the service using waitress.
 waitress-serve --listen="*:8080" --call "esdlvalidator.api.manage:create_app"
 ```
 
-### Update static ESDL metamodel code
+<!-- ### Deprecated: Update static ESDL metamodel code
 
 To update the ESDL code to work with the latest version of the ESDL ecore model, update esdl.ecore to the latest version
 and run
 
 ```
 pip3 install pyecoregen
 pyecoregen -e esdl.ecore -o ./esdlvalidator/core/esdl
-```
+``` -->
 
 ## Docker
 

dev.docker-compose.yml

@@ -8,7 +8,6 @@ networks:
 
 services:
   esdl-validator:
-#    image: mvrijlandt/nwn_esdl_validator:0.0.4
     build: ./
     ports:
       - "5000:5000"

docker-compose-poc.yml

@@ -1,21 +1,15 @@
 import json
-import uuid
-import logging
-from datetime import datetime as dt
-from math import cos, sin, atan2, sqrt, radians, degrees
 
-from esdl import Notes, Line, Point, Polygon, Note
 from flask import request, Response
 from flask_restx import Resource
 
 from esdlvalidator.api import app
 from esdlvalidator.api.controller import validationService
 from esdlvalidator.core.exceptions import SchemaNotFound
-from esdlvalidator.validation.functions import utils
 
 parser = app.api.parser()
 parser.add_argument("data", type=str, required=True)
-parser.add_argument("schemas", type=str, required=True)
+parser.add_argument("schemas", type=str, help="List of schema id's, comma separated", required=True)
 
 
 @app.ns_validation_to_msgs.route('/')
@@ -83,77 +77,3 @@ def set_messages(result, asset, msgs):
                 return result
         result.append({"assetID": asset, "messages": msgs})
         return result
-
-    def update_esdl(self, resource, results: dict):
-        asset_notes = {}
-        now = dt.now()
-
-        notes = Notes()
-        notes.id = str(uuid.uuid4())
-        notes.name = "Validation Notes"
-
-        for schema in results['schemas']:
-            for validation in schema['validations']:
-                if "errors" in validation:
-                    for error in validation['errors']:
-                        if isinstance(error, dict):
-                            asset_id = error["offending_asset"]
-                            message = error["message"]
-                            if asset_id in asset_notes:
-                                note = asset_notes[asset_id]
-                                note.text = note.text + "\nERROR: {}".format(message)
-                            else:
-                                asset = resource.uuid_dict[asset_id]
-                                p = self.get_center_point(asset)
-                                note = Note(id=str(uuid.uuid4()), mapLocation=p, author="ESDLValidatorService",
-                                            title=asset_id, text="ERROR: {}".format(message), date=now)
-                                asset_notes[asset_id] = note
-                if "warnings" in validation:
-                    for warning in validation['warnings']:
-                        if isinstance(warning, dict):
-                            asset_id = warning["offending_asset"]
-                            message = warning["message"]
-                            if asset_id in asset_notes:
-                                note = asset_notes[asset_id]
-                                note.text = note.text + "\nWARNING: {}".format(message)
-                            else:
-                                asset = resource.uuid_dict[asset_id]
-                                p = self.get_center_point(asset)
-                                note = Note(id=str(uuid.uuid4()), mapLocation=p, author="ESDLValidatorService",
-                                            title=asset_id, text="WARNING: {}".format(message), date=now)
-                                asset_notes[asset_id] = note
-        for n in asset_notes.values():
-            notes.note.append(n)
-
-        return notes
-
-    @staticmethod
-    def get_center_point(asset):
-        a = asset
-        while not utils.has_attribute(a, 'geometry'):
-            a = a.eContainer()
-        geometry = a.geometry
-        points = None
-        if isinstance(geometry, Polygon):
-            points = geometry.exterior[0:2]
-        elif isinstance(geometry, Line):
-            points = geometry.point[0:2]
-        elif isinstance(geometry, Point):
-            points = [geometry]
-        x = []
-        y = []
-        z = []
-        for p in points:
-            x.append(cos(radians(p.lat)) * cos(radians(p.lon)))
-            y.append(cos(radians(p.lat)) * sin(radians(p.lon)))
-            z.append(sin(radians(p.lat)))
-
-        x_avg = (sum(x) / len(x))
-        y_avg = (sum(y) / len(y))
-        z_avg = (sum(z) / len(z))
-
-        lon = atan2(y_avg, x_avg)
-        hyp = sqrt(x_avg * x_avg + y_avg * y_avg)
-        lat = atan2(z_avg, hyp)
-
-        return Point(lat=degrees(lat), lon=degrees(lon))

esdlvalidator/api/controller/validationToMessages.py

@@ -3,7 +3,6 @@
 from esdlvalidator.validation.functions.function import FunctionFactory, FunctionCheck, FunctionDefinition, \
     ArgDefinition, FunctionType, CheckResult
 
-
 @FunctionFactory.register(FunctionType.CHECK, "multi_cond_xor")
 class ContainsMultiConditionCheck(FunctionCheck):
 
@@ -49,7 +48,6 @@ def execute(self):
                     return CheckResult(False, msg)
                 else:
                     return CheckResult(False, result)
-            # print(str(utils.get_attribute(self.value, p)), p, v)
             if utils.get_attribute(self.value, p) == v:
                 fails += 1
 

esdlvalidator/validation/functions/check_multi_cond_xor.py

@@ -20,11 +20,12 @@ class EsdlValidator:
     def __init__(self):
         pass
 
-    def validate(self, esdl, schemas: list):
+    def validate(self, esdl, schemas: list) -> ValidatorResult:
         """Validate an ESDL against one or more multiple schemas
 
         Args:
             esdl (object): The loaded ESDL
+            schemas (list): A list of validation schemas
 
         Returns:
             result: ValidatorResult containing the validation results

esdlvalidator/validation/validator.py

@@ -1,5 +1,5 @@
 pyecore>=0.11.6
-pyecoregen>=0.4.3
+pyecoregen>=0.5.0
 lxml>=4.6.2
 numpy>=1.19.4
 flask>=1.1.2
@@ -27,4 +27,4 @@ six>=1.15.0
 jsonschema>=3.2.0
 pyrsistent>=0.17.3
 pycodestyle>=2.6.0
-pyESDL>=21.9.1
+pyESDL>=25.7