GetShotsWithMetadata accepts ids

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

rbproto/python/shot_pb2.py

@@ -13,7 +13,7 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nshot.proto\x12\x0fserialized_shot\"?\n\x03\x42ox\x12\x0c\n\x04left\x18\x01 \x01(\x02\x12\x0b\n\x03top\x18\x02 \x01(\x02\x12\r\n\x05width\x18\x03 \x01(\x02\x12\x0e\n\x06height\x18\x04 \x01(\x02\"\x1d\n\x05Point\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\"\x7f\n\rBallDetection\x12.\n\x0eplane_position\x18\x01 \x01(\x0b\x32\x16.serialized_shot.Point\x12(\n\nannotation\x18\x02 \x01(\x0b\x32\x14.serialized_shot.Box\x12\x14\n\x0cinterpolated\x18\x03 \x01(\x08\"T\n\x10RLEBallDetection\x12\x31\n\tdetection\x18\x01 \x01(\x0b\x32\x1e.serialized_shot.BallDetection\x12\r\n\x05\x63ount\x18\x02 \x01(\r\"L\n\x13RLEDetectionHistory\x12\x35\n\ndetections\x18\x01 \x03(\x0b\x32!.serialized_shot.RLEBallDetection\"F\n\x10\x44\x65tectionHistory\x12\x32\n\ndetections\x18\x01 \x03(\x0b\x32\x1e.serialized_shot.BallDetection\"\xfc\x01\n\rCollisionInfo\x12\x0e\n\x06source\x18\x01 \x01(\r\x12M\n\x10\x62\x61ll_identifiers\x18\x02 \x03(\x0b\x32\x33.serialized_shot.CollisionInfo.BallIdentifiersEntry\x12\x17\n\x0fwall_identifier\x18\x03 \x01(\r\x12\x13\n\x0b\x66rame_index\x18\x04 \x01(\r\x12\x0e\n\x06static\x18\x05 \x01(\x08\x1aN\n\x14\x42\x61llIdentifiersEntry\x12\x0b\n\x03key\x18\x01 \x01(\r\x12%\n\x05value\x18\x02 \x01(\x0b\x32\x16.serialized_shot.Point:\x02\x38\x01\"\xcc\x02\n\x04Path\x12\x13\n\x0bstart_frame\x18\x01 \x01(\r\x12\x11\n\tend_frame\x18\x02 \x01(\r\x12\x37\n\ndetections\x18\x03 \x01(\x0b\x32!.serialized_shot.DetectionHistoryH\x00\x12>\n\x0erle_detections\x18\x04 \x01(\x0b\x32$.serialized_shot.RLEDetectionHistoryH\x00\x12\x15\n\x0bnot_present\x18\x05 \x01(\x08H\x00\x12\x11\n\tis_static\x18\x06 \x01(\x08\x12\x32\n\nstart_info\x18\x07 \x01(\x0b\x32\x1e.serialized_shot.CollisionInfo\x12\x30\n\x08\x65nd_info\x18\x08 \x01(\x0b\x32\x1e.serialized_shot.CollisionInfoB\x13\n\x11\x64\x65tection_history\"R\n\x11IdentifierHistory\x12\x17\n\x0f\x62\x61ll_identifier\x18\x01 \x01(\r\x12$\n\x05paths\x18\x02 \x03(\x0b\x32\x15.serialized_shot.Path\"j\n\x12KeyBallIdentifiers\x12\x10\n\x08\x63ue_ball\x18\x01 \x01(\r\x12\x13\n\x0bobject_ball\x18\x02 \x01(\r\x12\x13\n\x0btarget_ball\x18\x03 \x01(\r\x12\x18\n\x10\x63ontact_sequence\x18\x04 \x03(\r\"\xa8\x01\n\x04Shot\x12@\n\x14identifier_histories\x18\x03 \x03(\x0b\x32\".serialized_shot.IdentifierHistory\x12\x36\n\tkey_balls\x18\x04 \x01(\x0b\x32#.serialized_shot.KeyBallIdentifiers\x12\x13\n\x0bstart_index\x18\x05 \x01(\r\x12\x11\n\tend_index\x18\x06 \x01(\rb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nshot.proto\x12\x0fserialized_shot\"?\n\x03\x42ox\x12\x0c\n\x04left\x18\x01 \x01(\x02\x12\x0b\n\x03top\x18\x02 \x01(\x02\x12\r\n\x05width\x18\x03 \x01(\x02\x12\x0e\n\x06height\x18\x04 \x01(\x02\"\x1d\n\x05Point\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\"\x7f\n\rBallDetection\x12.\n\x0eplane_position\x18\x01 \x01(\x0b\x32\x16.serialized_shot.Point\x12(\n\nannotation\x18\x02 \x01(\x0b\x32\x14.serialized_shot.Box\x12\x14\n\x0cinterpolated\x18\x03 \x01(\x08\"T\n\x10RLEBallDetection\x12\x31\n\tdetection\x18\x01 \x01(\x0b\x32\x1e.serialized_shot.BallDetection\x12\r\n\x05\x63ount\x18\x02 \x01(\r\"L\n\x13RLEDetectionHistory\x12\x35\n\ndetections\x18\x01 \x03(\x0b\x32!.serialized_shot.RLEBallDetection\"F\n\x10\x44\x65tectionHistory\x12\x32\n\ndetections\x18\x01 \x03(\x0b\x32\x1e.serialized_shot.BallDetection\"\xfc\x01\n\rCollisionInfo\x12\x0e\n\x06source\x18\x01 \x01(\r\x12M\n\x10\x62\x61ll_identifiers\x18\x02 \x03(\x0b\x32\x33.serialized_shot.CollisionInfo.BallIdentifiersEntry\x12\x17\n\x0fwall_identifier\x18\x03 \x01(\r\x12\x13\n\x0b\x66rame_index\x18\x04 \x01(\r\x12\x0e\n\x06static\x18\x05 \x01(\x08\x1aN\n\x14\x42\x61llIdentifiersEntry\x12\x0b\n\x03key\x18\x01 \x01(\r\x12%\n\x05value\x18\x02 \x01(\x0b\x32\x16.serialized_shot.Point:\x02\x38\x01\"\xcc\x02\n\x04Path\x12\x13\n\x0bstart_frame\x18\x01 \x01(\r\x12\x11\n\tend_frame\x18\x02 \x01(\r\x12\x37\n\ndetections\x18\x03 \x01(\x0b\x32!.serialized_shot.DetectionHistoryH\x00\x12>\n\x0erle_detections\x18\x04 \x01(\x0b\x32$.serialized_shot.RLEDetectionHistoryH\x00\x12\x15\n\x0bnot_present\x18\x05 \x01(\x08H\x00\x12\x11\n\tis_static\x18\x06 \x01(\x08\x12\x32\n\nstart_info\x18\x07 \x01(\x0b\x32\x1e.serialized_shot.CollisionInfo\x12\x30\n\x08\x65nd_info\x18\x08 \x01(\x0b\x32\x1e.serialized_shot.CollisionInfoB\x13\n\x11\x64\x65tection_history\"R\n\x11IdentifierHistory\x12\x17\n\x0f\x62\x61ll_identifier\x18\x01 \x01(\r\x12$\n\x05paths\x18\x02 \x03(\x0b\x32\x15.serialized_shot.Path\"\xf4\x01\n\x12KeyBallIdentifiers\x12\x10\n\x08\x63ue_ball\x18\x01 \x01(\r\x12\x13\n\x0bobject_ball\x18\x02 \x01(\r\x12\x13\n\x0btarget_ball\x18\x03 \x01(\r\x12\x18\n\x10\x63ontact_sequence\x18\x04 \x03(\r\x12\x18\n\x0b\x63ue_ball_id\x18\x05 \x01(\rH\x00\x88\x01\x01\x12\x1b\n\x0eobject_ball_id\x18\x06 \x01(\rH\x01\x88\x01\x01\x12\x1b\n\x0etarget_ball_id\x18\x07 \x01(\rH\x02\x88\x01\x01\x42\x0e\n\x0c_cue_ball_idB\x11\n\x0f_object_ball_idB\x11\n\x0f_target_ball_id\"\xa8\x01\n\x04Shot\x12@\n\x14identifier_histories\x18\x03 \x03(\x0b\x32\".serialized_shot.IdentifierHistory\x12\x36\n\tkey_balls\x18\x04 \x01(\x0b\x32#.serialized_shot.KeyBallIdentifiers\x12\x13\n\x0bstart_index\x18\x05 \x01(\r\x12\x11\n\tend_index\x18\x06 \x01(\rb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -42,8 +42,8 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_PATH']._serialized_end=1080
   _globals['_IDENTIFIERHISTORY']._serialized_start=1082
   _globals['_IDENTIFIERHISTORY']._serialized_end=1164
