Revert "feat: add healthchecks (#93)"

This reverts commit d9ff186.
deeppavlov · Oct 25, 2023 · 3a9e3f3 · 3a9e3f3
1 parent fad3f70
commit 3a9e3f3
Show file tree

Hide file tree

Showing 87 changed files with 61 additions and 190 deletions.
diff --git a/annotators/IntentCatcherTransformers/requirements.txt b/annotators/IntentCatcherTransformers/requirements.txt
@@ -5,7 +5,6 @@ itsdangerous==2.0.1
 gunicorn==19.9.0
 requests==2.22.0
 sentry-sdk[flask]==0.14.1
-six==1.16.0
 healthcheck==1.3.3
 jinja2<=3.0.3
 Werkzeug<=2.0.3

diff --git a/annotators/MultilingualSentimentClassification/requirements.txt b/annotators/MultilingualSentimentClassification/requirements.txt
@@ -3,7 +3,6 @@ flask==1.1.1
 gunicorn==19.9.0
 requests==2.22.0
 sentry-sdk[flask]==0.14.1
-six==1.16.0
 healthcheck==1.3.3
 itsdangerous==2.0.1
 jinja2<=3.0.3

diff --git a/annotators/MultilingualToxicClassification/requirements.txt b/annotators/MultilingualToxicClassification/requirements.txt
@@ -4,7 +4,6 @@ flask==1.1.1
 gunicorn==19.9.0
 requests==2.22.0
 sentry-sdk[flask]==0.14.1
-six==1.16.0
 healthcheck==1.3.3
 itsdangerous==2.0.1
 jinja2<=3.0.3

diff --git a/annotators/combined_classification/Dockerfile b/annotators/combined_classification/Dockerfile
@@ -19,7 +19,4 @@ ENV KEEP_ZERO_CONFS=$KEEP_ZERO_CONFS
 COPY annotators/combined_classification/ ./
 COPY common/ common/
 
-# wait for a server answer ( INTERVAL + TIMEOUT ) * RETRIES seconds after that change stutus to unhealthy
-HEALTHCHECK --interval=5s --timeout=5s --retries=3 CMD curl --fail 127.0.0.1:${SERVICE_PORT}/healthcheck || exit 1
-
 CMD gunicorn --workers=1 server:app -b 0.0.0.0:${SERVICE_PORT} --timeout=1200 --preload
diff --git a/annotators/combined_classification/requirements.txt b/annotators/combined_classification/requirements.txt
@@ -8,5 +8,3 @@ transformers==4.15.0
 jinja2<=3.0.3
 Werkzeug<=2.0.3
 pytorch-crf==0.7.2
-six==1.16.0
-healthcheck==1.3.3
diff --git a/annotators/combined_classification/server.py b/annotators/combined_classification/server.py
@@ -2,9 +2,9 @@
 import os
 import time
 
-import sentry_sdk
 from flask import Flask, request, jsonify
-from healthcheck import HealthCheck
+import sentry_sdk
+
 from sentry_sdk.integrations.flask import FlaskIntegration
 from deeppavlov import build_model
 from common.utils import combined_classes
@@ -66,7 +66,6 @@ def get_result(sentences, sentences_with_history, postannotations=False):
     raise e
 
 app = Flask(__name__)
-health = HealthCheck(app, "/healthcheck")
 
 
 @app.route("/model", methods=["POST"])

diff --git a/annotators/doc_processor/Dockerfile b/annotators/doc_processor/Dockerfile
@@ -18,7 +18,4 @@ COPY annotators/doc_processor /src
 COPY documents /src/documents
 COPY common /src/common
 
-# wait for a server answer ( INTERVAL + TIMEOUT ) * RETRIES seconds after that change stutus to unhealthy
-HEALTHCHECK --interval=5s --timeout=5s --retries=3 CMD curl --fail 127.0.0.1:${SERVICE_PORT}/healthcheck || exit 1
-
 CMD gunicorn --workers=1 server:app -b 0.0.0.0:${SERVICE_PORT} --timeout=1200
diff --git a/annotators/doc_processor/requirements.txt b/annotators/doc_processor/requirements.txt
@@ -9,6 +9,4 @@ pypdfium2==4.16.0
 bs4==0.0.1
 python-docx==0.8.11
 simplify-docx==0.1.2
