codegen.yml

@@ -1,7 +1,5 @@
 overwrite: true
-schema:
+schema: "src/schema.gql"
-  - "src/schema.gql"
-  - "src/client-schema.gql"
 documents: "src/**/*.gql"
 generates:
   src/index.tsx:

pyproject.toml

@@ -7,7 +7,7 @@ readme = "README.md"
 packages = [{include = "rbproto"}]
 
 [tool.poetry.dependencies]
-python = ">=3.10,<=3.13"
+python = ">=3.10,<3.12"
 protobuf = "^4.25.3"
 
 

rbproto/python/shot_pb2.py

@@ -13,15 +13,13 @@ _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\"\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\"\xf4\x01\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\x12\x18\n\x0b\x63ue_ball_id\x18\x05 \x01(\rH\x00\x88\x01\x01\x12\x1b\n\x0eobject_ball_id\x18\x06 \x01(\rH\x01\x88\x01\x01\x12\x1b\n\x0etarget_ball_id\x18\x07 \x01(\rH\x02\x88\x01\x01\x42\x0e\n\x0c_cue_ball_idB\x11\n\x0f_object_ball_idB\x11\n\x0f_target_ball_id\"\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')
+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')
 
 _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
@@ -34,16 +32,10 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_RLEDETECTIONHISTORY']._serialized_end=418
   _globals['_DETECTIONHISTORY']._serialized_start=420
   _globals['_DETECTIONHISTORY']._serialized_end=490
-  _globals['_COLLISIONINFO']._serialized_start=493
+  _globals['_PATH']._serialized_start=493
-  _globals['_COLLISIONINFO']._serialized_end=745
+  _globals['_PATH']._serialized_end=723
-  _globals['_COLLISIONINFO_BALLIDENTIFIERSENTRY']._serialized_start=667
+  _globals['_IDENTIFIERHISTORY']._serialized_start=725
-  _globals['_COLLISIONINFO_BALLIDENTIFIERSENTRY']._serialized_end=745
+  _globals['_IDENTIFIERHISTORY']._serialized_end=807
-  _globals['_PATH']._serialized_start=748
+  _globals['_SHOT']._serialized_start=809
-  _globals['_PATH']._serialized_end=1080
+  _globals['_SHOT']._serialized_end=881
-  _globals['_IDENTIFIERHISTORY']._serialized_start=1082
-  _globals['_IDENTIFIERHISTORY']._serialized_end=1164
-  _globals['_KEYBALLIDENTIFIERS']._serialized_start=1167
-  _globals['_KEYBALLIDENTIFIERS']._serialized_end=1411
-  _globals['_SHOT']._serialized_start=1414
-  _globals['_SHOT']._serialized_end=1582
 # @@protoc_insertion_point(module_scope)

rbproto/python/shot_pb2.pyi

@@ -55,46 +55,21 @@ 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", "start_info", "end_info"]
+    __slots__ = ["start_frame", "end_frame", "detections", "rle_detections", "not_present", "is_static"]
     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
-    start_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 = ...) -> None: ...
-    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"]
@@ -104,32 +79,8 @@ 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_id", "object_ball_id", "target_ball_id"]
-    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_ID_FIELD_NUMBER: _ClassVar[int]
-    OBJECT_BALL_ID_FIELD_NUMBER: _ClassVar[int]
-    TARGET_BALL_ID_FIELD_NUMBER: _ClassVar[int]
-    cue_ball: int
-    object_ball: int
-    target_ball: int
-    contact_sequence: _containers.RepeatedScalarFieldContainer[int]
-    cue_ball_id: int
-    object_ball_id: int
-    target_ball_id: int
-    def __init__(self, cue_ball: _Optional[int] = ..., object_ball: _Optional[int] = ..., target_ball: _Optional[int] = ..., contact_sequence: _Optional[_Iterable[int]] = ..., cue_ball_id: _Optional[int] = ..., object_ball_id: _Optional[int] = ..., target_ball_id: _Optional[int] = ...) -> None: ...
-
 class Shot(_message.Message):
-    __slots__ = ["identifier_histories", "key_balls", "start_index", "end_index"]
+    __slots__ = ["identifier_histories"]
     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]