-  _globals['_KEYBALLIDENTIFIERS']._serialized_start=1166
-  _globals['_KEYBALLIDENTIFIERS']._serialized_end=1272
-  _globals['_SHOT']._serialized_start=1275
-  _globals['_SHOT']._serialized_end=1443
+  _globals['_KEYBALLIDENTIFIERS']._serialized_start=1167
+  _globals['_KEYBALLIDENTIFIERS']._serialized_end=1411
+  _globals['_SHOT']._serialized_start=1414
+  _globals['_SHOT']._serialized_end=1582
 # @@protoc_insertion_point(module_scope)

rbproto/python/shot_pb2.pyi

@@ -105,16 +105,22 @@ class IdentifierHistory(_message.Message):
     def __init__(self, ball_identifier: _Optional[int] = ..., paths: _Optional[_Iterable[_Union[Path, _Mapping]]] = ...) -> None: ...
 
 class KeyBallIdentifiers(_message.Message):
-    __slots__ = ["cue_ball", "object_ball", "target_ball", "contact_sequence"]
+    __slots__ = ["cue_ball", "object_ball", "target_ball", "contact_sequence", "cue_ball_id", "object_ball_id", "target_ball_id"]
     CUE_BALL_FIELD_NUMBER: _ClassVar[int]
     OBJECT_BALL_FIELD_NUMBER: _ClassVar[int]
     TARGET_BALL_FIELD_NUMBER: _ClassVar[int]
     CONTACT_SEQUENCE_FIELD_NUMBER: _ClassVar[int]
+    CUE_BALL_ID_FIELD_NUMBER: _ClassVar[int]
+    OBJECT_BALL_ID_FIELD_NUMBER: _ClassVar[int]
+    TARGET_BALL_ID_FIELD_NUMBER: _ClassVar[int]
     cue_ball: int
     object_ball: int
     target_ball: int
     contact_sequence: _containers.RepeatedScalarFieldContainer[int]
