mint -> embodied all names changed

deeppavlov · Aug 8, 2023 · ae2354c · ae2354c
1 parent 7cd577d
commit ae2354c
Show file tree

Hide file tree

Showing 50 changed files with 127 additions and 127 deletions.
diff --git a/services/mint_sender/Dockerfile → annotators/embodied_status/Dockerfile b/services/mint_sender/Dockerfile → 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 → annotators/embodied_status/README.md b/annotators/mint_status/README.md → 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 → annotators/embodied_status/requirements.txt b/annotators/mint_status/requirements.txt → annotators/embodied_status/requirements.txt
diff --git a/annotators/mint_status/server.py → annotators/embodied_status/server.py b/annotators/mint_status/server.py → 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/...rvice_configs/mint_status/environment.yml → ...e_configs/embodied_status/environment.yml b/...rvice_configs/mint_status/environment.yml → ...e_configs/embodied_status/environment.yml
@@ -1,3 +1,3 @@
 SERVICE_PORT: 8043
-SERVICE_NAME: mint_status
+SERVICE_NAME: embodied_status
 CUDA_VISIBLE_DEVICES: '0'
diff --git a/...s/service_configs/mint_status/service.yml → ...rvice_configs/embodied_status/service.yml b/...s/service_configs/mint_status/service.yml → ...rvice_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
diff --git a/annotators/mint_status/test.py → annotators/embodied_status/test.py b/annotators/mint_status/test.py → annotators/embodied_status/test.py
diff --git a/assistant_dists/dream_mint/README.md → assistant_dists/dream_embodied/README.md b/assistant_dists/dream_mint/README.md → 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.
diff --git a/assistant_dists/dream_mint/architecture.png → ...ant_dists/dream_embodied/architecture.png b/assistant_dists/dream_mint/architecture.png → ...ant_dists/dream_embodied/architecture.png
diff --git a/assistant_dists/dream_mint/cpu.yml → assistant_dists/dream_embodied/cpu.yml b/assistant_dists/dream_mint/cpu.yml → assistant_dists/dream_embodied/cpu.yml
diff --git a/assistant_dists/dream_mint/db_conf.json → assistant_dists/dream_embodied/db_conf.json b/assistant_dists/dream_mint/db_conf.json → assistant_dists/dream_embodied/db_conf.json
diff --git a/assistant_dists/dream_mint/dev.yml → assistant_dists/dream_embodied/dev.yml b/assistant_dists/dream_mint/dev.yml → 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/...ts/dream_mint/docker-compose.override.yml → ...ream_embodied/docker-compose.override.yml b/...ts/dream_mint/docker-compose.override.yml → ...ream_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/...stant_dists/dream_mint/pipeline_conf.json → ...t_dists/dream_embodied/pipeline_conf.json b/...stant_dists/dream_mint/pipeline_conf.json → ...t_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 → assistant_dists/dream_embodied/proxy.yml b/assistant_dists/dream_mint/proxy.yml → assistant_dists/dream_embodied/proxy.yml
diff --git a/assistant_dists/dream_mint/telegram.yml → assistant_dists/dream_embodied/telegram.yml b/assistant_dists/dream_mint/telegram.yml → 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'
diff --git 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
@@ -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
@@ -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: [email protected]
-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'
diff --git 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