valanga 0.1.5__py3-none-any.whl → 0.1.6__py3-none-any.whl

valanga/evaluations.py

@@ -5,6 +5,8 @@ Evaluation-related classes and types.
 from dataclasses import dataclass
 from typing import Protocol
 
+from valanga.evaluator_types import EvaluatorInput
+
 from .game import BranchKey, State
 from .over_event import OverEvent
 from .represention_for_evaluation import ContentRepresentation
@@ -22,7 +24,9 @@ class EvalItem[StateT: State](Protocol):
         ...
 
     @property
-    def state_representation(self) -> ContentRepresentation | None:
+    def state_representation(
+        self,
+    ) -> ContentRepresentation[StateT, EvaluatorInput] | None:
         """The representation of the state associated with this evaluation item, if available."""
         ...
 

valanga/representation_factory.py

@@ -1,76 +1,50 @@
 """
-Factory class for creating state representations.
+Factory for creating content representations from game states and state modifications.
 """
 
 from dataclasses import dataclass
-from typing import Protocol
+from typing import Callable, TypeVar
 
 from .game import State, StateModifications
 from .represention_for_evaluation import ContentRepresentation
 
+StateT = TypeVar("StateT", bound=State)
+EvalIn = TypeVar("EvalIn")
 
-class CreateFromState[StateT: State, RepT: ContentRepresentation](Protocol):
-    """
-    Protocol for creating a state representation from a state.
-    """
-
-    def __call__(self, state: StateT) -> RepT: ...
-
-
-class CreateFromStateAndModifications[StateT: State, RepT: ContentRepresentation](
-    Protocol
-):
-    """
-    Protocol for creating a state representation from a state and modifications.
-    """
-
-    def __call__(
-        self,
-        state: StateT,
-        state_modifications: StateModifications,
-        previous_state_representation: RepT,
-    ) -> RepT: ...
+CreateFromState = Callable[[StateT], ContentRepresentation[StateT, EvalIn]]
+CreateFromStateAndMods = Callable[
+    [StateT, StateModifications, ContentRepresentation[StateT, EvalIn]],
+    ContentRepresentation[StateT, EvalIn],
+]
 
 
 @dataclass
-class RepresentationFactory[StateT: State, RepT: ContentRepresentation]:
-    """
-    Factory class for creating state representations.
+class RepresentationFactory[StateT: State, EvalIn]:
+    """Factory for creating content representations from states and state modifications.
+    Attributes:
+        create_from_state: Function to create a content representation from a state.
+        create_from_state_and_modifications: Function to create a content representation from a state and state modifications.
     """
 
-    create_from_state: CreateFromState[StateT, RepT]
-    create_from_state_and_modifications: CreateFromStateAndModifications[StateT, RepT]
+    create_from_state: CreateFromState[StateT, EvalIn]
+    create_from_state_and_modifications: CreateFromStateAndMods[StateT, EvalIn]
 
     def create_from_transition(
         self,
         state: StateT,
-        previous_state_representation: RepT | None,
+        previous_state_representation: ContentRepresentation[StateT, EvalIn] | None,
         modifications: StateModifications | None,
-    ) -> RepT:
-        """
-        Create a Generic T_StateRepresentation object from a transition.
-
+    ) -> ContentRepresentation[StateT, EvalIn]:
+        """Creates a content representation from a state transition.
         Args:
-            state (State): The current state of the game.
-            previous_state_representation (Representation364 | None): The representation of the previous state. None if this is the root node.
-            modifications (StateModifications | None): The modifications from the parent state to the current state. None if this is the root node.
-
+            state: The current state of the game.
+            previous_state_representation: The content representation of the previous state, or None if not available.
+            modifications: The modifications applied to the previous state to reach the current state, or None if not available.
         Returns:
-            T_StateRepresentation: The created (Generic) Representation object
-
-        This version is supposed to be faster as it only modifies the previous state
-        representation with the last modification
+            ContentRepresentation[StateT, EvalIn]: The content representation of the current state.
         """
-        if previous_state_representation is None:  # this is the root_node
-            representation = self.create_from_state(state=state)
-        else:
-            if modifications is None:
-                representation = self.create_from_state(state=state)
-            else:
-                representation = self.create_from_state_and_modifications(
-                    state=state,
-                    state_modifications=modifications,
-                    previous_state_representation=previous_state_representation,
-                )
-
-        return representation
+        if previous_state_representation is None or modifications is None:
+            return self.create_from_state(state)
+        return self.create_from_state_and_modifications(
+            state, modifications, previous_state_representation
+        )

valanga/represention_for_evaluation.py

