Merge pull request 'Let shot filters select a single player within a video' (#322) from dean/filter-by-player-index into master

Reviewed-on: #322

src/operations/recorded_shots.gql

@@ -1,12 +1,19 @@
-# Lightweight two-step picker data for Shot Lab's video-first source: the
-# caller's recent videos (completed or still uploading), then that video's
-# shots. The stream fields hint at "actively updating" without gating.
-query GetShotLabVideos($userId: Int!, $limit: Int! = 25) {
+# Lightweight two-step picker data for Shot Lab's video-first source: recent
+# videos from the requested audience (mine, followed users, or public), then
+# that video's shots. The stream fields hint at "actively updating" without
+# gating.
+query GetShotLabVideos(
+  $feedInput: VideoFeedInputGQL!
+  $includePrivate: IncludePrivateEnum!
+  $limit: Int! = 25
+  $after: String = null
+) {
   getFeedVideos(
     limit: $limit
+    after: $after
     includeCallersVideos: false
-    includePrivate: MINE
-    feedInput: { userId: $userId }
+    includePrivate: $includePrivate
+    feedInput: $feedInput
   ) {
     videos {
       id
@@ -26,6 +33,10 @@ query GetShotLabVideos($userId: Int!, $limit: Int! = 25) {
         lastSegmentUploadedAt
       }
     }
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
   }
 }
 

src/operations/session-coach.gql

@@ -36,6 +36,22 @@ query GetSessionCoach($videoId: Int!) {
   }
 }
 
+query GetSessionCoachGenerationStatus($videoId: Int!, $generationId: ID!) {
+  getSessionCoachGenerationStatus(
+    videoId: $videoId
+    generationId: $generationId
+  ) {
+    id
+    state
+    createdAt
+    updatedAt
+    startedAt
+    lastEnqueuedAt
+    enqueueCount
+    completedAt
+  }
+}
+
 mutation RequestSessionCoachGeneration($videoId: Int!) {
   requestSessionCoachGeneration(videoId: $videoId) {
     state
@@ -45,6 +61,21 @@ mutation RequestSessionCoachGeneration($videoId: Int!) {
   }
 }
 
+mutation SubmitSessionCoachFeedback(
+  $videoId: Int!
+  $generationId: ID!
+  $response: SessionCoachFeedbackResponseEnum!
+) {
+  submitSessionCoachFeedback(
+    videoId: $videoId
+    generationId: $generationId
+    response: $response
+  ) {
+    response
+    updatedAt
+  }
+}
+
 fragment SessionCoachCandidateFields on SessionCoachCandidateGQL {
   id
   rank
@@ -117,4 +148,8 @@ fragment SessionCoachGenerationFields on SessionCoachGenerationGQL {
     abstentionReason
     synthesisRationale
   }
+  feedback {
+    response
+    updatedAt
+  }
 }

src/operations/share_link.gql

@@ -0,0 +1,8 @@
+mutation CreateShotShareLink($shotIds: [Int!]!, $paddingSeconds: Float = null) {
+  createShotShareLink(
+    input: { shotIds: $shotIds, paddingSeconds: $paddingSeconds }
+  ) {
+    slug
+    url
+  }
+}

src/operations/shot_simulation.gql

@@ -1,3 +1,73 @@
+fragment TableStateLayoutFields on TableStateGQL {
+  identifierToPosition
+  identifierToColor {
+    hex
+  }
+}
+
+fragment DetectionBoxFields on BoundingBoxGQL {
+  left
+  top
+  width
+  height
+}
+
+fragment DetectionPocketPointFields on PocketPointsGQL {
+  topLeft {
+    x
+    y
+  }
+  topSide {
+    x
+    y
+  }
+  topRight {
+    x
+    y
+  }
+  bottomLeft {
+    x
+    y
+  }
+  bottomSide {
+    x
+    y
+  }
+  bottomRight {
+    x
+    y
+  }
+}
+
+# Everything needed to redraw a detection over the image it came from:
+# the detector's boxes plus the homography that turned them into plane
+# positions. Boxes, pocket boxes, and source points share the crop's
+# coordinate space; the crop locates that space in the full frame.
+#
+# Only the photo query selects this. The shot query returns its source
+# frame (frameImage) but positions there come from the stored homography,
+# so there are no fresh boxes to draw; the live query returns no image at
+# all and is polled every five seconds.
+fragment TableStateDetectionFields on TableStateGQL {
+  identifierToBox {
+    ...DetectionBoxFields
+  }
+  homography {
+    crop {
+      ...DetectionBoxFields
+    }
+    pockets {
+      ...DetectionBoxFields
+    }
+    sourcePoints {
+      ...DetectionPocketPointFields
+    }
+    destPoints {
+      ...DetectionPocketPointFields
+    }
+  }
+}
+
 query GetTableState(
   $b64Image: String!
   $tableSize: Float
@@ -8,10 +78,8 @@ query GetTableState(
     tableSize: $tableSize
     useHomography: $useHomography
   ) {
-    identifierToPosition
-    identifierToColor {
-      hex
-    }
+    ...TableStateLayoutFields
+    ...TableStateDetectionFields
   }
 }
 
@@ -20,10 +88,7 @@ query GetLiveTableState($videoId: Int!) {
     videoId
     frameIndex
     tableState {
-      identifierToPosition
-      identifierToColor {
-        hex
-      }
+      ...TableStateLayoutFields
     }
   }
 }
@@ -33,11 +98,11 @@ query GetShotTableState($shotId: Int!) {
     shotId
     videoId
     frameIndex
+    # The b64 JPEG frame the layout was detected in, so the client can show
+    # the shot's actual starting frame instead of the video's thumbnail.
+    frameImage
     tableState {
-      identifierToPosition
-      identifierToColor {
-        hex
-      }
+      ...TableStateLayoutFields
     }
   }
 }

