Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
nopaque
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
Looking for advice? Join the
Matrix channel for GitLab users in Bielefeld
!
Show more breadcrumbs
SFB 1288 - INF
nopaque
Commits
a1be95ff
Commit
a1be95ff
authored
5 years ago
by
Patrick Jentsch
Browse files
Options
Downloads
Patches
Plain Diff
Rename ocr job form and add nlp job form
parent
1c98dc01
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/services/forms.py
+34
-1
34 additions, 1 deletion
app/services/forms.py
app/services/views.py
+6
-6
6 additions, 6 deletions
app/services/views.py
app/templates/services/ocr.html.j2
+14
-14
14 additions, 14 deletions
app/templates/services/ocr.html.j2
with
54 additions
and
21 deletions
app/services/forms.py
+
34
−
1
View file @
a1be95ff
...
@@ -3,7 +3,7 @@ from wtforms import MultipleFileField, SelectField, StringField, SubmitField, Va
...
@@ -3,7 +3,7 @@ from wtforms import MultipleFileField, SelectField, StringField, SubmitField, Va
from
wtforms.validators
import
DataRequired
,
Length
from
wtforms.validators
import
DataRequired
,
Length
class
Create
OCRJobForm
(
FlaskForm
):
class
New
OCRJobForm
(
FlaskForm
):
description
=
StringField
(
description
=
StringField
(
'
Description
'
,
'
Description
'
,
validators
=
[
DataRequired
(),
Length
(
1
,
64
)]
validators
=
[
DataRequired
(),
Length
(
1
,
64
)]
...
@@ -37,3 +37,36 @@ class CreateOCRJobForm(FlaskForm):
...
@@ -37,3 +37,36 @@ class CreateOCRJobForm(FlaskForm):
'
File does not have an approved extension:
'
'
File does not have an approved extension:
'
'
.pdf | .tif | .tiff
'
'
.pdf | .tif | .tiff
'
)
)
class
NewNLPJobForm
(
FlaskForm
):
description
=
StringField
(
'
Description
'
,
validators
=
[
DataRequired
(),
Length
(
1
,
64
)]
)
files
=
MultipleFileField
(
'
Files
'
,
validators
=
[
DataRequired
()])
language
=
SelectField
(
'
Language
'
,
choices
=
[(
''
,
'
Choose your option
'
),
(
'
en
'
,
'
English
'
),
(
'
fr
'
,
'
French
'
),
(
'
de
'
,
'
German
'
),
(
'
it
'
,
'
Italian
'
),
(
'
pt
'
,
'
Portuguese
'
),
(
'
es
'
,
'
Spanish
'
)
],
validators
=
[
DataRequired
()]
)
submit
=
SubmitField
(
'
Create OCR job
'
)
title
=
StringField
(
'
Title
'
,
validators
=
[
DataRequired
(),
Length
(
1
,
32
)]
)
def
validate_files
(
form
,
field
):
for
file
in
field
.
data
:
if
not
file
.
filename
.
lower
().
endswith
(
'
.txt
'
):
raise
ValidationError
(
'
File does not have an approved extension:
'
'
.txt
'
)
This diff is collapsed.
Click to expand it.
app/services/views.py
+
6
−
6
View file @
a1be95ff
...
@@ -2,7 +2,7 @@ from datetime import datetime
...
@@ -2,7 +2,7 @@ from datetime import datetime
from
flask
import
current_app
,
flash
,
redirect
,
render_template
,
url_for
from
flask
import
current_app
,
flash
,
redirect
,
render_template
,
url_for
from
.
import
services
from
.
import
services
from
flask_login
import
current_user
,
login_required
from
flask_login
import
current_user
,
login_required
from
.forms
import
Create
OCRJobForm
from
.forms
import
New
OCRJobForm
from
..
import
swarm
from
..
import
swarm
from
threading
import
Thread
from
threading
import
Thread
import
hashlib
import
hashlib
...
@@ -12,8 +12,8 @@ import os
...
@@ -12,8 +12,8 @@ import os
@services.route
(
'
/ocr
'
,
methods
=
[
'
GET
'
,
'
POST
'
])
@services.route
(
'
/ocr
'
,
methods
=
[
'
GET
'
,
'
POST
'
])
@login_required
@login_required
def
ocr
():
def
ocr
():
create
_ocr_job_form
=
Create
OCRJobForm
()
new
_ocr_job_form
=
New
OCRJobForm
()
if
create
_ocr_job_form
.
validate_on_submit
():
if
new
_ocr_job_form
.
validate_on_submit
():
app
=
current_app
.
_get_current_object
()
app
=
current_app
.
_get_current_object
()
id
=
hashlib
.
md5
(
id
=
hashlib
.
md5
(
(
current_user
.
username
+
'
_
'
+
datetime
.
now
().
isoformat
()).
encode
()
(
current_user
.
username
+
'
_
'
+
datetime
.
now
().
isoformat
()).
encode
()
...
@@ -27,7 +27,7 @@ def ocr():
...
@@ -27,7 +27,7 @@ def ocr():
'
requested_cpus
'
:
2
,
'
requested_cpus
'
:
2
,
'
requested_memory
'
:
2048
,
'
requested_memory
'
:
2048
,
'
service
'
:
'
ocr
'
,
'
service
'
:
'
ocr
'
,
'
service_args
'
:
{
'
lang
'
:
create
_ocr_job_form
.
language
.
data
,
'
service_args
'
:
{
'
lang
'
:
new
_ocr_job_form
.
language
.
data
,
'
version
'
:
'
latest
'
'
version
'
:
'
latest
'
},
},
'
status
'
:
'
queued
'
'
status
'
:
'
queued
'
...
@@ -39,7 +39,7 @@ def ocr():
...
@@ -39,7 +39,7 @@ def ocr():
except
OSError
:
except
OSError
:
flash
(
'
OSError!
'
)
flash
(
'
OSError!
'
)
else
:
else
:
for
file
in
create
_ocr_job_form
.
files
.
data
:
for
file
in
new
_ocr_job_form
.
files
.
data
:
file
.
save
(
os
.
path
.
join
(
dir
,
file
.
filename
))
file
.
save
(
os
.
path
.
join
(
dir
,
file
.
filename
))
'''
'''
'
TODO: Let the scheduler run this job in the background.
'
TODO: Let the scheduler run this job in the background.
...
@@ -55,5 +55,5 @@ def ocr():
...
@@ -55,5 +55,5 @@ def ocr():
return
render_template
(
return
render_template
(
'
services/ocr.html.j2
'
,
'
services/ocr.html.j2
'
,
title
=
'
Optical Character Recognition
'
,
title
=
'
Optical Character Recognition
'
,
create
_ocr_job_form
=
create
_ocr_job_form
new
_ocr_job_form
=
new
_ocr_job_form
)
)
This diff is collapsed.
Click to expand it.
app/templates/services/ocr.html.j2
+
14
−
14
View file @
a1be95ff
...
@@ -80,14 +80,14 @@
...
@@ -80,14 +80,14 @@
<div class="card">
<div class="card">
<div class="card-content">
<div class="card-content">
<form method="POST" enctype="multipart/form-data">
<form method="POST" enctype="multipart/form-data">
{{
create
_ocr_job_form.hidden_tag() }}
{{
new
_ocr_job_form.hidden_tag() }}
<div class="row">
<div class="row">
<div class="col s12 m4">
<div class="col s12 m4">
<div class="input-field">
<div class="input-field">
<i class="material-icons prefix">title</i>
<i class="material-icons prefix">title</i>
{{
create
_ocr_job_form.title() }}
{{
new
_ocr_job_form.title() }}
{{
create
_ocr_job_form.title.label }}
{{
new
_ocr_job_form.title.label }}
{% for error in
create
_ocr_job_form.title.errors %}
{% for error in
new
_ocr_job_form.title.errors %}
<span class="helper-text red-text">{{ error }}</span>
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
{% endfor %}
</div>
</div>
...
@@ -95,9 +95,9 @@
...
@@ -95,9 +95,9 @@
<div class="col s12 m8">
<div class="col s12 m8">
<div class="input-field">
<div class="input-field">
<i class="material-icons prefix">description</i>
<i class="material-icons prefix">description</i>
{{
create
_ocr_job_form.description() }}
{{
new
_ocr_job_form.description() }}
{{
create
_ocr_job_form.description.label }}
{{
new
_ocr_job_form.description.label }}
{% for error in
create
_ocr_job_form.description.errors %}
{% for error in
new
_ocr_job_form.description.errors %}
<span class="helper-text red-text">{{ error }}</span>
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
{% endfor %}
</div>
</div>
...
@@ -105,13 +105,13 @@
...
@@ -105,13 +105,13 @@
<div class="col s12 m8">
<div class="col s12 m8">
<div class="file-field input-field">
<div class="file-field input-field">
<div class="btn">
<div class="btn">
<span>{{
create
_ocr_job_form.files.label.text }}</span>
<span>{{
new
_ocr_job_form.files.label.text }}</span>
{{
create
_ocr_job_form.files(accept='application/pdf, image/tiff') }}
{{
new
_ocr_job_form.files(accept='application/pdf, image/tiff') }}
</div>
</div>
<div class="file-path-wrapper">
<div class="file-path-wrapper">
<input class="file-path validate" type="text">
<input class="file-path validate" type="text">
</div>
</div>
{% for error in
create
_ocr_job_form.files.errors %}
{% for error in
new
_ocr_job_form.files.errors %}
<span class="helper-text red-text">{{ error }}</span>
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
{% endfor %}
</div>
</div>
...
@@ -119,15 +119,15 @@
...
@@ -119,15 +119,15 @@
<div class="col s12 m4">
<div class="col s12 m4">
<div class="input-field">
<div class="input-field">
<i class="material-icons prefix">language</i>
<i class="material-icons prefix">language</i>
{{
create
_ocr_job_form.language() }}
{{
new
_ocr_job_form.language() }}
{{
create
_ocr_job_form.language.label }}
{{
new
_ocr_job_form.language.label }}
{% for error in
create
_ocr_job_form.language.errors %}
{% for error in
new
_ocr_job_form.language.errors %}
<span class="helper-text red-text">{{ error }}</span>
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
{% endfor %}
</div>
</div>
</div>
</div>
</div>
</div>
{{
create
_ocr_job_form.submit(class='btn') }}
{{
new
_ocr_job_form.submit(class='btn') }}
</form>
</form>
</div>
</div>
</div>
</div>
...
...
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