Spelling out names of packages and modules

centre-for-humanities-computing · Oct 30, 2023 · 1147504 · 1147504
1 parent 433e94e
commit 1147504
Show file tree

Hide file tree

Showing 48 changed files with 37 additions and 36 deletions.
diff --git a/docs/tutorials/overview.ipynb b/docs/tutorials/overview.ipynb
@@ -38,7 +38,7 @@
     {
      "data": {
       "text/plain": [
-       "<conspiracies.docproc.coref.coref_comp.CoreferenceComponent at 0x7fc7dad4f580>"
+       "<conspiracies.docprocessing.coref.coref_comp.CoreferenceComponent at 0x7fc7dad4f580>"
       ]
      },
      "execution_count": 1,
@@ -49,7 +49,7 @@
    "source": [
     "import spacy\n",
     "from spacy.tokens import Span\n",
-    "from conspiracies.docproc.coref import CoreferenceComponent\n",
+    "from conspiracies.docprocessing.coref import CoreferenceComponent\n",
     "\n",
     "nlp = spacy.blank(\"da\")\n",
     "nlp.add_pipe(\"sentencizer\")\n",
@@ -159,7 +159,7 @@
    ],
    "source": [
     "import spacy\n",
-    "from conspiracies.docproc.headwordextraction.headwordextraction_comp import contains_ents\n",
+    "from conspiracies.docprocessing.headwordextraction.headwordextraction_comp import contains_ents\n",
     "\n",
     "nlp = spacy.load(\"en_core_web_sm\")\n",
     "nlp.add_pipe(\n",
@@ -209,7 +209,7 @@
     "tokenizer = AutoTokenizer.from_pretrained(tokenizer_name)\n",
     "\n",
     "# An example with a very long text\n",
-    "from conspiracies.preproc.wordpiece_length_normalization import wordpiece_length_normalization\n",
+    "from conspiracies.preprocessing.wordpiece_length_normalization import wordpiece_length_normalization\n",
     "\n",
     "long_text = [\"Hej mit navn er Kenneth. \" * 200]\n",
     "normalized_text = wordpiece_length_normalization(\n",
@@ -282,7 +282,7 @@
     }
    ],
    "source": [
-    "from conspiracies.docproc.relationextraction import SpacyRelationExtractor\n",
+    "from conspiracies.docprocessing.relationextraction import SpacyRelationExtractor\n",
     "import spacy\n",
     "\n",
     "\n",
@@ -339,7 +339,7 @@
     }
    ],
    "source": [
-    "from conspiracies.docproc.relationextraction import KnowledgeTriplets\n",
+    "from conspiracies.docprocessing.relationextraction import KnowledgeTriplets\n",
     "\n",
     "\n",
     "test_sents = [\n",

diff --git a/paper/extract_examples.py b/paper/extract_examples.py
@@ -8,7 +8,7 @@
 import re
 from typing import List, Tuple
 from spacy.tokens import Doc
-from conspiracies.docproc.relationextraction.gptprompting.data_classes import (
+from conspiracies.docprocessing.relationextraction.gptprompting.data_classes import (
     DocTriplets,
 )
 

diff --git a/paper/extract_triplets_tweets.py b/paper/extract_triplets_tweets.py
@@ -10,7 +10,7 @@
 from data import load_gold_triplets
 import spacy
 from extract_examples import extract_examples
-from conspiracies.docproc.relationextraction import (
+from conspiracies.docprocessing.relationextraction import (
     MarkdownPromptTemplate2,
     PromptTemplate,
 )

diff --git a/paper/src/ents_heads_extraction.py b/paper/src/ents_heads_extraction.py
@@ -2,7 +2,7 @@
 import spacy
 
 from relationextraction import SpacyRelationExtractor  # noqa
-from conspiracies.docproc.headwordextraction import contains_ents
+from conspiracies.docprocessing.headwordextraction import contains_ents
 
 
 def main():

diff --git a/pyproject.toml b/pyproject.toml
@@ -88,7 +88,7 @@ content-type = "text/markdown"
 
 
 [project.entry-points.spacy_factories]
-"conspiracies/docproc/relationextraction/gptprompting" = "conspiracies.docproc.relationextraction.gptprompting:create_prompt_relation_extraction_component"
+"conspiracies/docproc/relationextraction/gptprompting" = "conspiracies.docprocessing.relationextraction.gptprompting:create_prompt_relation_extraction_component"
 
 
 [build-system]

diff --git a/src/conspiracies/__init__.py b/src/conspiracies/__init__.py
@@ -1,2 +1,5 @@
 from .registry import registry  # noqa F401
-from conspiracies.docproc.doc_utils import docs_from_jsonl, docs_to_jsonl  # noqa F401
+from conspiracies.docprocessing.doc_utils import (
+    docs_from_jsonl,  # noqa F401
+    docs_to_jsonl,  # noqa F401
+)
diff --git a/src/conspiracies/corpusproc/__init__.py → ...conspiracies/corpusprocessing/__init__.py b/src/conspiracies/corpusproc/__init__.py → ...conspiracies/corpusprocessing/__init__.py
diff --git a/src/conspiracies/corpusproc/umap_hdb.py → ...conspiracies/corpusprocessing/umap_hdb.py b/src/conspiracies/corpusproc/umap_hdb.py → ...conspiracies/corpusprocessing/umap_hdb.py
diff --git a/src/conspiracies/docproc/coref/__init__.py b/src/conspiracies/docproc/coref/__init__.py
diff --git a/src/conspiracies/docproc/relationextraction/__init__.py b/src/conspiracies/docproc/relationextraction/__init__.py
diff --git a/src/conspiracies/docproc/relationextraction/multi2oie/__init__.py b/src/conspiracies/docproc/relationextraction/multi2oie/__init__.py
diff --git a/src/conspiracies/docprocessing/coref/__init__.py b/src/conspiracies/docprocessing/coref/__init__.py
@@ -0,0 +1,2 @@
+from .coref_model import CoreferenceModel  # noqa
+from .coref_component import CoreferenceComponent, create_coref_component  # noqa
diff --git a/src/conspiracies/docproc/coref/coref_comp.py → ...es/docprocessing/coref/coref_component.py b/src/conspiracies/docproc/coref/coref_comp.py → ...es/docprocessing/coref/coref_component.py
@@ -9,7 +9,7 @@
 from spacy.tokens import Doc, Span
 from spacy.util import minibatch
 
-from conspiracies.docproc.coref import CoreferenceModel
+from conspiracies.docprocessing.coref import CoreferenceModel
 
 
 class CoreferenceComponent(TrainablePipe):

diff --git a/...conspiracies/docproc/coref/coref_model.py → ...racies/docprocessing/coref/coref_model.py b/...conspiracies/docproc/coref/coref_model.py → ...racies/docprocessing/coref/coref_model.py
@@ -14,7 +14,7 @@
 # required for reading an archive using the "coref"
 from allennlp_models.coref.dataset_readers.conll import ConllCorefReader  # noqa
 
-from conspiracies.docproc.modeldownload import download_model
+from conspiracies.docprocessing.modeldownload import download_model
 
 
 @Predictor.register("coreference_resolution_v1")

diff --git a/src/conspiracies/docproc/doc_utils.py → src/conspiracies/docprocessing/doc_utils.py b/src/conspiracies/docproc/doc_utils.py → src/conspiracies/docprocessing/doc_utils.py
@@ -5,7 +5,7 @@
 from spacy.language import Language
 from spacy.tokens import Doc
 
-from conspiracies.docproc.relationextraction.gptprompting import (
+from conspiracies.docprocessing.relationextraction.gptprompting import (
     DocTriplets,
     SpanTriplet,
 )

diff --git a/...es/docproc/headwordextraction/__init__.py → ...processing/headwordextraction/__init__.py b/...es/docproc/headwordextraction/__init__.py → ...processing/headwordextraction/__init__.py
diff --git a/...wordextraction/headwordextraction_comp.py → ...xtraction/headwordextraction_component.py b/...wordextraction/headwordextraction_comp.py → ...xtraction/headwordextraction_component.py
diff --git a/src/conspiracies/docproc/modeldownload.py → ...nspiracies/docprocessing/modeldownload.py b/src/conspiracies/docproc/modeldownload.py → ...nspiracies/docprocessing/modeldownload.py
diff --git a/src/conspiracies/docprocessing/relationextraction/__init__.py b/src/conspiracies/docprocessing/relationextraction/__init__.py
@@ -0,0 +1,2 @@
+from .multi2oie.knowledge_triplets import KnowledgeTriplets  # noqa F401
+from .multi2oie.multi2oie_component import SpacyRelationExtractor  # noqa F401
diff --git a/...lationextraction/gptprompting/__init__.py → ...lationextraction/gptprompting/__init__.py b/...lationextraction/gptprompting/__init__.py → ...lationextraction/gptprompting/__init__.py
@@ -9,7 +9,7 @@
     chatGPTPromptTemplate,
 )
 
-from .prompt_relation_comp import (  # noqa F401
+from .prompt_relation_component import (  # noqa F401
     create_prompt_relation_extraction_component,
     score_open_relations,
 )
diff --git a/...onextraction/gptprompting/data_classes.py → ...onextraction/gptprompting/data_classes.py b/...onextraction/gptprompting/data_classes.py → ...onextraction/gptprompting/data_classes.py
diff --git a/...ionextraction/gptprompting/prompt_apis.py → ...ionextraction/gptprompting/prompt_apis.py b/...ionextraction/gptprompting/prompt_apis.py → ...ionextraction/gptprompting/prompt_apis.py
@@ -5,7 +5,7 @@
 from conspiracies.registry import registry
 from spacy.tokens import Doc
 
-from conspiracies.docproc.relationextraction.gptprompting.prompt_templates import (
+from conspiracies.docprocessing.relationextraction.gptprompting import (
     PromptTemplate,
 )
 

diff --git a/...tion/gptprompting/prompt_relation_comp.py → ...gptprompting/prompt_relation_component.py b/...tion/gptprompting/prompt_relation_comp.py → ...gptprompting/prompt_relation_component.py
diff --git a/...traction/gptprompting/prompt_templates.py → ...traction/gptprompting/prompt_templates.py b/...traction/gptprompting/prompt_templates.py → ...traction/gptprompting/prompt_templates.py
diff --git a/...onextraction/gptprompting/prompt_utils.py → ...onextraction/gptprompting/prompt_utils.py b/...onextraction/gptprompting/prompt_utils.py → ...onextraction/gptprompting/prompt_utils.py
diff --git a/src/conspiracies/docprocessing/relationextraction/multi2oie/__init__.py b/src/conspiracies/docprocessing/relationextraction/multi2oie/__init__.py
@@ -0,0 +1,2 @@
+from .knowledge_triplets import KnowledgeTriplets  # noqa F401
+from .multi2oie_component import SpacyRelationExtractor  # noqa F401
diff --git a/...c/relationextraction/multi2oie/dataset.py → ...g/relationextraction/multi2oie/dataset.py b/...c/relationextraction/multi2oie/dataset.py → ...g/relationextraction/multi2oie/dataset.py
diff --git a/...c/relationextraction/multi2oie/extract.py → ...g/relationextraction/multi2oie/extract.py b/...c/relationextraction/multi2oie/extract.py → ...g/relationextraction/multi2oie/extract.py
diff --git a/...xtraction/multi2oie/knowledge_triplets.py → ...xtraction/multi2oie/knowledge_triplets.py b/...xtraction/multi2oie/knowledge_triplets.py → ...xtraction/multi2oie/knowledge_triplets.py
diff --git a/...roc/relationextraction/multi2oie/model.py → ...ing/relationextraction/multi2oie/model.py b/...roc/relationextraction/multi2oie/model.py → ...ing/relationextraction/multi2oie/model.py
diff --git a/...ionextraction/multi2oie/multi2oie_comp.py → ...traction/multi2oie/multi2oie_component.py b/...ionextraction/multi2oie/multi2oie_comp.py → ...traction/multi2oie/multi2oie_component.py
diff --git a/...onextraction/multi2oie/multi2oie_utils.py → ...onextraction/multi2oie/multi2oie_utils.py b/...onextraction/multi2oie/multi2oie_utils.py → ...onextraction/multi2oie/multi2oie_utils.py
diff --git a/...ionextraction/multi2oie/other/__init__.py → ...ionextraction/multi2oie/other/__init__.py b/...ionextraction/multi2oie/other/__init__.py → ...ionextraction/multi2oie/other/__init__.py
diff --git a/...relationextraction/multi2oie/other/bio.py → ...relationextraction/multi2oie/other/bio.py b/...relationextraction/multi2oie/other/bio.py → ...relationextraction/multi2oie/other/bio.py
diff --git a/...lationextraction/multi2oie/other/utils.py → ...lationextraction/multi2oie/other/utils.py b/...lationextraction/multi2oie/other/utils.py → ...lationextraction/multi2oie/other/utils.py
diff --git a/src/conspiracies/preproc/__init__.py → src/conspiracies/preprocessing/__init__.py b/src/conspiracies/preproc/__init__.py → src/conspiracies/preprocessing/__init__.py
diff --git a/...preproc/wordpiece_length_normalization.py → ...cessing/wordpiece_length_normalization.py b/...preproc/wordpiece_length_normalization.py → ...cessing/wordpiece_length_normalization.py
diff --git a/tests/test_coref_comp.py b/tests/test_coref_comp.py
@@ -1,6 +1,6 @@
 from spacy.tokens import Span
 
-from conspiracies.docproc.coref import CoreferenceComponent  # noqa F401
+from conspiracies.docprocessing.coref import CoreferenceComponent  # noqa F401
 
 from .utils import nlp_da, nlp_da_w_coref  # noqa F401
 

diff --git a/tests/test_coref_model.py b/tests/test_coref_model.py
@@ -1,6 +1,6 @@
 from .utils import nlp_da  # noqa
 
-from conspiracies.docproc.coref import CoreferenceModel
+from conspiracies.docprocessing.coref import CoreferenceModel
 
 
 def test_CoreferenceModel(nlp_da):  # noqa

diff --git a/tests/test_data/prompt_data.py b/tests/test_data/prompt_data.py
@@ -1,7 +1,7 @@
 from typing import List
 
 import spacy
-from conspiracies.docproc.relationextraction.gptprompting import (
+from conspiracies.docprocessing.relationextraction.gptprompting import (
     DocTriplets,
     SpanTriplet,
     StringTriplet,

diff --git a/tests/test_ents_filter.py b/tests/test_ents_filter.py
@@ -1,7 +1,7 @@
 import spacy
 from spacy.tokens import Doc, Span
 
-from conspiracies.docproc.headwordextraction.headwordextraction_comp import (
+from conspiracies.docprocessing.headwordextraction.headwordextraction_component import (
     contains_ents,
 )
 

diff --git a/tests/test_prompt_data_classes.py b/tests/test_prompt_data_classes.py
@@ -1,6 +1,6 @@
 import pytest
 import spacy
-from conspiracies.docproc.relationextraction.gptprompting import (
+from conspiracies.docprocessing.relationextraction.gptprompting import (
     DocTriplets,
     SpanTriplet,
     StringTriplet,

diff --git a/tests/test_prompt_relation_evaluate.py b/tests/test_prompt_relation_evaluate.py
@@ -1,12 +1,10 @@
 import numpy as np
-from conspiracies.docproc.relationextraction.gptprompting import (
+from conspiracies.docprocessing.relationextraction.gptprompting import (
     DocTriplets,
+    score_open_relations,
 )
 from spacy.training import Example
 
-from conspiracies.docproc.relationextraction.gptprompting.prompt_relation_comp import (
-    score_open_relations,
-)
 from .utils import docs_with_triplets  # noqa F401
 
 

diff --git a/tests/test_prompt_relationextraction_component.py b/tests/test_prompt_relationextraction_component.py
@@ -2,7 +2,7 @@
 
 import pytest
 from confection import registry
-from conspiracies.docproc.relationextraction.gptprompting import (
+from conspiracies.docprocessing.relationextraction.gptprompting import (
     SpanTriplet,
     StringTriplet,
 )

diff --git a/tests/test_prompt_template_create_prompt.py b/tests/test_prompt_template_create_prompt.py
@@ -1,5 +1,5 @@
 import pytest
-from conspiracies.docproc.relationextraction.gptprompting.prompt_templates import (
+from conspiracies.docprocessing.relationextraction.gptprompting import (
     MarkdownPromptTemplate1,
     MarkdownPromptTemplate2,
     PromptTemplate1,

diff --git a/tests/test_prompt_template_parse_prompt.py b/tests/test_prompt_template_parse_prompt.py
@@ -1,5 +1,5 @@
 import pytest
-from conspiracies.docproc.relationextraction.gptprompting.prompt_templates import (
+from conspiracies.docprocessing.relationextraction.gptprompting import (
     MarkdownPromptTemplate1,
     MarkdownPromptTemplate2,
     PromptTemplate1,

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -3,7 +3,7 @@
 import pytest
 import spacy
 from conspiracies import docs_from_jsonl, docs_to_jsonl
-from conspiracies.docproc.relationextraction.gptprompting import (
+from conspiracies.docprocessing.relationextraction.gptprompting import (
     DocTriplets,
     SpanTriplet,
 )

diff --git a/tests/test_wp_length_normalization.py b/tests/test_wp_length_normalization.py
@@ -2,7 +2,7 @@
 
 from .utils import nlp_da  # noqa
 
-from conspiracies.preproc.wordpiece_length_normalization import (
+from conspiracies.preprocessing.wordpiece_length_normalization import (
     wordpiece_length_normalization,
 )
 from transformers import AutoTokenizer