Add backend for population management

.github/workflows/ci.yaml

@@ -12,7 +12,6 @@ on:
 env:
   REPO_NAME: ${{ github.event.repository.name }}
 
-
 jobs:
   pre-commit:
     if: always()
@@ -98,16 +97,15 @@ jobs:
           pip install --upgrade pip
           pip install -r requirements.txt
           pip install pytest-github-actions-annotate-failures
-      
+
       - name: Install graphviz
         uses: tlylt/install-graphviz@v1
 
-
       - name: PyTest with code coverage
         continue-on-error: true
         run: |
           pytest --junitxml pytest.xml --cov=. --cov-report=term-missing --cov-report=xml --cov-branch | tee pytest-coverage.txt
-      
+
       - name: Upload Coverage Results txt
         if: always()
         uses: actions/upload-artifact@v3

pkg_api/connector.py

@@ -2,7 +2,7 @@
 import os
 from enum import Enum
 
-from rdflib import Graph
+from rdflib import Graph, Namespace
 from rdflib.query import Result
 
 from pkg_api.core.namespaces import PKGPrefixes
@@ -12,6 +12,7 @@
 # Method to execute the SPARQL query
 
 DEFAULT_STORE_PATH = "data/RDFStore"
+DEFAULT_PKG_NAMESPACE = Namespace("http://example.com/pkg")
 
 
 class RDFStore(Enum):

pkg_api/server/__init__.py

@@ -9,21 +9,21 @@
 from pkg_api.connector import DEFAULT_STORE_PATH
 from pkg_api.pkg import DEFAULT_VISUALIZATION_PATH
 from pkg_api.server.auth import AuthResource
-from pkg_api.server.facts_management import PersonalFactsResource
 from pkg_api.server.models import db
 from pkg_api.server.nl_processing import NLResource
 from pkg_api.server.pkg_exploration import PKGExplorationResource
 from pkg_api.server.service_management import ServiceManagementResource
+from pkg_api.server.statements_management import StatementsManagementResource
 
 
 def create_app(testing: bool = False) -> Flask:
-    """Create the Flask app and add the API resources.
+    """Creates the Flask app and add the API resources.
 
     Args:
         testing: Enable testing mode. Defaults to False.
 
     Returns:
-        The Flask app.
+        Flask app.
     """
     app = Flask(__name__)
 
@@ -47,7 +47,7 @@ def create_app(testing: bool = False) -> Flask:
 
     api.add_resource(AuthResource, "/auth")
     api.add_resource(ServiceManagementResource, "/service")
-    api.add_resource(PersonalFactsResource, "/facts")
+    api.add_resource(StatementsManagementResource, "/statements")
     api.add_resource(PKGExplorationResource, "/explore")
     api.add_resource(NLResource, "/nl")
 

pkg_api/server/pkg_exploration.py

@@ -1,4 +1,5 @@
 """PKG Exploration Resource."""
+
 from typing import Any, Dict, Tuple
 
 from flask import request
@@ -17,8 +18,8 @@ def get(self) -> Tuple[Dict[str, Any], int]:
         data = request.json
         try:
             pkg = open_pkg(data)
-        except Exception as e:
-            return {"message": str(e)}, 400
+        except KeyError as e:
+            return {"message": e.args[0]}, 400
 
         graph_img_path = pkg.visualize_graph()
         pkg.close()
@@ -38,8 +39,8 @@ def post(self) -> Tuple[Dict[str, Any], int]:
         data = request.json
         try:
             pkg = open_pkg(data)
-        except Exception as e:
-            return {"message": str(e)}, 400
+        except KeyError as e:
+            return {"message": e.args[0]}, 400
 
         sparql_query = parse_query_request_data(data)
 

pkg_api/server/statements_management.py

@@ -0,0 +1,63 @@
+"""Statements Management API Resource."""
+
+from typing import Dict, Tuple
+
+from flask import request
+from flask_restful import Resource
+
+from pkg_api.server.utils import (
+    open_pkg,
+    parse_query_statement_population_data,
+)
+
+
+class StatementsManagementResource(Resource):
+    def post(self) -> Tuple[Dict[str, str], int]:
+        """Adds a statement to the PKG.
+
+        Raises:
+            KeyError: if there is missing information to open the user's PKG,
+              or if the statement is missing.
+
+        Returns:
+            A dictionary containing a message and the status code.
+        """
+        data = request.json
+        try:
+            pkg = open_pkg(data)
+        except KeyError as e:
+            return {"message": e.args[0]}, 400
+
+        try:
+            pkg_data = parse_query_statement_population_data(data)
+            pkg.add_statement(pkg_data)
+            pkg.close()
+        except KeyError as e:
+            return {"message": e.args[0]}, 400
+
+        return {"message": "Statement added successfully"}, 200
+
+    def delete(self) -> Tuple[Dict[str, str], int]:
+        """Deletes a statement from the PKG.
+
+        Raises:
+            KeyError: if there is missing information to open the user's PKG, or
+              if the statement is missing.
+
+        Returns:
+            A dictionary containing a message and the status code.
+        """
+        data = request.json
+        try:
+            pkg = open_pkg(data)
+        except KeyError as e:
+            return {"message": e.args[0]}, 400
+
+        try:
+            pkg_data = parse_query_statement_population_data(data)
+            pkg.remove_statement(pkg_data)
+            pkg.close()
+        except KeyError as e:
+            return {"message": e.args[0]}, 400
+
+        return {"message": "Statement removed successfully"}, 200

pkg_api/server/utils.py

@@ -1,10 +1,19 @@
 """Utility functions for the server."""
-from typing import Any, Dict
+
+import uuid
+from typing import Any, Dict, Union
 
 from flask import current_app
 
 from pkg_api.connector import RDFStore
-from pkg_api.core.pkg_types import URI
+from pkg_api.core.pkg_types import (
+    URI,
+    Concept,
+    PKGData,
+    Preference,
+    Triple,
+    TripleElement,
+)
 from pkg_api.pkg import PKG
 
 
@@ -14,13 +23,16 @@ def open_pkg(data: Dict[str, str]) -> PKG:
     Args:
         data: Request data.
 
+    Raises:
+        KeyError: If the owner URI is missing.
+
     Returns:
         A PKG instance.
     """
     owner_uri = data.get("owner_uri", None)
     owner_username = data.get("owner_username", None)
     if owner_uri is None:
