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
Show more breadcrumbs
SFB 1288 - INF
nopaque
Commits
afac4246
Commit
afac4246
authored
5 years ago
by
Stephan Porada
Browse files
Options
Downloads
Patches
Plain Diff
Add CurpusFile result relation to Corpus
parent
488baf0b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/main/views.py
+9
-1
9 additions, 1 deletion
app/main/views.py
app/models.py
+3
-0
3 additions, 0 deletions
app/models.py
with
12 additions
and
1 deletion
app/main/views.py
+
9
−
1
View file @
afac4246
...
@@ -5,7 +5,7 @@ from flask_login import current_user, login_required
...
@@ -5,7 +5,7 @@ from flask_login import current_user, login_required
from
.
import
main
from
.
import
main
from
.forms
import
CreateCorpusForm
from
.forms
import
CreateCorpusForm
from
..
import
db
from
..
import
db
from
..models
import
Corpus
,
Job
from
..models
import
Corpus
,
CorpusFile
,
Job
import
os
import
os
import
threading
import
threading
...
@@ -86,6 +86,14 @@ def dashboard():
...
@@ -86,6 +86,14 @@ def dashboard():
else
:
else
:
for
file
in
create_corpus_form
.
files
.
data
:
for
file
in
create_corpus_form
.
files
.
data
:
file
.
save
(
os
.
path
.
join
(
dir
,
file
.
filename
))
file
.
save
(
os
.
path
.
join
(
dir
,
file
.
filename
))
dir
=
os
.
path
.
join
(
str
(
corpus
.
user_id
),
'
corpora
'
,
str
(
corpus
.
id
))
corpus_file
=
CorpusFile
(
filename
=
file
.
filename
,
corpus_id
=
corpus
.
id
,
dir
=
dir
)
db
.
session
.
add
(
corpus_file
)
db
.
session
.
commit
()
flash
(
'
Corpus created!
'
)
flash
(
'
Corpus created!
'
)
return
redirect
(
url_for
(
'
main.dashboard
'
))
return
redirect
(
url_for
(
'
main.dashboard
'
))
...
...
This diff is collapsed.
Click to expand it.
app/models.py
+
3
−
0
View file @
afac4246
...
@@ -258,6 +258,7 @@ class JobInput(db.Model):
...
@@ -258,6 +258,7 @@ class JobInput(db.Model):
# Primary key
# Primary key
id
=
db
.
Column
(
db
.
Integer
,
primary_key
=
True
)
id
=
db
.
Column
(
db
.
Integer
,
primary_key
=
True
)
filename
=
db
.
Column
(
db
.
String
(
255
))
filename
=
db
.
Column
(
db
.
String
(
255
))
dir
=
db
.
Column
(
db
.
String
(
255
))
job_id
=
db
.
Column
(
db
.
Integer
,
db
.
ForeignKey
(
'
jobs.id
'
))
job_id
=
db
.
Column
(
db
.
Integer
,
db
.
ForeignKey
(
'
jobs.id
'
))
# Relationships
# Relationships
results
=
db
.
relationship
(
'
JobResult
'
,
results
=
db
.
relationship
(
'
JobResult
'
,
...
@@ -285,6 +286,7 @@ class JobResult(db.Model):
...
@@ -285,6 +286,7 @@ class JobResult(db.Model):
# Primary key
# Primary key
id
=
db
.
Column
(
db
.
Integer
,
primary_key
=
True
)
id
=
db
.
Column
(
db
.
Integer
,
primary_key
=
True
)
filename
=
db
.
Column
(
db
.
String
(
255
))
filename
=
db
.
Column
(
db
.
String
(
255
))
dir
=
db
.
Column
(
db
.
String
(
255
))
job_id
=
db
.
Column
(
db
.
Integer
,
db
.
ForeignKey
(
'
jobs.id
'
))
job_id
=
db
.
Column
(
db
.
Integer
,
db
.
ForeignKey
(
'
jobs.id
'
))
job_input_id
=
db
.
Column
(
db
.
Integer
,
db
.
ForeignKey
(
'
job_inputs.id
'
))
job_input_id
=
db
.
Column
(
db
.
Integer
,
db
.
ForeignKey
(
'
job_inputs.id
'
))
...
@@ -398,6 +400,7 @@ class CorpusFile(db.Model):
...
@@ -398,6 +400,7 @@ class CorpusFile(db.Model):
# Primary key
# Primary key
id
=
db
.
Column
(
db
.
Integer
,
primary_key
=
True
)
id
=
db
.
Column
(
db
.
Integer
,
primary_key
=
True
)
filename
=
db
.
Column
(
db
.
String
(
255
))
filename
=
db
.
Column
(
db
.
String
(
255
))
dir
=
db
.
Column
(
db
.
String
(
255
))
corpus_id
=
db
.
Column
(
db
.
Integer
,
db
.
ForeignKey
(
'
corpora.id
'
))
corpus_id
=
db
.
Column
(
db
.
Integer
,
db
.
ForeignKey
(
'
corpora.id
'
))
...
...
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