Merge pull request 'Add private to VideoGQL' (#125) from mk/not-clear into master

Reviewed-on: #125

.gitea/workflows/tests.yaml

@@ -13,5 +13,5 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - name: graphql-codegen causes no changes
+      - name: codegen causes no changes
         run: ./bin/assert-no-changes-wrapper.sh

.gitignore

@@ -3,3 +3,4 @@ dist
 .direnv
 /after.txt
 /before.txt
+**/__pycache__/**

README.md

@@ -0,0 +1 @@
+# rbgql

bin/assert-no-changes.sh

@@ -4,6 +4,12 @@ git ls-files | xargs md5sum > before.txt
 yarn install
 yarn graphql-codegen
 prettier ./src --write
+for proto in $(find ./rbproto -iname '*.proto'); do
+		name=$(basename "$proto" .proto)
+		protoc -I=./rbproto --python_out=./rbproto/python --pyi_out=./rbproto/python ./rbproto/shot.proto
+    yarn pbjs ./rbproto/shot.proto --ts ./rbproto/ts/shot.ts
+done
+prettier ./rbproto --write
 
 git ls-files | xargs md5sum > after.txt
 

codegen.yml

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

flake.nix

@@ -21,7 +21,7 @@
     in
       with pkgs; {
         devShell = mkShell {
-          buildInputs = [nodejs yarn watchman alejandra nodePackages.prettier just];
+          buildInputs = [nodejs yarn watchman alejandra nodePackages.prettier just protobuf];
         };
       });
 }

justfile

@@ -1,4 +1,5 @@
 NIX := "LD_LIBRARY_PATH='' nix"
+PROTOBUF_DIR := "$PWD/rbproto"
 
 prettier-gql:
 	#!/usr/bin/env bash
@@ -12,3 +13,27 @@ gql-codegen:
 
 
 gql: gql-codegen prettier-gql
+
+protobuf-compile-a-python name:
+	protoc -I={{ PROTOBUF_DIR }} --python_out={{ PROTOBUF_DIR }}/python --pyi_out={{ PROTOBUF_DIR }}/python {{ PROTOBUF_DIR }}/shot.proto
+
+protobuf-compile-a-js name:
+	#!/usr/bin/env bash
+	set -euxo pipefail
+	{{NIX}} develop --impure --command bash -c 'yarn pbjs {{ PROTOBUF_DIR }}/shot.proto --ts {{ PROTOBUF_DIR }}/ts/shot.ts && yarn prettier ./rbproto --write'
+
+protobuf-compile-all-js:
+	#!/usr/bin/env bash
+	for proto in $(find {{ PROTOBUF_DIR }} -iname '*.proto'); do
+		name=$(basename "$proto" .proto)
+		just protobuf-compile-a-js $name
+	done
+
+protobuf-compile-all-python:
+	#!/usr/bin/env bash
+	for proto in $(find {{ PROTOBUF_DIR }} -iname '*.proto'); do
+		name=$(basename "$proto" .proto)
+		just protobuf-compile-a-python $name
+	done
+
+protobuf-compile-everything: protobuf-compile-all-js protobuf-compile-all-python

package.json

@@ -18,6 +18,7 @@
     "@graphql-codegen/typescript-operations": "^4.0.1",
     "@graphql-codegen/typescript-react-apollo": "^4.2.0",
     "graphql": "^16.8.1",
+    "pbjs": "^0.0.14",
     "prettier": "^3.2.5",
     "prettier-plugin-organize-imports": "^3.2.4"
   },

pyproject.toml

@@ -0,0 +1,16 @@
+[tool.poetry]
+name = "rbproto"
+version = "0.1.0"
+description = ""
+authors = ["Mike Kalange <countablecloud@gmail.com>"]
+readme = "README.md"
+packages = [{include = "rbproto"}]
+
+[tool.poetry.dependencies]
+python = ">=3.10,<=3.13"
+protobuf = "^4.25.3"
+
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"

rbproto/__init__.py

@@ -0,0 +1 @@
+from .python.shot_pb2 import *  # noqa: F401

rbproto/python/shot_pb2.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: shot.proto
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_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')
+
+_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
+  _globals['_POINT']._serialized_end=125
+  _globals['_BALLDETECTION']._serialized_start=127
+  _globals['_BALLDETECTION']._serialized_end=254
+  _globals['_RLEBALLDETECTION']._serialized_start=256
+  _globals['_RLEBALLDETECTION']._serialized_end=340
+  _globals['_RLEDETECTIONHISTORY']._serialized_start=342
+  _globals['_RLEDETECTIONHISTORY']._serialized_end=418
+  _globals['_DETECTIONHISTORY']._serialized_start=420
+  _globals['_DETECTIONHISTORY']._serialized_end=490
+  _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=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

@@ -0,0 +1,135 @@
+from google.protobuf.internal import containers as _containers
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union
+
+DESCRIPTOR: _descriptor.FileDescriptor
+
+class Box(_message.Message):
+    __slots__ = ["left", "top", "width", "height"]
+    LEFT_FIELD_NUMBER: _ClassVar[int]
+    TOP_FIELD_NUMBER: _ClassVar[int]
+    WIDTH_FIELD_NUMBER: _ClassVar[int]
+    HEIGHT_FIELD_NUMBER: _ClassVar[int]
+    left: float
+    top: float
+    width: float
+    height: float
+    def __init__(self, left: _Optional[float] = ..., top: _Optional[float] = ..., width: _Optional[float] = ..., height: _Optional[float] = ...) -> None: ...
+
+class Point(_message.Message):
+    __slots__ = ["x", "y"]
+    X_FIELD_NUMBER: _ClassVar[int]
+    Y_FIELD_NUMBER: _ClassVar[int]
+    x: float
+    y: float
+    def __init__(self, x: _Optional[float] = ..., y: _Optional[float] = ...) -> None: ...
+
+class BallDetection(_message.Message):
+    __slots__ = ["plane_position", "annotation", "interpolated"]
+    PLANE_POSITION_FIELD_NUMBER: _ClassVar[int]
+    ANNOTATION_FIELD_NUMBER: _ClassVar[int]
+    INTERPOLATED_FIELD_NUMBER: _ClassVar[int]
+    plane_position: Point
+    annotation: Box
+    interpolated: bool
+    def __init__(self, plane_position: _Optional[_Union[Point, _Mapping]] = ..., annotation: _Optional[_Union[Box, _Mapping]] = ..., interpolated: bool = ...) -> None: ...
+
+class RLEBallDetection(_message.Message):
+    __slots__ = ["detection", "count"]
+    DETECTION_FIELD_NUMBER: _ClassVar[int]
+    COUNT_FIELD_NUMBER: _ClassVar[int]
+    detection: BallDetection
+    count: int
+    def __init__(self, detection: _Optional[_Union[BallDetection, _Mapping]] = ..., count: _Optional[int] = ...) -> None: ...
+
+class RLEDetectionHistory(_message.Message):
+    __slots__ = ["detections"]
+    DETECTIONS_FIELD_NUMBER: _ClassVar[int]
+    detections: _containers.RepeatedCompositeFieldContainer[RLEBallDetection]
+    def __init__(self, detections: _Optional[_Iterable[_Union[RLEBallDetection, _Mapping]]] = ...) -> None: ...
+
+class DetectionHistory(_message.Message):
+    __slots__ = ["detections"]
+    DETECTIONS_FIELD_NUMBER: _ClassVar[int]
+    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"]
+    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
+    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"]
+    BALL_IDENTIFIER_FIELD_NUMBER: _ClassVar[int]
+    PATHS_FIELD_NUMBER: _ClassVar[int]
+    ball_identifier: int
+    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"]
+    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
+    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

@@ -0,0 +1,77 @@
+syntax = "proto3";
+
+package serialized_shot;
+
+message Box {
+  float left = 1;
+  float top = 2;
+  float width = 3;
+  float height = 4;
+}
+
+message Point {
+  float x = 1;
+  float y = 2;
+}
+
+message BallDetection {
+  Point plane_position = 1;
+  Box annotation = 2;
+  bool interpolated = 3;
+}
+
+message RLEBallDetection {
+  BallDetection detection = 1;
+  uint32 count = 2;
+}
+
+message RLEDetectionHistory { repeated RLEBallDetection detections = 1; }
+
+message DetectionHistory { repeated BallDetection detections = 1; }
+
+message CollisionInfo {
+  uint32 source = 1;
+  map<uint32, Point> ball_identifiers = 2;
+  uint32 wall_identifier = 3;
+  uint32 frame_index = 4;
+  bool static = 5;
+}
+
+message Path {
+  uint32 start_frame = 1;
+  uint32 end_frame = 2;
+  oneof detection_history {
+    DetectionHistory detections = 3;
+    RLEDetectionHistory rle_detections = 4;
+    bool not_present = 5;
+  }
+  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;
+}

src/client-schema.gql

@@ -0,0 +1,25 @@
+# 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/config.gql

@@ -4,5 +4,6 @@ query getDeployedConfig {
     devMode
     environment
     firebase
+    minimumAllowedAppVersion
   }
 }

src/operations/feed.gql

@@ -1,3 +1,4 @@
+# DO NOT USE: use getVideoFeed instead
 query GetFeed(
   $limit: Int! = 5
   $after: String = null
@@ -21,8 +22,10 @@ query GetFeed(
       elapsedTime
       screenshotUri
       stream {
+        id
         isCompleted
       }
+      tableSize
       tags {
         tagClasses {
           name
@@ -36,3 +39,60 @@ query GetFeed(
     }
   }
 }
+
+fragment VideoCardFields on VideoGQL {
+  id
+  owner {
+    id
+    username
+    profileImageUri
+  }
+  name
+  screenshotUri
+  totalShotsMade
+  totalShots
+  makePercentage
+  createdAt
+  updatedAt
+  startTime
+  endTime
+  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,38 +1,176 @@
-query GetShots(
-  $filterInput: FilterInput!
-  $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
-) {
+query GetSerializedShotPaths($filterInput: FilterInput!) {
   getShots(filterInput: $filterInput) {
     id
     videoId
     startFrame
     endFrame
-    user {
-      id
-    }
-    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)
+    serializedShotPaths {
+      b64EncodedBuffer
     }
   }
 }
+
+query GetShotAnnotationTypes {
+  getShotAnnotationTypes {
+    id
+    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
+) {
+  getOrderedShots(
+    filterInput: $filterInput
+    shotsOrdering: $shotsOrdering
+    limit: $limit
+  ) {
+    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

@@ -1,9 +1,20 @@
 mutation getProfileImageUploadLink($fileExt: String = ".png") {
   getProfileImageUploadLink(fileExt: $fileExt) {
-    uploadUrl
-    headers {
-      key
-      value
+    value {
+      ... on UploadLink {
+        uploadUrl
+        headers {
+          key
+          value
+        }
+      }
+      ... on GetProfileUploadLinkErrors {
+        error {
+          ... on TooManyProfileImageUploadsErr {
+            linksRequested
+          }
+        }
+      }
     }
   }
 }
@@ -24,7 +35,9 @@ query getLoggedInUser {
     id
     firebaseUid
     username
+    isAdmin
     profileImageUri
+    fargoRating
     activeVideoId
     createdAt
     updatedAt
@@ -36,3 +49,89 @@ query GetUserPlayTime($userId: Int!) {
     totalSeconds
   }
 }
+
+query getUsernames(
+  $matchString: String!
+  $limit: Int = null
+  $after: String = null
+) {
+  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)
+}

src/operations/video.gql

@@ -1,56 +1,21 @@
-query GetStreamMonitoringDetails($videoId: Int!) {
-  getVideo(videoId: $videoId) {
+query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
+  getVideo(videoId: $videoId, debuggingJson: $debuggingJson) {
     id
     totalShots
     makePercentage
     elapsedTime
-    homographyHistory {
-      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
-        }
-      }
+    currentHomography {
+      ...HomographyInfo
     }
     stream {
+      id
       linksRequested
       uploadsCompleted
       segmentProcessingCursor
       isCompleted
       uploadCompletionCursor
       lastIntendedSegmentBound
+      initPlaylistUploadStatus
     }
     currentProcessing {
       errors {
@@ -69,6 +34,7 @@ query GetVideoUpdatePageDetails($videoId: Int!) {
     totalShots
     makePercentage
     elapsedTime
+    tableSize
     tags {
       tagClasses {
         name
@@ -91,14 +57,13 @@ query GetVideoDetails($videoId: Int!) {
     elapsedTime
     endTime
     makePercentage
-    makePercentage
     medianRun
     startTime
     totalShots
-    totalShots
     totalShotsMade
     createdAt
     updatedAt
+    tableSize
     owner {
       id
       firebaseUid
@@ -116,21 +81,33 @@ query GetVideoDetails($videoId: Int!) {
 
 query GetVideos($videoIds: [Int!]!) {
   getVideos(videoIds: $videoIds) {
+    ...VideoStreamMetadata
+  }
+}
+
+fragment VideoStreamMetadata on VideoGQL {
+  id
+  framesPerSecond
+  stream {
     id
-    playlist {
-      segmentDurations
-    }
-    stream {
-      id
-      segments {
-        uploaded
-        valid
-        segmentIndex
-        endFrameIndex
-        framesPerSecond
-      }
+    streamSegmentType
+    segments {
+      uploaded
+      valid
+      segmentIndex
+      endFrameIndex
+      framesPerSecond
     }
   }
+  playlist {
+    segmentDurations
+  }
+}
+
+query GetVideoForShotTime($videoId: Int!) {
+  getVideo(videoId: $videoId) {
+    ...VideoStreamMetadata
+  }
 }
 
 query GetVideo($videoId: Int!) {
@@ -139,12 +116,148 @@ query GetVideo($videoId: Int!) {
     playlist {
       segmentDurations
     }
+    homographyHistory {
+      ...HomographyInfo
+    }
     stream {
+      id
+      streamSegmentType
       segments {
         segmentIndex
         endFrameIndex
         framesPerSecond
       }
+      resolution {
+        width
+        height
+      }
+    }
+  }
+}
+
+query GetAverageTimePerShotForVideo($videoId: Int!) {
+  getVideo(videoId: $videoId) {
+    id
+    averageTimeBetweenShots
+  }
+}
+
+query GetElapsedTimeForVideo($videoId: Int!) {
+  getVideo(videoId: $videoId) {
+    id
+    elapsedTime
+  }
+}
+
+query GetMedianRunForVideo($videoId: Int!) {
+  getVideo(videoId: $videoId) {
+    id
+    medianRun
+  }
+}
+
+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
+    startTime
+  }
+}
+
+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 {
+      x
+      y
+    }
+    topRight {
+      x
+      y
+    }
+    bottomLeft {
+      x
+      y
+    }
+    bottomSide {
+      x
+      y
+    }
+    bottomRight {
+      x
+      y
     }
   }
 }

src/operations/video_upload.gql

@@ -6,14 +6,79 @@ mutation CreateUploadStream($videoMetadataInput: VideoMetadataInput!) {
 
 mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
   getUploadLink(videoId: $videoId, segmentIndex: $segmentIndex) {
-    uploadUrl
-    headers {
-      key
-      value
+    value {
+      ... on UploadLink {
+        uploadUrl
+        headers {
+          key
+          value
+        }
+      }
+      ... on GetUploadLinkErrors {
+        error {
+          ... on MustHaveSetForUploadLinkErr {
+            resolution
+            framesPerSecond
+          }
+          ... on SegmentAlreadyUploadedErr {
+            segmentId
+          }
+          ... on ProcessingFailedErr {
+            processing {
+              status
+              errors {
+                message
+              }
+            }
+          }
+        }
+      }
+    }
+    stream {
+      uploadCompletionCursor
     }
   }
 }
 
+mutation GetHlsInitUploadLink($videoId: Int!) {
+  getHlsInitUploadLink(videoId: $videoId) {
+    value {
+      ... on UploadLink {
+        uploadUrl
+        headers {
+          key
+          value
+        }
+      }
+      ... on GetUploadLinkErrors {
+        error {
+          ... on NoInitForChunkedUploadErr {
+            segmentType
+          }
+          ... on InitUploadAlreadyCompletedErr {
+            segmentType
+          }
+          ... on TooManyInitUploadsErr {
+            linksRequested
+          }
+        }
+      }
+    }
+  }
+}
+
+mutation SetSegmentDuration(
+  $videoId: Int!
+  $segmentIndex: Int!
+  $duration: Float!
+) {
+  setSegmentDuration(
+    videoId: $videoId
+    segmentIndex: $segmentIndex
+    duration: $duration
+  )
+}
+
 mutation EditUploadStream(
   $videoId: Int!
   $videoMetadataInput: VideoMetadataInput!
@@ -50,6 +115,7 @@ query GetUploadStreamsWithDetails(
         isCompleted
         lastIntendedSegmentBound
         uploadCompletionCursor
+        uploadsCompleted
       }
     }
     pageInfo {

src/schema.gql

@@ -4,13 +4,48 @@ type Query {
   ): [AggregateResultGQL!]!
   getBucketSet(keyName: String!): BucketSetGQL
   getDeployedConfig: DeployedConfigGQL!
+  waitFor(duration: Float!): Float!
   getVideoMakePercentageIntervals(
     videoId: ID!
     intervalDuration: Int! = 300
   ): [MakePercentageIntervalGQL!]!
-  getShots(filterInput: FilterInput!): [ShotGQL!]!
+  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(
+    userId: Int!
+    matchString: String = null
+    limit: Int = 100
+    after: String = null
+  ): UserRelationshipsResult!
   getPlayTime(userId: Int!): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
@@ -18,8 +53,14 @@ type Query {
     after: String = null
     filters: VideoFilterInput = null
   ): VideoHistoryGQL!
-  getVideo(videoId: Int!): VideoGQL!
+  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 {
@@ -36,6 +77,21 @@ type TargetMetricsGQL {
   count: Int!
   makePercentage: Float
   averageDifficulty: Float
+  spinTypeCounts: SpinTypeCountsGQL
+  shotDirectionCounts: ShotDirectionCountsGQL
+}
+
+type SpinTypeCountsGQL {
+  follow: Int!
+  draw: Int!
+  center: Int!
+  unknown: Int!
+}
+
+type ShotDirectionCountsGQL {
+  left: Int!
+  right: Int!
+  straight: Int!
 }
 
 input AggregateInputGQL {
@@ -43,9 +99,10 @@ input AggregateInputGQL {
   filterInput: FilterInput
 }
 
-input AggregationInput {
-  bucketSet: BucketSetInputGQL = null
-  enum: EnumAggregation = null
+input AggregationInput @oneOf {
+  bucketSet: BucketSetInputGQL
+  enum: EnumAggregation
+  datetimeRange: DatetimeRangeAggregationInput
 }
 
 input BucketSetInputGQL {
@@ -62,33 +119,87 @@ input EnumAggregation {
   feature: String!
 }
 
-input FilterInput {
-  andFilters: AndFilter = null
-  orFilters: OrFilter = null
-  cueObjectDistance: RangeFilter = null
-  targetPocketDistance: RangeFilter = null
-  cueObjectAngle: RangeFilter = null
-  cueBallSpeed: RangeFilter = null
-  difficulty: RangeFilter = null
-  intendedPocketType: [PocketEnum!] = null
-  shotDirection: [ShotDirectionEnum!] = null
-  videoId: [Int!] = null
-  userId: [Int!] = null
-  make: [Boolean!] = null
-  tags: [VideoTagInput!] = null
+input DatetimeRangeAggregationInput {
+  startDatetime: DateTime = null
+  endDatetime: DateTime = null
+  interval: TimeInterval!
+  feature: String! = "created_at"
 }
 
-input AndFilter {
-  filters: [FilterInput!]!
+"""
+Date with time (isoformat)
+"""
+scalar DateTime
+
+input TimeInterval @oneOf {
+  timedelta: TimeDeltaGQL
+  aligned: AlignedIntervalEnum
 }
 
-input OrFilter {
-  filters: [FilterInput!]!
+input TimeDeltaGQL {
+  days: Int = 0
+  weeks: Int = 0
+  months: Int = 0
+  years: Int = 0
 }
 
-input RangeFilter {
+enum AlignedIntervalEnum {
+  MONTH
+  YEAR
+  WEEK
+  DAY
+}
+
+input FilterInput @oneOf {
+  andFilters: [FilterInput!]
+  orFilters: [FilterInput!]
+  notFilter: FilterInput
+  cueObjectDistance: FloatRangeFilter
+  targetPocketDistance: FloatRangeFilter
+  cueObjectAngle: FloatRangeFilter
+  cueBallSpeed: FloatRangeFilter
+  difficulty: FloatRangeFilter
+  intendedPocketType: [PocketEnum!]
+  shotDirection: [ShotDirectionEnum!]
+  videoId: [Int!]
+  userId: [Int!]
+  username: [String!]
+  fargoRating: FloatRangeFilter
+  make: [Boolean!]
+  tags: [VideoTagInput!]
+  annotations: [ShotAnnotationInput!]
+  isStraight: [Boolean!]
+  isRight: [Boolean!]
+  isLeft: [Boolean!]
+  isLeftMiss: [Boolean!]
+  isRightMiss: [Boolean!]
+  isDirect: [Boolean!]
+  tableSize: FloatRangeFilter
+  bankAngle: FloatRangeFilter
+  bankDistance: FloatRangeFilter
+  kickAngle: FloatRangeFilter
+  kickDistance: FloatRangeFilter
+  cueAngleAfterObject: FloatRangeFilter
+  spinType: [SpinTypeEnum!]
+  cueSpeedAfterObject: FloatRangeFilter
+  falsePositiveScore: FloatRangeFilter
+  backcut: [Boolean!]
+  targetPocketAngleDirection: [ShotDirectionEnum!]
+  targetPocketAngle: FloatRangeFilter
+  missAngleInDegrees: FloatRangeFilter
+  marginOfErrorInDegrees: FloatRangeFilter
+  createdAt: DateRangeFilter
+  totalDistance: FloatRangeFilter
+  runLength: FloatRangeFilter
+}
+
+input FloatRangeFilter {
   lessThan: Float = null
   greaterThanEqualTo: Float = null
+  greaterThan: Float = null
+  includeOnNone: Boolean! = false
+  lessThanInclusive: Boolean! = false
+  greaterThanInclusive: Boolean! = true
 }
 
 enum PocketEnum {
@@ -111,6 +222,31 @@ input VideoTagClassInput {
   name: String!
 }
 
+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!
@@ -127,6 +263,7 @@ type DeployedConfigGQL {
   firebase: Boolean!
   devMode: Boolean!
   environment: String!
+  minimumAllowedAppVersion: String!
 }
 
 type MakePercentageIntervalGQL {
@@ -134,6 +271,58 @@ 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!
@@ -143,20 +332,21 @@ type ShotGQL {
   updatedAt: DateTime
   cueObjectFeatures: CueObjectFeaturesGQL
   pocketingIntentionFeatures: PocketingIntentionFeaturesGQL
+  pocketingIntentionInfo: PocketingIntentionInfoGQL
   bankFeatures: BankFeaturesGQL
+  serializedShotPaths: SerializedShotPathsGQL
   user: UserGQL
+  annotations: [ShotAnnotationGQL!]!
+  falsePositiveScore: Float
+  video: VideoGQL
 }
 
-"""
-Date with time (isoformat)
-"""
-scalar DateTime
-
 type CueObjectFeaturesGQL {
   cueObjectDistance: Float
   cueObjectAngle: Float
   cueBallSpeed: Float
   shotDirection: ShotDirectionEnum
+  spinType: SpinTypeEnum
 }
 
 type PocketingIntentionFeaturesGQL {
@@ -164,6 +354,25 @@ 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 {
@@ -177,23 +386,38 @@ enum WallTypeEnum {
   SHORT
 }
 
+type SerializedShotPathsGQL {
+  b64EncodedBuffer: String
+}
+
 type UserGQL {
   id: Int!
-  firebaseUid: String!
+  firebaseUid: String
   username: String!
+  isAdmin: Boolean
+  fargoRating: Int
   activeVideoId: Int
   profileImageUri: String
   createdAt: DateTime
   updatedAt: DateTime
+  videosPrivateByDefault: Boolean
+  following: [UserGQL!]
+  followers: [UserGQL!]
 }
 
-type UserPlayTimeGQL {
-  totalSeconds: Float!
+type ShotAnnotationGQL {
+  shotId: Int!
+  type: ShotAnnotationTypeGQL!
+  creator: UserGQL!
+  notes: String!
+  errorDefault: Boolean!
+  createdAt: DateTime
+  updatedAt: DateTime
 }
 
-type VideoHistoryGQL {
-  videos: [VideoGQL!]!
-  pageInfo: PageInfoGQL!
+type ShotAnnotationTypeGQL {
+  id: Int!
+  name: String!
 }
 
 type VideoGQL {
@@ -213,9 +437,12 @@ type VideoGQL {
   endTime: DateTime
   elapsedTime: Float
   framesPerSecond: Float!
+  tableSize: Float!
+  private: Boolean!
   stream: UploadStreamGQL
   playlist: HLSPlaylistGQL
   tags: [VideoTag!]!
+  currentHomography: HomographyInfoGQL
   homographyHistory: [HomographyInfoGQL!]!
   currentProcessing: VideoProcessingGQL
 }
@@ -227,12 +454,21 @@ type UploadStreamGQL {
   segmentProcessingCursor: Int!
   lastIntendedSegmentBound: Int
   isCompleted: Boolean!
+  initPlaylistUploadStatus: InitPlaylistUploadStatusEnum
   lowestUnuploadedSegmentIndex: Int!
   uploadCompletionCursor: Int!
   errors: [StreamErrorGQL!]!
   createdAt: DateTime!
   updatedAt: DateTime!
   segments: [UploadSegmentGQL!]!
+  resolution: VideoResolutionGQL!
+  streamSegmentType: StreamSegmentTypeEnum!
+}
+
+enum InitPlaylistUploadStatusEnum {
+  NOT_APPLICABLE
+  NOT_UPLOADED
+  UPLOADED
 }
 
 type StreamErrorGQL {
@@ -245,10 +481,20 @@ type UploadSegmentGQL {
   valid: Boolean!
   endFrameIndex: Int
   framesPerSecond: Float
-  durationsInSeconds: Float
+  durationInSeconds: Float
   linksRequested: Int!
 }
 
+type VideoResolutionGQL {
+  width: Int
+  height: Int
+}
+
+enum StreamSegmentTypeEnum {
+  FRAGMENTED_MP4
+  RB_CHUNKED_MP4
+}
+
 type HLSPlaylistGQL {
   videoId: Int!
   m3u8Text: String!
@@ -265,6 +511,7 @@ type VideoTagClass {
 }
 
 type HomographyInfoGQL {
+  id: Int!
   frameIndex: Int!
   crop: BoundingBoxGQL!
   pockets: [BoundingBoxGQL!]!
@@ -294,7 +541,10 @@ type IntPoint2D {
 }
 
 type VideoProcessingGQL {
+  id: Int!
   errors: [VideoProcessingErrorGQL!]!
+  status: ProcessingStatusEnum!
+  statuses: [VideoProcessingStatusGQL!]!
 }
 
 type VideoProcessingErrorGQL {
@@ -303,6 +553,82 @@ type VideoProcessingErrorGQL {
   endSegmentIndex: Int
 }
 
+enum ProcessingStatusEnum {
+  STARTED
+  FAILED
+  SUCCEEDED
+  SUSPENDED
+  CREATED
+  QUEUED
+  RUNNING
+  REEXTRACTING_FEATURES
+}
+
+type VideoProcessingStatusGQL {
+  status: ProcessingStatusEnum!
+  appVersion: String!
+  sequenceId: Int!
+  createdAt: DateTime
+  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!
+}
+
+input CreatedAfter @oneOf {
+  videoId: Int
+  createdAt: DateTime
+}
+
+type UserRelationshipsResult {
+  inquiringUser: UserGQL!
+  relationships: [UserRelationship!]!
+}
+
+type UserRelationship {
+  toUser: UserGQL!
+  toUserFollows: Boolean!
+  toUserIsFollowedBy: Boolean!
+}
+
+type UserPlayTimeGQL {
+  totalSeconds: Float!
+}
+
+type VideoHistoryGQL {
+  videos: [VideoGQL!]!
+  pageInfo: PageInfoGQL!
+}
+
 type PageInfoGQL {
   hasNextPage: Boolean!
   endCursor: String
@@ -313,15 +639,50 @@ input VideoFilterInput {
   requireCursorCompletion: Boolean! = true
 }
 
+type TagGQL {
+  name: String!
+  id: Int!
+  group: String
+}
+
+"""
+The `JSON` scalar type represents JSON values as specified by [ECMA-404](https://ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf).
+"""
+scalar JSON
+  @specifiedBy(
+    url: "https://ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf"
+  )
+
 type Mutation {
   createBucketSet(params: CreateBucketSetInput!): BucketSetGQL!
   setLoggerLevel(path: String!, level: String!): Boolean!
-  getProfileImageUploadLink(fileExt: String = ".png"): GetUploadLinkReturn!
+  addAnnotationToShot(
+    shotId: Int!
+    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!
   getUploadLink(videoId: Int!, segmentIndex: Int!): GetUploadLinkReturn!
+  getHlsInitUploadLink(videoId: Int!): GetUploadLinkReturn!
+  setSegmentDuration(
+    videoId: Int!
+    segmentIndex: Int!
+    duration: Float!
+  ): Boolean!
   editUploadStream(videoId: Int!, videoMetadata: VideoMetadataInput!): Boolean!
   deleteVideo(videoId: Int!): Boolean!
 }
@@ -332,7 +693,54 @@ input CreateBucketSetInput {
   buckets: [BucketInputGQL!]!
 }
 
-type GetUploadLinkReturn {
+type AddShotAnnotationReturn {
+  value: SuccessfulAddAddShotAnnotationErrors!
+}
+
+union SuccessfulAddAddShotAnnotationErrors =
+    SuccessfulAdd
+  | AddShotAnnotationErrors
+
+type SuccessfulAdd {
+  value: Boolean!
+}
+
+type AddShotAnnotationErrors {
+  error: DoesNotOwnShotErrOtherErrorNeedsNote!
+}
+
+union DoesNotOwnShotErrOtherErrorNeedsNote =
+    DoesNotOwnShotErr
+  | OtherErrorNeedsNote
+
+type DoesNotOwnShotErr {
+  shotId: Int!
+  msg: String
+}
+
+type OtherErrorNeedsNote {
+  msg: String
+}
+
+type UpdateShotAnnotationReturn {
+  shot: ShotGQL
+  error: DoesNotOwnShotErr
+}
+
+input UpdateAnnotationInputGQL {
+  name: String!
+  notes: String = null
+}
+
+type GetProfileUploadLinkReturn {
+  value: UploadLinkGetProfileUploadLinkErrors!
+}
+
+union UploadLinkGetProfileUploadLinkErrors =
+    UploadLink
+  | GetProfileUploadLinkErrors
+
+type UploadLink {
   uploadUrl: String!
   headers: [Header]!
 }
@@ -342,6 +750,20 @@ type Header {
   value: String!
 }
 
+type GetProfileUploadLinkErrors {
+  error: TooManyProfileImageUploadsErr!
+}
+
+type TooManyProfileImageUploadsErr {
+  linksRequested: Int!
+}
+
+input EditUserInputGQL {
+  username: String = null
+  fargoRating: Int = null
+  videosPrivateByDefault: Boolean = null
+}
+
 type CreateUploadStreamReturn {
   videoId: Int!
 }
@@ -351,26 +773,61 @@ input VideoMetadataInput {
   startTime: DateTime = null
   endTime: DateTime = null
   gameType: String = null
-  tableSize: String = null
-  uploadStreamMetadataInput: UploadStreamMetadataInput = null
+  tableSize: Float = 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
+input VideoResolution {
+  width: Int!
+  height: Int!
 }
 
-enum DeviceTypeEnum {
-  IOS
-  ANDROID
-  BROWSER
+type GetUploadLinkReturn {
+  value: UploadLinkGetUploadLinkErrors!
+  stream: UploadStreamGQL
+}
+
+union UploadLinkGetUploadLinkErrors = UploadLink | GetUploadLinkErrors
+
+type GetUploadLinkErrors {
+  error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErrInitUploadAlreadyCompletedErrTooManyInitUploadsErr!
+}
+
+union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErrInitUploadAlreadyCompletedErrTooManyInitUploadsErr =
+    MustHaveSetForUploadLinkErr
+  | SegmentAlreadyUploadedErr
+  | ProcessingFailedErr
+  | NoInitForChunkedUploadErr
+  | TooManyProfileImageUploadsErr
+  | InitUploadAlreadyCompletedErr
+  | TooManyInitUploadsErr
+
+type MustHaveSetForUploadLinkErr {
+  resolution: Boolean
+  framesPerSecond: Boolean
+}
+
+type SegmentAlreadyUploadedErr {
+  segmentId: Int!
+}
+
+type ProcessingFailedErr {
+  processing: VideoProcessingGQL!
+}
+
+type NoInitForChunkedUploadErr {
+  segmentType: StreamSegmentTypeEnum!
+}
+
+type InitUploadAlreadyCompletedErr {
+  segmentType: StreamSegmentTypeEnum!
+}
+
+type TooManyInitUploadsErr {
+  linksRequested: Int!
 }

yarn.lock

@@ -1553,6 +1553,11 @@ colorette@^2.0.16:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
+commander@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.0.1.tgz#b67622721785993182e807f4883633e6401ba53c"
+  integrity sha512-IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA==
+
 common-tags@1.8.2:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
@@ -2538,6 +2543,14 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+pbjs@^0.0.14:
+  version "0.0.14"
+  resolved "https://registry.yarnpkg.com/pbjs/-/pbjs-0.0.14.tgz#5ab3d4a5f06a9ab78dd320c63f72877120d4c48d"
+  integrity sha512-F4aA0ojrQ37kxFPOg4yRLP/vxb76rYQwMQigmVEljYlA7hZKmjaWjP6IkRn4nA0NdIj4Xxe4iqWrrIhJy+MwWQ==
+  dependencies:
+    commander "4.0.1"
+    protocol-buffers-schema "3.1.0"
+
 picocolors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
@@ -2574,6 +2587,11 @@ prop-types@^15.7.2:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
+protocol-buffers-schema@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.1.0.tgz#d8a819549ead3e6bd189ebe9e50e96636bbc5cc7"
+  integrity sha512-1g9zFjLFhGN1Dc5UVO8D2loVslp6sVxk5sJqgD66CuWUITh2gOaTLRN/pIakGFfB6e0nNF6hImrYFDurEsA1UQ==
+
 punycode@^1.3.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"