-    key_balls: KeyBallIdentifiers
+    def __init__(self, identifier_histories: _Optional[_Iterable[_Union[IdentifierHistory, _Mapping]]] = ...) -> None: ...
-    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 left = 1;
-  float top = 2;
+	float top = 2;
-  float width = 3;
+	float width = 3;
-  float height = 4;
+	float height = 4;
 }
 
 message Point {
@@ -15,63 +15,40 @@ message Point {
 }
 
 message BallDetection {
-  Point plane_position = 1;
+	Point plane_position = 1;
-  Box annotation = 2;
+	Box annotation = 2;
-  bool interpolated = 3;
+	bool interpolated = 3;
 }
 
 message RLEBallDetection {
-  BallDetection detection = 1;
+	BallDetection detection = 1;
-  uint32 count = 2;
+	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;
+	DetectionHistory detections = 3;
-    RLEDetectionHistory rle_detections = 4;
+	RLEDetectionHistory rle_detections = 4;
-    bool not_present = 5;
+	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;
-
-  optional uint32 cue_ball_id = 5;
-  optional uint32 object_ball_id = 6;
-  optional uint32 target_ball_id = 7;
-}
 
 message Shot {
   repeated IdentifierHistory identifier_histories = 3;
-  KeyBallIdentifiers key_balls = 4;
-  uint32 start_index = 5;
-  uint32 end_index = 6;
 }

rbproto/ts/shot.ts

@@ -427,150 +427,6 @@ 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;
@@ -578,8 +434,6 @@ export interface Path {
   rle_detections?: RLEDetectionHistory;
   not_present?: boolean;
   is_static?: boolean;
-  start_info?: CollisionInfo;
-  end_info?: CollisionInfo;
 }
 
 export function encodePath(message: Path): Uint8Array {
@@ -638,28 +492,6 @@ 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 {
@@ -716,22 +548,6 @@ 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);
     }
@@ -815,165 +631,8 @@ function _decodeIdentifierHistory(bb: ByteBuffer): IdentifierHistory {
   return message;
 }
 
-export interface KeyBallIdentifiers {
-  cue_ball?: number;
-  object_ball?: number;
-  target_ball?: number;
-  contact_sequence?: number[];
-  cue_ball_id?: number;
-  object_ball_id?: number;
-  target_ball_id?: 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);
-  }
-
-  // optional uint32 cue_ball_id = 5;
-  let $cue_ball_id = message.cue_ball_id;
-  if ($cue_ball_id !== undefined) {
-    writeVarint32(bb, 40);
-    writeVarint32(bb, $cue_ball_id);
-  }
-
-  // optional uint32 object_ball_id = 6;
-  let $object_ball_id = message.object_ball_id;
-  if ($object_ball_id !== undefined) {
-    writeVarint32(bb, 48);
-    writeVarint32(bb, $object_ball_id);
-  }
-
-  // optional uint32 target_ball_id = 7;
-  let $target_ball_id = message.target_ball_id;
-  if ($target_ball_id !== undefined) {
-    writeVarint32(bb, 56);
-    writeVarint32(bb, $target_ball_id);
-  }
-}
-
-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;
-      }
-
-      // optional uint32 cue_ball_id = 5;
-      case 5: {
-        message.cue_ball_id = readVarint32(bb) >>> 0;
-        break;
-      }
-
-      // optional uint32 object_ball_id = 6;
-      case 6: {
-        message.object_ball_id = readVarint32(bb) >>> 0;
-        break;
-      }
-
-      // optional uint32 target_ball_id = 7;
-      case 7: {
-        message.target_ball_id = 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 {
@@ -995,31 +654,6 @@ 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 {
@@ -1046,26 +680,6 @@ 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/client-schema.gql

@@ -1,25 +0,0 @@
-# see: https://www.apollographql.com/docs/react/local-state/managing-state-with-field-policies/
-directive @client on FIELD
-
-extend type ShotGQL {
-  startTime: Float!
-  endTime: Float!
-}
-
-extend type UploadStreamGQL {
-  segmentEndFrames: [Int!]!
-}
-
-extend type HLSPlaylistGQL {
-  segmentStartTimes: [Float!]!
-}
-
-type SegmentEndFramesGQL {
-  id: Int!
-  segmentEndFrames: [Int!]!
-}
-
-type SegmentStartTimesGQL {
-  id: Int!
-  segmentStartTimes: [Float!]!
-}

src/operations/feed.gql

@@ -1,4 +1,3 @@
-# DO NOT USE: use getVideoFeed instead
 query GetFeed(
   $limit: Int! = 5
   $after: String = null
@@ -22,7 +21,6 @@ query GetFeed(
       elapsedTime
       screenshotUri
       stream {
-        id
         isCompleted
       }
       tableSize
@@ -39,61 +37,3 @@ query GetFeed(
     }
   }
 }
-
-fragment VideoCardFields on VideoGQL {
-  id
-  owner {
-    id
-    username
-    profileImageUri
-  }
-  name
-  screenshotUri
-  totalShotsMade
-  totalShots
-  makePercentage
-  createdAt
-  updatedAt
-  startTime
-  endTime
-  private
-  elapsedTime
-  screenshotUri
-  stream {
-    id
-    isCompleted
-  }
-  tableSize
-  tags {
-    tagClasses {
-      name
-    }
-    name
-  }
-  currentProcessing {
-    id
-    errors {
-      message
-    }
-    status
-    statuses {
-      status
-    }
-  }
-}
-
-query GetVideoFeed(
-  $limit: Int! = 5
-  $after: String = null
-  $filters: VideoFilterInput = null
-) {
-  getFeedVideos(limit: $limit, after: $after, filters: $filters) {
-    videos {
-      ...VideoCardFields
-    }
-    pageInfo {
-      hasNextPage
-      endCursor
-    }
-  }
-}

src/operations/shots.gql

@@ -1,11 +1,53 @@
-query GetSerializedShotPaths($filterInput: FilterInput!) {
+query GetShots(
-  getShots(filterInput: $filterInput) {
+  $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
+  $includeShotDirection: Boolean! = false
+  $includeTargetPocketDistance: Boolean! = false
+  $includeMake: Boolean! = false
+  $includeIntendedPocketType: Boolean! = false
+) {
+  getShots(
+    filterInput: $filterInput
+    shotsPagination: $shotsPagination
+    limit: $limit
+  ) {
     id
     videoId
     startFrame
     endFrame
-    serializedShotPaths {
+    user {
-      b64EncodedBuffer
+      id
+    }
+    falsePositiveScore
+    video {
+      stream {
+        resolution {
+          width
+          height
+        }
+      }
+    }
+    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)
+    }
+    pocketingIntentionFeatures
+      @include(if: $includePocketingIntentionFeatures) {
+      targetPocketDistance @include(if: $includeTargetPocketDistance)
+      make @include(if: $includeMake)
+      intendedPocketType @include(if: $includeIntendedPocketType)
     }
   }
 }
@@ -16,164 +58,3 @@ query GetShotAnnotationTypes {
     name
   }
 }
-
-mutation UpdateShotAnnotations(
-  $shotId: Int!
-  $annotations: [UpdateAnnotationInputGQL!]!
-) {
-  updateShotAnnotations(shotId: $shotId, annotations: $annotations) {
-    shot {
-      id
-      annotations {
-        shotId
-        type {
-          id
-          name
-        }
-        notes
-      }
-    }
-    error {
-      shotId
-      msg
-    }
-  }
-}
-
-## Should be deprecated
-query GetShotsWithVideoGql(
-  $filterInput: FilterInput!
-  $shotsOrdering: GetShotsOrdering
-  $limit: Int
-) {
-  getOrderedShots(
-    filterInput: $filterInput
-    shotsOrdering: $shotsOrdering
-    limit: $limit
-  ) {
-    shots {
-      id
-      videoId
-      video {
-        screenshotUri
-        endTime
-      }
-    }
-  }
-}
-
-query GetShotsWithJustIds(
-  $filterInput: FilterInput!
-  $shotsOrdering: GetShotsOrdering
-  $limit: Int
-  $countRespectsLimit: Boolean
-) {
-  getOrderedShots(
-    filterInput: $filterInput
-    shotsOrdering: $shotsOrdering
-    limit: $limit
-    countRespectsLimit: $countRespectsLimit
-  ) {
-    count
-    shots {
-      id
-      videoId
-    }
-  }
-}
-
-## Reserved for playlists (which are created from a filter)
-query GetShotsWithMetadataFilterResult(
-  $filterInput: FilterInput!
-  $shotsOrdering: GetShotsOrdering
-  $limit: Int
-  $ids: [Int!]
-  $countRespectsLimit: Boolean
-) {
-  getOrderedShots(
-    filterInput: $filterInput
-    shotsOrdering: $shotsOrdering
-    limit: $limit
-    ids: $ids
-    countRespectsLimit: $countRespectsLimit
-  ) {
-    count
-    shots {
-      ...ShotWithAllFeatures
-    }
-    ids
-  }
-}
-
-# TODO: Delete
-query GetShotsWithMetadata(
-  $filterInput: FilterInput!
-  $shotsPagination: GetShotsPagination
-  $limit: Int
-  $ids: [Int!]
-) {
-  getShotsWithMetadata(
-    filterInput: $filterInput
-    shotsPagination: $shotsPagination
-    limit: $limit
-    ids: $ids
-  ) {
-    count
-    shots {
-      ...ShotWithAllFeatures
-    }
-    ids
-  }
-}
-
-query GetShotsByIds($ids: [Int!]!) {
-  getShotsByIds(ids: $ids) {
-    ...ShotWithAllFeatures
-  }
-}
-
-fragment ShotWithAllFeatures on ShotGQL {
-  id
-  videoId
-  startFrame
-  endFrame
-  startTime @client
-  endTime @client
-  user {
-    id
-  }
-  falsePositiveScore
-  createdAt
-  updatedAt
-  cueObjectFeatures {
-    cueObjectDistance
-    cueObjectAngle
-    cueBallSpeed
-    shotDirection
-    spinType
-  }
-  pocketingIntentionFeatures {
-    make
-    targetPocketDistance
-    targetPocketAngle
-    targetPocketAngleDirection
-    marginOfErrorInDegrees
-    intendedPocketType
-  }
-  pocketingIntentionInfo {
-    ballId
-    pocketId
-    pathMetadataIndex
-  }
-  serializedShotPaths {
-    b64EncodedBuffer
-  }
-  annotations {
-    shotId
-    type {
-      id
-      name
-    }
-    notes
-  }
-}

src/operations/user.gql

@@ -37,16 +37,14 @@ query getLoggedInUser {
     username
     isAdmin
     profileImageUri
-    fargoRating
     activeVideoId
     createdAt
     updatedAt
-    videosPrivateByDefault
   }
 }
 
-query GetUserPlayTime($userId: Int!, $filters: VideoFilterInput) {
+query GetUserPlayTime($userId: Int!) {
-  getPlayTime(userId: $userId, filters: $filters) {
+  getPlayTime(userId: $userId) {
     totalSeconds
   }
 }
@@ -58,102 +56,3 @@ query getUsernames(
 ) {
   getUsernames(matchString: $matchString, limit: $limit, after: $after)
 }
-
-query getUserRelationshipsMatching(
-  $userId: Int!
-  $matchString: String!
-  $limit: Int = null
-  $after: String = null
-) {
-  getUserRelationshipsMatching(
-    userId: $userId
-    matchString: $matchString
-    limit: $limit
-    after: $after
-  ) {
-    relationships {
-      toUser {
-        username
-        id
-      }
-      toUserFollows
-      toUserIsFollowedBy
-    }
-  }
-}
-
-query GetUserTags {
-  getUserTags {
-    id
-    name
-  }
-}
-
-mutation followUser($followedUserId: Int!) {
-  followUser(followedUserId: $followedUserId) {
-    username
-    id
-    following {
-      id
-      username
-    }
-    followers {
-      id
-      username
-    }
-  }
-}
-
-mutation unfollowUser($followedUserId: Int!) {
-  unfollowUser(followedUserId: $followedUserId) {
-    username
-    id
-    following {
-      id
-      username
-    }
-    followers {
-      id
-      username
-    }
-  }
-}
-
-query getUserFollowingFollowers {
-  getLoggedInUser {
-    id
-    following {
-      id
-      username
-    }
-    followers {
-      id
-      username
-    }
-  }
-}
-
-query doesUsernameExist($candidateUsername: String!) {
-  doesUsernameExist(candidateUsername: $candidateUsername)
-}
-
-mutation editUser(
-  $username: String
-  $fargoRating: Int
-  $videosPrivateByDefault: Boolean
-) {
-  editUser(
-    input: {
-      username: $username
-      fargoRating: $fargoRating
-      videosPrivateByDefault: $videosPrivateByDefault
-    }
-  ) {
-    id
-    firebaseUid
-    username
-    fargoRating
-    updatedAt
-    videosPrivateByDefault
-  }
-}

src/operations/video.gql

@@ -4,11 +4,47 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
     totalShots
     makePercentage
     elapsedTime
-    currentHomography {
+    homographyHistory {
-      ...HomographyInfo
+      crop {
+        left
+        top
+        width
+        height
+      }
+      pockets {
+        left
+        top
+        width
+        height
+      }
+      sourcePoints {
+        topLeft {
+          x
+          y
+        }
+        topSide {
+          x
+          y
+        }
+        topRight {
+          x
+          y
+        }
+        bottomLeft {
+          x
+          y
+        }
+        bottomSide {
+          x
+          y
+        }
+        bottomRight {
+          x
+          y
+        }
+      }
     }
     stream {
-      id
       linksRequested
       uploadsCompleted
       segmentProcessingCursor
@@ -81,32 +117,22 @@ query GetVideoDetails($videoId: Int!) {
 
 query GetVideos($videoIds: [Int!]!) {
   getVideos(videoIds: $videoIds) {
-    ...VideoStreamMetadata
-  }
-}
-
-fragment VideoStreamMetadata on VideoGQL {
-  id
-  framesPerSecond
-  stream {
     id
-    streamSegmentType
+    framesPerSecond
-    segments {
+    stream {
-      uploaded
+      id
-      valid
+      streamSegmentType
-      segmentIndex
+      segments {
-      endFrameIndex
+        uploaded
-      framesPerSecond
+        valid
+        segmentIndex
+        endFrameIndex
+        framesPerSecond
+      }
+    }
+    playlist {
+      segmentDurations
     }
-  }
-  playlist {
-    segmentDurations
-  }
-}
-
-query GetVideoForShotTime($videoId: Int!) {
-  getVideo(videoId: $videoId) {
-    ...VideoStreamMetadata
   }
 }
 
@@ -117,10 +143,47 @@ query GetVideo($videoId: Int!) {
       segmentDurations
     }
     homographyHistory {
-      ...HomographyInfo
+      frameIndex
+      crop {
+        left
+        top
+        width
+        height
+      }
+      pockets {
+        left
+        top
+        width
+        height
+      }
+      sourcePoints {
+        topLeft {
+          x
+          y
+        }
+        topSide {
+          x
+          y
+        }
+        topRight {
+          x
+          y
+        }
+        bottomLeft {
+          x
+          y
+        }
+        bottomSide {
+          x
+          y
+        }
+        bottomRight {
+          x
+          y
+        }
+      }
     }
     stream {
-      id
       streamSegmentType
       segments {
         segmentIndex
@@ -141,14 +204,12 @@ query GetAverageTimePerShotForVideo($videoId: Int!) {
     averageTimeBetweenShots
   }
 }
-
 query GetElapsedTimeForVideo($videoId: Int!) {
   getVideo(videoId: $videoId) {
     id
     elapsedTime
   }
 }
-
 query GetMedianRunForVideo($videoId: Int!) {
   getVideo(videoId: $videoId) {
     id
@@ -156,108 +217,23 @@ query GetMedianRunForVideo($videoId: Int!) {
   }
 }
 
-fragment StreamWithEndFrames on UploadStreamGQL {
-  id
-  streamSegmentType
-  segmentEndFrames @client
-  resolution {
-    width
-    height
-  }
-  segments {
-    uploaded
-    valid
-    segmentIndex
-    endFrameIndex
-    framesPerSecond
-  }
-}
-
-fragment SegmentEndFrames on SegmentEndFramesGQL {
-  id
-  segmentEndFrames
-}
-
-fragment SegmentStartTimes on SegmentStartTimesGQL {
-  id
-  segmentStartTimes
-}
-
-fragment PlaylistWithSegmentStartTimes on HLSPlaylistGQL {
-  videoId
-  segmentDurations
-  segmentStartTimes @client
-}
-
-fragment VideoDurationData on VideoGQL {
-  id
-  framesPerSecond
-  playlist {
-    ...PlaylistWithSegmentStartTimes
-  }
-  stream {
-    ...StreamWithEndFrames
-  }
-}
-
 query GetVideoForClipTimes($videoId: Int!) {
-  getVideo(videoId: $videoId) {
-    ...VideoDurationData
-  }
-}
-
-query GetHeaderInfoByVideoId($videoId: Int!) {
   getVideo(videoId: $videoId) {
     id
-    name
+    framesPerSecond
-    startTime
+    playlist {
-  }
+      segmentDurations
-}
-
-mutation FindPrerecordTableLayout($b64Image: String!, $videoId: Int!) {
-  findPrerecordTableLayout(b64Image: $b64Image, videoId: $videoId) {
-    ...HomographyInfo
-  }
-}
-
-fragment HomographyInfo on HomographyInfoGQL {
-  frameIndex
-  crop {
-    left
-    top
-    width
-    height
-  }
-  pockets {
-    left
-    top
-    width
-    height
-  }
-  sourcePoints {
-    topLeft {
-      x
-      y
     }
-    topSide {
+    stream {
-      x
+      id
-      y
+      streamSegmentType
-    }
+      segments {
-    topRight {
+        uploaded
-      x
+        valid
-      y
+        segmentIndex
-    }
+        endFrameIndex
-    bottomLeft {
+        framesPerSecond
-      x
+      }
-      y
-    }
-    bottomSide {
-      x
-      y
-    }
-    bottomRight {
-      x
-      y
     }
   }
 }

src/operations/video_upload.gql

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

src/schema.gql

@@ -9,44 +9,20 @@ type Query {
     videoId: ID!
     intervalDuration: Int! = 300
   ): [MakePercentageIntervalGQL!]!
-  getMedals(scope: MedalScope!, userId: Int = null): RequestedMedalsGQL!
-  getOrderedShots(
-    filterInput: FilterInput!
-    ids: [Int!] = null
-    shotsOrdering: GetShotsOrdering = null
-    limit: Int! = 500
-    countRespectsLimit: Boolean! = false
-  ): GetShotsResult!
-  getShotsWithMetadata(
-    filterInput: FilterInput!
-    ids: [Int!] = null
-    shotsPagination: GetShotsPagination = null
-    limit: Int! = 500
-    countRespectsLimit: Boolean! = false
-  ): GetShotsResult!
   getShots(
     filterInput: FilterInput!
     shotsPagination: GetShotsPagination = null
     limit: Int! = 500
-    countRespectsLimit: Boolean! = false
   ): [ShotGQL!]!
-  getShotsByIds(ids: [Int!]!): [ShotGQL!]!
   getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
   getUser(userId: Int!): UserGQL
-  doesUsernameExist(candidateUsername: String!): Boolean!
   getLoggedInUser: UserGQL
   getUsernames(
     matchString: String = null
     limit: Int = null
     after: String = null
   ): [String!]!
-  getUserRelationshipsMatching(
+  getPlayTime(userId: Int!): UserPlayTimeGQL!
-    userId: Int!
-    matchString: String = null
-    limit: Int = 100
-    after: String = null
-  ): UserRelationshipsResult!
-  getPlayTime(userId: Int!, filters: VideoFilterInput = null): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
     limit: Int! = 5
@@ -56,11 +32,6 @@ type Query {
   getUserTags: [TagGQL!]!
   getVideo(videoId: Int!, debuggingJson: JSON = null): VideoGQL!
   getVideos(videoIds: [Int!]!): [VideoGQL!]!
-  getFeedVideos(
-    limit: Int! = 5
-    after: String = null
-    filters: VideoFilterInput = null
-  ): VideoHistoryGQL!
 }
 
 type AggregateResultGQL {
@@ -77,21 +48,6 @@ 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 {
@@ -102,7 +58,6 @@ input AggregateInputGQL {
 input AggregationInput @oneOf {
   bucketSet: BucketSetInputGQL
   enum: EnumAggregation
-  datetimeRange: DatetimeRangeAggregationInput
 }
 
 input BucketSetInputGQL {
@@ -119,52 +74,19 @@ input EnumAggregation {
   feature: String!
 }
 
-input DatetimeRangeAggregationInput {
-  startDatetime: DateTime = null
-  endDatetime: DateTime = null
-  interval: TimeInterval!
-  feature: String! = "created_at"
-}
-
-"""
-Date with time (isoformat)
-"""
-scalar DateTime
-
-input TimeInterval @oneOf {
-  timedelta: TimeDeltaGQL
-  aligned: AlignedIntervalEnum
-}
-
-input TimeDeltaGQL {
-  days: Int = 0
-  weeks: Int = 0
-  months: Int = 0
-  years: Int = 0
-}
-
-enum AlignedIntervalEnum {
-  MONTH
-  YEAR
-  WEEK
-  DAY
-}
-
 input FilterInput @oneOf {
   andFilters: [FilterInput!]
   orFilters: [FilterInput!]
   notFilter: FilterInput
-  cueObjectDistance: FloatRangeFilter
+  cueObjectDistance: RangeFilter
-  targetPocketDistance: FloatRangeFilter
+  targetPocketDistance: RangeFilter
-  cueObjectAngle: FloatRangeFilter
+  cueObjectAngle: RangeFilter
-  cueBallSpeed: FloatRangeFilter
+  cueBallSpeed: RangeFilter
-  difficulty: FloatRangeFilter
+  difficulty: RangeFilter
   intendedPocketType: [PocketEnum!]
   shotDirection: [ShotDirectionEnum!]
   videoId: [Int!]
   userId: [Int!]
-  username: [String!]
-  fargoRating: FloatRangeFilter
   make: [Boolean!]
   tags: [VideoTagInput!]
   annotations: [ShotAnnotationInput!]
@@ -174,26 +96,18 @@ input FilterInput @oneOf {
   isLeftMiss: [Boolean!]
   isRightMiss: [Boolean!]
   isDirect: [Boolean!]
-  tableSize: FloatRangeFilter
+  tableSize: RangeFilter
-  bankAngle: FloatRangeFilter
+  bankAngle: RangeFilter
-  bankDistance: FloatRangeFilter
+  bankDistance: RangeFilter
-  kickAngle: FloatRangeFilter
+  kickAngle: RangeFilter
-  kickDistance: FloatRangeFilter
+  kickDistance: RangeFilter
-  cueAngleAfterObject: FloatRangeFilter
+  cueAngleAfterObject: RangeFilter
-  spinType: [SpinTypeEnum!]
+  cueSpeedAfterObject: RangeFilter
-  cueSpeedAfterObject: FloatRangeFilter
+  spinType: [String!]
-  falsePositiveScore: FloatRangeFilter
+  falsePositiveScore: RangeFilter
-  backcut: [Boolean!]
-  targetPocketAngleDirection: [ShotDirectionEnum!]
-  targetPocketAngle: FloatRangeFilter
-  missAngleInDegrees: FloatRangeFilter
-  marginOfErrorInDegrees: FloatRangeFilter
-  createdAt: DateRangeFilter
-  totalDistance: FloatRangeFilter
-  runLength: FloatRangeFilter
 }
 
-input FloatRangeFilter {
+input RangeFilter {
   lessThan: Float = null
   greaterThanEqualTo: Float = null
   greaterThan: Float = null
@@ -226,27 +140,6 @@ input ShotAnnotationInput {
   name: String!
 }
 
-enum SpinTypeEnum {
-  DRAW
-  FOLLOW
-  CENTER
-  UNKNOWN
-}
-
-input DateRangeFilter {
-  lessThan: Date = null
-  greaterThanEqualTo: Date = null
-  greaterThan: Date = null
-  includeOnNone: Boolean! = false
-  lessThanInclusive: Boolean! = false
-  greaterThanInclusive: Boolean! = true
-}
-
-"""
-Date (isoformat)
-"""
-scalar Date
-
 type BucketSetGQL {
   keyName: String!
   feature: String!
@@ -271,58 +164,6 @@ type MakePercentageIntervalGQL {
   elapsedTime: Float!
 }
 
-type RequestedMedalsGQL {
-  distanceOver66: MedalGQL
-  distanceOver78: MedalGQL
-  distanceOver90: MedalGQL
-  runLength3: MedalGQL
-  runLength5: MedalGQL
-  runLength8: MedalGQL
-  runLength10: MedalGQL
-  runLength15: MedalGQL
-  runLength20: MedalGQL
-  runLength25: MedalGQL
-  runLength30: MedalGQL
-  runLength40: MedalGQL
-  runLength50: MedalGQL
-  totalMakes25: MedalGQL
-  totalMakes50: MedalGQL
-  totalMakes75: MedalGQL
-  totalMakes100: MedalGQL
-  totalMakes200: MedalGQL
-  totalMakes300: MedalGQL
-  totalMakes400: MedalGQL
-  totalMakes500: MedalGQL
-  totalMakes750: MedalGQL
-  totalMakes1000: MedalGQL
-  dayStreak2: MedalGQL
-  dayStreak3: MedalGQL
-  dayStreak4: MedalGQL
-  dayStreak5: MedalGQL
-  dayStreak6: MedalGQL
-  dayStreak7: MedalGQL
-  dayStreak14: MedalGQL
-  dayStreak21: MedalGQL
-  dayStreak30: MedalGQL
-  dayStreak60: MedalGQL
-  dayStreak90: MedalGQL
-}
-
-type MedalGQL {
-  count: Int!
-}
-
-input MedalScope @oneOf {
-  videoId: Int
-  interval: TimeInterval
-}
-
-type GetShotsResult {
-  shots: [ShotGQL!]!
-  count: Int
-  ids: [Int!]!
-}
-
 type ShotGQL {
   id: Int!
   videoId: Int!
@@ -332,7 +173,6 @@ type ShotGQL {
   updatedAt: DateTime
   cueObjectFeatures: CueObjectFeaturesGQL
   pocketingIntentionFeatures: PocketingIntentionFeaturesGQL
-  pocketingIntentionInfo: PocketingIntentionInfoGQL
   bankFeatures: BankFeaturesGQL
   serializedShotPaths: SerializedShotPathsGQL
   user: UserGQL
@@ -341,12 +181,16 @@ type ShotGQL {
   video: VideoGQL
 }
 
+"""
+Date with time (isoformat)
+"""
+scalar DateTime
+
 type CueObjectFeaturesGQL {
   cueObjectDistance: Float
   cueObjectAngle: Float
   cueBallSpeed: Float
   shotDirection: ShotDirectionEnum
-  spinType: SpinTypeEnum
 }
 
 type PocketingIntentionFeaturesGQL {
@@ -354,25 +198,6 @@ type PocketingIntentionFeaturesGQL {
   make: Boolean
   intendedPocketType: PocketEnum
   difficulty: Float
-  targetPocketAngle: Float
-  targetPocketAngleDirection: ShotDirectionEnum
-  marginOfErrorInDegrees: Float
-  backcut: Boolean
-}
-
-type PocketingIntentionInfoGQL {
-  ballId: Int!
-  pocketId: PocketIdentifier!
-  pathMetadataIndex: Int!
-}
-
-enum PocketIdentifier {
-  TOP_LEFT
-  TOP_SIDE
-  TOP_RIGHT
-  BOTTOM_LEFT
-  BOTTOM_SIDE
-  BOTTOM_RIGHT
 }
 
 type BankFeaturesGQL {
@@ -392,17 +217,13 @@ type SerializedShotPathsGQL {
 
 type UserGQL {
   id: Int!
-  firebaseUid: String
+  firebaseUid: String!
   username: String!
-  isAdmin: Boolean
+  isAdmin: Boolean!
-  fargoRating: Int
   activeVideoId: Int
   profileImageUri: String
   createdAt: DateTime
   updatedAt: DateTime
-  videosPrivateByDefault: Boolean
-  following: [UserGQL!]
-  followers: [UserGQL!]
 }
 
 type ShotAnnotationGQL {
@@ -438,11 +259,9 @@ type VideoGQL {
   elapsedTime: Float
   framesPerSecond: Float!
   tableSize: Float!
-  private: Boolean!
   stream: UploadStreamGQL
   playlist: HLSPlaylistGQL
   tags: [VideoTag!]!
-  currentHomography: HomographyInfoGQL
   homographyHistory: [HomographyInfoGQL!]!
   currentProcessing: VideoProcessingGQL
 }
@@ -511,7 +330,6 @@ type VideoTagClass {
 }
 
 type HomographyInfoGQL {
-  id: Int!
   frameIndex: Int!
   crop: BoundingBoxGQL!
   pockets: [BoundingBoxGQL!]!
@@ -541,7 +359,6 @@ type IntPoint2D {
 }
 
 type VideoProcessingGQL {
-  id: Int!
   errors: [VideoProcessingErrorGQL!]!
   status: ProcessingStatusEnum!
   statuses: [VideoProcessingStatusGQL!]!
@@ -572,33 +389,6 @@ type VideoProcessingStatusGQL {
   updatedAt: DateTime
 }
 
-input GetShotsOrdering {
-  orderings: [ShotsOrderingComponent!]!
-}
-
-input ShotsOrderingComponent @oneOf {
-  videoCreation: DatetimeShotOrdering
-  marginOfError: FloatShotOrdering
-  videoId: IntShotOrdering
-  startFrame: IntShotOrdering
-  runLength: IntShotOrdering
-}
-
-input DatetimeShotOrdering {
-  descending: Boolean! = true
-  startingAt: DateTime = null
-}
-
-input FloatShotOrdering {
-  descending: Boolean! = true
-  startingAt: Float = null
-}
-
-input IntShotOrdering {
-  descending: Boolean! = true
-  startingAt: Int = null
-}
-
 input GetShotsPagination {
   createdAfter: CreatedAfter!
   startFrameAfter: Int!
@@ -609,27 +399,10 @@ input CreatedAfter @oneOf {
   createdAt: DateTime
 }
 
-type UserRelationshipsResult {
-  inquiringUser: UserGQL!
-  relationships: [UserRelationship!]!
-}
-
-type UserRelationship {
-  toUser: UserGQL!
-  toUserFollows: Boolean!
-  toUserIsFollowedBy: Boolean!
-}
-
 type UserPlayTimeGQL {
   totalSeconds: Float!
 }
 
-input VideoFilterInput {
-  isStreamCompleted: Boolean = null
-  requireCursorCompletion: Boolean! = true
-  createdAt: DateRangeFilter = null
-}
-
 type VideoHistoryGQL {
   videos: [VideoGQL!]!
   pageInfo: PageInfoGQL!
@@ -640,6 +413,11 @@ type PageInfoGQL {
   endCursor: String
 }
 
+input VideoFilterInput {
+  isStreamCompleted: Boolean = null
+  requireCursorCompletion: Boolean! = true
+}
+
 type TagGQL {
   name: String!
   id: Int!
@@ -662,18 +440,10 @@ type Mutation {
     annotationName: String!
     notes: String = null
   ): AddShotAnnotationReturn!
-  updateShotAnnotations(
-    shotId: Int!
-    annotations: [UpdateAnnotationInputGQL!]!
-  ): UpdateShotAnnotationReturn!
   getProfileImageUploadLink(
     fileExt: String = ".png"
   ): GetProfileUploadLinkReturn!
   editProfileImageUri(profileImageUri: String!): UserGQL!
-  editUser(input: EditUserInputGQL!): UserGQL!
-  followUser(followedUserId: Int!): UserGQL!
-  unfollowUser(followedUserId: Int!): UserGQL!
-  findPrerecordTableLayout(b64Image: String!, videoId: Int!): HomographyInfoGQL
   createUploadStream(
     videoMetadata: VideoMetadataInput!
   ): CreateUploadStreamReturn!
@@ -723,16 +493,6 @@ type OtherErrorNeedsNote {
   msg: String
 }
 
-type UpdateShotAnnotationReturn {
-  shot: ShotGQL
-  error: DoesNotOwnShotErr
-}
-
-input UpdateAnnotationInputGQL {
-  name: String!
-  notes: String = null
-}
-
 type GetProfileUploadLinkReturn {
   value: UploadLinkGetProfileUploadLinkErrors!
 }
@@ -759,12 +519,6 @@ type TooManyProfileImageUploadsErr {
   linksRequested: Int!
 }
 
-input EditUserInputGQL {
-  username: String = null
-  fargoRating: Int = null
-  videosPrivateByDefault: Boolean = null
-}
-
 type CreateUploadStreamReturn {
   videoId: Int!
 }
@@ -775,14 +529,32 @@ input VideoMetadataInput {
   endTime: DateTime = null
   gameType: String = null
   tableSize: Float = null
+  uploadStreamMetadataInput: UploadStreamMetadataInput = null
   lastIntendedSegmentBound: Int = null
   streamSegmentType: StreamSegmentTypeEnum = null
-  private: Boolean = null
   endStream: Boolean! = false
   resolution: VideoResolution = null
   framesPerSecond: Float = null
 }
 
+input UploadStreamMetadataInput {
+  deviceType: DeviceTypeEnum = null
+  osVersion: String = null
+  appVersion: String = null
+  browserName: String = null
+  browserVersion: String = null
+  locale: String = null
+  timezone: String = null
+  networkType: String = null
+  ipAddress: String = null
+}
+
+enum DeviceTypeEnum {
+  IOS
+  ANDROID
+  BROWSER
+}
+
 input VideoResolution {
   width: Int!
   height: Int!
@@ -796,17 +568,15 @@ type GetUploadLinkReturn {
 union UploadLinkGetUploadLinkErrors = UploadLink | GetUploadLinkErrors
 
 type GetUploadLinkErrors {
-  error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErrInitUploadAlreadyCompletedErrTooManyInitUploadsErr!
+  error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr!
 }
 
-union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErrInitUploadAlreadyCompletedErrTooManyInitUploadsErr =
+union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr =
     MustHaveSetForUploadLinkErr
   | SegmentAlreadyUploadedErr
   | ProcessingFailedErr
   | NoInitForChunkedUploadErr
   | TooManyProfileImageUploadsErr
-  | InitUploadAlreadyCompletedErr
-  | TooManyInitUploadsErr
 
 type MustHaveSetForUploadLinkErr {
   resolution: Boolean
@@ -824,11 +594,3 @@ type ProcessingFailedErr {
 type NoInitForChunkedUploadErr {
   segmentType: StreamSegmentTypeEnum!
 }
-
-type InitUploadAlreadyCompletedErr {
-  segmentType: StreamSegmentTypeEnum!
-}
-
-type TooManyInitUploadsErr {
-  linksRequested: Int!
-}