don't use entrylike

Author: CompRhys

src/pymatgen/analysis/phase_diagram.py

@@ -43,7 +43,7 @@
     from numpy.typing import ArrayLike
     from typing_extensions import Self
 
-    from pymatgen.util.typing import CompositionLike, EntryLike
+    from pymatgen.util.typing import CompositionLike
 
 logger = logging.getLogger(__name__)
 
@@ -343,7 +343,7 @@ class PhaseDiagram(MSONable):
 
     def __init__(
         self,
-        entries: Collection[EntryLike],
+        entries: Collection[Entry],
         elements: Collection[Element] = (),
         *,
         computed_data: dict[str, Any] | None = None,
@@ -455,9 +455,9 @@ def _compute(self) -> dict[str, Any]:
 
         entries = sorted(self.entries, key=lambda e: e.composition.reduced_composition)
 
-        el_refs: dict[Element, EntryLike] = {}
-        min_entries: list[EntryLike] = []
-        all_entries: list[EntryLike] = []
+        el_refs: dict[Element, Entry] = {}
+        min_entries: list[Entry] = []
+        all_entries: list[Entry] = []
         for composition, group_iter in itertools.groupby(entries, key=lambda e: e.composition.reduced_composition):
             group = list(group_iter)
             min_entry = min(group, key=lambda e: e.energy_per_atom)
@@ -1436,7 +1436,7 @@ class GrandPotentialPhaseDiagram(PhaseDiagram):
 
     def __init__(
         self,
-        entries: Collection[EntryLike],
+        entries: Collection[Entry],
         chempots: dict[Element, float],
         elements: Collection[Element] | None = None,
         *,
@@ -1447,7 +1447,7 @@ def __init__(
         TODO: update serialization here.
 
         Args:
-            entries (Sequence[EntryLike]): A list of EntryLike objects having an
+            entries (Sequence[Entry]): A list of Entry objects having an
                 energy, energy_per_atom and composition.
             chempots (dict[Element, float]): Specify the chemical potentials
                 of the open elements.
@@ -1518,7 +1518,7 @@ class CompoundPhaseDiagram(PhaseDiagram):
 
     def __init__(
         self,
-        entries: Sequence[EntryLike],
+        entries: Sequence[Entry],
         terminal_compositions: Sequence[Composition],
         normalize_terminal_compositions: bool = True,
     ):
@@ -1573,7 +1573,7 @@ def num2str(num):
         return ret
 
     def transform_entries(
-        self, entries: Sequence[EntryLike], terminal_compositions: Sequence[Composition]
+        self, entries: Sequence[Entry], terminal_compositions: Sequence[Composition]
     ) -> tuple[list[TransformedPDEntry], dict[Composition, DummySpecies]]:
         """
         Method to transform all entries to the composition coordinate in the
@@ -1668,7 +1668,7 @@ class PatchedPhaseDiagram(PhaseDiagram):
 
     def _compute(
         self,
-        entries: Sequence[EntryLike] | set[EntryLike],
+        entries: Sequence[Entry] | set[Entry],
         elements: Sequence[Element] | None = None,
         keep_all_spaces: bool = False,
         verbose: bool = False,
@@ -1677,7 +1677,7 @@ def _compute(
         Compute the phase diagram data for PatchedPhaseDiagram.
 
         Args:
-            entries: A list of EntryLike objects.
+            entries: A list of Entry objects.
             elements: Optional list of elements in the phase diagram.
             keep_all_spaces: Whether to keep chemical spaces that are subspaces of other spaces.
             verbose: Whether to show progress bar during convex hull construction.
@@ -1692,9 +1692,9 @@ def _compute(
 
         entries = sorted(entries, key=lambda e: e.composition.reduced_composition)
 
-        el_refs: dict[Element, EntryLike] = {}
-        min_entries: list[EntryLike] = []
-        all_entries: list[EntryLike] = []
+        el_refs: dict[Element, Entry] = {}
+        min_entries: list[Entry] = []
+        all_entries: list[Entry] = []
         for composition, group_iter in itertools.groupby(entries, key=lambda e: e.composition.reduced_composition):
             group = list(group_iter)
             min_entry = min(group, key=lambda e: e.energy_per_atom)
@@ -1778,7 +1778,7 @@ def _compute(
 
     def __init__(
         self,
-        entries: Sequence[EntryLike] | set[EntryLike],
+        entries: Sequence[Entry] | set[Entry],
         elements: Sequence[Element] | None = None,
         keep_all_spaces: bool = False,
         verbose: bool = False,
@@ -1787,7 +1787,7 @@ def __init__(
     ) -> None:
         """
         Args:
-            entries (Sequence[EntryLike] | set[EntryLike]): A list of EntryLike objects having an
+            entries (Sequence[Entry] | set[Entry]): A list of Entry objects having an
                 energy, energy_per_atom and composition.
             elements (Sequence[Element], optional): Optional list of elements in the phase
                 diagram. If set to None, the elements are determined from
@@ -2205,7 +2205,7 @@ def remove_redundant_spaces(
     # get_decomp_and_phase_separation_energy(),
     # get_phase_separation_energy()
 
-    def get_pd_for_entry(self, entry: EntryLike | Composition) -> PhaseDiagram:
+    def get_pd_for_entry(self, entry: Entry | Composition) -> PhaseDiagram:
         """Get the possible phase diagrams for an entry.
 
         Args: