From 5e0d07a88e82e8615dfbceac6ba2f67660c9574d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pogoda?= <mipo57@e-science.pl>
Date: Thu, 6 Apr 2023 10:53:07 +0200
Subject: [PATCH] style: sorting & cleaining imports
---
cli.py | 3 +-
main.py | 5 +--
print_config.py | 3 +-
scripts/cli.py | 3 +-
scripts/winer_input.py | 3 +-
src/detections/__init__.py | 2 +-
src/detections/date.py | 3 +-
src/detections/detection.py | 2 +-
src/detectors/date/date.py | 8 +++--
src/detectors/date/en.py | 5 +--
src/detectors/date/pl.py | 7 ++--
src/detectors/date/ru.py | 5 +--
src/detectors/date/utils.py | 1 +
src/detectors/email/email.py | 4 ++-
src/detectors/interface.py | 6 ++--
src/detectors/ner/ner.py | 10 +++---
src/detectors/number/number.py | 4 ++-
src/detectors/phone/phone.py | 4 ++-
src/detectors/url/common.py | 3 +-
src/detectors/url/url.py | 9 +++--
src/detectors/user/user.py | 4 ++-
src/dictionaries/morphosyntactic/__init__.py | 3 +-
src/dictionaries/morphosyntactic/interface.py | 7 ++--
src/dictionaries/morphosyntactic/ner_file.py | 11 ++++---
.../morphosyntactic/ner_file_nkjp.py | 7 ++--
src/input_parsers/ccl.py | 7 ++--
src/input_parsers/interface.py | 3 +-
src/input_parsers/wiktor_ner.py | 5 +--
src/pipeline/default.py | 7 ++--
src/pipeline/interface.py | 1 -
src/pipeline/sequential_jsonl.py | 9 ++---
src/replacers/date_replacer.py | 10 +++---
src/replacers/delete_replacer.py | 3 +-
src/replacers/email_replacer.py | 12 +++----
src/replacers/interface.py | 2 +-
src/replacers/ner_replacer.py | 9 +++--
src/replacers/number_replacer.py | 12 +++----
src/replacers/tag_replacer.py | 33 ++++++-------------
src/replacers/user_replacer.py | 11 +++----
src/string_replacements.py | 2 +-
src/suppressors/interface.py | 2 +-
src/suppressors/order_based.py | 4 ++-
src/worker.py | 2 +-
.../test_ccl_configuration.py | 2 +-
.../test_wiktorner_jsonl_configuration.py | 2 +-
...iktorner_jsonl_txt_output_configuration.py | 2 +-
tests/unit/detectors/ner/test_ner.py | 4 +--
tests/unit/detectors/url/test_url.py | 2 +-
tests/unit/detectors/user/test_user.py | 2 +-
.../morphosyntactic/test_ner_file.py | 6 ++--
.../morphosyntactic/test_ner_file_nkjp.py | 8 ++---
tests/unit/input_parsers/test_ccl.py | 2 +-
tests/unit/input_parsers/test_wiktor_ner.py | 2 +-
tests/unit/pipeline/test_default.py | 9 ++---
tests/unit/pipeline/test_sequential_jsonl.py | 9 ++---
tests/unit/replacers/test_date_replacer.py | 3 +-
tests/unit/replacers/test_email_replacer.py | 3 +-
tests/unit/replacers/test_ner_replacer.py | 9 +++--
tests/unit/replacers/test_tag_replacer.py | 3 +-
tests/unit/replacers/test_user_replacer.py | 2 +-
60 files changed, 174 insertions(+), 152 deletions(-)
diff --git a/cli.py b/cli.py
index 2b2dd65..1bc12e0 100644
--- a/cli.py
+++ b/cli.py
@@ -1,6 +1,7 @@
-from src.worker import Worker
import argparse
+from src.worker import Worker
+
if __name__ == "__main__":
parser = argparse.ArgumentParser(description="anonymizer")
parser.add_argument("input_path", type=str, help="Path to the input file")
diff --git a/main.py b/main.py
index 3990512..42deb74 100644
--- a/main.py
+++ b/main.py
@@ -1,9 +1,10 @@
"""Implementation of anonymizer service."""
-import nlp_ws
-from src.worker import Worker
import logging
+
import nlp_ws
+from src.worker import Worker
+
_log = logging.getLogger(__name__)
diff --git a/print_config.py b/print_config.py
index 2859f3c..a02740f 100644
--- a/print_config.py
+++ b/print_config.py
@@ -1,6 +1,7 @@
+import json
+
import hydra
from omegaconf import OmegaConf
-import json
@hydra.main(config_path="config", config_name="config")
diff --git a/scripts/cli.py b/scripts/cli.py
index 6ede48f..ff8fbe5 100644
--- a/scripts/cli.py
+++ b/scripts/cli.py
@@ -1,9 +1,8 @@
"""Implementation of anonymizer service."""
import argparse
-
-from src.anonymizers.polish_anonymizer import PolishAnonymizer
from src.anonymizers.english_anonymizer import EnglishAnonymizer
+from src.anonymizers.polish_anonymizer import PolishAnonymizer
from src.anonymizers.russian_anonymizer import RussianAnonymizer
diff --git a/scripts/winer_input.py b/scripts/winer_input.py
index fda1cc7..ec0726e 100644
--- a/scripts/winer_input.py
+++ b/scripts/winer_input.py
@@ -1,6 +1,7 @@
-from lpmn_client_biz import Connection, IOType, upload, download, Task, delete
import json
+from lpmn_client_biz import Connection, IOType, Task, delete, download, upload
+
lpmn = [
"morphodita",
{"posconverter": {"input_fromat": "ccl", "output_fromat": "json"}},
diff --git a/src/detections/__init__.py b/src/detections/__init__.py
index 554c9a5..9126ffb 100644
--- a/src/detections/__init__.py
+++ b/src/detections/__init__.py
@@ -1,5 +1,5 @@
-from src.detections.detection import *
from src.detections.date import *
+from src.detections.detection import *
from src.utils.subclasses import get_sublcasses
DETECTION_CLASSES_MAP = {
diff --git a/src/detections/date.py b/src/detections/date.py
index b9e9888..f5d01fd 100644
--- a/src/detections/date.py
+++ b/src/detections/date.py
@@ -1,5 +1,6 @@
+from typing import List, Optional, Tuple
+
from src.detections.detection import Detection
-from typing import List, Tuple, Optional
class DateDetection(Detection):
diff --git a/src/detections/detection.py b/src/detections/detection.py
index a2df4be..9070497 100644
--- a/src/detections/detection.py
+++ b/src/detections/detection.py
@@ -1,5 +1,5 @@
-from typing import Optional
from dataclasses import dataclass
+from typing import Optional
@dataclass
diff --git a/src/detectors/date/date.py b/src/detectors/date/date.py
index 43544d9..9e938ac 100644
--- a/src/detectors/date/date.py
+++ b/src/detectors/date/date.py
@@ -1,9 +1,11 @@
-from typing import List, Dict, Any, Tuple
+from typing import Any, Dict, List, Tuple
+
+from src.detections import DateDetection, Detection
+from src.detectors.interface import Detector
+
from .en import detect_dates_en
from .pl import detect_dates_pl
from .ru import detect_dates_ru
-from src.detections import Detection, DateDetection
-from src.detectors.interface import Detector
class DateDetector(Detector):
diff --git a/src/detectors/date/en.py b/src/detectors/date/en.py
index 90ed843..22423da 100644
--- a/src/detectors/date/en.py
+++ b/src/detectors/date/en.py
@@ -1,7 +1,8 @@
-import regex as re
from typing import List, Tuple
-from src.detections import DateDetection
+import regex as re
+
+from src.detections import DateDetection
from src.detectors.date.utils import parse_date_to_format
EN_DATES_REGEX = re.compile(
diff --git a/src/detectors/date/pl.py b/src/detectors/date/pl.py
index fc53985..3000a75 100644
--- a/src/detectors/date/pl.py
+++ b/src/detectors/date/pl.py
@@ -1,9 +1,10 @@
-import regex as re
from typing import List, Tuple
-from src.detections import DateDetection
-from src.suppressors.order_based import OrderBasedSuppressor
+import regex as re
+
+from src.detections import DateDetection
from src.detectors.date.utils import parse_date_to_format
+from src.suppressors.order_based import OrderBasedSuppressor
PL_DATES_REGEX = re.compile(
r"\b(?P<day_or_month_year>"
diff --git a/src/detectors/date/ru.py b/src/detectors/date/ru.py
index fbc18a0..247d040 100644
--- a/src/detectors/date/ru.py
+++ b/src/detectors/date/ru.py
@@ -1,7 +1,8 @@
-import regex as re
from typing import List, Tuple
-from src.detections import DateDetection
+import regex as re
+
+from src.detections import DateDetection
from src.detectors.date.utils import parse_date_to_format
RU_DATES_REGEX = re.compile(
diff --git a/src/detectors/date/utils.py b/src/detectors/date/utils.py
index b239d3d..356c185 100644
--- a/src/detectors/date/utils.py
+++ b/src/detectors/date/utils.py
@@ -1,4 +1,5 @@
from typing import List, Tuple
+
from src.detections import DateDetection, Optional
diff --git a/src/detectors/email/email.py b/src/detectors/email/email.py
index f14d9fc..e63b3a4 100644
--- a/src/detectors/email/email.py
+++ b/src/detectors/email/email.py
@@ -1,5 +1,7 @@
+from typing import Any, Dict, List, Tuple
+
import regex as re
-from typing import List, Dict, Any, Tuple
+
from src.detections import EmailDetection
from src.detectors.interface import Detector
diff --git a/src/detectors/interface.py b/src/detectors/interface.py
index 6978b02..ca68255 100644
--- a/src/detectors/interface.py
+++ b/src/detectors/interface.py
@@ -1,6 +1,7 @@
-from typing import List, Dict, Any, Tuple
-from src.detections import Detection
from abc import ABC, abstractmethod
+from typing import Any, Dict, List, Tuple
+
+from src.detections import Detection
class Detector(ABC):
@@ -17,4 +18,3 @@ class Detector(ABC):
Returns:
List[Tuple[int, int, Detection]]: List of detections.
"""
- pass
diff --git a/src/detectors/ner/ner.py b/src/detectors/ner/ner.py
index f534da9..704a0ab 100644
--- a/src/detectors/ner/ner.py
+++ b/src/detectors/ner/ner.py
@@ -1,8 +1,10 @@
-from typing import List, Dict, Any, Tuple
+from typing import Dict, List, Tuple
+
+from src.annotations import (Annotation, MorphosyntacticAnnotation,
+ NerAnnotation)
+from src.detections import (DETECTION_CLASSES_MAP, Detection,
+ MorphosyntacticInfoMixin)
from src.detectors.interface import Detector
-from src.detections import Detection, MorphosyntacticInfoMixin
-from src.annotations import Annotation, NerAnnotation, MorphosyntacticAnnotation
-from src.detections import DETECTION_CLASSES_MAP
class NerDetector(Detector):
diff --git a/src/detectors/number/number.py b/src/detectors/number/number.py
index 1939bc6..b3fed57 100644
--- a/src/detectors/number/number.py
+++ b/src/detectors/number/number.py
@@ -1,5 +1,7 @@
+from typing import Any, Dict, List, Tuple
+
import regex as re
-from typing import List, Dict, Any, Tuple
+
from src.detections import NumberDetection
from src.detectors.interface import Detector
diff --git a/src/detectors/phone/phone.py b/src/detectors/phone/phone.py
index 861a5e1..9ba9520 100644
--- a/src/detectors/phone/phone.py
+++ b/src/detectors/phone/phone.py
@@ -1,5 +1,7 @@
+from typing import Any, Dict, List, Tuple
+
import regex as re
-from typing import List, Dict, Any, Tuple
+
from src.detections import PhoneNumberDetection
from src.detectors.interface import Detector
diff --git a/src/detectors/url/common.py b/src/detectors/url/common.py
index cba0020..d3e814d 100644
--- a/src/detectors/url/common.py
+++ b/src/detectors/url/common.py
@@ -1,5 +1,6 @@
+from typing import List
+
import regex as re
-from typing import List, Tuple
def generate_url_regex(exeptions: List[str]) -> str:
diff --git a/src/detectors/url/url.py b/src/detectors/url/url.py
index ac67b2d..9104f05 100644
--- a/src/detectors/url/url.py
+++ b/src/detectors/url/url.py
@@ -1,10 +1,13 @@
+from typing import Any, Dict, List, Tuple
+
import regex as re
-from typing import List, Dict, Any, Tuple
-from .pl import URL_REGEX_PL
-from .common import generate_url_regex
+
from src.detections import UrlDetection
from src.detectors.interface import Detector
+from .common import generate_url_regex
+from .pl import URL_REGEX_PL
+
class UrlDetector(Detector):
def __init__(self, language: str = "pl") -> None:
diff --git a/src/detectors/user/user.py b/src/detectors/user/user.py
index 3a891ab..c197352 100644
--- a/src/detectors/user/user.py
+++ b/src/detectors/user/user.py
@@ -1,5 +1,7 @@
+from typing import Any, Dict, List, Tuple
+
import regex as re
-from typing import List, Dict, Any, Tuple
+
from src.detections import UserDetection
from src.detectors.interface import Detector
diff --git a/src/dictionaries/morphosyntactic/__init__.py b/src/dictionaries/morphosyntactic/__init__.py
index d014284..22d3339 100644
--- a/src/dictionaries/morphosyntactic/__init__.py
+++ b/src/dictionaries/morphosyntactic/__init__.py
@@ -1 +1,2 @@
-from src.dictionaries.morphosyntactic.interface import MorphosyntacticDictionary
+from src.dictionaries.morphosyntactic.interface import \
+ MorphosyntacticDictionary
diff --git a/src/dictionaries/morphosyntactic/interface.py b/src/dictionaries/morphosyntactic/interface.py
index 3ec644b..8e22432 100644
--- a/src/dictionaries/morphosyntactic/interface.py
+++ b/src/dictionaries/morphosyntactic/interface.py
@@ -1,6 +1,7 @@
-from src.detections import Detection
-from typing import Optional, List, Type
from abc import ABC, abstractmethod
+from typing import List, Optional, Type
+
+from src.detections import Detection
class MorphosyntacticDictionary(ABC):
@@ -9,10 +10,8 @@ class MorphosyntacticDictionary(ABC):
"""
Returns a list of supported detection classess
"""
- pass
def get_random_replacement(self, original_entry: Detection) -> Optional[str]:
"""
Returns a random replacement for the original entry
"""
- pass
diff --git a/src/dictionaries/morphosyntactic/ner_file.py b/src/dictionaries/morphosyntactic/ner_file.py
index e94cdb0..e143403 100644
--- a/src/dictionaries/morphosyntactic/ner_file.py
+++ b/src/dictionaries/morphosyntactic/ner_file.py
@@ -1,8 +1,11 @@
-from typing import Dict, List, Optional, Type
-from collections import defaultdict
-from src.detections import Detection, MorphosyntacticInfoMixin, DETECTION_CLASSES_MAP
-from src.dictionaries.morphosyntactic.interface import MorphosyntacticDictionary
import random
+from collections import defaultdict
+from typing import List, Optional, Type
+
+from src.detections import (DETECTION_CLASSES_MAP, Detection,
+ MorphosyntacticInfoMixin)
+from src.dictionaries.morphosyntactic.interface import \
+ MorphosyntacticDictionary
class NERFileMorphosyntacticDictionary(MorphosyntacticDictionary):
diff --git a/src/dictionaries/morphosyntactic/ner_file_nkjp.py b/src/dictionaries/morphosyntactic/ner_file_nkjp.py
index 6b8f49b..80eb16a 100644
--- a/src/dictionaries/morphosyntactic/ner_file_nkjp.py
+++ b/src/dictionaries/morphosyntactic/ner_file_nkjp.py
@@ -1,8 +1,9 @@
-from typing import Optional
-from src.detections import Detection, MorphosyntacticInfoMixin
import random
+from typing import Optional
-from src.dictionaries.morphosyntactic.ner_file import NERFileMorphosyntacticDictionary
+from src.detections import Detection, MorphosyntacticInfoMixin
+from src.dictionaries.morphosyntactic.ner_file import \
+ NERFileMorphosyntacticDictionary
class NERFileNKJPMorphosyntacticDictionary(NERFileMorphosyntacticDictionary):
diff --git a/src/input_parsers/ccl.py b/src/input_parsers/ccl.py
index 8572a49..44b5946 100644
--- a/src/input_parsers/ccl.py
+++ b/src/input_parsers/ccl.py
@@ -1,9 +1,10 @@
-from typing import Dict, List, Tuple
+from typing import List, Tuple
+
from lxml import etree
-from collections import defaultdict
+from src.annotations import (Annotation, MorphosyntacticAnnotation,
+ NerAnnotation)
from src.input_parsers.interface import InputParser
-from src.annotations import Annotation, MorphosyntacticAnnotation, NerAnnotation
class CCLInputParser(InputParser):
diff --git a/src/input_parsers/interface.py b/src/input_parsers/interface.py
index 6309f91..ce48fb9 100644
--- a/src/input_parsers/interface.py
+++ b/src/input_parsers/interface.py
@@ -1,5 +1,5 @@
-from typing import Dict, List, Tuple, Any
from abc import ABC, abstractmethod
+from typing import Any, List, Tuple
class InputParser(ABC):
@@ -16,4 +16,3 @@ class InputParser(ABC):
Returns:
Tuple[str, Dict[str, List[Tuple[int, int, Any]]]]: Text and annotations.
"""
- pass
diff --git a/src/input_parsers/wiktor_ner.py b/src/input_parsers/wiktor_ner.py
index 14e195d..cb7a75d 100644
--- a/src/input_parsers/wiktor_ner.py
+++ b/src/input_parsers/wiktor_ner.py
@@ -1,8 +1,9 @@
-from typing import List, Tuple
import json
+from typing import List, Tuple
+from src.annotations import (Annotation, MorphosyntacticAnnotation,
+ NerAnnotation)
from src.input_parsers.interface import InputParser
-from src.annotations import Annotation, MorphosyntacticAnnotation, NerAnnotation
class WiktorNERInputParser(InputParser):
diff --git a/src/pipeline/default.py b/src/pipeline/default.py
index cdf2db3..0185154 100644
--- a/src/pipeline/default.py
+++ b/src/pipeline/default.py
@@ -1,9 +1,10 @@
-from src.pipeline.interface import Pipeline
from typing import Dict
-from src.suppressors.interface import Suppressor
+
from src.detectors.interface import Detector
-from src.replacers.interface import ReplacerInterface
from src.input_parsers.interface import InputParser
+from src.pipeline.interface import Pipeline
+from src.replacers.interface import ReplacerInterface
+from src.suppressors.interface import Suppressor
class DefaultPipeline(Pipeline):
diff --git a/src/pipeline/interface.py b/src/pipeline/interface.py
index 9a183eb..4e92e24 100644
--- a/src/pipeline/interface.py
+++ b/src/pipeline/interface.py
@@ -12,4 +12,3 @@ class Pipeline(ABC):
Returns:
str: Anonymized text.
"""
- pass
diff --git a/src/pipeline/sequential_jsonl.py b/src/pipeline/sequential_jsonl.py
index 01effdb..bfb464a 100644
--- a/src/pipeline/sequential_jsonl.py
+++ b/src/pipeline/sequential_jsonl.py
@@ -1,10 +1,11 @@
-from src.pipeline.interface import Pipeline
+import json
from typing import Dict
-from src.suppressors.interface import Suppressor
+
from src.detectors.interface import Detector
-from src.replacers.interface import ReplacerInterface
from src.input_parsers.interface import InputParser
-import json
+from src.pipeline.interface import Pipeline
+from src.replacers.interface import ReplacerInterface
+from src.suppressors.interface import Suppressor
class SequentialJSONLPipeline(Pipeline):
diff --git a/src/replacers/date_replacer.py b/src/replacers/date_replacer.py
index 1ad6989..011868f 100644
--- a/src/replacers/date_replacer.py
+++ b/src/replacers/date_replacer.py
@@ -1,11 +1,9 @@
+import random
from typing import List, Tuple
-from src.detections import (
- Detection,
- DateDetection,
-)
-from src.string_replacements import replace_and_update
+
+from src.detections import DateDetection, Detection
from src.replacers.interface import ReplacerInterface
-import random
+from src.string_replacements import replace_and_update
# TODO: Add support for other languages
months_map = {
diff --git a/src/replacers/delete_replacer.py b/src/replacers/delete_replacer.py
index b51413b..d8cd3e8 100644
--- a/src/replacers/delete_replacer.py
+++ b/src/replacers/delete_replacer.py
@@ -1,7 +1,8 @@
from typing import List, Tuple
+
from src.detections import Detection
-from src.string_replacements import replace
from src.replacers.interface import ReplacerInterface
+from src.string_replacements import replace
class DeleteReplacer(ReplacerInterface):
diff --git a/src/replacers/email_replacer.py b/src/replacers/email_replacer.py
index cecba4d..f4f5f89 100644
--- a/src/replacers/email_replacer.py
+++ b/src/replacers/email_replacer.py
@@ -1,12 +1,10 @@
-from typing import List, Tuple
-from src.detections import (
- Detection,
- EmailDetection,
-)
-from src.string_replacements import replace_and_update
-from src.replacers.interface import ReplacerInterface
import random
import string
+from typing import List, Tuple
+
+from src.detections import Detection, EmailDetection
+from src.replacers.interface import ReplacerInterface
+from src.string_replacements import replace_and_update
def random_char(char_num):
diff --git a/src/replacers/interface.py b/src/replacers/interface.py
index e2621c9..dbf4396 100644
--- a/src/replacers/interface.py
+++ b/src/replacers/interface.py
@@ -1,5 +1,6 @@
from abc import ABC, abstractmethod
from typing import List, Tuple
+
from src.detections import Detection
@@ -19,4 +20,3 @@ class ReplacerInterface(ABC):
replaced with anonimized version and list of detections that were
not processed by this replacer.
"""
- pass
diff --git a/src/replacers/ner_replacer.py b/src/replacers/ner_replacer.py
index 56aee0d..98cf055 100644
--- a/src/replacers/ner_replacer.py
+++ b/src/replacers/ner_replacer.py
@@ -1,10 +1,9 @@
from typing import List, Tuple
-from src.detections import (
- Detection,
-)
-from src.string_replacements import replace_and_update
-from src.replacers.interface import ReplacerInterface
+
+from src.detections import Detection
from src.dictionaries.morphosyntactic import MorphosyntacticDictionary
+from src.replacers.interface import ReplacerInterface
+from src.string_replacements import replace_and_update
class NERReplacer(ReplacerInterface):
diff --git a/src/replacers/number_replacer.py b/src/replacers/number_replacer.py
index 14eaa25..6ae331a 100644
--- a/src/replacers/number_replacer.py
+++ b/src/replacers/number_replacer.py
@@ -1,12 +1,10 @@
-from typing import List, Tuple
-from src.detections import (
- Detection,
- NumberDetection,
-)
-from src.string_replacements import replace_and_update
-from src.replacers.interface import ReplacerInterface
import random
import string
+from typing import List, Tuple
+
+from src.detections import Detection, NumberDetection
+from src.replacers.interface import ReplacerInterface
+from src.string_replacements import replace_and_update
def randomize_digits_in_text(text: str) -> str:
diff --git a/src/replacers/tag_replacer.py b/src/replacers/tag_replacer.py
index 427a3d6..836cd14 100644
--- a/src/replacers/tag_replacer.py
+++ b/src/replacers/tag_replacer.py
@@ -1,28 +1,15 @@
from typing import List, Tuple
-from src.detections import (
- Detection,
- NameDetection,
- SurnameDetection,
- StreetNameDetection,
- LocationDetection,
- OrganizationNameDetection,
- ProperNameDetection,
- CityDetection,
- CountryDetection,
- PhoneNumberDetection,
- UrlDetection,
- UserDetection,
- EmailDetection,
- DateDetection,
- TINDetection,
- TitleDetection,
- HydronymDetection,
- SerialNumberDetection,
- KRSDetection,
- NumberDetection,
-)
-from src.string_replacements import replace
+
+from src.detections import (CityDetection, CountryDetection, DateDetection,
+ Detection, EmailDetection, HydronymDetection,
+ KRSDetection, LocationDetection, NameDetection,
+ NumberDetection, OrganizationNameDetection,
+ PhoneNumberDetection, ProperNameDetection,
+ SerialNumberDetection, StreetNameDetection,
+ SurnameDetection, TINDetection, TitleDetection,
+ UrlDetection, UserDetection)
from src.replacers.interface import ReplacerInterface
+from src.string_replacements import replace
class TagReplacer(ReplacerInterface):
diff --git a/src/replacers/user_replacer.py b/src/replacers/user_replacer.py
index 97206d8..518e569 100644
--- a/src/replacers/user_replacer.py
+++ b/src/replacers/user_replacer.py
@@ -1,12 +1,11 @@
from typing import List, Tuple
-from src.detections import (
- Detection,
- UserDetection,
-)
-from src.string_replacements import replace_and_update
-from src.replacers.interface import ReplacerInterface
+
from random_username.generate import generate_username
+from src.detections import Detection, UserDetection
+from src.replacers.interface import ReplacerInterface
+from src.string_replacements import replace_and_update
+
class UserReplacer(ReplacerInterface):
def __init__(self):
diff --git a/src/string_replacements.py b/src/string_replacements.py
index 5b5f584..06182bd 100644
--- a/src/string_replacements.py
+++ b/src/string_replacements.py
@@ -1,4 +1,4 @@
-from typing import List, Tuple, Any, TypeVar
+from typing import List, Tuple, TypeVar
def replace(original_string: str, replacements: List[Tuple[int, int, str]]) -> str:
diff --git a/src/suppressors/interface.py b/src/suppressors/interface.py
index f6a3420..960449c 100644
--- a/src/suppressors/interface.py
+++ b/src/suppressors/interface.py
@@ -1,5 +1,5 @@
-from typing import List, Tuple, Any
from abc import ABC, abstractmethod
+from typing import Any, List, Tuple
class Suppressor(ABC):
diff --git a/src/suppressors/order_based.py b/src/suppressors/order_based.py
index 1a6438f..c466c69 100644
--- a/src/suppressors/order_based.py
+++ b/src/suppressors/order_based.py
@@ -1,5 +1,7 @@
-from typing import List, Tuple, Dict, Any
+from typing import Any, List, Tuple
+
from bitarray import bitarray
+
from src.suppressors.interface import Suppressor
diff --git a/src/worker.py b/src/worker.py
index ecbb0e8..7c84fd0 100644
--- a/src/worker.py
+++ b/src/worker.py
@@ -1,5 +1,5 @@
"""Implementation of nlp_worker."""
-from hydra import initialize, compose
+from hydra import compose, initialize
from hydra.utils import instantiate
diff --git a/tests/integration/ccl_configuration/test_ccl_configuration.py b/tests/integration/ccl_configuration/test_ccl_configuration.py
index 357bb32..463b89d 100644
--- a/tests/integration/ccl_configuration/test_ccl_configuration.py
+++ b/tests/integration/ccl_configuration/test_ccl_configuration.py
@@ -1,4 +1,4 @@
-from hydra import initialize, compose
+from hydra import compose, initialize
from hydra.utils import instantiate
diff --git a/tests/integration/wiktorner_jsonl_configuration/test_wiktorner_jsonl_configuration.py b/tests/integration/wiktorner_jsonl_configuration/test_wiktorner_jsonl_configuration.py
index 2b7261f..48133bf 100644
--- a/tests/integration/wiktorner_jsonl_configuration/test_wiktorner_jsonl_configuration.py
+++ b/tests/integration/wiktorner_jsonl_configuration/test_wiktorner_jsonl_configuration.py
@@ -1,4 +1,4 @@
-from hydra import initialize, compose
+from hydra import compose, initialize
from hydra.utils import instantiate
diff --git a/tests/integration/wiktorner_jsonl_txt_output_configuration/test_wiktorner_jsonl_txt_output_configuration.py b/tests/integration/wiktorner_jsonl_txt_output_configuration/test_wiktorner_jsonl_txt_output_configuration.py
index 6974f22..d8aded5 100644
--- a/tests/integration/wiktorner_jsonl_txt_output_configuration/test_wiktorner_jsonl_txt_output_configuration.py
+++ b/tests/integration/wiktorner_jsonl_txt_output_configuration/test_wiktorner_jsonl_txt_output_configuration.py
@@ -1,4 +1,4 @@
-from hydra import initialize, compose
+from hydra import compose, initialize
from hydra.utils import instantiate
diff --git a/tests/unit/detectors/ner/test_ner.py b/tests/unit/detectors/ner/test_ner.py
index 33a4329..f59e722 100644
--- a/tests/unit/detectors/ner/test_ner.py
+++ b/tests/unit/detectors/ner/test_ner.py
@@ -1,5 +1,5 @@
-from src.annotations import NerAnnotation, MorphosyntacticAnnotation
-from src.detections import NameDetection, SurnameDetection, CityDetection
+from src.annotations import MorphosyntacticAnnotation, NerAnnotation
+from src.detections import CityDetection, NameDetection, SurnameDetection
from src.detectors.ner import NerDetector
diff --git a/tests/unit/detectors/url/test_url.py b/tests/unit/detectors/url/test_url.py
index c47071e..110d503 100644
--- a/tests/unit/detectors/url/test_url.py
+++ b/tests/unit/detectors/url/test_url.py
@@ -1,5 +1,5 @@
-from src.detectors.url import UrlDetector
from src.detections import UrlDetection
+from src.detectors.url import UrlDetector
def test_detect_urls():
diff --git a/tests/unit/detectors/user/test_user.py b/tests/unit/detectors/user/test_user.py
index 56220d6..f56218b 100644
--- a/tests/unit/detectors/user/test_user.py
+++ b/tests/unit/detectors/user/test_user.py
@@ -1,5 +1,5 @@
-from src.detectors.user import UserDetector
from src.detections import UserDetection
+from src.detectors.user import UserDetector
def test_detect_users():
diff --git a/tests/unit/dictionaries/morphosyntactic/test_ner_file.py b/tests/unit/dictionaries/morphosyntactic/test_ner_file.py
index abe02cb..f912869 100644
--- a/tests/unit/dictionaries/morphosyntactic/test_ner_file.py
+++ b/tests/unit/dictionaries/morphosyntactic/test_ner_file.py
@@ -1,7 +1,9 @@
-from src.dictionaries.morphosyntactic.ner_file import NERFileMorphosyntacticDictionary
-from src.detections import NameDetection, CityDetection, SurnameDetection
from tempfile import NamedTemporaryFile
+from src.detections import CityDetection, NameDetection, SurnameDetection
+from src.dictionaries.morphosyntactic.ner_file import \
+ NERFileMorphosyntacticDictionary
+
def test_ner_file_morphosyntactic_dictionary():
with NamedTemporaryFile() as file:
diff --git a/tests/unit/dictionaries/morphosyntactic/test_ner_file_nkjp.py b/tests/unit/dictionaries/morphosyntactic/test_ner_file_nkjp.py
index f886b55..c928e5b 100644
--- a/tests/unit/dictionaries/morphosyntactic/test_ner_file_nkjp.py
+++ b/tests/unit/dictionaries/morphosyntactic/test_ner_file_nkjp.py
@@ -1,9 +1,9 @@
-from src.dictionaries.morphosyntactic.ner_file_nkjp import (
- NERFileNKJPMorphosyntacticDictionary,
-)
-from src.detections import NameDetection, CityDetection, SurnameDetection
from tempfile import NamedTemporaryFile
+from src.detections import CityDetection, NameDetection, SurnameDetection
+from src.dictionaries.morphosyntactic.ner_file_nkjp import \
+ NERFileNKJPMorphosyntacticDictionary
+
def test_ner_file_nkjp_morphosyntactic_dictionary():
with NamedTemporaryFile() as file:
diff --git a/tests/unit/input_parsers/test_ccl.py b/tests/unit/input_parsers/test_ccl.py
index 6032503..9a41c77 100644
--- a/tests/unit/input_parsers/test_ccl.py
+++ b/tests/unit/input_parsers/test_ccl.py
@@ -1,5 +1,5 @@
+from src.annotations import MorphosyntacticAnnotation, NerAnnotation
from src.input_parsers.ccl import CCLInputParser
-from src.annotations import NerAnnotation, MorphosyntacticAnnotation
example_ccl = """<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE chunkList SYSTEM "ccl.dtd">
diff --git a/tests/unit/input_parsers/test_wiktor_ner.py b/tests/unit/input_parsers/test_wiktor_ner.py
index 04d8bf3..8b8fa73 100644
--- a/tests/unit/input_parsers/test_wiktor_ner.py
+++ b/tests/unit/input_parsers/test_wiktor_ner.py
@@ -1,5 +1,5 @@
+from src.annotations import MorphosyntacticAnnotation, NerAnnotation
from src.input_parsers.wiktor_ner import WiktorNERInputParser
-from src.annotations import NerAnnotation, MorphosyntacticAnnotation
example_json = """{
"filename": "test_filename",
diff --git a/tests/unit/pipeline/test_default.py b/tests/unit/pipeline/test_default.py
index 9131792..c83189a 100644
--- a/tests/unit/pipeline/test_default.py
+++ b/tests/unit/pipeline/test_default.py
@@ -1,10 +1,11 @@
-from src.pipeline.default import DefaultPipeline
+from tempfile import NamedTemporaryFile
+
from src.detections import NameDetection
-from src.input_parsers.interface import InputParser
from src.detectors.interface import Detector
-from src.suppressors.interface import Suppressor
+from src.input_parsers.interface import InputParser
+from src.pipeline.default import DefaultPipeline
from src.replacers.interface import ReplacerInterface
-from tempfile import NamedTemporaryFile
+from src.suppressors.interface import Suppressor
class MockInputParser(InputParser):
diff --git a/tests/unit/pipeline/test_sequential_jsonl.py b/tests/unit/pipeline/test_sequential_jsonl.py
index ddbf45f..aaaa63d 100644
--- a/tests/unit/pipeline/test_sequential_jsonl.py
+++ b/tests/unit/pipeline/test_sequential_jsonl.py
@@ -1,10 +1,11 @@
-from src.pipeline.sequential_jsonl import SequentialJSONLPipeline
+from tempfile import NamedTemporaryFile
+
from src.detections import NameDetection
-from src.input_parsers.interface import InputParser
from src.detectors.interface import Detector
-from src.suppressors.interface import Suppressor
+from src.input_parsers.interface import InputParser
+from src.pipeline.sequential_jsonl import SequentialJSONLPipeline
from src.replacers.interface import ReplacerInterface
-from tempfile import NamedTemporaryFile
+from src.suppressors.interface import Suppressor
class MockInputParser(InputParser):
diff --git a/tests/unit/replacers/test_date_replacer.py b/tests/unit/replacers/test_date_replacer.py
index 0811701..2995438 100644
--- a/tests/unit/replacers/test_date_replacer.py
+++ b/tests/unit/replacers/test_date_replacer.py
@@ -1,5 +1,6 @@
+from src.detections import (CityDetection, DateDetection, NameDetection,
+ SurnameDetection)
from src.replacers.date_replacer import DateReplacer
-from src.detections import NameDetection, SurnameDetection, DateDetection, CityDetection
def test_date_replacer():
diff --git a/tests/unit/replacers/test_email_replacer.py b/tests/unit/replacers/test_email_replacer.py
index e86b8c9..fdb25cc 100644
--- a/tests/unit/replacers/test_email_replacer.py
+++ b/tests/unit/replacers/test_email_replacer.py
@@ -1,5 +1,6 @@
+from src.detections import (CityDetection, DateDetection, EmailDetection,
+ UserDetection)
from src.replacers.email_replacer import EmailReplacer
-from src.detections import DateDetection, CityDetection, UserDetection, EmailDetection
def test_email_replacer():
diff --git a/tests/unit/replacers/test_ner_replacer.py b/tests/unit/replacers/test_ner_replacer.py
index 8b7fc65..6b262ef 100644
--- a/tests/unit/replacers/test_ner_replacer.py
+++ b/tests/unit/replacers/test_ner_replacer.py
@@ -1,8 +1,11 @@
-from src.replacers.ner_replacer import NERReplacer
-from src.detections import NameDetection, SurnameDetection, DateDetection, CityDetection
-from src.dictionaries.morphosyntactic.ner_file import NERFileMorphosyntacticDictionary
from tempfile import NamedTemporaryFile
+from src.detections import (CityDetection, DateDetection, NameDetection,
+ SurnameDetection)
+from src.dictionaries.morphosyntactic.ner_file import \
+ NERFileMorphosyntacticDictionary
+from src.replacers.ner_replacer import NERReplacer
+
def test_ner_replacer():
with NamedTemporaryFile() as file:
diff --git a/tests/unit/replacers/test_tag_replacer.py b/tests/unit/replacers/test_tag_replacer.py
index a134394..35af41f 100644
--- a/tests/unit/replacers/test_tag_replacer.py
+++ b/tests/unit/replacers/test_tag_replacer.py
@@ -1,5 +1,6 @@
+from src.detections import (CityDetection, DateDetection, NameDetection,
+ SurnameDetection)
from src.replacers.tag_replacer import TagReplacer
-from src.detections import NameDetection, SurnameDetection, DateDetection, CityDetection
def test_replace_with_tags():
diff --git a/tests/unit/replacers/test_user_replacer.py b/tests/unit/replacers/test_user_replacer.py
index 8afaa51..3a49f2e 100644
--- a/tests/unit/replacers/test_user_replacer.py
+++ b/tests/unit/replacers/test_user_replacer.py
@@ -1,5 +1,5 @@
+from src.detections import CityDetection, DateDetection, UserDetection
from src.replacers.user_replacer import UserReplacer
-from src.detections import DateDetection, CityDetection, UserDetection
def test_user_replacer():
--
GitLab