-filetype==1.2.0
-six==1.16.0
-healthcheck==1.3.3
+filetype==1.2.0
diff --git a/annotators/doc_processor/server.py b/annotators/doc_processor/server.py
@@ -1,20 +1,17 @@
 import logging
 import os
-
 import sentry_sdk
-from common.files_and_folders_processing import SKILLS_USING_DOC
 from flask import Flask, jsonify, request
-from healthcheck import HealthCheck
 from sentry_sdk.integrations.flask import FlaskIntegration
 from utils import upload_documents_save_info
+from common.files_and_folders_processing import SKILLS_USING_DOC
 
 # logging here because it conflicts with tf
 
 logging.basicConfig(format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=logging.INFO)
 logger = logging.getLogger(__name__)
 sentry_sdk.init(dsn=os.getenv("SENTRY_DSN"), integrations=[FlaskIntegration()])
 app = Flask(__name__)
-health = HealthCheck(app, "/healthcheck")
 
 DOC_PATHS_OR_LINKS = os.environ.get("DOC_PATHS_OR_LINKS")
 if DOC_PATHS_OR_LINKS:

diff --git a/annotators/doc_retriever/Dockerfile b/annotators/doc_retriever/Dockerfile
@@ -18,7 +18,4 @@ COPY annotators/doc_retriever /src
 COPY documents /src/documents
 COPY common /src/common
 
-# wait for a server answer ( INTERVAL + TIMEOUT ) * RETRIES seconds after that change stutus to unhealthy
-HEALTHCHECK --interval=5s --timeout=5s --retries=3 CMD curl --fail 127.0.0.1:${SERVICE_PORT}/healthcheck || exit 1
-
 CMD gunicorn --workers=1 server:app -b 0.0.0.0:${SERVICE_PORT} --timeout=1200
diff --git a/annotators/doc_retriever/requirements.txt b/annotators/doc_retriever/requirements.txt
@@ -3,7 +3,6 @@ itsdangerous==2.0.1
 gunicorn==19.9.0
 requests==2.22.0
 sentry-sdk[flask]==0.14.1
-six==1.16.0
 healthcheck==1.3.3
 jinja2<=3.0.3
 Werkzeug<=2.0.3
@@ -13,6 +12,4 @@ spacy==3.5
 pypdfium2==4.16.0
 bs4==0.0.1
 python-docx==0.8.11
-simplify-docx==0.1.2
-six==1.16.0
-healthcheck==1.3.3
+simplify-docx==0.1.2
diff --git a/annotators/doc_retriever/server.py b/annotators/doc_retriever/server.py
@@ -1,24 +1,21 @@
 import logging
 import os
-from pathlib import PurePath
-
-import requests
 import sentry_sdk
-from common.files_and_folders_processing import create_folders_if_not_exist
+import requests
+from pathlib import PurePath
 from deeppavlov import build_model
-from deeppavlov.core.common.file import read_json
 from flask import Flask, jsonify, request
-from healthcheck import HealthCheck
 from sentry_sdk.integrations.flask import FlaskIntegration
+from deeppavlov.core.common.file import read_json
 from utils import vectorize_upload_return_attributes, download_files, add_file_id_to_config
+from common.files_and_folders_processing import create_folders_if_not_exist
 
 # logging here because it conflicts with tf
 
 logging.basicConfig(format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=logging.INFO)
 logger = logging.getLogger(__name__)
 sentry_sdk.init(dsn=os.getenv("SENTRY_DSN"), integrations=[FlaskIntegration()])
 app = Flask(__name__)
-health = HealthCheck(app, "/healthcheck")
 
 PARAGRAPHS_NUM = int(os.environ.get("PARAGRAPHS_NUM", 5))
 FILE_SERVER_TIMEOUT = float(os.environ.get("FILE_SERVER_TIMEOUT", 30))

diff --git a/annotators/entity_storer/requirements.txt b/annotators/entity_storer/requirements.txt
@@ -2,7 +2,6 @@ sentry_sdk[flask]==1.19.1
 flask==2.2.3
 itsdangerous==2.0.1
 gunicorn==20.1.0
-six==1.16.0
 healthcheck==1.3.3
 six==1.15.0
 spacy==3.5.1

diff --git a/annotators/prompt_selector/Dockerfile b/annotators/prompt_selector/Dockerfile
@@ -15,7 +15,4 @@ ENV SENTENCE_RANKER_SERVICE_URL ${SENTENCE_RANKER_SERVICE_URL}
 ARG N_SENTENCES_TO_RETURN
 ENV N_SENTENCES_TO_RETURN ${N_SENTENCES_TO_RETURN}
 
