From 830939ee648e32ca5c5dd05e342b8c22ea9ffc96 Mon Sep 17 00:00:00 2001
From: Raphael Mitsch <r.mitsch@outlook.com>
Date: Wed, 15 Mar 2023 10:51:34 +0100
Subject: [PATCH] Fix InMemoryCandidate attribute names.

---
 spacy/kb/candidate.pxd                     | 2 +-
 spacy/kb/candidate.pyx                     | 4 ++--
 spacy/tests/pipeline/test_entity_linker.py | 6 +++---
 spacy/tests/serialize/test_serialize_kb.py | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/spacy/kb/candidate.pxd b/spacy/kb/candidate.pxd
index 0e753bf99..f21f423e4 100644
--- a/spacy/kb/candidate.pxd
+++ b/spacy/kb/candidate.pxd
@@ -8,8 +8,8 @@ cdef class Candidate:
 
 cdef class InMemoryCandidate(Candidate):
     cdef readonly hash_t _entity_hash
+    cdef readonly hash_t _alias_hash
     cpdef vector[float] _entity_vector
     cdef float _prior_prob
     cdef readonly InMemoryLookupKB _kb
     cdef float _entity_freq
-    cdef hash_t _mention
diff --git a/spacy/kb/candidate.pyx b/spacy/kb/candidate.pyx
index 9f141b20a..3d8da4b95 100644
--- a/spacy/kb/candidate.pyx
+++ b/spacy/kb/candidate.pyx
@@ -64,7 +64,7 @@ cdef class InMemoryCandidate(Candidate):
         self._entity_vector = entity_vector
         self._prior_prob = prior_prob
         self._kb = kb
-        self._alias = alias_hash
+        self._alias_hash = alias_hash
         self._entity_freq = entity_freq
 
     @property
@@ -84,7 +84,7 @@ cdef class InMemoryCandidate(Candidate):
     @property
     def alias(self) -> str:
         """RETURNS (str): Alias."""
-        return self._kb.vocab.strings[self._alias]
+        return self._kb.vocab.strings[self._alias_hash]
 
     @property
     def entity_id_(self) -> str:
diff --git a/spacy/tests/pipeline/test_entity_linker.py b/spacy/tests/pipeline/test_entity_linker.py
index cd1dc90e4..e29e3920b 100644
--- a/spacy/tests/pipeline/test_entity_linker.py
+++ b/spacy/tests/pipeline/test_entity_linker.py
@@ -473,7 +473,7 @@ def test_candidate_generation(nlp):
 
     # test the content of the candidates
     assert adam_ent_cands[0].entity_id_ == "Q2"
-    assert adam_ent_cands[0].mention == "adam"
+    assert adam_ent_cands[0].alias == "adam"
     assert_almost_equal(adam_ent_cands[0].entity_freq, 12)
     assert_almost_equal(adam_ent_cands[0].prior_prob, 0.9)
 
@@ -566,7 +566,7 @@ def test_vocab_serialization(nlp):
     assert len(candidates) == 1
     assert candidates[0].entity_id == q2_hash
     assert candidates[0].entity_id_ == "Q2"
-    assert candidates[0].mention == "adam"
+    assert candidates[0].alias == "adam"
 
     with make_tempdir() as d:
         mykb.to_disk(d / "kb")
@@ -577,7 +577,7 @@ def test_vocab_serialization(nlp):
         assert len(candidates) == 1
         assert candidates[0].entity_id == q2_hash
         assert candidates[0].entity_id_ == "Q2"
-        assert candidates[0].mention == "adam"
+        assert candidates[0].alias == "adam"
 
         assert kb_new_vocab.get_vector("Q2") == [2]
         assert_almost_equal(kb_new_vocab.get_prior_prob("Q2", "douglas"), 0.4)
diff --git a/spacy/tests/serialize/test_serialize_kb.py b/spacy/tests/serialize/test_serialize_kb.py
index 336fd16fe..eb4254d31 100644
--- a/spacy/tests/serialize/test_serialize_kb.py
+++ b/spacy/tests/serialize/test_serialize_kb.py
@@ -74,13 +74,13 @@ def _check_kb(kb):
     assert candidates[0].entity_id_ == "Q007"
     assert 6.999 < candidates[0].entity_freq < 7.01
     assert candidates[0].entity_vector == [0, 0, 7]
-    assert candidates[0].mention == "double07"
+    assert candidates[0].alias == "double07"
     assert 0.899 < candidates[0].prior_prob < 0.901
 
     assert candidates[1].entity_id_ == "Q17"
     assert 1.99 < candidates[1].entity_freq < 2.01
     assert candidates[1].entity_vector == [7, 1, 0]
-    assert candidates[1].mention == "double07"
+    assert candidates[1].alias == "double07"
     assert 0.099 < candidates[1].prior_prob < 0.101