Merge pull request #347 from my-game-plan/feature/wyscout-shot-assist

[Wyscout V3] add shot assist qualifier
PySport · Oct 25, 2024 · f542462 · f542462
2 parents 2895ae7 + c0e5206
commit f542462
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/kloppy/infra/serializers/event/wyscout/deserializer_v3.py b/kloppy/infra/serializers/event/wyscout/deserializer_v3.py
@@ -166,14 +166,20 @@ def _check_secondary_event_types(
 def _pass_qualifiers(raw_event) -> List[Qualifier]:
     qualifiers = _generic_qualifiers(raw_event)
 
-    if _check_secondary_event_types(raw_event, ["cross", "cross_blocked"]):
-        qualifiers.append(PassQualifier(PassType.CROSS))
-    elif _check_secondary_event_types(raw_event, ["hand_pass"]):
-        qualifiers.append(PassQualifier(PassType.HAND_PASS))
-    elif _check_secondary_event_types(raw_event, ["head_pass"]):
-        qualifiers.append(PassQualifier(PassType.HEAD_PASS))
-    elif _check_secondary_event_types(raw_event, ["smart_pass"]):
-        qualifiers.append(PassQualifier(PassType.SMART_PASS))
+    qualifier_mapping = {
+        PassType.CROSS: ["cross", "cross_blocked"],
+        PassType.HAND_PASS: ["hand_pass"],
+        PassType.HEAD_PASS: ["head_pass"],
+        PassType.SMART_PASS: ["smart_pass"],
+        PassType.SHOT_ASSIST: ["shot_assist"],
+        PassType.ASSIST: ["assist"],
+    }
+
+    for pass_type, secondary_event_types_values in qualifier_mapping.items():
+        if _check_secondary_event_types(
+            raw_event, secondary_event_types_values
+        ):
+            qualifiers.append(PassQualifier(pass_type))
 
     return qualifiers
 

diff --git a/kloppy/tests/files/wyscout_events_v3.json b/kloppy/tests/files/wyscout_events_v3.json
@@ -280,7 +280,8 @@
         "primary": "pass",
         "secondary": [
           "lateral_pass",
-          "short_or_medium_pass"
+          "short_or_medium_pass",
+          "shot_assist"
         ]
       },
       "videoTimestamp": "6.417876"

diff --git a/kloppy/tests/test_wyscout.py b/kloppy/tests/test_wyscout.py
@@ -21,6 +21,8 @@
     PassResult,
     FormationType,
     Time,
+    PassType,
+    PassQualifier,
 )
 
 from kloppy import wyscout
@@ -262,6 +264,13 @@ def test_goalkeeper_event(self, dataset: EventDataset):
             == GoalkeeperActionType.SAVE
         )
 
+    def test_shot_assist_event(self, dataset: EventDataset):
+        shot_assist_event = dataset.get_event_by_id(663291837)
+        assert shot_assist_event.event_type == EventType.PASS
+        assert PassType.SHOT_ASSIST in shot_assist_event.get_qualifier_values(
+            PassQualifier
+        )
+
     def test_shot_event(self, dataset: EventDataset):
         shot_event = dataset.get_event_by_id(663291840)
         assert shot_event.event_type == EventType.SHOT