Compare commits

..

59 Commits

Author SHA1 Message Date
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
5eac3d9d40 Expose stream type
All checks were successful
Tests / Tests (pull_request) Successful in 12s
2024-07-30 01:00:12 -06:00
64593f09b7 Add include_on_none in range filter 2024-07-29 17:21:09 -06:00
e20b68799f Add falsePositiveScore 2024-07-28 02:06:39 -06:00
378878967a Add streamSegmentType to Stream 2024-07-27 20:51:48 -06:00
251ebe7056 Merge pull request 'Add homography and resolution to GetVideo' (#25) from loewy/add-resolution-in-operation into master
Reviewed-on: #25
2024-07-25 19:09:56 -06:00
615e4d5467 add resolution and homography to getVideo
All checks were successful
Tests / Tests (pull_request) Successful in 8s
2024-07-25 18:07:17 -07:00
a4f602d651 Expose resolution 2024-07-25 18:18:16 -06:00
c48512fc45 Merge pull request 'Fixed get user tags parameters' (#24) from micah/get-user-tags into master
Reviewed-on: #24
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>
2024-07-24 14:28:25 -06:00
d75822c465 Fixed get user tags parameters
All checks were successful
Tests / Tests (pull_request) Successful in 11s
2024-07-24 11:47:57 -07:00
4feeba5150 Merge pull request 'Added user tags' (#23) from micah/get-user-tags into master
Reviewed-on: #23
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>
2024-07-23 23:37:05 -06:00
e1237363f0 Removed wrapper type
All checks were successful
Tests / Tests (pull_request) Successful in 14s
2024-07-23 18:53:39 -07:00
b1550b31c5 Added user tags
All checks were successful
Tests / Tests (pull_request) Successful in 7s
2024-07-22 19:43:42 -07:00
81b9fd9f12 Add spin features 2024-07-19 17:18:14 -06:00
d3559ede21 Merge pull request 'Add frames_per_second' (#21) from loewy/add-fps into master
Reviewed-on: #21
Reviewed-by: countablecloud <countablecloud@gmail.com>
2024-07-18 17:51:30 -06:00
ef6ccca3f9 fix black issue
All checks were successful
Tests / Tests (pull_request) Successful in 14s
2024-07-18 16:46:27 -07:00
f781e9648f add pycache to gitignore
Some checks failed
Tests / Tests (pull_request) Failing after 15s
2024-07-18 16:37:59 -07:00
18d2eea029 add shot_pb2 2024-07-18 16:34:22 -07:00
a95bdab8bf ad frames per second to schema 2024-07-18 16:14:28 -07:00
eaeb1ed0ea Add resolution 2024-07-18 01:14:18 -06:00
f9d6377fe4 Update durations in seconds 2024-07-16 21:48:15 -06:00
30cf72de78 Merge pull request 'Add initPlaylistUploadStatus' (#20) from loewy/update-video-gql-operations into master
Reviewed-on: #20
2024-07-16 20:24:58 -06:00
fd49dec34c add initPlaylistUploadStatus
All checks were successful
Tests / Tests (pull_request) Successful in 8s
2024-07-16 19:23:54 -07:00
cdd1cdd526 Fix segment parameter again 2024-07-16 20:22:16 -06:00
bce363e8ff Parameter to setSegmentDuration should be segmentIndex 2024-07-16 20:20:37 -06:00
80f609b8a2 Merge pull request 'Add operation for set segment duration' (#19) from loewy/set-segment-duration-operation into master
Reviewed-on: #19
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>
2024-07-16 17:54:19 -06:00
6205e9a353 add operation for set segment duration
All checks were successful
Tests / Tests (pull_request) Successful in 15s
2024-07-16 16:33:22 -07:00
12f7e1f115 Merge pull request 'Add operation getHlsInitUploadLink' (#18) from loewy/operation-get-hls-init-upload-link into master
Reviewed-on: #18
2024-07-16 15:28:43 -06:00
296ad969f4 Merge branch 'master' into loewy/operation-get-hls-init-upload-link
All checks were successful
Tests / Tests (pull_request) Successful in 9s
2024-07-16 15:27:37 -06:00
d25c08447e Merge pull request 'Adds init playlist status' (#17) from mk/add-init-file-uploaded-marking into master
Reviewed-on: #17
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>
2024-07-16 15:26:27 -06:00
7502a75753 Merge remote-tracking branch 'origin' into mk/add-init-file-uploaded-marking
All checks were successful
Tests / Tests (pull_request) Successful in 7s
2024-07-16 14:23:32 -07:00
1a14db1a17 Adds init playlist status
All checks were successful
Tests / Tests (pull_request) Successful in 14s
2024-07-16 14:21:45 -07:00
67d8bcac21 add operation for hls init link
All checks were successful
Tests / Tests (pull_request) Successful in 14s
2024-07-15 17:29:55 -07:00
4ca27317b4 Add operation for shot annotation types 2024-07-15 15:37:43 -06:00
dc214e878f Add annotations to shot gql 2024-07-15 15:32:21 -06:00
d669dba320 Add getUsernames operation 2024-07-14 00:16:02 -06:00
235f4a58e9 Add getUsernames 2024-07-13 23:43:18 -06:00
03c1d08d8c Request isAdmin in getLoggedInUser 2024-07-13 17:47:41 -06:00
cc36a8b51d Add isAdmin 2024-07-13 17:40:30 -06:00
d743ad83e3 Merge pull request 'Expand GQL Interfaces To Accomodate Multiple Stream Types' (#16) from mk/extend-to-additional-stream-types into master
Reviewed-on: #16
2024-07-12 22:08:57 -06:00
194c258dcd Expand GQL Interfaces To Accomodate Multiple Stream Types
All checks were successful
Tests / Tests (pull_request) Successful in 15s
2024-07-12 18:50:50 -06:00
e0e1ae1108 Merge pull request 'Add new filters' (#15) from dean/add-new-filters into master
Reviewed-on: #15
2024-07-12 17:54:42 -06:00
ee73443374 Add new filters
All checks were successful
Tests / Tests (pull_request) Successful in 15s
2024-07-12 23:52:06 +00:00
88801f9186 Add not support to filter input gql 2024-07-10 16:17:32 -06:00
524d469a0d Merge pull request 'Add get shot annotations query' (#14) from ivan/add-get-shot-annotations-query into master
Reviewed-on: #14
2024-07-08 14:49:05 -06:00
c7b225ff00 Add get shot annotations query
All checks were successful
Tests / Tests (pull_request) Successful in 8s
2024-07-08 13:26:03 -06:00
ba84f6d9c0 Merge pull request 'Create shot annotations gql' (#13) from kat/shot-annotations into master
Reviewed-on: #13
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>
2024-07-08 11:03:47 -06:00
6a72f9f43f Create shot annotations gql
All checks were successful
Tests / Tests (pull_request) Successful in 8s
2024-07-08 10:56:05 -06:00
efc0b2d858 Add column property query builder filters 2024-07-02 16:55:30 -06:00
7 changed files with 1559 additions and 10 deletions

1
.gitignore vendored
View File

@@ -3,3 +3,4 @@ dist
.direnv .direnv
/after.txt /after.txt
/before.txt /before.txt
**/__pycache__/**

File diff suppressed because it is too large Load Diff

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
@@ -20,6 +26,7 @@ query GetShots(
user { user {
id id
} }
falsePositiveScore
createdAt @include(if: $includeCreatedAt) createdAt @include(if: $includeCreatedAt)
updatedAt @include(if: $includeUpdatedAt) updatedAt @include(if: $includeUpdatedAt)
cueObjectFeatures @include(if: $includeCueObjectFeatures) { cueObjectFeatures @include(if: $includeCueObjectFeatures) {
@@ -36,3 +43,10 @@ query GetShots(
} }
} }
} }
query GetShotAnnotationTypes {
getShotAnnotationTypes {
id
name
}
}

View File

@@ -24,6 +24,7 @@ query getLoggedInUser {
id id
firebaseUid firebaseUid
username username
isAdmin
profileImageUri profileImageUri
activeVideoId activeVideoId
createdAt createdAt
@@ -36,3 +37,11 @@ query GetUserPlayTime($userId: Int!) {
totalSeconds totalSeconds
} }
} }
query getUsernames(
$matchString: String!
$limit: Int = null
$after: String = null
) {
getUsernames(matchString: $matchString, limit: $limit, after: $after)
}

View File

@@ -51,6 +51,7 @@ query GetStreamMonitoringDetails($videoId: Int!) {
isCompleted isCompleted
uploadCompletionCursor uploadCompletionCursor
lastIntendedSegmentBound lastIntendedSegmentBound
initPlaylistUploadStatus
} }
currentProcessing { currentProcessing {
errors { errors {
@@ -137,12 +138,58 @@ query GetVideo($videoId: Int!) {
playlist { playlist {
segmentDurations 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
}
}
}
stream { stream {
streamSegmentType
segments { segments {
segmentIndex segmentIndex
endFrameIndex endFrameIndex
framesPerSecond framesPerSecond
} }
resolution {
width
height
}
} }
} }
} }
@@ -165,3 +212,24 @@ query GetMedianRunForVideo($videoId: Int!) {
medianRun medianRun
} }
} }
query GetVideoForClipTimes($videoId: Int!) {
getVideo(videoId: $videoId) {
id
framesPerSecond
playlist {
segmentDurations
}
stream {
id
streamSegmentType
segments {
uploaded
valid
segmentIndex
endFrameIndex
framesPerSecond
}
}
}
}

View File

@@ -14,6 +14,28 @@ mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
} }
} }
mutation GetHlsInitUploadLink($videoId: Int!) {
getHlsInitUploadLink(videoId: $videoId) {
uploadUrl
headers {
key
value
}
}
}
mutation SetSegmentDuration(
$videoId: Int!
$segmentIndex: Int!
$duration: Float!
) {
setSegmentDuration(
videoId: $videoId
segmentIndex: $segmentIndex
duration: $duration
)
}
mutation EditUploadStream( mutation EditUploadStream(
$videoId: Int! $videoId: Int!
$videoMetadataInput: VideoMetadataInput! $videoMetadataInput: VideoMetadataInput!

View File

@@ -4,13 +4,24 @@ 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!]!
getUser(userId: Int!): UserGQL getUser(userId: Int!): UserGQL
getLoggedInUser: UserGQL getLoggedInUser: UserGQL
getUsernames(
matchString: String = null
limit: Int = null
after: String = null
): [String!]!
getPlayTime(userId: Int!): UserPlayTimeGQL! getPlayTime(userId: Int!): UserPlayTimeGQL!
getUserVideos( getUserVideos(
userId: Int = null userId: Int = null
@@ -18,6 +29,7 @@ type Query {
after: String = null after: String = null
filters: VideoFilterInput = null filters: VideoFilterInput = null
): VideoHistoryGQL! ): VideoHistoryGQL!
getUserTags: [TagGQL!]!
getVideo(videoId: Int!): VideoGQL! getVideo(videoId: Int!): VideoGQL!
getVideos(videoIds: [Int!]!): [VideoGQL!]! getVideos(videoIds: [Int!]!): [VideoGQL!]!
} }
@@ -65,6 +77,7 @@ input EnumAggregation {
input FilterInput @oneOf { input FilterInput @oneOf {
andFilters: [FilterInput!] andFilters: [FilterInput!]
orFilters: [FilterInput!] orFilters: [FilterInput!]
notFilter: FilterInput
cueObjectDistance: RangeFilter cueObjectDistance: RangeFilter
targetPocketDistance: RangeFilter targetPocketDistance: RangeFilter
cueObjectAngle: RangeFilter cueObjectAngle: RangeFilter
@@ -76,11 +89,27 @@ input FilterInput @oneOf {
userId: [Int!] userId: [Int!]
make: [Boolean!] make: [Boolean!]
tags: [VideoTagInput!] tags: [VideoTagInput!]
annotations: [ShotAnnotationInput!]
isStraight: [Boolean!]
isRight: [Boolean!]
isLeft: [Boolean!]
isLeftMiss: [Boolean!]
isRightMiss: [Boolean!]
isDirect: [Boolean!]
bankAngle: RangeFilter
bankDistance: RangeFilter
kickAngle: RangeFilter
kickDistance: RangeFilter
cueAngleAfterObject: RangeFilter
cueSpeedAfterObject: RangeFilter
spinType: [String!]
falsePositiveScore: RangeFilter
} }
input RangeFilter { input RangeFilter {
lessThan: Float = null lessThan: Float = null
greaterThanEqualTo: Float = null greaterThanEqualTo: Float = null
includeOnNone: Boolean! = false
} }
enum PocketEnum { enum PocketEnum {
@@ -103,6 +132,10 @@ input VideoTagClassInput {
name: String! name: String!
} }
input ShotAnnotationInput {
name: String!
}
type BucketSetGQL { type BucketSetGQL {
keyName: String! keyName: String!
feature: String! feature: String!
@@ -138,6 +171,9 @@ type ShotGQL {
bankFeatures: BankFeaturesGQL bankFeatures: BankFeaturesGQL
serializedShotPaths: SerializedShotPathsGQL serializedShotPaths: SerializedShotPathsGQL
user: UserGQL user: UserGQL
annotations: [ShotAnnotationGQL!]!
falsePositiveScore: Float
video: VideoGQL
} }
""" """
@@ -178,19 +214,25 @@ type UserGQL {
id: Int! id: Int!
firebaseUid: String! firebaseUid: String!
username: String! username: String!
isAdmin: Boolean!
activeVideoId: Int activeVideoId: Int
profileImageUri: String profileImageUri: String
createdAt: DateTime createdAt: DateTime
updatedAt: DateTime updatedAt: DateTime
} }
type UserPlayTimeGQL { type ShotAnnotationGQL {
totalSeconds: Float! shotId: Int!
type: ShotAnnotationTypeGQL!
creator: UserGQL!
notes: String!
createdAt: DateTime
updatedAt: DateTime
} }
type VideoHistoryGQL { type ShotAnnotationTypeGQL {
videos: [VideoGQL!]! id: Int!
pageInfo: PageInfoGQL! name: String!
} }
type VideoGQL { type VideoGQL {
@@ -224,12 +266,21 @@ type UploadStreamGQL {
segmentProcessingCursor: Int! segmentProcessingCursor: Int!
lastIntendedSegmentBound: Int lastIntendedSegmentBound: Int
isCompleted: Boolean! isCompleted: Boolean!
initPlaylistUploadStatus: InitPlaylistUploadStatusEnum
lowestUnuploadedSegmentIndex: Int! lowestUnuploadedSegmentIndex: Int!
uploadCompletionCursor: Int! uploadCompletionCursor: Int!
errors: [StreamErrorGQL!]! errors: [StreamErrorGQL!]!
createdAt: DateTime! createdAt: DateTime!
updatedAt: DateTime! updatedAt: DateTime!
segments: [UploadSegmentGQL!]! segments: [UploadSegmentGQL!]!
resolution: VideoResolutionGQL!
streamSegmentType: StreamSegmentTypeEnum!
}
enum InitPlaylistUploadStatusEnum {
NOT_APPLICABLE
NOT_UPLOADED
UPLOADED
} }
type StreamErrorGQL { type StreamErrorGQL {
@@ -242,10 +293,20 @@ type UploadSegmentGQL {
valid: Boolean! valid: Boolean!
endFrameIndex: Int endFrameIndex: Int
framesPerSecond: Float framesPerSecond: Float
durationsInSeconds: Float durationInSeconds: Float
linksRequested: Int! linksRequested: Int!
} }
type VideoResolutionGQL {
width: Int
height: Int
}
enum StreamSegmentTypeEnum {
FRAGMENTED_MP4
RB_CHUNKED_MP4
}
type HLSPlaylistGQL { type HLSPlaylistGQL {
videoId: Int! videoId: Int!
m3u8Text: String! m3u8Text: String!
@@ -300,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
@@ -310,15 +390,28 @@ input VideoFilterInput {
requireCursorCompletion: Boolean! = true requireCursorCompletion: Boolean! = true
} }
type TagGQL {
name: String!
id: Int!
group: String
}
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(
videoMetadata: VideoMetadataInput! videoMetadata: VideoMetadataInput!
): CreateUploadStreamReturn! ): CreateUploadStreamReturn!
getUploadLink(videoId: Int!, segmentIndex: Int!): GetUploadLinkReturn! getUploadLink(videoId: Int!, segmentIndex: Int!): GetUploadLinkReturn!
getHlsInitUploadLink(videoId: Int!): GetUploadLinkReturn!
setSegmentDuration(
videoId: Int!
segmentIndex: Int!
duration: Float!
): Boolean!
editUploadStream(videoId: Int!, videoMetadata: VideoMetadataInput!): Boolean! editUploadStream(videoId: Int!, videoMetadata: VideoMetadataInput!): Boolean!
deleteVideo(videoId: Int!): Boolean! deleteVideo(videoId: Int!): Boolean!
} }
@@ -351,7 +444,10 @@ input VideoMetadataInput {
tableSize: String = null tableSize: String = null
uploadStreamMetadataInput: UploadStreamMetadataInput = null uploadStreamMetadataInput: UploadStreamMetadataInput = null
lastIntendedSegmentBound: Int = null lastIntendedSegmentBound: Int = null
streamSegmentType: StreamSegmentTypeEnum = null
endStream: Boolean! = false endStream: Boolean! = false
resolution: VideoResolution = null
framesPerSecond: Float = null
} }
input UploadStreamMetadataInput { input UploadStreamMetadataInput {
@@ -371,3 +467,8 @@ enum DeviceTypeEnum {
ANDROID ANDROID
BROWSER BROWSER
} }
input VideoResolution {
width: Int!
height: Int!
}