Merge pull request 'Add stream type to get videos' (#43) from kat/add-stream-type-get-videos into master

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

.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
 

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.12"
+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,41 @@
+# -*- 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\"\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['_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['_PATH']._serialized_start=493
+  _globals['_PATH']._serialized_end=723
+  _globals['_IDENTIFIERHISTORY']._serialized_start=725
+  _globals['_IDENTIFIERHISTORY']._serialized_end=807
+  _globals['_SHOT']._serialized_start=809
+  _globals['_SHOT']._serialized_end=881
+# @@protoc_insertion_point(module_scope)

rbproto/python/shot_pb2.pyi

@@ -0,0 +1,86 @@
+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 Path(_message.Message):
+    __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_frame: int
+    end_frame: int
+    detections: DetectionHistory
+    rle_detections: RLEDetectionHistory
+    not_present: bool
+    is_static: bool
+    def __init__(self, start_frame: _Optional[int] = ..., end_frame: _Optional[int] = ..., detections: _Optional[_Union[DetectionHistory, _Mapping]] = ..., rle_detections: _Optional[_Union[RLEDetectionHistory, _Mapping]] = ..., not_present: bool = ..., is_static: bool = ...) -> None: ...
+
+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 Shot(_message.Message):
+    __slots__ = ["identifier_histories"]
+    IDENTIFIER_HISTORIES_FIELD_NUMBER: _ClassVar[int]
+    identifier_histories: _containers.RepeatedCompositeFieldContainer[IdentifierHistory]
+    def __init__(self, identifier_histories: _Optional[_Iterable[_Union[IdentifierHistory, _Mapping]]] = ...) -> None: ...

rbproto/shot.proto

@@ -0,0 +1,54 @@
+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 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;
+}
+
+message IdentifierHistory {
+  uint32 ball_identifier = 1;
+  repeated Path paths = 2;
+}
+
+message Shot {
+  repeated IdentifierHistory identifier_histories = 3;
+}

src/operations/config.gql

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

src/operations/feed.gql

