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
7362bb55
Commit
7362bb55
authored
2 years ago
by
Patrick Jentsch
Browse files
Options
Downloads
Patches
Plain Diff
Codestyle enhancements
parent
0a8b32e5
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/__init__.py
+3
-6
3 additions, 6 deletions
app/__init__.py
app/models.py
+1
-1
1 addition, 1 deletion
app/models.py
app/socketio_event_listeners.py
+29
-12
29 additions, 12 deletions
app/socketio_event_listeners.py
with
33 additions
and
19 deletions
app/__init__.py
+
3
−
6
View file @
7362bb55
from
config
import
Config
from
config
import
Config
from
flask
import
Flask
from
flask
import
Flask
from
flask_apscheduler
import
APScheduler
from
flask_apscheduler
import
APScheduler
from
flask_assets
import
Environment
from
flask_login
import
LoginManager
from
flask_login
import
LoginManager
from
flask_mail
import
Mail
from
flask_mail
import
Mail
from
flask_migrate
import
Migrate
from
flask_migrate
import
Migrate
...
@@ -8,10 +9,9 @@ from flask_paranoid import Paranoid
...
@@ -8,10 +9,9 @@ from flask_paranoid import Paranoid
from
flask_socketio
import
SocketIO
from
flask_socketio
import
SocketIO
from
flask_sqlalchemy
import
SQLAlchemy
from
flask_sqlalchemy
import
SQLAlchemy
from
flask_hashids
import
Hashids
from
flask_hashids
import
Hashids
import
flask_assets
assets
:
flask_assets
.
Environment
=
flask_assets
.
Environment
()
assets
:
Environment
=
Environment
()
db
:
SQLAlchemy
=
SQLAlchemy
()
db
:
SQLAlchemy
=
SQLAlchemy
()
hashids
:
Hashids
=
Hashids
()
hashids
:
Hashids
=
Hashids
()
login
:
LoginManager
=
LoginManager
()
login
:
LoginManager
=
LoginManager
()
...
@@ -38,10 +38,7 @@ def create_app(config: Config = Config) -> Flask:
...
@@ -38,10 +38,7 @@ def create_app(config: Config = Config) -> Flask:
mail
.
init_app
(
app
)
mail
.
init_app
(
app
)
migrate
.
init_app
(
app
,
db
)
migrate
.
init_app
(
app
,
db
)
paranoid
.
init_app
(
app
)
paranoid
.
init_app
(
app
)
socketio
.
init_app
(
socketio
.
init_app
(
app
,
message_queue
=
app
.
config
[
'
NOPAQUE_SOCKETIO_MESSAGE_QUEUE_URI
'
])
# noqa
app
,
message_queue
=
app
.
config
[
'
NOPAQUE_SOCKETIO_MESSAGE_QUEUE_URI
'
]
)
from
app
import
socketio_event_listeners
from
app
import
socketio_event_listeners
from
app
import
sqlalchemy_event_listeners
from
app
import
sqlalchemy_event_listeners
...
...
This diff is collapsed.
Click to expand it.
app/models.py
+
1
−
1
View file @
7362bb55
...
@@ -869,7 +869,7 @@ class Corpus(HashidMixin, db.Model):
...
@@ -869,7 +869,7 @@ class Corpus(HashidMixin, db.Model):
cascade
=
'
all, delete-orphan
'
cascade
=
'
all, delete-orphan
'
)
)
# "static" attributes
# "static" attributes
max_num_tokens
=
2147483647
max_num_tokens
=
2
_
147
_
483
_
647
def
__repr__
(
self
):
def
__repr__
(
self
):
return
f
'
<Corpus
{
self
.
title
}
>
'
return
f
'
<Corpus
{
self
.
title
}
>
'
...
...
This diff is collapsed.
Click to expand it.
app/socketio_event_listeners.py
+
29
−
12
View file @
7362bb55
from
app
import
hashids
,
socketio
from
app
import
hashids
,
socketio
from
app.decorators
import
socketio_login_required
from
app.decorators
import
socketio_login_required
from
app.models
import
User
from
app.models
import
TesseractOCRModel
,
TranskribusHTRModel
,
User
from
flask_login
import
current_user
from
flask_login
import
current_user
from
flask_socketio
import
join_room
from
flask_socketio
import
join_room
...
@@ -11,14 +11,31 @@ def users_user_get(user_hashid):
...
@@ -11,14 +11,31 @@ def users_user_get(user_hashid):
user_id
=
hashids
.
decode
(
user_hashid
)
user_id
=
hashids
.
decode
(
user_hashid
)
user
=
User
.
query
.
get
(
user_id
)
user
=
User
.
query
.
get
(
user_id
)
if
user
is
None
:
if
user
is
None
:
response
=
{
'
code
'
:
404
,
'
msg
'
:
'
Not found
'
}
return
{
'
code
'
:
404
,
'
msg
'
:
'
Not found
'
}
elif
not
(
user
==
current_user
or
current_user
.
is_administrator
):
if
not
(
user
==
current_user
or
current_user
.
is_administrator
):
response
=
{
'
code
'
:
403
,
'
msg
'
:
'
Forbidden
'
}
return
{
'
code
'
:
403
,
'
msg
'
:
'
Forbidden
'
}
else
:
# corpora = [x.to_dict() for x in user.corpora]
response
=
{
# jobs = [x.to_dict() for x in user.jobs]
'
code
'
:
200
,
# transkribus_htr_models = TranskribusHTRModel.query.filter(
'
msg
'
:
'
OK
'
,
# (TranskribusHTRModel.shared == True) | (TranskribusHTRModel.user == user)
'
payload
'
:
user
.
to_dict
(
backrefs
=
True
,
relationships
=
True
)
# ).all()
}
# tesseract_ocr_models = TesseractOCRModel.query.filter(
join_room
(
f
'
users.
{
user
.
hashid
}
'
)
# (TesseractOCRModel.shared == True) | (TesseractOCRModel.user == user)
return
response
# ).all()
# response = {
# 'code': 200,
# 'msg': 'OK',
# 'payload': {
# 'user': user.to_dict(),
# 'corpora': corpora,
# 'jobs': jobs,
# 'transkribus_htr_models': transkribus_htr_models,
# 'tesseract_ocr_models': tesseract_ocr_models
# }
# }
join_room
(
f
'
users.
{
user
.
hashid
}
'
)
return
{
'
code
'
:
200
,
'
msg
'
:
'
OK
'
,
'
payload
'
:
user
.
to_dict
(
backrefs
=
True
,
relationships
=
True
)
}
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