Expose frames per second in get videos

Reviewed-on: #42
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>
Reviewed-by: countablecloud <countablecloud@gmail.com>

src/index.tsx

@@ -34,6 +34,16 @@ export type Scalars = {
   JSON: { input: any; output: any };
 };
 
+export type AddShotAnnotationErrors = {
+  __typename?: "AddShotAnnotationErrors";
+  error: DoesNotOwnShotErrOtherErrorNeedsNote;
+};
+
+export type AddShotAnnotationReturn = {
+  __typename?: "AddShotAnnotationReturn";
+  value: SuccessfulAddAddShotAnnotationErrors;
+};
+
 export type AggregateInputGql = {
   aggregations: Array<AggregationInput>;
   filterInput?: InputMaybe<FilterInput>;
@@ -131,6 +141,16 @@ export enum DeviceTypeEnum {
   Ios = "IOS",
 }
 
+export type DoesNotOwnShotErr = {
+  __typename?: "DoesNotOwnShotErr";
+  msg?: Maybe<Scalars["String"]["output"]>;
+  shotId: Scalars["Int"]["output"];
+};
+
+export type DoesNotOwnShotErrOtherErrorNeedsNote =
+  | DoesNotOwnShotErr
+  | OtherErrorNeedsNote;
+
 export type EnumAggregation = {
   feature: Scalars["String"]["input"];
 };
@@ -1097,16 +1117,30 @@ export type FilterInput =
       videoId: Array<Scalars["Int"]["input"]>;
     };
 
+export type GetProfileUploadLinkErrors = {
+  __typename?: "GetProfileUploadLinkErrors";
+  error: TooManyProfileImageUploadsErr;
+};
+
+export type GetProfileUploadLinkReturn = {
+  __typename?: "GetProfileUploadLinkReturn";
+  value: UploadLinkGetProfileUploadLinkErrors;
+};
+
 export type GetShotsPagination = {
   createdAfter: CreatedAfter;
   startFrameAfter: Scalars["Int"]["input"];
 };
 
