GetShotsWithMetadata accepts ids

codegen.yml

@@ -1,7 +1,5 @@
 overwrite: true
-schema:
+schema: "src/schema.gql"
-  - "src/schema.gql"
-  - "src/client-schema.gql"
 documents: "src/**/*.gql"
 generates:
   src/index.tsx:

pyproject.toml

@@ -7,7 +7,7 @@ readme = "README.md"
 packages = [{include = "rbproto"}]
 
 [tool.poetry.dependencies]
-python = ">=3.10,<=3.13"
+python = ">=3.10,<3.12"
 protobuf = "^4.25.3"
 
 

src/client-schema.gql

@@ -1,25 +0,0 @@
-# see: https://www.apollographql.com/docs/react/local-state/managing-state-with-field-policies/
-directive @client on FIELD
-
-extend type ShotGQL {
-  startTime: Float!
-  endTime: Float!
-}
-
-extend type UploadStreamGQL {
-  segmentEndFrames: [Int!]!
-}
-
-extend type HLSPlaylistGQL {
-  segmentStartTimes: [Float!]!
-}
-
-type SegmentEndFramesGQL {
-  id: Int!
-  segmentEndFrames: [Int!]!
-}
-
-type SegmentStartTimesGQL {
-  id: Int!
-  segmentStartTimes: [Float!]!
-}

src/operations/feed.gql

@@ -1,4 +1,3 @@
-# DO NOT USE: use getVideoFeed instead
 query GetFeed(
   $limit: Int! = 5
   $after: String = null
@@ -22,7 +21,6 @@ query GetFeed(
       elapsedTime
       screenshotUri
       stream {
-        id
         isCompleted
       }
       tableSize
@@ -39,61 +37,3 @@ query GetFeed(
     }
   }
 }
-
-fragment VideoCardFields on VideoGQL {
-  id
-  owner {
-    id
-    username
-    profileImageUri
-  }
-  name
-  screenshotUri
-  totalShotsMade
-  totalShots
-  makePercentage
-  createdAt
-  updatedAt
-  startTime
-  endTime
-  private
-  elapsedTime
-  screenshotUri
-  stream {
-    id
-    isCompleted
-  }
-  tableSize
-  tags {
-    tagClasses {
-      name
-    }
-    name
-  }
-  currentProcessing {
-    id
-    errors {
-      message
-    }
-    status
-    statuses {
-      status
-    }
-  }
-}
-
-query GetVideoFeed(
-  $limit: Int! = 5
-  $after: String = null
-  $filters: VideoFilterInput = null
-) {
-  getFeedVideos(limit: $limit, after: $after, filters: $filters) {
-    videos {
-      ...VideoCardFields
-    }
-    pageInfo {
-      hasNextPage
-      endCursor
-    }
-  }
-}

src/operations/shots.gql

@@ -17,95 +17,6 @@ query GetShotAnnotationTypes {
   }
 }
 
