From ea239685bff56372aeadaeb3050f5c2ccc37175f Mon Sep 17 00:00:00 2001
From: felix-wang <35718120+numb3r3@users.noreply.github.com>
Date: Tue, 30 Aug 2022 21:55:56 +0800
Subject: [PATCH] fix: grpc meta auth (#811)

* fix: grpc meta auth

* fix: use clip-auth-token env
---
 client/clip_client/client.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/client/clip_client/client.py b/client/clip_client/client.py
index b25919c97..f7a0a736d 100644
--- a/client/clip_client/client.py
+++ b/client/clip_client/client.py
@@ -61,7 +61,9 @@ def __init__(self, server: str, credential: dict = {}, **kwargs):
         else:
             raise ValueError(f'{server} is not a valid scheme')
 
-        self._authorization = credential.get('Authorization', None)
+        self._authorization = credential.get(
+            'Authorization', os.environ.get('CLIP_AUTH_TOKEN')
+        )
 
     @overload
     def encode(
@@ -205,8 +207,9 @@ def _get_post_payload(self, content, kwargs):
             request_size=kwargs.get('batch_size', 8),
             total_docs=len(content) if hasattr(content, '__len__') else None,
         )
+
         if self._scheme == 'grpc' and self._authorization:
-            payload.update(metadata=('authorization', self._authorization))
+            payload.update(metadata=(('authorization', self._authorization),))
         elif self._scheme == 'http' and self._authorization:
             payload.update(headers={'Authorization': self._authorization})
         return payload
@@ -413,7 +416,7 @@ def _get_rank_payload(self, content, kwargs):
             total_docs=len(content) if hasattr(content, '__len__') else None,
         )
         if self._scheme == 'grpc' and self._authorization:
-            payload.update(metadata=('authorization', self._authorization))
+            payload.update(metadata=(('authorization', self._authorization),))
         elif self._scheme == 'http' and self._authorization:
             payload.update(headers={'Authorization': self._authorization})
         return payload