merge conflict

Author: UnravelSports [JB]

kloppy/__init__.py

@@ -13,4 +13,4 @@
 #     )
 #     from .domain.services.state_builder import add_state
 
-__version__ = "3.15.0"
+__version__ = "3.16.0"

kloppy/_providers/opta.py

@@ -19,7 +19,7 @@ def load(
 
     Parameters:
         f7_data: F7 xml feed containing the lineup information
-        f24_data: F24 xml feed containing the events
+        f24_data: F24 or F73 xml feed containing the events
         event_types:
         coordinates:
         event_factory:

kloppy/_providers/secondspectrum.py

@@ -1,5 +1,4 @@
 from typing import Optional
-import contextlib
 
 from kloppy.domain import TrackingDataset
 from kloppy.infra.serializers.tracking.secondspectrum import (

kloppy/config.py

@@ -1,15 +1,10 @@
 import os
 from contextlib import contextmanager
 from copy import copy
-from typing import Any, Optional, Union
+from typing import Any, Optional, TypedDict, Union
 
 from kloppy.domain import EventFactory
 
-try:
-    from typing import TypedDict
-except ImportError:
-    from mypy_extensions import TypedDict
-
 try:
     from typing import Literal
 except ImportError:

kloppy/datafactory.py

@@ -1 +1,3 @@
 from ._providers.datafactory import load
+
+__all__ = ["load"]

kloppy/domain/models/common.py

@@ -5,50 +5,45 @@
 from datetime import datetime, timedelta
 from enum import Enum, Flag
 from typing import (
+    Any,
+    Callable,
     Dict,
+    Generic,
+    Iterable,
     List,
+    Literal,
+    NewType,
     Optional,
-    Callable,
-    Union,
-    Any,
     TypeVar,
-    Generic,
-    NewType,
+    Union,
     overload,
-    Iterable,
 )
 
-from .position import PositionType
-
 from ...utils import deprecated, snake_case
-
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
+from .position import PositionType
 
 if sys.version_info >= (3, 11):
     from typing import Self
 else:
     from typing_extensions import Self
 
+from ...exceptions import (
+    InvalidFilterError,
+    KloppyParameterError,
+    OrientationError,
+)
+from .formation import FormationType
 from .pitch import (
-    PitchDimensions,
-    Unit,
     Dimension,
-    NormalizedPitchDimensions,
-    MetricPitchDimensions,
     ImperialPitchDimensions,
+    MetricPitchDimensions,
+    NormalizedPitchDimensions,
     OptaPitchDimensions,
+    PitchDimensions,
+    Unit,
     WyscoutPitchDimensions,
 )
-from .formation import FormationType
-from .time import Time, Period, TimeContainer
-from ...exceptions import (
-    OrientationError,
-    InvalidFilterError,
-    KloppyParameterError,
-)
+from .time import Period, Time, TimeContainer
 
 
 @dataclass
@@ -264,7 +259,10 @@ def get_player_by_jersey_number(self, jersey_no: int):
     def get_player_by_position(self, position: PositionType, time: Time):
         for player in self.players:
             if player.positions.items:
-                player_position = player.positions.value_at(time)
+                try:
+                    player_position = player.positions.value_at(time)
+                except KeyError:  # player that is subbed in later
+                    continue
                 if player_position and player_position == position:
                     return player
 
@@ -928,6 +926,85 @@ class DatasetFlag(Flag):
     BALL_STATE = 2
 
 
+@dataclass
+class Statistic(ABC):
+    name: str = field(init=False)
+
+
+@dataclass
+class ScalarStatistic(Statistic):
+    value: float
+
+
+@dataclass
+class ExpectedGoals(ScalarStatistic):
+    """Expected goals"""
+
+    def __post_init__(self):
+        self.name = "xG"
+
+
+@dataclass
+class PostShotExpectedGoals(ScalarStatistic):
+    """Post-shot expected goals"""
+
+    def __post_init__(self):
+        self.name = "PSxG"
+
+
+@dataclass
+class ActionValue(Statistic):
+    """Action value"""
+
+    name: str
+    action_value_scoring_before: Optional[float] = field(default=None)
+    action_value_scoring_after: Optional[float] = field(default=None)
+    action_value_conceding_before: Optional[float] = field(default=None)
+    action_value_conceding_after: Optional[float] = field(default=None)
+
+    @property
+    def offensive_value(self) -> Optional[float]:
+        return (
+            None
+            if None
+            in (
+                self.action_value_scoring_before,
+                self.action_value_scoring_after,
+            )
+            else self.action_value_scoring_after
+            - self.action_value_scoring_before
+        )
+
+    @property
+    def defensive_value(self) -> Optional[float]:
+        return (
+            None
+            if None
+            in (
+                self.action_value_conceding_before,
+                self.action_value_conceding_after,
+            )
+            else self.action_value_conceding_after
+            - self.action_value_conceding_before
+        )
+
+    @property
+    def value(self) -> Optional[float]:
+        if None in (
+            self.action_value_scoring_before,
+            self.action_value_scoring_after,
+            self.action_value_conceding_before,
+            self.action_value_conceding_after,
+        ):
+            return None
+        return (
+            self.action_value_scoring_after - self.action_value_scoring_before
+        ) - (
+            self.action_value_conceding_after
+            - self.action_value_conceding_before
+        )
+
+
 @dataclass
 class DataRecord(ABC):
     """
@@ -945,6 +1022,7 @@ class DataRecord(ABC):
     next_record: Optional["DataRecord"] = field(init=False)
     period: Period
     timestamp: timedelta
+    statistics: List[Statistic]
     ball_owning_team: Optional[Team]
     ball_state: Optional[BallState]
 
@@ -1118,6 +1196,7 @@ def _init_player_positions(self):
         start_of_match = self.metadata.periods[0].start_time
         for team in self.metadata.teams:
             for player in team.players:
+                player.positions.reset()
                 if player.starting:
                     player.set_position(
                         start_of_match,

kloppy/domain/models/event.py

@@ -1066,12 +1066,22 @@ def _update_formations_and_positions(self):
         """Update team formations and player positions based on Substitution and TacticalShift events."""
         max_leeway = timedelta(seconds=60)
 
+        for team in self.metadata.teams:
+            team.formations.reset()
+
         for event in self.events:
             if isinstance(event, SubstitutionEvent):
+                if event.replacement_player.starting_position:
+                    replacement_player_position = (
+                        event.replacement_player.starting_position
+                    )
+                else:
+                    replacement_player_position = event.player.positions.last(
+                        default=PositionType.Unknown
+                    )
                 event.replacement_player.set_position(
                     event.time,
-                    event.replacement_player.starting_position
-                    or event.player.positions.last(default=None),
+                    replacement_player_position,
                 )
                 event.player.set_position(event.time, None)
 

kloppy/domain/models/formation.py

@@ -81,6 +81,7 @@ class FormationType(Enum):
     FIVE_TWO_TWO_ONE = "5-2-2-1"
     FIVE_THREE_TWO = "5-3-2"
     FIVE_FOUR_ONE = "5-4-1"
+    UNKNOWN = "Unknown"
 
     def __str__(self):
         return self.value

kloppy/domain/models/time.py

@@ -1,15 +1,14 @@
 from dataclasses import dataclass, field
-from datetime import timedelta, datetime
+from datetime import datetime, timedelta
 from typing import (
-    overload,
-    Union,
-    Optional,
-    TypeVar,
     Generic,
     List,
-    Tuple,
-    NamedTuple,
     Literal,
+    Optional,
+    Tuple,
+    TypeVar,
+    Union,
+    overload,
 )
 
 from sortedcontainers import SortedDict
@@ -273,3 +272,7 @@ def __repr__(self):
         item_type = type(self.items.values()[0]).__name__
         str_items = {str(key): value for key, value in self.items.items()}
         return f"TimeContainer[{item_type}]({str_items})"
+
+    def reset(self):
+        """Clears all items from the container."""
+        self.items.clear()

kloppy/domain/services/__init__.py

@@ -2,8 +2,8 @@
 
 from kloppy.domain import AttackingDirection, Frame, Ground
 
-from .transformers import DatasetTransformer, DatasetTransformerBuilder
 from .event_factory import EventFactory, create_event
+from .transformers import DatasetTransformer, DatasetTransformerBuilder
 
 # NOT YET: from .enrichers import TrackingPossessionEnricher
 
@@ -35,3 +35,12 @@ def attacking_direction_from_frame(frame: Frame) -> AttackingDirection:
         return AttackingDirection.LTR
     else:
         return AttackingDirection.RTL
+
+
+__all__ = [
+    "DatasetTransformer",
+    "DatasetTransformerBuilder",
+    "EventFactory",
+    "create_event",
+    "attacking_direction_from_frame",
+]