remove: rabbitmq (#1631)

Author: IgnatovFedor

deeppavlov/core/models/torch_model.py

@@ -19,7 +19,6 @@
 from typing import Optional
 
 import torch
-from overrides import overrides
 
 from deeppavlov.core.common.errors import ConfigError
 from deeppavlov.core.models.nn_model import NNModel
@@ -130,7 +129,6 @@ def init_from_opt(self, model_func: str) -> None:
     def is_data_parallel(self) -> bool:
         return isinstance(self.model, torch.nn.DataParallel)
 
-    @overrides
     def load(self, fname: Optional[str] = None, *args, **kwargs) -> None:
         """Load model from `fname` (if `fname` is not given, use `self.load_path`) to `self.model` along with
             the optimizer `self.optimizer`, optionally `self.lr_scheduler`.
@@ -187,7 +185,6 @@ def load(self, fname: Optional[str] = None, *args, **kwargs) -> None:
             log.debug(f"Init from scratch. Load path {self.load_path} is not provided.")
             self.init_from_opt(model_func)
 
-    @overrides
     def save(self, fname: Optional[str] = None, *args, **kwargs) -> None:
         """Save torch model to `fname` (if `fname` is not given, use `self.save_path`). Checkpoint includes
             `model_state_dict`, `optimizer_state_dict`, and `epochs_done` (number of training epochs).
@@ -224,7 +221,6 @@ def save(self, fname: Optional[str] = None, *args, **kwargs) -> None:
         # return it back to device (necessary if it was on `cuda`)
         self.model.to(self.device)
 
-    @overrides
     def process_event(self, event_name: str, data: dict) -> None:
         """Process event. After epoch, increase `self.epochs_done`. After validation, decrease learning rate in
             `self.learning_rate_drop_div` times (not lower than `self.min_learning_rate`)

deeppavlov/dataset_iterators/sqlite_iterator.py

@@ -18,8 +18,6 @@
 from random import Random
 from typing import List, Any, Dict, Optional, Union, Generator, Tuple
 
-from overrides import overrides
-
 from deeppavlov.core.commands.utils import expand_path
 from deeppavlov.core.common.registry import register
 from deeppavlov.core.data.data_fitting_iterator import DataFittingIterator
@@ -73,7 +71,6 @@ def __init__(self, load_path: Union[str, Path], batch_size: Optional[int] = None
         self.shuffle = shuffle
         self.random = Random(seed)
 
-    @overrides
     def get_doc_ids(self) -> List[Any]:
         """Get document ids.
 
@@ -112,7 +109,6 @@ def map_doc2idx(self) -> Dict[int, Any]:
             "SQLite iterator: The size of the database is {} documents".format(len(doc2idx)))
         return doc2idx
 
-    @overrides
     def get_doc_content(self, doc_id: Any) -> Optional[str]:
         """Get document content by id.
 
@@ -132,7 +128,6 @@ def get_doc_content(self, doc_id: Any) -> Optional[str]:
         cursor.close()
         return result if result is None else result[0]
 
-    @overrides
     def gen_batches(self, batch_size: int, shuffle: bool = None) \
             -> Generator[Tuple[List[str], List[int]], Any, None]:
         """Gen batches of documents.

deeppavlov/dataset_readers/basic_classification_reader.py

@@ -17,7 +17,6 @@
 from pathlib import Path
 
 import pandas as pd
-from overrides import overrides
 
 from deeppavlov.core.common.registry import register
 from deeppavlov.core.data.dataset_reader import DatasetReader
@@ -32,7 +31,6 @@ class BasicClassificationDatasetReader(DatasetReader):
     Class provides reading dataset in .csv format
     """
 
-    @overrides
     def read(self, data_path: str, url: str = None,
              format: str = "csv", class_sep: str = None,
              *args, **kwargs) -> dict:

deeppavlov/dataset_readers/docred_reader.py

@@ -22,7 +22,6 @@
 
 import numpy as np
 import pandas as pd
-from overrides import overrides
 
 from deeppavlov.core.commands.utils import expand_path
 from deeppavlov.core.common.registry import register
@@ -35,7 +34,6 @@
 class DocREDDatasetReader(DatasetReader):
     """ Class to read the datasets in DocRED format"""
 
-    @overrides
     def read(
             self,
             data_path: str,

deeppavlov/dataset_readers/huggingface_dataset_reader.py

@@ -19,7 +19,6 @@
 from typing import Dict, Optional, List, Union
 
 from datasets import load_dataset, Dataset, Features, ClassLabel, concatenate_datasets
-from overrides import overrides
 
 from deeppavlov.core.common.registry import register
 from deeppavlov.core.data.dataset_reader import DatasetReader
@@ -30,7 +29,6 @@ class HuggingFaceDatasetReader(DatasetReader):
     """Adds HuggingFace Datasets https://huggingface.co/datasets/ to DeepPavlov
     """
 
-    @overrides
     def read(self,
              path: str,
              name: Optional[str] = None,

deeppavlov/dataset_readers/imdb_reader.py

@@ -15,8 +15,6 @@
 from typing import List, Dict, Any, Optional, Tuple
 from pathlib import Path
 
-from overrides import overrides
-
 from deeppavlov.core.common.registry import register
 from deeppavlov.core.data.dataset_reader import DatasetReader
 from deeppavlov.core.data.utils import download_decompress, mark_done, is_done
@@ -35,7 +33,6 @@ class ImdbReader(DatasetReader):
     for Computational Linguistics (ACL 2011).
     """
 