@@ -2,21 +2,26 @@
 Contains the definition of the ContentRepresentation protocol for content representations used in evaluations.
 """
 
-from typing import Any, Protocol, TypeVar
+from typing import Protocol, TypeVar
+
+from valanga.evaluator_types import EvaluatorInput
 
-from .evaluator_types import EvaluatorInput
 from .game import State
 
-StateT_contra = TypeVar("StateT_contra", bound=State, contravariant=True, default=Any)
+StateT_contra = TypeVar("StateT_contra", bound=State, contravariant=True, default=State)
+
+EvalIn_co = TypeVar(
+    "EvalIn_co", covariant=True, bound=EvaluatorInput, default=EvaluatorInput
+)
 
 
-class ContentRepresentation(Protocol[StateT_contra]):
+class ContentRepresentation[StateT_contra, EvalIn_co](Protocol):
     """
     Protocol defining the interface for a content representation.
     It is a function returning the proper input for evaluation by the content evaluator.
     """
 
-    def get_evaluator_input(self, state: StateT_contra) -> EvaluatorInput:
+    def get_evaluator_input(self, state: StateT_contra) -> EvalIn_co:
         """
         Returns the evaluator input tensor for the content. Content representations have generally a compressed view and complemetary view of state info so to avoid redundancy and have all the necessary info we also give the state as input.
 
@@ -26,3 +31,4 @@ class ContentRepresentation(Protocol[StateT_contra]):
         Returns:
             The evaluator input tensor.
         """
+        ...

{valanga-0.1.5.dist-info → valanga-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valanga
-Version: 0.1.5
+Version: 0.1.6
 Summary: Shared types and utilities for evaluation
 Author-email: Victor Gabillon <victorgabillon@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{valanga-0.1.5.dist-info → valanga-0.1.6.dist-info}/RECORD

@@ -1,15 +1,15 @@
 valanga/__init__.py,sha256=EFoB5P_lGQCXM1tLTc9ZvO5mt_Ui_MXStEpcPwptwd8,945
-valanga/evaluations.py,sha256=Csy6z_npeHA5ipUYCR1QVHazvLGIq3StZ6mRv2Bpqxk,1370
+valanga/evaluations.py,sha256=kGq8oU6cV-dlMvX_lSU_AAAWCXlvEGhsXdRt_CmuYvc,1461
 valanga/evaluator_types.py,sha256=dRNY297Up2BSIM2557jy6cz0cINzfUHOpqkr1T6SSQM,344
 valanga/game.py,sha256=7vFLJL0AhG9EqG_Po0hpyFU685YVMWnKYXn-QR2yiOo,6086
 valanga/over_event.py,sha256=jUqN3CXq3e55TvDZatZKFlEOzJfho7M1Zr7VjZUhP6M,7908
 valanga/policy.py,sha256=TkqcOSePRhHqtuoMbCKe5qZbizvF5H9uG1_oEcIZsuA,1229
 valanga/progress_messsage.py,sha256=3LnOXSgyU84UkwcpsakcbPt_d3el2ojRSUClAwoPyEk,361
 valanga/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-valanga/representation_factory.py,sha256=zTZEo_sfUYY6fnMHU1U_ToWIIpvXVCs707JKDH2cEKw,2556
-valanga/represention_for_evaluation.py,sha256=4ZJhcmAcEAB2CkED9blu6RX3sY5LgVxHJ0p40Sujwn8,1010
-valanga-0.1.5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-valanga-0.1.5.dist-info/METADATA,sha256=7ZrF2SDwCyuXDXDTx98w8oLAmoLwx1vQpulXTxXVxQw,44645
-valanga-0.1.5.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-valanga-0.1.5.dist-info/top_level.txt,sha256=cKFLhxKDTqygHnc0xc_L8jDx6oNu5hSHqZ4UExU4xPo,8
-valanga-0.1.5.dist-info/RECORD,,
+valanga/representation_factory.py,sha256=w1RKwuDec-imp5NmB3rg-e5iiuEScbHCX8tnBeXeVgQ,2117
+valanga/represention_for_evaluation.py,sha256=9yCCOuN-h9FnoLJrffKGQ-oXiiXzZT3rP4e5wwMYfys,1135
+valanga-0.1.6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+valanga-0.1.6.dist-info/METADATA,sha256=cMwv58HEFZHTEmRujAzCRcnU0uL24voleiQV7OVCZDE,44645
+valanga-0.1.6.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+valanga-0.1.6.dist-info/top_level.txt,sha256=cKFLhxKDTqygHnc0xc_L8jDx6oNu5hSHqZ4UExU4xPo,8
+valanga-0.1.6.dist-info/RECORD,,