Merge pull request 'Select the detection audit payload on getTableState' (#315) from dean/shot-lab-detection-boxes-gql into master

This reverts commit 65151d4b6b, reversing
changes made to 926b2aab7a.

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

@@ -14,6 +14,16 @@ query GetSessionCoach($videoId: Int!) {
     unknownOutcomeCount
     analyzedShotCount
     makePercentage
+    longestMakeStreak
+    recentBaseline {
+      sessionCount
+      attemptCount
+      madeCount
+      makePercentage
+    }
+    positiveCandidates {
+      ...SessionCoachCandidateFields
+    }
     primaryCandidate {
       ...SessionCoachCandidateFields
     }
@@ -35,6 +45,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
@@ -59,6 +84,10 @@ fragment SessionCoachCandidateFields on SessionCoachCandidateGQL {
     patternShotCount
     score
     rankReason
+    baselineSessionCount
+    baselineAttemptCount
+    baselineMadeCount
+    baselineMakePercentage
   }
 }
 
@@ -68,7 +97,13 @@ fragment SessionCoachGenerationFields on SessionCoachGenerationGQL {
   createdAt
   completedAt
   decision {
+    selectedPositiveCandidateId
+    positiveTitle
+    positiveBody
     selectedCandidateId
+    supportingCandidateIds
+    supportingShotIds
+    sessionSummary
     title
     body
     suggestedAction
@@ -95,5 +130,10 @@ fragment SessionCoachGenerationFields on SessionCoachGenerationGQL {
     startedAt
     lastEnqueuedAt
     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,72 @@
+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 live and shot queries read a
+# frame out of a video the app never holds, so there is no image to
+# overlay, and getLiveTableState 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 +77,8 @@ query GetTableState(
     tableSize: $tableSize
     useHomography: $useHomography
   ) {
-    identifierToPosition
-    identifierToColor {
-      hex
-    }
+    ...TableStateLayoutFields
+    ...TableStateDetectionFields
   }
 }
 
@@ -20,10 +87,7 @@ query GetLiveTableState($videoId: Int!) {
     videoId
     frameIndex
     tableState {
-      identifierToPosition
-      identifierToColor {
-        hex
-      }
+      ...TableStateLayoutFields
     }
   }
 }
@@ -34,10 +98,7 @@ query GetShotTableState($shotId: Int!) {
     videoId
     frameIndex
     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/operations/video_upload.gql

@@ -54,6 +54,51 @@ mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
   }
 }
 
