Skip to content

Commit 95ff3ab

Browse files
authored
Revert "Implement loading specified RASA model via API endpoint (buerokratt#627)" (buerokratt#670)
This reverts commit f83ca22.
1 parent 2ebb8c5 commit 95ff3ab

7 files changed

+43
-155
lines changed

DSL/Resql.Training/get-latest-ready-model-file-name.sql

-1
This file was deleted.

DSL/Resql.Training/get-ready-model-file-name-by-version-number.sql

-1
This file was deleted.

DSL/Ruuter.private/DSL/POST/rasa/model/trained-model.yml

-92
This file was deleted.

constants.ini

-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ CHATBOT_EXTERNAL_KEY=local-key
1717
DOMAIN=localhost
1818
TRAINING_RESQL=http://resql-training:8083
1919
SERVICE_RUUTER_PUBLIC=http://ruuter-public:8086
20-
S3_FERRY=http://s3-ferry:3000

docker-compose-bot.yml

+42
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
11
version: "3.9"
22

33
services:
4+
train-bot:
5+
container_name: train-bot
6+
image: rasa
7+
ports:
8+
- 5005:5005
9+
volumes:
10+
- ./loba/:/app
11+
command:
12+
- train
13+
- --fixed-model-name
14+
- loba-model
15+
networks:
16+
- bykstack
17+
logging:
18+
driver: "json-file"
19+
options:
20+
max-size: "50m"
21+
max-file: "3"
22+
restart: "no"
23+
424
run-action-server:
525
container_name: bot-action-server
626
image: rasa
@@ -21,6 +41,28 @@ services:
2141
max-size: "50m"
2242
max-file: "3"
2343

44+
bot:
45+
container_name: bot
46+
image: rasa
47+
ports:
48+
- 5005:5005
49+
volumes:
50+
- ./loba/:/app
51+
- ./cc.et.300.bin:/app/fasttext_et_model/cc.et.300.bin
52+
command:
53+
- run
54+
depends_on:
55+
train-bot:
56+
condition: service_completed_successfully
57+
restart: always
58+
networks:
59+
- bykstack
60+
logging:
61+
driver: "json-file"
62+
options:
63+
max-size: "50m"
64+
max-file: "3"
65+
2466
networks:
2567
bykstack:
2668
name: bykstack

docker-compose.yml

+1-58
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ services:
2626
image: ruuter
2727
environment:
2828
- application.cors.allowedOrigins=http://localhost:8082,http://localhost:3001,http://localhost:3003
29-
- application.httpCodesAllowList=200,201,202,204,400,401,403,500
29+
- application.httpCodesAllowList=200,201,202,400,401,403,500
3030
- application.internalRequests.allowedIPs=127.0.0.1
3131
- application.logging.displayRequestContent=true
3232
- application.logging.displayResponseContent=true
@@ -241,65 +241,8 @@ services:
241241
networks:
242242
- bykstack
243243

244-
s3-ferry:
245-
container_name: s3-ferry
246-
image: s3-ferry
247-
user: root
248-
volumes:
249-
- rasa-training-data:/api/data
250-
environment:
251-
- API_CORS_ORIGIN=*
252-
- API_DOCUMENTATION_ENABLED=true
253-
254-
- S3_REGION=us-east-1
255-
- S3_ENDPOINT_URL=http://localstack-2:4566
256-
- S3_ACCESS_KEY_ID=accessKey
257-
- S3_SECRET_ACCESS_KEY=secretKey
258-
- S3_DATA_BUCKET_NAME=buerokratt
259-
- S3_DATA_BUCKET_PATH=
260-
261-
- FS_DATA_DIRECTORY_PATH=./data
262-
ports:
263-
- 3005:3000
264-
networks:
265-
- bykstack
266-
267-
localstack:
268-
container_name: localstack
269-
image: localstack/localstack:3.3.0
270-
ports:
271-
- 4566:4566
272-
environment:
273-
- SERVICES=s3:4566
274-
volumes:
275-
- ./localstack-init.sh:/etc/localstack/init/ready.d/init.sh
276-
networks:
277-
- bykstack
278-
279-
bot:
280-
container_name: bot
281-
image: rasa
282-
ports:
283-
- 5005:5005
284-
volumes:
285-
- ./loba/:/app
286-
- ./cc.et.300.bin:/app/fasttext_et_model/cc.et.300.bin
287-
- rasa-training-data:/app/models
288-
environment:
289-
- SQLALCHEMY_WARN_20=1
290-
command: ["run", "--enable-api"]
291-
restart: always
292-
networks:
293-
- bykstack
294-
logging:
295-
driver: "json-file"
296-
options:
297-
max-size: "50m"
298-
max-file: "3"
299-
300244
volumes:
301245
opensearch-data:
302-
rasa-training-data:
303246
networks:
304247
bykstack:
305248
name: bykstack

localstack-init.sh

-2
This file was deleted.

0 commit comments

Comments
 (0)