refactor(client): use docarray pbar (#668)

README.md

@@ -10,10 +10,10 @@
 </p>
 
 <p align=center>
-<a href="https://pypi.org/project/clip_server/"><img src="https://github.com/jina-ai/jina/blob/master/.github/badges/python-badge.svg?raw=true" alt="Python 3.7 3.8 3.9 3.10" title="CLIP-as-service supports Python 3.7 and above"></a>
-<a href="https://pypi.org/project/clip_server/"><img src="https://img.shields.io/pypi/v/clip_server?color=%23099cec&amp;label=PyPI&amp;logo=pypi&amp;logoColor=white" alt="PyPI"></a>
-<a href="https://slack.jina.ai"><img src="https://img.shields.io/badge/Slack-2.7k%2B-blueviolet?logo=slack&amp;logoColor=white"></a>
-<a href="https://codecov.io/gh/jina-ai/clip-as-service"><img src="https://codecov.io/gh/jina-ai/clip-as-service/branch/main/graph/badge.svg?token=M7aC0FgIqd"/></a>
+<a href="https://pypi.org/project/clip_server/"><img alt="PyPI - Python Version" src="https://img.shields.io/pypi/pyversions/clip_server?logo=python&logoColor=white&style=flat-square"></a>
+<a href="https://pypi.org/project/clip_server/"><img alt="PyPI" src="https://img.shields.io/pypi/v/clip_server?label=PyPI&logo=pypi&logoColor=white&style=flat-square"></a>
+<a href="https://slack.jina.ai"><img src="https://img.shields.io/badge/Slack-2.7k%2B-blueviolet?logo=slack&amp;logoColor=white&style=flat-square"></a>
+<a href="https://codecov.io/gh/jina-ai/clip-as-service"><img alt="Codecov branch" src="https://img.shields.io/codecov/c/github/jina-ai/clip-as-service/main?label=PyPI&logo=Codecov&logoColor=white&style=flat-square"></a>
 </p>
 
 <!-- start elevator-pitch -->

client/clip_client/client.py

@@ -295,31 +295,10 @@ def _prepare_streaming(self, disable, total):
                 'the length of the input is unknown, the progressbar would not be accurate.'
             )
 
-        from rich.progress import (
-            Progress,
-            BarColumn,
-            SpinnerColumn,
-            MofNCompleteColumn,
-            TextColumn,
-            TimeRemainingColumn,
-        )
+        from docarray.array.mixins.io.pbar import get_pbar
+
+        self._pbar = get_pbar(disable)
 
-        self._pbar = Progress(
-            SpinnerColumn(),
-            TextColumn('[bold]{task.description}'),
-            BarColumn(),
-            MofNCompleteColumn(),
-            '•',
-            TimeRemainingColumn(),
-            '•',
-            TextColumn(
-                '[bold blue]{task.fields[total_size]}',
-                justify='right',
-                style='progress.filesize',
-            ),
-            transient=True,
-            disable=disable,
-        )
         os.environ['JINA_GRPC_SEND_BYTES'] = '0'
         os.environ['JINA_GRPC_RECV_BYTES'] = '0'
 

client/setup.py

@@ -41,7 +41,7 @@
     long_description_content_type='text/markdown',
     zip_safe=False,
     setup_requires=['setuptools>=18.0', 'wheel'],
-    install_requires=['jina>=3.2.10', 'docarray[common]>=0.9.18'],
+    install_requires=['jina>=3.2.10', 'docarray[common]>=0.10.3'],
     extras_require={
         'test': [
             'pytest',
@@ -64,6 +64,7 @@
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: Unix Shell',
         'Environment :: Console',
         'License :: OSI Approved :: Apache Software License',

server/setup.py

@@ -53,6 +53,7 @@
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: Unix Shell',
         'Environment :: Console',
         'License :: OSI Approved :: Apache Software License',