Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
morfeusz
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
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
lexworkers
morfeusz
Commits
e3d6bba3
Commit
e3d6bba3
authored
Sep 4, 2020
by
Leszek Szymczak
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into 'morfeusz_to_docker'
# Conflicts: # Dockerfile # docker-compose.yml # src/morfeusz_worker.py
parents
8ed81f2b
062c8510
Branches
Branches containing commit
No related tags found
1 merge request
!2
Morfeusz to docker
Pipeline
#1608
passed
Sep 4, 2020
Stage: check_style
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
config.ini
+4
-3
4 additions, 3 deletions
config.ini
docker-compose.yml
+1
-1
1 addition, 1 deletion
docker-compose.yml
src/morfeusz_worker.py
+2
-1
2 additions, 1 deletion
src/morfeusz_worker.py
with
7 additions
and
5 deletions
config.ini
+
4
−
3
View file @
e3d6bba3
[service]
[service]
tool
=
morfeusz
tool
=
morfeusz
rabbit_host
=
10.17.0.85
rabbit_host
=
lexp_rabbitmq
rabbit_user
=
clarin
rabbit_user
=
test
rabbit_password
=
clarin123
rabbit_password
=
test
queue_prefix
=
lex_
[tool]
[tool]
workers_number
=
1
workers_number
=
1
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
1
−
1
View file @
e3d6bba3
version
:
'
3'
version
:
'
3'
services
:
services
:
stat
:
morfeusz
:
container_name
:
clarin_morfeusz
container_name
:
clarin_morfeusz
build
:
./
build
:
./
working_dir
:
/home/worker
working_dir
:
/home/worker
...
...
This diff is collapsed.
Click to expand it.
src/morfeusz_worker.py
+
2
−
1
View file @
e3d6bba3
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
import
json
import
json
import
logging
import
logging
import
lex_ws
import
lex_ws
import
morfeusz2
import
morfeusz2
...
@@ -64,7 +65,7 @@ class MorfeuszWorker(lex_ws.LexWorker):
...
@@ -64,7 +65,7 @@ class MorfeuszWorker(lex_ws.LexWorker):
responseb
.
append
(
list
(
elem
[
2
]))
responseb
.
append
(
list
(
elem
[
2
]))
response
=
{
'
analyse
'
:
responseb
}
response
=
{
'
analyse
'
:
responseb
}
elif
function_type
==
'
getInfo
'
:
elif
function_type
==
'
getInfo
'
:
with
open
(
'
info.json
'
,
'
rt
'
,
encoding
=
'
utf8
'
)
as
f
:
with
open
(
'
src/
info.json
'
,
'
rt
'
)
as
f
:
response
=
json
.
load
(
f
)
response
=
json
.
load
(
f
)
return
response
return
response
...
...
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