Request id in Homography info

Reviewed-on: #142

pyproject.toml

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

src/operations/feed.gql

@@ -1,3 +1,4 @@
+# DO NOT USE: use getVideoFeed instead
 query GetFeed(
   $limit: Int! = 5
   $after: String = null
@@ -5,32 +6,71 @@ query GetFeed(
 ) {
   getUserVideos(limit: $limit, after: $after, filters: $filters) {
     videos {
-      id
-      owner {
-        username
-      }
-      name
-      screenshotUri
-      totalShotsMade
-      totalShots
-      makePercentage
-      createdAt
-      updatedAt
-      startTime
-      endTime
-      elapsedTime
-      screenshotUri
-      stream {
-        id
-        isCompleted
-      }
-      tableSize
-      tags {
-        tagClasses {
-          name
-        }
-        name
-      }
+      ...VideoCardFields
+    }
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
+  }
+}
+
+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
+  $includeCallersVideos: Boolean = null
+) {
+  getFeedVideos(
+    limit: $limit
+    after: $after
+    filters: $filters
+    includeCallersVideos: $includeCallersVideos
+  ) {
+    videos {
+      ...VideoCardFields
     }
     pageInfo {
       hasNextPage

src/operations/medals.gql

@@ -0,0 +1,80 @@
+fragment MedalFields on MedalGQL {
+  count
+  nickname
+}
+
+query getMedals($scope: MedalScope!, $userId: Int) {
+  getMedals(scope: $scope, userId: $userId) {
+    distanceOver66 {
+      ...MedalFields
+    }
+    distanceOver78 {
+      ...MedalFields
+    }
+    distanceOver90 {
+      ...MedalFields
+    }
+    runLength3 {
+      ...MedalFields
+    }
+    runLength5 {
+      ...MedalFields
+    }
+    runLength8 {
+      ...MedalFields
+    }
+    runLength10 {
+      ...MedalFields
+    }
+    runLength15 {
+      ...MedalFields
+    }
+    runLength20 {
+      ...MedalFields
+    }
+    runLength25 {
+      ...MedalFields
+    }
+    runLength30 {
+      ...MedalFields
+    }
+    runLength40 {
+      ...MedalFields
+    }
+    runLength50 {
+      ...MedalFields
+    }
+    totalMakes100 {
+      ...MedalFields
+    }
+    # missing assets
+    # totalMakes500 {
+    #   ...MedalFields
+    # }
+    # totalMakes1000 {
+    #   ...MedalFields
+    # }
+    # totalMakes5000 {
+    #   ...MedalFields
+    # }
+    # totalMakes10000 {
+    #   ...MedalFields
+    # }
+    dailyMakes50 {
+      ...MedalFields
+    }
+    dailyMakes100 {
+      ...MedalFields
+    }
+    dailyMakes150 {
+      ...MedalFields
+    }
+    dailyMakes200 {
+      ...MedalFields
+    }
+    # missing asset
+    # dailyMakes250 {
+    #   ...MedalFields
+    # }
+  }
+}

src/operations/shots.gql

@@ -40,9 +40,17 @@ mutation UpdateShotAnnotations(
   }
 }
 
-query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
-  getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
-    ids
+## Should be deprecated
+query GetShotsWithVideoGql(
+  $filterInput: FilterInput!
+  $shotsOrdering: GetShotsOrdering
+  $limit: Int
+) {
+  getOrderedShots(
+    filterInput: $filterInput
+    shotsOrdering: $shotsOrdering
+    limit: $limit
+  ) {
     shots {
       id
       videoId
@@ -54,18 +62,40 @@ query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
   }
 }
 
+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 {
@@ -129,6 +159,7 @@ fragment ShotWithAllFeatures on ShotGQL {
     targetPocketAngleDirection
     marginOfErrorInDegrees
     intendedPocketType
+    difficulty
   }
   pocketingIntentionInfo {
     ballId

src/operations/user.gql

@@ -37,14 +37,16 @@ query getLoggedInUser {
     username
     isAdmin
     profileImageUri
+    fargoRating
     activeVideoId
     createdAt
     updatedAt
+    videosPrivateByDefault
   }
 }
 
-query GetUserPlayTime($userId: Int!) {
-  getPlayTime(userId: $userId) {
+query GetUserPlayTime($userId: Int!, $filters: VideoFilterInput) {
+  getPlayTime(userId: $userId, filters: $filters) {
     totalSeconds
   }
 }
@@ -57,23 +59,25 @@ query getUsernames(
   getUsernames(matchString: $matchString, limit: $limit, after: $after)
 }
 
-query getUsernamesAndFollowing(
+query getUserRelationshipsMatching(
   $userId: Int!
   $matchString: String!
   $limit: Int = null
   $after: String = null
 ) {
-  getUsernamesAndFollowing(
+  getUserRelationshipsMatching(
     userId: $userId
     matchString: $matchString
     limit: $limit
     after: $after
   ) {
-    followers
-    following
-    usernamesAndIds {
-      username
-      id
+    relationships {
+      toUser {
+        username
+        id
+      }
+      toUserFollows
+      toUserIsFollowedBy
     }
   }
 }
@@ -84,3 +88,72 @@ query GetUserTags {
     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,44 +5,7 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
     makePercentage
     elapsedTime
     currentHomography {
-      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
-        }
-      }
+      ...HomographyInfo
     }
     stream {
       id
@@ -55,6 +18,7 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
       initPlaylistUploadStatus
     }
     currentProcessing {
+      id
       errors {
         message
         startSegmentIndex
@@ -154,45 +118,7 @@ query GetVideo($videoId: Int!) {
       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
-        }
-      }
+      ...HomographyInfo
     }
     stream {
       id
@@ -288,3 +214,52 @@ query GetHeaderInfoByVideoId($videoId: Int!) {
     startTime
   }
 }
+
+mutation FindPrerecordTableLayout($b64Image: String!, $videoId: Int!) {
+  findPrerecordTableLayout(b64Image: $b64Image, videoId: $videoId) {
+    ...HomographyInfo
+  }
+}
+
+fragment HomographyInfo on HomographyInfoGQL {
+  id
+  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
+    }
+  }
+}

src/schema.gql

@@ -9,39 +9,51 @@ type Query {
     videoId: ID!
     intervalDuration: Int! = 300
   ): [MakePercentageIntervalGQL!]!
+  getMedals(scope: MedalScope!, userId: Int = null): RequestedMedalsGQL!
+  getRuns(
+    filterInput: RunFilterInput!
+    runIds: [Int!] = null
+    runsOrdering: GetRunsOrdering = null
+    limit: Int! = 500
+    countRespectsLimit: Boolean! = false
+  ): GetRunsResult!
   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!]!
-  getUsernamesAndFollowing(
+  getUserRelationshipsMatching(
     userId: Int!
     matchString: String = null
     limit: Int = 100
     after: String = null
-  ): UsernamesAndFollowingResponse!
-  getPlayTime(userId: Int!): UserPlayTimeGQL!
+  ): UserRelationshipsResult!
+  getPlayTime(userId: Int!, filters: VideoFilterInput = null): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
     limit: Int! = 5
@@ -54,6 +66,7 @@ type Query {
   getFeedVideos(
     limit: Int! = 5
     after: String = null
+    includeCallersVideos: Boolean = true
     filters: VideoFilterInput = null
   ): VideoHistoryGQL!
 }
@@ -266,10 +279,61 @@ type MakePercentageIntervalGQL {
   elapsedTime: Float!
 }
 
-type GetShotsResult {
-  shots: [ShotGQL!]!
+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 @deprecated(reason: "no longer supported")
+  totalMakes50: MedalGQL @deprecated(reason: "no longer supported")
+  totalMakes75: MedalGQL @deprecated(reason: "no longer supported")
+  totalMakes200: MedalGQL @deprecated(reason: "no longer supported")
+  totalMakes300: MedalGQL @deprecated(reason: "no longer supported")
+  totalMakes400: MedalGQL @deprecated(reason: "no longer supported")
+  totalMakes750: MedalGQL @deprecated(reason: "no longer supported")
+  totalMakes100: MedalGQL
+  totalMakes500: MedalGQL
+  totalMakes1000: MedalGQL
+  totalMakes5000: MedalGQL
+  totalMakes10000: MedalGQL
+  dailyMakes50: MedalGQL
+  dailyMakes100: MedalGQL
+  dailyMakes150: MedalGQL
+  dailyMakes200: MedalGQL
+  dailyMakes250: MedalGQL
+}
+
+type MedalGQL {
+  count: Int!
+  nickname: String
+}
+
+input MedalScope @oneOf {
+  videoId: Int
+  interval: TimeInterval
+}
+
+type GetRunsResult {
+  runs: [RunGQL!]!
   count: Int
-  ids: [Int!]!
+  runIds: [Int!]!
+}
+
+type RunGQL {
+  id: Int!
+  runLength: Int!
+  videoId: Int!
+  userId: Int!
+  shots: [ShotGQL!]!
 }
 
 type ShotGQL {
@@ -341,16 +405,17 @@ 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
-  following: [Int!]
-  followers: [Int!]
+  videosPrivateByDefault: Boolean
+  following: [UserGQL!]
+  followers: [UserGQL!]
 }
 
 type ShotAnnotationGQL {
@@ -386,6 +451,7 @@ type VideoGQL {
   elapsedTime: Float
   framesPerSecond: Float!
   tableSize: Float!
+  private: Boolean!
   stream: UploadStreamGQL
   playlist: HLSPlaylistGQL
   tags: [VideoTag!]!
@@ -408,6 +474,7 @@ type UploadStreamGQL {
   createdAt: DateTime!
   updatedAt: DateTime!
   segments: [UploadSegmentGQL!]!
+  clientUploadStatus: ClientUploadStatusEnum
   resolution: VideoResolutionGQL!
   streamSegmentType: StreamSegmentTypeEnum!
 }
@@ -432,6 +499,11 @@ type UploadSegmentGQL {
   linksRequested: Int!
 }
 
+enum ClientUploadStatusEnum {
+  UPLOAD_ENABLED
+  UPLOAD_DISABLED
+}
+
 type VideoResolutionGQL {
   width: Int
   height: Int
@@ -458,6 +530,7 @@ type VideoTagClass {
 }
 
 type HomographyInfoGQL {
+  id: Int!
   frameIndex: Int!
   crop: BoundingBoxGQL!
   pockets: [BoundingBoxGQL!]!
@@ -487,6 +560,7 @@ type IntPoint2D {
 }
 
 type VideoProcessingGQL {
+  id: Int!
   errors: [VideoProcessingErrorGQL!]!
   status: ProcessingStatusEnum!
   statuses: [VideoProcessingStatusGQL!]!
@@ -517,33 +591,61 @@ type VideoProcessingStatusGQL {
   updatedAt: DateTime
 }
 
+input RunFilterInput {
+  videoId: [Int!]
+  userId: [Int!]
+  username: [String!]
+  andFilters: [RunFilterInput!]
+  orFilters: [RunFilterInput!]
+  notFilter: RunFilterInput
+  tableSize: FloatRangeFilter
+  createdAt: DateRangeFilter
+  runLength: FloatRangeFilter
+}
+
+input GetRunsOrdering {
+  orderings: [RunsOrderingComponent!]!
+}
+
+input RunsOrderingComponent @oneOf {
+  runLength: IntOrdering
+  videoId: IntOrdering
+  videoCreation: DatetimeOrdering
+}
+
+input IntOrdering {
+  descending: Boolean! = true
+  startingAt: Int = null
+}
+
+input DatetimeOrdering {
+  descending: Boolean! = true
+  startingAt: DateTime = null
+}
+
+type GetShotsResult {
+  shots: [ShotGQL!]!
+  count: Int
+  ids: [Int!]!
+}
+
 input GetShotsOrdering {
   orderings: [ShotsOrderingComponent!]!
 }
 
 input ShotsOrderingComponent @oneOf {
-  videoCreation: DatetimeShotOrdering
-  marginOfError: FloatShotOrdering
-  videoId: IntShotOrdering
-  startFrame: IntShotOrdering
-  runLength: IntShotOrdering
+  videoCreation: DatetimeOrdering
+  marginOfError: FloatOrdering
+  videoId: IntOrdering
+  startFrame: IntOrdering
+  runLength: IntOrdering
 }
 
-input DatetimeShotOrdering {
-  descending: Boolean! = true
-  startingAt: DateTime = null
-}
-
-input FloatShotOrdering {
+input FloatOrdering {
   descending: Boolean! = true
   startingAt: Float = null
 }
 
-input IntShotOrdering {
-  descending: Boolean! = true
-  startingAt: Int = null
-}
-
 input GetShotsPagination {
   createdAfter: CreatedAfter!
   startFrameAfter: Int!
@@ -554,16 +656,28 @@ input CreatedAfter @oneOf {
   createdAt: DateTime
 }
 
-type UsernamesAndFollowingResponse {
-  usernames: [String!]!
-  following: [Int!]!
-  followers: [Int!]!
+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
+  excludeVideosWithNoShots: Boolean = null
+}
+
 type VideoHistoryGQL {
   videos: [VideoGQL!]!
   pageInfo: PageInfoGQL!
@@ -574,11 +688,6 @@ type PageInfoGQL {
   endCursor: String
 }
 
-input VideoFilterInput {
-  isStreamCompleted: Boolean = null
-  requireCursorCompletion: Boolean! = true
-}
-
 type TagGQL {
   name: String!
   id: Int!
@@ -612,6 +721,7 @@ type Mutation {
   editUser(input: EditUserInputGQL!): UserGQL!
   followUser(followedUserId: Int!): UserGQL!
   unfollowUser(followedUserId: Int!): UserGQL!
+  findPrerecordTableLayout(b64Image: String!, videoId: Int!): HomographyInfoGQL
   createUploadStream(
     videoMetadata: VideoMetadataInput!
   ): CreateUploadStreamReturn!
@@ -700,6 +810,7 @@ type TooManyProfileImageUploadsErr {
 input EditUserInputGQL {
   username: String = null
   fargoRating: Int = null
+  videosPrivateByDefault: Boolean = null
 }
 
 type CreateUploadStreamReturn {
@@ -714,7 +825,9 @@ input VideoMetadataInput {
   tableSize: Float = null
   lastIntendedSegmentBound: Int = null
   streamSegmentType: StreamSegmentTypeEnum = null
+  private: Boolean = null
   endStream: Boolean! = false
+  clientUploadStatus: ClientUploadStatusEnum = null
   resolution: VideoResolution = null
   framesPerSecond: Float = null
 }