-    def __init__(self, cue_ball: _Optional[int] = ..., object_ball: _Optional[int] = ..., target_ball: _Optional[int] = ..., contact_sequence: _Optional[_Iterable[int]] = ...) -> None: ...
+    cue_ball_id: int
+    object_ball_id: int
+    target_ball_id: int
+    def __init__(self, cue_ball: _Optional[int] = ..., object_ball: _Optional[int] = ..., target_ball: _Optional[int] = ..., contact_sequence: _Optional[_Iterable[int]] = ..., cue_ball_id: _Optional[int] = ..., object_ball_id: _Optional[int] = ..., target_ball_id: _Optional[int] = ...) -> None: ...
 
 class Shot(_message.Message):
     __slots__ = ["identifier_histories", "key_balls", "start_index", "end_index"]

rbproto/shot.proto

@@ -63,6 +63,10 @@ message KeyBallIdentifiers {
   // Long term this will potentially represent a linked list
   // of all balls in a shot.
   repeated uint32 contact_sequence = 4;
+
+  optional uint32 cue_ball_id = 5;
+  optional uint32 object_ball_id = 6;
+  optional uint32 target_ball_id = 7;
 }
 
 message Shot {

rbproto/ts/shot.ts

@@ -820,6 +820,9 @@ export interface KeyBallIdentifiers {
   object_ball?: number;
   target_ball?: number;
   contact_sequence?: number[];
+  cue_ball_id?: number;
+  object_ball_id?: number;
+  target_ball_id?: number;
 }
 
 export function encodeKeyBallIdentifiers(
@@ -867,6 +870,27 @@ function _encodeKeyBallIdentifiers(
     writeByteBuffer(bb, packed);
     pushByteBuffer(packed);
   }
+
+  // optional uint32 cue_ball_id = 5;
+  let $cue_ball_id = message.cue_ball_id;
+  if ($cue_ball_id !== undefined) {
+    writeVarint32(bb, 40);
+    writeVarint32(bb, $cue_ball_id);
+  }
+
+  // optional uint32 object_ball_id = 6;
+  let $object_ball_id = message.object_ball_id;
+  if ($object_ball_id !== undefined) {
+    writeVarint32(bb, 48);
+    writeVarint32(bb, $object_ball_id);
+  }
+
+  // optional uint32 target_ball_id = 7;
+  let $target_ball_id = message.target_ball_id;
+  if ($target_ball_id !== undefined) {
+    writeVarint32(bb, 56);
+    writeVarint32(bb, $target_ball_id);
+  }
 }
 
 export function decodeKeyBallIdentifiers(
@@ -919,6 +943,24 @@ function _decodeKeyBallIdentifiers(bb: ByteBuffer): KeyBallIdentifiers {
         break;
       }
 
+      // optional uint32 cue_ball_id = 5;
+      case 5: {
+        message.cue_ball_id = readVarint32(bb) >>> 0;
+        break;
+      }
+
+      // optional uint32 object_ball_id = 6;
+      case 6: {
+        message.object_ball_id = readVarint32(bb) >>> 0;
+        break;
+      }
+
+      // optional uint32 target_ball_id = 7;
+      case 7: {
+        message.target_ball_id = readVarint32(bb) >>> 0;
+        break;
+      }
+
       default:
         skipUnknownField(bb, tag & 7);
     }

src/index.tsx

@@ -72,6 +72,12 @@ export type AggregationInput =
     }
   | { bucketSet?: never; datetimeRange?: never; enum: EnumAggregation };
 
