diff --git a/front_end/dpath.py b/front_end/dpath.py index 545f7961be166345ead882457ffe320ea5cdef0c..d3957eaeba0484dcbd756e11dd48d276c30a6a2a 100644 --- a/front_end/dpath.py +++ b/front_end/dpath.py @@ -1,7 +1,5 @@ from flask import Flask, render_template, url_for, flash, redirect, request import requests -import urllib.request -import os from werkzeug.utils import secure_filename @@ -55,10 +53,8 @@ def upload_image(): return redirect(request.url) if file and allowed_file(file.filename): filename = secure_filename(file.filename) - file.save(os.path.join(app.config['UPLOAD_FOLDER'], filename)) - # print('upload_image filename: ' + filename) - flash('Image successfully uploaded.') - return render_template('home.html', filename=filename) + report = post_file(request) + return render_template('reportDetail.html', report=report) else: flash('Allowed image types are - png, jpg, jpeg, gif, tif') return redirect(request.url) @@ -66,9 +62,9 @@ def upload_image(): @app.route('/display/<filename>') def display_image(filename): - # print('display_image filename: ' + filename) return redirect(url_for('static', filename='uploads/' + filename), code=301) -if __name__ == "__main__": - app.run(debug=True) \ No newline at end of file +def post_file(request) : + response = requests.post(f'{REPORTS_SERVICE_URL}/{BASE_URL}/report/image', files=request.files).json() + return response \ No newline at end of file diff --git a/front_end/templates/reportDetail.html b/front_end/templates/reportDetail.html index 54c56b7bff810617d0d7a70ab46aa8f2f73307ee..cbe840b1fbfd4a3e88386000a5fcf72f6fbd3256 100644 --- a/front_end/templates/reportDetail.html +++ b/front_end/templates/reportDetail.html @@ -10,5 +10,4 @@ <div class="container"> {% include 'includes/reportDetail.html' %} </div> -</body> - +</body> \ No newline at end of file diff --git a/upload_service/app.py b/upload_service/app.py index 2d9c75458d5cede43b126fb3f8898d42863b613f..c1e35219258c75ed31bcf2c42a816fb4ae15e6f6 100644 --- a/upload_service/app.py +++ b/upload_service/app.py @@ -32,14 +32,15 @@ def get_reports() : @app.route(f'/{PREFIX}/report/image', methods=['POST']) def upload_image(): + print("reached") response = validate_request(request) if response.status_code == 400: return response provider = Provider() id = uuid.uuid1() - provider.save_binary(request.files['file'], id) - response = jsonify(Model(id).start()) + response = jsonify(provider.create_report("")) + # response = jsonify(Model(id).start()) response.status_code = 201 return response @@ -53,10 +54,10 @@ def validate_request(request): return response file = file = request.files['file'] - if invalid_extension(file.filename.rsplit('.', 1)[1].lower()): - response = jsonify({'message' : 'Allowed file types are png, tiff'}) - response.status_code = 400 - return response + # if invalid_extension(file.filename.rsplit('.', 1)[1].lower()): + # response = jsonify({'message' : 'Allowed file types are png, tiff'}) + # response.status_code = 400 + # return response if invalid_filename(file): response = jsonify({'message' : 'No file selected for uploading'}) response.status_code = 400