Check homography

Reviewed-on: #119

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/check_homography.gql

@@ -0,0 +1,69 @@
+mutation checkHomographyIsValid($b64Image: String!, $videoId: Int!) {
+  checkHomographyIsValid(b64Image: $b64Image, videoId: $videoId) {
+    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
+      }
+    }
+    destPoints {
+      topLeft {
+        x
+        y
+      }
+      topSide {
+        x
+        y
+      }
+      topRight {
+        x
+        y
+      }
+      bottomLeft {
+        x
+        y
+      }
+      bottomSide {
+        x
+        y
+      }
+      bottomRight {
+        x
+        y
+      }
+    }
+  }
+}

src/operations/feed.gql

@@ -1,3 +1,4 @@
+# DO NOT USE: use getVideoFeed instead
 query GetFeed(
   $limit: Int! = 5
   $after: String = null
@@ -38,3 +39,59 @@ query GetFeed(
     }
   }
 }
+
+fragment VideoCardFields on VideoGQL {
+  id
+  owner {
+    id
+    username
+    profileImageUri
+  }
+  name
+  screenshotUri
+  totalShotsMade
+  totalShots
+  makePercentage
+  createdAt
+  updatedAt
+  startTime
+  endTime
+  elapsedTime
+  screenshotUri
+  stream {
+    id
+    isCompleted
+  }
+  tableSize
+  tags {
+    tagClasses {
+      name
+    }
+    name
+  }
+  currentProcessing {
+    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

@@ -40,9 +40,17 @@ mutation UpdateShotAnnotations(
   }
 }
 
-query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
+## Should be deprecated
-  getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
+query GetShotsWithVideoGql(
-    ids
+  $filterInput: FilterInput!
+  $shotsOrdering: GetShotsOrdering
+  $limit: Int
+) {
+  getOrderedShots(
+    filterInput: $filterInput
+    shotsOrdering: $shotsOrdering
+    limit: $limit
+  ) {
     shots {
       id
       videoId
@@ -54,18 +62,37 @@ query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
   }
 }
 
+query GetShotsWithJustIds(
+  $filterInput: FilterInput!
+  $shotsOrdering: GetShotsOrdering
+  $limit: Int
+) {
+  getOrderedShots(
+    filterInput: $filterInput
+    shotsOrdering: $shotsOrdering
+    limit: $limit
+  ) {
+    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 {

src/operations/user.gql

@@ -37,6 +37,7 @@ query getLoggedInUser {
     username
     isAdmin
     profileImageUri
+    fargoRating
     activeVideoId
     createdAt
     updatedAt
@@ -57,23 +58,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
+    relationships {
-    following
+      toUser {
-    usernamesAndIds {
+        username
-      username
+        id
-      id
+      }
+      toUserFollows
+      toUserIsFollowedBy
     }
   }
 }
@@ -84,3 +87,51 @@ 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)
+}

src/schema.gql

@@ -9,38 +9,43 @@ 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!]!
-  getUsernamesAndFollowing(
+  getUserRelationshipsMatching(
     userId: Int!
     matchString: String = null
     limit: Int = 100
     after: String = null
-  ): UsernamesAndFollowingResponse!
+  ): UserRelationshipsResult!
   getPlayTime(userId: Int!): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
@@ -266,6 +271,52 @@ 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
@@ -341,16 +392,16 @@ 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!]
+  following: [UserGQL!]
-  followers: [Int!]
+  followers: [UserGQL!]
 }
 
 type ShotAnnotationGQL {
@@ -554,15 +605,15 @@ input CreatedAfter @oneOf {
   createdAt: DateTime
 }
 
-type UsernamesAndFollowingResponse {
+type UserRelationshipsResult {
-  usernamesAndIds: [FollowingUser!]!
+  inquiringUser: UserGQL!
-  following: [Int!]!
+  relationships: [UserRelationship!]!
-  followers: [Int!]!
 }
 
-type FollowingUser {
+type UserRelationship {
-  id: Int!
+  toUser: UserGQL!
-  username: String!
+  toUserFollows: Boolean!
+  toUserIsFollowedBy: Boolean!
 }
 
 type UserPlayTimeGQL {
@@ -617,6 +668,7 @@ type Mutation {
   editUser(input: EditUserInputGQL!): UserGQL!
   followUser(followedUserId: Int!): UserGQL!
   unfollowUser(followedUserId: Int!): UserGQL!
+  checkHomographyIsValid(b64Image: String!, videoId: Int!): HomographyInfoGQL
   createUploadStream(
     videoMetadata: VideoMetadataInput!
   ): CreateUploadStreamReturn!