-mutation UpdateShotAnnotations(
-  $shotId: Int!
-  $annotations: [UpdateAnnotationInputGQL!]!
-) {
-  updateShotAnnotations(shotId: $shotId, annotations: $annotations) {
-    shot {
-      id
-      annotations {
-        shotId
-        type {
-          id
-          name
-        }
-        notes
-      }
-    }
-    error {
-      shotId
-      msg
-    }
-  }
-}
-
-## Should be deprecated
-query GetShotsWithVideoGql(
-  $filterInput: FilterInput!
-  $shotsOrdering: GetShotsOrdering
-  $limit: Int
-) {
-  getOrderedShots(
-    filterInput: $filterInput
-    shotsOrdering: $shotsOrdering
-    limit: $limit
-  ) {
-    shots {
-      id
-      videoId
-      video {
-        screenshotUri
-        endTime
-      }
-    }
-  }
-}
-
-query GetShotsWithJustIds(
-  $filterInput: FilterInput!
-  $shotsOrdering: GetShotsOrdering
-  $limit: Int
-  $countRespectsLimit: Boolean
-) {
-  getOrderedShots(
-    filterInput: $filterInput
-    shotsOrdering: $shotsOrdering
-    limit: $limit
-    countRespectsLimit: $countRespectsLimit
-  ) {
-    count
-    shots {
-      id
-      videoId
-    }
-  }
-}
-
-## Reserved for playlists (which are created from a filter)
-query GetShotsWithMetadataFilterResult(
-  $filterInput: FilterInput!
-  $shotsOrdering: GetShotsOrdering
-  $limit: Int
-  $ids: [Int!]
-  $countRespectsLimit: Boolean
-) {
-  getOrderedShots(
-    filterInput: $filterInput
-    shotsOrdering: $shotsOrdering
-    limit: $limit
-    ids: $ids
-    countRespectsLimit: $countRespectsLimit
-  ) {
-    count
-    shots {
-      ...ShotWithAllFeatures
-    }
-    ids
-  }
-}
-
-# TODO: Delete
 query GetShotsWithMetadata(
   $filterInput: FilterInput!
   $shotsPagination: GetShotsPagination
@@ -137,12 +48,18 @@ fragment ShotWithAllFeatures on ShotGQL {
   videoId
   startFrame
   endFrame
-  startTime @client
-  endTime @client
   user {
     id
   }
   falsePositiveScore
+  video {
+    stream {
+      resolution {
+        width
+        height
+      }
+    }
+  }
   createdAt
   updatedAt
   cueObjectFeatures {
@@ -153,11 +70,8 @@ fragment ShotWithAllFeatures on ShotGQL {
     spinType
   }
   pocketingIntentionFeatures {
-    make
     targetPocketDistance
-    targetPocketAngle
+    make
-    targetPocketAngleDirection
-    marginOfErrorInDegrees
     intendedPocketType
   }
   pocketingIntentionInfo {
@@ -168,12 +82,4 @@ fragment ShotWithAllFeatures on ShotGQL {
   serializedShotPaths {
     b64EncodedBuffer
   }
-  annotations {
-    shotId
-    type {
-      id
-      name
-    }
-    notes
-  }
 }

src/operations/user.gql

@@ -37,11 +37,9 @@ query getLoggedInUser {
     username
     isAdmin
     profileImageUri
-    fargoRating
     activeVideoId
     createdAt
     updatedAt
-    videosPrivateByDefault
   }
 }
 
@@ -59,101 +57,9 @@ query getUsernames(
   getUsernames(matchString: $matchString, limit: $limit, after: $after)
 }
 
-query getUserRelationshipsMatching(
-  $userId: Int!
-  $matchString: String!
-  $limit: Int = null
-  $after: String = null
-) {
-  getUserRelationshipsMatching(
-    userId: $userId
-    matchString: $matchString
-    limit: $limit
-    after: $after
-  ) {
-    relationships {
-      toUser {
-        username
-        id
-      }
-      toUserFollows
-      toUserIsFollowedBy
-    }
-  }
-}
-
 query GetUserTags {
   getUserTags {
     id
     name
   }
 }
-
-mutation followUser($followedUserId: Int!) {
-  followUser(followedUserId: $followedUserId) {
-    username
-    id
-    following {
-      id
-      username
-    }
-    followers {
-      id
-      username
-    }
-  }
-}
-
-mutation unfollowUser($followedUserId: Int!) {
-  unfollowUser(followedUserId: $followedUserId) {
-    username
-    id
-    following {
-      id
-      username
-    }
-    followers {
-      id
-      username
-    }
-  }
-}
-
-query getUserFollowingFollowers {
-  getLoggedInUser {
-    id
-    following {
-      id
-      username
-    }
-    followers {
-      id
-      username
-    }
-  }
-}
-
-query doesUsernameExist($candidateUsername: String!) {
-  doesUsernameExist(candidateUsername: $candidateUsername)
-}
-
-mutation editUser(
-  $username: String
-  $fargoRating: Int
-  $videosPrivateByDefault: Boolean
-) {
-  editUser(
-    input: {
-      username: $username
-      fargoRating: $fargoRating
-      videosPrivateByDefault: $videosPrivateByDefault
-    }
-  ) {
-    id
-    firebaseUid
-    username
-    fargoRating
-    updatedAt
-    videosPrivateByDefault
-  }
-}

src/operations/video.gql

@@ -5,10 +5,46 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
     makePercentage
     elapsedTime
     currentHomography {
-      ...HomographyInfo
+      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 {
-      id
       linksRequested
       uploadsCompleted
       segmentProcessingCursor
@@ -18,7 +54,6 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
       initPlaylistUploadStatus
     }
     currentProcessing {
-      id
       errors {
         message
         startSegmentIndex
@@ -82,32 +117,22 @@ query GetVideoDetails($videoId: Int!) {
 
 query GetVideos($videoIds: [Int!]!) {
   getVideos(videoIds: $videoIds) {
-    ...VideoStreamMetadata
-  }
-}
-
-fragment VideoStreamMetadata on VideoGQL {
-  id
-  framesPerSecond
-  stream {
     id
-    streamSegmentType
+    framesPerSecond
-    segments {
+    stream {
-      uploaded
+      id
-      valid
+      streamSegmentType
-      segmentIndex
+      segments {
-      endFrameIndex
+        uploaded
-      framesPerSecond
+        valid
+        segmentIndex
+        endFrameIndex
+        framesPerSecond
+      }
+    }
+    playlist {
+      segmentDurations
     }
-  }
-  playlist {
-    segmentDurations
-  }
-}
-
-query GetVideoForShotTime($videoId: Int!) {
-  getVideo(videoId: $videoId) {
-    ...VideoStreamMetadata
   }
 }
 
@@ -118,10 +143,47 @@ query GetVideo($videoId: Int!) {
       segmentDurations
     }
     homographyHistory {
-      ...HomographyInfo
+      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 {
-      id
       streamSegmentType
       segments {
         segmentIndex
@@ -142,14 +204,12 @@ query GetAverageTimePerShotForVideo($videoId: Int!) {
     averageTimeBetweenShots
   }
 }
-
 query GetElapsedTimeForVideo($videoId: Int!) {
   getVideo(videoId: $videoId) {
     id
     elapsedTime
   }
 }
-
 query GetMedianRunForVideo($videoId: Int!) {
   getVideo(videoId: $videoId) {
     id
@@ -157,108 +217,23 @@ query GetMedianRunForVideo($videoId: Int!) {
   }
 }
 
-fragment StreamWithEndFrames on UploadStreamGQL {
-  id
-  streamSegmentType
-  segmentEndFrames @client
-  resolution {
-    width
-    height
-  }
-  segments {
-    uploaded
-    valid
-    segmentIndex
-    endFrameIndex
-    framesPerSecond
-  }
-}
-
-fragment SegmentEndFrames on SegmentEndFramesGQL {
-  id
-  segmentEndFrames
-}
-
-fragment SegmentStartTimes on SegmentStartTimesGQL {
-  id
-  segmentStartTimes
-}
-
-fragment PlaylistWithSegmentStartTimes on HLSPlaylistGQL {
-  videoId
-  segmentDurations
-  segmentStartTimes @client
-}
-
-fragment VideoDurationData on VideoGQL {
-  id
-  framesPerSecond
-  playlist {
-    ...PlaylistWithSegmentStartTimes
-  }
-  stream {
-    ...StreamWithEndFrames
-  }
-}
-
 query GetVideoForClipTimes($videoId: Int!) {
-  getVideo(videoId: $videoId) {
-    ...VideoDurationData
-  }
-}
-
-query GetHeaderInfoByVideoId($videoId: Int!) {
   getVideo(videoId: $videoId) {
     id
-    name
+    framesPerSecond
-    startTime
+    playlist {
-  }
+      segmentDurations
-}
-
-mutation FindPrerecordTableLayout($b64Image: String!, $videoId: Int!) {
-  findPrerecordTableLayout(b64Image: $b64Image, videoId: $videoId) {
-    ...HomographyInfo
-  }
-}
-
-fragment HomographyInfo on HomographyInfoGQL {
-  frameIndex
-  crop {
-    left
-    top
-    width
-    height
-  }
-  pockets {
-    left
-    top
-    width
-    height
-  }
-  sourcePoints {
-    topLeft {
-      x
-      y
     }
-    topSide {
+    stream {
-      x
+      id
-      y
+      streamSegmentType
-    }
+      segments {
-    topRight {
+        uploaded
-      x
+        valid
-      y
+        segmentIndex
-    }
+        endFrameIndex
-    bottomLeft {
+        framesPerSecond
-      x
+      }
-      y
-    }
-    bottomSide {
-      x
-      y
-    }
-    bottomRight {
-      x
-      y
     }
   }
 }

src/schema.gql

@@ -9,44 +9,27 @@ type Query {
     videoId: ID!
     intervalDuration: Int! = 300
   ): [MakePercentageIntervalGQL!]!
-  getMedals(scope: MedalScope!, userId: Int = null): RequestedMedalsGQL!
-  getOrderedShots(
-    filterInput: FilterInput!
-    ids: [Int!] = null
-    shotsOrdering: GetShotsOrdering = null
-    limit: Int! = 500
-    countRespectsLimit: Boolean! = false
-  ): GetShotsResult!
   getShotsWithMetadata(
     filterInput: FilterInput!
     ids: [Int!] = null
     shotsPagination: GetShotsPagination = null
     limit: Int! = 500
-    countRespectsLimit: Boolean! = false
   ): GetShotsResult!
   getShots(
     filterInput: FilterInput!
     shotsPagination: GetShotsPagination = null
     limit: Int! = 500
-    countRespectsLimit: Boolean! = false
   ): [ShotGQL!]!
   getShotsByIds(ids: [Int!]!): [ShotGQL!]!
   getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
   getUser(userId: Int!): UserGQL
-  doesUsernameExist(candidateUsername: String!): Boolean!
   getLoggedInUser: UserGQL
   getUsernames(
     matchString: String = null
     limit: Int = null
     after: String = null
   ): [String!]!
-  getUserRelationshipsMatching(
+  getPlayTime(userId: Int!): UserPlayTimeGQL!
-    userId: Int!
-    matchString: String = null
-    limit: Int = 100
-    after: String = null
-  ): UserRelationshipsResult!
-  getPlayTime(userId: Int!, filters: VideoFilterInput = null): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
     limit: Int! = 5
@@ -56,11 +39,6 @@ type Query {
   getUserTags: [TagGQL!]!
   getVideo(videoId: Int!, debuggingJson: JSON = null): VideoGQL!
   getVideos(videoIds: [Int!]!): [VideoGQL!]!
-  getFeedVideos(
-    limit: Int! = 5
-    after: String = null
-    filters: VideoFilterInput = null
-  ): VideoHistoryGQL!
 }
 
 type AggregateResultGQL {
@@ -147,7 +125,6 @@ enum AlignedIntervalEnum {
   MONTH
   YEAR
   WEEK
-  DAY
 }
 
 input FilterInput @oneOf {
@@ -163,8 +140,6 @@ input FilterInput @oneOf {
   shotDirection: [ShotDirectionEnum!]
   videoId: [Int!]
   userId: [Int!]
-  username: [String!]
-  fargoRating: FloatRangeFilter
   make: [Boolean!]
   tags: [VideoTagInput!]
   annotations: [ShotAnnotationInput!]
@@ -187,10 +162,7 @@ input FilterInput @oneOf {
   targetPocketAngleDirection: [ShotDirectionEnum!]
   targetPocketAngle: FloatRangeFilter
   missAngleInDegrees: FloatRangeFilter
-  marginOfErrorInDegrees: FloatRangeFilter
   createdAt: DateRangeFilter
-  totalDistance: FloatRangeFilter
-  runLength: FloatRangeFilter
 }
 
 input FloatRangeFilter {
@@ -271,52 +243,6 @@ type MakePercentageIntervalGQL {
   elapsedTime: Float!
 }
 
-type RequestedMedalsGQL {
-  distanceOver66: MedalGQL
-  distanceOver78: MedalGQL
-  distanceOver90: MedalGQL
-  runLength3: MedalGQL
-  runLength5: MedalGQL
-  runLength8: MedalGQL
-  runLength10: MedalGQL
-  runLength15: MedalGQL
-  runLength20: MedalGQL
-  runLength25: MedalGQL
-  runLength30: MedalGQL
-  runLength40: MedalGQL
-  runLength50: MedalGQL
-  totalMakes25: MedalGQL
-  totalMakes50: MedalGQL
-  totalMakes75: MedalGQL
-  totalMakes100: MedalGQL
-  totalMakes200: MedalGQL
-  totalMakes300: MedalGQL
-  totalMakes400: MedalGQL
-  totalMakes500: MedalGQL
-  totalMakes750: MedalGQL
-  totalMakes1000: MedalGQL
-  dayStreak2: MedalGQL
-  dayStreak3: MedalGQL
-  dayStreak4: MedalGQL
-  dayStreak5: MedalGQL
-  dayStreak6: MedalGQL
-  dayStreak7: MedalGQL
-  dayStreak14: MedalGQL
-  dayStreak21: MedalGQL
-  dayStreak30: MedalGQL
-  dayStreak60: MedalGQL
-  dayStreak90: MedalGQL
-}
-
-type MedalGQL {
-  count: Int!
-}
-
-input MedalScope @oneOf {
-  videoId: Int
-  interval: TimeInterval
-}
-
 type GetShotsResult {
   shots: [ShotGQL!]!
   count: Int
@@ -356,7 +282,6 @@ type PocketingIntentionFeaturesGQL {
   difficulty: Float
   targetPocketAngle: Float
   targetPocketAngleDirection: ShotDirectionEnum
-  marginOfErrorInDegrees: Float
   backcut: Boolean
 }
 
@@ -392,17 +317,13 @@ type SerializedShotPathsGQL {
 
 type UserGQL {
   id: Int!
-  firebaseUid: String
+  firebaseUid: String!
   username: String!
-  isAdmin: Boolean
+  isAdmin: Boolean!
-  fargoRating: Int
   activeVideoId: Int
   profileImageUri: String
   createdAt: DateTime
   updatedAt: DateTime
-  videosPrivateByDefault: Boolean
-  following: [UserGQL!]
-  followers: [UserGQL!]
 }
 
 type ShotAnnotationGQL {
@@ -438,7 +359,6 @@ type VideoGQL {
   elapsedTime: Float
   framesPerSecond: Float!
   tableSize: Float!
-  private: Boolean!
   stream: UploadStreamGQL
   playlist: HLSPlaylistGQL
   tags: [VideoTag!]!
@@ -511,7 +431,6 @@ type VideoTagClass {
 }
 
 type HomographyInfoGQL {
-  id: Int!
   frameIndex: Int!
   crop: BoundingBoxGQL!
   pockets: [BoundingBoxGQL!]!
@@ -541,7 +460,6 @@ type IntPoint2D {
 }
 
 type VideoProcessingGQL {
-  id: Int!
   errors: [VideoProcessingErrorGQL!]!
   status: ProcessingStatusEnum!
   statuses: [VideoProcessingStatusGQL!]!
@@ -572,33 +490,6 @@ type VideoProcessingStatusGQL {
   updatedAt: DateTime
 }
 
-input GetShotsOrdering {
-  orderings: [ShotsOrderingComponent!]!
-}
-
-input ShotsOrderingComponent @oneOf {
-  videoCreation: DatetimeShotOrdering
-  marginOfError: FloatShotOrdering
-  videoId: IntShotOrdering
-  startFrame: IntShotOrdering
-  runLength: IntShotOrdering
-}
-
-input DatetimeShotOrdering {
-  descending: Boolean! = true
-  startingAt: DateTime = null
-}
-
-input FloatShotOrdering {
-  descending: Boolean! = true
-  startingAt: Float = null
-}
-
-input IntShotOrdering {
-  descending: Boolean! = true
-  startingAt: Int = null
-}
-
 input GetShotsPagination {
   createdAfter: CreatedAfter!
   startFrameAfter: Int!
@@ -609,27 +500,10 @@ input CreatedAfter @oneOf {
   createdAt: DateTime
 }
 
-type UserRelationshipsResult {
-  inquiringUser: UserGQL!
-  relationships: [UserRelationship!]!
-}
-
-type UserRelationship {
-  toUser: UserGQL!
-  toUserFollows: Boolean!
-  toUserIsFollowedBy: Boolean!
-}
-
 type UserPlayTimeGQL {
   totalSeconds: Float!
 }
 
-input VideoFilterInput {
-  isStreamCompleted: Boolean = null
-  requireCursorCompletion: Boolean! = true
-  createdAt: DateRangeFilter = null
-}
-
 type VideoHistoryGQL {
   videos: [VideoGQL!]!
   pageInfo: PageInfoGQL!
@@ -640,6 +514,11 @@ type PageInfoGQL {
   endCursor: String
 }
 
+input VideoFilterInput {
+  isStreamCompleted: Boolean = null
+  requireCursorCompletion: Boolean! = true
+}
+
 type TagGQL {
   name: String!
   id: Int!
@@ -662,18 +541,10 @@ type Mutation {
     annotationName: String!
     notes: String = null
   ): AddShotAnnotationReturn!
-  updateShotAnnotations(
-    shotId: Int!
-    annotations: [UpdateAnnotationInputGQL!]!
-  ): UpdateShotAnnotationReturn!
   getProfileImageUploadLink(
     fileExt: String = ".png"
   ): GetProfileUploadLinkReturn!
   editProfileImageUri(profileImageUri: String!): UserGQL!
-  editUser(input: EditUserInputGQL!): UserGQL!
-  followUser(followedUserId: Int!): UserGQL!
-  unfollowUser(followedUserId: Int!): UserGQL!
-  findPrerecordTableLayout(b64Image: String!, videoId: Int!): HomographyInfoGQL
   createUploadStream(
     videoMetadata: VideoMetadataInput!
   ): CreateUploadStreamReturn!
@@ -723,16 +594,6 @@ type OtherErrorNeedsNote {
   msg: String
 }
 
-type UpdateShotAnnotationReturn {
-  shot: ShotGQL
-  error: DoesNotOwnShotErr
-}
-
-input UpdateAnnotationInputGQL {
-  name: String!
-  notes: String = null
-}
-
 type GetProfileUploadLinkReturn {
   value: UploadLinkGetProfileUploadLinkErrors!
 }
@@ -759,12 +620,6 @@ type TooManyProfileImageUploadsErr {
   linksRequested: Int!
 }
 
-input EditUserInputGQL {
-  username: String = null
-  fargoRating: Int = null
-  videosPrivateByDefault: Boolean = null
-}
-
 type CreateUploadStreamReturn {
   videoId: Int!
 }
@@ -775,14 +630,32 @@ input VideoMetadataInput {
   endTime: DateTime = null
   gameType: String = null
   tableSize: Float = null
+  uploadStreamMetadataInput: UploadStreamMetadataInput = null
   lastIntendedSegmentBound: Int = null
   streamSegmentType: StreamSegmentTypeEnum = null
-  private: Boolean = null
   endStream: Boolean! = false
   resolution: VideoResolution = null
   framesPerSecond: Float = null
 }
 
+input UploadStreamMetadataInput {
+  deviceType: DeviceTypeEnum = null
+  osVersion: String = null
+  appVersion: String = null
+  browserName: String = null
+  browserVersion: String = null
+  locale: String = null
+  timezone: String = null
+  networkType: String = null
+  ipAddress: String = null
+}
+
+enum DeviceTypeEnum {
+  IOS
+  ANDROID
+  BROWSER
+}
+
 input VideoResolution {
   width: Int!
   height: Int!