Add offensive & duel event types for SB, Opta, Wyscout

kloppy/domain/models/event.py

@@ -468,6 +468,8 @@ class DuelType(Enum):
     GROUND = "GROUND"
     LOOSE_BALL = "LOOSE_BALL"
     SLIDING_TACKLE = "SLIDING_TACKLE"
+    OFFENSIVE = "OFFENSIVE"
+    DEFENSIVE = "DEFENSIVE"
 
 
 @dataclass

kloppy/infra/serializers/event/opta/deserializer.py

@@ -133,6 +133,9 @@
 EVENT_QUALIFIER_ASSIST = 210
 EVENT_QUALIFIER_ASSIST_2ND = 218
 
+EVENT_QUALIFIER_DEFENSIVE_DUEL = 285
+EVENT_QUALIFIER_OFFENSIVE_DUEL = 286
+
 EVENT_QUALIFIER_FIRST_YELLOW_CARD = 31
 EVENT_QUALIFIER_SECOND_YELLOW_CARD = 32
 EVENT_QUALIFIER_RED_CARD = 33
@@ -397,6 +400,11 @@ def _parse_duel(
 
     result = DuelResult.WON if outcome else DuelResult.LOST
 
+    if EVENT_QUALIFIER_OFFENSIVE_DUEL in raw_qualifiers:
+        qualifiers.append(DuelQualifier(value=DuelType.OFFENSIVE))
+    elif EVENT_QUALIFIER_DEFENSIVE_DUEL in raw_qualifiers:
+        qualifiers.append(DuelQualifier(value=DuelType.DEFENSIVE))
+
     return dict(
         result=result,
         qualifiers=qualifiers,

kloppy/infra/serializers/event/statsbomb/deserializer.py

@@ -581,6 +581,11 @@ def _parse_duel(
             DuelQualifier(value=DuelType.GROUND),
         ]
 
+    if raw_event["possession_team"]["id"] == raw_event["team"]["id"]:
+        duel_qualifiers.append(DuelQualifier(value=DuelType.OFFENSIVE))
+    else:
+        duel_qualifiers.append(DuelQualifier(value=DuelType.DEFENSIVE))
+
     qualifiers = duel_qualifiers + _get_body_part_qualifiers(duel_dict)
 
     outcome_name = duel_dict.get("outcome", {}).get("name") or duel_dict.get(
@@ -600,6 +605,12 @@ def _parse_aerial_won_duel(raw_event: dict, type_name: str) -> Dict:
         DuelQualifier(value=DuelType.LOOSE_BALL),
         DuelQualifier(value=DuelType.AERIAL),
     ]
+
+    if raw_event["possession_team"]["id"] == raw_event["team"]["id"]:
+        duel_qualifiers.append(DuelQualifier(value=DuelType.OFFENSIVE))
+    else:
+        duel_qualifiers.append(DuelQualifier(value=DuelType.DEFENSIVE))
+
     qualifiers = duel_qualifiers + _get_body_part_qualifiers(aerial_won_dict)
 
     result = DuelResult.WON

kloppy/infra/serializers/event/wyscout/deserializer_v3.py

@@ -303,6 +303,7 @@ def _parse_duel(raw_event: Dict) -> Dict:
     qualifiers = _generic_qualifiers(raw_event)
     duel_qualifiers = []
     secondary_types = raw_event["type"]["secondary"]
+    result = DuelResult.LOST
 
     if "ground_duel" in secondary_types:
         duel_qualifiers.append(DuelQualifier(value=DuelType.GROUND))
@@ -313,6 +314,10 @@ def _parse_duel(raw_event: Dict) -> Dict:
                 DuelQualifier(value=DuelType.AERIAL),
             ]
         )
+        if raw_event["aerialDuel"]["firstTouch"]:
+            result = DuelResult.WON
+        else:
+            result = DuelResult.LOST
     else:
         if (
             "loose_ball_duel" in secondary_types
@@ -340,25 +345,20 @@ def _parse_duel(raw_event: Dict) -> Dict:
                 ]
             )
 
-    qualifiers.extend(duel_qualifiers)
+    if "offensive_duel" in secondary_types:
+        duel_qualifiers.append(DuelQualifier(value=DuelType.OFFENSIVE))
+        if raw_event["groundDuel"]["keptPossession"]:
+            result = DuelResult.WON
+        else:
+            result = DuelResult.LOST
+    elif "defensive_duel" in secondary_types:
+        duel_qualifiers.append(DuelQualifier(value=DuelType.DEFENSIVE))
+        if raw_event["groundDuel"]["recoveredPossession"]:
+            result = DuelResult.WON
+        else:
+            result = DuelResult.LOST
 
-    if (
-        "offensive_duel" in secondary_types
-        and raw_event["groundDuel"]["keptPossession"]
-    ):
-        result = DuelResult.WON
-    elif (
-        "defensive_duel" in secondary_types
-        and raw_event["groundDuel"]["recoveredPossession"]
-    ):
-        result = DuelResult.WON
-    elif (
-        "aerial_duel" in secondary_types
-        and raw_event["aerialDuel"]["firstTouch"]
-    ):
-        result = DuelResult.WON
-    else:
-        result = DuelResult.LOST
+    qualifiers.extend(duel_qualifiers)
 
     return {"result": result, "qualifiers": qualifiers}
 

kloppy/tests/test_opta.py

@@ -158,6 +158,9 @@ def test_correct_deserialization(self, f7_data: str, f24_data: str):
             dataset.events[7].get_qualifier_values(DuelQualifier)[1].value
             == DuelType.AERIAL
         )
+        assert DuelQualifier(value=DuelType.DEFENSIVE) in dataset.events[
+            7
+        ].get_qualifier_values(DuelQualifier)
         assert (
             dataset.events[8].get_qualifier_values(DuelQualifier)[1].value
             == DuelType.GROUND

kloppy/tests/test_statsbomb.py

@@ -157,6 +157,12 @@ def test_correct_deserialization(
             dataset.events[194].get_qualifier_values(DuelQualifier)[1].value
             == DuelType.AERIAL
         )
+        assert DuelQualifier(value=DuelType.DEFENSIVE) in dataset.events[
+            194
+        ].get_qualifier_values(DuelQualifier)
+        assert DuelQualifier(value=DuelType.OFFENSIVE) in dataset.events[
+            195
+        ].get_qualifier_values(DuelQualifier)
         assert (
             dataset.events[307].get_qualifier_values(DuelQualifier)[0].value
             == DuelType.GROUND

kloppy/tests/test_wyscout.py

@@ -46,6 +46,9 @@ def test_correct_v3_deserialization(self, event_v3_data: Path):
             dataset.events[6].get_qualifier_value(DuelQualifier)
             == DuelType.GROUND
         )
+        assert DuelQualifier(value=DuelType.OFFENSIVE) in dataset.events[
+            6
+        ].get_qualifier_values(DuelQualifier)
         assert (
             dataset.events[7].get_qualifier_values(DuelQualifier)[1].value
             == DuelType.AERIAL