point to new endpoint and make strings into URIRefs

buildingmotif-app/src/app/shape-validation/shape-validate.service.ts

@@ -15,7 +15,7 @@ export class ShapeValidationService {
   validateModelShape(modelId: number, shape_collection_ids: number[], shape_uris: string[], target_class: string) {
     const headers = {'Content-Type': "application/json"}
 
-    return this.http.post<ValidationResponse>(`http://localhost:5000/models/${modelId}/validate`,
+    return this.http.post<ValidationResponse>(`http://localhost:5000/models/${modelId}/validate_shape`,
         {shape_collection_ids, shape_uris, target_class},
         {headers, responseType: 'json'}
       )

buildingmotif/api/views/model.py

@@ -1,7 +1,7 @@
 import flask
 from flask import Blueprint, current_app, jsonify, request
 from flask_api import status
-from rdflib import Graph
+from rdflib import Graph, URIRef
 from rdflib.plugins.parsers.notation3 import BadSyntax
 from sqlalchemy.orm.exc import NoResultFound
 
@@ -232,11 +232,19 @@ def validate_shape(models_id: int) -> flask.Response:
             "message": f"shape collections with ids {nonexistent_shape_collections} do not exist"
         }, status.HTTP_400_BAD_REQUEST
 
+    if body.get("target_class", None) is None:
+        return {
+            "message": "target class is required to execute this endpoint"
+        }, status.HTTP_400_BAD_REQUEST
+
+    shape_uris = [URIRef(shape_uri) for shape_uri in body.get("shape_uris", [])]
+    target_class = URIRef(body.get("target_class"))
+
     # test
     conformance = model.test_model_against_shapes(
         shape_collections=shape_collections,
-        shapes_to_test=body.get("shape_uris", []),
-        target_class=body.get("target_class", None),
+        shapes_to_test=shape_uris,
+        target_class=target_class,
     )
     result = {
         shape_uri: validation_context.report_string