-    @overrides
     def read(self, data_path: str, url: Optional[str] = None,
              *args, **kwargs) -> Dict[str, List[Tuple[Any, Any]]]:
         """

deeppavlov/dataset_readers/rured_reader.py

@@ -4,7 +4,6 @@
 from typing import Dict, List, Tuple
 from pathlib import Path
 from logging import getLogger
-from overrides import overrides
 
 from deeppavlov.core.common.registry import register
 from deeppavlov.core.data.dataset_reader import DatasetReader
@@ -16,7 +15,6 @@
 class RuREDDatasetReader(DatasetReader):
     """ Class to read the datasets in RuRED format"""
 
-    @overrides
     def read(self, data_path: str, rel2id: Dict = None) -> Dict[str, List[Tuple]]:
         """
         This class processes the RuRED relation extraction dataset

deeppavlov/deep.py

@@ -20,7 +20,6 @@
 from deeppavlov.core.common.cross_validation import calc_cv_score
 from deeppavlov.core.common.file import find_config
 from deeppavlov.download import deep_download
-from deeppavlov.utils.agent import start_rabbit_service
 from deeppavlov.utils.pip_wrapper import install_from_config
 from deeppavlov.utils.server import start_model_server
 from deeppavlov.utils.socket import start_socket_server
@@ -30,8 +29,8 @@
 parser = argparse.ArgumentParser()
 
 parser.add_argument("mode", help="select a mode, train or interact", type=str,
-                    choices={'train', 'evaluate', 'interact', 'predict', 'riseapi', 'risesocket', 'agent-rabbit',
-                             'download', 'install', 'crossval'})
+                    choices={'train', 'evaluate', 'interact', 'predict', 'riseapi', 'risesocket', 'download', 'install',
+                             'crossval'})
 parser.add_argument("config_path", help="path to a pipeline json config", type=str)
 
 parser.add_argument("-e", "--start-epoch-num", dest="start_epoch_num", default=None,
@@ -54,15 +53,6 @@
 parser.add_argument("--socket-type", default="TCP", type=str, choices={"TCP", "UNIX"})
 parser.add_argument("--socket-file", default="/tmp/deeppavlov_socket.s", type=str)
 
-parser.add_argument("-sn", "--service-name", default=None, help="service name for agent-rabbit mode", type=str)
-parser.add_argument("-an", "--agent-namespace", default=None, help="dp-agent namespace name", type=str)
-parser.add_argument("-ul", "--utterance-lifetime", default=None, help="message expiration in seconds", type=int)
-parser.add_argument("-rh", "--rabbit-host", default=None, help="RabbitMQ server host", type=str)
-parser.add_argument("-rp", "--rabbit-port", default=None, help="RabbitMQ server port", type=int)
-parser.add_argument("-rl", "--rabbit-login", default=None, help="RabbitMQ server login", type=str)
-parser.add_argument("-rpwd", "--rabbit-password", default=None, help="RabbitMQ server password", type=str)
-parser.add_argument("-rvh", "--rabbit-virtualhost", default=None, help="RabbitMQ server virtualhost", type=str)
-
 
 def main():
     args = parser.parse_args()
@@ -85,17 +75,6 @@ def main():
         start_model_server(pipeline_config_path, args.https, args.key, args.cert, port=args.port)
     elif args.mode == 'risesocket':
         start_socket_server(pipeline_config_path, args.socket_type, port=args.port, socket_file=args.socket_file)
-    elif args.mode == 'agent-rabbit':
-        start_rabbit_service(model_config=pipeline_config_path,
-                             service_name=args.service_name,
-                             agent_namespace=args.agent_namespace,
-                             batch_size=args.batch_size,
-                             utterance_lifetime_sec=args.utterance_lifetime,
-                             rabbit_host=args.rabbit_host,
-                             rabbit_port=args.rabbit_port,
-                             rabbit_login=args.rabbit_login,
-                             rabbit_password=args.rabbit_password,
-                             rabbit_virtualhost=args.rabbit_virtualhost)
     elif args.mode == 'predict':
         predict_on_stream(pipeline_config_path, args.batch_size, args.file_path)
     elif args.mode == 'crossval':

deeppavlov/models/classifiers/torch_classification_model.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import logging
-from overrides import overrides
 from typing import List, Union, Optional
 
 import numpy as np
@@ -133,7 +132,6 @@ def __call__(self, texts: List[np.ndarray], *args) -> Union[List[List[float]], L
         else:
             return np.argmax(outputs, axis=-1).tolist()
 
-    @overrides
     def process_event(self, event_name: str, data: dict):
         """Process event after epoch
 

deeppavlov/models/embedders/abstract_embedder.py

@@ -18,7 +18,6 @@
 from typing import List, Union, Iterator
 
 import numpy as np
-from overrides import overrides
 
 from deeppavlov.core.data.utils import zero_pad
 from deeppavlov.core.models.component import Component
@@ -56,14 +55,12 @@ def __init__(self, load_path: Union[str, Path], pad_zero: bool = False, mean: bo
         self.model = None
         self.load()
 
-    @overrides
     def save(self) -> None:
         """
         Class does not save loaded model again as it is not trained during usage
         """
         raise NotImplementedError
 
-    @overrides
     def __call__(self, batch: List[List[str]], mean: bool = None) -> List[Union[list, np.ndarray]]:
         """
         Embed sentences from batch