New importer api

Author: HeersGBV

app.py

@@ -12,7 +12,7 @@
 
 sparql_url = 'http://fuseki:3030/n4o'
 def lido2rdf_url(): return f'http://converter:5000/convert'
-def importer_url(coll): return f'http://importer:5020/collection/import/{coll}'
+def importer_url(coll): return f'http://importer:5020/collection/{coll}/load'
 
 
 app = Flask(__name__, template_folder='templates', static_folder='static', static_url_path='/assets')
@@ -83,7 +83,7 @@ def home():
         collection = 'default'
         if user := find_user(username):
             collection = user['collection'] or 'default'
-        data_dir = './data/'
+        data_dir = './admin_data/'
         with open(data_dir+user['samplefile'], 'r') as f:
             user['profile_data'] = f.read()
         return render_template('index.html', collection=collection, user=jsonify(user).json)
@@ -127,9 +127,10 @@ def import_ttl():
     ''''Import TTL data into the RDF store'''
     if coll := request.json.get('coll_index'):
         if data := request.json['data']:
-            with open(f'./stage/inbox/{coll}/out.ttl', 'w') as f:
-                f.write(data)
-            return requests.post(importer_url(coll)).text
+            fn = f'import_{coll}.ttl'
+            with open(f'./data/{fn}', 'w') as f: f.write(data)
+            res =requests.post(f'http://importer:5020/collection/{coll}/receive?from={fn}')
+            return requests.post(f'http://importer:5020/collection/{coll}/load').text, res.status_code
     return jsonify(message='No data or collection index provided')
 
 

templates/index.html

@@ -62,6 +62,7 @@ <h4>RDF Output (ttl)</h4>
           <button type="button" class="btn btn-danger btn-sm" onclick="import_ttl()" id="ITB">Import</button>
           <button type="button" class="btn btn-primary btn-sm" onclick="rdfEditor.setValue('')" id="ITB">Clear</button>
           <button type="button" class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#uploadFile">Upload file</button>
+          <div class="spinner-border text-primary" role="status" id="SP2"></div>
         </p>
         <div id="rdfEditor" style="height:600px"></div>
       </div>
@@ -71,6 +72,7 @@ <h4>RDF Output (ttl)</h4>
 </body>
 <script>
   document.getElementById("SP1").style.display = "none";
+  document.getElementById("SP2").style.display = "none";
 
   function makeEditor(label, style = "ace/theme/monokai", fmt = "ace/mode/xml") {
     // Returns an ace editor object
@@ -115,6 +117,7 @@ <h4>RDF Output (ttl)</h4>
   }
 
   function import_ttl(collection = "n4o") {
+    document.getElementById("SP2").style.display = "inline-block";
     var req = {
       method: 'POST',
       headers: {
@@ -127,6 +130,9 @@ <h4>RDF Output (ttl)</h4>
       .then(response => response.json())
       .then(json => console.log(json))
       .catch(err => console.error(err))
+     .finally(() => {
+        document.getElementById("SP2").style.display = "none";
+      });
   }
 
   function uploadTurtle(form) {