Merge remote-tracking branch 'origin/master' into live-table-state-merged

src/operations/feed.gql

@@ -41,7 +41,6 @@ fragment VideoCardFields on VideoGQL {
   stream {
     id
     lastIntendedSegmentBound
-    uploadCompletionCursor
     streamSegmentType
     isCompleted
     lastSegmentUploadedAt

src/operations/recorded_shots.gql

@@ -1,62 +0,0 @@
-# Lightweight two-step picker data for loading a recorded shot into Shot Lab.
-query GetRecordedStreams($limit: Int! = 25) {
-  getFeedVideos(
-    limit: $limit
-    filters: { isStreamCompleted: true, excludeVideosWithNoShots: true }
-    includePrivate: MINE
-    feedInput: { allUsers: true }
-  ) {
-    videos {
-      id
-      name
-      createdAt
-      screenshotUri
-      framesPerSecond
-      totalShots
-      owner {
-        id
-        username
-        profileImageUri
-      }
-    }
-  }
-}
-
-query GetRecordedStreamShots($videoId: Int!, $limit: Int! = 200) {
-  getOrderedShots(
-    filterInput: { videoId: [$videoId] }
-    shotsOrdering: { orderings: [{ startFrame: { descending: false } }] }
-    limit: $limit
-  ) {
-    shots {
-      id
-      videoId
-      startFrame
-      endFrame
-      serializedShotPaths {
-        b64EncodedBuffer
-      }
-      cueObjectFeatures {
-        cueObjectDistance
-        cueObjectAngle
-        cueBallSpeed
-        shotDirection
-        spinType
-      }
-      pocketingIntentionFeatures {
-        make
-        targetPocketDistance
-        targetPocketAngle
-        targetPocketAngleDirection
-        marginOfErrorInDegrees
-        intendedPocketType
-        difficulty
-      }
-      pocketingIntentionInfo {
-        ballId
-        pocketId
-        pathMetadataIndex
-      }
-    }
-  }
-}

src/operations/session-coach.gql

@@ -1,51 +0,0 @@
-query GetSessionCoach($videoId: Int!) {
-  getSessionCoach(videoId: $videoId) {
-    videoId
-    processingId
-    analysisVersion
-    state
-    generatedAt
-    processingStatus
-    ineligibilityReason
-    summary
-    shotCount
-    madeCount
-    missedCount
-    unknownOutcomeCount
-    analyzedShotCount
-    makePercentage
-    primaryCandidate {
-      ...SessionCoachCandidateFields
-    }
-    candidates {
-      ...SessionCoachCandidateFields
-    }
-  }
-}
-
-fragment SessionCoachCandidateFields on SessionCoachCandidateGQL {
-  id
-  rank
-  family
-  kind
-  title
-  body
-  action
-  supportingShotIds
-  drillId
-  limitations
-  evidence {
-    bucketKey
-    bucketLabel
-    attemptCount
-    madeCount
-    missedCount
-    makePercentage
-    comparisonAttemptCount
-    comparisonMadeCount
-    comparisonMakePercentage
-    patternShotCount
-    score
-    rankReason
-  }
-}

src/operations/shot_simulation.gql

@@ -9,9 +9,6 @@ query GetTableState(
     useHomography: $useHomography
   ) {
     identifierToPosition
-    identifierToColor {
-      hex
-    }
   }
 }
 
@@ -21,22 +18,8 @@ query GetLiveTableState($videoId: Int!) {
     frameIndex
     tableState {
       identifierToPosition
-      identifierToColor {
+      homography {
-        hex
+        ...HomographyInfo
-      }
-    }
-  }
-}
-
-query GetShotTableState($shotId: Int!) {
-  getShotTableState(shotId: $shotId) {
-    shotId
-    videoId
-    frameIndex
-    tableState {
-      identifierToPosition
-      identifierToColor {
-        hex
       }
     }
   }

src/operations/usage_stats.gql

@@ -1,45 +0,0 @@
-query getUsageStats($days: Int! = 30) {
-  getUsageStats(days: $days) {
-    funnel {
-      freemiumEpoch
-      eraSignups
-      eraPaying
-      activationCohort
-      activationActivated
-      payingUsers
-      newPaid7d
-      newPaid30d
-      retentionPrevActive
-      retentionReturned
-    }
-    cohorts {
-      weekStart
-      signups
-      activated7d
-      paid7d
-      activatedNotPaid7d
-    }
-    totalUsers
-    totalVideos
-    totalShots
-    totalRuns
-    windows {
-      label
-      newUsers
-      activeUsers
-      sessions
-      shots
-    }
-    daily {
-      day
-      newUsers
-      activeUsers
-      sessions
-      shots
-    }
-    processingLast24h {
-      status
-      count
-    }
-  }
-}

src/schema.gql

@@ -65,7 +65,6 @@ type Query {
     limit: Int! = 500
     countRespectsLimit: Boolean! = false
   ): GetRunsResult!
-  getSessionCoach(videoId: Int!): SessionCoachGQL!
   videoPlayerClusters(videoId: Int!): [PlayerClusterGQL!]!
   getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
   getTableState(
@@ -74,7 +73,6 @@ type Query {
     useHomography: HomographyInputGQL = null
   ): TableStateGQL!
   getLiveTableState(videoId: Int!): LiveTableStateGQL!
-  getShotTableState(shotId: Int!): ShotTableStateGQL!
   simulateShot(simulationInput: SimulateShotInputGQL!): ShotProjectionGQL!
   computePotAim(
     simulationInput: SimulateShotInputGQL!
@@ -102,7 +100,6 @@ type Query {
     countRespectsLimit: Boolean! = false
   ): [ShotGQL!]!
   getShotsByIds(ids: [Int!]!): [ShotGQL!]!
-  getUsageStats(days: Int! = 30): UsageStatsGQL!
   getUser(userId: Int!): UserGQL
   doesUsernameExist(candidateUsername: String!): Boolean!
   getLoggedInUser: UserGQL
@@ -611,7 +608,7 @@ type VideoTagClass {
 }
 
 type HomographyInfoGQL {
-  id: Int
+  id: Int!
   frameIndex: Int!
   crop: BoundingBoxGQL!
   pockets: [BoundingBoxGQL!]!
@@ -996,81 +993,6 @@ input DatetimeOrdering {
   startingAt: DateTime = null
 }
 
-type SessionCoachGQL {
-  videoId: Int!
-  processingId: Int
-  analysisVersion: String!
-  state: SessionCoachStateEnum!
-  generatedAt: DateTime!
-  processingStatus: String
-  ineligibilityReason: SessionCoachIneligibilityReasonEnum
-  summary: String
-  shotCount: Int!
-  madeCount: Int!
-  missedCount: Int!
-  unknownOutcomeCount: Int!
-  analyzedShotCount: Int!
-  makePercentage: Float
-  primaryCandidate: SessionCoachCandidateGQL
-  candidates: [SessionCoachCandidateGQL!]!
-}
-
-enum SessionCoachStateEnum {
-  PROCESSING
-  READY
-  NO_TRACKED_SHOTS
-  INELIGIBLE
-  FAILED
-}
-
-enum SessionCoachIneligibilityReasonEnum {
-  MULTIPLAYER
-}
-
-type SessionCoachCandidateGQL {
-  id: ID!
-  rank: Int!
-  family: SessionCoachCandidateFamilyEnum!
-  kind: SessionCoachCandidateKindEnum!
-  title: String!
-  body: String!
-  action: String!
-  supportingShotIds: [Int!]!
-  drillId: String
-  evidence: SessionCoachEvidenceGQL!
-  limitations: [String!]!
-}
-
-enum SessionCoachCandidateFamilyEnum {
-  AIMING
-  CUT_ANGLE
-  SPIN
-  OBJECT_TO_POCKET_DISTANCE
-  CUE_TO_OBJECT_DISTANCE
-  BACK_CUT
-}
-
-enum SessionCoachCandidateKindEnum {
-  DIRECTIONAL_MISS
-  OUTCOME_PATTERN
-  USAGE_PATTERN
-}
-
-type SessionCoachEvidenceGQL {
-  bucketKey: String!
-  bucketLabel: String!
-  attemptCount: Int!
-  madeCount: Int!
-  missedCount: Int!
-  makePercentage: Float!
-  comparisonAttemptCount: Int!
-  comparisonMadeCount: Int!
-  comparisonMakePercentage: Float
-  patternShotCount: Int!
-  score: Float!
-  rankReason: String!
-}
-
 type PlayerClusterGQL {
   videoId: Int!
   clusterId: Int!
@@ -1098,14 +1020,6 @@ type PlayerClusterShotGQL {
 type TableStateGQL {
   identifierToPosition: [[Float!]!]!
   homography: HomographyInfoGQL
-  identifierToColor: [RGBColorGQL]!
-}
-
-type RGBColorGQL {
-  r: Int!
-  g: Int!
-  b: Int!
-  hex: String!
 }
 
 input HomographyInputGQL {
@@ -1142,13 +1056,6 @@ type LiveTableStateGQL {
   tableState: TableStateGQL!
 }
 
-type ShotTableStateGQL {
-  shotId: Int!
-  videoId: Int!
-  frameIndex: Int!
-  tableState: TableStateGQL!
-}
-
 type ShotProjectionGQL {
   trajectories: [BallTrajectoryGQL!]!
   events: [SimulationEventGQL!]!
@@ -1253,60 +1160,6 @@ input CreatedAfter @oneOf {
   createdAt: DateTime
 }
 
-type UsageStatsGQL {
-  funnel: FunnelStatsGQL!
-  totalUsers: Int!
-  totalVideos: Int!
-  totalShots: Int!
-  totalRuns: Int!
-  cohorts: [CohortStatsGQL!]!
-  windows: [UsageStatsWindowGQL!]!
-  daily: [UsageStatsDailyGQL!]!
-  processingLast24h: [ProcessingStatusCountGQL!]!
-}
-
-type FunnelStatsGQL {
-  freemiumEpoch: Date!
-  eraSignups: Int!
-  eraPaying: Int!
-  activationCohort: Int!
-  activationActivated: Int!
-  payingUsers: Int!
-  newPaid7d: Int!
-  newPaid30d: Int!
-  retentionPrevActive: Int!
-  retentionReturned: Int!
-}
-
-type CohortStatsGQL {
-  weekStart: Date!
-  signups: Int!
-  activated7d: Int!
-  paid7d: Int!
-  activatedNotPaid7d: Int!
-}
-
-type UsageStatsWindowGQL {
-  label: String!
-  newUsers: Int!
-  activeUsers: Int!
-  sessions: Int!
-  shots: Int!
-}
-
-type UsageStatsDailyGQL {
-  day: Date!
-  newUsers: Int!
-  activeUsers: Int!
-  sessions: Int!
-  shots: Int!
-}
-
-type ProcessingStatusCountGQL {
-  status: String!
-  count: Int!
-}
-
 type UserRelationshipsResult {
   inquiringUser: UserGQL!
   relationships: [UserRelationship!]!
@@ -1901,7 +1754,6 @@ input VideoMetadataInput {
   clientUploadStatus: ClientUploadStatusEnum = null
   resolution: VideoResolution = null
   framesPerSecond: Float = null
-  homographyBackend: HomographyBackendGQL = null
 }
 
 input VideoResolution {
@@ -1909,11 +1761,6 @@ input VideoResolution {
   height: Int!
 }
 
-enum HomographyBackendGQL {
-  CLASSIC
-  TABLENET
-}
-
 type GetUploadLinkReturn {
   value: UploadLinkGetUploadLinkErrors!
   stream: UploadStreamGQL