@@ -23,6 +23,7 @@ query GetFeed(
       stream {
         isCompleted
       }
+      tableSize
       tags {
         tagClasses {
           name

src/operations/shots.gql

@@ -1,5 +1,7 @@
 query GetShots(
   $filterInput: FilterInput!
+  $shotsPagination: GetShotsPagination
+  $limit: Int
   $includeCreatedAt: Boolean! = false
   $includeUpdatedAt: Boolean! = false
   $includeCueObjectFeatures: Boolean! = false
@@ -12,7 +14,11 @@ query GetShots(
   $includeMake: Boolean! = false
   $includeIntendedPocketType: Boolean! = false
 ) {
-  getShots(filterInput: $filterInput) {
+  getShots(
+    filterInput: $filterInput
+    shotsPagination: $shotsPagination
+    limit: $limit
+  ) {
     id
     videoId
     startFrame
@@ -20,6 +26,7 @@ query GetShots(
     user {
       id
     }
+    falsePositiveScore
     createdAt @include(if: $includeCreatedAt)
     updatedAt @include(if: $includeUpdatedAt)
     cueObjectFeatures @include(if: $includeCueObjectFeatures) {
@@ -36,3 +43,10 @@ query GetShots(
     }
   }
 }
+
+query GetShotAnnotationTypes {
+  getShotAnnotationTypes {
+    id
+    name
+  }
+}

src/operations/user.gql

@@ -1,11 +1,22 @@
 mutation getProfileImageUploadLink($fileExt: String = ".png") {
   getProfileImageUploadLink(fileExt: $fileExt) {
+    value {
+      ... on UploadLink {
         uploadUrl
         headers {
           key
           value
         }
       }
+      ... on GetProfileUploadLinkErrors {
+        error {
+          ... on TooManyProfileImageUploadsErr {
+            linksRequested
+          }
+        }
+      }
+    }
+  }
 }
 
 mutation editProfileImageUri($profileImageUri: String!) {
@@ -24,6 +35,7 @@ query getLoggedInUser {
     id
     firebaseUid
     username
+    isAdmin
     profileImageUri
     activeVideoId
     createdAt
@@ -36,3 +48,11 @@ query GetUserPlayTime($userId: Int!) {
     totalSeconds
   }
 }
+
+query getUsernames(
+  $matchString: String!
+  $limit: Int = null
+  $after: String = null
+) {
+  getUsernames(matchString: $matchString, limit: $limit, after: $after)
+}

src/operations/video.gql

@@ -1,5 +1,5 @@
-query GetStreamMonitoringDetails($videoId: Int!) {
+query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
-  getVideo(videoId: $videoId) {
+  getVideo(videoId: $videoId, debuggingJson: $debuggingJson) {
     id
     totalShots
     makePercentage
@@ -51,6 +51,7 @@ query GetStreamMonitoringDetails($videoId: Int!) {
       isCompleted
       uploadCompletionCursor
       lastIntendedSegmentBound
+      initPlaylistUploadStatus
     }
     currentProcessing {
       errors {
@@ -69,6 +70,7 @@ query GetVideoUpdatePageDetails($videoId: Int!) {
     totalShots
     makePercentage
     elapsedTime
+    tableSize
     tags {
       tagClasses {
         name
@@ -91,14 +93,13 @@ query GetVideoDetails($videoId: Int!) {
     elapsedTime
     endTime
     makePercentage
-    makePercentage
     medianRun
     startTime
     totalShots
-    totalShots
     totalShotsMade
     createdAt
     updatedAt
+    tableSize
     owner {
       id
       firebaseUid
@@ -117,11 +118,9 @@ query GetVideoDetails($videoId: Int!) {
 query GetVideos($videoIds: [Int!]!) {
   getVideos(videoIds: $videoIds) {
     id
-    playlist {
-      segmentDurations
-    }
     stream {
       id
+      streamSegmentType
       segments {
         uploaded
         valid
@@ -130,6 +129,9 @@ query GetVideos($videoIds: [Int!]!) {
         framesPerSecond
       }
     }
+    playlist {
+      segmentDurations
+    }
   }
 }
 
@@ -139,12 +141,98 @@ query GetVideo($videoId: Int!) {
     playlist {
       segmentDurations
     }
+    homographyHistory {
+      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 {
+      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
+  }
+}
+
+query GetVideoForClipTimes($videoId: Int!) {
+  getVideo(videoId: $videoId) {
+    id
+    framesPerSecond
+    playlist {
+      segmentDurations
+    }
+    stream {
+      id
+      streamSegmentType
+      segments {
+        uploaded
+        valid
+        segmentIndex
+        endFrameIndex
+        framesPerSecond
+      }
     }
   }
 }

src/operations/video_upload.gql

@@ -6,12 +6,71 @@ mutation CreateUploadStream($videoMetadataInput: VideoMetadataInput!) {
 
 mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
   getUploadLink(videoId: $videoId, segmentIndex: $segmentIndex) {
+    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
+          }
+        }
+      }
+    }
+  }
+}
+
+mutation SetSegmentDuration(
+  $videoId: Int!
+  $segmentIndex: Int!
+  $duration: Float!
+) {
+  setSegmentDuration(
+    videoId: $videoId
+    segmentIndex: $segmentIndex
+    duration: $duration
+  )
 }
 
 mutation EditUploadStream(
@@ -50,6 +109,7 @@ query GetUploadStreamsWithDetails(
         isCompleted
         lastIntendedSegmentBound
         uploadCompletionCursor
+        uploadsCompleted
       }
     }
     pageInfo {

src/schema.gql

@@ -4,13 +4,24 @@ type Query {
   ): [AggregateResultGQL!]!
   getBucketSet(keyName: String!): BucketSetGQL
   getDeployedConfig: DeployedConfigGQL!
+  waitFor(duration: Float!): Float!
   getVideoMakePercentageIntervals(
     videoId: ID!
     intervalDuration: Int! = 300
   ): [MakePercentageIntervalGQL!]!
-  getShots(filterInput: FilterInput!): [ShotGQL!]!
+  getShots(
+    filterInput: FilterInput!
+    shotsPagination: GetShotsPagination = null
+    limit: Int! = 500
+  ): [ShotGQL!]!
+  getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
   getUser(userId: Int!): UserGQL
   getLoggedInUser: UserGQL
+  getUsernames(
+    matchString: String = null
+    limit: Int = null
+    after: String = null
+  ): [String!]!
   getPlayTime(userId: Int!): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
@@ -18,7 +29,8 @@ 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!]!
 }
 
@@ -43,9 +55,9 @@ input AggregateInputGQL {
   filterInput: FilterInput
 }
 
-input AggregationInput {
+input AggregationInput @oneOf {
-  bucketSet: BucketSetInputGQL = null
+  bucketSet: BucketSetInputGQL
-  enum: EnumAggregation = null
+  enum: EnumAggregation
 }
 
 input BucketSetInputGQL {
@@ -62,33 +74,46 @@ input EnumAggregation {
   feature: String!
 }
 
-input FilterInput {
+input FilterInput @oneOf {
-  andFilters: AndFilter = null
+  andFilters: [FilterInput!]
-  orFilters: OrFilter = null
+  orFilters: [FilterInput!]
-  cueObjectDistance: RangeFilter = null
+  notFilter: FilterInput
-  targetPocketDistance: RangeFilter = null
+  cueObjectDistance: RangeFilter
-  cueObjectAngle: RangeFilter = null
+  targetPocketDistance: RangeFilter
-  cueBallSpeed: RangeFilter = null
+  cueObjectAngle: RangeFilter
-  difficulty: RangeFilter = null
+  cueBallSpeed: RangeFilter
-  intendedPocketType: [PocketEnum!] = null
+  difficulty: RangeFilter
-  shotDirection: [ShotDirectionEnum!] = null
+  intendedPocketType: [PocketEnum!]
-  videoId: [Int!] = null
+  shotDirection: [ShotDirectionEnum!]
-  userId: [Int!] = null
+  videoId: [Int!]
-  make: [Boolean!] = null
+  userId: [Int!]
-  tags: [VideoTagInput!] = null
+  make: [Boolean!]
-}
+  tags: [VideoTagInput!]
-
+  annotations: [ShotAnnotationInput!]
-input AndFilter {
+  isStraight: [Boolean!]
-  filters: [FilterInput!]!
+  isRight: [Boolean!]
-}
+  isLeft: [Boolean!]
-
+  isLeftMiss: [Boolean!]
-input OrFilter {
+  isRightMiss: [Boolean!]
-  filters: [FilterInput!]!
+  isDirect: [Boolean!]
+  tableSize: RangeFilter
+  bankAngle: RangeFilter
+  bankDistance: RangeFilter
+  kickAngle: RangeFilter
+  kickDistance: RangeFilter
+  cueAngleAfterObject: RangeFilter
+  cueSpeedAfterObject: RangeFilter
+  spinType: [String!]
+  falsePositiveScore: RangeFilter
 }
 
 input RangeFilter {
   lessThan: Float = null
   greaterThanEqualTo: Float = null
+  greaterThan: Float = null
+  includeOnNone: Boolean! = false
+  lessThanInclusive: Boolean! = false
+  greaterThanInclusive: Boolean! = true
 }
 
 enum PocketEnum {
@@ -111,6 +136,10 @@ input VideoTagClassInput {
   name: String!
 }
 
+input ShotAnnotationInput {
+  name: String!
+}
+
 type BucketSetGQL {
   keyName: String!
   feature: String!
@@ -127,6 +156,7 @@ type DeployedConfigGQL {
   firebase: Boolean!
   devMode: Boolean!
   environment: String!
+  minimumAllowedAppVersion: String!
 }
 
 type MakePercentageIntervalGQL {
@@ -144,7 +174,11 @@ type ShotGQL {
   cueObjectFeatures: CueObjectFeaturesGQL
   pocketingIntentionFeatures: PocketingIntentionFeaturesGQL
   bankFeatures: BankFeaturesGQL
+  serializedShotPaths: SerializedShotPathsGQL
   user: UserGQL
+  annotations: [ShotAnnotationGQL!]!
+  falsePositiveScore: Float
+  video: VideoGQL
 }
 
 """
@@ -177,23 +211,34 @@ enum WallTypeEnum {
   SHORT
 }
 
+type SerializedShotPathsGQL {
+  b64EncodedBuffer: String
+}
+
 type UserGQL {
   id: Int!
   firebaseUid: String!
   username: String!
+  isAdmin: Boolean!
   activeVideoId: Int
   profileImageUri: String
   createdAt: DateTime
   updatedAt: DateTime
 }
 
-type UserPlayTimeGQL {
+type ShotAnnotationGQL {
-  totalSeconds: Float!
+  shotId: Int!
+  type: ShotAnnotationTypeGQL!
+  creator: UserGQL!
+  notes: String!
+  errorDefault: Boolean!
+  createdAt: DateTime
+  updatedAt: DateTime
 }
 
-type VideoHistoryGQL {
+type ShotAnnotationTypeGQL {
-  videos: [VideoGQL!]!
+  id: Int!
-  pageInfo: PageInfoGQL!
+  name: String!
 }
 
 type VideoGQL {
@@ -213,6 +258,7 @@ type VideoGQL {
   endTime: DateTime
   elapsedTime: Float
   framesPerSecond: Float!
+  tableSize: Float!
   stream: UploadStreamGQL
   playlist: HLSPlaylistGQL
   tags: [VideoTag!]!
@@ -227,12 +273,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 +300,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!
@@ -295,6 +360,8 @@ type IntPoint2D {
 
 type VideoProcessingGQL {
   errors: [VideoProcessingErrorGQL!]!
+  status: ProcessingStatusEnum!
+  statuses: [VideoProcessingStatusGQL!]!
 }
 
 type VideoProcessingErrorGQL {
@@ -303,6 +370,44 @@ 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 GetShotsPagination {
+  createdAfter: CreatedAfter!
+  startFrameAfter: Int!
+}
+
+input CreatedAfter @oneOf {
+  videoId: Int
+  createdAt: DateTime
+}
+
+type UserPlayTimeGQL {
+  totalSeconds: Float!
+}
+
+type VideoHistoryGQL {
+  videos: [VideoGQL!]!
+  pageInfo: PageInfoGQL!
+}
+
 type PageInfoGQL {
   hasNextPage: Boolean!
   endCursor: String
@@ -313,15 +418,42 @@ 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!
+  getProfileImageUploadLink(
+    fileExt: String = ".png"
+  ): GetProfileUploadLinkReturn!
   editProfileImageUri(profileImageUri: String!): UserGQL!
   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 +464,44 @@ 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 GetProfileUploadLinkReturn {
+  value: UploadLinkGetProfileUploadLinkErrors!
+}
+
+union UploadLinkGetProfileUploadLinkErrors =
+    UploadLink
+  | GetProfileUploadLinkErrors
+
+type UploadLink {
   uploadUrl: String!
   headers: [Header]!
 }
@@ -342,6 +511,14 @@ type Header {
   value: String!
 }
 
+type GetProfileUploadLinkErrors {
+  error: TooManyProfileImageUploadsErr!
+}
+
+type TooManyProfileImageUploadsErr {
+  linksRequested: Int!
+}
+
 type CreateUploadStreamReturn {
   videoId: Int!
 }
@@ -351,10 +528,13 @@ input VideoMetadataInput {
   startTime: DateTime = null
   endTime: DateTime = null
   gameType: String = null
-  tableSize: String = null
+  tableSize: Float = null
   uploadStreamMetadataInput: UploadStreamMetadataInput = null
   lastIntendedSegmentBound: Int = null
+  streamSegmentType: StreamSegmentTypeEnum = null
   endStream: Boolean! = false
+  resolution: VideoResolution = null
+  framesPerSecond: Float = null
 }
 
 input UploadStreamMetadataInput {
@@ -374,3 +554,43 @@ enum DeviceTypeEnum {
   ANDROID
   BROWSER
 }
+
+input VideoResolution {
+  width: Int!
+  height: Int!
+}
+
+type GetUploadLinkReturn {
+  value: UploadLinkGetUploadLinkErrors!
+  stream: UploadStreamGQL
+}
+
+union UploadLinkGetUploadLinkErrors = UploadLink | GetUploadLinkErrors
+
+type GetUploadLinkErrors {
+  error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr!
+}
+
+union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr =
+    MustHaveSetForUploadLinkErr
+  | SegmentAlreadyUploadedErr
+  | ProcessingFailedErr
+  | NoInitForChunkedUploadErr
+  | TooManyProfileImageUploadsErr
+
+type MustHaveSetForUploadLinkErr {
+  resolution: Boolean
+  framesPerSecond: Boolean
+}
+
+type SegmentAlreadyUploadedErr {
+  segmentId: Int!
+}
+
+type ProcessingFailedErr {
+  processing: VideoProcessingGQL!
+}
+
+type NoInitForChunkedUploadErr {
+  segmentType: StreamSegmentTypeEnum!
+}

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"