Add pocket angle features

Reviewed-on: #57
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>

rbproto/python/shot_pb2.py

@@ -13,13 +13,15 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nshot.proto\x12\x0fserialized_shot\"?\n\x03\x42ox\x12\x0c\n\x04left\x18\x01 \x01(\x02\x12\x0b\n\x03top\x18\x02 \x01(\x02\x12\r\n\x05width\x18\x03 \x01(\x02\x12\x0e\n\x06height\x18\x04 \x01(\x02\"\x1d\n\x05Point\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\"\x7f\n\rBallDetection\x12.\n\x0eplane_position\x18\x01 \x01(\x0b\x32\x16.serialized_shot.Point\x12(\n\nannotation\x18\x02 \x01(\x0b\x32\x14.serialized_shot.Box\x12\x14\n\x0cinterpolated\x18\x03 \x01(\x08\"T\n\x10RLEBallDetection\x12\x31\n\tdetection\x18\x01 \x01(\x0b\x32\x1e.serialized_shot.BallDetection\x12\r\n\x05\x63ount\x18\x02 \x01(\r\"L\n\x13RLEDetectionHistory\x12\x35\n\ndetections\x18\x01 \x03(\x0b\x32!.serialized_shot.RLEBallDetection\"F\n\x10\x44\x65tectionHistory\x12\x32\n\ndetections\x18\x01 \x03(\x0b\x32\x1e.serialized_shot.BallDetection\"\xe6\x01\n\x04Path\x12\x13\n\x0bstart_frame\x18\x01 \x01(\r\x12\x11\n\tend_frame\x18\x02 \x01(\r\x12\x37\n\ndetections\x18\x03 \x01(\x0b\x32!.serialized_shot.DetectionHistoryH\x00\x12>\n\x0erle_detections\x18\x04 \x01(\x0b\x32$.serialized_shot.RLEDetectionHistoryH\x00\x12\x15\n\x0bnot_present\x18\x05 \x01(\x08H\x00\x12\x11\n\tis_static\x18\x06 \x01(\x08\x42\x13\n\x11\x64\x65tection_history\"R\n\x11IdentifierHistory\x12\x17\n\x0f\x62\x61ll_identifier\x18\x01 \x01(\r\x12$\n\x05paths\x18\x02 \x03(\x0b\x32\x15.serialized_shot.Path\"H\n\x04Shot\x12@\n\x14identifier_histories\x18\x03 \x03(\x0b\x32\".serialized_shot.IdentifierHistoryb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nshot.proto\x12\x0fserialized_shot\"?\n\x03\x42ox\x12\x0c\n\x04left\x18\x01 \x01(\x02\x12\x0b\n\x03top\x18\x02 \x01(\x02\x12\r\n\x05width\x18\x03 \x01(\x02\x12\x0e\n\x06height\x18\x04 \x01(\x02\"\x1d\n\x05Point\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\"\x7f\n\rBallDetection\x12.\n\x0eplane_position\x18\x01 \x01(\x0b\x32\x16.serialized_shot.Point\x12(\n\nannotation\x18\x02 \x01(\x0b\x32\x14.serialized_shot.Box\x12\x14\n\x0cinterpolated\x18\x03 \x01(\x08\"T\n\x10RLEBallDetection\x12\x31\n\tdetection\x18\x01 \x01(\x0b\x32\x1e.serialized_shot.BallDetection\x12\r\n\x05\x63ount\x18\x02 \x01(\r\"L\n\x13RLEDetectionHistory\x12\x35\n\ndetections\x18\x01 \x03(\x0b\x32!.serialized_shot.RLEBallDetection\"F\n\x10\x44\x65tectionHistory\x12\x32\n\ndetections\x18\x01 \x03(\x0b\x32\x1e.serialized_shot.BallDetection\"\xfc\x01\n\rCollisionInfo\x12\x0e\n\x06source\x18\x01 \x01(\r\x12M\n\x10\x62\x61ll_identifiers\x18\x02 \x03(\x0b\x32\x33.serialized_shot.CollisionInfo.BallIdentifiersEntry\x12\x17\n\x0fwall_identifier\x18\x03 \x01(\r\x12\x13\n\x0b\x66rame_index\x18\x04 \x01(\r\x12\x0e\n\x06static\x18\x05 \x01(\x08\x1aN\n\x14\x42\x61llIdentifiersEntry\x12\x0b\n\x03key\x18\x01 \x01(\r\x12%\n\x05value\x18\x02 \x01(\x0b\x32\x16.serialized_shot.Point:\x02\x38\x01\"\xcc\x02\n\x04Path\x12\x13\n\x0bstart_frame\x18\x01 \x01(\r\x12\x11\n\tend_frame\x18\x02 \x01(\r\x12\x37\n\ndetections\x18\x03 \x01(\x0b\x32!.serialized_shot.DetectionHistoryH\x00\x12>\n\x0erle_detections\x18\x04 \x01(\x0b\x32$.serialized_shot.RLEDetectionHistoryH\x00\x12\x15\n\x0bnot_present\x18\x05 \x01(\x08H\x00\x12\x11\n\tis_static\x18\x06 \x01(\x08\x12\x32\n\nstart_info\x18\x07 \x01(\x0b\x32\x1e.serialized_shot.CollisionInfo\x12\x30\n\x08\x65nd_info\x18\x08 \x01(\x0b\x32\x1e.serialized_shot.CollisionInfoB\x13\n\x11\x64\x65tection_history\"R\n\x11IdentifierHistory\x12\x17\n\x0f\x62\x61ll_identifier\x18\x01 \x01(\r\x12$\n\x05paths\x18\x02 \x03(\x0b\x32\x15.serialized_shot.Path\"j\n\x12KeyBallIdentifiers\x12\x10\n\x08\x63ue_ball\x18\x01 \x01(\r\x12\x13\n\x0bobject_ball\x18\x02 \x01(\r\x12\x13\n\x0btarget_ball\x18\x03 \x01(\r\x12\x18\n\x10\x63ontact_sequence\x18\x04 \x03(\r\"\xa8\x01\n\x04Shot\x12@\n\x14identifier_histories\x18\x03 \x03(\x0b\x32\".serialized_shot.IdentifierHistory\x12\x36\n\tkey_balls\x18\x04 \x01(\x0b\x32#.serialized_shot.KeyBallIdentifiers\x12\x13\n\x0bstart_index\x18\x05 \x01(\r\x12\x11\n\tend_index\x18\x06 \x01(\rb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'shot_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
+  _globals['_COLLISIONINFO_BALLIDENTIFIERSENTRY']._options = None
+  _globals['_COLLISIONINFO_BALLIDENTIFIERSENTRY']._serialized_options = b'8\001'
   _globals['_BOX']._serialized_start=31
   _globals['_BOX']._serialized_end=94
   _globals['_POINT']._serialized_start=96
