Compare commits

..

40 Commits

Author SHA1 Message Date
15b307a88f Merge pull request 'Add current homography to VideoGQL' (#49) from loewy/add-current-homography-to-get-video into master
Reviewed-on: #49
2024-09-04 18:28:24 -06:00
72b338bfc2 add current homography to video gql
All checks were successful
Tests / Tests (pull_request) Successful in 6s
2024-09-04 18:04:55 -06:00
267486774c Add get shots result 2024-09-04 16:12:20 -06:00
b94a568ef1 Merge pull request 'Add error types for init uploading' (#48) from mk/limit-init-upload-links into master
Reviewed-on: #48
Reviewed-by: loewy <loewymalkov@gmail.com>
2024-09-03 16:52:51 -06:00
b773ccfc8f Add error types for init uploading
All checks were successful
Tests / Tests (pull_request) Successful in 15s
2024-09-03 15:50:02 -07:00
fd5c28e073 Add get shots with metadata 2024-09-01 21:16:44 +00:00
4c232829b6 Merge pull request 'Add spinType and cueBallSpeed to get shots operation' (#47) from loewy/add-spin-type-to-get-shots into master
Reviewed-on: #47
2024-08-29 19:34:19 -06:00
ddf1036009 add spin type and cue ball speed to get shots operation
All checks were successful
Tests / Tests (pull_request) Successful in 15s
2024-08-29 18:32:05 -07:00
9b3e5c23a0 Merge pull request 'Dummy query to resolve shot paths' (#46) from mk/deserialize-and-render into master
Reviewed-on: #46
Reviewed-by: loewy <loewymalkov@gmail.com>
2024-08-29 12:26:23 -06:00
a7eae9d46b Merge branch 'master' into mk/deserialize-and-render
All checks were successful
Tests / Tests (pull_request) Successful in 5s
2024-08-29 12:24:54 -06:00
8c3e9d6273 Merge pull request 'Add spinType and filter input' (#45) from mk/spin-type into master
Reviewed-on: #45
Reviewed-by: loewy <loewymalkov@gmail.com>
2024-08-28 17:38:43 -06:00
f306cc6c16 Merge branch 'master' into mk/spin-type
All checks were successful
Tests / Tests (pull_request) Successful in 9s
2024-08-28 17:27:58 -06:00
643cdb29e3 Add spinType and filter input
All checks were successful
Tests / Tests (pull_request) Successful in 15s
2024-08-28 16:27:21 -07:00
89287a0100 Merge pull request 'Expose frames per second in get videos' (#44) from kat/expose-frames-per-second into master
Reviewed-on: #44
2024-08-27 10:21:38 -06:00
f9b02f65e0 Expose frames per second in get videos
All checks were successful
Tests / Tests (pull_request) Successful in 7s
2024-08-26 20:53:16 -06:00
41169e2848 Dummy query to get it working for now
All checks were successful
Tests / Tests (pull_request) Successful in 7s
2024-08-26 15:54:43 -07:00
ba36bc709c Merge pull request 'Add resolution to getShots operation' (#42) from loewy/add-resolution-in-get-shots into master
Reviewed-on: #42
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>
Reviewed-by: countablecloud <countablecloud@gmail.com>
2024-08-26 12:42:15 -06:00
4005416233 Merge branch 'master' into loewy/add-resolution-in-get-shots
All checks were successful
Tests / Tests (pull_request) Successful in 15s
2024-08-26 10:23:07 -06:00
db4a6315cd Merge pull request 'Add stream type to get videos' (#43) from kat/add-stream-type-get-videos into master
Reviewed-on: #43
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>
2024-08-26 08:36:44 -06:00
af38fdea64 Add stream type to get videos
All checks were successful
Tests / Tests (pull_request) Successful in 7s
2024-08-26 06:56:40 -06:00
172df69340 add resolution to getShots operation
All checks were successful
Tests / Tests (pull_request) Successful in 9s
2024-08-23 17:29:40 -07:00
a030a0ef16 Merge pull request 'Error reporting types and Errors for Shot Annotation' (#41) from mk/allow-error-reporting into master
Reviewed-on: #41
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>
2024-08-21 16:59:34 -06:00
7a6cc2739f Error reporting types and Errors
All checks were successful
Tests / Tests (pull_request) Successful in 9s
2024-08-21 13:41:24 -07:00
41c9701e18 Merge pull request 'Add separate return to profile image' (#40) from mk/add-separate-return-to-image-upload-link into master
Reviewed-on: #40
Reviewed-by: loewy <loewymalkov@gmail.com>
2024-08-19 15:58:15 -06:00
16e79ed608 Adds stream to get upload link
All checks were successful
Tests / Tests (pull_request) Successful in 14s
2024-08-19 14:54:48 -07:00
f401e1879b Add separate return to profile image
All checks were successful
Tests / Tests (pull_request) Successful in 15s
2024-08-19 14:44:43 -07:00
72b451d322 remove stream from getUploadLink 2024-08-16 18:47:08 -07:00
5350c46e0a Merge pull request 'Adds proper error return to stuff involving upload links' (#39) from mk/add-error-return-to-upload-links into master
Reviewed-on: #39
Reviewed-by: loewy <loewymalkov@gmail.com>
2024-08-16 19:02:31 -06:00
1f5c5774e1 Merge branch 'master' into mk/add-error-return-to-upload-links
All checks were successful
Tests / Tests (pull_request) Successful in 15s
2024-08-16 17:29:18 -06:00
3b29502e7e Adds proper error return to stuff involving upload links
All checks were successful
Tests / Tests (pull_request) Successful in 10s
2024-08-16 16:28:45 -07:00
abc7e9fd05 Merge pull request 'add minimum app version to get config call' (#38) from loewy/add-operation-minimum-app-version into master
Reviewed-on: #38
2024-08-16 16:40:39 -06:00
dd5ce77102 add minimum app version to get config call
All checks were successful
Tests / Tests (pull_request) Successful in 15s
2024-08-16 14:26:24 -07:00
dabaa3d1e1 Add minimum allowed AppVersion to deployed config 2024-08-16 12:21:46 -07:00
a6604a3a6d add tableSize to GetFeed 2024-08-15 19:52:03 -07:00
09a3e0e294 Add table size range filter 2024-08-15 19:42:53 -07:00
f20ca53a2a add tableSize to operations for getVideo
All checks were successful
Tests / Tests (pull_request) Successful in 14s
2024-08-15 18:51:36 -07:00
a2b912500c Merge pull request 'Add table size to return' (#36) from mk/table-size-non-optional-float into master
Reviewed-on: #36
Reviewed-by: loewy <loewymalkov@gmail.com>
2024-08-15 19:12:22 -06:00
7de3d196ba Add table size to return
All checks were successful
Tests / Tests (pull_request) Successful in 8s
2024-08-15 19:11:25 -06:00
6d5669aaf8 Merge pull request 'Make table size nonnullable float' (#35) from mk/table-size-non-optional-float into master
Reviewed-on: #35
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>
2024-08-15 18:19:07 -06:00
2c583509a2 Make table size nonnullable and float
All checks were successful
Tests / Tests (pull_request) Successful in 7s
2024-08-15 16:54:07 -07:00
8 changed files with 725 additions and 69 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -4,5 +4,6 @@ query getDeployedConfig {
devMode
environment
firebase
minimumAllowedAppVersion
}
}

View File

@@ -23,6 +23,7 @@ query GetFeed(
stream {
isCompleted
}
tableSize
tags {
tagClasses {
name

View File

@@ -1,6 +1,6 @@
query GetShots(
$filterInput: FilterInput!
$shotsPagination: GetShotsPagination = null
$shotsPagination: GetShotsPagination
$limit: Int
$includeCreatedAt: Boolean! = false
$includeUpdatedAt: Boolean! = false
@@ -9,6 +9,7 @@ query GetShots(
$includeCueObjectDistance: Boolean! = false
$includeCueObjectAngle: Boolean! = false
$includeCueBallSpeed: Boolean! = false
$includeSpinType: Boolean! = false
$includeShotDirection: Boolean! = false
$includeTargetPocketDistance: Boolean! = false
$includeMake: Boolean! = false
@@ -27,6 +28,14 @@ query GetShots(
id
}
falsePositiveScore
video {
stream {
resolution {
width
height
}
}
}
createdAt @include(if: $includeCreatedAt)
updatedAt @include(if: $includeUpdatedAt)
cueObjectFeatures @include(if: $includeCueObjectFeatures) {
@@ -34,6 +43,7 @@ query GetShots(
cueObjectAngle @include(if: $includeCueObjectAngle)
cueBallSpeed @include(if: $includeCueBallSpeed)
shotDirection @include(if: $includeShotDirection)
spinType @include(if: $includeSpinType)
}
pocketingIntentionFeatures
@include(if: $includePocketingIntentionFeatures) {
@@ -44,6 +54,18 @@ query GetShots(
}
}
query GetSerializedShotPaths($filterInput: FilterInput!) {
getShots(filterInput: $filterInput) {
id
videoId
startFrame
endFrame
serializedShotPaths {
b64EncodedBuffer
}
}
}
query GetShotAnnotationTypes {
getShotAnnotationTypes {
id

View File

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

View File

@@ -70,6 +70,7 @@ query GetVideoUpdatePageDetails($videoId: Int!) {
totalShots
makePercentage
elapsedTime
tableSize
tags {
tagClasses {
name
@@ -98,6 +99,7 @@ query GetVideoDetails($videoId: Int!) {
totalShotsMade
createdAt
updatedAt
tableSize
owner {
id
firebaseUid
@@ -116,11 +118,10 @@ query GetVideoDetails($videoId: Int!) {
query GetVideos($videoIds: [Int!]!) {
getVideos(videoIds: $videoIds) {
id
playlist {
segmentDurations
}
framesPerSecond
stream {
id
streamSegmentType
segments {
uploaded
valid
@@ -129,6 +130,9 @@ query GetVideos($videoIds: [Int!]!) {
framesPerSecond
}
}
playlist {
segmentDurations
}
}
}

View File

@@ -6,20 +6,63 @@ mutation CreateUploadStream($videoMetadataInput: VideoMetadataInput!) {
mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
getUploadLink(videoId: $videoId, segmentIndex: $segmentIndex) {
uploadUrl
headers {
key
value
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) {
uploadUrl
headers {
key
value
value {
... on UploadLink {
uploadUrl
headers {
key
value
}
}
... on GetUploadLinkErrors {
error {
... on NoInitForChunkedUploadErr {
segmentType
}
... on InitUploadAlreadyCompletedErr {
segmentType
}
... on TooManyInitUploadsErr {
linksRequested
}
}
}
}
}
}

View File

@@ -9,12 +9,17 @@ type Query {
videoId: ID!
intervalDuration: Int! = 300
): [MakePercentageIntervalGQL!]!
getShotsWithMetadata(
filterInput: FilterInput!
shotsPagination: GetShotsPagination = null
limit: Int! = 500
): GetShotsResult!
getShots(
filterInput: FilterInput!
shotsPagination: GetShotsPagination = null
limit: Int! = 500
): [ShotGQL!]!
getShotAnnotationTypes: [ShotAnnotationTypeGQL!]!
getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
getUser(userId: Int!): UserGQL
getLoggedInUser: UserGQL
getUsernames(
@@ -96,20 +101,24 @@ input FilterInput @oneOf {
isLeftMiss: [Boolean!]
isRightMiss: [Boolean!]
isDirect: [Boolean!]
tableSize: RangeFilter
bankAngle: RangeFilter
bankDistance: RangeFilter
kickAngle: RangeFilter
kickDistance: RangeFilter
cueAngleAfterObject: RangeFilter
spinType: [SpinTypeEnum!]
cueSpeedAfterObject: RangeFilter
spinType: [String!]
falsePositiveScore: RangeFilter
}
input RangeFilter {
lessThan: Float = null
greaterThanEqualTo: Float = null
greaterThan: Float = null
includeOnNone: Boolean! = false
lessThanInclusive: Boolean! = false
greaterThanInclusive: Boolean! = true
}
enum PocketEnum {
@@ -136,6 +145,13 @@ input ShotAnnotationInput {
name: String!
}
enum SpinTypeEnum {
DRAW
FOLLOW
CENTER
UNKNOWN
}
type BucketSetGQL {
keyName: String!
feature: String!
@@ -152,6 +168,7 @@ type DeployedConfigGQL {
firebase: Boolean!
devMode: Boolean!
environment: String!
minimumAllowedAppVersion: String!
}
type MakePercentageIntervalGQL {
@@ -159,6 +176,11 @@ type MakePercentageIntervalGQL {
elapsedTime: Float!
}
type GetShotsResult {
shots: [ShotGQL!]!
count: Int
}
type ShotGQL {
id: Int!
videoId: Int!
@@ -186,6 +208,7 @@ type CueObjectFeaturesGQL {
cueObjectAngle: Float
cueBallSpeed: Float
shotDirection: ShotDirectionEnum
spinType: SpinTypeEnum
}
type PocketingIntentionFeaturesGQL {
@@ -226,6 +249,7 @@ type ShotAnnotationGQL {
type: ShotAnnotationTypeGQL!
creator: UserGQL!
notes: String!
errorDefault: Boolean!
createdAt: DateTime
updatedAt: DateTime
}
@@ -252,9 +276,11 @@ type VideoGQL {
endTime: DateTime
elapsedTime: Float
framesPerSecond: Float!
tableSize: Float!
stream: UploadStreamGQL
playlist: HLSPlaylistGQL
tags: [VideoTag!]!
currentHomography: HomographyInfoGQL
homographyHistory: [HomographyInfoGQL!]!
currentProcessing: VideoProcessingGQL
}
@@ -428,8 +454,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!
@@ -451,10 +483,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 {
@@ -462,6 +530,14 @@ type Header {
value: String!
}
type GetProfileUploadLinkErrors {
error: TooManyProfileImageUploadsErr!
}
type TooManyProfileImageUploadsErr {
linksRequested: Int!
}
type CreateUploadStreamReturn {
videoId: Int!
}
@@ -471,7 +547,7 @@ input VideoMetadataInput {
startTime: DateTime = null
endTime: DateTime = null
gameType: String = null
tableSize: String = null
tableSize: Float = null
uploadStreamMetadataInput: UploadStreamMetadataInput = null
lastIntendedSegmentBound: Int = null
streamSegmentType: StreamSegmentTypeEnum = null
@@ -502,3 +578,48 @@ input VideoResolution {
width: Int!
height: Int!
}
type GetUploadLinkReturn {
value: UploadLinkGetUploadLinkErrors!
stream: UploadStreamGQL
}
union UploadLinkGetUploadLinkErrors = UploadLink | GetUploadLinkErrors
type GetUploadLinkErrors {
error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErrInitUploadAlreadyCompletedErrTooManyInitUploadsErr!
}
union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErrInitUploadAlreadyCompletedErrTooManyInitUploadsErr =
MustHaveSetForUploadLinkErr
| SegmentAlreadyUploadedErr
| ProcessingFailedErr
| NoInitForChunkedUploadErr
| TooManyProfileImageUploadsErr
| InitUploadAlreadyCompletedErr
| TooManyInitUploadsErr
type MustHaveSetForUploadLinkErr {
resolution: Boolean
framesPerSecond: Boolean
}
type SegmentAlreadyUploadedErr {
segmentId: Int!
}
type ProcessingFailedErr {
processing: VideoProcessingGQL!
}
type NoInitForChunkedUploadErr {
segmentType: StreamSegmentTypeEnum!
}
type InitUploadAlreadyCompletedErr {
segmentType: StreamSegmentTypeEnum!
}
type TooManyInitUploadsErr {
linksRequested: Int!
}