Merge branch 'development' into config_overrides

lakesuperior/endpoints/query.py

@@ -55,9 +55,13 @@ def sparql():
     if request.method == 'GET':
         return render_template('sparql_query.html', nsm=nsm)
     else:
-        logger.debug('Query: {}'.format(request.form['query']))
+        if request.mimetype == 'multipart/form-data':
+            qstr = request.form['query']
+        else:
+            qstr = stream.read()
+        logger.debug('Query: {}'.format(qstr))
         with TxnManager(rdf_store) as txn:
-            qres = query_api.sparql_query(request.form['query'])
+            qres = query_api.sparql_query(qstr)
 
             match = request.accept_mimetypes.best_match(accept_mimetypes.keys())
             if match:

lakesuperior/model/ldp_rs.py

@@ -12,9 +12,10 @@ logger = logging.getLogger(__name__)
 
 
 class LdpRs(Ldpr):
-    '''LDP-RS (LDP RDF source).
+    '''
+    LDP-RS (LDP RDF source).
 
-    Definition: https://www.w3.org/TR/ldp/#ldprs
+    https://www.w3.org/TR/ldp/#ldprs
     '''
     def __init__(self, uuid, repr_opts={}, handling='lenient', **kwargs):
         '''
@@ -41,61 +42,6 @@ class LdpRs(Ldpr):
         self.handling = handling
 
 
-    ## LDP METHODS ##
-
-    def patch(self, update_str):
-        '''
-        Update an existing resource by applying a SPARQL-UPDATE query.
-
-        @param update_str (string) SPARQL-Update staements.
-        '''
-        self.handling = 'lenient' # FCREPO does that and Hyrax requires it.
-
-        return self._sparql_update(update_str)
-
-
-    #def _sparql_delta(self, q):
-    #    '''
-    #    Calculate the delta obtained by a SPARQL Update operation.
-
-    #    This is a critical component of the SPARQL update prcess and does a
-    #    couple of things:
-
-    #    1. It ensures that no resources outside of the subject of the request
-    #    are modified (e.g. by variable subjects)
-    #    2. It verifies that none of the terms being modified is server managed.
-
-    #    This method extracts an in-memory copy of the resource and performs the
-    #    query on that once it has checked if any of the server managed terms is
-    #    in the delta. If it is, it raises an exception.
-
-    #    NOTE: This only checks if a server-managed term is effectively being
-    #    modified. If a server-managed term is present in the query but does not
-    #    cause any change in the updated resource, no error is raised.
-
-    #    @return tuple(rdflib.Graph) Remove and add graphs. These can be used
-    #    with `BaseStoreLayout.update_resource` and/or recorded as separate
-    #    events in a provenance tracking system.
-    #    '''
-    #    logger.debug('Provided SPARQL query: {}'.format(q))
-    #    pre_gr = self.imr.graph
-
-    #    post_gr = pre_gr | Graph()
-    #    post_gr.update(q)
-
-    #    remove_gr, add_gr = self._dedup_deltas(pre_gr, post_gr)
-
-    #    #logger.debug('Removing: {}'.format(
-    #    #    remove_gr.serialize(format='turtle').decode('utf8')))
-    #    #logger.debug('Adding: {}'.format(
-    #    #    add_gr.serialize(format='turtle').decode('utf8')))
-
-    #    remove_gr = self._check_mgd_terms(remove_gr)
-    #    add_gr = self._check_mgd_terms(add_gr)
-
-    #    return set(remove_gr), set(add_gr)
-
-
 
 class Ldpc(LdpRs):
     '''LDPC (LDP Container).'''

lakesuperior/model/ldpr.py

@@ -395,8 +395,15 @@ class Ldpr(metaclass=ABCMeta):
         return self.create_or_replace_rsrc()
 
 
-    def patch(self, *args, **kwargs):
-        raise NotImplementedError()
+    def patch(self, update_str):
+        '''
+        Update an existing resource by applying a SPARQL-UPDATE query.
+
+        @param update_str (string) SPARQL-Update staements.
+        '''
+        self.handling = 'lenient' # FCREPO does that and Hyrax requires it.
+
+        return self._sparql_update(update_str)
 
 
     def bury_rsrc(self, inbound, tstone_pointer=None):
@@ -829,37 +836,53 @@ class Ldpr(metaclass=ABCMeta):
         '''
         Apply a SPARQL update to a resource.
 
-        The SPARQL string is validated beforehand to make sure that it does
-        not contain server-managed terms.
+        @param update_str (string) SPARQL-Update string. All URIs are local.
 
-        In theory, server-managed terms in DELETE statements are harmless
-        because the patch is only applied over the user-provided triples, but
-        at the moment those are also checked.
+        @return 
         '''
-        # Parse the SPARQL update string and validate contents.
-        qry_struct = translateUpdate(parseUpdate(update_str))
-        check_ins_gr = Graph()
-        check_del_gr = Graph()
-        for stmt in qry_struct:
-            try:
-                check_ins_gr += set(stmt.insert.triples)
-            except AttributeError:
-                pass
-            try:
-                check_del_gr += set(stmt.delete.triples)
-            except AttributeError:
-                pass
+        self.handling = 'lenient' # FCREPO does that and Hyrax requires it.
+        delta = self._sparql_delta(update_str)
+
+        return self._modify_rsrc(RES_UPDATED, *delta, notify=notify)
+
+
+    def _sparql_delta(self, q):
+        '''
+        Calculate the delta obtained by a SPARQL Update operation.
+
+        This is a critical component of the SPARQL update prcess and does a
+        couple of things:
+
+        1. It ensures that no resources outside of the subject of the request
+        are modified (e.g. by variable subjects)
+        2. It verifies that none of the terms being modified is server managed.
+
+        This method extracts an in-memory copy of the resource and performs the
+        query on that once it has checked if any of the server managed terms is
+        in the delta. If it is, it raises an exception.
+
+        NOTE: This only checks if a server-managed term is effectively being
+        modified. If a server-managed term is present in the query but does not
+        cause any change in the updated resource, no error is raised.
+
+        @return tuple(rdflib.Graph) Remove and add graphs. These can be used
+        with `BaseStoreLayout.update_resource` and/or recorded as separate
+        events in a provenance tracking system.
+        '''
+        logger.debug('Provided SPARQL query: {}'.format(q))
+        pre_gr = self.imr.graph
 
-        self._check_mgd_terms(check_ins_gr)
-        self._check_mgd_terms(check_del_gr)
+        post_gr = pre_gr | Graph()
+        post_gr.update(q)
 
-        env.app_globals.rdfly.patch_rsrc(self.uid, update_str)
+        remove_gr, add_gr = self._dedup_deltas(pre_gr, post_gr)
 
-        if notify and current_app.config.get('messaging'):
-            self._enqueue_msg(RES_UPDATED, check_del_gr, check_ins_gr)
+        #logger.debug('Removing: {}'.format(
+        #    remove_gr.serialize(format='turtle').decode('utf8')))
+        #logger.debug('Adding: {}'.format(
+        #    add_gr.serialize(format='turtle').decode('utf8')))
 
-        # @FIXME Ugly workaround until we find how to recompose a SPARQL query
-        # string from a parsed query object.
-        env.app_globals.rdfly.clear_smt(self.uid)
+        remove_gr = self._check_mgd_terms(remove_gr)
+        add_gr = self._check_mgd_terms(add_gr)
 
-        return RES_UPDATED
+        return set(remove_gr), set(add_gr)