-        raise Exception("Missing owner URI")
+        raise KeyError("Missing owner URI")
 
     store_path = current_app.config["STORE_PATH"]
     visualization_path = current_app.config["VISUALIZATION_PATH"]
@@ -43,3 +55,67 @@ def parse_query_request_data(data: Dict[str, Any]) -> str:
         A string containing SPARQL query.
     """
     return data.get("sparql_query", None)
+
+
+def _parse_triple_element(
+    element_data: Union[Dict[str, Any], str]
+) -> TripleElement:
+    """Parses a triple element received from HTTP request.
+
+    Args:
+        element_data: Data sent with HTTP request.
+
+    Returns:
+        Triple element.
+    """
+    if element_data is not None:
+        value = (
+            element_data
+            if isinstance(element_data, str)
+            else element_data.get("value")
+        )
+        if isinstance(value, dict):
+            return TripleElement(value.get("description"), Concept(**value))
+        elif isinstance(value, str):
+            try:
+                return TripleElement(value, URI(value))
+            except Exception:
+                return TripleElement(value, None)
+
+    return None
+
+
+def parse_query_statement_population_data(data: Dict[str, Any]) -> PKGData:
+    """Parses the request data to execute SPARQL query.
+
+    Raises:
+        KeyError: If there is no natural language statement description.
+
+    Args:
+        data: Request data.
+
+    Returns:
+        Associated PKGData.
+    """
+    description = data.get("description", None)
+    if description is None:
+        raise KeyError("Missing description")
+
+    # Parse triple elements
+    subject = _parse_triple_element(data.get("subject", None))
+    predicate = _parse_triple_element(data.get("predicate", None))
+    statement_object = _parse_triple_element(data.get("object", None))
+
+    # Parse preference
+    preference = data.get("preference", None)
+    if preference and -1.0 <= preference <= 1.0:
+        preference = Preference(statement_object, preference)
+    else:
+        preference = None
+
+    return PKGData(
+        id=uuid.uuid1(),
+        statement=description,
+        triple=Triple(subject, predicate, statement_object),
+        preference=preference,
+    )

tests/pkg_api/server/conftest.py

@@ -1,4 +1,5 @@
 """Fixtures for the pkg_api.server package."""
+
 import os
 
 import pytest
@@ -19,3 +20,7 @@ def client() -> Flask:
     yield client
     # Delete the test database
     os.remove(f"{app.instance_path}/test.sqlite")
+    # Delete turtle files
+    for file in os.listdir(f"{app.config['STORE_PATH']}"):
+        if file.endswith(".ttl"):
+            os.remove(f"{app.config['STORE_PATH']}/{file}")