src/operations/usage_stats.gql

@@ -7,6 +7,8 @@ query getUsageStats($days: Int! = 30) {
       activationCohort
       activationActivated
       payingUsers
+      pastDueUsers
+      newPaidToday
       newPaid7d
       newPaid30d
       retentionPrevActive
@@ -18,6 +20,7 @@ query getUsageStats($days: Int! = 30) {
       activated7d
       paid7d
       activatedNotPaid7d
+      paidTotal
     }
     totalUsers
     totalVideos

src/schema.gql

@@ -214,6 +214,7 @@ type CohortStatsGQL {
   activated7d: Int!
   paid7d: Int!
   activatedNotPaid7d: Int!
+  paidTotal: Int!
 }
 
 type CommentGQL {
@@ -259,6 +260,11 @@ input CreatePoolHallInput {
   timezone: String = null
 }
 
+input CreateShotShareLinkInput {
+  shotIds: [Int!]!
+  paddingSeconds: Float = null
+}
+
 type CreateSubscriptionResultGQL {
   checkoutUrl: String!
   sessionId: String!
@@ -402,6 +408,7 @@ input FilterInput @oneOf {
   userId: [Int!]
   runId: [Int!]
   username: [String!]
+  playerIndex: [Int!]
   fargoRating: FloatRangeFilter
   make: [Boolean!]
   tags: [VideoTagInput!]
@@ -459,6 +466,8 @@ type FunnelStatsGQL {
   activationCohort: Int!
   activationActivated: Int!
   payingUsers: Int!
+  pastDueUsers: Int!
+  newPaidToday: Int!
   newPaid7d: Int!
   newPaid30d: Int!
   retentionPrevActive: Int!
@@ -531,19 +540,6 @@ type GetUploadLinksReturn {
   stream: UploadStreamGQL
 }
 
-type SegmentUploadLink {
-  segmentIndex: Int!
-  uploadUrl: String!
-  headers: [Header]!
-}
-
-type UploadLinkBatch {
-  links: [SegmentUploadLink!]!
-  alreadyUploaded: [Int!]!
-}
-
-union UploadLinkBatchGetUploadLinkErrors = UploadLinkBatch | GetUploadLinkErrors
-
 type HLSPlaylistGQL {
   videoId: Int!
   m3u8Text: String!
@@ -719,6 +715,7 @@ type Mutation {
   cancelCameraClaimSession(claimSessionId: ID!): CameraClaimSession!
   endCameraLease(leaseId: ID!): CameraLease!
   extendCameraLease(leaseId: ID!, additionalMinutes: Int! = 60): CameraLease!
+  createShotShareLink(input: CreateShotShareLinkInput!): ShareLinkGQL!
   finalizePlayerAssignments(
     input: FinalizePlayerAssignmentsInput!
   ): [PlayerClusterGQL!]!
@@ -735,6 +732,11 @@ type Mutation {
     shotId: Int!
     fieldsToEdit: EditableShotFieldInputGQL!
   ): EditShotReturn!
+  submitSessionCoachFeedback(
+    videoId: Int!
+    generationId: ID!
+    response: SessionCoachFeedbackResponseEnum!
+  ): SessionCoachFeedbackGQL!
   requestSessionCoachGeneration(videoId: Int!): SessionCoachGQL!
   getProfileImageUploadLink(
     fileExt: String = ".png"
@@ -1075,6 +1077,10 @@ type Query {
     limit: Int! = 500
     countRespectsLimit: Boolean! = false
   ): GetRunsResult!
+  getSessionCoachGenerationStatus(
+    videoId: Int!
+    generationId: ID!
+  ): SessionCoachGenerationStatusGQL
   getSessionCoach(videoId: Int!): SessionCoachGQL!
   videoPlayerClusters(videoId: Int!): [PlayerClusterGQL!]!
   getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
@@ -1308,6 +1314,12 @@ type SegmentAlreadyUploadedErr {
   segmentId: Int!
 }
 
+type SegmentUploadLink {
+  segmentIndex: Int!
+  uploadUrl: String!
+  headers: [Header]!
+}
+
 type SerializedShotPathsGQL {
   b64EncodedBuffer: String
 }
@@ -1388,6 +1400,18 @@ type SessionCoachEvidenceGQL {
   baselineMakePercentage: Float
 }
 
+type SessionCoachFeedbackGQL {
+  response: SessionCoachFeedbackResponseEnum!
+  updatedAt: DateTime!
+}
+
+enum SessionCoachFeedbackResponseEnum {
+  HELPFUL
+  WRONG_FOCUS
+  ALREADY_WORKING_ON_THIS
+  NOT_ENOUGH_EVIDENCE
+}
+
 type SessionCoachGQL {
   videoId: Int!
   processingId: Int
@@ -1439,6 +1463,7 @@ type SessionCoachGenerationGQL {
   completedAt: DateTime
   decision: SessionCoachDecisionGQL
   diagnostics: SessionCoachGenerationDiagnosticsGQL
+  feedback: SessionCoachFeedbackGQL
 }
 
 enum SessionCoachGenerationStateEnum {
@@ -1448,6 +1473,17 @@ enum SessionCoachGenerationStateEnum {
   FAILED
 }
 
+type SessionCoachGenerationStatusGQL {
+  id: ID!
+  state: SessionCoachGenerationStateEnum!
+  createdAt: DateTime!
+  updatedAt: DateTime!
+  startedAt: DateTime
+  lastEnqueuedAt: DateTime
+  enqueueCount: Int!
+  completedAt: DateTime
+}
+
 enum SessionCoachIneligibilityReasonEnum {
   MULTIPLAYER
 }
@@ -1460,6 +1496,11 @@ enum SessionCoachStateEnum {
   FAILED
 }
 
+type ShareLinkGQL {
+  slug: String!
+  url: String!
+}
+
 type ShotAnnotationGQL {
   shotId: Int!
   type: ShotAnnotationTypeGQL!
@@ -1528,6 +1569,7 @@ type ShotTableStateGQL {
   videoId: Int!
   frameIndex: Int!
   tableState: TableStateGQL!
+  frameImage: String
 }
 
 input ShotsOrderingComponent @oneOf {
@@ -1709,6 +1751,7 @@ type TableStateGQL {
   identifierToPosition: [[Float!]!]!
   homography: HomographyInfoGQL
   identifierToColor: [RGBColorGQL]!
+  identifierToBox: [BoundingBoxGQL!]!
 }
 
 type TagClassGQL {
@@ -1794,6 +1837,13 @@ type UploadLink {
   headers: [Header]!
 }
 
+type UploadLinkBatch {
+  links: [SegmentUploadLink!]!
+  alreadyUploaded: [Int!]!
+}
+
+union UploadLinkBatchGetUploadLinkErrors = UploadLinkBatch | GetUploadLinkErrors
+
 union UploadLinkGetProfileUploadLinkErrors =
     UploadLink
   | GetProfileUploadLinkErrors
@@ -1923,7 +1973,7 @@ type VideoExportJobGQL {
   shotIds: [Int!]
   runId: Int
   downloadUrl: String
-  fileSizeBytes: Int
+  fileSizeBytes: BigInt
   expiresAt: DateTime
   createdAt: DateTime
 }