Cleanup (#2264)

Author: RobertLucian

test/e2e/e2e/tests.py

@@ -41,7 +41,6 @@
     wait_on_futures,
     endpoint_ready,
     request_prediction,
-    generate_grpc,
     job_done,
     jobs_done,
     request_batch_prediction,
@@ -88,36 +87,16 @@ def test_realtime_api(
             client=client, api_names=[api_name], timeout=timeout
         ), f"apis {api_name} not ready"
 
-        if not expectations or "grpc" not in expectations:
-            with open(str(api_dir / "sample.json")) as f:
-                payload = json.load(f)
-            response = request_prediction(client, api_name, payload, extra_path)
-
-            assert (
-                response.status_code == HTTPStatus.OK
-            ), f"status code: got {response.status_code}, expected {HTTPStatus.OK}"
+        with open(str(api_dir / "sample.json")) as f:
+            payload = json.load(f)
+        response = request_prediction(client, api_name, payload, extra_path)
 
-            if expectations and "response" in expectations:
-                assert_response_expectations(response, expectations["response"])
+        assert (
+            response.status_code == HTTPStatus.OK
+        ), f"status code: got {response.status_code}, expected {HTTPStatus.OK}"
 
-        if expectations and "grpc" in expectations:
-            stub, input_sample, output_values, output_type, is_output_stream = generate_grpc(
-                client, api_name, api_dir, expectations["grpc"]
-            )
-            if is_output_stream:
-                for response, output_val in zip(stub.Predict(input_sample), output_values):
-                    assert (
-                        type(response) == output_type
-                    ), f"didn't receive response of type {str(output_type)}, but received {str(type(response))}"
-                    assert response == output_val, f"received {response} instead of {output_val}"
-            else:
-                response = stub.Predict(input_sample)
-                assert (
-                    type(stub.Predict(input_sample)) == output_type
-                ), f"didn't receive response of type {str(output_type)}, but received {str(type(response))}"
-                assert (
-                    response == output_values[0]
-                ), f"received {response} instead of {output_values[0]}"
+        if expectations and "response" in expectations:
+            assert_response_expectations(response, expectations["response"])
     except:
         # best effort
         try:

test/e2e/e2e/utils.py

@@ -12,18 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import importlib
-import pathlib
 import os
-import sys
 import threading as td
 import time
 from concurrent import futures
 from http import HTTPStatus
 from typing import Any, List, Optional, Tuple, Union, Dict, Callable
 
 import cortex as cx
-import grpc
 import requests
 import yaml
 
@@ -130,45 +126,6 @@ def _runnable(job_id):
     return True
 
 
-def generate_grpc(
-    client: cx.Client, api_name: str, api_dir: pathlib.Path, config: Dict[str, Any]
-) -> Tuple[Any, Any, List, Any, bool]:
-    api_info = client.get_api(api_name)
-
-    test_proto_dir = pathlib.Path(config["proto_module_pb2"]).parent
-    sys.path.append(str(api_dir / test_proto_dir))
-    proto_module_pb2 = importlib.import_module(str(pathlib.Path(config["proto_module_pb2"]).stem))
-    proto_module_pb2_grpc = importlib.import_module(
-        str(pathlib.Path(config["proto_module_pb2_grpc"]).stem)
-    )
-    sys.path.pop()
-
-    endpoint = api_info["endpoint"] + ":" + str(api_info["grpc_ports"]["insecure"])
-    channel = grpc.insecure_channel(endpoint)
-    stub = getattr(proto_module_pb2_grpc, config["stub_service_name"] + "Stub")(channel)
-
-    input_sample = getattr(proto_module_pb2, config["input_spec"]["class_name"])()
-    for k, v in config["input_spec"]["input"].items():
-        setattr(input_sample, k, v)
-
-    SampleClass = getattr(proto_module_pb2, config["output_spec"]["class_name"])
-    output_values = []
-    is_output_stream = config["output_spec"]["stream"]
-    if is_output_stream:
-        for entry in config["output_spec"]["output"]:
-            output_val = SampleClass()
-            for k, v in entry.items():
-                setattr(output_val, k, v)
-            output_values.append(output_val)
-    else:
-        output_val = SampleClass()
-        for k, v in config["output_spec"]["output"].items():
-            setattr(output_val, k, v)
-        output_values.append(output_val)
-
-    return stub, input_sample, output_values, SampleClass, is_output_stream
-
-
 def request_prediction(
     client: cx.Client,
     api_name: str,