Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Drexel 2022-2023 AIML Capstone - Digital Pathology
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zac Rahn
Drexel 2022-2023 AIML Capstone - Digital Pathology
Commits
92ee4f4e
Commit
92ee4f4e
authored
2 years ago
by
dw927
Browse files
Options
Downloads
Patches
Plain Diff
Connected upload page to the web service.
parent
ab8d8b9f
No related branches found
No related tags found
1 merge request
!4
Dwelsh
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
front_end/dpath.py
+5
-9
5 additions, 9 deletions
front_end/dpath.py
front_end/templates/reportDetail.html
+1
-2
1 addition, 2 deletions
front_end/templates/reportDetail.html
upload_service/app.py
+7
-6
7 additions, 6 deletions
upload_service/app.py
with
13 additions
and
17 deletions
front_end/dpath.py
+
5
−
9
View file @
92ee4f4e
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
This diff is collapsed.
Click to expand it.
front_end/templates/reportDetail.html
+
1
−
2
View file @
92ee4f4e
...
...
@@ -11,4 +11,3 @@
{% include 'includes/reportDetail.html' %}
</div>
</body>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
upload_service/app.py
+
7
−
6
View file @
92ee4f4e
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment