make clip_app_client a bit more generic

experimental/clip_app_client.py

@@ -43,29 +43,30 @@ def preprocess_image(image_url):
 
 preprocessed_image = preprocess_image(test_image_url)
 
-def send_text_request(number):
+
+def text_to_embedding(text):
     payload = {
-        "text": ('str', english_text, 'application/octet-stream'),
+        "text": ('str', text, 'application/octet-stream'),
     }
     url = os.environ.get("HTTP_ADDRESS", "http://127.0.0.1:8000/")
     response = requests.post(url, files=payload)
     embeddings = response.text
-    return number, embeddings
+    return embeddings
 
-def send_image_url_request(number):
+def image_url_to_embedding(image_url):
     payload = {
         "image_url": ('str', test_image_url, 'application/octet-stream'),
     }
     url = os.environ.get("HTTP_ADDRESS", "http://127.0.0.1:8000/")
     response = requests.post(url, files=payload)
     embeddings = response.text
-    return number, embeddings
+    return embeddings
 
-def send_preprocessed_image_request(number):
+def preprocessed_image_to_embedding(image):
     key = "preprocessed_image"
-    data_bytes = preprocessed_image.numpy().tobytes()
-    shape_bytes = np.array(preprocessed_image.shape).tobytes()
-    dtype_bytes = str(preprocessed_image.dtype).encode()
+    data_bytes = image.numpy().tobytes()
+    shape_bytes = np.array(image.shape).tobytes()
+    dtype_bytes = str(image.dtype).encode()
     payload = {
         key: ('tensor', data_bytes, 'application/octet-stream'),
         'shape': ('shape', shape_bytes, 'application/octet-stream'),
@@ -74,6 +75,18 @@ def send_preprocessed_image_request(number):
     url = os.environ.get("HTTP_ADDRESS", "http://127.0.0.1:8000/")
     response = requests.post(url, files=payload)
     embeddings = response.text
+    return embeddings
+
+def _send_text_request(number):
+    embeddings = text_to_embedding(english_text)
+    return number, embeddings
+
+def _send_image_url_request(number):
+    embeddings = image_url_to_embedding(test_image_url)
+    return number, embeddings
+
+def _send_preprocessed_image_request(number):
+    embeddings = preprocessed_image_to_embedding(preprocessed_image)
     return number, embeddings
 
 def process(numbers, send_func, max_workers=10):
@@ -97,7 +110,7 @@ if __name__ == "__main__":
     # n_calls = 1
     numbers = list(range(n_calls))
     start_time = time.monotonic()
-    process(numbers, send_text_request)
+    process(numbers, _send_text_request)
     end_time = time.monotonic()
     total_time = end_time - start_time
     avg_time_ms = total_time / n_calls * 1000
@@ -110,7 +123,7 @@ if __name__ == "__main__":
     # n_calls = 1
     numbers = list(range(n_calls))
     start_time = time.monotonic()
-    process(numbers, send_image_url_request)
+    process(numbers, _send_image_url_request)
     end_time = time.monotonic()
     total_time = end_time - start_time
     avg_time_ms = total_time / n_calls * 1000
@@ -123,7 +136,7 @@ if __name__ == "__main__":
     # n_calls = 1
     numbers = list(range(n_calls))
     start_time = time.monotonic()
-    process(numbers, send_preprocessed_image_request)
+    process(numbers, _send_preprocessed_image_request)
     end_time = time.monotonic()
     total_time = end_time - start_time
     avg_time_ms = total_time / n_calls * 1000