From b0cf3ed26388172cd89bf093f3ce03759a1b98a5 Mon Sep 17 00:00:00 2001
From: Dave Welsh <dw927@drexel.edu>
Date: Tue, 24 Jan 2023 11:56:03 -0500
Subject: [PATCH] Removed test endpoints. Aliased provider. Removed redundant
report endpoint from front end.
---
front_end/dpath.py | 9 +--------
upload_service/app.py | 10 +++-------
2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/front_end/dpath.py b/front_end/dpath.py
index 9fe9bee..3c55fb9 100644
--- a/front_end/dpath.py
+++ b/front_end/dpath.py
@@ -1,7 +1,6 @@
from flask import Flask, render_template, url_for, flash, redirect
from flask import jsonify
from flask import request
-import test_data_provider as provider
import requests
import urllib.request
import os
@@ -47,10 +46,4 @@ 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)
-
-@app.route("/report/<int:report_id>")
-def get_report(report_id) :
- return jsonify(provider.get_report(report_id))
-
-
+ return redirect(url_for('static', filename='uploads/' + filename), code=301)
\ No newline at end of file
diff --git a/upload_service/app.py b/upload_service/app.py
index 8742d01..7f6de10 100644
--- a/upload_service/app.py
+++ b/upload_service/app.py
@@ -2,7 +2,7 @@ from flask import Flask
from flask import jsonify
from flask import request
from flask import render_template
-from s3_provider import Provider
+from s3_provider import Provider as provider
from fake_model import LearningModel as Model
import uuid
@@ -18,10 +18,6 @@ VALID_EXTENSIONS = [
PREFIX = 'dpath'
-@app.route(f'/{PREFIX}/ping', methods=['GET'])
-def ping() :
- return 'pong'
-
@app.route(f'/{PREFIX}/')
def home():
return render_template('home.html')
@@ -36,7 +32,7 @@ def upload_image():
if response.status_code == 400:
return response
- provider = Provider()
+ provider = provider()
id = uuid.uuid1()
provider.save_binary(request.files['file'], id)
response = jsonify(Model(id).start())
@@ -66,4 +62,4 @@ def invalid_extension(extension) :
return extension not in VALID_EXTENSIONS
def invalid_filename(file):
- return file.filename == ''
+ return file.filename == ''
\ No newline at end of file
--
GitLab