From 8064310193f828cf99941ab56c2061afa5cac122 Mon Sep 17 00:00:00 2001 From: Tristan Lee Date: Mon, 7 Aug 2023 15:55:06 -0500 Subject: [PATCH] refactored spacy.load of nlp models so that they're loading during ETLController initialization instead of on cisticola.base import --- Pipfile.lock | 12 ++++----- cisticola/base.py | 49 ++++++++++------------------------- cisticola/transformer/base.py | 25 +++++++++++++++--- 3 files changed, 42 insertions(+), 44 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 8ea1a92..b66d3da 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -59,19 +59,19 @@ }, "boto3": { "hashes": [ - "sha256:1bae3e6222c7272af44ab4dc456fc4cb7d2d7044489b7a4a08f9cd0fbad6d213", - "sha256:8630c2c38c3130e31e1a4182943aee8bc7dd1a1ad9729092b46fdbc8ac045a77" + "sha256:a654d57e3882e7fd2c1260d604a44364a2fed00da4f52faf37e5901e71145df1", + "sha256:e3c2e8e55c17af6671a5332d6ab4635ad9793c80d0ac6d78af7b30a994d0681b" ], "index": "pypi", - "version": "==1.28.19" + "version": "==1.28.20" }, "botocore": { "hashes": [ - "sha256:15f269945f319b0263cde9a61a25f2c9a83f6074b62cddae71edafec4a61e637", - "sha256:724f9a1a91f88291f5adc6347705a31e52312c88cddd56e38709215b161e025a" + "sha256:485ef175cd011ebc965f4577d8cc02a226c46bd608dd2bb75ce6938328cff0fd", + "sha256:be51c5352162700e7beb0aa27af394adbbf86f8e7a2ca0c437d448d0a7b2bdfb" ], "markers": "python_version >= '3.7'", - "version": "==1.31.19" + "version": "==1.31.20" }, "brotli": { "hashes": [ diff --git a/cisticola/base.py b/cisticola/base.py index b595167..c5947b1 100644 --- a/cisticola/base.py +++ b/cisticola/base.py @@ -32,6 +32,14 @@ from .utils import make_request # Disable decompression bomb check PIL.Image.MAX_IMAGE_PIXELS = 1024 * 1024 * 256 +URL_REGEX = r"""(?i)\b((?:https?:(?:/{1,3}|[a-z0-9%])|[a-z0-9.\-]+[.](?:com|net|org|edu|gov|mil|aero|asia|biz|cat|coop|info|int|jobs|mobi|museum|name|post|pro|tel|travel|xxx|ac|ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cs|cu|cv|cx|cy|cz|dd|de|dj|dk|dm|do|dz|ec|ee|eg|eh|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|in|io|iq|ir|is|it|je|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|ps|pt|pw|py|qa|re|ro|rs|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|Ja|sk|sl|sm|sn|so|sr|ss|st|su|sv|sx|sy|sz|tc|td|tf|tg|th|tj|tk|tl|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|yu|za|zm|zw)/)(?:[^\s()<>{}\[\]]+|\([^\s()]*?\([^\s()]+\)[^\s()]*?\)|\([^\s]+?\))+(?:\([^\s()]*?\([^\s()]+\)[^\s()]*?\)|\([^\s]+?\)|[^\s`!()\[\]{};:\'\".,<>?«»“”‘’])|(?:(?{}\[\]]+|\([^\s()]*?\([^\s()]+\)[^\s()]*?\)|\([^\s]+?\))+(?:\([^\s()]*?\([^\s()]+\)[^\s()]*?\)|\([^\s]+?\)|[^\s`!()\[\]{};:\'\".,<>?«»“”‘’])|(?:(?