Fix server-managed predicate removal; infer container class type from

predicates.

lakesuperior/endpoints/ldp.py

@@ -4,12 +4,14 @@ from collections import defaultdict
 from uuid import uuid4
 
 from flask import Blueprint, request, send_file
+from rdflib import Graph
 from werkzeug.datastructures import FileStorage
 
 from lakesuperior.exceptions import InvalidResourceError, \
         ResourceExistsError, ResourceNotExistsError, ServerManagedTermError
-from lakesuperior.model.ldp_rs import Ldpr, Ldpc, LdpRs
+from lakesuperior.model.ldpr import Ldpr
 from lakesuperior.model.ldp_nr import LdpNr
+from lakesuperior.model.ldp_rs import Ldpc, LdpDc, LdpIc, LdpRs
 from lakesuperior.store_layouts.rdf.base_rdf_layout import BaseRdfLayout
 from lakesuperior.util.translator import Translator
 
@@ -228,28 +230,41 @@ def delete_resource(uuid):
 
 
 def class_from_req_body():
+    '''
+    Determine LDP type (and instance class) from the provided RDF body.
+    '''
     logger.debug('Content type: {}'.format(request.mimetype))
     logger.debug('files: {}'.format(request.files))
     logger.debug('stream: {}'.format(request.stream))
+
+    # LDP-NR types
     if  not request.mimetype or request.mimetype in accept_rdf:
-        cls = Ldpc
         # Parse out the RDF string.
         data = request.data.decode('utf-8')
+        g = Graph().parse(data=data, format=request.mimetype)
+
+        if Ldpr.MBR_RSRC_URI in g.predicates() and \
+                Ldpr.MBR_REL_URI in g.predicates():
+            if Ldpr.INS_CNT_REL_URI in g.predicates():
+                cls = LdpIc
+            else:
+                cls = LdpDc
+        else:
+            cls = Ldpc
     else:
         cls = LdpNr
         if request.mimetype == 'multipart/form-data':
             # This seems the "right" way to upload a binary file, with a
-            # multipart/form-data MIME type and the file in the `file` field.
-            # This however is not supported by FCREPO4.
+            # multipart/form-data MIME type and the file in the `file`
+            # field. This however is not supported by FCREPO4.
             data = request.files.get('file').stream
         else:
-            # This is a less clean way, with the file in the form body and the
-            # request as application/x-www-form-urlencoded.
+            # This is a less clean way, with the file in the form body and
+            # the request as application/x-www-form-urlencoded.
             # This is how FCREPO4 accepts binary uploads.
             data = request.stream
 
-    logger.info('POSTing resource of type: {}'.format(cls.__name__))
-    #logger.info('POST data: {}'.format(data))
+    logger.info('Creating resource of type: {}'.format(cls.__name__))
 
     return cls, data
 

lakesuperior/model/ldp_rs.py

@@ -123,7 +123,8 @@ class LdpRs(Ldpr):
                 raise ServerManagedTermError(offending_subjects, 's')
             else:
                 for s in offending_subjects:
-                    g.remove((s, Variable('p'), Variable('o')))
+                    self._logger.info('Removing offending subj: {}'.format(s))
+                    g.remove((s, None, None))
 
         offending_predicates = set(g.predicates()) & srv_mgd_predicates
         if offending_predicates:
@@ -131,7 +132,8 @@ class LdpRs(Ldpr):
                 raise ServerManagedTermError(offending_predicates, 'p')
             else:
                 for p in offending_predicates:
-                    g.remove((Variable('s'), p, Variable('o')))
+                    self._logger.info('Removing offending pred: {}'.format(p))
+                    g.remove((None, p, None))
 
         offending_types = set(g.objects(predicate=RDF.type)) & srv_mgd_types
         if offending_types:
@@ -139,8 +141,11 @@ class LdpRs(Ldpr):
                 raise ServerManagedTermError(offending_types, 't')
             else:
                 for t in offending_types:
-                    g.remove((Variable('s'), RDF.type, t))
+                    self._logger.info('Removing offending type: {}'.format(t))
+                    g.remove((None, RDF.type, t))
 
+        self._logger.debug('Sanitized graph: {}'.format(g.serialize(
+            format='turtle').decode('utf-8')))
         return g
 
 

lakesuperior/model/ldpr.py

@@ -609,6 +609,7 @@ class Ldpr(metaclass=ABCMeta):
                     add_g.add((s, p, target_uri))
 
         if len(add_g):
+            add_g = self._check_mgd_terms(add_g)
             self._logger.debug('Adding DC/IC triples: {}'.format(
                 add_g.serialize(format='turtle').decode('utf-8')))
             self.rdfly.modify_dataset(Graph(), add_g)