Add explicit optional scalars to KeyBallIdentifiers

Reviewed-on: #59
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_start=1167
-  _globals['_KEYBALLIDENTIFIERS']._serialized_end=1272
+  _globals['_KEYBALLIDENTIFIERS']._serialized_end=1411
-  _globals['_SHOT']._serialized_start=1275
+  _globals['_SHOT']._serialized_start=1414
-  _globals['_SHOT']._serialized_end=1443
+  _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

@@ -28,6 +28,8 @@ export type Scalars = {
   Boolean: { input: boolean; output: boolean };
   Int: { input: number; output: number };
   Float: { input: number; output: number };
+  /** Date (isoformat) */
+  Date: { input: any; output: any };
   /** Date with time (isoformat) */
   DateTime: { input: any; output: any };
   /** The `JSON` scalar type represents JSON values as specified by [ECMA-404](https://ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf). */
@@ -132,10 +134,20 @@ export type CueObjectFeaturesGql = {
   spinType?: Maybe<SpinTypeEnum>;
 };
 
+export type DateRangeFilter = {
+  greaterThan?: InputMaybe<Scalars["Date"]["input"]>;
+  greaterThanEqualTo?: InputMaybe<Scalars["Date"]["input"]>;
+  greaterThanInclusive?: Scalars["Boolean"]["input"];
+  includeOnNone?: Scalars["Boolean"]["input"];
+  lessThan?: InputMaybe<Scalars["Date"]["input"]>;
+  lessThanInclusive?: Scalars["Boolean"]["input"];
+};
+
 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 = {
@@ -174,6 +186,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -191,6 +204,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -209,6 +223,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -226,6 +241,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -244,6 +260,7 @@ export type FilterInput =
       backcut: Array<Scalars["Boolean"]["input"]>;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -261,6 +278,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -277,8 +295,9 @@ export type FilterInput =
       andFilters?: never;
       annotations?: never;
       backcut?: never;
-      bankAngle: RangeFilter;
+      bankAngle: FloatRangeFilter;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -296,6 +315,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -313,7 +333,8 @@ export type FilterInput =
       annotations?: never;
       backcut?: never;
       bankAngle?: never;
-      bankDistance: RangeFilter;
+      bankDistance: FloatRangeFilter;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -331,6 +352,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -349,7 +371,8 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject: RangeFilter;
+      createdAt: DateRangeFilter;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
@@ -366,6 +389,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -384,8 +408,9 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
+      createdAt?: never;
-      cueBallSpeed: RangeFilter;
+      cueAngleAfterObject: FloatRangeFilter;
+      cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
       cueSpeedAfterObject?: never;
@@ -401,6 +426,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -419,9 +445,10 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
-      cueBallSpeed?: never;
+      cueBallSpeed: FloatRangeFilter;
-      cueObjectAngle: RangeFilter;
+      cueObjectAngle?: never;
       cueObjectDistance?: never;
       cueSpeedAfterObject?: never;
       difficulty?: never;
@@ -436,6 +463,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -454,10 +482,11 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
-      cueObjectAngle?: never;
+      cueObjectAngle: FloatRangeFilter;
-      cueObjectDistance: RangeFilter;
+      cueObjectDistance?: never;
       cueSpeedAfterObject?: never;
       difficulty?: never;
       falsePositiveScore?: never;
@@ -471,6 +500,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -489,11 +519,12 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
-      cueObjectDistance?: never;
+      cueObjectDistance: FloatRangeFilter;
-      cueSpeedAfterObject: RangeFilter;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       falsePositiveScore?: never;
       intendedPocketType?: never;
@@ -506,6 +537,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -524,12 +556,13 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
+      cueSpeedAfterObject: FloatRangeFilter;
-      difficulty: RangeFilter;
+      difficulty?: never;
       falsePositiveScore?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -541,6 +574,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -559,13 +593,14 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
       cueSpeedAfterObject?: never;
-      difficulty?: never;
+      difficulty: FloatRangeFilter;
-      falsePositiveScore: RangeFilter;
+      falsePositiveScore?: never;
       intendedPocketType?: never;
       isDirect?: never;
       isLeft?: never;
@@ -576,6 +611,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -594,6 +630,44 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
+      cueAngleAfterObject?: never;
+      cueBallSpeed?: never;
+      cueObjectAngle?: never;
+      cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
+      difficulty?: never;
+      falsePositiveScore: FloatRangeFilter;
+      intendedPocketType?: never;
+      isDirect?: never;
+      isLeft?: never;
+      isLeftMiss?: never;
+      isRight?: never;
+      isRightMiss?: never;
+      isStraight?: never;
+      kickAngle?: never;
+      kickDistance?: never;
+      make?: never;
+      missAngleInDegrees?: never;
+      notFilter?: never;
+      orFilters?: never;
+      shotDirection?: never;
+      spinType?: never;
+      tableSize?: never;
+      tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
+      targetPocketDistance?: never;
+      userId?: never;
+      videoId?: never;
+    }
+  | {
+      andFilters?: never;
+      annotations?: never;
+      backcut?: never;
+      bankAngle?: never;
+      bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -611,6 +685,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -629,6 +704,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -646,6 +722,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -664,6 +741,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -681,6 +759,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -699,6 +778,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -716,6 +796,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -734,6 +815,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -751,6 +833,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -769,6 +852,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -786,6 +870,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -804,6 +889,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -821,6 +907,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -839,6 +926,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -853,9 +941,10 @@ export type FilterInput =
       isRight?: never;
       isRightMiss?: never;
       isStraight?: never;
-      kickAngle: RangeFilter;
+      kickAngle: FloatRangeFilter;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -874,6 +963,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -889,8 +979,9 @@ export type FilterInput =
       isRightMiss?: never;
       isStraight?: never;
       kickAngle?: never;
-      kickDistance: RangeFilter;
+      kickDistance: FloatRangeFilter;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -909,6 +1000,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -926,6 +1018,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make: Array<Scalars["Boolean"]["input"]>;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -944,6 +1037,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -961,6 +1055,44 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees: FloatRangeFilter;
+      notFilter?: never;
+      orFilters?: never;
+      shotDirection?: never;
+      spinType?: never;
+      tableSize?: never;
+      tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
+      targetPocketDistance?: never;
+      userId?: 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;
+      intendedPocketType?: never;
+      isDirect?: never;
+      isLeft?: never;
+      isLeftMiss?: never;
+      isRight?: never;
+      isRightMiss?: never;
+      isStraight?: never;
+      kickAngle?: never;
+      kickDistance?: never;
+      make?: never;
+      missAngleInDegrees?: never;
       notFilter: FilterInput;
       orFilters?: never;
       shotDirection?: never;
@@ -979,6 +1111,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -996,6 +1129,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters: Array<FilterInput>;
       shotDirection?: never;
@@ -1014,6 +1148,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -1031,6 +1166,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection: Array<ShotDirectionEnum>;
@@ -1049,6 +1185,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -1066,6 +1203,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -1084,6 +1222,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -1101,11 +1240,12 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
       spinType?: never;
-      tableSize: RangeFilter;
+      tableSize: FloatRangeFilter;
       tags?: never;
       targetPocketAngle?: never;
       targetPocketAngleDirection?: never;
@@ -1119,6 +1259,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -1136,6 +1277,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -1154,6 +1296,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -1171,13 +1314,14 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
       spinType?: never;
       tableSize?: never;
       tags?: never;
-      targetPocketAngle: RangeFilter;
+      targetPocketAngle: FloatRangeFilter;
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -1189,6 +1333,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -1206,6 +1351,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -1224,6 +1370,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -1241,6 +1388,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -1249,7 +1397,7 @@ export type FilterInput =
       tags?: never;
       targetPocketAngle?: never;
       targetPocketAngleDirection?: never;
-      targetPocketDistance: RangeFilter;
+      targetPocketDistance: FloatRangeFilter;
       userId?: never;
       videoId?: never;
     }
@@ -1259,6 +1407,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -1276,6 +1425,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -1294,6 +1444,7 @@ export type FilterInput =
       backcut?: never;
       bankAngle?: never;
       bankDistance?: never;
+      createdAt?: never;
       cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
@@ -1311,6 +1462,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
@@ -1324,6 +1476,15 @@ export type FilterInput =
       videoId: Array<Scalars["Int"]["input"]>;
     };
 