+export enum AlignedIntervalEnum {
+  Month = "MONTH",
+  Week = "WEEK",
+  Year = "YEAR",
+}
+
 export type BankFeaturesGql = {
   __typename?: "BankFeaturesGQL";
   bankAngle: Scalars["Float"]["output"];
@@ -144,9 +150,10 @@ export type DateRangeFilter = {
 };
 
 export type DatetimeRangeAggregationInput = {
-  endDatetime: Scalars["DateTime"]["input"];
+  endDatetime?: InputMaybe<Scalars["DateTime"]["input"]>;
+  feature?: Scalars["String"]["input"];
   interval: TimeInterval;
-  startDatetime: Scalars["DateTime"]["input"];
+  startDatetime?: InputMaybe<Scalars["DateTime"]["input"]>;
 };
 
 export type DeployedConfigGql = {
@@ -1502,6 +1509,7 @@ export type GetShotsPagination = {
 export type GetShotsResult = {
   __typename?: "GetShotsResult";
   count?: Maybe<Scalars["Int"]["output"]>;
+  ids: Array<Scalars["Int"]["output"]>;
   shots: Array<ShotGql>;
 };
 
@@ -1726,6 +1734,7 @@ export type Query = {
   getPlayTime: UserPlayTimeGql;
   getShotAnnotationTypes: Array<ShotAnnotationTypeGql>;
   getShots: Array<ShotGql>;
+  getShotsByIds: Array<ShotGql>;
   getShotsWithMetadata: GetShotsResult;
   getUser?: Maybe<UserGql>;
   getUserTags: Array<TagGql>;
@@ -1759,8 +1768,13 @@ export type QueryGetShotsArgs = {
   shotsPagination?: InputMaybe<GetShotsPagination>;
 };
 
+export type QueryGetShotsByIdsArgs = {
+  ids: Array<Scalars["Int"]["input"]>;
+};
+
 export type QueryGetShotsWithMetadataArgs = {
   filterInput: FilterInput;
+  ids?: InputMaybe<Array<Scalars["Int"]["input"]>>;
   limit?: Scalars["Int"]["input"];
   shotsPagination?: InputMaybe<GetShotsPagination>;
 };
@@ -1913,19 +1927,17 @@ export type TargetMetricsGql = {
   spinTypeCounts?: Maybe<SpinTypeCountsGql>;
 };
 
-export type TimeInterval = {
+export type TimeDeltaGql = {
   days?: InputMaybe<Scalars["Int"]["input"]>;
-  hours?: InputMaybe<Scalars["Int"]["input"]>;
-  minutes?: InputMaybe<Scalars["Int"]["input"]>;
-  /** Assumes a month is 30 days long */
   months?: InputMaybe<Scalars["Int"]["input"]>;
-  /** A second is the base unit and cannot be subdivided */
-  seconds?: InputMaybe<Scalars["Int"]["input"]>;
   weeks?: InputMaybe<Scalars["Int"]["input"]>;
-  /** Assumes a year is 365 days long */
   years?: InputMaybe<Scalars["Int"]["input"]>;
 };
 
+export type TimeInterval =
+  | { aligned: AlignedIntervalEnum; timedelta?: never }
+  | { aligned?: never; timedelta: TimeDeltaGql };
+
 export type TooManyInitUploadsErr = {
   __typename?: "TooManyInitUploadsErr";
   linksRequested: Scalars["Int"]["output"];
@@ -2207,64 +2219,6 @@ export type GetVideoMakePercentageIntervalsQuery = {
   }>;
 };
 
-export type GetShotsQueryVariables = Exact<{
-  filterInput: FilterInput;
-  shotsPagination?: InputMaybe<GetShotsPagination>;
-  limit?: InputMaybe<Scalars["Int"]["input"]>;
-  includeCreatedAt?: Scalars["Boolean"]["input"];
-  includeUpdatedAt?: Scalars["Boolean"]["input"];
-  includeCueObjectFeatures?: Scalars["Boolean"]["input"];
-  includePocketingIntentionFeatures?: Scalars["Boolean"]["input"];
-  includeCueObjectDistance?: Scalars["Boolean"]["input"];
-  includeCueObjectAngle?: Scalars["Boolean"]["input"];
-  includeCueBallSpeed?: Scalars["Boolean"]["input"];
-  includeSpinType?: Scalars["Boolean"]["input"];
-  includeShotDirection?: Scalars["Boolean"]["input"];
-  includeTargetPocketDistance?: Scalars["Boolean"]["input"];
-  includeMake?: Scalars["Boolean"]["input"];
-  includeIntendedPocketType?: Scalars["Boolean"]["input"];
-}>;
-
-export type GetShotsQuery = {
-  __typename?: "Query";
-  getShots: Array<{
-    __typename?: "ShotGQL";
-    id: number;
-    videoId: number;
-    startFrame: number;
-    endFrame: number;
-    falsePositiveScore?: number | null;
-    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;
-      cueObjectAngle?: number | null;
-      cueBallSpeed?: number | null;
-      shotDirection?: ShotDirectionEnum | null;
-      spinType?: SpinTypeEnum | null;
-    } | null;
-    pocketingIntentionFeatures?: {
-      __typename?: "PocketingIntentionFeaturesGQL";
-      targetPocketDistance?: number | null;
-      make?: boolean | null;
-      intendedPocketType?: PocketEnum | null;
-    } | null;
-  }>;
-};
-
 export type GetSerializedShotPathsQueryVariables = Exact<{
   filterInput: FilterInput;
 }>;
@@ -2301,18 +2255,7 @@ export type GetShotsWithMetadataQueryVariables = Exact<{
   filterInput: FilterInput;
   shotsPagination?: InputMaybe<GetShotsPagination>;
   limit?: InputMaybe<Scalars["Int"]["input"]>;
-  includeCreatedAt?: Scalars["Boolean"]["input"];
-  includeUpdatedAt?: Scalars["Boolean"]["input"];
-  includeCueObjectFeatures?: Scalars["Boolean"]["input"];
-  includePocketingIntentionFeatures?: Scalars["Boolean"]["input"];
-  includeCueObjectDistance?: Scalars["Boolean"]["input"];
-  includeCueObjectAngle?: Scalars["Boolean"]["input"];
-  includeCueBallSpeed?: Scalars["Boolean"]["input"];
-  includeSpinType?: Scalars["Boolean"]["input"];
-  includeShotDirection?: Scalars["Boolean"]["input"];
-  includeTargetPocketDistance?: Scalars["Boolean"]["input"];
-  includeMake?: Scalars["Boolean"]["input"];
-  includeIntendedPocketType?: Scalars["Boolean"]["input"];
+  ids?: InputMaybe<Array<Scalars["Int"]["input"]> | Scalars["Int"]["input"]>;
 }>;
 
 export type GetShotsWithMetadataQuery = {
@@ -2320,6 +2263,7 @@ export type GetShotsWithMetadataQuery = {
   getShotsWithMetadata: {
     __typename?: "GetShotsResult";
     count?: number | null;
+    ids: Array<number>;
     shots: Array<{
       __typename?: "ShotGQL";
       id: number;
@@ -2341,10 +2285,6 @@ export type GetShotsWithMetadataQuery = {
           };
         } | null;
       } | null;
-      serializedShotPaths?: {
-        __typename?: "SerializedShotPathsGQL";
-        b64EncodedBuffer?: string | null;
-      } | null;
       cueObjectFeatures?: {
         __typename?: "CueObjectFeaturesGQL";
         cueObjectDistance?: number | null;
@@ -2359,10 +2299,121 @@ export type GetShotsWithMetadataQuery = {
         make?: boolean | null;
         intendedPocketType?: PocketEnum | null;
       } | null;
+      pocketingIntentionInfo?: {
+        __typename?: "PocketingIntentionInfoGQL";
+        ballId: number;
+        pocketId: PocketIdentifier;
+        pathMetadataIndex: number;
+      } | null;
+      serializedShotPaths?: {
+        __typename?: "SerializedShotPathsGQL";
+        b64EncodedBuffer?: string | null;
+      } | null;
     }>;
   };
 };
 
+export type GetShotsByIdsQueryVariables = Exact<{
+  ids: Array<Scalars["Int"]["input"]> | Scalars["Int"]["input"];
+}>;
+
+export type GetShotsByIdsQuery = {
+  __typename?: "Query";
+  getShotsByIds: Array<{
+    __typename?: "ShotGQL";
+    id: number;
+    videoId: number;
+    startFrame: number;
+    endFrame: number;
+    falsePositiveScore?: number | null;
+    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;
+      cueObjectAngle?: number | null;
+      cueBallSpeed?: number | null;
+      shotDirection?: ShotDirectionEnum | null;
+      spinType?: SpinTypeEnum | null;
+    } | null;
+    pocketingIntentionFeatures?: {
+      __typename?: "PocketingIntentionFeaturesGQL";
+      targetPocketDistance?: number | null;
+      make?: boolean | null;
+      intendedPocketType?: PocketEnum | null;
+    } | null;
+    pocketingIntentionInfo?: {
+      __typename?: "PocketingIntentionInfoGQL";
+      ballId: number;
+      pocketId: PocketIdentifier;
+      pathMetadataIndex: number;
+    } | null;
+    serializedShotPaths?: {
+      __typename?: "SerializedShotPathsGQL";
+      b64EncodedBuffer?: string | null;
+    } | null;
+  }>;
+};
+
+export type ShotWithAllFeaturesFragment = {
+  __typename?: "ShotGQL";
+  id: number;
+  videoId: number;
+  startFrame: number;
+  endFrame: number;
+  falsePositiveScore?: number | null;
+  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;
+    cueObjectAngle?: number | null;
+    cueBallSpeed?: number | null;
+    shotDirection?: ShotDirectionEnum | null;
+    spinType?: SpinTypeEnum | null;
+  } | null;
+  pocketingIntentionFeatures?: {
+    __typename?: "PocketingIntentionFeaturesGQL";
+    targetPocketDistance?: number | null;
+    make?: boolean | null;
+    intendedPocketType?: PocketEnum | null;
+  } | null;
+  pocketingIntentionInfo?: {
+    __typename?: "PocketingIntentionInfoGQL";
+    ballId: number;
+    pocketId: PocketIdentifier;
+    pathMetadataIndex: number;
+  } | null;
+  serializedShotPaths?: {
+    __typename?: "SerializedShotPathsGQL";
+    b64EncodedBuffer?: string | null;
+  } | null;
+};
+
 export type GetProfileImageUploadLinkMutationVariables = Exact<{
   fileExt?: InputMaybe<Scalars["String"]["input"]>;
 }>;
@@ -2906,6 +2957,48 @@ export type GetUploadStreamsWithDetailsQuery = {
   };
 };
 
+export const ShotWithAllFeaturesFragmentDoc = gql`
+  fragment ShotWithAllFeatures on ShotGQL {
+    id
+    videoId
+    startFrame
+    endFrame
+    user {
+      id
+    }
+    falsePositiveScore
+    video {
+      stream {
+        resolution {
+          width
+          height
+        }
+      }
+    }
+    createdAt
+    updatedAt
+    cueObjectFeatures {
+      cueObjectDistance
+      cueObjectAngle
+      cueBallSpeed
+      shotDirection
+      spinType
+    }
+    pocketingIntentionFeatures {
+      targetPocketDistance
+      make
+      intendedPocketType
+    }
+    pocketingIntentionInfo {
+      ballId
+      pocketId
+      pathMetadataIndex
+    }
+    serializedShotPaths {
+      b64EncodedBuffer
+    }
+  }
+`;
 export const GetAggregatedShotMetricsDocument = gql`
   query GetAggregatedShotMetrics($aggregateInput: AggregateInputGQL!) {
     getAggregatedShotMetrics(aggregateInput: $aggregateInput) {
@@ -3245,138 +3338,6 @@ export type GetVideoMakePercentageIntervalsQueryResult = Apollo.QueryResult<
   GetVideoMakePercentageIntervalsQuery,
   GetVideoMakePercentageIntervalsQueryVariables
 >;
-export const GetShotsDocument = gql`
-  query GetShots(
-    $filterInput: FilterInput!
-    $shotsPagination: GetShotsPagination
-    $limit: Int
-    $includeCreatedAt: Boolean! = false
-    $includeUpdatedAt: Boolean! = false
-    $includeCueObjectFeatures: Boolean! = false
-    $includePocketingIntentionFeatures: Boolean! = false
-    $includeCueObjectDistance: Boolean! = false
-    $includeCueObjectAngle: Boolean! = false
-    $includeCueBallSpeed: Boolean! = false
-    $includeSpinType: Boolean! = false
-    $includeShotDirection: Boolean! = false
-    $includeTargetPocketDistance: Boolean! = false
-    $includeMake: Boolean! = false
-    $includeIntendedPocketType: Boolean! = false
-  ) {
-    getShots(
-      filterInput: $filterInput
-      shotsPagination: $shotsPagination
-      limit: $limit
-    ) {
-      id
-      videoId
-      startFrame
-      endFrame
-      user {
-        id
-      }
-      falsePositiveScore
-      video {
-        stream {
-          resolution {
-            width
-            height
-          }
-        }
-      }
-      createdAt @include(if: $includeCreatedAt)
-      updatedAt @include(if: $includeUpdatedAt)
-      cueObjectFeatures @include(if: $includeCueObjectFeatures) {
-        cueObjectDistance @include(if: $includeCueObjectDistance)
-        cueObjectAngle @include(if: $includeCueObjectAngle)
-        cueBallSpeed @include(if: $includeCueBallSpeed)
-        shotDirection @include(if: $includeShotDirection)
-        spinType @include(if: $includeSpinType)
-      }
-      pocketingIntentionFeatures
-        @include(if: $includePocketingIntentionFeatures) {
-        targetPocketDistance @include(if: $includeTargetPocketDistance)
-        make @include(if: $includeMake)
-        intendedPocketType @include(if: $includeIntendedPocketType)
-      }
-    }
-  }
-`;
-
-/**
- * __useGetShotsQuery__
- *
- * To run a query within a React component, call `useGetShotsQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetShotsQuery` 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 } = useGetShotsQuery({
- *   variables: {
- *      filterInput: // value for 'filterInput'
- *      shotsPagination: // value for 'shotsPagination'
- *      limit: // value for 'limit'
- *      includeCreatedAt: // value for 'includeCreatedAt'
- *      includeUpdatedAt: // value for 'includeUpdatedAt'
- *      includeCueObjectFeatures: // value for 'includeCueObjectFeatures'
- *      includePocketingIntentionFeatures: // value for 'includePocketingIntentionFeatures'
- *      includeCueObjectDistance: // value for 'includeCueObjectDistance'
- *      includeCueObjectAngle: // value for 'includeCueObjectAngle'
- *      includeCueBallSpeed: // value for 'includeCueBallSpeed'
- *      includeSpinType: // value for 'includeSpinType'
- *      includeShotDirection: // value for 'includeShotDirection'
- *      includeTargetPocketDistance: // value for 'includeTargetPocketDistance'
- *      includeMake: // value for 'includeMake'
- *      includeIntendedPocketType: // value for 'includeIntendedPocketType'
- *   },
- * });
- */
-export function useGetShotsQuery(
-  baseOptions: Apollo.QueryHookOptions<GetShotsQuery, GetShotsQueryVariables>,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useQuery<GetShotsQuery, GetShotsQueryVariables>(
-    GetShotsDocument,
-    options,
-  );
-}
-export function useGetShotsLazyQuery(
-  baseOptions?: Apollo.LazyQueryHookOptions<
-    GetShotsQuery,
-    GetShotsQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useLazyQuery<GetShotsQuery, GetShotsQueryVariables>(
-    GetShotsDocument,
-    options,
-  );
-}
-export function useGetShotsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    GetShotsQuery,
-    GetShotsQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useSuspenseQuery<GetShotsQuery, GetShotsQueryVariables>(
-    GetShotsDocument,
-    options,
-  );
-}
-export type GetShotsQueryHookResult = ReturnType<typeof useGetShotsQuery>;
-export type GetShotsLazyQueryHookResult = ReturnType<
-  typeof useGetShotsLazyQuery
->;
-export type GetShotsSuspenseQueryHookResult = ReturnType<
-  typeof useGetShotsSuspenseQuery
->;
-export type GetShotsQueryResult = Apollo.QueryResult<
-  GetShotsQuery,
-  GetShotsQueryVariables
->;
 export const GetSerializedShotPathsDocument = gql`
   query GetSerializedShotPaths($filterInput: FilterInput!) {
     getShots(filterInput: $filterInput) {
@@ -3534,63 +3495,22 @@ export const GetShotsWithMetadataDocument = gql`
     $filterInput: FilterInput!
     $shotsPagination: GetShotsPagination
     $limit: Int
-    $includeCreatedAt: Boolean! = false
-    $includeUpdatedAt: Boolean! = false
-    $includeCueObjectFeatures: Boolean! = false
-    $includePocketingIntentionFeatures: Boolean! = false
-    $includeCueObjectDistance: Boolean! = false
-    $includeCueObjectAngle: Boolean! = false
-    $includeCueBallSpeed: Boolean! = false
-    $includeSpinType: Boolean! = false
-    $includeShotDirection: Boolean! = false
-    $includeTargetPocketDistance: Boolean! = false
-    $includeMake: Boolean! = false
-    $includeIntendedPocketType: Boolean! = false
+    $ids: [Int!]
   ) {
     getShotsWithMetadata(
       filterInput: $filterInput
       shotsPagination: $shotsPagination
       limit: $limit
+      ids: $ids
     ) {
       count
       shots {
-        id
-        videoId
-        startFrame
-        endFrame
-        user {
-          id
-        }
-        falsePositiveScore
-        video {
-          stream {
-            resolution {
-              width
-              height
-            }
-          }
-        }
-        serializedShotPaths {
-          b64EncodedBuffer
-        }
-        createdAt @include(if: $includeCreatedAt)
-        updatedAt @include(if: $includeUpdatedAt)
-        cueObjectFeatures @include(if: $includeCueObjectFeatures) {
-          cueObjectDistance @include(if: $includeCueObjectDistance)
-          cueObjectAngle @include(if: $includeCueObjectAngle)
-          cueBallSpeed @include(if: $includeCueBallSpeed)
-          shotDirection @include(if: $includeShotDirection)
-          spinType @include(if: $includeSpinType)
-        }
-        pocketingIntentionFeatures
-          @include(if: $includePocketingIntentionFeatures) {
-          targetPocketDistance @include(if: $includeTargetPocketDistance)
-          make @include(if: $includeMake)
-          intendedPocketType @include(if: $includeIntendedPocketType)
-        }
+        ...ShotWithAllFeatures
       }
+      ids
     }
   }
+  ${ShotWithAllFeaturesFragmentDoc}
 `;
 
 /**
@@ -3608,18 +3528,7 @@ export const GetShotsWithMetadataDocument = gql`
  *      filterInput: // value for 'filterInput'
  *      shotsPagination: // value for 'shotsPagination'
  *      limit: // value for 'limit'
- *      includeCreatedAt: // value for 'includeCreatedAt'
- *      includeUpdatedAt: // value for 'includeUpdatedAt'
- *      includeCueObjectFeatures: // value for 'includeCueObjectFeatures'
- *      includePocketingIntentionFeatures: // value for 'includePocketingIntentionFeatures'
- *      includeCueObjectDistance: // value for 'includeCueObjectDistance'
- *      includeCueObjectAngle: // value for 'includeCueObjectAngle'
- *      includeCueBallSpeed: // value for 'includeCueBallSpeed'
- *      includeSpinType: // value for 'includeSpinType'
- *      includeShotDirection: // value for 'includeShotDirection'
- *      includeTargetPocketDistance: // value for 'includeTargetPocketDistance'
- *      includeMake: // value for 'includeMake'
- *      includeIntendedPocketType: // value for 'includeIntendedPocketType'
+ *      ids: // value for 'ids'
  *   },
  * });
  */
@@ -3672,6 +3581,80 @@ export type GetShotsWithMetadataQueryResult = Apollo.QueryResult<
   GetShotsWithMetadataQuery,
   GetShotsWithMetadataQueryVariables
 >;
+export const GetShotsByIdsDocument = gql`
+  query GetShotsByIds($ids: [Int!]!) {
+    getShotsByIds(ids: $ids) {
+      ...ShotWithAllFeatures
+    }
+  }
+  ${ShotWithAllFeaturesFragmentDoc}
+`;
+
+/**
+ * __useGetShotsByIdsQuery__
+ *
+ * To run a query within a React component, call `useGetShotsByIdsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetShotsByIdsQuery` 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 } = useGetShotsByIdsQuery({
+ *   variables: {
+ *      ids: // value for 'ids'
+ *   },
+ * });
+ */
+export function useGetShotsByIdsQuery(
+  baseOptions: Apollo.QueryHookOptions<
+    GetShotsByIdsQuery,
+    GetShotsByIdsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<GetShotsByIdsQuery, GetShotsByIdsQueryVariables>(
+    GetShotsByIdsDocument,
+    options,
+  );
+}
+export function useGetShotsByIdsLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetShotsByIdsQuery,
+    GetShotsByIdsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<GetShotsByIdsQuery, GetShotsByIdsQueryVariables>(
+    GetShotsByIdsDocument,
+    options,
+  );
+}
+export function useGetShotsByIdsSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetShotsByIdsQuery,
+    GetShotsByIdsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetShotsByIdsQuery,
+    GetShotsByIdsQueryVariables
+  >(GetShotsByIdsDocument, options);
+}
+export type GetShotsByIdsQueryHookResult = ReturnType<
+  typeof useGetShotsByIdsQuery
+>;
+export type GetShotsByIdsLazyQueryHookResult = ReturnType<
+  typeof useGetShotsByIdsLazyQuery
+>;
+export type GetShotsByIdsSuspenseQueryHookResult = ReturnType<
+  typeof useGetShotsByIdsSuspenseQuery
+>;
+export type GetShotsByIdsQueryResult = Apollo.QueryResult<
+  GetShotsByIdsQuery,
+  GetShotsByIdsQueryVariables
+>;
 export const GetProfileImageUploadLinkDocument = gql`
   mutation getProfileImageUploadLink($fileExt: String = ".png") {
     getProfileImageUploadLink(fileExt: $fileExt) {

src/operations/shots.gql

@@ -1,59 +1,3 @@
-query GetShots(
-  $filterInput: FilterInput!
-  $shotsPagination: GetShotsPagination
-  $limit: Int
-  $includeCreatedAt: Boolean! = false
-  $includeUpdatedAt: Boolean! = false
-  $includeCueObjectFeatures: Boolean! = false
-  $includePocketingIntentionFeatures: Boolean! = false
-  $includeCueObjectDistance: Boolean! = false
-  $includeCueObjectAngle: Boolean! = false
-  $includeCueBallSpeed: Boolean! = false
-  $includeSpinType: Boolean! = false
-  $includeShotDirection: Boolean! = false
-  $includeTargetPocketDistance: Boolean! = false
-  $includeMake: Boolean! = false
-  $includeIntendedPocketType: Boolean! = false
-) {
-  getShots(
-    filterInput: $filterInput
-    shotsPagination: $shotsPagination
-    limit: $limit
-  ) {
-    id
-    videoId
-    startFrame
-    endFrame
-    user {
-      id
-    }
-    falsePositiveScore
-    video {
-      stream {
-        resolution {
-          width
-          height
-        }
-      }
-    }
-    createdAt @include(if: $includeCreatedAt)
-    updatedAt @include(if: $includeUpdatedAt)
-    cueObjectFeatures @include(if: $includeCueObjectFeatures) {
-      cueObjectDistance @include(if: $includeCueObjectDistance)
-      cueObjectAngle @include(if: $includeCueObjectAngle)
-      cueBallSpeed @include(if: $includeCueBallSpeed)
-      shotDirection @include(if: $includeShotDirection)
-      spinType @include(if: $includeSpinType)
-    }
-    pocketingIntentionFeatures
-      @include(if: $includePocketingIntentionFeatures) {
-      targetPocketDistance @include(if: $includeTargetPocketDistance)
-      make @include(if: $includeMake)
-      intendedPocketType @include(if: $includeIntendedPocketType)
-    }
-  }
-}
-
 query GetSerializedShotPaths($filterInput: FilterInput!) {
   getShots(filterInput: $filterInput) {
     id
@@ -77,61 +21,65 @@ query GetShotsWithMetadata(
   $filterInput: FilterInput!
   $shotsPagination: GetShotsPagination
   $limit: Int
-  $includeCreatedAt: Boolean! = false
-  $includeUpdatedAt: Boolean! = false
-  $includeCueObjectFeatures: Boolean! = false
-  $includePocketingIntentionFeatures: Boolean! = false
-  $includeCueObjectDistance: Boolean! = false
-  $includeCueObjectAngle: Boolean! = false
-  $includeCueBallSpeed: Boolean! = false
-  $includeSpinType: Boolean! = false
-  $includeShotDirection: Boolean! = false
-  $includeTargetPocketDistance: Boolean! = false
-  $includeMake: Boolean! = false
-  $includeIntendedPocketType: Boolean! = false
+  $ids: [Int!]
 ) {
   getShotsWithMetadata(
     filterInput: $filterInput
     shotsPagination: $shotsPagination
     limit: $limit
+    ids: $ids
   ) {
     count
     shots {
-      id
-      videoId
-      startFrame
-      endFrame
-      user {
-        id
-      }
-      falsePositiveScore
-      video {
-        stream {
-          resolution {
-            width
-            height
-          }
-        }
-      }
-      serializedShotPaths {
-        b64EncodedBuffer
-      }
+      ...ShotWithAllFeatures
+    }
+    ids
+  }
+}
 
-      createdAt @include(if: $includeCreatedAt)
-      updatedAt @include(if: $includeUpdatedAt)
-      cueObjectFeatures @include(if: $includeCueObjectFeatures) {
-        cueObjectDistance @include(if: $includeCueObjectDistance)
-        cueObjectAngle @include(if: $includeCueObjectAngle)
-        cueBallSpeed @include(if: $includeCueBallSpeed)
-        shotDirection @include(if: $includeShotDirection)
-        spinType @include(if: $includeSpinType)
-      }
-      pocketingIntentionFeatures
-        @include(if: $includePocketingIntentionFeatures) {
-        targetPocketDistance @include(if: $includeTargetPocketDistance)
-        make @include(if: $includeMake)
-        intendedPocketType @include(if: $includeIntendedPocketType)
+query GetShotsByIds($ids: [Int!]!) {
+  getShotsByIds(ids: $ids) {
+    ...ShotWithAllFeatures
+  }
+}
+
+fragment ShotWithAllFeatures on ShotGQL {
+  id
+  videoId
+  startFrame
+  endFrame
+  user {
+    id
+  }
+  falsePositiveScore
+  video {
+    stream {
+      resolution {
+        width
+        height
       }
     }
   }
+  createdAt
+  updatedAt
+  cueObjectFeatures {
+    cueObjectDistance
+    cueObjectAngle
+    cueBallSpeed
+    shotDirection
+    spinType
+  }
+  pocketingIntentionFeatures {
+    targetPocketDistance
+    make
+    intendedPocketType
+  }
+  pocketingIntentionInfo {
+    ballId
+    pocketId
+    pathMetadataIndex
+  }
+  serializedShotPaths {
+    b64EncodedBuffer
+  }
 }

src/schema.gql

@@ -11,6 +11,7 @@ type Query {
   ): [MakePercentageIntervalGQL!]!
   getShotsWithMetadata(
     filterInput: FilterInput!
+    ids: [Int!] = null
     shotsPagination: GetShotsPagination = null
     limit: Int! = 500
   ): GetShotsResult!
@@ -19,6 +20,7 @@ type Query {
     shotsPagination: GetShotsPagination = null
     limit: Int! = 500
   ): [ShotGQL!]!
+  getShotsByIds(ids: [Int!]!): [ShotGQL!]!
   getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
   getUser(userId: Int!): UserGQL
   getLoggedInUser: UserGQL
@@ -96,9 +98,10 @@ input EnumAggregation {
 }
 
 input DatetimeRangeAggregationInput {
-  startDatetime: DateTime!
-  endDatetime: DateTime!
+  startDatetime: DateTime = null
+  endDatetime: DateTime = null
   interval: TimeInterval!
+  feature: String! = "created_at"
 }
 
 """
@@ -106,27 +109,24 @@ Date with time (isoformat)
 """
 scalar DateTime
 
-input TimeInterval {
-  """
-  A second is the base unit and cannot be subdivided
-  """
-  seconds: Int = 0
-  minutes: Int = 0
-  hours: Int = 0
+input TimeInterval @oneOf {
+  timedelta: TimeDeltaGQL
+  aligned: AlignedIntervalEnum
+}
+
+input TimeDeltaGQL {
   days: Int = 0
   weeks: Int = 0
-
-  """
-  Assumes a month is 30 days long
-  """
   months: Int = 0
-
-  """
-  Assumes a year is 365 days long
-  """
   years: Int = 0
 }
 
+enum AlignedIntervalEnum {
+  MONTH
+  YEAR
+  WEEK
+}
+
 input FilterInput @oneOf {
   andFilters: [FilterInput!]
   orFilters: [FilterInput!]
@@ -246,6 +246,7 @@ type MakePercentageIntervalGQL {
 type GetShotsResult {
   shots: [ShotGQL!]!
   count: Int
+  ids: [Int!]!
 }
 
 type ShotGQL {