-# wait for a server answer ( INTERVAL + TIMEOUT ) * RETRIES seconds after that change stutus to unhealthy
-HEALTHCHECK --interval=5s --timeout=5s --retries=3 CMD curl --fail 127.0.0.1:${SERVICE_PORT}/healthcheck || exit 1
-
 CMD gunicorn --workers=1 server:app --bind 0.0.0.0:8000
diff --git a/annotators/prompt_selector/requirements.txt b/annotators/prompt_selector/requirements.txt
@@ -7,5 +7,3 @@ click<=8.0.4
 jinja2<=3.1.2
 Werkzeug>=2.2.2,<3.0
 numpy>=1.17.2
-six==1.16.0
-healthcheck==1.3.3
diff --git a/annotators/prompt_selector/server.py b/annotators/prompt_selector/server.py
@@ -10,14 +10,12 @@
 import numpy as np
 import sentry_sdk
 from flask import Flask, request, jsonify
-from healthcheck import HealthCheck
 
 
 sentry_sdk.init(getenv("SENTRY_DSN"))
 logging.basicConfig(format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=logging.DEBUG)
 logger = logging.getLogger(__name__)
 app = Flask(__name__)
-health = HealthCheck(app, "/healthcheck")
 
 SENTENCE_RANKER_SERVICE_URL = getenv("SENTENCE_RANKER_SERVICE_URL")
 logger.info(f"prompt-selector considered ranker: {SENTENCE_RANKER_SERVICE_URL}")

diff --git a/annotators/prompt_selector/template.yml b/annotators/prompt_selector/template.yml
@@ -0,0 +1,13 @@
+- name: prompt_selector_template
+  display_name: Prompt Selector Template
+  author: [email protected]
+#  is_customizable: true
+  description: Template for creating Prompt Selector
+  endpoints:
+  - group: annotators
+    endpoint: respond
+  config_keys:
+#    SERVICE_PORT: int
+    SERVICE_NAME: str
+    SENTENCE_RANKER_SERVICE_URL: str
+    N_SENTENCES_TO_RETURN: int
diff --git a/annotators/toxic_classification_ru/requirements.txt b/annotators/toxic_classification_ru/requirements.txt
@@ -4,7 +4,6 @@ flask==1.1.1
 gunicorn==19.9.0
 requests==2.22.0
 sentry-sdk[flask]==0.14.1
-six==1.16.0
 healthcheck==1.3.3
 itsdangerous==2.0.1
 jinja2<=3.0.3

diff --git a/common/dialogflow_framework/requirements.txt b/common/dialogflow_framework/requirements.txt
@@ -3,7 +3,6 @@ sentry_sdk[flask]==0.14.3
 flask==1.1.1
 itsdangerous==2.0.1
 gunicorn==19.9.0
-six==1.16.0
 healthcheck==1.3.3
 # dialogflow framework
 programy==4.3

diff --git a/response_selectors/confidence_based_response_selector/Dockerfile b/response_selectors/confidence_based_response_selector/Dockerfile
@@ -12,7 +12,4 @@ ENV FILTER_BADLISTED_WORDS ${FILTER_BADLISTED_WORDS}
 
 COPY . /src/
 
-# wait for a server answer ( INTERVAL + TIMEOUT ) * RETRIES seconds after that change stutus to unhealthy
-HEALTHCHECK --interval=5s --timeout=5s --retries=3 CMD curl --fail 127.0.0.1:${SERVICE_PORT}/healthcheck || exit 1
-
 CMD gunicorn --workers=1 --bind 0.0.0.0:3003 server:app
