Compare commits

..

5 Commits

Author SHA1 Message Date
Dean Wenstrand
901f4222a4 Let shot filters select a single player within a video
All checks were successful
Tests / Tests (pull_request) Successful in 11s
Adds playerIndex to FilterInput, backing ShooterIdentity.player_index --
the cluster-assigned shooter, 0-based and stable only within one video.

Deliberately separate from userId, which is populated only once a cluster
has been confirmed against a registered account. Multiplayer sessions are
usually played against someone without a Railbird login, so filtering by
userId cannot express "the other player" in the common case; the cluster
index always can.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-06 13:14:00 -07:00
0f6e7b28d4 Merge pull request 'Return the shot's start frame image from getShotTableState' (#321) from ivan/shot-table-state-frame-image into master 2026-08-06 19:11:59 +00:00
9b6b08c1ec Return the shot's start frame image from getShotTableState
All checks were successful
Tests / Tests (pull_request) Successful in 12s
Shot Lab was showing the video's single thumbnail next to every shot's
layout. The backend now returns the frame the layout was detected in as
a base64 JPEG (frameImage), selected by the GetShotTableState operation.
Also dedupes ShareLinkGQL/CreateShotShareLinkInput, which appeared twice
in the committed schema after a bad merge.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-08-06 09:56:38 -07:00
0f01c71a43 Merge pull request 'Add Session Coach generation status query' (#320) from loewy/session-coach-status-polling-gql into master
Reviewed-on: #320
2026-08-06 06:40:20 +00:00
238ade1384 Add Session Coach generation status query
All checks were successful
Tests / Tests (pull_request) Successful in 40s
2026-08-05 12:08:51 -07:00
4 changed files with 252 additions and 13 deletions

View File

@@ -476,6 +476,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -520,6 +521,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -564,6 +566,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -608,6 +611,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -652,6 +656,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -696,6 +701,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -740,6 +746,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -784,6 +791,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -828,6 +836,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -872,6 +881,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -916,6 +926,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -960,6 +971,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1004,6 +1016,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1048,6 +1061,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1092,6 +1106,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1136,6 +1151,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1180,6 +1196,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1224,6 +1241,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1268,6 +1286,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1312,6 +1331,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1356,6 +1376,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1400,6 +1421,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1444,6 +1466,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1488,6 +1511,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1532,6 +1556,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1576,6 +1601,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1620,6 +1646,7 @@ export type FilterInput =
missAngleInDegrees: FloatRangeFilter;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1664,6 +1691,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter: FilterInput;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1708,6 +1736,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters: Array<FilterInput>;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1752,6 +1781,52 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex: Array<Scalars["Int"]["input"]>;
runId?: never;
runLength?: never;
shotDirection?: never;
spinType?: never;
tableSize?: never;
tags?: never;
targetPocketAngle?: never;
targetPocketAngleDirection?: never;
targetPocketDistance?: never;
totalDistance?: never;
userId?: never;
username?: never;
videoId?: never;
}
| {
andFilters?: never;
annotations?: never;
backcut?: never;
bankAngle?: never;
bankDistance?: never;
createdAt?: never;
cueAngleAfterObject?: never;
cueBallSpeed?: never;
cueObjectAngle?: never;
cueObjectDistance?: never;
cueSpeedAfterObject?: never;
difficulty?: never;
falsePositiveScore?: never;
fargoRating?: never;
intendedPocketType?: never;
isBreakHeuristic?: never;
isDirect?: never;
isLeft?: never;
isLeftMiss?: never;
isRight?: never;
isRightMiss?: never;
isStraight?: never;
kickAngle?: never;
kickDistance?: never;
make?: never;
marginOfErrorInDegrees?: never;
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId: Array<Scalars["Int"]["input"]>;
runLength?: never;
shotDirection?: never;
@@ -1796,6 +1871,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength: FloatRangeFilter;
shotDirection?: never;
@@ -1840,6 +1916,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection: Array<ShotDirectionEnum>;
@@ -1884,6 +1961,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1928,6 +2006,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -1972,6 +2051,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -2016,6 +2096,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -2060,6 +2141,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -2104,6 +2186,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -2148,6 +2231,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -2192,6 +2276,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -2236,6 +2321,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -2280,6 +2366,7 @@ export type FilterInput =
missAngleInDegrees?: never;
notFilter?: never;
orFilters?: never;
playerIndex?: never;
runId?: never;
runLength?: never;
shotDirection?: never;
@@ -3132,6 +3219,7 @@ export type Query = {
getResolvedTier: ResolvedTierGql;
getRuns: GetRunsResult;
getSessionCoach: SessionCoachGql;
getSessionCoachGenerationStatus?: Maybe<SessionCoachGenerationStatusGql>;
getShotAnnotationTypes: Array<ShotAnnotationTypeGql>;
getShotTableState: ShotTableStateGql;
getShots: Array<ShotGql>;
@@ -3293,6 +3381,11 @@ export type QueryGetSessionCoachArgs = {
videoId: Scalars["Int"]["input"];
};
export type QueryGetSessionCoachGenerationStatusArgs = {
generationId: Scalars["ID"]["input"];
videoId: Scalars["Int"]["input"];
};
export type QueryGetShotAnnotationTypesArgs = {
errorTypes?: InputMaybe<Scalars["Boolean"]["input"]>;
};
@@ -3772,6 +3865,18 @@ export enum SessionCoachGenerationStateEnum {
Running = "RUNNING",
}
export type SessionCoachGenerationStatusGql = {
__typename?: "SessionCoachGenerationStatusGQL";
completedAt?: Maybe<Scalars["DateTime"]["output"]>;
createdAt: Scalars["DateTime"]["output"];
enqueueCount: Scalars["Int"]["output"];
id: Scalars["ID"]["output"];
lastEnqueuedAt?: Maybe<Scalars["DateTime"]["output"]>;
startedAt?: Maybe<Scalars["DateTime"]["output"]>;
state: SessionCoachGenerationStateEnum;
updatedAt: Scalars["DateTime"]["output"];
};
export enum SessionCoachIneligibilityReasonEnum {
Multiplayer = "MULTIPLAYER",
}
@@ -3864,6 +3969,7 @@ export type ShotProjectionGql = {
export type ShotTableStateGql = {
__typename?: "ShotTableStateGQL";
frameImage?: Maybe<Scalars["String"]["output"]>;
frameIndex: Scalars["Int"]["output"];
shotId: Scalars["Int"]["output"];
tableState: TableStateGql;
@@ -7238,6 +7344,26 @@ export type GetSessionCoachQuery = {
};
};
export type GetSessionCoachGenerationStatusQueryVariables = Exact<{
videoId: Scalars["Int"]["input"];
generationId: Scalars["ID"]["input"];
}>;
export type GetSessionCoachGenerationStatusQuery = {
__typename?: "Query";
getSessionCoachGenerationStatus?: {
__typename?: "SessionCoachGenerationStatusGQL";
id: string;
state: SessionCoachGenerationStateEnum;
createdAt: any;
updatedAt: any;
startedAt?: any | null;
lastEnqueuedAt?: any | null;
enqueueCount: number;
completedAt?: any | null;
} | null;
};
export type RequestSessionCoachGenerationMutationVariables = Exact<{
videoId: Scalars["Int"]["input"];
}>;
@@ -7697,6 +7823,7 @@ export type GetShotTableStateQuery = {
shotId: number;
videoId: number;
frameIndex: number;
frameImage?: string | null;
tableState: {
__typename?: "TableStateGQL";
identifierToPosition: Array<Array<number>>;
@@ -15923,6 +16050,90 @@ export type GetSessionCoachQueryResult = Apollo.QueryResult<
GetSessionCoachQuery,
GetSessionCoachQueryVariables
>;
export const GetSessionCoachGenerationStatusDocument = gql`
query GetSessionCoachGenerationStatus($videoId: Int!, $generationId: ID!) {
getSessionCoachGenerationStatus(
videoId: $videoId
generationId: $generationId
) {
id
state
createdAt
updatedAt
startedAt
lastEnqueuedAt
enqueueCount
completedAt
}
}
`;
/**
* __useGetSessionCoachGenerationStatusQuery__
*
* To run a query within a React component, call `useGetSessionCoachGenerationStatusQuery` and pass it any options that fit your needs.
* When your component renders, `useGetSessionCoachGenerationStatusQuery` returns an object from Apollo Client that contains loading, error, and data properties
* you can use to render your UI.
*
* @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
*
* @example
* const { data, loading, error } = useGetSessionCoachGenerationStatusQuery({
* variables: {
* videoId: // value for 'videoId'
* generationId: // value for 'generationId'
* },
* });
*/
export function useGetSessionCoachGenerationStatusQuery(
baseOptions: Apollo.QueryHookOptions<
GetSessionCoachGenerationStatusQuery,
GetSessionCoachGenerationStatusQueryVariables
>,
) {
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useQuery<
GetSessionCoachGenerationStatusQuery,
GetSessionCoachGenerationStatusQueryVariables
>(GetSessionCoachGenerationStatusDocument, options);
}
export function useGetSessionCoachGenerationStatusLazyQuery(
baseOptions?: Apollo.LazyQueryHookOptions<
GetSessionCoachGenerationStatusQuery,
GetSessionCoachGenerationStatusQueryVariables
>,
) {
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useLazyQuery<
GetSessionCoachGenerationStatusQuery,
GetSessionCoachGenerationStatusQueryVariables
>(GetSessionCoachGenerationStatusDocument, options);
}
export function useGetSessionCoachGenerationStatusSuspenseQuery(
baseOptions?: Apollo.SuspenseQueryHookOptions<
GetSessionCoachGenerationStatusQuery,
GetSessionCoachGenerationStatusQueryVariables
>,
) {
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<
GetSessionCoachGenerationStatusQuery,
GetSessionCoachGenerationStatusQueryVariables
>(GetSessionCoachGenerationStatusDocument, options);
}
export type GetSessionCoachGenerationStatusQueryHookResult = ReturnType<
typeof useGetSessionCoachGenerationStatusQuery
>;
export type GetSessionCoachGenerationStatusLazyQueryHookResult = ReturnType<
typeof useGetSessionCoachGenerationStatusLazyQuery
>;
export type GetSessionCoachGenerationStatusSuspenseQueryHookResult = ReturnType<
typeof useGetSessionCoachGenerationStatusSuspenseQuery
>;
export type GetSessionCoachGenerationStatusQueryResult = Apollo.QueryResult<
GetSessionCoachGenerationStatusQuery,
GetSessionCoachGenerationStatusQueryVariables
>;
export const RequestSessionCoachGenerationDocument = gql`
mutation RequestSessionCoachGeneration($videoId: Int!) {
requestSessionCoachGeneration(videoId: $videoId) {
@@ -16393,6 +16604,7 @@ export const GetShotTableStateDocument = gql`
shotId
videoId
frameIndex
frameImage
tableState {
...TableStateLayoutFields
}

View File

@@ -36,6 +36,22 @@ query GetSessionCoach($videoId: Int!) {
}
}
query GetSessionCoachGenerationStatus($videoId: Int!, $generationId: ID!) {
getSessionCoachGenerationStatus(
videoId: $videoId
generationId: $generationId
) {
id
state
createdAt
updatedAt
startedAt
lastEnqueuedAt
enqueueCount
completedAt
}
}
mutation RequestSessionCoachGeneration($videoId: Int!) {
requestSessionCoachGeneration(videoId: $videoId) {
state

View File

@@ -44,9 +44,10 @@ fragment DetectionPocketPointFields on PocketPointsGQL {
# positions. Boxes, pocket boxes, and source points share the crop's
# coordinate space; the crop locates that space in the full frame.
#
# Only the photo query selects this. The live and shot queries read a
# frame out of a video the app never holds, so there is no image to
# overlay, and getLiveTableState is polled every five seconds.
# Only the photo query selects this. The shot query returns its source
# frame (frameImage) but positions there come from the stored homography,
# so there are no fresh boxes to draw; the live query returns no image at
# all and is polled every five seconds.
fragment TableStateDetectionFields on TableStateGQL {
identifierToBox {
...DetectionBoxFields
@@ -97,6 +98,9 @@ query GetShotTableState($shotId: Int!) {
shotId
videoId
frameIndex
# The b64 JPEG frame the layout was detected in, so the client can show
# the shot's actual starting frame instead of the video's thumbnail.
frameImage
tableState {
...TableStateLayoutFields
}

View File

@@ -250,11 +250,6 @@ input CreatePoolHallCameraInput {
claimTermsText: String = null
}
input CreateShotShareLinkInput {
shotIds: [Int!]!
paddingSeconds: Float = null
}
input CreatePoolHallInput {
name: String!
address: String = null
@@ -413,6 +408,7 @@ input FilterInput @oneOf {
userId: [Int!]
runId: [Int!]
username: [String!]
playerIndex: [Int!]
fargoRating: FloatRangeFilter
make: [Boolean!]
tags: [VideoTagInput!]
@@ -1081,6 +1077,10 @@ type Query {
limit: Int! = 500
countRespectsLimit: Boolean! = false
): GetRunsResult!
getSessionCoachGenerationStatus(
videoId: Int!
generationId: ID!
): SessionCoachGenerationStatusGQL
getSessionCoach(videoId: Int!): SessionCoachGQL!
videoPlayerClusters(videoId: Int!): [PlayerClusterGQL!]!
getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
@@ -1473,6 +1473,17 @@ enum SessionCoachGenerationStateEnum {
FAILED
}
type SessionCoachGenerationStatusGQL {
id: ID!
state: SessionCoachGenerationStateEnum!
createdAt: DateTime!
updatedAt: DateTime!
startedAt: DateTime
lastEnqueuedAt: DateTime
enqueueCount: Int!
completedAt: DateTime
}
enum SessionCoachIneligibilityReasonEnum {
MULTIPLAYER
}
@@ -1558,6 +1569,7 @@ type ShotTableStateGQL {
videoId: Int!
frameIndex: Int!
tableState: TableStateGQL!
frameImage: String
}
input ShotsOrderingComponent @oneOf {
@@ -1951,11 +1963,6 @@ type UserSubscriptionStatusGQL {
stripeSubscriptionId: String
}
type ShareLinkGQL {
slug: String!
url: String!
}
type VideoExportJobGQL {
id: Int!
videoId: Int!