From ae2354c9877b57c3994adeb77390ec800dd1c3e8 Mon Sep 17 00:00:00 2001 From: moon-strider Date: Tue, 8 Aug 2023 10:57:45 +0300 Subject: [PATCH] mint -> embodied all names changed --- .../embodied_status}/Dockerfile | 4 +-- .../README.md | 2 +- .../requirements.txt | 0 .../server.py | 8 +++--- .../embodied_status}/environment.yml | 2 +- .../embodied_status}/service.yml | 8 +++--- .../{mint_status => embodied_status}/test.py | 0 .../{dream_mint => dream_embodied}/README.md | 6 ++-- .../architecture.png | Bin .../{dream_mint => dream_embodied}/cpu.yml | 0 .../db_conf.json | 0 .../{dream_mint => dream_embodied}/dev.yml | 12 ++++---- .../docker-compose.override.yml | 18 ++++++------ .../pipeline_conf.json | 18 ++++++------ .../{dream_mint => dream_embodied}/proxy.yml | 0 .../telegram.yml | 2 +- common/response_selection.py | 2 +- common/robot.py | 2 +- common/utils.py | 4 +-- components.tsv | 6 ++-- components/NFiqwoob18b0Buqwbf.yml | 12 ++++---- components/OINEWgiowe923n2g2no.yml | 2 +- components/OInfoqfwbqou2no.yml | 2 +- components/Ofjpqo2f9j2NFKknf9.yml | 12 ++++---- components/Oqwkogbqo2no.yml | 2 +- components/Pnfwoei382fn02nv20vnvVN.yml | 8 +++--- .../force_intents_intent_catcher.json | 20 +++++++------- .../server.py | 2 +- .../utils.py | 2 +- .../embodied_sender}/Dockerfile | 4 +-- .../README.md | 4 +-- .../requirements.txt | 0 .../server.py | 10 +++---- .../embodied_sender}/environment.yml | 2 +- .../embodied_sender}/service.yml | 8 +++--- .../{mint_sender => embodied_sender}/test.py | 8 +++--- services/ros_flask_server/README.md | 4 +-- services/ros_flask_server/server.py | 26 +++++++++--------- .../rule_based_selector/connector.py | 10 +++---- .../Dockerfile | 0 .../README.md | 4 +-- .../common/.gitkeep | 0 .../requirements.txt | 0 .../scenario/condition.py | 0 .../scenario/main.py | 2 +- .../scenario/response.py | 6 ++-- .../scenario/response_funcs.py | 0 .../server.py | 0 .../dff_embodied_skill}/environment.yml | 2 +- .../dff_embodied_skill}/service.yml | 8 +++--- 50 files changed, 127 insertions(+), 127 deletions(-) rename {services/mint_sender => annotators/embodied_status}/Dockerfile (70%) rename annotators/{mint_status => embodied_status}/README.md (93%) rename annotators/{mint_status => embodied_status}/requirements.txt (100%) rename annotators/{mint_status => embodied_status}/server.py (83%) rename annotators/{mint_status/service_configs/mint_status => embodied_status/service_configs/embodied_status}/environment.yml (59%) rename annotators/{mint_status/service_configs/mint_status => embodied_status/service_configs/embodied_status}/service.yml (73%) rename annotators/{mint_status => embodied_status}/test.py (100%) rename assistant_dists/{dream_mint => dream_embodied}/README.md (87%) rename assistant_dists/{dream_mint => dream_embodied}/architecture.png (100%) rename assistant_dists/{dream_mint => dream_embodied}/cpu.yml (100%) rename assistant_dists/{dream_mint => dream_embodied}/db_conf.json (100%) rename assistant_dists/{dream_mint => dream_embodied}/dev.yml (92%) rename assistant_dists/{dream_mint => dream_embodied}/docker-compose.override.yml (94%) rename assistant_dists/{dream_mint => dream_embodied}/pipeline_conf.json (96%) rename assistant_dists/{dream_mint => dream_embodied}/proxy.yml (100%) rename assistant_dists/{dream_mint => dream_embodied}/telegram.yml (76%) rename {annotators/mint_status => services/embodied_sender}/Dockerfile (70%) rename services/{mint_sender => embodied_sender}/README.md (66%) rename services/{mint_sender => embodied_sender}/requirements.txt (100%) rename services/{mint_sender => embodied_sender}/server.py (81%) rename services/{mint_sender/service_configs/mint_sender => embodied_sender/service_configs/embodied_sender}/environment.yml (59%) rename services/{mint_sender/service_configs/mint_sender => embodied_sender/service_configs/embodied_sender}/service.yml (73%) rename services/{mint_sender => embodied_sender}/test.py (80%) rename skills/{dff_mint_skill => dff_embodied_skill}/Dockerfile (100%) rename skills/{dff_mint_skill => dff_embodied_skill}/README.md (68%) rename skills/{dff_mint_skill => dff_embodied_skill}/common/.gitkeep (100%) rename skills/{dff_mint_skill => dff_embodied_skill}/requirements.txt (100%) rename skills/{dff_mint_skill => dff_embodied_skill}/scenario/condition.py (100%) rename skills/{dff_mint_skill => dff_embodied_skill}/scenario/main.py (95%) rename skills/{dff_mint_skill => dff_embodied_skill}/scenario/response.py (95%) rename skills/{dff_mint_skill => dff_embodied_skill}/scenario/response_funcs.py (100%) rename skills/{dff_mint_skill => dff_embodied_skill}/server.py (100%) rename skills/{dff_mint_skill/service_configs/dff_mint_skill => dff_embodied_skill/service_configs/dff_embodied_skill}/environment.yml (57%) rename skills/{dff_mint_skill/service_configs/dff_mint_skill => dff_embodied_skill/service_configs/dff_embodied_skill}/service.yml (75%) diff --git a/services/mint_sender/Dockerfile b/annotators/embodied_status/Dockerfile similarity index 70% rename from services/mint_sender/Dockerfile rename to annotators/embodied_status/Dockerfile index 5fadb2eb2e..882912bb81 100644 --- a/services/mint_sender/Dockerfile +++ b/annotators/embodied_status/Dockerfile @@ -7,10 +7,10 @@ ENV SERVICE_PORT ${SERVICE_PORT} RUN mkdir /src -COPY ./services/mint_sender/requirements.txt /src/requirements.txt +COPY ./annotators/embodied_status/requirements.txt /src/requirements.txt RUN pip install -r /src/requirements.txt -COPY ./services/mint_sender /src/ +COPY ./annotators/embodied_status /src/ COPY ./common/ /src/common/ WORKDIR /src diff --git a/annotators/mint_status/README.md b/annotators/embodied_status/README.md similarity index 93% rename from annotators/mint_status/README.md rename to annotators/embodied_status/README.md index e53fd42254..b0d9a9e747 100644 --- a/annotators/mint_status/README.md +++ b/annotators/embodied_status/README.md @@ -1,4 +1,4 @@ -# mint_status annotator service +# embodied_status annotator service This annotator does the following: 1. Checks whether there is a command currently being performed on the side of *connector* (e.g. minecraft-interface); diff --git a/annotators/mint_status/requirements.txt b/annotators/embodied_status/requirements.txt similarity index 100% rename from annotators/mint_status/requirements.txt rename to annotators/embodied_status/requirements.txt diff --git a/annotators/mint_status/server.py b/annotators/embodied_status/server.py similarity index 83% rename from annotators/mint_status/server.py rename to annotators/embodied_status/server.py index 52b05edfd1..7164708e23 100644 --- a/annotators/mint_status/server.py +++ b/annotators/embodied_status/server.py @@ -29,7 +29,7 @@ def respond(): command = dialog["human"]["attributes"].get("performing_command") if command: - logger.info(f"mint_status: found command `{command}` sent to robot") + logger.info(f"embodied_status: found command `{command}` sent to robot") result = False try: result = check_if_command_performed(command, ROS_FLASK_SERVER, dialog.get("dialog_id", "unknown")) @@ -46,11 +46,11 @@ def respond(): else: # command is not completed, so do not update human attributes results += [{"human_attributes": dialog["human"]["attributes"]}] - logger.info(f"mint_status: status of command `{command}` performance: `{result}`") + logger.info(f"embodied_status: status of command `{command}` performance: `{result}`") else: - logger.info("mint_status: NO command found in human attributes") + logger.info("embodied_status: NO command found in human attributes") results += [{"human_attributes": {}}] total_time = time.time() - st_time - logger.info(f"mint_status exec time: {total_time:.3f}s") + logger.info(f"embodied_status exec time: {total_time:.3f}s") return jsonify(results) diff --git a/annotators/mint_status/service_configs/mint_status/environment.yml b/annotators/embodied_status/service_configs/embodied_status/environment.yml similarity index 59% rename from annotators/mint_status/service_configs/mint_status/environment.yml rename to annotators/embodied_status/service_configs/embodied_status/environment.yml index a7f0cee2ed..b55fd75474 100644 --- a/annotators/mint_status/service_configs/mint_status/environment.yml +++ b/annotators/embodied_status/service_configs/embodied_status/environment.yml @@ -1,3 +1,3 @@ SERVICE_PORT: 8043 -SERVICE_NAME: mint_status +SERVICE_NAME: embodied_status CUDA_VISIBLE_DEVICES: '0' \ No newline at end of file diff --git a/annotators/mint_status/service_configs/mint_status/service.yml b/annotators/embodied_status/service_configs/embodied_status/service.yml similarity index 73% rename from annotators/mint_status/service_configs/mint_status/service.yml rename to annotators/embodied_status/service_configs/embodied_status/service.yml index 504490f4a5..5119f1eb1d 100644 --- a/annotators/mint_status/service_configs/mint_status/service.yml +++ b/annotators/embodied_status/service_configs/embodied_status/service.yml @@ -1,4 +1,4 @@ -name: mint-status +name: embodied-status endpoints: - check compose: @@ -7,10 +7,10 @@ compose: build: args: SERVICE_PORT: 8043 - SERVICE_NAME: mint_status + SERVICE_NAME: embodied_status CUDA_VISIBLE_DEVICES: '0' context: . - dockerfile: ./annotators/mint_status/Dockerfile + dockerfile: ./annotators/embodied_status/Dockerfile command: gunicorn --workers=1 server:app -b 0.0.0.0:8043 --timeout 600 environment: - CUDA_VISIBLE_DEVICES=0 @@ -22,6 +22,6 @@ compose: memory: 100M volumes: - ./common:/src/common - - ./annotators/mint_status:/src + - ./annotators/embodied_status:/src ports: - 8043:8043 \ No newline at end of file diff --git a/annotators/mint_status/test.py b/annotators/embodied_status/test.py similarity index 100% rename from annotators/mint_status/test.py rename to annotators/embodied_status/test.py diff --git a/assistant_dists/dream_mint/README.md b/assistant_dists/dream_embodied/README.md similarity index 87% rename from assistant_dists/dream_mint/README.md rename to assistant_dists/dream_embodied/README.md index 236bef28dc..3358e068be 100644 --- a/assistant_dists/dream_mint/README.md +++ b/assistant_dists/dream_embodied/README.md @@ -1,4 +1,4 @@ -# dream_mint distribution +# dream_embodied distribution ![Architecture](architecture.png) @@ -20,8 +20,8 @@ This distribution functions the following way: # Launch command: ``` -docker-compose -f docker-compose.yml -f assistant_dists/dream_mint/docker-compose.override.yml -f \ -assistant_dists/dream_mint/dev.yml -f assistant_dists/dream_mint/proxy.yml up --build +docker-compose -f docker-compose.yml -f assistant_dists/dream_embodied/docker-compose.override.yml -f \ +assistant_dists/dream_embodied/dev.yml -f assistant_dists/dream_embodied/proxy.yml up --build ``` Attention! The last part of the command stops all running containers on the machine. If this is not required, remove the part of the command after the semicolon or edit it to stop only specific containers if their names are known in advance. \ No newline at end of file diff --git a/assistant_dists/dream_mint/architecture.png b/assistant_dists/dream_embodied/architecture.png similarity index 100% rename from assistant_dists/dream_mint/architecture.png rename to assistant_dists/dream_embodied/architecture.png diff --git a/assistant_dists/dream_mint/cpu.yml b/assistant_dists/dream_embodied/cpu.yml similarity index 100% rename from assistant_dists/dream_mint/cpu.yml rename to assistant_dists/dream_embodied/cpu.yml diff --git a/assistant_dists/dream_mint/db_conf.json b/assistant_dists/dream_embodied/db_conf.json similarity index 100% rename from assistant_dists/dream_mint/db_conf.json rename to assistant_dists/dream_embodied/db_conf.json diff --git a/assistant_dists/dream_mint/dev.yml b/assistant_dists/dream_embodied/dev.yml similarity index 92% rename from assistant_dists/dream_mint/dev.yml rename to assistant_dists/dream_embodied/dev.yml index 163c7270a9..75736ef2ce 100644 --- a/assistant_dists/dream_mint/dev.yml +++ b/assistant_dists/dream_embodied/dev.yml @@ -73,15 +73,15 @@ services: - "~/.deeppavlov:/root/.deeppavlov" ports: - 8021:8021 - dff-mint-skill: + dff-embodied-skill: volumes: - - "./skills/dff_mint_skill:/src" + - "./skills/dff_embodied_skill:/src" - "./common:/src/common" ports: - 8041:8041 - mint-sender: + embodied-sender: volumes: - - "./services/mint_sender:/src" + - "./services/embodied_sender:/src" - "./common:/src/common" ports: - 8042:8042 @@ -91,9 +91,9 @@ services: - "./common:/home/dkr/common" ports: - 5000:5000 - mint-status: + embodied-status: volumes: - - "./annotators/mint_status:/src" + - "./annotators/embodied_status:/src" - "./common:/src/common" ports: - 8043:8043 diff --git a/assistant_dists/dream_mint/docker-compose.override.yml b/assistant_dists/dream_embodied/docker-compose.override.yml similarity index 94% rename from assistant_dists/dream_mint/docker-compose.override.yml rename to assistant_dists/dream_embodied/docker-compose.override.yml index 86ca4e426e..135b6828b9 100644 --- a/assistant_dists/dream_mint/docker-compose.override.yml +++ b/assistant_dists/dream_embodied/docker-compose.override.yml @@ -1,10 +1,10 @@ services: agent: - command: sh -c 'bin/wait && python -m deeppavlov_agent.run agent.channel=telegram agent.telegram_token=$TG_TOKEN agent.pipeline_config=assistant_dists/dream_mint/pipeline_conf.json' + command: sh -c 'bin/wait && python -m deeppavlov_agent.run agent.channel=telegram agent.telegram_token=$TG_TOKEN agent.pipeline_config=assistant_dists/dream_embodied/pipeline_conf.json' environment: WAIT_HOSTS: "ranking-based-response-selector:8002, sentence-ranker:8128, dff-program-y-skill:8008, sentseg:8011, convers-evaluation-selector:8009, intent-catcher-commands:8014, badlisted-words:8018, dialogpt:8125, entity-detection:8103, ner:8021, spacy-nounphrases:8006, - dff-mint-skill:8041, mint-sender:8042, ros-flask-server:5000, mint-status:8043" + dff-embodied-skill:8041, embodied-sender:8042, ros-flask-server:5000, embodied-status:8043" WAIT_HOSTS_TIMEOUT: ${WAIT_TIMEOUT:-480} HIGH_PRIORITY_INTENTS: 1 RESTRICTION_FOR_SENSITIVE_CASE: 1 @@ -252,14 +252,14 @@ services: reservations: memory: 100M - mint-sender: + embodied-sender: env_file: [ .env ] build: args: SERVICE_PORT: 8042 ROS_FLASK_SERVER: http://ros-flask-server:5000 context: . - dockerfile: ./services/mint_sender/Dockerfile + dockerfile: ./services/embodied_sender/Dockerfile command: flask run -h 0.0.0.0 -p 8042 environment: - FLASK_APP=server @@ -270,14 +270,14 @@ services: reservations: memory: 100M - mint-status: + embodied-status: env_file: [ .env ] build: args: SERVICE_PORT: 8043 ROS_FLASK_SERVER: http://ros-flask-server:5000 context: . - dockerfile: ./annotators/mint_status/Dockerfile + dockerfile: ./annotators/embodied_status/Dockerfile command: flask run -h 0.0.0.0 -p 8043 environment: - FLASK_APP=server @@ -288,16 +288,16 @@ services: reservations: memory: 100M - dff-mint-skill: + dff-embodied-skill: env_file: [ .env ] build: args: SERVICE_PORT: 8041 - SERVICE_NAME: dff_mint_skill + SERVICE_NAME: dff_embodied_skill LANGUAGE: EN ROS_FLASK_SERVER: http://ros-flask-server:5000 context: . - dockerfile: ./skills/dff_mint_skill/Dockerfile + dockerfile: ./skills/dff_embodied_skill/Dockerfile command: gunicorn --workers=1 server:app -b 0.0.0.0:8041 --reload deploy: resources: diff --git a/assistant_dists/dream_mint/pipeline_conf.json b/assistant_dists/dream_embodied/pipeline_conf.json similarity index 96% rename from assistant_dists/dream_mint/pipeline_conf.json rename to assistant_dists/dream_embodied/pipeline_conf.json index fbb1c27f16..e258c836b0 100644 --- a/assistant_dists/dream_mint/pipeline_conf.json +++ b/assistant_dists/dream_embodied/pipeline_conf.json @@ -63,18 +63,18 @@ } }, "annotators": { - "mint_status": { + "embodied_status": { "connector": { "protocol": "http", "timeout": 10, - "url": "http://mint-status:8043/check" + "url": "http://embodied-status:8043/check" }, "dialog_formatter": "state_formatters.dp_formatters:utt_non_punct_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "state_manager_method": "update_attributes", "source": { "component": "components/Pnfwoei382fn02nv20vnvVN.yml", - "service": "services/mint_status/service_configs/mint_status" + "service": "services/embodied_status/service_configs/embodied_status" } }, "sentseg": { @@ -289,11 +289,11 @@ "service": "skills/dff_program_y_skill/service_configs/dff-program-y-skill" } }, - "dff_mint_skill": { + "dff_embodied_skill": { "connector": { "protocol": "http", "timeout": 2.0, - "url": "http://dff-mint-skill:8041/respond" + "url": "http://dff-embodied-skill:8041/respond" }, "dialog_formatter": "state_formatters.dp_formatters:dff_intent_responder_skill_formatter", "response_formatter": "state_formatters.dp_formatters:skill_with_attributes_formatter_service", @@ -304,7 +304,7 @@ "is_enabled": true, "source": { "component": "components/Ofjpqo2f9j2NFKknf9.yml", - "service": "skills/dff_mint_skill/service_configs/dff_mint_skill" + "service": "skills/dff_embodied_skill/service_configs/dff_embodied_skill" } }, "dummy_skill": { @@ -364,11 +364,11 @@ } }, "actors": { - "mint_sender": { + "embodied_sender": { "connector": { "protocol": "http", "timeout": 1.0, - "url": "http://mint-sender:8042/send" + "url": "http://embodied-sender:8042/send" }, "dialog_formatter": "state_formatters.dp_formatters:last_human_bot_annotated_utterance", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", @@ -380,7 +380,7 @@ } }, "metadata": { - "display_name": "Dream Mint", + "display_name": "Dream Embodied", "author": "DeepPavlov", "description": "Embodied AI version of DeepPavlov Dream Socialbot that allows user to control remote clients using natural language through dp-agents.", "version": "0.1.0", diff --git a/assistant_dists/dream_mint/proxy.yml b/assistant_dists/dream_embodied/proxy.yml similarity index 100% rename from assistant_dists/dream_mint/proxy.yml rename to assistant_dists/dream_embodied/proxy.yml diff --git a/assistant_dists/dream_mint/telegram.yml b/assistant_dists/dream_embodied/telegram.yml similarity index 76% rename from assistant_dists/dream_mint/telegram.yml rename to assistant_dists/dream_embodied/telegram.yml index 40524d8456..97fb6c69f9 100644 --- a/assistant_dists/dream_mint/telegram.yml +++ b/assistant_dists/dream_embodied/telegram.yml @@ -1,6 +1,6 @@ services: agent-tg: - command: sh -c 'bin/wait && python -m deeppavlov_agent.run agent.channel=telegram agent.telegram_token=$TG_TOKEN agent.pipeline_config=assistant_dists/dream_mint/pipeline_conf.json agent.db_config=assistant_dists/dream_mint/db_conf.json' + command: sh -c 'bin/wait && python -m deeppavlov_agent.run agent.channel=telegram agent.telegram_token=$TG_TOKEN agent.pipeline_config=assistant_dists/dream_embodied/pipeline_conf.json agent.db_config=assistant_dists/dream_embodied/db_conf.json' env_file: [.env] build: context: ./ diff --git a/common/response_selection.py b/common/response_selection.py index 9c69679fa3..7a27fc0161 100644 --- a/common/response_selection.py +++ b/common/response_selection.py @@ -44,7 +44,7 @@ CAN_NOT_BE_DISLIKED_SKILLS = ["meta_script_skill", "personal_info_skill"] NOT_ADD_PROMPT_SKILLS = [ "alexa_handler", - "dff_mint_skill", + "dff_embodied_skill", "dff_intent_responder_skill", "misheard_asr", "dff_program_y_dangerous_skill", diff --git a/common/robot.py b/common/robot.py index 8c7aba5a95..c32ec06f0c 100644 --- a/common/robot.py +++ b/common/robot.py @@ -2,7 +2,7 @@ command_intents = {"track_object", "turn_around", "move_forward", "move_backward", "open_door", "move_to_point"} -mint_intents = {"move_forward", "move_backward"} +embodied_intents = {"move_forward", "move_backward"} def check_if_valid_robot_command(command, service_url, dialog_id, timeout=1.0): diff --git a/common/utils.py b/common/utils.py index f862f2f315..414e14608c 100644 --- a/common/utils.py +++ b/common/utils.py @@ -13,7 +13,7 @@ sentry_sdk.init(getenv("SENTRY_DSN")) other_skills = { - "dff_mint_skill", + "dff_embodied_skill", "dff_intent_responder_skill", "dff_program_y_dangerous_skill", "misheard_asr", @@ -95,7 +95,7 @@ } high_priority_intents = { - "dff_mint_skill": { + "dff_embodied_skill": { "cant_do", "exit", "repeat", diff --git a/components.tsv b/components.tsv index 986a44a24d..61e2337bba 100644 --- a/components.tsv +++ b/components.tsv @@ -43,9 +43,9 @@ 8038 robot-fake-server 8039 8040 -8041 dff-mint-skill -8042 mint-sender -8043 mint-status +8041 dff-embodied-skill +8042 embodied-sender +8043 embodied-status 8044 8045 8046 diff --git a/components/NFiqwoob18b0Buqwbf.yml b/components/NFiqwoob18b0Buqwbf.yml index d5c25e6b0c..9a93db0cd5 100644 --- a/components/NFiqwoob18b0Buqwbf.yml +++ b/components/NFiqwoob18b0Buqwbf.yml @@ -1,5 +1,5 @@ -name: mint_sender -display_name: Mint sender +name: embodied_sender +display_name: Embodied sender component_type: Script-based w/o NNs model_type: null is_customizable: false @@ -10,10 +10,10 @@ gpu_usage: null connector: protocol: http timeout: 1.0 - url: http://mint-sender:8042/send -previous_services: [mint_status] -required_previous_services: [mint_status] + url: http://embodied-sender:8042/send +previous_services: [embodied_status] +required_previous_services: [embodied_status] tags: null endpoint: send -service: services/mint_sender/service_configs/mint_sender +service: services/embodied_sender/service_configs/embodied_sender date_created: '2023-06-01T12:12:12' \ No newline at end of file diff --git a/components/OINEWgiowe923n2g2no.yml b/components/OINEWgiowe923n2g2no.yml index 2953c2f4ac..b13517f1cc 100644 --- a/components/OINEWgiowe923n2g2no.yml +++ b/components/OINEWgiowe923n2g2no.yml @@ -13,7 +13,7 @@ connector: url: http://ros-flask-server:5000/is_command_valid previous_services: - skills -required_previous_services: [mint_status] +required_previous_services: [embodied_status] tags: null endpoint: is_command_valid service: services/ros_flask_server/service_configs/ros_flask_server diff --git a/components/OInfoqfwbqou2no.yml b/components/OInfoqfwbqou2no.yml index ce42e5880d..ec2c53935b 100644 --- a/components/OInfoqfwbqou2no.yml +++ b/components/OInfoqfwbqou2no.yml @@ -13,7 +13,7 @@ connector: url: http://ros-flask-server:5000/perform_command previous_services: - skills -required_previous_services: [mint_status] +required_previous_services: [embodied_status] tags: null endpoint: perform_command service: services/ros_flask_server/service_configs/ros_flask_server diff --git a/components/Ofjpqo2f9j2NFKknf9.yml b/components/Ofjpqo2f9j2NFKknf9.yml index d0a3f8ad4e..094cc8b5b9 100644 --- a/components/Ofjpqo2f9j2NFKknf9.yml +++ b/components/Ofjpqo2f9j2NFKknf9.yml @@ -1,20 +1,20 @@ -name: dff_mint_skill -display_name: Mint skill +name: dff_embodied_skill +display_name: Embodied skill component_type: Script-based w/o NNs model_type: null is_customizable: false author: publisher@deeppavlov.ai -description: A dff skill that interacts with ros_flask_server and mint_status. It allows Dream to answer to embodied intents. +description: A dff skill that interacts with ros_flask_server and embodied_status. It allows Dream to answer to embodied intents. ram_usage: 150M gpu_usage: null connector: protocol: http timeout: 1.0 - url: http://dff-mint-skill:8041/respond + url: http://dff-embodied-skill:8041/respond previous_services: - skill_selectors -required_previous_services: [mint_status] +required_previous_services: [embodied_status] tags: null endpoint: respond -service: skills/dff_mint_skill/service_configs/dff_mint_skill +service: skills/dff_embodied_skill/service_configs/dff_embodied_skill date_created: '2023-06-01T12:12:12' \ No newline at end of file diff --git a/components/Oqwkogbqo2no.yml b/components/Oqwkogbqo2no.yml index 7dc14ec8d3..bb02c73b8e 100644 --- a/components/Oqwkogbqo2no.yml +++ b/components/Oqwkogbqo2no.yml @@ -13,7 +13,7 @@ connector: url: http://ros-flask-server:5000/is_command_performed previous_services: - skills -required_previous_services: [mint_status] +required_previous_services: [embodied_status] tags: null endpoint: is_command_performed service: services/ros_flask_server/service_configs/ros_flask_server diff --git a/components/Pnfwoei382fn02nv20vnvVN.yml b/components/Pnfwoei382fn02nv20vnvVN.yml index e10885306c..01ee640500 100644 --- a/components/Pnfwoei382fn02nv20vnvVN.yml +++ b/components/Pnfwoei382fn02nv20vnvVN.yml @@ -1,5 +1,5 @@ -name: mint_status -display_name: Mint status +name: embodied_status +display_name: Embodied status component_type: Script-based w/o NNs model_type: null is_customizable: false @@ -10,10 +10,10 @@ gpu_usage: null connector: protocol: http timeout: 1.0 - url: http://mint-status:8043/check + url: http://embodied-status:8043/check previous_services: null required_previous_services: null tags: null endpoint: check -service: annotators/mint_status/service_configs/mint_status +service: annotators/embodied_status/service_configs/embodied_status date_created: '2023-06-01T12:12:12' \ No newline at end of file diff --git a/response_selectors/convers_evaluation_based_selector/force_intents_intent_catcher.json b/response_selectors/convers_evaluation_based_selector/force_intents_intent_catcher.json index 1ec3a97e04..c93885cfc7 100644 --- a/response_selectors/convers_evaluation_based_selector/force_intents_intent_catcher.json +++ b/response_selectors/convers_evaluation_based_selector/force_intents_intent_catcher.json @@ -1,49 +1,49 @@ { "exit": [ "dff_intent_responder_skill", - "dff_mint_skill", + "dff_embodied_skill", "dff_program_y_skill" ], "repeat": [ "dff_intent_responder_skill", - "dff_mint_skill" + "dff_embodied_skill" ], "what_time": [ "dff_intent_responder_skill", - "dff_mint_skill" + "dff_embodied_skill" ], "cant_do": [ "dff_intent_responder_skill", - "dff_mint_skill", + "dff_embodied_skill", "dff_program_y_skill" ], "what_is_your_name": [ "dff_intent_responder_skill", - "dff_mint_skill", + "dff_embodied_skill", "dff_program_y_skill" ], "where_are_you_from": [ "dff_intent_responder_skill", - "dff_mint_skill", + "dff_embodied_skill", "dff_program_y_skill" ], "who_made_you": [ "dff_intent_responder_skill", - "dff_mint_skill", + "dff_embodied_skill", "dff_program_y_skill" ], "what_is_your_job": [ "dff_intent_responder_skill", - "dff_mint_skill", + "dff_embodied_skill", "dff_program_y_skill" ], "what_can_you_do": [ "dff_intent_responder_skill", - "dff_mint_skill", + "dff_embodied_skill", "dff_program_y_skill" ], "dont_understand": [ "dff_intent_responder_skill", - "dff_mint_skill" + "dff_embodied_skill" ] } \ No newline at end of file diff --git a/response_selectors/convers_evaluation_based_selector/server.py b/response_selectors/convers_evaluation_based_selector/server.py index 5f0eb39531..68c450eea3 100644 --- a/response_selectors/convers_evaluation_based_selector/server.py +++ b/response_selectors/convers_evaluation_based_selector/server.py @@ -201,7 +201,7 @@ def rule_score_based_selection( is_misheard = misheard_with_spec1 in candidates[i]["text"] or misheard_with_spec2 in candidates[i]["text"] intent_name = get_intent_name(candidates[i]["text"]) is_intent_candidate = ( - skill_names[i] in ["dff_intent_responder_skill", "dff_mint_skill", "dff_program_y_skill"] + skill_names[i] in ["dff_intent_responder_skill", "dff_embodied_skill", "dff_program_y_skill"] ) and intent_name is_intent_candidate = is_intent_candidate and intent_name not in low_priority_intents # print("is intent candidate? " + str(is_intent_candidate), flush=True) diff --git a/response_selectors/convers_evaluation_based_selector/utils.py b/response_selectors/convers_evaluation_based_selector/utils.py index b4d7985186..e6d63260be 100644 --- a/response_selectors/convers_evaluation_based_selector/utils.py +++ b/response_selectors/convers_evaluation_based_selector/utils.py @@ -101,7 +101,7 @@ def add_question_to_statement( def lower_duplicates_score(candidates, bot_utt_counter, scores, confidences): for i, cand in enumerate(candidates): # no penalties for repeat intent - if cand["skill_name"] == "dff_mint_skill" and "#+#repeat" in cand["text"]: + if cand["skill_name"] == "dff_embodied_skill" and "#+#repeat" in cand["text"]: continue if cand["skill_name"] == "dff_intent_responder_skill" and "#+#repeat" in cand["text"]: continue diff --git a/annotators/mint_status/Dockerfile b/services/embodied_sender/Dockerfile similarity index 70% rename from annotators/mint_status/Dockerfile rename to services/embodied_sender/Dockerfile index 4695262f5d..44adcbd169 100644 --- a/annotators/mint_status/Dockerfile +++ b/services/embodied_sender/Dockerfile @@ -7,10 +7,10 @@ ENV SERVICE_PORT ${SERVICE_PORT} RUN mkdir /src -COPY ./annotators/mint_status/requirements.txt /src/requirements.txt +COPY ./services/embodied_sender/requirements.txt /src/requirements.txt RUN pip install -r /src/requirements.txt -COPY ./annotators/mint_status /src/ +COPY ./services/embodied_sender /src/ COPY ./common/ /src/common/ WORKDIR /src diff --git a/services/mint_sender/README.md b/services/embodied_sender/README.md similarity index 66% rename from services/mint_sender/README.md rename to services/embodied_sender/README.md index ebac11e6be..3e5ac20e26 100644 --- a/services/mint_sender/README.md +++ b/services/embodied_sender/README.md @@ -1,4 +1,4 @@ -# mint_sender service +# embodied_sender service The logic behind this service boils down to: -if there is a `command_to_perform`, but no command being performed on connector-side at the moment, send the command to the ROS server where it shall be further processed if needed (for more details, check [README](/annotators/mint_status/README.md) in annotators/mint_status). \ No newline at end of file +if there is a `command_to_perform`, but no command being performed on connector-side at the moment, send the command to the ROS server where it shall be further processed if needed (for more details, check [README](/annotators/embodied_status/README.md) in annotators/embodied_status). \ No newline at end of file diff --git a/services/mint_sender/requirements.txt b/services/embodied_sender/requirements.txt similarity index 100% rename from services/mint_sender/requirements.txt rename to services/embodied_sender/requirements.txt diff --git a/services/mint_sender/server.py b/services/embodied_sender/server.py similarity index 81% rename from services/mint_sender/server.py rename to services/embodied_sender/server.py index 482acc6d69..f7104e505a 100644 --- a/services/mint_sender/server.py +++ b/services/embodied_sender/server.py @@ -15,7 +15,7 @@ app = Flask(__name__) ROS_FLASK_SERVER = getenv("ROS_FLASK_SERVER") -SKILL_NAMES_SENDING_COMMANDS = ["dff_mint_skill"] +SKILL_NAMES_SENDING_COMMANDS = ["dff_embodied_skill"] @app.route("/send", methods=["POST"]) @@ -32,7 +32,7 @@ def respond(): current_skill_hyp = [hyp for hyp in hyps if hyp.get("skill_name", "") == active_skill][0] command = current_skill_hyp.get("command_to_perform", "") if active_skill in SKILL_NAMES_SENDING_COMMANDS and len(command): - logger.info(f"mint_sender: command `{command}` is being sent to mint") + logger.info(f"embodied_sender: command `{command}` is being sent to embodied") result = False try: result = send_robot_command_to_perform(command, ROS_FLASK_SERVER, dialog_id) @@ -44,11 +44,11 @@ def respond(): results += [{"human_attributes": {"performing_command": command}}] else: results += [{"human_attributes": {}}] - logger.info(f"mint_sender: status of sending command `{command}`: `{result}`") + logger.info(f"embodied_sender: status of sending command `{command}`: `{result}`") else: - logger.info("mint_sender: NO command found in previous bot uttr") + logger.info("embodied_sender: NO command found in previous bot uttr") results += [{"human_attributes": {}}] total_time = time.time() - st_time - logger.info(f"mint_sender exec time: {total_time:.3f}s") + logger.info(f"embodied_sender exec time: {total_time:.3f}s") return jsonify(results) diff --git a/services/mint_sender/service_configs/mint_sender/environment.yml b/services/embodied_sender/service_configs/embodied_sender/environment.yml similarity index 59% rename from services/mint_sender/service_configs/mint_sender/environment.yml rename to services/embodied_sender/service_configs/embodied_sender/environment.yml index ed3023c1be..9da5a27aaa 100644 --- a/services/mint_sender/service_configs/mint_sender/environment.yml +++ b/services/embodied_sender/service_configs/embodied_sender/environment.yml @@ -1,3 +1,3 @@ SERVICE_PORT: 8042 -SERVICE_NAME: mint_sender +SERVICE_NAME: embodied_sender CUDA_VISIBLE_DEVICES: '0' \ No newline at end of file diff --git a/services/mint_sender/service_configs/mint_sender/service.yml b/services/embodied_sender/service_configs/embodied_sender/service.yml similarity index 73% rename from services/mint_sender/service_configs/mint_sender/service.yml rename to services/embodied_sender/service_configs/embodied_sender/service.yml index 697f24b713..d85d2d70f6 100644 --- a/services/mint_sender/service_configs/mint_sender/service.yml +++ b/services/embodied_sender/service_configs/embodied_sender/service.yml @@ -1,4 +1,4 @@ -name: mint-sender +name: embodied-sender endpoints: - send compose: @@ -7,10 +7,10 @@ compose: build: args: SERVICE_PORT: 8042 - SERVICE_NAME: mint_sender + SERVICE_NAME: embodied_sender CUDA_VISIBLE_DEVICES: '0' context: . - dockerfile: ./services/mint_sender/Dockerfile + dockerfile: ./services/embodied_sender/Dockerfile command: gunicorn --workers=1 server:app -b 0.0.0.0:8042 --timeout 600 environment: - CUDA_VISIBLE_DEVICES=0 @@ -22,6 +22,6 @@ compose: memory: 100M volumes: - ./common:/src/common - - ./services/mint_sender:/src + - ./services/embodied_sender:/src ports: - 8042:8042 \ No newline at end of file diff --git a/services/mint_sender/test.py b/services/embodied_sender/test.py similarity index 80% rename from services/mint_sender/test.py rename to services/embodied_sender/test.py index fda5149a73..4ae293ead4 100644 --- a/services/mint_sender/test.py +++ b/services/embodied_sender/test.py @@ -9,7 +9,7 @@ def main(): { "hypotheses": [ { - "skill_name": "dff_mint_skill", + "skill_name": "dff_embodied_skill", "command_to_perform": "move_forward_10", } ], @@ -17,15 +17,15 @@ def main(): { "hypotheses": [ { - "skill_name": "dff_mint_skill", + "skill_name": "dff_embodied_skill", "command_to_perform": "move_backward_10", } ], }, ], "bot_utterances": [ - {"active_skill": "dff_mint_skill"}, - {"active_skill": "dff_mint_skill"}, + {"active_skill": "dff_embodied_skill"}, + {"active_skill": "dff_embodied_skill"}, ], "dialog_ids": ["test_dialog_id", "test_dialog_id"], } diff --git a/services/ros_flask_server/README.md b/services/ros_flask_server/README.md index 28aca8aa84..826d66d5a2 100644 --- a/services/ros_flask_server/README.md +++ b/services/ros_flask_server/README.md @@ -1,10 +1,10 @@ # ros_flask_server service -This is an intermediate node in the chain of dream_mint: +This is an intermediate node in the chain of dream_embodied: ### Architecture -[Architecture](../../assistant_dists/dream_mint/architecture.png) +[Architecture](../../assistant_dists/dream_embodied/architecture.png) ### Description diff --git a/services/ros_flask_server/server.py b/services/ros_flask_server/server.py index b5e10d884e..d598ded1b1 100644 --- a/services/ros_flask_server/server.py +++ b/services/ros_flask_server/server.py @@ -35,12 +35,12 @@ def respond_set_commands(): st_time = time.perf_counter() VALID_COMMANDS = list(map(lambda i: i.lower(), request.json.get("commands", []))) if not VALID_COMMANDS: - logger.info("mint-server user did not send valid commands list") - logger.info(f"mint-server `VALID_COMMANDS` set: {VALID_COMMANDS}") + logger.info("embodied-server user did not send valid commands list") + logger.info(f"embodied-server `VALID_COMMANDS` set: {VALID_COMMANDS}") total_time = time.perf_counter() - st_time - logger.info(f"mint-server `is_command_valid` exec time: {total_time:.3f}s") + logger.info(f"embodied-server `is_command_valid` exec time: {total_time:.3f}s") return {"result": bool(VALID_COMMANDS)} @@ -51,11 +51,11 @@ def respond_is_command_valid(): command = request.json.get("command", None) results = {"result": any(item in command for item in VALID_COMMANDS)} - logger.info(f"mint-server `is_command_valid` results: {results}") + logger.info(f"embodied-server `is_command_valid` results: {results}") total_time = time.perf_counter() - st_time - logger.info(f"mint-server `is_command_valid` exec time: {total_time:.3f}s") + logger.info(f"embodied-server `is_command_valid` exec time: {total_time:.3f}s") return jsonify(results) @@ -75,11 +75,11 @@ def respond_perform_command(): except Exception as e: logger.info(f"Error inside ROS: {e}") results = {"result": cmd_valid} - logger.info(f"mint-server `perform_command` {command} appended to queue?: {results}") + logger.info(f"embodied-server `perform_command` {command} appended to queue?: {results}") total_time = time.perf_counter() - st_time - logger.info(f"mint-server `perform_command` exec time: {total_time:.3f}s") + logger.info(f"embodied-server `perform_command` exec time: {total_time:.3f}s") return jsonify(results) @@ -92,11 +92,11 @@ def respond_receive_command(): command = COMMAND_QUEUE.pop(0) if COMMAND_QUEUE else None results = {"command": command} - logger.info(f"mint-server `receive_command` results: {results}") + logger.info(f"embodied-server `receive_command` results: {results}") total_time = time.perf_counter() - st_time - logger.info(f"mint-server `receive_command` exec time: {total_time:.3f}s") + logger.info(f"embodied-server `receive_command` exec time: {total_time:.3f}s") return jsonify(results) @@ -106,11 +106,11 @@ def respond_is_command_performed(): st_time = time.perf_counter() results = {"result": EXECUTING_COMMAND} - logger.info(f"mint-server `is_command_performed` results: {results}") + logger.info(f"embodied-server `is_command_performed` results: {results}") total_time = time.perf_counter() - st_time - logger.info(f"mint-server `is_command_performed` exec time: {total_time:.3f}s") + logger.info(f"embodied-server `is_command_performed` exec time: {total_time:.3f}s") return jsonify(results) @@ -122,12 +122,12 @@ def respond_command_is_performed(): st_time = time.perf_counter() results = {"result": True} - logger.info(f"mint-server `command_is_performed` results: {results}") + logger.info(f"embodied-server `command_is_performed` results: {results}") EXECUTING_COMMAND = None total_time = time.perf_counter() - st_time - logger.info(f"mint-server `command_is_performed` exec time: {total_time:.3f}s") + logger.info(f"embodied-server `command_is_performed` exec time: {total_time:.3f}s") return jsonify(results) diff --git a/skill_selectors/rule_based_selector/connector.py b/skill_selectors/rule_based_selector/connector.py index 67ee1b1b2e..03e8eff825 100644 --- a/skill_selectors/rule_based_selector/connector.py +++ b/skill_selectors/rule_based_selector/connector.py @@ -12,7 +12,7 @@ from common.link import get_linked_to_skills, get_previously_active_skill from common.movies import extract_movies_names_from_annotations from common.response_selection import UNPREDICTABLE_SKILLS -from common.robot import command_intents, mint_intents +from common.robot import command_intents, embodied_intents from common.sensitive import is_sensitive_topic_and_request from common.skills_turn_on_topics_and_patterns import turn_on_skills from common.universal_templates import ( @@ -82,9 +82,9 @@ async def send(self, payload: Dict, callback: Callable): intent_catcher_intents = get_intents(user_uttr, probs=False, which="intent_catcher") high_priority_intent_detected = any( [k for k in intent_catcher_intents if k in high_priority_intents["dff_intent_responder_skill"]] - ) or any([k for k in intent_catcher_intents if k in high_priority_intents["dff_mint_skill"]]) + ) or any([k for k in intent_catcher_intents if k in high_priority_intents["dff_embodied_skill"]]) low_priority_intent_detected = any([k for k in intent_catcher_intents if k in low_priority_intents]) - mint_cmd_detected = any([k for k in intent_catcher_intents if k in mint_intents]) + embodied_cmd_detected = any([k for k in intent_catcher_intents if k in embodied_intents]) command_detected = any([k for k in intent_catcher_intents if k in command_intents]) detected_topics = set(get_topics(user_uttr, which="all")) @@ -127,9 +127,9 @@ async def send(self, payload: Dict, callback: Callable): skills_for_uttr.append("dummy_skill") # process intent with corresponding IntentResponder skills_for_uttr.append("dff_intent_responder_skill") - elif mint_cmd_detected: + elif embodied_cmd_detected: skills_for_uttr.append("dummy_skill") - skills_for_uttr.append("dff_mint_skill") + skills_for_uttr.append("dff_embodied_skill") skills_for_uttr.append("dff_intent_responder_skill") elif command_detected: skills_for_uttr.append("dummy_skill") diff --git a/skills/dff_mint_skill/Dockerfile b/skills/dff_embodied_skill/Dockerfile similarity index 100% rename from skills/dff_mint_skill/Dockerfile rename to skills/dff_embodied_skill/Dockerfile diff --git a/skills/dff_mint_skill/README.md b/skills/dff_embodied_skill/README.md similarity index 68% rename from skills/dff_mint_skill/README.md rename to skills/dff_embodied_skill/README.md index d51f943463..455ef14f61 100644 --- a/skills/dff_mint_skill/README.md +++ b/skills/dff_embodied_skill/README.md @@ -1,6 +1,6 @@ -# dff_mint_skill +# dff_embodied_skill -This is the skill for dream_mint distribution that allows Dream to respond to caught specific user intents. +This is the skill for dream_embodied distribution that allows Dream to respond to caught specific user intents. The notable part of this skill may be found at `scenario/response_funcs.py`: If the skill was chosen by dream, the skill checks whether the command Dream want's the connector to execute is valid, and if so, it sets the `command_to_perform` attribute to be equal to the command's name. \ No newline at end of file diff --git a/skills/dff_mint_skill/common/.gitkeep b/skills/dff_embodied_skill/common/.gitkeep similarity index 100% rename from skills/dff_mint_skill/common/.gitkeep rename to skills/dff_embodied_skill/common/.gitkeep diff --git a/skills/dff_mint_skill/requirements.txt b/skills/dff_embodied_skill/requirements.txt similarity index 100% rename from skills/dff_mint_skill/requirements.txt rename to skills/dff_embodied_skill/requirements.txt diff --git a/skills/dff_mint_skill/scenario/condition.py b/skills/dff_embodied_skill/scenario/condition.py similarity index 100% rename from skills/dff_mint_skill/scenario/condition.py rename to skills/dff_embodied_skill/scenario/condition.py diff --git a/skills/dff_mint_skill/scenario/main.py b/skills/dff_embodied_skill/scenario/main.py similarity index 95% rename from skills/dff_mint_skill/scenario/main.py rename to skills/dff_embodied_skill/scenario/main.py index 66673209fa..8395c6020f 100644 --- a/skills/dff_mint_skill/scenario/main.py +++ b/skills/dff_embodied_skill/scenario/main.py @@ -23,7 +23,7 @@ }, "context_driven_response": { "command_selector": { - RESPONSE: rsp.mint_response, + RESPONSE: rsp.embodied_response, PROCESSING: {"set_confidence": rsp.set_confidence_from_input}, }, }, diff --git a/skills/dff_mint_skill/scenario/response.py b/skills/dff_embodied_skill/scenario/response.py similarity index 95% rename from skills/dff_mint_skill/scenario/response.py rename to skills/dff_embodied_skill/scenario/response.py index 89ed92f83e..433925ed4e 100644 --- a/skills/dff_mint_skill/scenario/response.py +++ b/skills/dff_embodied_skill/scenario/response.py @@ -4,7 +4,7 @@ import common.dff.integration.context as int_ctx import scenario.response_funcs as response_funcs -from common.robot import mint_intents +from common.robot import embodied_intents from common.utils import get_intents from df_engine.core import Actor, Context @@ -12,7 +12,7 @@ logger = logging.getLogger(__name__) -def mint_response(ctx: Context, actor: Actor, *args, **kwargs) -> str: +def embodied_response(ctx: Context, actor: Actor, *args, **kwargs) -> str: annotated_utterance = int_ctx.get_last_human_utterance(ctx, actor) intention, confidence = get_detected_intents(annotated_utterance) logger.info(f"Detected intents: {intention}") @@ -60,7 +60,7 @@ def default_response(ctx: Context, actor: Actor, *args, **kwargs) -> str: def set_confidence_from_input(ctx: Context, actor: Actor, *args, **kwargs) -> Context: intent, confidence = get_detected_intents(int_ctx.get_last_human_utterance(ctx, actor)) - if intent in mint_intents: + if intent in embodied_intents: int_ctx.set_confidence(ctx, actor, 1.0) else: int_ctx.set_confidence(ctx, actor, confidence) diff --git a/skills/dff_mint_skill/scenario/response_funcs.py b/skills/dff_embodied_skill/scenario/response_funcs.py similarity index 100% rename from skills/dff_mint_skill/scenario/response_funcs.py rename to skills/dff_embodied_skill/scenario/response_funcs.py diff --git a/skills/dff_mint_skill/server.py b/skills/dff_embodied_skill/server.py similarity index 100% rename from skills/dff_mint_skill/server.py rename to skills/dff_embodied_skill/server.py diff --git a/skills/dff_mint_skill/service_configs/dff_mint_skill/environment.yml b/skills/dff_embodied_skill/service_configs/dff_embodied_skill/environment.yml similarity index 57% rename from skills/dff_mint_skill/service_configs/dff_mint_skill/environment.yml rename to skills/dff_embodied_skill/service_configs/dff_embodied_skill/environment.yml index 691b197927..619f2860ef 100644 --- a/skills/dff_mint_skill/service_configs/dff_mint_skill/environment.yml +++ b/skills/dff_embodied_skill/service_configs/dff_embodied_skill/environment.yml @@ -1,3 +1,3 @@ SERVICE_PORT: 8041 -SERVICE_NAME: dff_mint_skill +SERVICE_NAME: dff_embodied_skill CUDA_VISIBLE_DEVICES: '0' \ No newline at end of file diff --git a/skills/dff_mint_skill/service_configs/dff_mint_skill/service.yml b/skills/dff_embodied_skill/service_configs/dff_embodied_skill/service.yml similarity index 75% rename from skills/dff_mint_skill/service_configs/dff_mint_skill/service.yml rename to skills/dff_embodied_skill/service_configs/dff_embodied_skill/service.yml index 8db6e9bfbd..7b524f6e25 100644 --- a/skills/dff_mint_skill/service_configs/dff_mint_skill/service.yml +++ b/skills/dff_embodied_skill/service_configs/dff_embodied_skill/service.yml @@ -1,4 +1,4 @@ -name: dff-mint-skill +name: dff-embodied-skill endpoints: - respond compose: @@ -7,10 +7,10 @@ compose: build: args: SERVICE_PORT: 8041 - SERVICE_NAME: dff_mint_skill + SERVICE_NAME: dff_embodied_skill CUDA_VISIBLE_DEVICES: '0' context: . - dockerfile: ./skills/dff_mint_skill/Dockerfile + dockerfile: ./skills/dff_embodied_skill/Dockerfile command: gunicorn --workers=1 server:app -b 0.0.0.0:8041 --timeout 600 environment: - CUDA_VISIBLE_DEVICES=0 @@ -22,7 +22,7 @@ compose: memory: 100M volumes: - ./common:/src/common - - ./skills/dff_mint_skill:/src + - ./skills/dff_embodied_skill:/src - ~/.deeppavlov:/root/.deeppavlov - ~/.deeppavlov/cache:/root/.cache ports: