Compare commits

..

12 Commits

Author SHA1 Message Date
e8938621fc Merge pull request 'Support shots pagination' (#30) from kat/paginate-get-shots into master
Reviewed-on: #30
2024-08-09 15:12:51 -06:00
8c8dcdd8e1 Support shots pagination
All checks were successful
Tests / Tests (pull_request) Successful in 7s
2024-08-09 15:10:36 -06:00
5085c9af90 Add waitFor 2024-08-09 00:59:38 -06:00
85bc743c8e Bump getShots default 2024-08-05 23:36:54 -06:00
b8efa644e3 Merge pull request 'Add frameIndex in operation for getVideo in homographyHistory' (#29) from loewy/add-frame-index-in-homography-history into master
Reviewed-on: #29
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>
2024-08-01 19:52:51 -06:00
c18628a4ca Add pagination to getShots 2024-08-01 19:49:57 -06:00
535e24c9c2 add frameindex in operations
All checks were successful
Tests / Tests (pull_request) Successful in 11s
2024-08-01 14:52:37 -07:00
04308b1003 Merge pull request 'Add addAnnotationToShot' (#28) from mk/add-add-annotation into master
Reviewed-on: #28
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>
2024-07-30 18:10:44 -06:00
43c626141e Add addAnnotationToShot
All checks were successful
Tests / Tests (pull_request) Successful in 15s
2024-07-30 17:08:05 -07:00
c49266e4c1 Merge pull request 'Expose frames per second on video' (#27) from kat/add-video-duration into master
Reviewed-on: #27
2024-07-30 11:54:34 -06:00
6677b9232f Expose frames per second on video
All checks were successful
Tests / Tests (pull_request) Successful in 8s
2024-07-30 11:53:34 -06:00
76e792be88 Merge pull request 'Expose stream type on video' (#26) from kat/create-get-video-for-clip-calculation into master
Reviewed-on: #26
2024-07-30 01:02:18 -06:00
4 changed files with 74 additions and 12 deletions

View File

@@ -102,6 +102,10 @@ export type CreateUploadStreamReturn = {
videoId: Scalars["Int"]["output"]; videoId: Scalars["Int"]["output"];
}; };
export type CreatedAfter =
| { createdAt: Scalars["DateTime"]["input"]; videoId?: never }
| { createdAt?: never; videoId: Scalars["Int"]["input"] };
export type CueObjectFeaturesGql = { export type CueObjectFeaturesGql = {
__typename?: "CueObjectFeaturesGQL"; __typename?: "CueObjectFeaturesGQL";
cueBallSpeed?: Maybe<Scalars["Float"]["output"]>; cueBallSpeed?: Maybe<Scalars["Float"]["output"]>;
@@ -1029,6 +1033,11 @@ export type FilterInput =
videoId: Array<Scalars["Int"]["input"]>; videoId: Array<Scalars["Int"]["input"]>;
}; };
export type GetShotsPagination = {
createdAfter: CreatedAfter;
startFrameAfter: Scalars["Int"]["input"];
};
export type GetUploadLinkReturn = { export type GetUploadLinkReturn = {
__typename?: "GetUploadLinkReturn"; __typename?: "GetUploadLinkReturn";
headers: Array<Maybe<Header>>; headers: Array<Maybe<Header>>;
@@ -1077,6 +1086,7 @@ export type MakePercentageIntervalGql = {
export type Mutation = { export type Mutation = {
__typename?: "Mutation"; __typename?: "Mutation";
addAnnotationToShot: Scalars["Boolean"]["output"];
createBucketSet: BucketSetGql; createBucketSet: BucketSetGql;
createUploadStream: CreateUploadStreamReturn; createUploadStream: CreateUploadStreamReturn;
deleteVideo: Scalars["Boolean"]["output"]; deleteVideo: Scalars["Boolean"]["output"];
@@ -1089,6 +1099,11 @@ export type Mutation = {
setSegmentDuration: Scalars["Boolean"]["output"]; setSegmentDuration: Scalars["Boolean"]["output"];
}; };
export type MutationAddAnnotationToShotArgs = {
annotationName: Scalars["String"]["input"];
shotId: Scalars["Int"]["input"];
};
export type MutationCreateBucketSetArgs = { export type MutationCreateBucketSetArgs = {
params: CreateBucketSetInput; params: CreateBucketSetInput;
}; };
@@ -1179,6 +1194,7 @@ export type Query = {
getVideo: VideoGql; getVideo: VideoGql;
getVideoMakePercentageIntervals: Array<MakePercentageIntervalGql>; getVideoMakePercentageIntervals: Array<MakePercentageIntervalGql>;
getVideos: Array<VideoGql>; getVideos: Array<VideoGql>;
waitFor: Scalars["Float"]["output"];
}; };
export type QueryGetAggregatedShotMetricsArgs = { export type QueryGetAggregatedShotMetricsArgs = {
@@ -1195,6 +1211,8 @@ export type QueryGetPlayTimeArgs = {
export type QueryGetShotsArgs = { export type QueryGetShotsArgs = {
filterInput: FilterInput; filterInput: FilterInput;
limit?: Scalars["Int"]["input"];
shotsPagination?: InputMaybe<GetShotsPagination>;
}; };
export type QueryGetUserArgs = { export type QueryGetUserArgs = {
@@ -1227,6 +1245,10 @@ export type QueryGetVideosArgs = {
videoIds: Array<Scalars["Int"]["input"]>; videoIds: Array<Scalars["Int"]["input"]>;
}; };
export type QueryWaitForArgs = {
duration: Scalars["Float"]["input"];
};
export type RangeFilter = { export type RangeFilter = {
greaterThanEqualTo?: InputMaybe<Scalars["Float"]["input"]>; greaterThanEqualTo?: InputMaybe<Scalars["Float"]["input"]>;
includeOnNone?: Scalars["Boolean"]["input"]; includeOnNone?: Scalars["Boolean"]["input"];
@@ -1278,6 +1300,7 @@ export type ShotGql = {
startFrame: Scalars["Int"]["output"]; startFrame: Scalars["Int"]["output"];
updatedAt?: Maybe<Scalars["DateTime"]["output"]>; updatedAt?: Maybe<Scalars["DateTime"]["output"]>;
user?: Maybe<UserGql>; user?: Maybe<UserGql>;
video?: Maybe<VideoGql>;
videoId: Scalars["Int"]["output"]; videoId: Scalars["Int"]["output"];
}; };
@@ -1551,6 +1574,8 @@ export type GetVideoMakePercentageIntervalsQuery = {
export type GetShotsQueryVariables = Exact<{ export type GetShotsQueryVariables = Exact<{
filterInput: FilterInput; filterInput: FilterInput;
shotsPagination: GetShotsPagination;
limit?: InputMaybe<Scalars["Int"]["input"]>;
includeCreatedAt?: Scalars["Boolean"]["input"]; includeCreatedAt?: Scalars["Boolean"]["input"];
includeUpdatedAt?: Scalars["Boolean"]["input"]; includeUpdatedAt?: Scalars["Boolean"]["input"];
includeCueObjectFeatures?: Scalars["Boolean"]["input"]; includeCueObjectFeatures?: Scalars["Boolean"]["input"];
@@ -1845,6 +1870,7 @@ export type GetVideoQuery = {
} | null; } | null;
homographyHistory: Array<{ homographyHistory: Array<{
__typename?: "HomographyInfoGQL"; __typename?: "HomographyInfoGQL";
frameIndex: number;
crop: { crop: {
__typename?: "BoundingBoxGQL"; __typename?: "BoundingBoxGQL";
left: number; left: number;
@@ -1931,6 +1957,7 @@ export type GetVideoForClipTimesQuery = {
getVideo: { getVideo: {
__typename?: "VideoGQL"; __typename?: "VideoGQL";
id: number; id: number;
framesPerSecond: number;
playlist?: { playlist?: {
__typename?: "HLSPlaylistGQL"; __typename?: "HLSPlaylistGQL";
segmentDurations: Array<number>; segmentDurations: Array<number>;
@@ -2408,6 +2435,8 @@ export type GetVideoMakePercentageIntervalsQueryResult = Apollo.QueryResult<
export const GetShotsDocument = gql` export const GetShotsDocument = gql`
query GetShots( query GetShots(
$filterInput: FilterInput! $filterInput: FilterInput!
$shotsPagination: GetShotsPagination!
$limit: Int
$includeCreatedAt: Boolean! = false $includeCreatedAt: Boolean! = false
$includeUpdatedAt: Boolean! = false $includeUpdatedAt: Boolean! = false
$includeCueObjectFeatures: Boolean! = false $includeCueObjectFeatures: Boolean! = false
@@ -2420,7 +2449,11 @@ export const GetShotsDocument = gql`
$includeMake: Boolean! = false $includeMake: Boolean! = false
$includeIntendedPocketType: Boolean! = false $includeIntendedPocketType: Boolean! = false
) { ) {
getShots(filterInput: $filterInput) { getShots(
filterInput: $filterInput
shotsPagination: $shotsPagination
limit: $limit
) {
id id
videoId videoId
startFrame startFrame
@@ -2460,6 +2493,8 @@ export const GetShotsDocument = gql`
* const { data, loading, error } = useGetShotsQuery({ * const { data, loading, error } = useGetShotsQuery({
* variables: { * variables: {
* filterInput: // value for 'filterInput' * filterInput: // value for 'filterInput'
* shotsPagination: // value for 'shotsPagination'
* limit: // value for 'limit'
* includeCreatedAt: // value for 'includeCreatedAt' * includeCreatedAt: // value for 'includeCreatedAt'
* includeUpdatedAt: // value for 'includeUpdatedAt' * includeUpdatedAt: // value for 'includeUpdatedAt'
* includeCueObjectFeatures: // value for 'includeCueObjectFeatures' * includeCueObjectFeatures: // value for 'includeCueObjectFeatures'
@@ -3379,6 +3414,7 @@ export const GetVideoDocument = gql`
segmentDurations segmentDurations
} }
homographyHistory { homographyHistory {
frameIndex
crop { crop {
left left
top top
@@ -3720,6 +3756,7 @@ export const GetVideoForClipTimesDocument = gql`
query GetVideoForClipTimes($videoId: Int!) { query GetVideoForClipTimes($videoId: Int!) {
getVideo(videoId: $videoId) { getVideo(videoId: $videoId) {
id id
framesPerSecond
playlist { playlist {
segmentDurations segmentDurations
} }

View File

@@ -1,5 +1,7 @@
query GetShots( query GetShots(
$filterInput: FilterInput! $filterInput: FilterInput!
$shotsPagination: GetShotsPagination!
$limit: Int
$includeCreatedAt: Boolean! = false $includeCreatedAt: Boolean! = false
$includeUpdatedAt: Boolean! = false $includeUpdatedAt: Boolean! = false
$includeCueObjectFeatures: Boolean! = false $includeCueObjectFeatures: Boolean! = false
@@ -12,7 +14,11 @@ query GetShots(
$includeMake: Boolean! = false $includeMake: Boolean! = false
$includeIntendedPocketType: Boolean! = false $includeIntendedPocketType: Boolean! = false
) { ) {
getShots(filterInput: $filterInput) { getShots(
filterInput: $filterInput
shotsPagination: $shotsPagination
limit: $limit
) {
id id
videoId videoId
startFrame startFrame

View File

@@ -139,6 +139,7 @@ query GetVideo($videoId: Int!) {
segmentDurations segmentDurations
} }
homographyHistory { homographyHistory {
frameIndex
crop { crop {
left left
top top
@@ -215,6 +216,7 @@ query GetMedianRunForVideo($videoId: Int!) {
query GetVideoForClipTimes($videoId: Int!) { query GetVideoForClipTimes($videoId: Int!) {
getVideo(videoId: $videoId) { getVideo(videoId: $videoId) {
id id
framesPerSecond
playlist { playlist {
segmentDurations segmentDurations
} }

View File

@@ -4,11 +4,16 @@ type Query {
): [AggregateResultGQL!]! ): [AggregateResultGQL!]!
getBucketSet(keyName: String!): BucketSetGQL getBucketSet(keyName: String!): BucketSetGQL
getDeployedConfig: DeployedConfigGQL! getDeployedConfig: DeployedConfigGQL!
waitFor(duration: Float!): Float!
getVideoMakePercentageIntervals( getVideoMakePercentageIntervals(
videoId: ID! videoId: ID!
intervalDuration: Int! = 300 intervalDuration: Int! = 300
): [MakePercentageIntervalGQL!]! ): [MakePercentageIntervalGQL!]!
getShots(filterInput: FilterInput!): [ShotGQL!]! getShots(
filterInput: FilterInput!
shotsPagination: GetShotsPagination = null
limit: Int! = 500
): [ShotGQL!]!
getShotAnnotationTypes: [ShotAnnotationTypeGQL!]! getShotAnnotationTypes: [ShotAnnotationTypeGQL!]!
getUser(userId: Int!): UserGQL getUser(userId: Int!): UserGQL
getLoggedInUser: UserGQL getLoggedInUser: UserGQL
@@ -168,6 +173,7 @@ type ShotGQL {
user: UserGQL user: UserGQL
annotations: [ShotAnnotationGQL!]! annotations: [ShotAnnotationGQL!]!
falsePositiveScore: Float falsePositiveScore: Float
video: VideoGQL
} }
""" """
@@ -229,15 +235,6 @@ type ShotAnnotationTypeGQL {
name: String! name: String!
} }
type UserPlayTimeGQL {
totalSeconds: Float!
}
type VideoHistoryGQL {
videos: [VideoGQL!]!
pageInfo: PageInfoGQL!
}
type VideoGQL { type VideoGQL {
id: Int! id: Int!
owner: UserGQL owner: UserGQL
@@ -364,6 +361,25 @@ type VideoProcessingErrorGQL {
endSegmentIndex: Int endSegmentIndex: Int
} }
input GetShotsPagination {
createdAfter: CreatedAfter!
startFrameAfter: Int!
}
input CreatedAfter @oneOf {
videoId: Int
createdAt: DateTime
}
type UserPlayTimeGQL {
totalSeconds: Float!
}
type VideoHistoryGQL {
videos: [VideoGQL!]!
pageInfo: PageInfoGQL!
}
type PageInfoGQL { type PageInfoGQL {
hasNextPage: Boolean! hasNextPage: Boolean!
endCursor: String endCursor: String
@@ -383,6 +399,7 @@ type TagGQL {
type Mutation { type Mutation {
createBucketSet(params: CreateBucketSetInput!): BucketSetGQL! createBucketSet(params: CreateBucketSetInput!): BucketSetGQL!
setLoggerLevel(path: String!, level: String!): Boolean! setLoggerLevel(path: String!, level: String!): Boolean!
addAnnotationToShot(shotId: Int!, annotationName: String!): Boolean!
getProfileImageUploadLink(fileExt: String = ".png"): GetUploadLinkReturn! getProfileImageUploadLink(fileExt: String = ".png"): GetUploadLinkReturn!
editProfileImageUri(profileImageUri: String!): UserGQL! editProfileImageUri(profileImageUri: String!): UserGQL!
createUploadStream( createUploadStream(