renard-pipeline 0.6.1__tar.gz → 0.6.3__tar.gz

{renard_pipeline-0.6.1 → renard_pipeline-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: renard-pipeline
-Version: 0.6.1
+Version: 0.6.3
 Summary: Relationships Extraction from NARrative Documents
 Home-page: https://github.com/CompNet/Renard
 License: GPL-3.0-only
@@ -13,9 +13,6 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Provides-Extra: spacy
-Provides-Extra: stanza
-Requires-Dist: coreferee (>=1.4,<2.0) ; extra == "spacy"
 Requires-Dist: datasets (>=3.0,<4.0)
 Requires-Dist: grimbert (>=0.1,<0.2)
 Requires-Dist: matplotlib (>=3.5,<4.0)
@@ -26,13 +23,10 @@ Requires-Dist: nltk (>=3.9,<4.0)
 Requires-Dist: pandas (>=2.0,<3.0)
 Requires-Dist: pytest (>=8.3.0,<9.0.0)
 Requires-Dist: rank-bm25 (>=0.2.2,<0.3.0)
-Requires-Dist: spacy (>=3.5,<4.0) ; extra == "spacy"
-Requires-Dist: spacy-transformers (>=1.3,<2.0) ; extra == "spacy"
-Requires-Dist: stanza (>=1.3,<2.0) ; extra == "stanza"
 Requires-Dist: tibert (>=0.5,<0.6)
 Requires-Dist: torch (>=2.0.0,!=2.0.1)
 Requires-Dist: tqdm (>=4.62.3,<5.0.0)
-Requires-Dist: transformers (>=4.36,<5.0)
+Requires-Dist: transformers (>=4.37,<5.0)
 Project-URL: Documentation, https://compnet.github.io/Renard/
 Project-URL: Repository, https://github.com/CompNet/Renard
 Description-Content-Type: text/markdown

{renard_pipeline-0.6.1 → renard_pipeline-0.6.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "renard-pipeline"
-version = "0.6.1"
+version = "0.6.3"
 description = "Relationships Extraction from NARrative Documents"
 authors = ["Arthur Amalvy <arthur.amalvy@univ-avignon.fr>"]
 license = "GPL-3.0-only"
@@ -13,15 +13,9 @@ repository = "https://github.com/CompNet/Renard"
 documentation = "https://compnet.github.io/Renard/"
 
 [tool.poetry.dependencies]
-# optional dependencies
-stanza = { version = "^1.3", optional = true }
-spacy = { version = "^3.5", optional = true }
-coreferee = { version = "^1.4", optional = true }
-spacy-transformers = {version = "^1.3", optional = true}
-# required dependencies
 python = "^3.8,<3.12"
 torch = ">=2.0.0, !=2.0.1"
-transformers = "^4.36"
+transformers = "^4.37"
 nltk = "^3.9"
 tqdm = "^4.62.3"
 networkx = "^3.0"
@@ -41,10 +35,6 @@ Sphinx = "^4.3.1"
 sphinx-rtd-theme = "^1.0.0"
 sphinx-autodoc-typehints = "^1.12.0"
 
-[tool.poetry.extras]
-stanza = ["stanza"]
-spacy = ["spacy", "coreferee", "spacy-transformers"]
-
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

{renard_pipeline-0.6.1 → renard_pipeline-0.6.3}/renard/graph_utils.py

@@ -124,6 +124,15 @@ def dynamic_graph_to_gephi_graph(graphs: List[nx.Graph]) -> nx.Graph:
     G = nx.Graph()
 
     for H_i, H in enumerate(graphs):
+
+        # update node attributes
+        for u in H.nodes:
+            G.add_node(u)
+            for key, value in H.nodes[u].items():
+                # format : (VALUE, START, END)
+                series = G.nodes[u].get(key, [])
+                G.nodes[u][key] = series + [(value, H_i, H_i + 1)]
+
         for u, v in H.edges:
             # create a new edge between two characters if it doesn't
             # exist yet

{renard_pipeline-0.6.1 → renard_pipeline-0.6.3}/renard/pipeline/graph_extraction.py

@@ -306,8 +306,11 @@ class CoOccurrencesGraphExtractor(PipelineStep):
 
         # * Construct graph from co-occurence matrix
         G = nx.Graph()
-        for character, _ in mentions:
-            G.add_node(character)
+        for character, mention in mentions:
+            # NOTE: we add an 'entity_type' attribute. This is useful
+            # when using the 'additional_ner_classes' option, to
+            # differentiate between different entity types.
+            G.add_node(character, entity_type=mention.tag)
 
         for i, (char1, mention1) in enumerate(mentions):
             for j, (char2, mention2) in enumerate(mentions):

{renard_pipeline-0.6.1 → renard_pipeline-0.6.3}/renard/pipeline/stanford_corenlp.py

@@ -72,7 +72,7 @@ class StanfordCoreNLPPipeline(PipelineStep):
     .. note::
 
         The Stanford CoreNLP pipeline requires the ``stanza`` library.
-        You can install it with poetry using ``poetry install -E stanza``.
+        You can install it with poetry using ``pip install stanza``.
 
     .. warning::