Refactoring the FindSimilar rpc to FindSimilarImage.

perone · Nov 29, 2018 · 488acee · 488acee
1 parent 452a9f8
commit 488acee
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 71 deletions.
diff --git a/python/euclides/euclidesproto_pb2.py b/python/euclides/euclidesproto_pb2.py
diff --git a/python/euclides/euclidesproto_pb2_grpc.py b/python/euclides/euclidesproto_pb2_grpc.py
@@ -1,7 +1,7 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
 
-from . import euclidesproto_pb2 as euclidesproto__pb2
+import euclidesproto_pb2 as euclidesproto__pb2
 
 
 class SimilarStub(object):
@@ -19,10 +19,10 @@ def __init__(self, channel):
         request_serializer=euclidesproto__pb2.ShutdownRequest.SerializeToString,
         response_deserializer=euclidesproto__pb2.ShutdownReply.FromString,
         )
-    self.FindSimilar = channel.unary_unary(
-        '/euclidesproto.Similar/FindSimilar',
-        request_serializer=euclidesproto__pb2.FindSimilarRequest.SerializeToString,
-        response_deserializer=euclidesproto__pb2.FindSimilarReply.FromString,
+    self.FindSimilarImage = channel.unary_unary(
+        '/euclidesproto.Similar/FindSimilarImage',
+        request_serializer=euclidesproto__pb2.FindSimilarImageRequest.SerializeToString,
+        response_deserializer=euclidesproto__pb2.FindSimilarImageReply.FromString,
         )
     self.AddImage = channel.unary_unary(
         '/euclidesproto.Similar/AddImage',
@@ -47,7 +47,7 @@ def Shutdown(self, request, context):
     context.set_details('Method not implemented!')
     raise NotImplementedError('Method not implemented!')
 
-  def FindSimilar(self, request, context):
+  def FindSimilarImage(self, request, context):
     # missing associated documentation comment in .proto file
     pass
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -76,10 +76,10 @@ def add_SimilarServicer_to_server(servicer, server):
           request_deserializer=euclidesproto__pb2.ShutdownRequest.FromString,
           response_serializer=euclidesproto__pb2.ShutdownReply.SerializeToString,
       ),
-      'FindSimilar': grpc.unary_unary_rpc_method_handler(
-          servicer.FindSimilar,
-          request_deserializer=euclidesproto__pb2.FindSimilarRequest.FromString,
-          response_serializer=euclidesproto__pb2.FindSimilarReply.SerializeToString,
+      'FindSimilarImage': grpc.unary_unary_rpc_method_handler(
+          servicer.FindSimilarImage,
+          request_deserializer=euclidesproto__pb2.FindSimilarImageRequest.FromString,
+          response_serializer=euclidesproto__pb2.FindSimilarImageReply.SerializeToString,
       ),
       'AddImage': grpc.unary_unary_rpc_method_handler(
           servicer.AddImage,

diff --git a/python/euclides/services.py b/python/euclides/services.py
@@ -52,14 +52,14 @@ def remove_image(self, image_id):
         reply = self.stub.RemoveImage(request)
         return reply
 
-    def find_similar(self, image, models, top_k=5):
+    def find_similar_image(self, image, models, top_k=5):
         bytes_img = io.BytesIO()
         image.save(bytes_img, format=self.wire_image)
-        request = ec_proto.FindSimilarRequest()
+        request = ec_proto.FindSimilarImageRequest()
         request.models.extend(models)
         request.top_k = int(top_k)
         request.image_data = bytes_img.getvalue()
-        reply = self.stub.FindSimilar(request)
+        reply = self.stub.FindSimilarImage(request)
         return reply
 
     def __shutdown(self, shutdown_type):

diff --git a/python/examples/find_similar.py b/python/examples/find_similar.py
@@ -29,7 +29,7 @@ def run_main():
 
     with euclides.Channel("localhost", 50000) as channel:
         db = euclides.EuclidesDB(channel)
-        ret_similar = db.find_similar(image, ["resnet18"], args.topk)
+        ret_similar = db.find_similar_image(image, ["resnet18"], args.topk)
 
     print(ret_similar)
 

diff --git a/source/protos/euclidesproto.proto b/source/protos/euclidesproto.proto
@@ -10,7 +10,7 @@ message EuclidesDBMetadata {
     int32 database_version = 1;
 }
 
-message FindSimilarRequest {
+message FindSimilarImageRequest {
     int32 top_k = 1;
     bytes image_data = 2;
     repeated string models = 3;
@@ -22,7 +22,7 @@ message SearchResults {
     string model = 3;
 }
 
-message FindSimilarReply {
+message FindSimilarImageReply {
     repeated SearchResults results = 1;
 }
 
@@ -67,7 +67,7 @@ message ShutdownReply {
 
 service Similar {
     rpc Shutdown (ShutdownRequest) returns (ShutdownReply) {}
-    rpc FindSimilar (FindSimilarRequest) returns (FindSimilarReply) {}
+    rpc FindSimilarImage (FindSimilarImageRequest) returns (FindSimilarImageReply) {}
     rpc AddImage (AddImageRequest) returns (AddImageReply) {}
     rpc RemoveImage (RemoveImageRequest) returns (RemoveImageReply) {}
 }