[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

examples/apply_jumanpp.py

@@ -3,6 +3,7 @@
 Usage:
     $ python examples/apply_jumanpp.py "今日はいい天気ですね。"
 """
+
 import sys
 
 from rhoknp import Jumanpp

examples/apply_knp.py

@@ -3,6 +3,7 @@
 Usage:
     $ python examples/apply_knp.py "今日はいい天気ですね。"
 """
+
 import sys
 
 from rhoknp import KNP

examples/apply_kwja.py

@@ -3,6 +3,7 @@
 Usage:
     $ python examples/apply_kwja.py "今日はいい天気ですね。"
 """
+
 import sys
 
 from rhoknp import KWJA

examples/load_jumanpp.py

@@ -3,6 +3,7 @@
 Usage:
     $ python examples/load_jumanpp.py example.jumanpp
 """
+
 import sys
 
 from rhoknp import Sentence

examples/load_knp.py

@@ -3,6 +3,7 @@
 Usage:
     $ python examples/load_knp.py example.jumanpp
 """
+
 import sys
 
 from rhoknp import Sentence

examples/use_coreference_resolution.py

@@ -3,6 +3,7 @@
 Usage:
     $ python examples/use_coreference_resolution.py "ソビエト連邦はソ連ともよばれる。同国の首都はモスクワである。"
 """
+
 import sys
 from typing import List
 

examples/use_dependency_parsing.py

@@ -3,6 +3,7 @@
 Usage:
     $ python examples/use_dependency_parsing.py "今日はいい天気ですね。"
 """
+
 import sys
 
 from rhoknp import KNP

examples/use_discourse_relation_analysis.py

@@ -3,6 +3,7 @@
 Usage:
     $ python examples/use_discourse_relation_analysis.py "風が吹いたら桶屋が儲かる。"
 """
+
 import sys
 
 from rhoknp import KNP

examples/use_morphological_analysis.py

@@ -3,6 +3,7 @@
 Usage:
     $ python examples/use_morphological_analysis.py "今日はいい天気ですね。"
 """
+
 import sys
 
 from rhoknp import Jumanpp

examples/use_named_entity_recognition.py

@@ -3,6 +3,7 @@
 Usage:
     $ python examples/use_named_entity_recognition.py "太郎は花子が読んでいる本を次郎に渡した。"
 """
+
 import sys
 
 from rhoknp import KNP

examples/use_predicate_argument_structure_analysis.py

@@ -3,6 +3,7 @@
 Usage:
     $ python examples/use_predicate_argument_structure_analysis.py "太郎は花子が読んでいる本を次郎に渡した。"
 """
+
 import sys
 from typing import Dict, List
 

src/rhoknp/__init__.py

@@ -6,15 +6,15 @@
 __version__ = version("rhoknp")
 
 __all__ = [
-    "__version__",
-    "RegexSenter",
-    "Jumanpp",
     "KNP",
     "KWJA",
-    "Document",
-    "Sentence",
-    "Clause",
-    "Phrase",
     "BasePhrase",
+    "Clause",
+    "Document",
+    "Jumanpp",
     "Morpheme",
+    "Phrase",
+    "RegexSenter",
+    "Sentence",
+    "__version__",
 ]

src/rhoknp/cohesion/__init__.py

@@ -7,20 +7,20 @@
 from rhoknp.cohesion.rel import RelMode, RelTag, RelTagList
 
 __all__ = [
-    "Pas",
-    "Predicate",
     "Argument",
+    "ArgumentType",
+    "DiscourseRelation",
+    "DiscourseRelationLabel",
+    "DiscourseRelationTag",
     "EndophoraArgument",
+    "Entity",
+    "EntityManager",
     "ExophoraArgument",
-    "ArgumentType",
     "ExophoraReferent",
     "ExophoraReferentType",
-    "Entity",
-    "EntityManager",
+    "Pas",
+    "Predicate",
+    "RelMode",
     "RelTag",
     "RelTagList",
-    "RelMode",
-    "DiscourseRelation",
-    "DiscourseRelationLabel",
-    "DiscourseRelationTag",
 ]

src/rhoknp/cohesion/argument.py

@@ -41,7 +41,7 @@ def __init__(self, case: str, arg_type: ArgumentType) -> None:
         self.case: str = case  #: 述語に対する格．
         self.type: ArgumentType = arg_type  #: 項のタイプ．
         self.optional: bool = False  #: 修飾的な項かどうか．
-        self._pas: Optional["Pas"] = None
+        self._pas: Optional[Pas] = None
 
     @abstractmethod
     def __str__(self) -> str:

src/rhoknp/cohesion/coreference.py

@@ -21,8 +21,8 @@ class Entity:
     def __init__(self, eid: int, exophora_referent: Optional[ExophoraReferent] = None) -> None:
         self.eid = eid  #: エンティティ ID．
         self.exophora_referent = exophora_referent  #: 外界照応の照応先．対応するものがなければ None．
-        self.mentions: List["BasePhrase"] = []  #: このエンティティを参照するメンションのリスト．
-        self.mentions_nonidentical: List["BasePhrase"] = []  #: このエンティティを≒関係で参照するメンションのリスト．
+        self.mentions: List[BasePhrase] = []  #: このエンティティを参照するメンションのリスト．
+        self.mentions_nonidentical: List[BasePhrase] = []  #: このエンティティを≒関係で参照するメンションのリスト．
 
     @property
     def mentions_all(self) -> List["BasePhrase"]:

src/rhoknp/cohesion/discourse.py

@@ -229,7 +229,7 @@ def from_discourse_relation_fstring(cls, fstring: str, modifier: "Clause") -> Op
             return None
         tag = DiscourseRelationTag(tag)
         category = tag.label
-        head_sentence: Optional["Sentence"] = None
+        head_sentence: Optional[Sentence] = None
         if modifier.sentence.has_document():
             sentences = modifier.document.sentences
         else:

src/rhoknp/cohesion/predicate.py

@@ -18,9 +18,9 @@ class Predicate:
     """
 
     def __init__(self, base_phrase: "BasePhrase", cfid: Optional[str] = None) -> None:
-        self.base_phrase: "BasePhrase" = base_phrase  #: 述語の核となる基本句．
+        self.base_phrase: BasePhrase = base_phrase  #: 述語の核となる基本句．
         self.cfid: Optional[str] = cfid  #: 格フーレムID．
-        self._pas: Optional["Pas"] = None
+        self._pas: Optional[Pas] = None
 
     @property
     def text(self) -> str:

src/rhoknp/processors/__init__.py

@@ -3,4 +3,4 @@
 from rhoknp.processors.kwja import KWJA
 from rhoknp.processors.senter import RegexSenter
 
-__all__ = ["RegexSenter", "Jumanpp", "KNP", "KWJA"]
+__all__ = ["KNP", "KWJA", "Jumanpp", "RegexSenter"]

src/rhoknp/processors/processor.py

@@ -8,16 +8,13 @@ class Processor(ABC):
     """解析器の基底クラス．"""
 
     @overload
-    def __call__(self, text: str, timeout: int = 10) -> Document:
-        ...
+    def __call__(self, text: str, timeout: int = 10) -> Document: ...
 
     @overload
-    def __call__(self, text: Sentence, timeout: int = 10) -> Sentence:
-        ...
+    def __call__(self, text: Sentence, timeout: int = 10) -> Sentence: ...
 
     @overload
-    def __call__(self, text: Document, timeout: int = 10) -> Document:
-        ...
+    def __call__(self, text: Document, timeout: int = 10) -> Document: ...
 
     def __call__(self, text: Union[str, Sentence, Document], timeout: int = 10) -> Union[Document, Sentence]:
         """テキストに解析器を適用する．
@@ -38,16 +35,13 @@ def __call__(self, text: Union[str, Sentence, Document], timeout: int = 10) -> U
         return self.apply(text, timeout=timeout)
 
     @overload
-    def apply(self, text: str, timeout: int = 10) -> Document:
-        ...
+    def apply(self, text: str, timeout: int = 10) -> Document: ...
 
     @overload
-    def apply(self, text: Sentence, timeout: int = 10) -> Sentence:
-        ...
+    def apply(self, text: Sentence, timeout: int = 10) -> Sentence: ...
 
     @overload
-    def apply(self, text: Document, timeout: int = 10) -> Document:
-        ...
+    def apply(self, text: Document, timeout: int = 10) -> Document: ...
 
     def apply(self, text: Union[str, Sentence, Document], timeout: int = 10) -> Union[Document, Sentence]:
         """テキストに解析器を適用する．

src/rhoknp/props/__init__.py

@@ -7,8 +7,8 @@
 __all__ = [
     "DepType",
     "FeatureDict",
-    "SemanticsDict",
+    "MemoTag",
     "NamedEntity",
     "NamedEntityCategory",
-    "MemoTag",
+    "SemanticsDict",
 ]

src/rhoknp/units/__init__.py

@@ -5,4 +5,4 @@
 from rhoknp.units.phrase import Phrase
 from rhoknp.units.sentence import Sentence
 
-__all__ = ["Document", "Sentence", "Clause", "Phrase", "BasePhrase", "Morpheme"]
+__all__ = ["BasePhrase", "Clause", "Document", "Morpheme", "Phrase", "Sentence"]

src/rhoknp/units/base_phrase.py

@@ -50,7 +50,7 @@ def __init__(
         super().__init__()
 
         # parent unit
-        self._phrase: Optional["Phrase"] = None
+        self._phrase: Optional[Phrase] = None
 
         # child units
         self._morphemes: Optional[List[Morpheme]] = None
@@ -291,7 +291,7 @@ def get_coreferents(self, include_nonidentical: bool = False, include_self: bool
         Returns:
             共参照している基本句の集合．
         """
-        mentions: List["BasePhrase"] = [self]
+        mentions: List[BasePhrase] = [self]
         for mention in itertools.chain.from_iterable(entity.mentions for entity in self.entities):
             if mention not in mentions:
                 mentions.append(mention)

src/rhoknp/units/clause.py

@@ -29,7 +29,7 @@ def __init__(self) -> None:
         super().__init__()
 
         # parent unit
-        self._sentence: Optional["Sentence"] = None
+        self._sentence: Optional[Sentence] = None
 
         # child units
         self._phrases: Optional[List[Phrase]] = None

src/rhoknp/units/morpheme.py

@@ -97,14 +97,14 @@ def __init__(
         self.conjform_id = conjform_id  #: 活用形ID．
 
         # parent unit
-        self._base_phrase: Optional["BasePhrase"] = None
-        self._sentence: Optional["Sentence"] = None
+        self._base_phrase: Optional[BasePhrase] = None
+        self._sentence: Optional[Sentence] = None
 
         self.semantics: SemanticsDict = (
             semantics if semantics is not None else SemanticsDict()
         )  #: 辞書に記載の意味情報．
         self.features: FeatureDict = features if features is not None else FeatureDict()  #: 素性．
-        self.homographs: List["Morpheme"] = []  #: 同形の形態素のリスト．
+        self.homographs: List[Morpheme] = []  #: 同形の形態素のリスト．
 
         self.index = self.count  #: 文内におけるインデックス．
         if homograph is False:
@@ -341,16 +341,7 @@ def to_knp(self) -> str:
         ret = self._to_jumanpp_line()
         features = FeatureDict(self.features)  # deep copy
         for homograph in self.homographs:
-            alt_feature_key = "ALT-{}-{}-{}-{}-{}-{}-{}-{}".format(
-                homograph.surf,
-                homograph.reading,
-                homograph.lemma,
-                homograph.pos_id,
-                homograph.subpos_id,
-                homograph.conjtype_id,
-                homograph.conjform_id,
-                homograph.semantics.to_sstring(),
-            )
+            alt_feature_key = f"ALT-{homograph.surf}-{homograph.reading}-{homograph.lemma}-{homograph.pos_id}-{homograph.subpos_id}-{homograph.conjtype_id}-{homograph.conjform_id}-{homograph.semantics.to_sstring()}"
             features[alt_feature_key] = True
         if features:
             ret += f" {features.to_fstring()}"

src/rhoknp/units/phrase.py

@@ -34,8 +34,8 @@ def __init__(
         super().__init__()
 
         # parent unit
-        self._clause: Optional["Clause"] = None
-        self._sentence: Optional["Sentence"] = None
+        self._clause: Optional[Clause] = None
+        self._sentence: Optional[Sentence] = None
 
         # child units
         self._base_phrases: Optional[List[BasePhrase]] = None

src/rhoknp/units/sentence.py

@@ -47,7 +47,7 @@ def __init__(self, text: Optional[str] = None) -> None:
         EntityManager.reset()
 
         # parent unit
-        self._document: Optional["Document"] = None
+        self._document: Optional[Document] = None
 
         # child units
         self._clauses: Optional[List[Clause]] = None

tests/cli/test_cli.py

@@ -51,7 +51,7 @@ def test_cat() -> None:
         assert result.exit_code == 0
 
 
-@pytest.fixture()
+@pytest.fixture
 def _mock_stdin(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr("sys.stdin", knp_text)
 

tests/cli/test_serve.py

@@ -13,7 +13,7 @@
 
 
 @pytest.mark.skipif(not is_jumanpp_available, reason="Juman++ is not available")
-@pytest.fixture()
+@pytest.fixture
 def jumanpp_client() -> TestClient:
     app = create_app(AnalyzerType.JUMANPP)
     return TestClient(app)
@@ -50,7 +50,7 @@ def test_index_jumanpp(jumanpp_client: TestClient, text: str) -> None:
 
 
 @pytest.mark.skipif(not is_knp_available, reason="KNP is not available")
-@pytest.fixture()
+@pytest.fixture
 def knp_client() -> TestClient:
     app = create_app(AnalyzerType.KNP)
     return TestClient(app)
@@ -104,7 +104,7 @@ def test_index_knp_error(knp_client: TestClient) -> None:
 
 
 @pytest.mark.skipif(not is_kwja_available, reason="KWJA is not available")
-@pytest.fixture()
+@pytest.fixture
 def kwja_client() -> TestClient:
     app = create_app(AnalyzerType.KWJA, options=["--model-size", "tiny", "--tasks", "char,word"])
     return TestClient(app)