+mutation GetUploadLinks($videoId: Int!, $segmentIndexes: [Int!]!) {
+  getUploadLinks(videoId: $videoId, segmentIndexes: $segmentIndexes) {
+    value {
+      ... on UploadLinkBatch {
+        links {
+          segmentIndex
+          uploadUrl
+          headers {
+            key
+            value
+          }
+        }
+        alreadyUploaded
+      }
+      ... on GetUploadLinkErrors {
+        error {
+          ... on MustHaveSetForUploadLinkErr {
+            resolution
+            framesPerSecond
+          }
+          ... on ProcessingFailedErr {
+            processing {
+              status
+              errors {
+                message
+              }
+            }
+          }
+          ... on StorageLimitExceededErr {
+            reason
+            tierName
+            retainedStorageUsedBytes
+            retainedStorageLimitBytes
+            remainingStorageBytes
+          }
+        }
+      }
+    }
+    stream {
+      id
+      uploadCompletionCursor
+    }
+  }
+}
+
 mutation GetHlsInitUploadLink($videoId: Int!) {
   getHlsInitUploadLink(videoId: $videoId) {
     value {

src/schema.gql

@@ -214,6 +214,7 @@ type CohortStatsGQL {
   activated7d: Int!
   paid7d: Int!
   activatedNotPaid7d: Int!
+  paidTotal: Int!
 }
 
 type CommentGQL {
@@ -249,6 +250,11 @@ input CreatePoolHallCameraInput {
   claimTermsText: String = null
 }
 
+input CreateShotShareLinkInput {
+  shotIds: [Int!]!
+  paddingSeconds: Float = null
+}
+
 input CreatePoolHallInput {
   name: String!
   address: String = null
@@ -259,6 +265,11 @@ input CreatePoolHallInput {
   timezone: String = null
 }
 
+input CreateShotShareLinkInput {
+  shotIds: [Int!]!
+  paddingSeconds: Float = null
+}
+
 type CreateSubscriptionResultGQL {
   checkoutUrl: String!
   sessionId: String!
@@ -459,6 +470,8 @@ type FunnelStatsGQL {
   activationCohort: Int!
   activationActivated: Int!
   payingUsers: Int!
+  pastDueUsers: Int!
+  newPaidToday: Int!
   newPaid7d: Int!
   newPaid30d: Int!
   retentionPrevActive: Int!
@@ -526,6 +539,11 @@ type GetUploadLinkReturn {
   stream: UploadStreamGQL
 }
 
+type GetUploadLinksReturn {
+  value: UploadLinkBatchGetUploadLinkErrors!
+  stream: UploadStreamGQL
+}
+
 type HLSPlaylistGQL {
   videoId: Int!
   m3u8Text: String!
@@ -701,6 +719,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!]!
@@ -717,6 +736,11 @@ type Mutation {
     shotId: Int!
     fieldsToEdit: EditableShotFieldInputGQL!
   ): EditShotReturn!
+  submitSessionCoachFeedback(
+    videoId: Int!
+    generationId: ID!
+    response: SessionCoachFeedbackResponseEnum!
+  ): SessionCoachFeedbackGQL!
   requestSessionCoachGeneration(videoId: Int!): SessionCoachGQL!
   getProfileImageUploadLink(
     fileExt: String = ".png"
@@ -755,6 +779,7 @@ type Mutation {
     expectedDurationSeconds: Float = null
   ): CreateUploadStreamReturn!
   getUploadLink(videoId: Int!, segmentIndex: Int!): GetUploadLinkReturn!
+  getUploadLinks(videoId: Int!, segmentIndexes: [Int!]!): GetUploadLinksReturn!
   getHlsInitUploadLink(videoId: Int!): GetUploadLinkReturn!
   setSegmentDuration(
     videoId: Int!
@@ -1289,11 +1314,25 @@ type SegmentAlreadyUploadedErr {
   segmentId: Int!
 }
 
+type SegmentUploadLink {
+  segmentIndex: Int!
+  uploadUrl: String!
+  headers: [Header]!
+}
+
 type SerializedShotPathsGQL {
   b64EncodedBuffer: String
 }
 
+type SessionCoachBaselineGQL {
+  sessionCount: Int!
+  attemptCount: Int!
+  madeCount: Int!
+  makePercentage: Float!
+}
+
 enum SessionCoachCandidateFamilyEnum {
+  OVERALL
   AIMING
   CUT_ANGLE
   SPIN
@@ -1317,13 +1356,22 @@ type SessionCoachCandidateGQL {
 }
 
 enum SessionCoachCandidateKindEnum {
+  BASELINE_COMPARISON
+  SESSION_STREAK
+  STRENGTH_PATTERN
   DIRECTIONAL_MISS
   OUTCOME_PATTERN
   USAGE_PATTERN
 }
 
 type SessionCoachDecisionGQL {
+  selectedPositiveCandidateId: ID
+  positiveTitle: String
+  positiveBody: String
   selectedCandidateId: ID
+  supportingCandidateIds: [ID!]!
+  supportingShotIds: [Int!]!
+  sessionSummary: String
   title: String
   body: String
   suggestedAction: String
@@ -1346,6 +1394,22 @@ type SessionCoachEvidenceGQL {
   patternShotCount: Int!
   score: Float!
   rankReason: String!
+  baselineSessionCount: Int!
+  baselineAttemptCount: Int!
+  baselineMadeCount: Int!
+  baselineMakePercentage: Float
+}
+
+type SessionCoachFeedbackGQL {
+  response: SessionCoachFeedbackResponseEnum!
+  updatedAt: DateTime!
+}
+
+enum SessionCoachFeedbackResponseEnum {
+  HELPFUL
+  WRONG_FOCUS
+  ALREADY_WORKING_ON_THIS
+  NOT_ENOUGH_EVIDENCE
 }
 
 type SessionCoachGQL {
@@ -1363,6 +1427,9 @@ type SessionCoachGQL {
   unknownOutcomeCount: Int!
   analyzedShotCount: Int!
   makePercentage: Float
+  longestMakeStreak: Int!
+  recentBaseline: SessionCoachBaselineGQL
+  positiveCandidates: [SessionCoachCandidateGQL!]!
   primaryCandidate: SessionCoachCandidateGQL
   candidates: [SessionCoachCandidateGQL!]!
   agentGeneration: SessionCoachGenerationGQL
@@ -1386,6 +1453,7 @@ type SessionCoachGenerationDiagnosticsGQL {
   startedAt: DateTime
   lastEnqueuedAt: DateTime
   abstentionReason: String
+  synthesisRationale: String
 }
 
 type SessionCoachGenerationGQL {
@@ -1395,6 +1463,7 @@ type SessionCoachGenerationGQL {
   completedAt: DateTime
   decision: SessionCoachDecisionGQL
   diagnostics: SessionCoachGenerationDiagnosticsGQL
+  feedback: SessionCoachFeedbackGQL
 }
 
 enum SessionCoachGenerationStateEnum {
@@ -1416,6 +1485,11 @@ enum SessionCoachStateEnum {
   FAILED
 }
 
+type ShareLinkGQL {
+  slug: String!
+  url: String!
+}
+
 type ShotAnnotationGQL {
   shotId: Int!
   type: ShotAnnotationTypeGQL!
@@ -1665,6 +1739,7 @@ type TableStateGQL {
   identifierToPosition: [[Float!]!]!
   homography: HomographyInfoGQL
   identifierToColor: [RGBColorGQL]!
+  identifierToBox: [BoundingBoxGQL!]!
 }
 
 type TagClassGQL {
@@ -1750,6 +1825,13 @@ type UploadLink {
   headers: [Header]!
 }
 
+type UploadLinkBatch {
+  links: [SegmentUploadLink!]!
+  alreadyUploaded: [Int!]!
+}
+
+union UploadLinkBatchGetUploadLinkErrors = UploadLinkBatch | GetUploadLinkErrors
+
 union UploadLinkGetProfileUploadLinkErrors =
     UploadLink
   | GetProfileUploadLinkErrors
@@ -1869,6 +1951,11 @@ type UserSubscriptionStatusGQL {
   stripeSubscriptionId: String
 }
 
+type ShareLinkGQL {
+  slug: String!
+  url: String!
+}
+
 type VideoExportJobGQL {
   id: Int!
   videoId: Int!
@@ -1879,7 +1966,7 @@ type VideoExportJobGQL {
   shotIds: [Int!]
   runId: Int
   downloadUrl: String
-  fileSizeBytes: Int
+  fileSizeBytes: BigInt
   expiresAt: DateTime
   createdAt: DateTime
 }