chore: move clip models

client/setup.py

@@ -43,7 +43,7 @@
     setup_requires=['setuptools>=18.0', 'wheel'],
     install_requires=[
         'jina>=3.12.0',
-        'docarray[common]>=0.19.0,<0.30.0',
+        'docarray[common]==0.21.0',
         'packaging',
     ],
     extras_require={

server/clip_server/model/pretrained_models.py

@@ -2,9 +2,11 @@
 import hashlib
 import shutil
 import urllib
+import requests
 
 
 _OPENCLIP_S3_BUCKET = 'https://clip-as-service.s3.us-east-2.amazonaws.com/models/torch'
+_OPENCLIP_HUGGINGFACE_BUCKET = 'https://huggingface.co/jinaai/clip-models/'
 _OPENCLIP_MODELS = {
     'RN50::openai': ('RN50.pt', '9140964eaaf9f68c95aa8df6ca13777c'),
     'RN50::yfcc15m': ('RN50-yfcc15m.pt', 'e9c564f91ae7dc754d9043fdcd2a9f22'),
@@ -132,7 +134,7 @@
 def md5file(filename: str):
     hash_md5 = hashlib.md5()
     with open(filename, 'rb') as f:
-        for chunk in iter(lambda: f.read(4096), b""):
+        for chunk in iter(lambda: f.read(4096), b''):
             hash_md5.update(chunk)
 
     return hash_md5.hexdigest()
@@ -143,12 +145,30 @@
     if len(model_pretrained) == 0:  # not on s3
         return None, None
     else:
+        hg_download_url = (
+            _OPENCLIP_HUGGINGFACE_BUCKET
+            + 'resolve/main/'
+            + model_pretrained[0]
+            + '?download=true'
+        )
+        try:
+            print(f'Test Hg url: {hg_download_url}')
+            response = requests.head(hg_download_url)
+            if response.status_code in [200, 302]:
+                print('Download from huggingface')
+                return (hg_download_url, model_pretrained[1])
+            else:
+                print(f'Model not found on hugging face, trying to download from s3.')
+
+        except requests.exceptions.RequestException as e:
+            print(str(e))
+            print(f'Model not found on hugging face, trying to download from s3.')
         return (_OPENCLIP_S3_BUCKET + '/' + model_pretrained[0], model_pretrained[1])
 
 
 def download_model(
     url: str,
-    target_folder: str = os.path.expanduser("~/.cache/clip"),
+    target_folder: str = os.path.expanduser('~/.cache/clip'),
     md5sum: str = None,
     with_resume: bool = True,
     max_attempts: int = 3,
@@ -175,14 +195,14 @@
     )
 
     progress = Progress(
-        " \n",  # divide this bar from Flow's bar
-        TextColumn("[bold blue]{task.fields[filename]}", justify="right"),
-        "[progress.percentage]{task.percentage:>3.1f}%",
-        "•",
+        ' \n',  # divide this bar from Flow's bar
+        TextColumn('[bold blue]{task.fields[filename]}', justify='right'),
+        '[progress.percentage]{task.percentage:>3.1f}%',
+        '•',
         DownloadColumn(),
-        "•",
+        '•',
         TransferSpeedColumn(),
-        "•",
+        '•',
         TimeRemainingColumn(),
     )