+export type FloatRangeFilter = {
+  greaterThan?: InputMaybe<Scalars["Float"]["input"]>;
+  greaterThanEqualTo?: InputMaybe<Scalars["Float"]["input"]>;
+  greaterThanInclusive?: Scalars["Boolean"]["input"];
+  includeOnNone?: Scalars["Boolean"]["input"];
+  lessThan?: InputMaybe<Scalars["Float"]["input"]>;
+  lessThanInclusive?: Scalars["Boolean"]["input"];
+};
+
 export type GetProfileUploadLinkErrors = {
   __typename?: "GetProfileUploadLinkErrors";
   error: TooManyProfileImageUploadsErr;
@@ -1504,6 +1665,15 @@ export enum PocketEnum {
   Side = "SIDE",
 }
 
+export enum PocketIdentifier {
+  BottomLeft = "BOTTOM_LEFT",
+  BottomRight = "BOTTOM_RIGHT",
+  BottomSide = "BOTTOM_SIDE",
+  TopLeft = "TOP_LEFT",
+  TopRight = "TOP_RIGHT",
+  TopSide = "TOP_SIDE",
+}
+
 export type PocketPointsGql = {
   __typename?: "PocketPointsGQL";
   bottomLeft: IntPoint2D;
@@ -1525,6 +1695,13 @@ export type PocketingIntentionFeaturesGql = {
   targetPocketDistance?: Maybe<Scalars["Float"]["output"]>;
 };
 
+export type PocketingIntentionInfoGql = {
+  __typename?: "PocketingIntentionInfoGQL";
+  ballId: Scalars["Int"]["output"];
+  pathMetadataIndex: Scalars["Int"]["output"];
+  pocketId: PocketIdentifier;
+};
+
 export type ProcessingFailedErr = {
   __typename?: "ProcessingFailedErr";
   processing: VideoProcessingGql;
@@ -1624,15 +1801,6 @@ export type QueryWaitForArgs = {
   duration: Scalars["Float"]["input"];
 };
 
-export type RangeFilter = {
-  greaterThan?: InputMaybe<Scalars["Float"]["input"]>;
-  greaterThanEqualTo?: InputMaybe<Scalars["Float"]["input"]>;
-  greaterThanInclusive?: Scalars["Boolean"]["input"];
-  includeOnNone?: Scalars["Boolean"]["input"];
-  lessThan?: InputMaybe<Scalars["Float"]["input"]>;
-  lessThanInclusive?: Scalars["Boolean"]["input"];
-};
-
 export type SegmentAlreadyUploadedErr = {
   __typename?: "SegmentAlreadyUploadedErr";
   segmentId: Scalars["Int"]["output"];
@@ -1687,6 +1855,7 @@ export type ShotGql = {
   falsePositiveScore?: Maybe<Scalars["Float"]["output"]>;
   id: Scalars["Int"]["output"];
   pocketingIntentionFeatures?: Maybe<PocketingIntentionFeaturesGql>;
+  pocketingIntentionInfo?: Maybe<PocketingIntentionInfoGql>;
   serializedShotPaths?: Maybe<SerializedShotPathsGql>;
   startFrame: Scalars["Int"]["output"];
   updatedAt?: Maybe<Scalars["DateTime"]["output"]>;
@@ -1746,10 +1915,11 @@ export type TargetMetricsGql = {
 };
 
 export type TimeInterval = {
+  /** True eg 1/15-3/15 => [(1/15,1/31), (2/1,2/28), (3/1,3/15)] False eg 1/15-2/15 => [(1/15,2/14), (2/14,3/15)] */
+  calendarAlignedMonths?: Scalars["Boolean"]["input"];
   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"]>;

src/operations/shots.gql

@@ -116,6 +116,7 @@ query GetShotsWithMetadata(
       serializedShotPaths {
         b64EncodedBuffer
       }
+
       createdAt @include(if: $includeCreatedAt)
       updatedAt @include(if: $includeUpdatedAt)
       cueObjectFeatures @include(if: $includeCueObjectFeatures) {

src/schema.gql

@@ -96,9 +96,10 @@ input EnumAggregation {
 }
 
 input DatetimeRangeAggregationInput {
-  startDatetime: DateTime!
+  startDatetime: DateTime = null
-  endDatetime: DateTime!
+  endDatetime: DateTime = null
   interval: TimeInterval!
+  feature: String! = "created_at"
 }
 
 """
@@ -115,27 +116,28 @@ input TimeInterval {
   hours: Int = 0
   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
+
+  """
+  True eg 1/15-3/15 => [(1/15,1/31), (2/1,2/28), (3/1,3/15)] False eg 1/15-2/15 => [(1/15,2/14), (2/14,3/15)]
+  """
+  calendarAlignedMonths: Boolean! = true
 }
 
 input FilterInput @oneOf {
   andFilters: [FilterInput!]
   orFilters: [FilterInput!]
   notFilter: FilterInput
-  cueObjectDistance: RangeFilter
+  cueObjectDistance: FloatRangeFilter
-  targetPocketDistance: RangeFilter
+  targetPocketDistance: FloatRangeFilter
-  cueObjectAngle: RangeFilter
+  cueObjectAngle: FloatRangeFilter
-  cueBallSpeed: RangeFilter
+  cueBallSpeed: FloatRangeFilter
-  difficulty: RangeFilter
+  difficulty: FloatRangeFilter
   intendedPocketType: [PocketEnum!]
   shotDirection: [ShotDirectionEnum!]
   videoId: [Int!]
@@ -149,21 +151,23 @@ input FilterInput @oneOf {
   isLeftMiss: [Boolean!]
   isRightMiss: [Boolean!]
   isDirect: [Boolean!]
-  tableSize: RangeFilter
+  tableSize: FloatRangeFilter
-  bankAngle: RangeFilter
+  bankAngle: FloatRangeFilter
-  bankDistance: RangeFilter
+  bankDistance: FloatRangeFilter
-  kickAngle: RangeFilter
+  kickAngle: FloatRangeFilter
-  kickDistance: RangeFilter
+  kickDistance: FloatRangeFilter
-  cueAngleAfterObject: RangeFilter
+  cueAngleAfterObject: FloatRangeFilter
   spinType: [SpinTypeEnum!]
-  cueSpeedAfterObject: RangeFilter
+  cueSpeedAfterObject: FloatRangeFilter
-  falsePositiveScore: RangeFilter
+  falsePositiveScore: FloatRangeFilter
   backcut: [Boolean!]
   targetPocketAngleDirection: [ShotDirectionEnum!]
-  targetPocketAngle: RangeFilter
+  targetPocketAngle: FloatRangeFilter
+  missAngleInDegrees: FloatRangeFilter
+  createdAt: DateRangeFilter
 }
 
-input RangeFilter {
+input FloatRangeFilter {
   lessThan: Float = null
   greaterThanEqualTo: Float = null
   greaterThan: Float = null
@@ -203,6 +207,20 @@ enum SpinTypeEnum {
   UNKNOWN
 }
 
+input DateRangeFilter {
+  lessThan: Date = null
+  greaterThanEqualTo: Date = null
+  greaterThan: Date = null
+  includeOnNone: Boolean! = false
+  lessThanInclusive: Boolean! = false
+  greaterThanInclusive: Boolean! = true
+}
+
+"""
+Date (isoformat)
+"""
+scalar Date
+
 type BucketSetGQL {
   keyName: String!
   feature: String!
@@ -241,6 +259,7 @@ type ShotGQL {
   updatedAt: DateTime
   cueObjectFeatures: CueObjectFeaturesGQL
   pocketingIntentionFeatures: PocketingIntentionFeaturesGQL
+  pocketingIntentionInfo: PocketingIntentionInfoGQL
   bankFeatures: BankFeaturesGQL
   serializedShotPaths: SerializedShotPathsGQL
   user: UserGQL
@@ -267,6 +286,21 @@ type PocketingIntentionFeaturesGQL {
   backcut: Boolean
 }
 
+type PocketingIntentionInfoGQL {
+  ballId: Int!
+  pocketId: PocketIdentifier!
+  pathMetadataIndex: Int!
+}
+
+enum PocketIdentifier {
+  TOP_LEFT
+  TOP_SIDE
+  TOP_RIGHT
+  BOTTOM_LEFT
+  BOTTOM_SIDE
+  BOTTOM_RIGHT
+}
+
 type BankFeaturesGQL {
   wallsHit: [WallTypeEnum!]!
   bankAngle: Float!