Enable ZIP uploads

Author: HeersGBV

app.py

@@ -10,8 +10,8 @@
 from urllib.parse import urlparse
 
 LOG_FILE = 'app.log'
-IMPORTER_URL  ='http://importer:5020'
-FUSEKI_URL  ='http://fuseki:3030'
+IMPORTER_HOST = 'http://importer:5020'
+FUSEKI_HOST = 'http://fuseki:3030'
 
 
 logging.basicConfig(filename=LOG_FILE, level=logging.INFO)
@@ -86,7 +86,7 @@ def logout():
 @app.route('/fuseki', methods=['post'])
 def fuseki():
     if data := request.json.get('data'):
-        res = requests.post(f'{FUSEKI_URL}/n4o?query={data}')
+        res = requests.post(f'{FUSEKI_HOST}/n4o?query={data}')
         return jsonify(res.text), res.status_code
 
 
@@ -95,7 +95,7 @@ def importer(subpath):
     '''Forwards requests to the importer service'''
     res = requests.request(
         method=request.method,
-        url=f'{IMPORTER_URL}/{subpath}',  # Forward to importer service
+        url=f'{IMPORTER_HOST}/{subpath}',  # Forward to importer service
         headers={k: v for k, v in request.headers if k.lower() != 'host'},  # Exclude 'host' header
         data=request.get_data(),
         cookies=request.cookies,
@@ -110,21 +110,22 @@ def importer(subpath):
     return response
 
 
-@app.route('/postCollectionData', methods=['POST'])
-def postCollectionData():
-    '''Posts new collection data. Recent data will be deleted.'''
-    if uri := request.json.get('uri'):
-        index = urlparse(uri).path.strip('/').split('/')[-1]
-        if data := request.json['data']:
+@app.route('/postCollectionData/<int:coll_index>', methods=['POST'])
+def postCollectionData(coll_index):
+    '''Upload new collection data. Recent data will be deleted.'''
+    if coll_index > 0:
+        if file := request.files.get('file'):
             # Copy data to file, then call importer services receive and add
-            suffix = request.json.get("suffix", "ttl")
-            import_file = f'import_{index}.{suffix}'
-            Path(f'./data').mkdir(exist_ok=True)
-            Path(f'./data/{import_file}').write_text(data)
-            service = f'{IMPORTER_URL}/collection/{index}'
-            res = requests.post(f'{service}/receive?from={import_file}')
-            res = requests.post(f'{service}/load')
-            #res = requests.post(f'{service}/add')
+            # logger.info(f'name = {file.filename} index = {index}')
+            buffer_name = f'collection_{coll_index}{Path(file.filename).suffix}'
+            file.save(f'./data/{buffer_name}')
+
+            service_url = f'{IMPORTER_HOST}/collection/{coll_index}'
+            res = requests.post(f'{service_url}/receive?from={buffer_name}')
+            if res.ok:
+                res = requests.post(f'{service_url}/load')
+                # TODO res = requests.post(f'{service}/add') #Not supporte
+            Path(f'./data/{buffer_name}').unlink(missing_ok=False)
             return res.text, res.status_code
     return jsonify(message='No data or collection index provided')
 

static/collections.js

@@ -50,19 +50,22 @@ function showProgess(on = false) {
 }
 
 /// Import TTL data into the KG
-function postCollectionData(uri, data, suffix) {
+function postCollectionData(index,file) {
     showProgess(true);
-    var req = {
-        method: 'POST',
-        headers: {
-            'Accept': 'application/json, text/plain, */*', 'Content-Type': 'application/json'
-        },
-        body: JSON.stringify({ "data": data, "uri": uri, suffix: suffix })
-    }
-    fetch('/postCollectionData', req)
+    var data = new FormData();
+    data.append('file', file, file.filename);
+    data.append('index', index);
+    
+    var req = { method: 'POST', body: data, };
+    fetch('/postCollectionData/'+index, req)
         .then(response => response.json())
-        .then(json => console.log(json))
-        .catch(err => console.error(err))
+        .then(json => {
+            console.log(json);
+            if (json.code) {
+                alert(`Error ${json.code}:\n\t${json.message} at line ${json.position.linecol}`);
+            }
+        })
+        .catch(err => alert(err))
         .finally(() => {
             showProgess(false);
         });
@@ -170,12 +173,8 @@ function makeAppData() {
                 }
                 else {
                     const file0 = this.rdfFiles[0]
-                    const textPromise = file0.text();
-                    textPromise.then((data) => {
-                        let suffix = file0.name.split('.').pop().toLowerCase();
-                        postCollectionData(this.displayCollection.uri, data, suffix);
-                        this.rdfFiles = [];
-                    });
+                    postCollectionData(this.displayCollection.id, file0);
+                    this.rdfFiles = [];
                 }
             },
             putCollection(collection) {

templates/collections.html

@@ -33,7 +33,7 @@ <h5 class="modal-title" id="uploadRDFLabel">Uploading RDF files</h5>
         <div class="modal-body">
           <form novalidate @submit.prevent="uploadRDF">
             <div class="input-group mb-3">
-              <input type="file" class="form-control" @change="saveRDFUrl" accept=".ttl,.nt,.xml,.n3" />&nbsp;
+              <input type="file" class="form-control" @change="saveRDFUrl" accept=".ttl,.nt,.xml,.n3,.zip" />&nbsp;
               <input type="submit" class="btn btn-primary" data-bs-dismiss="modal" value="Open" />
             </div>
           </form>