@@ -32,10 +34,16 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_RLEDETECTIONHISTORY']._serialized_end=418
   _globals['_DETECTIONHISTORY']._serialized_start=420
   _globals['_DETECTIONHISTORY']._serialized_end=490
-  _globals['_PATH']._serialized_start=493
-  _globals['_PATH']._serialized_end=723
-  _globals['_IDENTIFIERHISTORY']._serialized_start=725
-  _globals['_IDENTIFIERHISTORY']._serialized_end=807
-  _globals['_SHOT']._serialized_start=809
-  _globals['_SHOT']._serialized_end=881
+  _globals['_COLLISIONINFO']._serialized_start=493
+  _globals['_COLLISIONINFO']._serialized_end=745
+  _globals['_COLLISIONINFO_BALLIDENTIFIERSENTRY']._serialized_start=667
+  _globals['_COLLISIONINFO_BALLIDENTIFIERSENTRY']._serialized_end=745
+  _globals['_PATH']._serialized_start=748
+  _globals['_PATH']._serialized_end=1080
+  _globals['_IDENTIFIERHISTORY']._serialized_start=1082
+  _globals['_IDENTIFIERHISTORY']._serialized_end=1164
+  _globals['_KEYBALLIDENTIFIERS']._serialized_start=1166
+  _globals['_KEYBALLIDENTIFIERS']._serialized_end=1272
+  _globals['_SHOT']._serialized_start=1275
+  _globals['_SHOT']._serialized_end=1443
 # @@protoc_insertion_point(module_scope)

rbproto/python/shot_pb2.pyi

@@ -55,21 +55,46 @@ class DetectionHistory(_message.Message):
     detections: _containers.RepeatedCompositeFieldContainer[BallDetection]
     def __init__(self, detections: _Optional[_Iterable[_Union[BallDetection, _Mapping]]] = ...) -> None: ...
 
+class CollisionInfo(_message.Message):
+    __slots__ = ["source", "ball_identifiers", "wall_identifier", "frame_index", "static"]
+    class BallIdentifiersEntry(_message.Message):
+        __slots__ = ["key", "value"]
+        KEY_FIELD_NUMBER: _ClassVar[int]
+        VALUE_FIELD_NUMBER: _ClassVar[int]
+        key: int
+        value: Point
+        def __init__(self, key: _Optional[int] = ..., value: _Optional[_Union[Point, _Mapping]] = ...) -> None: ...
+    SOURCE_FIELD_NUMBER: _ClassVar[int]
+    BALL_IDENTIFIERS_FIELD_NUMBER: _ClassVar[int]
+    WALL_IDENTIFIER_FIELD_NUMBER: _ClassVar[int]
+    FRAME_INDEX_FIELD_NUMBER: _ClassVar[int]
+    STATIC_FIELD_NUMBER: _ClassVar[int]
+    source: int
+    ball_identifiers: _containers.MessageMap[int, Point]
+    wall_identifier: int
+    frame_index: int
+    static: bool
+    def __init__(self, source: _Optional[int] = ..., ball_identifiers: _Optional[_Mapping[int, Point]] = ..., wall_identifier: _Optional[int] = ..., frame_index: _Optional[int] = ..., static: bool = ...) -> None: ...
+
 class Path(_message.Message):
-    __slots__ = ["start_frame", "end_frame", "detections", "rle_detections", "not_present", "is_static"]
+    __slots__ = ["start_frame", "end_frame", "detections", "rle_detections", "not_present", "is_static", "start_info", "end_info"]
     START_FRAME_FIELD_NUMBER: _ClassVar[int]
     END_FRAME_FIELD_NUMBER: _ClassVar[int]
     DETECTIONS_FIELD_NUMBER: _ClassVar[int]
     RLE_DETECTIONS_FIELD_NUMBER: _ClassVar[int]
     NOT_PRESENT_FIELD_NUMBER: _ClassVar[int]
     IS_STATIC_FIELD_NUMBER: _ClassVar[int]
+    START_INFO_FIELD_NUMBER: _ClassVar[int]
+    END_INFO_FIELD_NUMBER: _ClassVar[int]
     start_frame: int
     end_frame: int
     detections: DetectionHistory
     rle_detections: RLEDetectionHistory
     not_present: bool
     is_static: bool