diff --git a/response_selectors/confidence_based_response_selector/component.yml b/response_selectors/confidence_based_response_selector/component.yml
@@ -0,0 +1,20 @@
+confidence-based-response-selector:
+  name: response_selector
+  display_name: Response Selector
+  container_name: confidence-based-response-selector
+  component_type: null
+  model_type: Dictionary/Pattern-based
+  is_customizable: false
+  author: DeepPavlov
+  description: Algorithm that selects a final responses among the given list of candidate
+    responses
+  ram_usage: 100M
+  gpu_usage: null
+  port: 8005
+  endpoints:
+  - group: response_selectors
+    endpoint: respond
+  build_args:
+    SERVICE_PORT: '8005'
+    SERVICE_NAME: response_selector
+  date_created: '2023-03-16T09:45:32'
diff --git a/response_selectors/confidence_based_response_selector/pipeline.yml b/response_selectors/confidence_based_response_selector/pipeline.yml
@@ -0,0 +1,10 @@
+confidence-based-response-selector:
+- group: response_selectors
+  connector:
+    protocol: http
+    url: http://confidence-based-response-selector:8005/respond
+  dialog_formatter: state_formatters.dp_formatters:full_dialog
+  response_formatter: state_formatters.dp_formatters:base_response_selector_formatter_service
+  previous_services:
+  - response_annotators
+  state_manager_method: add_bot_utterance
diff --git a/response_selectors/confidence_based_response_selector/requirements.txt b/response_selectors/confidence_based_response_selector/requirements.txt
@@ -6,5 +6,3 @@ numpy==1.25.0
 sentry-sdk==0.12.3
 jinja2<=3.0.3
 Werkzeug<=2.0.3
-six==1.16.0
-healthcheck==1.3.3
diff --git a/response_selectors/confidence_based_response_selector/server.py b/response_selectors/confidence_based_response_selector/server.py
@@ -5,10 +5,9 @@
 import time
 import requests
 
-import sentry_sdk
 from flask import Flask, request, jsonify
-from healthcheck import HealthCheck
 from os import getenv
+import sentry_sdk
 
 
 sentry_sdk.init(getenv("SENTRY_DSN"))
@@ -17,7 +16,6 @@
 logger = logging.getLogger(__name__)
 
 app = Flask(__name__)
-health = HealthCheck(app, "/healthcheck")
 
 BADLIST_URL = getenv("BADLIST_ANNOTATOR_URL", "http://badlisted-words:8018/badlisted_words_batch")
 FILTER_BADLISTED_WORDS = getenv("FILTER_BADLISTED_WORDS", 0)

diff --git a/response_selectors/convers_evaluation_based_selector/Dockerfile b/response_selectors/convers_evaluation_based_selector/Dockerfile
@@ -52,7 +52,4 @@ ENV LANGUAGE ${LANGUAGE}
 COPY ./response_selectors/convers_evaluation_based_selector/ ./
 COPY ./common/ ./common/
 
-# wait for a server answer ( INTERVAL + TIMEOUT ) * RETRIES seconds after that change stutus to unhealthy
-HEALTHCHECK --interval=5s --timeout=5s --retries=3 CMD curl --fail 127.0.0.1:${SERVICE_PORT}/healthcheck || exit 1
-
 CMD gunicorn --workers=2 server:app
diff --git a/response_selectors/convers_evaluation_based_selector/requirements.txt b/response_selectors/convers_evaluation_based_selector/requirements.txt
@@ -7,5 +7,3 @@ sentry-sdk==0.12.3
 nltk==3.2.5
 jinja2<=3.0.3
 Werkzeug<=2.0.3
-six==1.16.0
-healthcheck==1.3.3
diff --git a/response_selectors/convers_evaluation_based_selector/server.py b/response_selectors/convers_evaluation_based_selector/server.py
@@ -10,7 +10,6 @@
 import numpy as np
 import sentry_sdk
 from flask import Flask, request, jsonify
-from healthcheck import HealthCheck
 from nltk.tokenize import sent_tokenize
 
 from common.greeting import greeting_spec, HI_THIS_IS_DREAM
@@ -42,7 +41,6 @@
 logger = logging.getLogger(__name__)
 
 app = Flask(__name__)
-health = HealthCheck(app, "/healthcheck")
 
 CALL_BY_NAME_PROBABILITY = float(getenv("CALL_BY_NAME_PROBABILITY", 0.5))  # if name is already known
 TAG_BASED_SELECTION = getenv("TAG_BASED_SELECTION", False)

diff --git a/response_selectors/llm_based_response_selector/Dockerfile b/response_selectors/llm_based_response_selector/Dockerfile
@@ -26,7 +26,5 @@ COPY ./response_selectors/llm_based_response_selector/ /src/
 WORKDIR /src
 COPY ./common/ ./common/
 
-# wait for a server answer ( INTERVAL + TIMEOUT ) * RETRIES seconds after that change stutus to unhealthy
-HEALTHCHECK --interval=5s --timeout=5s --retries=3 CMD curl --fail 127.0.0.1:${SERVICE_PORT}/healthcheck || exit 1
 
 CMD gunicorn --workers=1 server:app -b 0.0.0.0:${SERVICE_PORT} --timeout=1200
