Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.1.2 #182

Merged
merged 23 commits into from
Dec 4, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f0c6324
Create webchat service in docker-compose, update make run-webchat com…
arthurTemporim Oct 26, 2020
84560ab
Merge pull request #181 from lappis-unb/webchat
arthurTemporim Oct 26, 2020
8bbb2ea
Add rocketchat to boilerplate
guilherme1guy Oct 27, 2020
1a531da
Merge pull request #183 from guilherme1guy/devel
arthurTemporim Oct 28, 2020
f501ab3
Improve bot_config.py to connect to Rocketchat even if the user is cr…
arthurTemporim Oct 28, 2020
9c36977
Apply black to all project python code
arthurTemporim Oct 28, 2020
8351c10
Merge pull request #184 from lappis-unb/improvements
arthurTemporim Oct 28, 2020
0d9b5c9
Update all services ports
arthurTemporim Oct 29, 2020
ab2f5c5
Update Makefile logs
arthurTemporim Oct 29, 2020
0e9e350
Merge pull request #185 from lappis-unb/docker-improvements
arthurTemporim Oct 29, 2020
2a64f56
Adiciona dependência do Git e abre porta do Rasa X
dudanogueira Oct 29, 2020
6b464f8
Change back kibana port to 5601
arthurTemporim Oct 30, 2020
b261b9b
Merge branch 'devel' into main
arthurTemporim Oct 30, 2020
9fa14a0
Merge pull request #188 from dudanogueira/main
arthurTemporim Oct 30, 2020
1c1a3cc
Correct command run-api in bot/Makefile
arthurTemporim Nov 3, 2020
e896587
Merge branch 'devel' of github.com:lappis-unb/rasa-ptbr-boilerplate i…
arthurTemporim Nov 3, 2020
b781b2f
Merge branch 'main' of github.com:lappis-unb/rasa-ptbr-boilerplate in…
arthurTemporim Nov 3, 2020
bb6dacf
Fix call to make run-x
gabibguedes Nov 3, 2020
44e9661
Add env variables for rasa x in a env file
gabibguedes Nov 3, 2020
c14edf5
Merge pull request #191 from lappis-unb/rasaX
RochaCarla Nov 18, 2020
0be623a
Merge branch 'main' of github.com:lappis-unb/rasa-ptbr-boilerplate in…
arthurTemporim Nov 30, 2020
b3e410f
Update domain.yml with RASAX changes
arthurTemporim Nov 30, 2020
f250415
Correct mistake in COPY in actions.Dockerfile
arthurTemporim Dec 2, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ build-coach:
docker-compose build --no-cache coach

build-analytics:
docker-compose up -d elasticsearch
docker-compose up -d rabbitmq
docker-compose up -d rabbitmq-consumer
docker-compose up -d kibana
make run-analytics
make config-elastic
make config-kibana

Expand All @@ -42,9 +39,15 @@ config-elastic:
config-kibana:
docker-compose run --rm -v $(current_dir)/modules/analytics/:/analytics/ kibana python3 /analytics/import_dashboards.py
$(info )
$(info Acesse o KIBANA em: http://localhost:5601)
$(info Acesse o KIBANA em: http://localhost:5004)
arthurTemporim marked this conversation as resolved.
Show resolved Hide resolved
$(info )

run-analytics:
docker-compose up -d elasticsearch
docker-compose up -d rabbitmq
docker-compose up -d rabbitmq-consumer
docker-compose up -d kibana

run-shell:
docker-compose run --rm --service-ports bot make shell

Expand Down
4 changes: 2 additions & 2 deletions bot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ validate:

# MENSAGEIROS
shell:
rasa shell -m models/ -vv --endpoints endpoints.yml --port 5004
rasa shell -m models/ -vv --endpoints endpoints.yml --port 5006

telegram:
rasa run -m models/ -vv --port 5001 --credentials credentials.yml \
--endpoints endpoints.yml

webchat:
rasa run -m models/ -vv --endpoints endpoints.yml --credentials credentials.yml --port 5005 --cors '*'
rasa run -m models/ -vv --endpoints endpoints.yml --credentials credentials.yml --port 5007 --cors '*'

api:
rasa run -m models/ -vv --endpoints endpoints.yml --enable-api
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
volumes:
- ./bot/:/bot/
ports:
- 5004:5004
- 5006:5006
depends_on:
- actions

Expand Down Expand Up @@ -62,7 +62,7 @@ services:
volumes:
- ./bot/:/bot/
ports:
- 5005:5005
- 5007:5007
depends_on:
- actions
command: sh -c "make webchat"
Expand Down Expand Up @@ -105,7 +105,7 @@ services:
dockerfile: ./docker/kibana.Dockerfile
restart: unless-stopped
ports:
- 5601:5601
- 5004:5601
arthurTemporim marked this conversation as resolved.
Show resolved Hide resolved
env_file:
- env/kibana.env
depends_on:
Expand Down Expand Up @@ -206,7 +206,7 @@ services:
- mongo
- mongo-init-replica
ports:
- 3000:3000
- 5003:3000

mongo:
image: mongo:4.0
Expand Down
2 changes: 1 addition & 1 deletion modules/webchat/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h1>Seja bem vindo ao BOILERPLATE integrado com webchat</h1>
WebChat.default.init({
selector: "#webchat",
initPayload: "/cumprimentar",
socketUrl: "http://localhost:5005",
socketUrl: "http://localhost:5007",
socketPath: "/socket.io/",
title: "Tais",
backgroundColor: '#FF0000',
Expand Down