Merge pull request #11 from rekcurd/feature/istio-support

Merged!

Author: keigohtr

drucker_client/drucker_worker_client.py

@@ -53,6 +53,9 @@ def __init__(self, logger: SystemLoggerInterface,
         else:
             v_str = drucker_pb2.EnumVersionInfo.Name(version)
 
+        self.__metadata = [('x-rekcurd-application-name', app),
+                           ('x-rekcurd-sevice-level', env),
+                           ('x-rekcurd-grpc-version', v_str)]
         if host is None:
             self.__change_domain_app_env(domain, app, env, v_str)
         else:
@@ -88,70 +91,70 @@ def run_predict_string_string(self, input, option="{}"):
         request = drucker_pb2.StringInput()
         request.input = input
         request.option.val=option
-        response = self.stub.Predict_String_String(request)
+        response = self.stub.Predict_String_String(request, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.BytesOutput())
     def run_predict_string_bytes(self, input, option="{}"):
         request = drucker_pb2.StringInput()
         request.input = input
         request.option.val=option
-        response = self.stub.Predict_String_Bytes(request)
+        response = self.stub.Predict_String_Bytes(request, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.ArrIntOutput())
     def run_predict_string_arrint(self, input, option="{}"):
         request = drucker_pb2.StringInput()
         request.input = input
         request.option.val=option
-        response = self.stub.Predict_String_ArrInt(request)
+        response = self.stub.Predict_String_ArrInt(request, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.ArrFloatOutput())
     def run_predict_string_arrfloat(self, input, option="{}"):
         request = drucker_pb2.StringInput()
         request.input = input
         request.option.val=option
-        response = self.stub.Predict_String_ArrFloat(request)
+        response = self.stub.Predict_String_ArrFloat(request, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.ArrStringOutput())
     def run_predict_string_arrstring(self, input, option="{}"):
         request = drucker_pb2.StringInput()
         request.input = input
         request.option.val=option
-        response = self.stub.Predict_String_ArrString(request)
+        response = self.stub.Predict_String_ArrString(request, metadata=self.__metadata)
         return response
 
 
     @error_handling(drucker_pb2.StringOutput())
     def run_predict_bytes_string(self, input, option="{}"):
         request_iterator = self.__byte_input_request(input, option)
-        response = self.stub.Predict_Bytes_String(request_iterator)
+        response = self.stub.Predict_Bytes_String(request_iterator, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.BytesOutput())
     def run_predict_bytes_bytes(self, input, option="{}"):
         request_iterator = self.__byte_input_request(input, option)
-        response = self.stub.Predict_Bytes_Bytes(request_iterator)
+        response = self.stub.Predict_Bytes_Bytes(request_iterator, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.ArrIntOutput())
     def run_predict_bytes_arrint(self, input, option="{}"):
         request_iterator = self.__byte_input_request(input, option)
-        response = self.stub.Predict_Bytes_ArrInt(request_iterator)
+        response = self.stub.Predict_Bytes_ArrInt(request_iterator, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.ArrFloatOutput())
     def run_predict_bytes_arrfloat(self, input, option="{}"):
         request_iterator = self.__byte_input_request(input, option)
-        response = self.stub.Predict_Bytes_ArrFloat(request_iterator)
+        response = self.stub.Predict_Bytes_ArrFloat(request_iterator, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.ArrStringOutput())
     def run_predict_bytes_arrstring(self, input, option="{}"):
         request_iterator = self.__byte_input_request(input, option)
-        response = self.stub.Predict_Bytes_ArrString(request_iterator)
+        response = self.stub.Predict_Bytes_ArrString(request_iterator, metadata=self.__metadata)
         return response
 
 
@@ -160,39 +163,39 @@ def run_predict_arrint_string(self, input, option="{}"):
         request = drucker_pb2.ArrIntInput()
         request.input.extend(input)
         request.option.val=option
-        response = self.stub.Predict_ArrInt_String(request)
+        response = self.stub.Predict_ArrInt_String(request, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.BytesOutput())
     def run_predict_arrint_bytes(self, input, option="{}"):
         request = drucker_pb2.ArrIntInput()
         request.input.extend(input)
         request.option.val=option
-        response = self.stub.Predict_ArrInt_Bytes(request)
+        response = self.stub.Predict_ArrInt_Bytes(request, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.ArrIntOutput())
     def run_predict_arrint_arrint(self, input, option="{}"):
         request = drucker_pb2.ArrIntInput()
         request.input.extend(input)
         request.option.val=option
-        response = self.stub.Predict_ArrInt_ArrInt(request)
+        response = self.stub.Predict_ArrInt_ArrInt(request, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.ArrFloatOutput())
     def run_predict_arrint_arrfloat(self, input, option="{}"):
         request = drucker_pb2.ArrIntInput()
         request.input.extend(input)
         request.option.val=option
-        response = self.stub.Predict_ArrInt_ArrFloat(request)
+        response = self.stub.Predict_ArrInt_ArrFloat(request, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.ArrStringOutput())
     def run_predict_arrint_arrstring(self, input, option="{}"):
         request = drucker_pb2.ArrIntInput()
         request.input.extend(input)
         request.option.val=option
-        response = self.stub.Predict_ArrInt_ArrString(request)
+        response = self.stub.Predict_ArrInt_ArrString(request, metadata=self.__metadata)
         return response
 
 
@@ -201,39 +204,39 @@ def run_predict_arrfloat_string(self, input, option="{}"):
         request = drucker_pb2.ArrFloatInput()
         request.input.extend(input)
         request.option.val=option
-        response = self.stub.Predict_ArrFloat_String(request)
+        response = self.stub.Predict_ArrFloat_String(request, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.BytesOutput())
     def run_predict_arrfloat_bytes(self, input, option="{}"):
         request = drucker_pb2.ArrFloatInput()
         request.input.extend(input)
         request.option.val=option
-        response = self.stub.Predict_ArrFloat_Bytes(request)
+        response = self.stub.Predict_ArrFloat_Bytes(request, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.ArrIntOutput())
     def run_predict_arrfloat_arrint(self, input, option="{}"):
         request = drucker_pb2.ArrFloatInput()
         request.input.extend(input)
         request.option.val=option
-        response = self.stub.Predict_ArrFloat_ArrInt(request)
+        response = self.stub.Predict_ArrFloat_ArrInt(request, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.ArrFloatOutput())
     def run_predict_arrfloat_arrfloat(self, input, option="{}"):
         request = drucker_pb2.ArrFloatInput()
         request.input.extend(input)
         request.option.val=option
-        response = self.stub.Predict_ArrFloat_ArrFloat(request)
+        response = self.stub.Predict_ArrFloat_ArrFloat(request, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.ArrStringOutput())
     def run_predict_arrfloat_arrstring(self, input, option="{}"):
         request = drucker_pb2.ArrFloatInput()
         request.input.extend(input)
         request.option.val=option
-        response = self.stub.Predict_ArrFloat_ArrString(request)
+        response = self.stub.Predict_ArrFloat_ArrString(request, metadata=self.__metadata)
         return response
 
 
@@ -242,37 +245,37 @@ def run_predict_arrstring_string(self, input, option="{}"):
         request = drucker_pb2.ArrStringInput()
         request.input.extend(input)
         request.option.val=option
-        response = self.stub.Predict_ArrString_String(request)
+        response = self.stub.Predict_ArrString_String(request, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.BytesOutput())
     def run_predict_arrstring_bytes(self, input, option="{}"):
         request = drucker_pb2.ArrStringInput()
         request.input.extend(input)
         request.option.val=option
-        response = self.stub.Predict_ArrString_Bytes(request)
+        response = self.stub.Predict_ArrString_Bytes(request, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.ArrIntOutput())
     def run_predict_arrstring_arrint(self, input, option="{}"):
         request = drucker_pb2.ArrStringInput()
         request.input.extend(input)
         request.option.val=option
-        response = self.stub.Predict_ArrString_ArrInt(request)
+        response = self.stub.Predict_ArrString_ArrInt(request, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.ArrFloatOutput())
     def run_predict_arrstring_arrfloat(self, input, option="{}"):
         request = drucker_pb2.ArrStringInput()
         request.input.extend(input)
         request.option.val=option
-        response = self.stub.Predict_ArrString_ArrFloat(request)
+        response = self.stub.Predict_ArrString_ArrFloat(request, metadata=self.__metadata)
         return response
 
     @error_handling(drucker_pb2.ArrStringOutput())
     def run_predict_arrstring_arrstring(self, input, option="{}"):
         request = drucker_pb2.ArrStringInput()
         request.input.extend(input)
         request.option.val=option
-        response = self.stub.Predict_ArrString_ArrString(request)
+        response = self.stub.Predict_ArrString_ArrString(request, metadata=self.__metadata)
         return response

drucker_client/test/__init__.py

@@ -1,16 +1,10 @@
 import os
-import unittest
-from functools import wraps
-from unittest.mock import patch, Mock
 
-from drucker.utils import PredictResult
 from drucker.logger import JsonServiceLogger, JsonSystemLogger
 import drucker.drucker_worker_servicer
 
 from drucker_client.test.dummy_app import DummyApp
 from drucker_client.logger import logger
-from drucker_client.protobuf import drucker_pb2
-import drucker_client.drucker_worker_client
 
 
 os.environ["DRUCKER_TEST_MODE"] = "True"
@@ -21,53 +15,3 @@
 system_logger = JsonSystemLogger(app.config)
 Type = drucker.drucker_worker_servicer.DruckerWorkerServicer.Type
 client_logger = logger
-
-
-class DruckerWorkerTest(unittest.TestCase):
-    """DruckerWorkerTest is a base class for testing DruckerWorkerClient.
-    This class create xxxOutput instance and check that the return values have correct type.
-    """
-
-    def assertStringResponse(self, response):
-        self.assertEqual(response.__class__.__name__, "StringOutput")
-
-    def assertBytesResponse(self, response):
-        for item in response:
-            self.assertEqual(item.__class__.__name__, "BytesOutput")
-
-    def assertArrIntResponse(self, response):
-        self.assertEqual(response.__class__.__name__, "ArrIntOutput")
-
-    def assertArrFloatResponse(self, response):
-        self.assertEqual(response.__class__.__name__, "ArrFloatOutput")
-
-    def assertArrStringResponse(self, response):
-        self.assertEqual(response.__class__.__name__, "ArrStringOutput")
-
-
-_prediction_value_map = {
-    Type.STRING: PredictResult('Drucker', 1.0, option={}),
-    Type.BYTES: PredictResult(b'\x8f\xfa;\xc8a\xa3T%', 1.0, option={}),
-    Type.ARRAY_INT: PredictResult([2, 3, 5, 7], [1.0, 1.0, 1.0, 1.0], option={}),
-    Type.ARRAY_FLOAT: PredictResult([0.78341155, 0.03166816, 0.92745938], [1.0, 1.0, 1.0], option={}),
-    Type.ARRAY_STRING: PredictResult(['Drucker', 'is', 'awesome'], [1.0, 1.0, 1.0], option={}),
-}
-
-
-def patch_predictor(input_type, output_type):
-    """Decorator to mock the predictor.
-    Patch the several methods of the Predict class to make a fake predictor.
-    """
-    def test_method(func):
-        @wraps(func)
-        def inner_method(*args, **kwargs):
-            with patch('drucker_client.test.dummy_app.DummyApp.get_type_input',
-                       new=Mock(return_value=input_type)) as _, \
-                    patch('drucker_client.test.dummy_app.DummyApp.get_type_output',
-                          new=Mock(return_value=output_type)) as _, \
-                    patch('drucker_client.test.dummy_app.DummyApp.load_model') as _, \
-                    patch('drucker_client.test.dummy_app.DummyApp.predict',
-                          new=Mock(return_value=_prediction_value_map[output_type])) as _:
-                return func(*args, **kwargs)
-        return inner_method
-    return test_method