-    def __init__(self, start_frame: _Optional[int] = ..., end_frame: _Optional[int] = ..., detections: _Optional[_Union[DetectionHistory, _Mapping]] = ..., rle_detections: _Optional[_Union[RLEDetectionHistory, _Mapping]] = ..., not_present: bool = ..., is_static: bool = ...) -> None: ...
+    start_info: CollisionInfo
+    end_info: CollisionInfo
+    def __init__(self, start_frame: _Optional[int] = ..., end_frame: _Optional[int] = ..., detections: _Optional[_Union[DetectionHistory, _Mapping]] = ..., rle_detections: _Optional[_Union[RLEDetectionHistory, _Mapping]] = ..., not_present: bool = ..., is_static: bool = ..., start_info: _Optional[_Union[CollisionInfo, _Mapping]] = ..., end_info: _Optional[_Union[CollisionInfo, _Mapping]] = ...) -> None: ...
 
 class IdentifierHistory(_message.Message):
     __slots__ = ["ball_identifier", "paths"]
@@ -79,8 +104,26 @@ class IdentifierHistory(_message.Message):
     paths: _containers.RepeatedCompositeFieldContainer[Path]
     def __init__(self, ball_identifier: _Optional[int] = ..., paths: _Optional[_Iterable[_Union[Path, _Mapping]]] = ...) -> None: ...
 
+class KeyBallIdentifiers(_message.Message):
+    __slots__ = ["cue_ball", "object_ball", "target_ball", "contact_sequence"]
+    CUE_BALL_FIELD_NUMBER: _ClassVar[int]
+    OBJECT_BALL_FIELD_NUMBER: _ClassVar[int]
+    TARGET_BALL_FIELD_NUMBER: _ClassVar[int]
+    CONTACT_SEQUENCE_FIELD_NUMBER: _ClassVar[int]
+    cue_ball: int
+    object_ball: int
+    target_ball: int
+    contact_sequence: _containers.RepeatedScalarFieldContainer[int]
+    def __init__(self, cue_ball: _Optional[int] = ..., object_ball: _Optional[int] = ..., target_ball: _Optional[int] = ..., contact_sequence: _Optional[_Iterable[int]] = ...) -> None: ...
+
 class Shot(_message.Message):
-    __slots__ = ["identifier_histories"]
+    __slots__ = ["identifier_histories", "key_balls", "start_index", "end_index"]
     IDENTIFIER_HISTORIES_FIELD_NUMBER: _ClassVar[int]
+    KEY_BALLS_FIELD_NUMBER: _ClassVar[int]
+    START_INDEX_FIELD_NUMBER: _ClassVar[int]
+    END_INDEX_FIELD_NUMBER: _ClassVar[int]
     identifier_histories: _containers.RepeatedCompositeFieldContainer[IdentifierHistory]
-    def __init__(self, identifier_histories: _Optional[_Iterable[_Union[IdentifierHistory, _Mapping]]] = ...) -> None: ...
+    key_balls: KeyBallIdentifiers
+    start_index: int
+    end_index: int
+    def __init__(self, identifier_histories: _Optional[_Iterable[_Union[IdentifierHistory, _Mapping]]] = ..., key_balls: _Optional[_Union[KeyBallIdentifiers, _Mapping]] = ..., start_index: _Optional[int] = ..., end_index: _Optional[int] = ...) -> None: ...

rbproto/shot.proto