diff --git a/response_selectors/llm_based_response_selector/requirements.txt b/response_selectors/llm_based_response_selector/requirements.txt
@@ -6,5 +6,3 @@ numpy==1.25.0
 sentry-sdk==0.12.3
 jinja2<=3.0.3
 Werkzeug<=2.0.3
-six==1.16.0
-healthcheck==1.3.3
diff --git a/response_selectors/llm_based_response_selector/server.py b/response_selectors/llm_based_response_selector/server.py
@@ -11,8 +11,6 @@
 
 import sentry_sdk
 from flask import Flask, request, jsonify
-from healthcheck import HealthCheck
-
 from common.containers import get_envvars_for_llm, is_container_running
 from common.prompts import send_request_to_prompted_generative_service, compose_sending_variables
 from common.utils import is_toxic_or_badlisted_utterance
@@ -23,7 +21,6 @@
 logger = logging.getLogger(__name__)
 
 app = Flask(__name__)
-health = HealthCheck(app, "/healthcheck")
 
 GENERATIVE_SERVICE_URL = getenv("GENERATIVE_SERVICE_URL")
 while True:

diff --git a/response_selectors/ranking_and_intent_based_response_selector/Dockerfile b/response_selectors/ranking_and_intent_based_response_selector/Dockerfile
@@ -22,7 +22,5 @@ COPY ./response_selectors/ranking_and_intent_based_response_selector/ /src/
 WORKDIR /src
 COPY ./common/ ./common/
 
-# wait for a server answer ( INTERVAL + TIMEOUT ) * RETRIES seconds after that change stutus to unhealthy
-HEALTHCHECK --interval=5s --timeout=5s --retries=3 CMD curl --fail 127.0.0.1:${SERVICE_PORT}/healthcheck || exit 1
 
 CMD gunicorn --workers=1 server:app -b 0.0.0.0:${SERVICE_PORT} --timeout=1200
diff --git a/response_selectors/ranking_and_intent_based_response_selector/requirements.txt b/response_selectors/ranking_and_intent_based_response_selector/requirements.txt
@@ -6,5 +6,3 @@ numpy==1.25.0
 sentry-sdk==0.12.3
 jinja2<=3.0.3
 Werkzeug<=2.0.3
-six==1.16.0
-healthcheck==1.3.3
diff --git a/response_selectors/ranking_and_intent_based_response_selector/server.py b/response_selectors/ranking_and_intent_based_response_selector/server.py
@@ -10,7 +10,6 @@
 
 import sentry_sdk
 from flask import Flask, request, jsonify
-from healthcheck import HealthCheck
 from common.universal_templates import (
     is_any_question_sentence_in_utterance,
     if_chat_about_particular_topic,
@@ -32,7 +31,6 @@
 logger = logging.getLogger(__name__)
 
 app = Flask(__name__)
-health = HealthCheck(app, "/healthcheck")
 
 SENTENCE_RANKER_ANNOTATION_NAME = getenv("SENTENCE_RANKER_ANNOTATION_NAME")
 SENTENCE_RANKER_SERVICE_URL = getenv("SENTENCE_RANKER_SERVICE_URL")

diff --git a/response_selectors/ranking_based_response_selector/Dockerfile b/response_selectors/ranking_based_response_selector/Dockerfile
@@ -22,7 +22,5 @@ COPY ./response_selectors/ranking_based_response_selector/ /src/
 WORKDIR /src
 COPY ./common/ ./common/
 
-# wait for a server answer ( INTERVAL + TIMEOUT ) * RETRIES seconds after that change stutus to unhealthy
-HEALTHCHECK --interval=5s --timeout=5s --retries=3 CMD curl --fail 127.0.0.1:${SERVICE_PORT}/healthcheck || exit 1
 
 CMD gunicorn --workers=1 server:app -b 0.0.0.0:${SERVICE_PORT} --timeout=1200
diff --git a/response_selectors/ranking_based_response_selector/requirements.txt b/response_selectors/ranking_based_response_selector/requirements.txt
@@ -6,5 +6,3 @@ numpy==1.25.0
 sentry-sdk==0.12.3
 jinja2<=3.0.3
 Werkzeug<=2.0.3
-six==1.16.0
-healthcheck==1.3.3