Adjust benchmark and generators to cope with FCREPO.

lakesuperior/util/benchmark.py

@@ -97,7 +97,8 @@ def run(
 
         if delete_container:
             print('Removing previously existing container.')
-            requests.delete(parent, headers={'prefer': 'no-tombstone'})
+            requests.delete(parent)
+            requests.delete(f'{parent}/fcr:tombstone')
         requests.put(parent)
 
     elif mode == 'python':
@@ -133,7 +134,6 @@ def run(
 
     try:
         for i in range(1, count + 1):
-            #import pdb; pdb.set_trace()
             if mode == 'ldp':
                 dest = (
                     f'{parent}/{uuid4()}' if method == 'put'
@@ -229,7 +229,7 @@ def _ingest_graph_py(method, dest, data, ref):
     if method == 'put':
         _, rsrc = rsrc_api.create_or_replace(dest, **kwargs)
     else:
-        _, rsrc = rsrc_api.create(dest, **kwargs)
+        rsrc = rsrc_api.create(dest, **kwargs)
 
     return rsrc.uid
 

lakesuperior/util/generators.py

@@ -63,7 +63,7 @@ nsc = {
 for pfx, ns in nsc.items():
     nsm.bind(pfx, ns)
 
-def random_graph(size, ref):
+def random_graph(size, ref, subj=''):
     '''
     Generate a synthetic graph.
 
@@ -74,24 +74,24 @@ def random_graph(size, ref):
     gr.namespace_manager = nsm
     for ii in range(floor(size / 4)):
         gr.add((
-            URIRef(''),
-            nsc['intp'][str(ii % size)],
+            URIRef(subj),
+            nsc['intp'][f'u{ii % size}'],
             URIRef(ref)
         ))
         gr.add((
-            URIRef(''),
-            nsc['litp'][str(ii % size)],
-            Literal(random_utf8_string(64))
+            URIRef(subj),
+            nsc['extp'][f'u{ii % size}'],
+            URIRef('http://example.edu/res/{}'.format(ii // 10))
         ))
         gr.add((
-            URIRef(''),
-            nsc['litp'][str(ii % size)],
+            URIRef(subj),
+            nsc['litp'][f'l{ii % size}'],
             Literal(random_utf8_string(64))
         ))
         gr.add((
-            URIRef(''),
-            nsc['extp'][str(ii % size)],
-            URIRef('http://example.edu/res/{}'.format(ii // 10))
+            URIRef(subj),
+            nsc['litp'][f'l{ii % size + size}'],
+            Literal(random_utf8_string(64))
         ))
 
     #print('Graph: {}'.format(gr.serialize(format='turtle').decode('utf-8')))