@@ -3,10 +3,10 @@ syntax = "proto3";
 package serialized_shot;
 
 message Box {
-	float left = 1;
-	float top = 2;
-	float width = 3;
-	float height = 4;
+  float left = 1;
+  float top = 2;
+  float width = 3;
+  float height = 4;
 }
 
 message Point {
@@ -15,40 +15,59 @@ message Point {
 }
 
 message BallDetection {
-	Point plane_position = 1;
-	Box annotation = 2;
-	bool interpolated = 3;
+  Point plane_position = 1;
+  Box annotation = 2;
+  bool interpolated = 3;
 }
 
 message RLEBallDetection {
-	BallDetection detection = 1;
-	uint32 count = 2;
+  BallDetection detection = 1;
+  uint32 count = 2;
 }
 
-message RLEDetectionHistory {
-  repeated RLEBallDetection detections = 1;
-}
+message RLEDetectionHistory { repeated RLEBallDetection detections = 1; }
 
-message DetectionHistory {
-  repeated BallDetection detections = 1;
+message DetectionHistory { repeated BallDetection detections = 1; }
+
+message CollisionInfo {
+  uint32 source = 1;
+  map<uint32, Point> ball_identifiers = 2;
+  uint32 wall_identifier = 3;
+  uint32 frame_index = 4;
+  bool static = 5;
 }
 
 message Path {
   uint32 start_frame = 1;
   uint32 end_frame = 2;
   oneof detection_history {
-	DetectionHistory detections = 3;
-	RLEDetectionHistory rle_detections = 4;
-	bool not_present = 5;
+    DetectionHistory detections = 3;
+    RLEDetectionHistory rle_detections = 4;
+    bool not_present = 5;
   }
   bool is_static = 6;
+  CollisionInfo start_info = 7;
+  CollisionInfo end_info = 8;
 }
 
 message IdentifierHistory {
   uint32 ball_identifier = 1;
   repeated Path paths = 2;
 }
+message KeyBallIdentifiers {
+  uint32 cue_ball = 1;
+  uint32 object_ball = 2;
+  uint32 target_ball = 3;
+
+  // For now this will just be cue->object/target->target
+  // Long term this will potentially represent a linked list
+  // of all balls in a shot.
+  repeated uint32 contact_sequence = 4;
+}
 
 message Shot {
   repeated IdentifierHistory identifier_histories = 3;
+  KeyBallIdentifiers key_balls = 4;
+  uint32 start_index = 5;
+  uint32 end_index = 6;
 }

rbproto/ts/shot.ts

@@ -427,6 +427,150 @@ function _decodeDetectionHistory(bb: ByteBuffer): DetectionHistory {
   return message;
 }
 
+export interface CollisionInfo {
+  source?: number;
+  ball_identifiers?: { [key: number]: Point };
+  wall_identifier?: number;
+  frame_index?: number;
+  static?: boolean;
+}
+
+export function encodeCollisionInfo(message: CollisionInfo): Uint8Array {
+  let bb = popByteBuffer();
+  _encodeCollisionInfo(message, bb);
+  return toUint8Array(bb);
+}
+
+function _encodeCollisionInfo(message: CollisionInfo, bb: ByteBuffer): void {
+  // optional uint32 source = 1;
+  let $source = message.source;
+  if ($source !== undefined) {
+    writeVarint32(bb, 8);
+    writeVarint32(bb, $source);
+  }
+
+  // optional map<uint32, Point> ball_identifiers = 2;
+  let map$ball_identifiers = message.ball_identifiers;
+  if (map$ball_identifiers !== undefined) {
+    for (let key in map$ball_identifiers) {
+      let nested = popByteBuffer();
+      let value = map$ball_identifiers[key];
+      writeVarint32(nested, 8);
+      writeVarint32(nested, +key);
+      writeVarint32(nested, 18);
+      let nestedValue = popByteBuffer();
+      _encodePoint(value, nestedValue);
+      writeVarint32(nested, nestedValue.limit);
+      writeByteBuffer(nested, nestedValue);
+      pushByteBuffer(nestedValue);
+      writeVarint32(bb, 18);
+      writeVarint32(bb, nested.offset);
+      writeByteBuffer(bb, nested);
+      pushByteBuffer(nested);
+    }
+  }
+
+  // optional uint32 wall_identifier = 3;
+  let $wall_identifier = message.wall_identifier;
+  if ($wall_identifier !== undefined) {
+    writeVarint32(bb, 24);
+    writeVarint32(bb, $wall_identifier);
+  }
+
+  // optional uint32 frame_index = 4;
+  let $frame_index = message.frame_index;
+  if ($frame_index !== undefined) {
+    writeVarint32(bb, 32);
+    writeVarint32(bb, $frame_index);
+  }
+
+  // optional bool static = 5;
+  let $static = message.static;
+  if ($static !== undefined) {
+    writeVarint32(bb, 40);
+    writeByte(bb, $static ? 1 : 0);
+  }
+}
+
+export function decodeCollisionInfo(binary: Uint8Array): CollisionInfo {
+  return _decodeCollisionInfo(wrapByteBuffer(binary));
+}
+
+function _decodeCollisionInfo(bb: ByteBuffer): CollisionInfo {
+  let message: CollisionInfo = {} as any;
+
+  end_of_message: while (!isAtEnd(bb)) {
+    let tag = readVarint32(bb);
+
+    switch (tag >>> 3) {
+      case 0:
+        break end_of_message;
+
+      // optional uint32 source = 1;
+      case 1: {
+        message.source = readVarint32(bb) >>> 0;
+        break;
+      }
+
+      // optional map<uint32, Point> ball_identifiers = 2;
+      case 2: {
+        let values =
+          message.ball_identifiers || (message.ball_identifiers = {});
+        let outerLimit = pushTemporaryLength(bb);
+        let key: number | undefined;
+        let value: Point | undefined;
+        end_of_entry: while (!isAtEnd(bb)) {
+          let tag = readVarint32(bb);
+          switch (tag >>> 3) {
+            case 0:
+              break end_of_entry;
+            case 1: {
+              key = readVarint32(bb) >>> 0;
+              break;
+            }
+            case 2: {
+              let valueLimit = pushTemporaryLength(bb);
+              value = _decodePoint(bb);
+              bb.limit = valueLimit;
+              break;
+            }
+            default:
+              skipUnknownField(bb, tag & 7);
+          }
+        }
+        if (key === undefined || value === undefined)
+          throw new Error("Invalid data for map: ball_identifiers");
+        values[key] = value;
+        bb.limit = outerLimit;
+        break;
+      }
+
+      // optional uint32 wall_identifier = 3;
+      case 3: {
+        message.wall_identifier = readVarint32(bb) >>> 0;
+        break;
+      }
+
+      // optional uint32 frame_index = 4;
+      case 4: {
+        message.frame_index = readVarint32(bb) >>> 0;
+        break;
+      }
+
+      // optional bool static = 5;
+      case 5: {
+        message.static = !!readByte(bb);
+        break;
+      }
+
+      default:
+        skipUnknownField(bb, tag & 7);
+    }
+  }
+
+  return message;
+}
+
 export interface Path {
   start_frame?: number;
   end_frame?: number;
@@ -434,6 +578,8 @@ export interface Path {
   rle_detections?: RLEDetectionHistory;
   not_present?: boolean;
   is_static?: boolean;
+  start_info?: CollisionInfo;
+  end_info?: CollisionInfo;
 }
 
 export function encodePath(message: Path): Uint8Array {
@@ -492,6 +638,28 @@ function _encodePath(message: Path, bb: ByteBuffer): void {
     writeVarint32(bb, 48);
     writeByte(bb, $is_static ? 1 : 0);
   }
+
+  // optional CollisionInfo start_info = 7;
+  let $start_info = message.start_info;
+  if ($start_info !== undefined) {
+    writeVarint32(bb, 58);
+    let nested = popByteBuffer();
+    _encodeCollisionInfo($start_info, nested);
+    writeVarint32(bb, nested.limit);
+    writeByteBuffer(bb, nested);
+    pushByteBuffer(nested);
+  }
+
+  // optional CollisionInfo end_info = 8;
+  let $end_info = message.end_info;
+  if ($end_info !== undefined) {
+    writeVarint32(bb, 66);
+    let nested = popByteBuffer();
+    _encodeCollisionInfo($end_info, nested);
+    writeVarint32(bb, nested.limit);
+    writeByteBuffer(bb, nested);
+    pushByteBuffer(nested);
+  }
 }
 
 export function decodePath(binary: Uint8Array): Path {
@@ -548,6 +716,22 @@ function _decodePath(bb: ByteBuffer): Path {
         break;
       }
 
+      // optional CollisionInfo start_info = 7;
+      case 7: {
+        let limit = pushTemporaryLength(bb);
+        message.start_info = _decodeCollisionInfo(bb);
+        bb.limit = limit;
+        break;
+      }
+
+      // optional CollisionInfo end_info = 8;
+      case 8: {
+        let limit = pushTemporaryLength(bb);
+        message.end_info = _decodeCollisionInfo(bb);
+        bb.limit = limit;
+        break;
+      }
+
       default:
         skipUnknownField(bb, tag & 7);
     }
@@ -631,8 +815,123 @@ function _decodeIdentifierHistory(bb: ByteBuffer): IdentifierHistory {
   return message;
 }
 
+export interface KeyBallIdentifiers {
+  cue_ball?: number;
+  object_ball?: number;
+  target_ball?: number;
+  contact_sequence?: number[];
+}
+
+export function encodeKeyBallIdentifiers(
+  message: KeyBallIdentifiers,
+): Uint8Array {
+  let bb = popByteBuffer();
+  _encodeKeyBallIdentifiers(message, bb);
+  return toUint8Array(bb);
+}
+
+function _encodeKeyBallIdentifiers(
+  message: KeyBallIdentifiers,
+  bb: ByteBuffer,
+): void {
+  // optional uint32 cue_ball = 1;
+  let $cue_ball = message.cue_ball;
+  if ($cue_ball !== undefined) {
+    writeVarint32(bb, 8);
+    writeVarint32(bb, $cue_ball);
+  }
+
+  // optional uint32 object_ball = 2;
+  let $object_ball = message.object_ball;
+  if ($object_ball !== undefined) {
+    writeVarint32(bb, 16);
+    writeVarint32(bb, $object_ball);
+  }
+
+  // optional uint32 target_ball = 3;
+  let $target_ball = message.target_ball;
+  if ($target_ball !== undefined) {
+    writeVarint32(bb, 24);
+    writeVarint32(bb, $target_ball);
+  }
+
+  // repeated uint32 contact_sequence = 4;
+  let array$contact_sequence = message.contact_sequence;
+  if (array$contact_sequence !== undefined) {
+    let packed = popByteBuffer();
+    for (let value of array$contact_sequence) {
+      writeVarint32(packed, value);
+    }
+    writeVarint32(bb, 34);
+    writeVarint32(bb, packed.offset);
+    writeByteBuffer(bb, packed);
+    pushByteBuffer(packed);
+  }
+}
+
+export function decodeKeyBallIdentifiers(
+  binary: Uint8Array,
+): KeyBallIdentifiers {
+  return _decodeKeyBallIdentifiers(wrapByteBuffer(binary));
+}
+
+function _decodeKeyBallIdentifiers(bb: ByteBuffer): KeyBallIdentifiers {
+  let message: KeyBallIdentifiers = {} as any;
+
+  end_of_message: while (!isAtEnd(bb)) {
+    let tag = readVarint32(bb);
+
+    switch (tag >>> 3) {
+      case 0:
+        break end_of_message;
+
+      // optional uint32 cue_ball = 1;
+      case 1: {
+        message.cue_ball = readVarint32(bb) >>> 0;
+        break;
+      }
+
+      // optional uint32 object_ball = 2;
+      case 2: {
+        message.object_ball = readVarint32(bb) >>> 0;
+        break;
+      }
+
+      // optional uint32 target_ball = 3;
+      case 3: {
+        message.target_ball = readVarint32(bb) >>> 0;
+        break;
+      }
+
+      // repeated uint32 contact_sequence = 4;
+      case 4: {
+        let values =
+          message.contact_sequence || (message.contact_sequence = []);
+        if ((tag & 7) === 2) {
+          let outerLimit = pushTemporaryLength(bb);
+          while (!isAtEnd(bb)) {
+            values.push(readVarint32(bb) >>> 0);
+          }
+          bb.limit = outerLimit;
+        } else {
+          values.push(readVarint32(bb) >>> 0);
+        }
+        break;
+      }
+
+      default:
+        skipUnknownField(bb, tag & 7);
+    }
+  }
+
+  return message;
+}
+
 export interface Shot {
   identifier_histories?: IdentifierHistory[];
+  key_balls?: KeyBallIdentifiers;
+  start_index?: number;
+  end_index?: number;
 }
 
 export function encodeShot(message: Shot): Uint8Array {
@@ -654,6 +953,31 @@ function _encodeShot(message: Shot, bb: ByteBuffer): void {
       pushByteBuffer(nested);
     }
   }
+
+  // optional KeyBallIdentifiers key_balls = 4;
+  let $key_balls = message.key_balls;
+  if ($key_balls !== undefined) {
+    writeVarint32(bb, 34);
+    let nested = popByteBuffer();
+    _encodeKeyBallIdentifiers($key_balls, nested);
+    writeVarint32(bb, nested.limit);
+    writeByteBuffer(bb, nested);
+    pushByteBuffer(nested);
+  }
+
+  // optional uint32 start_index = 5;
+  let $start_index = message.start_index;
+  if ($start_index !== undefined) {
+    writeVarint32(bb, 40);
+    writeVarint32(bb, $start_index);
+  }
+
+  // optional uint32 end_index = 6;
+  let $end_index = message.end_index;
+  if ($end_index !== undefined) {
+    writeVarint32(bb, 48);
+    writeVarint32(bb, $end_index);
+  }
 }
 
 export function decodeShot(binary: Uint8Array): Shot {
@@ -680,6 +1004,26 @@ function _decodeShot(bb: ByteBuffer): Shot {
         break;
       }
 
+      // optional KeyBallIdentifiers key_balls = 4;
+      case 4: {
+        let limit = pushTemporaryLength(bb);
+        message.key_balls = _decodeKeyBallIdentifiers(bb);
+        bb.limit = limit;
+        break;
+      }
+
+      // optional uint32 start_index = 5;
+      case 5: {
+        message.start_index = readVarint32(bb) >>> 0;
+        break;
+      }
+
+      // optional uint32 end_index = 6;
+      case 6: {
+        message.end_index = readVarint32(bb) >>> 0;
+        break;
+      }
+
       default:
         skipUnknownField(bb, tag & 7);
     }

src/index.tsx

@@ -62,8 +62,13 @@ export type AggregationIdentifierGql = {
 };
 
 export type AggregationInput =
-  | { bucketSet: BucketSetInputGql; enum?: never }
-  | { bucketSet?: never; enum: EnumAggregation };
+  | { bucketSet: BucketSetInputGql; datetimeRange?: never; enum?: never }
+  | {
+      bucketSet?: never;
+      datetimeRange: DatetimeRangeAggregationInput;
+      enum?: never;
+    }
+  | { bucketSet?: never; datetimeRange?: never; enum: EnumAggregation };
 
 export type BankFeaturesGql = {
   __typename?: "BankFeaturesGQL";
@@ -127,6 +132,12 @@ export type CueObjectFeaturesGql = {
   spinType?: Maybe<SpinTypeEnum>;
 };
 
+export type DatetimeRangeAggregationInput = {
+  endDatetime: Scalars["DateTime"]["input"];
+  interval: TimeInterval;
+  startDatetime: Scalars["DateTime"]["input"];
+};
+
 export type DeployedConfigGql = {
   __typename?: "DeployedConfigGQL";
   allowNewUsers: Scalars["Boolean"]["output"];
@@ -160,6 +171,7 @@ export type FilterInput =
   | {
       andFilters: Array<FilterInput>;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -185,6 +197,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -192,6 +206,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations: Array<ShotAnnotationInput>;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -217,6 +232,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -224,6 +241,42 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut: Array<Scalars["Boolean"]["input"]>;
+      bankAngle?: never;
+      bankDistance?: never;
+      cueAngleAfterObject?: never;
+      cueBallSpeed?: never;
+      cueObjectAngle?: never;
+      cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
+      difficulty?: never;
+      falsePositiveScore?: never;
+      intendedPocketType?: never;
+      isDirect?: never;
+      isLeft?: never;
+      isLeftMiss?: never;
+      isRight?: never;
+      isRightMiss?: never;
+      isStraight?: never;
+      kickAngle?: never;
+      kickDistance?: never;
+      make?: never;
+      notFilter?: never;
+      orFilters?: never;
+      shotDirection?: never;
+      spinType?: never;
+      tableSize?: never;
+      tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
+      targetPocketDistance?: never;
+      userId?: never;
+      videoId?: never;
+    }
+  | {
+      andFilters?: never;
+      annotations?: never;
+      backcut?: never;
       bankAngle: RangeFilter;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -249,6 +302,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -256,6 +311,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance: RangeFilter;
       cueAngleAfterObject?: never;
@@ -281,6 +337,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -288,6 +346,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject: RangeFilter;
@@ -313,6 +372,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -320,6 +381,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -345,6 +407,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -352,6 +416,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -377,6 +442,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -384,6 +451,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -409,6 +477,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -416,6 +486,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -441,6 +512,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -448,6 +521,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -473,6 +547,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -480,6 +556,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -505,6 +582,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -512,6 +591,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -537,6 +617,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -544,6 +626,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -569,6 +652,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -576,6 +661,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -601,6 +687,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -608,6 +696,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -633,6 +722,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -640,6 +731,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -665,6 +757,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -672,6 +766,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -697,6 +792,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -704,6 +801,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -729,6 +827,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -736,6 +836,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -761,6 +862,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -768,6 +871,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -793,6 +897,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -800,6 +906,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -825,6 +932,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -832,6 +941,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -857,6 +967,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -864,6 +976,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -889,6 +1002,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -896,6 +1011,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -921,6 +1037,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -928,6 +1046,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -953,6 +1072,8 @@ export type FilterInput =
       spinType: Array<SpinTypeEnum>;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -960,6 +1081,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -985,6 +1107,8 @@ export type FilterInput =
       spinType?: never;
       tableSize: RangeFilter;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -992,6 +1116,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -1017,6 +1142,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags: Array<VideoTagInput>;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId?: never;
@@ -1024,6 +1151,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -1049,6 +1177,78 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle: RangeFilter;
+      targetPocketAngleDirection?: never;
+      targetPocketDistance?: never;
+      userId?: never;
+      videoId?: never;
+    }
+  | {
+      andFilters?: never;
+      annotations?: never;
+      backcut?: never;
+      bankAngle?: never;
+      bankDistance?: never;
+      cueAngleAfterObject?: never;
+      cueBallSpeed?: never;
+      cueObjectAngle?: never;
+      cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
+      difficulty?: never;
+      falsePositiveScore?: never;
+      intendedPocketType?: never;
+      isDirect?: never;
+      isLeft?: never;
+      isLeftMiss?: never;
+      isRight?: never;
+      isRightMiss?: never;
+      isStraight?: never;
+      kickAngle?: never;
+      kickDistance?: never;
+      make?: never;
+      notFilter?: never;
+      orFilters?: never;
+      shotDirection?: never;
+      spinType?: never;
+      tableSize?: never;
+      tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection: Array<ShotDirectionEnum>;
+      targetPocketDistance?: never;
+      userId?: never;
+      videoId?: never;
+    }
+  | {
+      andFilters?: never;
+      annotations?: never;
+      backcut?: never;
+      bankAngle?: never;
+      bankDistance?: never;
+      cueAngleAfterObject?: never;
+      cueBallSpeed?: never;
+      cueObjectAngle?: never;
+      cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
+      difficulty?: never;
+      falsePositiveScore?: never;
+      intendedPocketType?: never;
+      isDirect?: never;
+      isLeft?: never;
+      isLeftMiss?: never;
+      isRight?: never;
+      isRightMiss?: never;
+      isStraight?: never;
+      kickAngle?: never;
+      kickDistance?: never;
+      make?: never;
+      notFilter?: never;
+      orFilters?: never;
+      shotDirection?: never;
+      spinType?: never;
+      tableSize?: never;
+      tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance: RangeFilter;
       userId?: never;
       videoId?: never;
@@ -1056,6 +1256,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -1081,6 +1282,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId: Array<Scalars["Int"]["input"]>;
       videoId?: never;
@@ -1088,6 +1291,7 @@ export type FilterInput =
   | {
       andFilters?: never;
       annotations?: never;
+      backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
       cueAngleAfterObject?: never;
@@ -1113,6 +1317,8 @@ export type FilterInput =
       spinType?: never;
       tableSize?: never;
       tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
       videoId: Array<Scalars["Int"]["input"]>;
@@ -1310,9 +1516,12 @@ export type PocketPointsGql = {
 
 export type PocketingIntentionFeaturesGql = {
   __typename?: "PocketingIntentionFeaturesGQL";
+  backcut?: Maybe<Scalars["Boolean"]["output"]>;
   difficulty?: Maybe<Scalars["Float"]["output"]>;
   intendedPocketType?: Maybe<PocketEnum>;
   make?: Maybe<Scalars["Boolean"]["output"]>;
+  targetPocketAngle?: Maybe<Scalars["Float"]["output"]>;
+  targetPocketAngleDirection?: Maybe<ShotDirectionEnum>;
   targetPocketDistance?: Maybe<Scalars["Float"]["output"]>;
 };
 
@@ -1455,6 +1664,13 @@ export type ShotAnnotationTypeGql = {
   name: Scalars["String"]["output"];
 };
 
+export type ShotDirectionCountsGql = {
+  __typename?: "ShotDirectionCountsGQL";
+  left: Scalars["Int"]["output"];
+  right: Scalars["Int"]["output"];
+  straight: Scalars["Int"]["output"];
+};
+
 export enum ShotDirectionEnum {
   Left = "LEFT",
   Right = "RIGHT",
@@ -1479,6 +1695,14 @@ export type ShotGql = {
   videoId: Scalars["Int"]["output"];
 };
 
+export type SpinTypeCountsGql = {
+  __typename?: "SpinTypeCountsGQL";
+  center: Scalars["Int"]["output"];
+  draw: Scalars["Int"]["output"];
+  follow: Scalars["Int"]["output"];
+  unknown: Scalars["Int"]["output"];
+};
+
 export enum SpinTypeEnum {
   Center = "CENTER",
   Draw = "DRAW",
@@ -1517,6 +1741,21 @@ export type TargetMetricsGql = {
   averageDifficulty?: Maybe<Scalars["Float"]["output"]>;
   count: Scalars["Int"]["output"];
   makePercentage?: Maybe<Scalars["Float"]["output"]>;
+  shotDirectionCounts?: Maybe<ShotDirectionCountsGql>;
+  spinTypeCounts?: Maybe<SpinTypeCountsGql>;
+};
+
+export type TimeInterval = {
+  days?: InputMaybe<Scalars["Int"]["input"]>;
+  hours?: InputMaybe<Scalars["Int"]["input"]>;
+  minutes?: InputMaybe<Scalars["Int"]["input"]>;
+  /** Assumes a month is 30 days long */
+  months?: InputMaybe<Scalars["Int"]["input"]>;
+  /** A second is the base unit and cannot be subdivided */
+  seconds?: InputMaybe<Scalars["Int"]["input"]>;
+  weeks?: InputMaybe<Scalars["Int"]["input"]>;
+  /** Assumes a year is 365 days long */
+  years?: InputMaybe<Scalars["Int"]["input"]>;
 };
 
 export type TooManyInitUploadsErr = {
@@ -1934,6 +2173,10 @@ export type GetShotsWithMetadataQuery = {
           };
         } | null;
       } | null;
+      serializedShotPaths?: {
+        __typename?: "SerializedShotPathsGQL";
+        b64EncodedBuffer?: string | null;
+      } | null;
       cueObjectFeatures?: {
         __typename?: "CueObjectFeaturesGQL";
         cueObjectDistance?: number | null;
@@ -2054,7 +2297,7 @@ export type GetStreamMonitoringDetailsQuery = {
     totalShots: number;
     makePercentage: number;
     elapsedTime?: number | null;
-    homographyHistory: Array<{
+    currentHomography?: {
       __typename?: "HomographyInfoGQL";
       crop: {
         __typename?: "BoundingBoxGQL";
@@ -2079,7 +2322,7 @@ export type GetStreamMonitoringDetailsQuery = {
         bottomSide: { __typename?: "IntPoint2D"; x: number; y: number };
         bottomRight: { __typename?: "IntPoint2D"; x: number; y: number };
       };
-    }>;
+    } | null;
     stream?: {
       __typename?: "UploadStreamGQL";
       linksRequested: number;
@@ -3159,6 +3402,9 @@ export const GetShotsWithMetadataDocument = gql`
             }
           }
         }
+        serializedShotPaths {
+          b64EncodedBuffer
+        }
         createdAt @include(if: $includeCreatedAt)
         updatedAt @include(if: $includeUpdatedAt)
         cueObjectFeatures @include(if: $includeCueObjectFeatures) {
@@ -3686,7 +3932,7 @@ export const GetStreamMonitoringDetailsDocument = gql`
       totalShots
       makePercentage
       elapsedTime
-      homographyHistory {
+      currentHomography {
         crop {
           left
           top

src/operations/shots.gql

@@ -113,6 +113,9 @@ query GetShotsWithMetadata(
           }
         }
       }
+      serializedShotPaths {
+        b64EncodedBuffer
+      }
       createdAt @include(if: $includeCreatedAt)
       updatedAt @include(if: $includeUpdatedAt)
       cueObjectFeatures @include(if: $includeCueObjectFeatures) {

src/operations/video.gql

@@ -4,7 +4,7 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
     totalShots
     makePercentage
     elapsedTime
-    homographyHistory {
+    currentHomography {
       crop {
         left
         top

src/schema.gql

@@ -53,6 +53,21 @@ type TargetMetricsGQL {
   count: Int!
   makePercentage: Float
   averageDifficulty: Float
+  spinTypeCounts: SpinTypeCountsGQL
+  shotDirectionCounts: ShotDirectionCountsGQL
+}
+
+type SpinTypeCountsGQL {
+  follow: Int!
+  draw: Int!
+  center: Int!
+  unknown: Int!
+}
+
+type ShotDirectionCountsGQL {
+  left: Int!
+  right: Int!
+  straight: Int!
 }
 
 input AggregateInputGQL {
@@ -63,6 +78,7 @@ input AggregateInputGQL {
 input AggregationInput @oneOf {
   bucketSet: BucketSetInputGQL
   enum: EnumAggregation
+  datetimeRange: DatetimeRangeAggregationInput
 }
 
 input BucketSetInputGQL {
@@ -79,6 +95,38 @@ input EnumAggregation {
   feature: String!
 }
 
+input DatetimeRangeAggregationInput {
+  startDatetime: DateTime!
+  endDatetime: DateTime!
+  interval: TimeInterval!
+}
+
+"""
+Date with time (isoformat)
+"""
+scalar DateTime
+
+input TimeInterval {
+  """
+  A second is the base unit and cannot be subdivided
+  """
+  seconds: Int = 0
+  minutes: Int = 0
+  hours: Int = 0
+  days: Int = 0
+  weeks: Int = 0
+
+  """
+  Assumes a month is 30 days long
+  """
+  months: Int = 0
+
+  """
+  Assumes a year is 365 days long
+  """
+  years: Int = 0
+}
+
 input FilterInput @oneOf {
   andFilters: [FilterInput!]
   orFilters: [FilterInput!]
@@ -110,6 +158,9 @@ input FilterInput @oneOf {
   spinType: [SpinTypeEnum!]
   cueSpeedAfterObject: RangeFilter
   falsePositiveScore: RangeFilter
+  backcut: [Boolean!]
+  targetPocketAngleDirection: [ShotDirectionEnum!]
+  targetPocketAngle: RangeFilter
 }
 
 input RangeFilter {
@@ -198,11 +249,6 @@ type ShotGQL {
   video: VideoGQL
 }
 
-"""
-Date with time (isoformat)
-"""
-scalar DateTime
-
 type CueObjectFeaturesGQL {
   cueObjectDistance: Float
   cueObjectAngle: Float
@@ -216,6 +262,9 @@ type PocketingIntentionFeaturesGQL {
   make: Boolean
   intendedPocketType: PocketEnum
   difficulty: Float
+  targetPocketAngle: Float
+  targetPocketAngleDirection: ShotDirectionEnum
+  backcut: Boolean
 }
 
 type BankFeaturesGQL {