Merge pull request 'Add debugJson to getStreamMonitoringDetails' (#34) from loewy/add-debug-json into master

Reviewed-on: #34

.gitignore

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

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

@@ -24,6 +24,7 @@ query getLoggedInUser {
     id
     firebaseUid
     username
+    isAdmin
     profileImageUri
     activeVideoId
     createdAt
@@ -36,3 +37,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!) {
-  getVideo(videoId: $videoId) {
+query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
+  getVideo(videoId: $videoId, debuggingJson: $debuggingJson) {
     id
     totalShots
     makePercentage
@@ -51,6 +51,7 @@ query GetStreamMonitoringDetails($videoId: Int!) {
       isCompleted
       uploadCompletionCursor
       lastIntendedSegmentBound
+      initPlaylistUploadStatus
     }
     currentProcessing {
       errors {
@@ -137,28 +138,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

@@ -14,6 +14,28 @@ mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
   }
 }
 
+mutation GetHlsInitUploadLink($videoId: Int!) {
+  getHlsInitUploadLink(videoId: $videoId) {
+    uploadUrl
+    headers {
+      key
+      value
+    }
+  }
+}
+
+mutation SetSegmentDuration(
+  $videoId: Int!
+  $segmentIndex: Int!
+  $duration: Float!
+) {
+  setSegmentDuration(
+    videoId: $videoId
+    segmentIndex: $segmentIndex
+    duration: $duration
+  )
+}
+
 mutation EditUploadStream(
   $videoId: Int!
   $videoMetadataInput: VideoMetadataInput!
@@ -50,6 +72,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: [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!]!
 }
 
@@ -65,6 +77,7 @@ input EnumAggregation {
 input FilterInput @oneOf {
   andFilters: [FilterInput!]
   orFilters: [FilterInput!]
+  notFilter: FilterInput
   cueObjectDistance: RangeFilter
   targetPocketDistance: RangeFilter
   cueObjectAngle: RangeFilter
@@ -76,11 +89,27 @@ input FilterInput @oneOf {
   userId: [Int!]
   make: [Boolean!]
   tags: [VideoTagInput!]
+  annotations: [ShotAnnotationInput!]
+  isStraight: [Boolean!]
+  isRight: [Boolean!]
+  isLeft: [Boolean!]
+  isLeftMiss: [Boolean!]
+  isRightMiss: [Boolean!]
+  isDirect: [Boolean!]
+  bankAngle: RangeFilter
+  bankDistance: RangeFilter
+  kickAngle: RangeFilter
+  kickDistance: RangeFilter
+  cueAngleAfterObject: RangeFilter
+  cueSpeedAfterObject: RangeFilter
+  spinType: [String!]
+  falsePositiveScore: RangeFilter
 }
 
 input RangeFilter {
   lessThan: Float = null
   greaterThanEqualTo: Float = null
+  includeOnNone: Boolean! = false
 }
 
 enum PocketEnum {
@@ -103,6 +132,10 @@ input VideoTagClassInput {
   name: String!
 }
 
+input ShotAnnotationInput {
+  name: String!
+}
+
 type BucketSetGQL {
   keyName: String!
   feature: String!
@@ -138,6 +171,9 @@ type ShotGQL {
   bankFeatures: BankFeaturesGQL
   serializedShotPaths: SerializedShotPathsGQL
   user: UserGQL
+  annotations: [ShotAnnotationGQL!]!
+  falsePositiveScore: Float
+  video: VideoGQL
 }
 
 """
@@ -178,19 +214,25 @@ type UserGQL {
   id: Int!
   firebaseUid: String!
   username: String!
+  isAdmin: Boolean!
   activeVideoId: Int
   profileImageUri: String
   createdAt: DateTime
   updatedAt: DateTime
 }
 
-type UserPlayTimeGQL {
-  totalSeconds: Float!
+type ShotAnnotationGQL {
+  shotId: Int!
+  type: ShotAnnotationTypeGQL!
+  creator: UserGQL!
+  notes: String!
+  createdAt: DateTime
+  updatedAt: DateTime
 }
 
-type VideoHistoryGQL {
-  videos: [VideoGQL!]!
-  pageInfo: PageInfoGQL!
+type ShotAnnotationTypeGQL {
+  id: Int!
+  name: String!
 }
 
 type VideoGQL {
@@ -224,12 +266,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 {
@@ -242,10 +293,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!
@@ -292,6 +353,8 @@ type IntPoint2D {
 
 type VideoProcessingGQL {
   errors: [VideoProcessingErrorGQL!]!
+  status: ProcessingStatusEnum!
+  statuses: [VideoProcessingStatusGQL!]!
 }
 
 type VideoProcessingErrorGQL {
@@ -300,6 +363,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
@@ -310,15 +411,36 @@ 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!
+  addAnnotationToShot(shotId: Int!, annotationName: String!): Boolean!
   getProfileImageUploadLink(fileExt: String = ".png"): GetUploadLinkReturn!
   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,6 +454,7 @@ input CreateBucketSetInput {
 type GetUploadLinkReturn {
   uploadUrl: String!
   headers: [Header]!
+  uploadCompletionCursor: Int
 }
 
 type Header {
@@ -351,7 +474,10 @@ input VideoMetadataInput {
   tableSize: String = null
   uploadStreamMetadataInput: UploadStreamMetadataInput = null
   lastIntendedSegmentBound: Int = null
+  streamSegmentType: StreamSegmentTypeEnum = null
   endStream: Boolean! = false
+  resolution: VideoResolution = null
+  framesPerSecond: Float = null
 }
 
 input UploadStreamMetadataInput {
@@ -371,3 +497,8 @@ enum DeviceTypeEnum {
   ANDROID
   BROWSER
 }
+
+input VideoResolution {
+  width: Int!
+  height: Int!
+}