+export type GetUploadLinkErrors = {
+  __typename?: "GetUploadLinkErrors";
+  error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr;
+};
+
 export type GetUploadLinkReturn = {
   __typename?: "GetUploadLinkReturn";
-  headers: Array<Maybe<Header>>;
-  uploadCompletionCursor?: Maybe<Scalars["Int"]["output"]>;
-  uploadUrl: Scalars["String"]["output"];
+  stream?: Maybe<UploadStreamGql>;
+  value: UploadLinkGetUploadLinkErrors;
 };
 
 export type HlsPlaylistGql = {
@@ -1149,16 +1183,30 @@ export type MakePercentageIntervalGql = {
   makePercentage: Scalars["Float"]["output"];
 };
 
+export type MustHaveSetForUploadLinkErr = {
+  __typename?: "MustHaveSetForUploadLinkErr";
+  framesPerSecond?: Maybe<Scalars["Boolean"]["output"]>;
+  resolution?: Maybe<Scalars["Boolean"]["output"]>;
+};
+
+export type MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr =
+
+    | MustHaveSetForUploadLinkErr
+    | NoInitForChunkedUploadErr
+    | ProcessingFailedErr
+    | SegmentAlreadyUploadedErr
+    | TooManyProfileImageUploadsErr;
+
 export type Mutation = {
   __typename?: "Mutation";
-  addAnnotationToShot: Scalars["Boolean"]["output"];
+  addAnnotationToShot: AddShotAnnotationReturn;
   createBucketSet: BucketSetGql;
   createUploadStream: CreateUploadStreamReturn;
   deleteVideo: Scalars["Boolean"]["output"];
   editProfileImageUri: UserGql;
   editUploadStream: Scalars["Boolean"]["output"];
   getHlsInitUploadLink: GetUploadLinkReturn;
-  getProfileImageUploadLink: GetUploadLinkReturn;
+  getProfileImageUploadLink: GetProfileUploadLinkReturn;
   getUploadLink: GetUploadLinkReturn;
   setLoggerLevel: Scalars["Boolean"]["output"];
   setSegmentDuration: Scalars["Boolean"]["output"];
@@ -1166,6 +1214,7 @@ export type Mutation = {
 
 export type MutationAddAnnotationToShotArgs = {
   annotationName: Scalars["String"]["input"];
+  notes?: InputMaybe<Scalars["String"]["input"]>;
   shotId: Scalars["Int"]["input"];
 };
 
@@ -1214,6 +1263,16 @@ export type MutationSetSegmentDurationArgs = {
   videoId: Scalars["Int"]["input"];
 };
 
+export type NoInitForChunkedUploadErr = {
+  __typename?: "NoInitForChunkedUploadErr";
+  segmentType: StreamSegmentTypeEnum;
+};
+
+export type OtherErrorNeedsNote = {
+  __typename?: "OtherErrorNeedsNote";
+  msg?: Maybe<Scalars["String"]["output"]>;
+};
+
 export type PageInfoGql = {
   __typename?: "PageInfoGQL";
   endCursor?: Maybe<Scalars["String"]["output"]>;
@@ -1243,6 +1302,11 @@ export type PocketingIntentionFeaturesGql = {
   targetPocketDistance?: Maybe<Scalars["Float"]["output"]>;
 };
 
+export type ProcessingFailedErr = {
+  __typename?: "ProcessingFailedErr";
+  processing: VideoProcessingGql;
+};
+
 export enum ProcessingStatusEnum {
   Created = "CREATED",
   Failed = "FAILED",
@@ -1285,6 +1349,10 @@ export type QueryGetPlayTimeArgs = {
   userId: Scalars["Int"]["input"];
 };
 
+export type QueryGetShotAnnotationTypesArgs = {
+  errorTypes?: InputMaybe<Scalars["Boolean"]["input"]>;
+};
+
 export type QueryGetShotsArgs = {
   filterInput: FilterInput;
   limit?: Scalars["Int"]["input"];
@@ -1335,6 +1403,11 @@ export type RangeFilter = {
   lessThanInclusive?: Scalars["Boolean"]["input"];
 };
 
+export type SegmentAlreadyUploadedErr = {
+  __typename?: "SegmentAlreadyUploadedErr";
+  segmentId: Scalars["Int"]["output"];
+};
+
 export type SerializedShotPathsGql = {
   __typename?: "SerializedShotPathsGQL";
   b64EncodedBuffer?: Maybe<Scalars["String"]["output"]>;
@@ -1344,6 +1417,7 @@ export type ShotAnnotationGql = {
   __typename?: "ShotAnnotationGQL";
   createdAt?: Maybe<Scalars["DateTime"]["output"]>;
   creator: UserGql;
+  errorDefault: Scalars["Boolean"]["output"];
   notes: Scalars["String"]["output"];
   shotId: Scalars["Int"]["output"];
   type: ShotAnnotationTypeGql;
@@ -1394,6 +1468,15 @@ export enum StreamSegmentTypeEnum {
   RbChunkedMp4 = "RB_CHUNKED_MP4",
 }
 
+export type SuccessfulAdd = {
+  __typename?: "SuccessfulAdd";
+  value: Scalars["Boolean"]["output"];
+};
+
+export type SuccessfulAddAddShotAnnotationErrors =
+  | AddShotAnnotationErrors
+  | SuccessfulAdd;
+
 export type TagGql = {
   __typename?: "TagGQL";
   group?: Maybe<Scalars["String"]["output"]>;
@@ -1408,6 +1491,23 @@ export type TargetMetricsGql = {
   makePercentage?: Maybe<Scalars["Float"]["output"]>;
 };
 
+export type TooManyProfileImageUploadsErr = {
+  __typename?: "TooManyProfileImageUploadsErr";
+  linksRequested: Scalars["Int"]["output"];
+};
+
+export type UploadLink = {
+  __typename?: "UploadLink";
+  headers: Array<Maybe<Header>>;
+  uploadUrl: Scalars["String"]["output"];
+};
+
+export type UploadLinkGetProfileUploadLinkErrors =
+  | GetProfileUploadLinkErrors
+  | UploadLink;
+
+export type UploadLinkGetUploadLinkErrors = GetUploadLinkErrors | UploadLink;
+
 export type UploadSegmentGql = {
   __typename?: "UploadSegmentGQL";
   durationInSeconds?: Maybe<Scalars["Float"]["output"]>;
@@ -1695,6 +1795,17 @@ export type GetShotsQuery = {
     createdAt?: any | null;
     updatedAt?: any | null;
     user?: { __typename?: "UserGQL"; id: number } | null;
+    video?: {
+      __typename?: "VideoGQL";
+      stream?: {
+        __typename?: "UploadStreamGQL";
+        resolution: {
+          __typename?: "VideoResolutionGQL";
+          width?: number | null;
+          height?: number | null;
+        };
+      } | null;
+    } | null;
     cueObjectFeatures?: {
       __typename?: "CueObjectFeaturesGQL";
       cueObjectDistance?: number | null;
@@ -1731,7 +1842,17 @@ export type GetProfileImageUploadLinkMutationVariables = Exact<{
 export type GetProfileImageUploadLinkMutation = {
   __typename?: "Mutation";
   getProfileImageUploadLink: {
-    __typename?: "GetUploadLinkReturn";
+    __typename?: "GetProfileUploadLinkReturn";
+    value:
+      | {
+          __typename?: "GetProfileUploadLinkErrors";
+          error: {
+            __typename?: "TooManyProfileImageUploadsErr";
+            linksRequested: number;
+          };
+        }
+      | {
+          __typename?: "UploadLink";
           uploadUrl: string;
           headers: Array<{
             __typename?: "Header";
@@ -1740,6 +1861,7 @@ export type GetProfileImageUploadLinkMutation = {
           } | null>;
         };
   };
+};
 
 export type EditProfileImageUriMutationVariables = Exact<{
   profileImageUri: Scalars["String"]["input"];
@@ -1933,13 +2055,11 @@ export type GetVideosQuery = {
   getVideos: Array<{
     __typename?: "VideoGQL";
     id: number;
-    playlist?: {
-      __typename?: "HLSPlaylistGQL";
-      segmentDurations: Array<number>;
-    } | null;
+    framesPerSecond: number;
     stream?: {
       __typename?: "UploadStreamGQL";
       id: string;
+      streamSegmentType: StreamSegmentTypeEnum;
       segments: Array<{
         __typename?: "UploadSegmentGQL";
         uploaded: boolean;
@@ -1949,6 +2069,10 @@ export type GetVideosQuery = {
         framesPerSecond?: number | null;
       }>;
     } | null;
+    playlist?: {
+      __typename?: "HLSPlaylistGQL";
+      segmentDurations: Array<number>;
+    } | null;
   }>;
 };
 
@@ -2096,6 +2220,32 @@ export type GetUploadLinkMutation = {
   __typename?: "Mutation";
   getUploadLink: {
     __typename?: "GetUploadLinkReturn";
+    value:
+      | {
+          __typename?: "GetUploadLinkErrors";
+          error:
+            | {
+                __typename?: "MustHaveSetForUploadLinkErr";
+                resolution?: boolean | null;
+                framesPerSecond?: boolean | null;
+              }
+            | { __typename?: "NoInitForChunkedUploadErr" }
+            | {
+                __typename?: "ProcessingFailedErr";
+                processing: {
+                  __typename?: "VideoProcessingGQL";
+                  status: ProcessingStatusEnum;
+                  errors: Array<{
+                    __typename?: "VideoProcessingErrorGQL";
+                    message: string;
+                  }>;
+                };
+              }
+            | { __typename?: "SegmentAlreadyUploadedErr"; segmentId: number }
+            | { __typename?: "TooManyProfileImageUploadsErr" };
+        }
+      | {
+          __typename?: "UploadLink";
           uploadUrl: string;
           headers: Array<{
             __typename?: "Header";
@@ -2103,6 +2253,11 @@ export type GetUploadLinkMutation = {
             value: string;
           } | null>;
         };
+    stream?: {
+      __typename?: "UploadStreamGQL";
+      uploadCompletionCursor: number;
+    } | null;
+  };
 };
 
 export type GetHlsInitUploadLinkMutationVariables = Exact<{
@@ -2113,6 +2268,21 @@ export type GetHlsInitUploadLinkMutation = {
   __typename?: "Mutation";
   getHlsInitUploadLink: {
     __typename?: "GetUploadLinkReturn";
+    value:
+      | {
+          __typename?: "GetUploadLinkErrors";
+          error:
+            | { __typename?: "MustHaveSetForUploadLinkErr" }
+            | {
+                __typename?: "NoInitForChunkedUploadErr";
+                segmentType: StreamSegmentTypeEnum;
+              }
+            | { __typename?: "ProcessingFailedErr" }
+            | { __typename?: "SegmentAlreadyUploadedErr" }
+            | { __typename?: "TooManyProfileImageUploadsErr" };
+        }
+      | {
+          __typename?: "UploadLink";
           uploadUrl: string;
           headers: Array<{
             __typename?: "Header";
@@ -2121,6 +2291,7 @@ export type GetHlsInitUploadLinkMutation = {
           } | null>;
         };
   };
+};
 
 export type SetSegmentDurationMutationVariables = Exact<{
   videoId: Scalars["Int"]["input"];
@@ -2562,6 +2733,14 @@ export const GetShotsDocument = gql`
         id
       }
       falsePositiveScore
+      video {
+        stream {
+          resolution {
+            width
+            height
+          }
+        }
+      }
       createdAt @include(if: $includeCreatedAt)
       updatedAt @include(if: $includeUpdatedAt)
       cueObjectFeatures @include(if: $includeCueObjectFeatures) {
@@ -2729,12 +2908,23 @@ export type GetShotAnnotationTypesQueryResult = Apollo.QueryResult<
 export const GetProfileImageUploadLinkDocument = gql`
   mutation getProfileImageUploadLink($fileExt: String = ".png") {
     getProfileImageUploadLink(fileExt: $fileExt) {
+      value {
+        ... on UploadLink {
           uploadUrl
           headers {
             key
             value
           }
         }
+        ... on GetProfileUploadLinkErrors {
+          error {
+            ... on TooManyProfileImageUploadsErr {
+              linksRequested
+            }
+          }
+        }
+      }
+    }
   }
 `;
 export type GetProfileImageUploadLinkMutationFn = Apollo.MutationFunction<
@@ -3432,11 +3622,10 @@ export const GetVideosDocument = gql`
   query GetVideos($videoIds: [Int!]!) {
     getVideos(videoIds: $videoIds) {
       id
-      playlist {
-        segmentDurations
-      }
+      framesPerSecond
       stream {
         id
+        streamSegmentType
         segments {
           uploaded
           valid
@@ -3445,6 +3634,9 @@ export const GetVideosDocument = gql`
           framesPerSecond
         }
       }
+      playlist {
+        segmentDurations
+      }
     }
   }
 `;
@@ -3996,12 +4188,38 @@ export type CreateUploadStreamMutationOptions = Apollo.BaseMutationOptions<
 export const GetUploadLinkDocument = gql`
   mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
     getUploadLink(videoId: $videoId, segmentIndex: $segmentIndex) {
+      value {
+        ... on UploadLink {
           uploadUrl
           headers {
             key
             value
           }
         }
+        ... on GetUploadLinkErrors {
+          error {
+            ... on MustHaveSetForUploadLinkErr {
+              resolution
+              framesPerSecond
+            }
+            ... on SegmentAlreadyUploadedErr {
+              segmentId
+            }
+            ... on ProcessingFailedErr {
+              processing {
+                status
+                errors {
+                  message
+                }
+              }
+            }
+          }
+        }
+      }
+      stream {
+        uploadCompletionCursor
+      }
+    }
   }
 `;
 export type GetUploadLinkMutationFn = Apollo.MutationFunction<
@@ -4051,12 +4269,23 @@ export type GetUploadLinkMutationOptions = Apollo.BaseMutationOptions<
 export const GetHlsInitUploadLinkDocument = gql`
   mutation GetHlsInitUploadLink($videoId: Int!) {
     getHlsInitUploadLink(videoId: $videoId) {
+      value {
+        ... on UploadLink {
           uploadUrl
           headers {
             key
             value
           }
         }
+        ... on GetUploadLinkErrors {
+          error {
+            ... on NoInitForChunkedUploadErr {
+              segmentType
+            }
+          }
+        }
+      }
+    }
   }
 `;
 export type GetHlsInitUploadLinkMutationFn = Apollo.MutationFunction<

src/operations/shots.gql

@@ -27,6 +27,14 @@ query GetShots(
       id
     }
     falsePositiveScore
+    video {
+      stream {
+        resolution {
+          width
+          height
+        }
+      }
+    }
     createdAt @include(if: $includeCreatedAt)
     updatedAt @include(if: $includeUpdatedAt)
     cueObjectFeatures @include(if: $includeCueObjectFeatures) {

src/operations/user.gql

@@ -1,11 +1,22 @@
 mutation getProfileImageUploadLink($fileExt: String = ".png") {
   getProfileImageUploadLink(fileExt: $fileExt) {
+    value {
+      ... on UploadLink {
         uploadUrl
         headers {
           key
           value
         }
       }
+      ... on GetProfileUploadLinkErrors {
+        error {
+          ... on TooManyProfileImageUploadsErr {
+            linksRequested
+          }
+        }
+      }
+    }
+  }
 }
 
 mutation editProfileImageUri($profileImageUri: String!) {

src/operations/video.gql

@@ -118,11 +118,10 @@ query GetVideoDetails($videoId: Int!) {
 query GetVideos($videoIds: [Int!]!) {
   getVideos(videoIds: $videoIds) {
     id
-    playlist {
-      segmentDurations
-    }
+    framesPerSecond
     stream {
       id
+      streamSegmentType
       segments {
         uploaded
         valid
@@ -131,6 +130,9 @@ query GetVideos($videoIds: [Int!]!) {
         framesPerSecond
       }
     }
+    playlist {
+      segmentDurations
+    }
   }
 }
 

src/operations/video_upload.gql

@@ -6,22 +6,59 @@ mutation CreateUploadStream($videoMetadataInput: VideoMetadataInput!) {
 
 mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
   getUploadLink(videoId: $videoId, segmentIndex: $segmentIndex) {
+    value {
+      ... on UploadLink {
         uploadUrl
         headers {
           key
           value
         }
       }
+      ... on GetUploadLinkErrors {
+        error {
+          ... on MustHaveSetForUploadLinkErr {
+            resolution
+            framesPerSecond
+          }
+          ... on SegmentAlreadyUploadedErr {
+            segmentId
+          }
+          ... on ProcessingFailedErr {
+            processing {
+              status
+              errors {
+                message
+              }
+            }
+          }
+        }
+      }
+    }
+    stream {
+      uploadCompletionCursor
+    }
+  }
 }
 
 mutation GetHlsInitUploadLink($videoId: Int!) {
   getHlsInitUploadLink(videoId: $videoId) {
+    value {
+      ... on UploadLink {
         uploadUrl
         headers {
           key
           value
         }
       }
+      ... on GetUploadLinkErrors {
+        error {
+          ... on NoInitForChunkedUploadErr {
+            segmentType
+          }
+        }
+      }
+    }
+  }
 }
 
 mutation SetSegmentDuration(

src/schema.gql

@@ -14,7 +14,7 @@ type Query {
     shotsPagination: GetShotsPagination = null
     limit: Int! = 500
   ): [ShotGQL!]!
-  getShotAnnotationTypes: [ShotAnnotationTypeGQL!]!
+  getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
   getUser(userId: Int!): UserGQL
   getLoggedInUser: UserGQL
   getUsernames(
@@ -231,6 +231,7 @@ type ShotAnnotationGQL {
   type: ShotAnnotationTypeGQL!
   creator: UserGQL!
   notes: String!
+  errorDefault: Boolean!
   createdAt: DateTime
   updatedAt: DateTime
 }
@@ -434,8 +435,14 @@ scalar JSON
 type Mutation {
   createBucketSet(params: CreateBucketSetInput!): BucketSetGQL!
   setLoggerLevel(path: String!, level: String!): Boolean!
-  addAnnotationToShot(shotId: Int!, annotationName: String!): Boolean!
-  getProfileImageUploadLink(fileExt: String = ".png"): GetUploadLinkReturn!
+  addAnnotationToShot(
+    shotId: Int!
+    annotationName: String!
+    notes: String = null
+  ): AddShotAnnotationReturn!
+  getProfileImageUploadLink(
+    fileExt: String = ".png"
+  ): GetProfileUploadLinkReturn!
   editProfileImageUri(profileImageUri: String!): UserGQL!
   createUploadStream(
     videoMetadata: VideoMetadataInput!
@@ -457,10 +464,46 @@ input CreateBucketSetInput {
   buckets: [BucketInputGQL!]!
 }
 
-type GetUploadLinkReturn {
+type AddShotAnnotationReturn {
+  value: SuccessfulAddAddShotAnnotationErrors!
+}
+
+union SuccessfulAddAddShotAnnotationErrors =
+    SuccessfulAdd
+  | AddShotAnnotationErrors
+
+type SuccessfulAdd {
+  value: Boolean!
+}
+
+type AddShotAnnotationErrors {
+  error: DoesNotOwnShotErrOtherErrorNeedsNote!
+}
+
+union DoesNotOwnShotErrOtherErrorNeedsNote =
+    DoesNotOwnShotErr
+  | OtherErrorNeedsNote
+
+type DoesNotOwnShotErr {
+  shotId: Int!
+  msg: String
+}
+
+type OtherErrorNeedsNote {
+  msg: String
+}
+
+type GetProfileUploadLinkReturn {
+  value: UploadLinkGetProfileUploadLinkErrors!
+}
+
+union UploadLinkGetProfileUploadLinkErrors =
+    UploadLink
+  | GetProfileUploadLinkErrors
+
+type UploadLink {
   uploadUrl: String!
   headers: [Header]!
-  uploadCompletionCursor: Int
 }
 
 type Header {
@@ -468,6 +511,14 @@ type Header {
   value: String!
 }
 
+type GetProfileUploadLinkErrors {
+  error: TooManyProfileImageUploadsErr!
+}
+
+type TooManyProfileImageUploadsErr {
+  linksRequested: Int!
+}
+
 type CreateUploadStreamReturn {
   videoId: Int!
 }
@@ -508,3 +559,38 @@ input VideoResolution {
   width: Int!
   height: Int!
 }
+
+type GetUploadLinkReturn {
+  value: UploadLinkGetUploadLinkErrors!
+  stream: UploadStreamGQL
+}
+
+union UploadLinkGetUploadLinkErrors = UploadLink | GetUploadLinkErrors
+
+type GetUploadLinkErrors {
+  error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr!
+}
+
+union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr =
+    MustHaveSetForUploadLinkErr
+  | SegmentAlreadyUploadedErr
+  | ProcessingFailedErr
+  | NoInitForChunkedUploadErr
+  | TooManyProfileImageUploadsErr
+
+type MustHaveSetForUploadLinkErr {
+  resolution: Boolean
+  framesPerSecond: Boolean
+}
+
+type SegmentAlreadyUploadedErr {
+  segmentId: Int!
+}
+
+type ProcessingFailedErr {
+  processing: VideoProcessingGQL!
+}
+
+type NoInitForChunkedUploadErr {
+  segmentType: StreamSegmentTypeEnum!
+}