feat: Update to dozer 0.2.1

README.md

@@ -94,7 +94,7 @@ user = IngestRequest(
     schema_name="users",
     typ=0,
     old=None,
-    new=Record(values=[Value(int_value=1), Value(string_value="vivek")]),
+    new=[Value(int_value=1), Value(string_value="vivek")],
     seq_no=1
 )
 ingestor.ingest(user)

protos/common.proto

@@ -54,12 +54,8 @@ message CountResponse {
 
 // Request for `OnEvent`.
 message OnEventRequest {
-  // The event type to subscribe to.
-  dozer.types.EventType type = 1;
-  // The name of the endpoint to subscribe to.
-  string endpoint = 2;
-  // JSON filter string.
-  optional string filter = 3;
+  // The endpoints to subscribe to. Key is the endpoint name, value is the filter.
+  map<string, dozer.types.EventFilter> endpoints = 1;
 }
 
 // Request for `getFields`.
@@ -81,7 +77,7 @@ message QueryResponse {
   // The list of field definitions.
   repeated dozer.types.FieldDefinition fields = 1;
   // The list of record data.
-  repeated dozer.types.RecordWithId records = 2;
+  repeated dozer.types.Record records = 2;
 }
 
 // Request for `getEndpoints`.

protos/ingest.proto

@@ -25,9 +25,9 @@ message IngestRequest {
   // The operation type.
   dozer.types.OperationType typ = 2;
   // Old record data, only applicable for UPDATE type.
-  optional dozer.types.Record old = 3;
+  repeated dozer.types.Value old = 3;
   // New record data.
-  dozer.types.Record new = 4;
+  repeated dozer.types.Value new = 4;
 
   uint32 seq_no = 5;
 }

protos/types.proto

@@ -13,6 +13,14 @@ enum EventType {
   DELETE_ONLY = 3; // Only DELETE events.
 }
 
+// Event filter.
+message EventFilter {
+  // The event type to subscribe to.
+  dozer.types.EventType type = 1;
+  // JSON filter string.
+  optional string filter = 3;
+}
+
 // The event types.
 enum OperationType {
   INSERT = 0; // INSERT operation.
@@ -28,8 +36,6 @@ message Operation {
   optional Record old = 2;
   // New record data.
   Record new = 3;
-  // New record id, only applicable for INSERT type.
-  optional uint64 new_id = 4;
   // Name of the endpoint that this event is from.
   string endpoint_name = 5;
 }
@@ -38,16 +44,10 @@ message Operation {
 message Record {
   // The list of field values.
   repeated Value values = 1;
+  // The record id in cache.
+  uint64 id = 2;
   // Records with same primary key will have increasing version.
-  uint32 version = 2;
-}
-
-// A record with its id in cache.
-message RecordWithId {
-  // The record id.
-  uint64 id = 1;
-  // The record data.
-  Record record = 2;
+  uint32 version = 3;
 }
 
 // Supported data types in Dozer.
@@ -126,3 +126,14 @@ message Value {
     google.protobuf.Value json_value = 14;  // JSON type.
   };
 }
+message SchemasResponse {
+  map<string, Schema> schemas = 1;
+  map<string, string> errors = 2;
+}
+
+message Schema  {
+  // The list of indexes of the keys that are used as the primary index.
+  repeated int32 primary_index = 1;
+  // The list of field definitions.
+  repeated FieldDefinition fields = 2;
+}

pydozer/api.py

@@ -6,6 +6,7 @@
 from pydozer.common_pb2_grpc import CommonGrpcServiceStub
 from pydozer.common_pb2 import QueryRequest, OnEventRequest, QueryResponse, CountResponse
 from pydozer.health_pb2 import HealthCheckRequest, HealthCheckResponse
+from pydozer.types_pb2 import EventFilter
 
 DOZER_API_URL = os.getenv("DOZER_API_URL", "0.0.0.0:50051")
 
@@ -109,7 +110,9 @@ def on_event(self, request={}):
         Args:
             request (OnEventRequest): Optionally accepts a filter
         """
-        _req = OnEventRequest(endpoint=self.endpoint)
+        _req = OnEventRequest(endpoints={
+            self.endpoint: EventFilter()
+        })
         for key, value in request.items():
             setattr(_req, key, value)
 

pydozer/auth_pb2_grpc.py

@@ -2,7 +2,7 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-import pydozer.auth_pb2 as auth__pb2
+import auth_pb2 as auth__pb2
 
 
 class AuthGrpcServiceStub(object):

pydozer/common_pb2_grpc.py

@@ -2,8 +2,8 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-import pydozer.common_pb2 as common__pb2
-import pydozer.types_pb2 as types__pb2
+import common_pb2 as common__pb2
+import types_pb2 as types__pb2
 
 
 class CommonGrpcServiceStub(object):

pydozer/health_pb2_grpc.py

@@ -2,7 +2,7 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-import pydozer.health_pb2 as health__pb2
+import health_pb2 as health__pb2
 
 
 class HealthGrpcServiceStub(object):

pydozer/helper.py

@@ -124,19 +124,18 @@ def map_value(col, typ) -> Value:
         return Value()
 
 
-def map_record(schema_name: str, row: list, types, idx) -> Record:
+def map_record(schema_name: str, row: list, types, idx) -> IngestRequest:
     values = []
     assert len(row) == len(types), "Row and types must be the same length"
     for i in range(len(row)):
         val = map_value(row[i], types[i])
         values.append(val)
 
-    rec = Record(values=values, version=1)
     return IngestRequest(
         schema_name=schema_name,
         typ=0,
         old=None,
-        new=rec,
+        new=values,
         seq_no=idx
     )
 

pydozer/ingest.py

@@ -41,7 +41,7 @@ def ingest_raw(self, request) -> IngestResponse:
                 schema_name="users",
                 typ=0,
                 old=None,
-                new=Record(values=[Value(int_value=1), Value(string_value="vivek")]),
+                new=[Value(int_value=1), Value(string_value="vivek")],
                 seq_no=1
             )
             ingestor.ingest(user)

pydozer/ingest_pb2_grpc.py

@@ -2,7 +2,7 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-import pydozer.ingest_pb2 as ingest__pb2
+import ingest_pb2 as ingest__pb2
 
 
 class IngestServiceStub(object):