Add spin type counts

Reviewed-on: #56
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

@@ -25,12 +25,16 @@ message RLEBallDetection {
   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 {
@@ -42,13 +46,28 @@ message Path {
     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";
@@ -124,6 +129,13 @@ export type CueObjectFeaturesGql = {
   cueObjectAngle?: Maybe<Scalars["Float"]["output"]>;
   cueObjectDistance?: Maybe<Scalars["Float"]["output"]>;
   shotDirection?: Maybe<ShotDirectionEnum>;
+  spinType?: Maybe<SpinTypeEnum>;
+};
+
+export type DatetimeRangeAggregationInput = {
+  endDatetime: Scalars["DateTime"]["input"];
+  interval: TimeInterval;
+  startDatetime: Scalars["DateTime"]["input"];
 };
 
 export type DeployedConfigGql = {
@@ -949,7 +961,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType: Array<Scalars["String"]["input"]>;
+      spinType: Array<SpinTypeEnum>;
       tableSize?: never;
       tags?: never;
       targetPocketDistance?: never;
@@ -1132,9 +1144,15 @@ export type GetShotsPagination = {
   startFrameAfter: Scalars["Int"]["input"];
 };
 
+export type GetShotsResult = {
+  __typename?: "GetShotsResult";
+  count?: Maybe<Scalars["Int"]["output"]>;
+  shots: Array<ShotGql>;
+};
+
 export type GetUploadLinkErrors = {
   __typename?: "GetUploadLinkErrors";
-  error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr;
+  error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErrInitUploadAlreadyCompletedErrTooManyInitUploadsErr;
 };
 
 export type GetUploadLinkReturn = {
@@ -1171,6 +1189,11 @@ export enum InitPlaylistUploadStatusEnum {
   Uploaded = "UPLOADED",
 }
 
+export type InitUploadAlreadyCompletedErr = {
+  __typename?: "InitUploadAlreadyCompletedErr";
+  segmentType: StreamSegmentTypeEnum;
+};
+
 export type IntPoint2D = {
   __typename?: "IntPoint2D";
   x: Scalars["Int"]["output"];
@@ -1189,12 +1212,14 @@ export type MustHaveSetForUploadLinkErr = {
   resolution?: Maybe<Scalars["Boolean"]["output"]>;
 };
 
-export type MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr =
+export type MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErrInitUploadAlreadyCompletedErrTooManyInitUploadsErr =
 
+    | InitUploadAlreadyCompletedErr
     | MustHaveSetForUploadLinkErr
     | NoInitForChunkedUploadErr
     | ProcessingFailedErr
     | SegmentAlreadyUploadedErr
+    | TooManyInitUploadsErr
     | TooManyProfileImageUploadsErr;
 
 export type Mutation = {
@@ -1327,6 +1352,7 @@ export type Query = {
   getPlayTime: UserPlayTimeGql;
   getShotAnnotationTypes: Array<ShotAnnotationTypeGql>;
   getShots: Array<ShotGql>;
+  getShotsWithMetadata: GetShotsResult;
   getUser?: Maybe<UserGql>;
   getUserTags: Array<TagGql>;
   getUserVideos: VideoHistoryGql;
@@ -1359,6 +1385,12 @@ export type QueryGetShotsArgs = {
   shotsPagination?: InputMaybe<GetShotsPagination>;
 };
 
+export type QueryGetShotsWithMetadataArgs = {
+  filterInput: FilterInput;
+  limit?: Scalars["Int"]["input"];
+  shotsPagination?: InputMaybe<GetShotsPagination>;
+};
+
 export type QueryGetUserArgs = {
   userId: Scalars["Int"]["input"];
 };
@@ -1458,6 +1490,21 @@ 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",
+  Follow = "FOLLOW",
+  Unknown = "UNKNOWN",
+}
+
 export type StreamErrorGql = {
   __typename?: "StreamErrorGQL";
   message: Scalars["String"]["output"];
@@ -1489,6 +1536,25 @@ export type TargetMetricsGql = {
   averageDifficulty?: Maybe<Scalars["Float"]["output"]>;
   count: Scalars["Int"]["output"];
   makePercentage?: Maybe<Scalars["Float"]["output"]>;
+  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 = {
+  __typename?: "TooManyInitUploadsErr";
+  linksRequested: Scalars["Int"]["output"];
 };
 
 export type TooManyProfileImageUploadsErr = {
@@ -1576,6 +1642,7 @@ export type VideoGql = {
   __typename?: "VideoGQL";
   averageTimeBetweenShots?: Maybe<Scalars["Float"]["output"]>;
   createdAt?: Maybe<Scalars["DateTime"]["output"]>;
+  currentHomography?: Maybe<HomographyInfoGql>;
   currentProcessing?: Maybe<VideoProcessingGql>;
   elapsedTime?: Maybe<Scalars["Float"]["output"]>;
   endTime?: Maybe<Scalars["DateTime"]["output"]>;
@@ -1777,6 +1844,7 @@ export type GetShotsQueryVariables = Exact<{
   includeCueObjectDistance?: Scalars["Boolean"]["input"];
   includeCueObjectAngle?: Scalars["Boolean"]["input"];
   includeCueBallSpeed?: Scalars["Boolean"]["input"];
+  includeSpinType?: Scalars["Boolean"]["input"];
   includeShotDirection?: Scalars["Boolean"]["input"];
   includeTargetPocketDistance?: Scalars["Boolean"]["input"];
   includeMake?: Scalars["Boolean"]["input"];
@@ -1795,12 +1863,24 @@ export type GetShotsQuery = {
     createdAt?: any | null;
     updatedAt?: any | null;
     user?: { __typename?: "UserGQL"; id: number } | null;
+    video?: {
+      __typename?: "VideoGQL";
+      stream?: {
+        __typename?: "UploadStreamGQL";
+        resolution: {
+          __typename?: "VideoResolutionGQL";
+          width?: number | null;
+          height?: number | null;
+        };
+      } | null;
+    } | null;
     cueObjectFeatures?: {
       __typename?: "CueObjectFeaturesGQL";
       cueObjectDistance?: number | null;
       cueObjectAngle?: number | null;
       cueBallSpeed?: number | null;
       shotDirection?: ShotDirectionEnum | null;
+      spinType?: SpinTypeEnum | null;
     } | null;
     pocketingIntentionFeatures?: {
       __typename?: "PocketingIntentionFeaturesGQL";
@@ -1811,6 +1891,25 @@ export type GetShotsQuery = {
   }>;
 };
 
+export type GetSerializedShotPathsQueryVariables = Exact<{
+  filterInput: FilterInput;
+}>;
+
+export type GetSerializedShotPathsQuery = {
+  __typename?: "Query";
+  getShots: Array<{
+    __typename?: "ShotGQL";
+    id: number;
+    videoId: number;
+    startFrame: number;
+    endFrame: number;
+    serializedShotPaths?: {
+      __typename?: "SerializedShotPathsGQL";
+      b64EncodedBuffer?: string | null;
+    } | null;
+  }>;
+};
+
 export type GetShotAnnotationTypesQueryVariables = Exact<{
   [key: string]: never;
 }>;
@@ -1824,6 +1923,72 @@ export type GetShotAnnotationTypesQuery = {
   }>;
 };
 
+export type GetShotsWithMetadataQueryVariables = Exact<{
+  filterInput: FilterInput;
+  shotsPagination?: InputMaybe<GetShotsPagination>;
+  limit?: InputMaybe<Scalars["Int"]["input"]>;
+  includeCreatedAt?: Scalars["Boolean"]["input"];
+  includeUpdatedAt?: Scalars["Boolean"]["input"];
+  includeCueObjectFeatures?: Scalars["Boolean"]["input"];
+  includePocketingIntentionFeatures?: Scalars["Boolean"]["input"];
+  includeCueObjectDistance?: Scalars["Boolean"]["input"];
+  includeCueObjectAngle?: Scalars["Boolean"]["input"];
+  includeCueBallSpeed?: Scalars["Boolean"]["input"];
+  includeSpinType?: Scalars["Boolean"]["input"];
+  includeShotDirection?: Scalars["Boolean"]["input"];
+  includeTargetPocketDistance?: Scalars["Boolean"]["input"];
+  includeMake?: Scalars["Boolean"]["input"];
+  includeIntendedPocketType?: Scalars["Boolean"]["input"];
+}>;
+
+export type GetShotsWithMetadataQuery = {
+  __typename?: "Query";
+  getShotsWithMetadata: {
+    __typename?: "GetShotsResult";
+    count?: number | null;
+    shots: Array<{
+      __typename?: "ShotGQL";
+      id: number;
+      videoId: number;
+      startFrame: number;
+      endFrame: number;
+      falsePositiveScore?: number | null;
+      createdAt?: any | null;
+      updatedAt?: any | null;
+      user?: { __typename?: "UserGQL"; id: number } | null;
+      video?: {
+        __typename?: "VideoGQL";
+        stream?: {
+          __typename?: "UploadStreamGQL";
+          resolution: {
+            __typename?: "VideoResolutionGQL";
+            width?: number | null;
+            height?: number | null;
+          };
+        } | null;
+      } | null;
+      serializedShotPaths?: {
+        __typename?: "SerializedShotPathsGQL";
+        b64EncodedBuffer?: string | null;
+      } | null;
+      cueObjectFeatures?: {
+        __typename?: "CueObjectFeaturesGQL";
+        cueObjectDistance?: number | null;
+        cueObjectAngle?: number | null;
+        cueBallSpeed?: number | null;
+        shotDirection?: ShotDirectionEnum | null;
+        spinType?: SpinTypeEnum | null;
+      } | null;
+      pocketingIntentionFeatures?: {
+        __typename?: "PocketingIntentionFeaturesGQL";
+        targetPocketDistance?: number | null;
+        make?: boolean | null;
+        intendedPocketType?: PocketEnum | null;
+      } | null;
+    }>;
+  };
+};
+
 export type GetProfileImageUploadLinkMutationVariables = Exact<{
   fileExt?: InputMaybe<Scalars["String"]["input"]>;
 }>;
@@ -1906,6 +2071,13 @@ export type GetUsernamesQuery = {
   getUsernames: Array<string>;
 };
 
+export type GetUserTagsQueryVariables = Exact<{ [key: string]: never }>;
+
+export type GetUserTagsQuery = {
+  __typename?: "Query";
+  getUserTags: Array<{ __typename?: "TagGQL"; id: number; name: string }>;
+};
+
 export type GetStreamMonitoringDetailsQueryVariables = Exact<{
   videoId: Scalars["Int"]["input"];
   debuggingJson?: InputMaybe<Scalars["JSON"]["input"]>;
@@ -1919,7 +2091,7 @@ export type GetStreamMonitoringDetailsQuery = {
     totalShots: number;
     makePercentage: number;
     elapsedTime?: number | null;
-    homographyHistory: Array<{
+    currentHomography?: {
       __typename?: "HomographyInfoGQL";
       crop: {
         __typename?: "BoundingBoxGQL";
@@ -1944,7 +2116,7 @@ export type GetStreamMonitoringDetailsQuery = {
         bottomSide: { __typename?: "IntPoint2D"; x: number; y: number };
         bottomRight: { __typename?: "IntPoint2D"; x: number; y: number };
       };
-    }>;
+    } | null;
     stream?: {
       __typename?: "UploadStreamGQL";
       linksRequested: number;
@@ -2044,13 +2216,11 @@ export type GetVideosQuery = {
   getVideos: Array<{
     __typename?: "VideoGQL";
     id: number;
-    playlist?: {
-      __typename?: "HLSPlaylistGQL";
-      segmentDurations: Array<number>;
-    } | null;
+    framesPerSecond: number;
     stream?: {
       __typename?: "UploadStreamGQL";
       id: string;
+      streamSegmentType: StreamSegmentTypeEnum;
       segments: Array<{
         __typename?: "UploadSegmentGQL";
         uploaded: boolean;
@@ -2060,6 +2230,10 @@ export type GetVideosQuery = {
         framesPerSecond?: number | null;
       }>;
     } | null;
+    playlist?: {
+      __typename?: "HLSPlaylistGQL";
+      segmentDurations: Array<number>;
+    } | null;
   }>;
 };
 
@@ -2211,6 +2385,7 @@ export type GetUploadLinkMutation = {
       | {
           __typename?: "GetUploadLinkErrors";
           error:
+            | { __typename?: "InitUploadAlreadyCompletedErr" }
             | {
                 __typename?: "MustHaveSetForUploadLinkErr";
                 resolution?: boolean | null;
@@ -2229,6 +2404,7 @@ export type GetUploadLinkMutation = {
                 };
               }
             | { __typename?: "SegmentAlreadyUploadedErr"; segmentId: number }
+            | { __typename?: "TooManyInitUploadsErr" }
             | { __typename?: "TooManyProfileImageUploadsErr" };
         }
       | {
@@ -2259,6 +2435,10 @@ export type GetHlsInitUploadLinkMutation = {
       | {
           __typename?: "GetUploadLinkErrors";
           error:
+            | {
+                __typename?: "InitUploadAlreadyCompletedErr";
+                segmentType: StreamSegmentTypeEnum;
+              }
             | { __typename?: "MustHaveSetForUploadLinkErr" }
             | {
                 __typename?: "NoInitForChunkedUploadErr";
@@ -2266,6 +2446,7 @@ export type GetHlsInitUploadLinkMutation = {
               }
             | { __typename?: "ProcessingFailedErr" }
             | { __typename?: "SegmentAlreadyUploadedErr" }
+            | { __typename?: "TooManyInitUploadsErr"; linksRequested: number }
             | { __typename?: "TooManyProfileImageUploadsErr" };
         }
       | {
@@ -2702,6 +2883,7 @@ export const GetShotsDocument = gql`
     $includeCueObjectDistance: Boolean! = false
     $includeCueObjectAngle: Boolean! = false
     $includeCueBallSpeed: Boolean! = false
+    $includeSpinType: Boolean! = false
     $includeShotDirection: Boolean! = false
     $includeTargetPocketDistance: Boolean! = false
     $includeMake: Boolean! = false
@@ -2720,6 +2902,14 @@ export const GetShotsDocument = gql`
         id
       }
       falsePositiveScore
+      video {
+        stream {
+          resolution {
+            width
+            height
+          }
+        }
+      }
       createdAt @include(if: $includeCreatedAt)
       updatedAt @include(if: $includeUpdatedAt)
       cueObjectFeatures @include(if: $includeCueObjectFeatures) {
@@ -2727,6 +2917,7 @@ export const GetShotsDocument = gql`
         cueObjectAngle @include(if: $includeCueObjectAngle)
         cueBallSpeed @include(if: $includeCueBallSpeed)
         shotDirection @include(if: $includeShotDirection)
+        spinType @include(if: $includeSpinType)
       }
       pocketingIntentionFeatures
         @include(if: $includePocketingIntentionFeatures) {
@@ -2760,6 +2951,7 @@ export const GetShotsDocument = gql`
  *      includeCueObjectDistance: // value for 'includeCueObjectDistance'
  *      includeCueObjectAngle: // value for 'includeCueObjectAngle'
  *      includeCueBallSpeed: // value for 'includeCueBallSpeed'
+ *      includeSpinType: // value for 'includeSpinType'
  *      includeShotDirection: // value for 'includeShotDirection'
  *      includeTargetPocketDistance: // value for 'includeTargetPocketDistance'
  *      includeMake: // value for 'includeMake'
@@ -2811,6 +3003,85 @@ export type GetShotsQueryResult = Apollo.QueryResult<
   GetShotsQuery,
   GetShotsQueryVariables
 >;
+export const GetSerializedShotPathsDocument = gql`
+  query GetSerializedShotPaths($filterInput: FilterInput!) {
+    getShots(filterInput: $filterInput) {
+      id
+      videoId
+      startFrame
+      endFrame
+      serializedShotPaths {
+        b64EncodedBuffer
+      }
+    }
+  }
+`;
+
+/**
+ * __useGetSerializedShotPathsQuery__
+ *
+ * To run a query within a React component, call `useGetSerializedShotPathsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetSerializedShotPathsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetSerializedShotPathsQuery({
+ *   variables: {
+ *      filterInput: // value for 'filterInput'
+ *   },
+ * });
+ */
+export function useGetSerializedShotPathsQuery(
+  baseOptions: Apollo.QueryHookOptions<
+    GetSerializedShotPathsQuery,
+    GetSerializedShotPathsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<
+    GetSerializedShotPathsQuery,
+    GetSerializedShotPathsQueryVariables
+  >(GetSerializedShotPathsDocument, options);
+}
+export function useGetSerializedShotPathsLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetSerializedShotPathsQuery,
+    GetSerializedShotPathsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<
+    GetSerializedShotPathsQuery,
+    GetSerializedShotPathsQueryVariables
+  >(GetSerializedShotPathsDocument, options);
+}
+export function useGetSerializedShotPathsSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetSerializedShotPathsQuery,
+    GetSerializedShotPathsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetSerializedShotPathsQuery,
+    GetSerializedShotPathsQueryVariables
+  >(GetSerializedShotPathsDocument, options);
+}
+export type GetSerializedShotPathsQueryHookResult = ReturnType<
+  typeof useGetSerializedShotPathsQuery
+>;
+export type GetSerializedShotPathsLazyQueryHookResult = ReturnType<
+  typeof useGetSerializedShotPathsLazyQuery
+>;
+export type GetSerializedShotPathsSuspenseQueryHookResult = ReturnType<
+  typeof useGetSerializedShotPathsSuspenseQuery
+>;
+export type GetSerializedShotPathsQueryResult = Apollo.QueryResult<
+  GetSerializedShotPathsQuery,
+  GetSerializedShotPathsQueryVariables
+>;
 export const GetShotAnnotationTypesDocument = gql`
   query GetShotAnnotationTypes {
     getShotAnnotationTypes {
@@ -2884,6 +3155,149 @@ export type GetShotAnnotationTypesQueryResult = Apollo.QueryResult<
   GetShotAnnotationTypesQuery,
   GetShotAnnotationTypesQueryVariables
 >;
+export const GetShotsWithMetadataDocument = gql`
+  query GetShotsWithMetadata(
+    $filterInput: FilterInput!
+    $shotsPagination: GetShotsPagination
+    $limit: Int
+    $includeCreatedAt: Boolean! = false
+    $includeUpdatedAt: Boolean! = false
+    $includeCueObjectFeatures: Boolean! = false
+    $includePocketingIntentionFeatures: Boolean! = false
+    $includeCueObjectDistance: Boolean! = false
+    $includeCueObjectAngle: Boolean! = false
+    $includeCueBallSpeed: Boolean! = false
+    $includeSpinType: Boolean! = false
+    $includeShotDirection: Boolean! = false
+    $includeTargetPocketDistance: Boolean! = false
+    $includeMake: Boolean! = false
+    $includeIntendedPocketType: Boolean! = false
+  ) {
+    getShotsWithMetadata(
+      filterInput: $filterInput
+      shotsPagination: $shotsPagination
+      limit: $limit
+    ) {
+      count
+      shots {
+        id
+        videoId
+        startFrame
+        endFrame
+        user {
+          id
+        }
+        falsePositiveScore
+        video {
+          stream {
+            resolution {
+              width
+              height
+            }
+          }
+        }
+        serializedShotPaths {
+          b64EncodedBuffer
+        }
+        createdAt @include(if: $includeCreatedAt)
+        updatedAt @include(if: $includeUpdatedAt)
+        cueObjectFeatures @include(if: $includeCueObjectFeatures) {
+          cueObjectDistance @include(if: $includeCueObjectDistance)
+          cueObjectAngle @include(if: $includeCueObjectAngle)
+          cueBallSpeed @include(if: $includeCueBallSpeed)
+          shotDirection @include(if: $includeShotDirection)
+          spinType @include(if: $includeSpinType)
+        }
+        pocketingIntentionFeatures
+          @include(if: $includePocketingIntentionFeatures) {
+          targetPocketDistance @include(if: $includeTargetPocketDistance)
+          make @include(if: $includeMake)
+          intendedPocketType @include(if: $includeIntendedPocketType)
+        }
+      }
+    }
+  }
+`;
+
+/**
+ * __useGetShotsWithMetadataQuery__
+ *
+ * To run a query within a React component, call `useGetShotsWithMetadataQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetShotsWithMetadataQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetShotsWithMetadataQuery({
+ *   variables: {
+ *      filterInput: // value for 'filterInput'
+ *      shotsPagination: // value for 'shotsPagination'
+ *      limit: // value for 'limit'
+ *      includeCreatedAt: // value for 'includeCreatedAt'
+ *      includeUpdatedAt: // value for 'includeUpdatedAt'
+ *      includeCueObjectFeatures: // value for 'includeCueObjectFeatures'
+ *      includePocketingIntentionFeatures: // value for 'includePocketingIntentionFeatures'
+ *      includeCueObjectDistance: // value for 'includeCueObjectDistance'
+ *      includeCueObjectAngle: // value for 'includeCueObjectAngle'
+ *      includeCueBallSpeed: // value for 'includeCueBallSpeed'
+ *      includeSpinType: // value for 'includeSpinType'
+ *      includeShotDirection: // value for 'includeShotDirection'
+ *      includeTargetPocketDistance: // value for 'includeTargetPocketDistance'
+ *      includeMake: // value for 'includeMake'
+ *      includeIntendedPocketType: // value for 'includeIntendedPocketType'
+ *   },
+ * });
+ */
+export function useGetShotsWithMetadataQuery(
+  baseOptions: Apollo.QueryHookOptions<
+    GetShotsWithMetadataQuery,
+    GetShotsWithMetadataQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<
+    GetShotsWithMetadataQuery,
+    GetShotsWithMetadataQueryVariables
+  >(GetShotsWithMetadataDocument, options);
+}
+export function useGetShotsWithMetadataLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetShotsWithMetadataQuery,
+    GetShotsWithMetadataQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<
+    GetShotsWithMetadataQuery,
+    GetShotsWithMetadataQueryVariables
+  >(GetShotsWithMetadataDocument, options);
+}
+export function useGetShotsWithMetadataSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetShotsWithMetadataQuery,
+    GetShotsWithMetadataQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetShotsWithMetadataQuery,
+    GetShotsWithMetadataQueryVariables
+  >(GetShotsWithMetadataDocument, options);
+}
+export type GetShotsWithMetadataQueryHookResult = ReturnType<
+  typeof useGetShotsWithMetadataQuery
+>;
+export type GetShotsWithMetadataLazyQueryHookResult = ReturnType<
+  typeof useGetShotsWithMetadataLazyQuery
+>;
+export type GetShotsWithMetadataSuspenseQueryHookResult = ReturnType<
+  typeof useGetShotsWithMetadataSuspenseQuery
+>;
+export type GetShotsWithMetadataQueryResult = Apollo.QueryResult<
+  GetShotsWithMetadataQuery,
+  GetShotsWithMetadataQueryVariables
+>;
 export const GetProfileImageUploadLinkDocument = gql`
   mutation getProfileImageUploadLink($fileExt: String = ".png") {
     getProfileImageUploadLink(fileExt: $fileExt) {
@@ -3234,6 +3648,77 @@ export type GetUsernamesQueryResult = Apollo.QueryResult<
   GetUsernamesQuery,
   GetUsernamesQueryVariables
 >;
+export const GetUserTagsDocument = gql`
+  query GetUserTags {
+    getUserTags {
+      id
+      name
+    }
+  }
+`;
+
+/**
+ * __useGetUserTagsQuery__
+ *
+ * To run a query within a React component, call `useGetUserTagsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetUserTagsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetUserTagsQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useGetUserTagsQuery(
+  baseOptions?: Apollo.QueryHookOptions<
+    GetUserTagsQuery,
+    GetUserTagsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<GetUserTagsQuery, GetUserTagsQueryVariables>(
+    GetUserTagsDocument,
+    options,
+  );
+}
+export function useGetUserTagsLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetUserTagsQuery,
+    GetUserTagsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<GetUserTagsQuery, GetUserTagsQueryVariables>(
+    GetUserTagsDocument,
+    options,
+  );
+}
+export function useGetUserTagsSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetUserTagsQuery,
+    GetUserTagsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<GetUserTagsQuery, GetUserTagsQueryVariables>(
+    GetUserTagsDocument,
+    options,
+  );
+}
+export type GetUserTagsQueryHookResult = ReturnType<typeof useGetUserTagsQuery>;
+export type GetUserTagsLazyQueryHookResult = ReturnType<
+  typeof useGetUserTagsLazyQuery
+>;
+export type GetUserTagsSuspenseQueryHookResult = ReturnType<
+  typeof useGetUserTagsSuspenseQuery
+>;
+export type GetUserTagsQueryResult = Apollo.QueryResult<
+  GetUserTagsQuery,
+  GetUserTagsQueryVariables
+>;
 export const GetStreamMonitoringDetailsDocument = gql`
   query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
     getVideo(videoId: $videoId, debuggingJson: $debuggingJson) {
@@ -3241,7 +3726,7 @@ export const GetStreamMonitoringDetailsDocument = gql`
       totalShots
       makePercentage
       elapsedTime
-      homographyHistory {
+      currentHomography {
         crop {
           left
           top
@@ -3601,11 +4086,10 @@ export const GetVideosDocument = gql`
   query GetVideos($videoIds: [Int!]!) {
     getVideos(videoIds: $videoIds) {
       id
-      playlist {
-        segmentDurations
-      }
+      framesPerSecond
       stream {
         id
+        streamSegmentType
         segments {
           uploaded
           valid
@@ -3614,6 +4098,9 @@ export const GetVideosDocument = gql`
           framesPerSecond
         }
       }
+      playlist {
+        segmentDurations
+      }
     }
   }
 `;
@@ -4259,6 +4746,12 @@ export const GetHlsInitUploadLinkDocument = gql`
             ... on NoInitForChunkedUploadErr {
               segmentType
             }
+            ... on InitUploadAlreadyCompletedErr {
+              segmentType
+            }
+            ... on TooManyInitUploadsErr {
+              linksRequested
+            }
           }
         }
       }

src/operations/shots.gql

@@ -9,6 +9,7 @@ query GetShots(
   $includeCueObjectDistance: Boolean! = false
   $includeCueObjectAngle: Boolean! = false
   $includeCueBallSpeed: Boolean! = false
+  $includeSpinType: Boolean! = false
   $includeShotDirection: Boolean! = false
   $includeTargetPocketDistance: Boolean! = false
   $includeMake: Boolean! = false
@@ -27,6 +28,14 @@ query GetShots(
       id
     }
     falsePositiveScore
+    video {
+      stream {
+        resolution {
+          width
+          height
+        }
+      }
+    }
     createdAt @include(if: $includeCreatedAt)
     updatedAt @include(if: $includeUpdatedAt)
     cueObjectFeatures @include(if: $includeCueObjectFeatures) {
@@ -34,6 +43,7 @@ query GetShots(
       cueObjectAngle @include(if: $includeCueObjectAngle)
       cueBallSpeed @include(if: $includeCueBallSpeed)
       shotDirection @include(if: $includeShotDirection)
+      spinType @include(if: $includeSpinType)
     }
     pocketingIntentionFeatures
       @include(if: $includePocketingIntentionFeatures) {
@@ -44,9 +54,83 @@ query GetShots(
   }
 }
 
+query GetSerializedShotPaths($filterInput: FilterInput!) {
+  getShots(filterInput: $filterInput) {
+    id
+    videoId
+    startFrame
+    endFrame
+    serializedShotPaths {
+      b64EncodedBuffer
+    }
+  }
+}
+
 query GetShotAnnotationTypes {
   getShotAnnotationTypes {
     id
     name
   }
 }
+
+query GetShotsWithMetadata(
+  $filterInput: FilterInput!
+  $shotsPagination: GetShotsPagination
+  $limit: Int
+  $includeCreatedAt: Boolean! = false
+  $includeUpdatedAt: Boolean! = false
+  $includeCueObjectFeatures: Boolean! = false
+  $includePocketingIntentionFeatures: Boolean! = false
+  $includeCueObjectDistance: Boolean! = false
+  $includeCueObjectAngle: Boolean! = false
+  $includeCueBallSpeed: Boolean! = false
+  $includeSpinType: Boolean! = false
+  $includeShotDirection: Boolean! = false
+  $includeTargetPocketDistance: Boolean! = false
+  $includeMake: Boolean! = false
+  $includeIntendedPocketType: Boolean! = false
+) {
+  getShotsWithMetadata(
+    filterInput: $filterInput
+    shotsPagination: $shotsPagination
+    limit: $limit
+  ) {
+    count
+    shots {
+      id
+      videoId
+      startFrame
+      endFrame
+      user {
+        id
+      }
+      falsePositiveScore
+      video {
+        stream {
+          resolution {
+            width
+            height
+          }
+        }
+      }
+      serializedShotPaths {
+        b64EncodedBuffer
+      }
+      createdAt @include(if: $includeCreatedAt)
+      updatedAt @include(if: $includeUpdatedAt)
+      cueObjectFeatures @include(if: $includeCueObjectFeatures) {
+        cueObjectDistance @include(if: $includeCueObjectDistance)
+        cueObjectAngle @include(if: $includeCueObjectAngle)
+        cueBallSpeed @include(if: $includeCueBallSpeed)
+        shotDirection @include(if: $includeShotDirection)
+        spinType @include(if: $includeSpinType)
+      }
+      pocketingIntentionFeatures
+        @include(if: $includePocketingIntentionFeatures) {
+        targetPocketDistance @include(if: $includeTargetPocketDistance)
+        make @include(if: $includeMake)
+        intendedPocketType @include(if: $includeIntendedPocketType)
+      }
+    }
+  }
+}

src/operations/user.gql

@@ -56,3 +56,10 @@ query getUsernames(
 ) {
   getUsernames(matchString: $matchString, limit: $limit, after: $after)
 }
+
+query GetUserTags {
+  getUserTags {
+    id
+    name
+  }
+}

src/operations/video.gql

@@ -4,7 +4,7 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
     totalShots
     makePercentage
     elapsedTime
-    homographyHistory {
+    currentHomography {
       crop {
         left
         top
@@ -118,11 +118,10 @@ query GetVideoDetails($videoId: Int!) {
 query GetVideos($videoIds: [Int!]!) {
   getVideos(videoIds: $videoIds) {
     id
-    playlist {
-      segmentDurations
-    }
+    framesPerSecond
     stream {
       id
+      streamSegmentType
       segments {
         uploaded
         valid
@@ -131,6 +130,9 @@ query GetVideos($videoIds: [Int!]!) {
         framesPerSecond
       }
     }
+    playlist {
+      segmentDurations
+    }
   }
 }
 

src/operations/video_upload.gql

@@ -55,6 +55,12 @@ mutation GetHlsInitUploadLink($videoId: Int!) {
           ... on NoInitForChunkedUploadErr {
             segmentType
           }
+          ... on InitUploadAlreadyCompletedErr {
+            segmentType
+          }
+          ... on TooManyInitUploadsErr {
+            linksRequested
+          }
         }
       }
     }

src/schema.gql

@@ -9,6 +9,11 @@ type Query {
     videoId: ID!
     intervalDuration: Int! = 300
   ): [MakePercentageIntervalGQL!]!
+  getShotsWithMetadata(
+    filterInput: FilterInput!
+    shotsPagination: GetShotsPagination = null
+    limit: Int! = 500
+  ): GetShotsResult!
   getShots(
     filterInput: FilterInput!
     shotsPagination: GetShotsPagination = null
@@ -48,6 +53,14 @@ type TargetMetricsGQL {
   count: Int!
   makePercentage: Float
   averageDifficulty: Float
+  spinTypeCounts: SpinTypeCountsGQL
+}
+
+type SpinTypeCountsGQL {
+  follow: Int!
+  draw: Int!
+  center: Int!
+  unknown: Int!
 }
 
 input AggregateInputGQL {
@@ -58,6 +71,7 @@ input AggregateInputGQL {
 input AggregationInput @oneOf {
   bucketSet: BucketSetInputGQL
   enum: EnumAggregation
+  datetimeRange: DatetimeRangeAggregationInput
 }
 
 input BucketSetInputGQL {
@@ -74,6 +88,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!]
@@ -102,8 +148,8 @@ input FilterInput @oneOf {
   kickAngle: RangeFilter
   kickDistance: RangeFilter
   cueAngleAfterObject: RangeFilter
+  spinType: [SpinTypeEnum!]
   cueSpeedAfterObject: RangeFilter
-  spinType: [String!]
   falsePositiveScore: RangeFilter
 }
 
@@ -140,6 +186,13 @@ input ShotAnnotationInput {
   name: String!
 }
 
+enum SpinTypeEnum {
+  DRAW
+  FOLLOW
+  CENTER
+  UNKNOWN
+}
+
 type BucketSetGQL {
   keyName: String!
   feature: String!
@@ -164,6 +217,11 @@ type MakePercentageIntervalGQL {
   elapsedTime: Float!
 }
 
+type GetShotsResult {
+  shots: [ShotGQL!]!
+  count: Int
+}
+
 type ShotGQL {
   id: Int!
   videoId: Int!
@@ -181,16 +239,12 @@ type ShotGQL {
   video: VideoGQL
 }
 
-"""
-Date with time (isoformat)
-"""
-scalar DateTime
-
 type CueObjectFeaturesGQL {
   cueObjectDistance: Float
   cueObjectAngle: Float
   cueBallSpeed: Float
   shotDirection: ShotDirectionEnum
+  spinType: SpinTypeEnum
 }
 
 type PocketingIntentionFeaturesGQL {
@@ -262,6 +316,7 @@ type VideoGQL {
   stream: UploadStreamGQL
   playlist: HLSPlaylistGQL
   tags: [VideoTag!]!
+  currentHomography: HomographyInfoGQL
   homographyHistory: [HomographyInfoGQL!]!
   currentProcessing: VideoProcessingGQL
 }
@@ -568,15 +623,17 @@ type GetUploadLinkReturn {
 union UploadLinkGetUploadLinkErrors = UploadLink | GetUploadLinkErrors
 
 type GetUploadLinkErrors {
-  error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr!
+  error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErrInitUploadAlreadyCompletedErrTooManyInitUploadsErr!
 }
 
-union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr =
+union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErrInitUploadAlreadyCompletedErrTooManyInitUploadsErr =
     MustHaveSetForUploadLinkErr
   | SegmentAlreadyUploadedErr
   | ProcessingFailedErr
   | NoInitForChunkedUploadErr
   | TooManyProfileImageUploadsErr
+  | InitUploadAlreadyCompletedErr
+  | TooManyInitUploadsErr
 
 type MustHaveSetForUploadLinkErr {
   resolution: Boolean
@@ -594,3 +651,11 @@ type ProcessingFailedErr {
 type NoInitForChunkedUploadErr {
   segmentType: StreamSegmentTypeEnum!
 }
+
+type InitUploadAlreadyCompletedErr {
+  segmentType: StreamSegmentTypeEnum!
+}
+
+type TooManyInitUploadsErr {
+  linksRequested: Int!
+}