clip_app_client should return tensors

.env

@@ -0,0 +1 @@
+HTTP_ADDRESS="http://192.168.7.79:8000"

experimental/clip_app_client.py

@@ -1,3 +1,4 @@
+import json
 import os
 import numpy as np
 import requests
@@ -40,11 +41,16 @@ class ClipAppClient:
         :param image_url: str, URL of the image to preprocess
         :return: torch.Tensor, preprocessed image
         """
-        response = requests.get(image_url)
-        input_image = Image.open(BytesIO(response.content)).convert('RGB')
-        input_image = np.array(input_image)
-        input_im = Image.fromarray(input_image)
-        prepro = self.preprocess(input_im).unsqueeze(0).cpu()
+        if os.path.isfile(image_url):
+            input_image = Image.open(image_url).convert('RGB')
+            input_image = np.array(input_image)
+            input_image = Image.fromarray(input_image)
+        else:
+            response = requests.get(image_url)
+            input_image = Image.open(BytesIO(response.content)).convert('RGB')
+            input_image = np.array(input_image)
+            input_image = Image.fromarray(input_image)
+        prepro = self.preprocess(input_image).unsqueeze(0).cpu()
         return prepro
 
     def text_to_embedding(self, text):
@@ -60,6 +66,8 @@ class ClipAppClient:
         url = os.environ.get("HTTP_ADDRESS", "http://127.0.0.1:8000/")
         response = requests.post(url, files=payload)
         embeddings = response.text
+        embeddings = json.loads(embeddings)
+        embeddings = torch.tensor(embeddings)
         return embeddings
 
     def image_url_to_embedding(self, image_url):
@@ -75,6 +83,8 @@ class ClipAppClient:
         url = os.environ.get("HTTP_ADDRESS", "http://127.0.0.1:8000/")
         response = requests.post(url, files=payload)
         embeddings = response.text
+        embeddings = json.loads(embeddings)
+        embeddings = torch.tensor(embeddings)
         return embeddings
 
     def preprocessed_image_to_embedding(self, image):
@@ -96,5 +106,7 @@ class ClipAppClient:
         url = os.environ.get("HTTP_ADDRESS", "http://127.0.0.1:8000/")
         response = requests.post(url, files=payload)
         embeddings = response.text
+        embeddings = json.loads(embeddings)
+        embeddings = torch.tensor(embeddings)
         return embeddings
 

experimental/clip_app_performance_test.py

@@ -35,8 +35,7 @@ def process(numbers, send_func, max_workers=10):
         futures = [executor.submit(send_func, number) for number in numbers]
         for future in as_completed(futures):
             n_result, result = future.result()
-            result = json.loads(result)
-            print (f"{n_result} : {len(result[0])}")
+            print (f"{n_result} : {result.shape}")
 
 if __name__ == "__main__":
     n_calls = 300