hexlib/regex.py

@@ -3,5 +3,4 @@ import re
 LINK_RE = re.compile(r"(https?://[\w\-_.]+\.[a-z]{2,4}([^\s<'\"]*|$))")
 HTML_HREF_RE = re.compile(r"href=\"([^\"]+)\"")
 WHITESPACE_RE = re.compile(r"\s+")
-PUNCTUATION_RE = re.compile(r"[.,;:\"!?/()|*=>]+")
+PUNCTUATION_RE = re.compile(r"[.,;:\"!?/()|*=]+")
-XML_ENTITY_RE = re.compile(r"&[a-z]+;")

hexlib/text.py

@@ -6,7 +6,7 @@ from lxml import etree
 from nltk.corpus import stopwords
 from nltk.stem import WordNetLemmatizer
 
-from .regex import WHITESPACE_RE, PUNCTUATION_RE, LINK_RE, XML_ENTITY_RE
+from .regex import WHITESPACE_RE, PUNCTUATION_RE, LINK_RE
 
 get_text = etree.XPath("//text()")
 
@@ -24,12 +24,11 @@ nltk.download("wordnet", quiet=True)
 lemmatizer = WordNetLemmatizer()
 
 
-def clean_multicore(texts, processes, chunk_size=10000, **kwargs):
+def clean_multicore(texts, processes, **kwargs):
     pool = Pool(processes=processes)
-    yield from pool.imap(
+    return pool.map(
         func=partial(preprocess, **kwargs),
         iterable=texts,
-        chunksize=chunk_size
     )
 
 
@@ -45,7 +44,7 @@ def _transform_bigram(ngram_seq, ngrams):
 
 def preprocess(text, lowercase=False, clean_html=False, strip=False, remove_punctuation=False,
                remove_stopwords_en=False, lemmatize=False, fix_single_quotes=False, strip_quotes=False,
-               remove_urls=False, bigrams: set = None, remove_numbers=False):
+               remove_urls=False, bigrams: set = None):
     if lowercase:
         text = text.lower()
 
@@ -57,12 +56,8 @@ def preprocess(text, lowercase=False, clean_html=False, strip=False, remove_punc
 
     if clean_html:
         try:
-            text = "<root>" + text + "</root>"
+            root = etree.fromstring(text.replace("&", ""))
-
+            text = "".join(get_text(root))
-            parser = etree.XMLParser(recover=True)
-            root = etree.fromstring(text, parser)
-
-            text = " ".join(get_text(root))
         except:
             pass
 
@@ -80,14 +75,9 @@ def preprocess(text, lowercase=False, clean_html=False, strip=False, remove_punc
         words.append("*")
         text = " ".join(_transform_bigram(nltk.bigrams(words), bigrams))
 
-    if remove_stopwords_en or lemmatize or remove_numbers:
+    if remove_stopwords_en or lemmatize:
         words = text.split(" ")
 
-        if remove_numbers:
-            words = filter(lambda w: not w.isnumeric(), words)
-
-        if not lemmatize and not remove_stopwords_en:
-            text = " ".join(words)
         if lemmatize and remove_stopwords_en:
             text = " ".join(lemmatizer.lemmatize(w) for w in words if w not in stop_words_en)
         elif not lemmatize and remove_stopwords_en:

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="hexlib",
-    version="1.48",
+    version="1.44",
     description="Misc utility methods",
     author="simon987",
     author_email="me@simon987.net",

test/test_text.py

@@ -164,61 +164,6 @@ class TestText(TestCase):
 
         self.assertEqual(cleaned, expected)
 
-    def test_html_no_root(self):
-        text = "<a href=\"#p217709510\" class=\"quotelink\">&gt;&gt;217709510</a><br>Is there a<wbr>servant that is against civilization and humanity?<br>Literally instant summon."
-
-        cleaned = preprocess(
-            text,
-            clean_html=True,
-            lowercase=True,
-            remove_punctuation=True,
-            strip=True,
-            lemmatize=False,
-            fix_single_quotes=True,
-            remove_stopwords_en=False,
-            remove_urls=False
-        )
-
-        expected = "217709510 is there a servant that is against civilization and humanity literally instant summon"
-        self.assertEqual(cleaned, expected)
-
-    def test_html_entity(self):
-        text = "doesn&#039;t"
-
-        cleaned = preprocess(
-            text,
-            clean_html=True,
-            lowercase=True,
-            remove_punctuation=True,
-            strip=True,
-            lemmatize=False,
-            fix_single_quotes=True,
-            remove_stopwords_en=False,
-            remove_urls=False
-        )
-
-        expected = "doesn't"
-        self.assertEqual(cleaned, expected)
-
-    def test_html_invalid_attribute(self):
-        text = '<root><iframe width="560" height="315" src=" " title="youtube video player" frameborder="0" allowfullscreen></iframe></root>'
-
-        cleaned = preprocess(
-            text,
-            clean_html=True,
-            lowercase=True,
-            remove_punctuation=True,
-            strip=True,
-            lemmatize=False,
-            fix_single_quotes=True,
-            remove_stopwords_en=False,
-            remove_urls=False
-        )
-
-        expected = ""
-
-        self.assertEqual(cleaned, expected)
-
     def test_bigrams(self):
         text = "x A b c d e f g h"
         cleaned = preprocess(
@@ -233,14 +178,3 @@ class TestText(TestCase):
         expected = "x a_b c_d e f_g h"
 
         self.assertEqual(cleaned, expected)
-
-    def test_remove_numbers(self):
-        text = "Hello1 test1124test 12 1 1111111 world"
-        cleaned = preprocess(
-            text,
-            lowercase=True,
-            remove_numbers=True
-        )
-        expected = "hello1 test1124test world"
-
-        self.assertEqual(cleaned, expected)