pyannotators-patterns 0.5.88__tar.gz → 0.5.98__tar.gz

{pyannotators_patterns-0.5.88 → pyannotators_patterns-0.5.98}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: pyannotators-patterns
-Version: 0.5.88
+Version: 0.5.98
 Summary: Annotator based on Presidio pattern recognizer
 Home-page: https://github.com/oterrier/pyannotators_patterns/
 Keywords: 
@@ -20,6 +20,8 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3.8
 Requires-Dist: pymultirole-plugins>=0.5.0,<0.6.0
+Requires-Dist: tldextract==5.1.2
+Requires-Dist: spacy==3.4.4
 Requires-Dist: spacy[lookups]==3.4.4
 Requires-Dist: log-with-context
 Requires-Dist: collections_extended
@@ -31,8 +33,6 @@ Requires-Dist: bump2version ; extra == "dev"
 Requires-Dist: sphinx ; extra == "docs"
 Requires-Dist: sphinx-rtd-theme ; extra == "docs"
 Requires-Dist: m2r2 ; extra == "docs"
-Requires-Dist: sphinxcontrib.apidoc ; extra == "docs"
-Requires-Dist: jupyter_sphinx ; extra == "docs"
 Requires-Dist: pytest ; extra == "test"
 Requires-Dist: pytest-cov ; extra == "test"
 Requires-Dist: pytest-flake8 ; extra == "test"

{pyannotators_patterns-0.5.88 → pyannotators_patterns-0.5.98}/pyproject.toml

@@ -26,6 +26,8 @@ classifiers = [
 ]
 requires = [
     "pymultirole-plugins>=0.5.0,<0.6.0",
+    "tldextract==5.1.2",
+    "spacy==3.4.4",
     "spacy[lookups]==3.4.4",
     "log-with-context",
     "collections_extended",
@@ -52,8 +54,8 @@ docs = [
     "sphinx",
     "sphinx-rtd-theme",
     "m2r2",  # markdown support
-    "sphinxcontrib.apidoc",  # run sphinx-apidoc when building docs
-    "jupyter_sphinx",   # for execution of code snippets in the documentation
+    # "sphinxcontrib.apidoc",  # run sphinx-apidoc when building docs
+    # "jupyter_sphinx",   # for execution of code snippets in the documentation
 ]
 dev = [
     "flit",

{pyannotators_patterns-0.5.88 → pyannotators_patterns-0.5.98}/setup.py

@@ -14,6 +14,8 @@ package_dir = \
 
 install_requires = \
 ['pymultirole-plugins>=0.5.0,<0.6.0',
+ 'tldextract==5.1.2',
+ 'spacy==3.4.4',
  'spacy[lookups]==3.4.4',
  'log-with-context',
  'collections_extended',
@@ -22,11 +24,7 @@ install_requires = \
 
 extras_require = \
 {'dev': ['flit', 'pre-commit', 'bump2version'],
- 'docs': ['sphinx',
-          'sphinx-rtd-theme',
-          'm2r2',
-          'sphinxcontrib.apidoc',
-          'jupyter_sphinx'],
+ 'docs': ['sphinx', 'sphinx-rtd-theme', 'm2r2'],
  'test': ['pytest',
           'pytest-cov',
           'pytest-flake8',
@@ -41,7 +39,7 @@ entry_points = \
                           'pyannotators_patterns.patterns:PatternsAnnotator']}
 
 setup(name='pyannotators-patterns',
-      version='0.5.88',
+      version='0.5.98',
       description='Annotator based on Presidio pattern recognizer',
       author='Olivier Terrier',
       author_email='olivier.terrier@kairntech.com',

{pyannotators_patterns-0.5.88 → pyannotators_patterns-0.5.98}/src/pyannotators_patterns/__init__.py

@@ -1,2 +1,2 @@
 """Annotator based on Presidio pattern recognizer"""
-__version__ = "0.5.88"
+__version__ = "0.5.98"

{pyannotators_patterns-0.5.88 → pyannotators_patterns-0.5.98}/src/pyannotators_patterns/named_pattern_recognizer.py

@@ -85,13 +85,15 @@ class NamedPatternRecognizer(PatternRecognizer):
                     validation_result,
                     flags,
                 )
+                recognition_metadata = {"pattern_name": pattern.name}
+                recognition_metadata.update(match.groupdict())
                 pattern_result = RecognizerResult(
                     entity_type=self.supported_entities[0],
                     start=start,
                     end=end,
                     score=score,
                     analysis_explanation=description,
-                    recognition_metadata=match.groupdict()
+                    recognition_metadata=recognition_metadata
                 )
 
                 if validation_result is not None:

{pyannotators_patterns-0.5.88 → pyannotators_patterns-0.5.98}/tests/test_coords.py

@@ -29,9 +29,12 @@ def test_coords(
                 a.text == 'N85,8598654')
     with check:
         assert lat0 == IsPartialDict(labelName='coords', text='N85,8598654',
-                                     properties=IsPartialDict(ref_lat='N', val_lat='85,8598654'))
+                                     properties=IsPartialDict(ref_lat='N', val_lat='85,8598654',
+                                                              pattern_name='ref_lat'))
 
     lat1 = next(a.dict(exclude_none=True, exclude_unset=True) for a in doc0.annotations if
                 a.text == '85,8598654N')
     with check:
-        assert lat1 == IsPartialDict(labelName='coords', text='85,8598654N', properties=IsPartialDict(ref_lat='N', val_lat='85,8598654'))
+        assert lat1 == IsPartialDict(labelName='coords', text='85,8598654N',
+                                     properties=IsPartialDict(ref_lat='N', val_lat='85,8598654',
+                                                              pattern_name='ref_lat_DEVANT'))