pyannotators-entityfishing 1.6.44__tar.gz → 1.6.47__tar.gz

{pyannotators_entityfishing-1.6.44 → pyannotators_entityfishing-1.6.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyannotators-entityfishing
-Version: 1.6.44
+Version: 1.6.47
 Summary: Annotator based on entity-fishing
 Project-URL: Homepage, https://github.com/oterrier/pyannotators_entityfishing/
 Author-email: Olivier Terrier <olivier.terrier@kairntech.com>
@@ -20,7 +20,7 @@ Requires-Python: >=3.12
 Requires-Dist: collections-extended
 Requires-Dist: mongoquery
 Requires-Dist: pydantic<3.0,>=2.0
-Requires-Dist: pymultirole-plugins<0.7.0,>=0.6.0
+Requires-Dist: pymultirole-plugins<1.7.0,>=1.6.0
 Requires-Dist: python-singleton-metaclasses
 Requires-Dist: requests
 Requires-Dist: requests-cache
@@ -30,7 +30,7 @@ Requires-Dist: bump2version; extra == 'dev'
 Requires-Dist: pre-commit; extra == 'dev'
 Provides-Extra: docs
 Requires-Dist: lxml-html-clean; extra == 'docs'
-Requires-Dist: m2r2; extra == 'docs'
+Requires-Dist: myst-parser; extra == 'docs'
 Requires-Dist: sphinx; extra == 'docs'
 Requires-Dist: sphinx-rtd-theme; extra == 'docs'
 Requires-Dist: sphinxcontrib-apidoc; extra == 'docs'

{pyannotators_entityfishing-1.6.44 → pyannotators_entityfishing-1.6.47}/pyproject.toml

@@ -28,7 +28,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-    "pymultirole-plugins>=0.6.0,<0.7.0",
+    "pymultirole-plugins>=1.6.0,<1.7.0",
     "pydantic>=2.0,<3.0",
     "requests",
     "requests-cache",
@@ -57,7 +57,7 @@ test = [
 docs = [
     "sphinx",
     "sphinx-rtd-theme",
-    "m2r2",
+    "myst-parser",
     "sphinxcontrib.apidoc",
     "lxml_html_clean",
 ]

{pyannotators_entityfishing-1.6.44 → pyannotators_entityfishing-1.6.47}/src/pyannotators_entityfishing/__init__.py

@@ -1,3 +1,3 @@
 """Annotator based on entity-fishing"""
 
-__version__ = "1.6.44"
+__version__ = "1.6.47"

{pyannotators_entityfishing-1.6.44 → pyannotators_entityfishing-1.6.47}/src/pyannotators_entityfishing/entityfishing.py

@@ -148,12 +148,12 @@ def _enrich_concepts_with_properties(concepts: dict, wiki_props: list[str], mult
     """Enrich concept dicts with extracted wikidata_properties."""
     for concept in concepts.values():
         if concept is not None and "statements" in concept:
-            fingerprint = defaultdict(list)
+            fingerprint = defaultdict(set)
             for wp in wiki_props:
-                fingerprint[wp] = []
+                fingerprint[wp] = set()
             for st in concept["statements"]:
                 if st["propertyId"] in wiki_props:
-                    fingerprint[st["propertyId"]].append(st["value"])
+                    fingerprint[st["propertyId"]].add(st["value"])
             if sum(len(v) for v in fingerprint.values()) > 0:
                 concept["wikidata_properties"] = dict(fingerprint)
 
@@ -184,7 +184,7 @@ def _build_annotation(entity: dict, label: str, concept: dict | None, lang: str,
         if fingerprints:
             fp_parts = []
             for f in fingerprints:
-                fvals = concept["wikidata_properties"].get(f, [])
+                fvals = list(concept["wikidata_properties"].get(f, []))
                 if fvals:
                     fingers = [f"{f}:{v}" for v in sorted(fvals) if isinstance(v, str)]
                     if multivalued_props:
@@ -194,7 +194,7 @@ def _build_annotation(entity: dict, label: str, concept: dict | None, lang: str,
             ann_term.properties["fingerprint"] = ",".join(fp_parts)
         if wikidata_properties:
             for wp in wikidata_properties:
-                fvals = concept["wikidata_properties"].get(wp, [])
+                fvals = list(concept["wikidata_properties"].get(wp, []))
                 if len(fvals) == 1:
                     ann_term.properties[wp] = fvals[0]
                 elif len(fvals) > 1: