Merge pull request 'Add pocketing intention info' (#60) from volodymyr/pocketing-intention-info into master

Reviewed-on: #60

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

@@ -144,9 +144,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 = {
@@ -1914,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"]>;
@@ -2341,10 +2343,6 @@ export type GetShotsWithMetadataQuery = {
           };
         } | null;
       } | null;
-      serializedShotPaths?: {
-        __typename?: "SerializedShotPathsGQL";
-        b64EncodedBuffer?: string | null;
-      } | null;
       cueObjectFeatures?: {
         __typename?: "CueObjectFeaturesGQL";
         cueObjectDistance?: number | null;
@@ -2359,6 +2357,16 @@ 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;
     }>;
   };
 };
@@ -3570,9 +3578,6 @@ export const GetShotsWithMetadataDocument = gql`
             }
           }
         }
-        serializedShotPaths {
-          b64EncodedBuffer
-        }
         createdAt @include(if: $includeCreatedAt)
         updatedAt @include(if: $includeUpdatedAt)
         cueObjectFeatures @include(if: $includeCueObjectFeatures) {
@@ -3588,6 +3593,15 @@ export const GetShotsWithMetadataDocument = gql`
           make @include(if: $includeMake)
           intendedPocketType @include(if: $includeIntendedPocketType)
         }
+        pocketingIntentionInfo
+          @include(if: $includePocketingIntentionFeatures) {
+          ballId
+          pocketId
+          pathMetadataIndex
+        }
+        serializedShotPaths @include(if: $includePocketingIntentionFeatures) {
+          b64EncodedBuffer
+        }
       }
     }
   }

src/operations/shots.gql

@@ -113,10 +113,6 @@ query GetShotsWithMetadata(
           }
         }
       }
-      serializedShotPaths {
-        b64EncodedBuffer
-      }
-
       createdAt @include(if: $includeCreatedAt)
       updatedAt @include(if: $includeUpdatedAt)
       cueObjectFeatures @include(if: $includeCueObjectFeatures) {
@@ -132,6 +128,14 @@ query GetShotsWithMetadata(
         make @include(if: $includeMake)
         intendedPocketType @include(if: $includeIntendedPocketType)
       }
+      pocketingIntentionInfo @include(if: $includePocketingIntentionFeatures) {
+        ballId
+        pocketId
+        pathMetadataIndex
+      }
+      serializedShotPaths @include(if: $includePocketingIntentionFeatures) {
+        b64EncodedBuffer
+      }
     }
   }
 }

src/schema.gql

@@ -96,9 +96,10 @@ input EnumAggregation {
 }
 
 input DatetimeRangeAggregationInput {
-  startDatetime: DateTime!
-  endDatetime: DateTime!
+  startDatetime: DateTime = null
+  endDatetime: DateTime = null
   interval: TimeInterval!
+  feature: String! = "created_at"
 }
 
 """
@@ -115,16 +116,17 @@ 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 {