Update test to the latest rekcurd spec

Author: keigohtr

test/__init__.py

@@ -1,17 +1,9 @@
-import os
+from .dummy_app import DummyApp
 
-from rekcurd.logger import JsonServiceLogger, JsonSystemLogger
-import rekcurd.rekcurd_worker_servicer
+from rekcurd import RekcurdWorkerServicer
+from rekcurd.logger import JsonServiceLogger
 
-from test.dummy_app import DummyApp
-from rekcurd_client.logger import logger
-
-
-os.environ["REKCURD_TEST_MODE"] = "True"
-os.environ["REKCURD_SETTINGS_YAML"] = "test/test-settings.yml"
 
 app = DummyApp()
-service_logger = JsonServiceLogger(app.config)
-system_logger = JsonSystemLogger(app.config)
-Type = rekcurd.rekcurd_worker_servicer.RekcurdWorkerServicer.Type
-client_logger = logger
+app.service_logger = JsonServiceLogger()
+Type = RekcurdWorkerServicer.Type

test/core/_client_application.py

@@ -5,9 +5,7 @@
 
 from rekcurd.utils import PredictResult
 
-import rekcurd_client.core.rekcurd_worker_client
 from rekcurd_client.protobuf import rekcurd_pb2_grpc
-from rekcurd_client.logger import logger
 from rekcurd_client import RekcurdWorkerClient
 
 
@@ -409,7 +407,9 @@ def _run_arrstring_arrstring(client: RekcurdWorkerClient):
 
 def run(scenario, channel):
     stub = rekcurd_pb2_grpc.RekcurdWorkerStub(channel)
-    client = rekcurd_client.core.rekcurd_worker_client.RekcurdWorkerClient(logger=logger, domain='example.com', app='rekcurd-sample', env='development')
+    client = RekcurdWorkerClient(
+        host="example.com", port=80, application_name="rekcurd-sample",
+        service_level="development")
     client.stub = stub
     try:
         return _IMPLEMENTATIONS[scenario](client)

test/core/test_worker_client_e2e.py

@@ -2,13 +2,13 @@
 from concurrent import futures
 
 from test import *
+from rekcurd_client import RekcurdWorkerClient
 from rekcurd_client.protobuf import rekcurd_pb2_grpc
 import unittest
 from functools import wraps
 from unittest.mock import patch, Mock
 
 from rekcurd.utils import PredictResult
-import rekcurd_client.core.rekcurd_worker_client
 
 
 def patch_predictor(input_type, output_type):
@@ -81,13 +81,11 @@ def assertArrStringResponse(self, response):
     def setUpClass(cls):
         server = grpc.server(futures.ThreadPoolExecutor(max_workers=1))
         rekcurd_pb2_grpc.add_RekcurdWorkerServicer_to_server(
-            rekcurd.rekcurd_worker_servicer.RekcurdWorkerServicer(
-                logger=service_logger, app=app),
-            server)
+            RekcurdWorkerServicer(app=app, predictor=None), server)
         server.add_insecure_port("[::]:5000")
         server.start()
         cls.server = server
-        cls.client = rekcurd_client.core.rekcurd_worker_client.RekcurdWorkerClient(logger=client_logger, host='127.0.0.1:5000')
+        cls.client = RekcurdWorkerClient(host='127.0.0.1', port=5000)
 
     @classmethod
     def tearDownClass(cls):

test/dummy_app.py

@@ -1,24 +1,15 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-
 from rekcurd import Rekcurd
-from rekcurd.utils import PredictLabel, PredictResult, EvaluateResult, EvaluateResultDetail, EvaluateDetail
-from typing import List, Generator
 
 
 class DummyApp(Rekcurd):
-    def __init__(self, config_file: str = None):
-        super().__init__(config_file)
-
-    def load_model(self) -> None:
+    def load_model(self, **kwargs):
         pass
 
-    def predict(self, input: PredictLabel, option: dict = None) -> PredictResult:
+    def predict(self, **kwargs):
         pass
 
-    def evaluate(self, file: bytes) -> EvaluateResult:
+    def evaluate(self, **kwargs):
         pass
 
-    def get_evaluate_detail(self, file_path: str, results: List[EvaluateResultDetail]) -> Generator[EvaluateDetail, None, None]:
+    def get_evaluate_detail(self, **kwargs):
         pass