Skip to content

Commit

Permalink
docs: revert black
Browse files Browse the repository at this point in the history
  • Loading branch information
Zihao Jing committed Dec 20, 2023
1 parent 6863d07 commit 1c17697
Show file tree
Hide file tree
Showing 2 changed files with 119 additions and 119 deletions.
112 changes: 56 additions & 56 deletions client/setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,89 +5,89 @@
from setuptools import setup

if sys.version_info < (3, 7, 0):
raise OSError(f"CLIP-as-service requires Python >=3.7, but yours is {sys.version}")
raise OSError(f'CLIP-as-service requires Python >=3.7, but yours is {sys.version}')

try:
pkg_name = "clip-client"
pkg_name = 'clip-client'
libinfo_py = path.join(
path.dirname(__file__), pkg_name.replace("-", "_"), "__init__.py"
path.dirname(__file__), pkg_name.replace('-', '_'), '__init__.py'
)
libinfo_content = open(libinfo_py, "r", encoding="utf8").readlines()
version_line = [l.strip() for l in libinfo_content if l.startswith("__version__")][
libinfo_content = open(libinfo_py, 'r', encoding='utf8').readlines()
version_line = [l.strip() for l in libinfo_content if l.startswith('__version__')][
0
]
exec(version_line) # gives __version__
except FileNotFoundError as ex:
__version__ = "0.0.0"
__version__ = '0.0.0'

try:
with open("../README.md", encoding="utf8") as fp:
with open('../README.md', encoding='utf8') as fp:
_long_description = fp.read()
except FileNotFoundError:
_long_description = ""
_long_description = ''

setup(
name=pkg_name,
packages=find_packages(),
version=__version__,
include_package_data=True,
description="Embed images and sentences into fixed-length vectors via CLIP",
author="Jina AI",
author_email="[email protected]",
license="Apache 2.0",
url="https://github.com/jina-ai/clip-as-service",
download_url="https://github.com/jina-ai/clip-as-service/tags",
description='Embed images and sentences into fixed-length vectors via CLIP',
author='Jina AI',
author_email='[email protected]',
license='Apache 2.0',
url='https://github.com/jina-ai/clip-as-service',
download_url='https://github.com/jina-ai/clip-as-service/tags',
long_description=_long_description,
long_description_content_type="text/markdown",
long_description_content_type='text/markdown',
zip_safe=False,
setup_requires=["setuptools>=18.0", "wheel"],
setup_requires=['setuptools>=18.0', 'wheel'],
install_requires=[
"jina>=3.12.0",
"docarray[common]>=0.19.0,<0.30.0",
"packaging",
'jina>=3.12.0',
'docarray[common]>=0.19.0,<0.30.0',
'packaging',
],
extras_require={
"test": [
"pytest",
"pytest-timeout",
"pytest-mock",
"pytest-asyncio",
"pytest-cov",
"pytest-repeat",
"pytest-reraise",
"mock",
"pytest-custom_exit_code",
"black",
'test': [
'pytest',
'pytest-timeout',
'pytest-mock',
'pytest-asyncio',
'pytest-cov',
'pytest-repeat',
'pytest-reraise',
'mock',
'pytest-custom_exit_code',
'black',
],
},
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"Intended Audience :: Education",
"Intended Audience :: Science/Research",
"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",
"Operating System :: OS Independent",
"Topic :: Database :: Database Engines/Servers",
"Topic :: Scientific/Engineering :: Artificial Intelligence",
"Topic :: Internet :: WWW/HTTP :: Indexing/Search",
"Topic :: Scientific/Engineering :: Image Recognition",
"Topic :: Multimedia :: Video",
"Topic :: Scientific/Engineering",
"Topic :: Scientific/Engineering :: Mathematics",
"Topic :: Software Development",
"Topic :: Software Development :: Libraries",
"Topic :: Software Development :: Libraries :: Python Modules",
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'Intended Audience :: Education',
'Intended Audience :: Science/Research',
'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',
'Operating System :: OS Independent',
'Topic :: Database :: Database Engines/Servers',
'Topic :: Scientific/Engineering :: Artificial Intelligence',
'Topic :: Internet :: WWW/HTTP :: Indexing/Search',
'Topic :: Scientific/Engineering :: Image Recognition',
'Topic :: Multimedia :: Video',
'Topic :: Scientific/Engineering',
'Topic :: Scientific/Engineering :: Mathematics',
'Topic :: Software Development',
'Topic :: Software Development :: Libraries',
'Topic :: Software Development :: Libraries :: Python Modules',
],
project_urls={
"Documentation": "https://clip-as-service.jina.ai",
"Source": "https://github.com/jina-ai/clip-as-service/",
"Tracker": "https://github.com/jina-ai/clip-as-service/issues",
'Documentation': 'https://clip-as-service.jina.ai',
'Source': 'https://github.com/jina-ai/clip-as-service/',
'Tracker': 'https://github.com/jina-ai/clip-as-service/issues',
},
keywords="jina openai clip deep-learning cross-modal multi-modal neural-search",
keywords='jina openai clip deep-learning cross-modal multi-modal neural-search',
)
126 changes: 63 additions & 63 deletions server/setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,99 +4,99 @@
from setuptools import find_packages, setup

if sys.version_info < (3, 7, 0):
raise OSError(f"CLIP-as-service requires Python >=3.7, but yours is {sys.version}")
raise OSError(f'CLIP-as-service requires Python >=3.7, but yours is {sys.version}')

try:
pkg_name = "clip-server"
pkg_name = 'clip-server'
libinfo_py = path.join(
path.dirname(__file__), pkg_name.replace("-", "_"), "__init__.py"
path.dirname(__file__), pkg_name.replace('-', '_'), '__init__.py'
)
libinfo_content = open(libinfo_py, "r", encoding="utf8").readlines()
version_line = [l.strip() for l in libinfo_content if l.startswith("__version__")][
libinfo_content = open(libinfo_py, 'r', encoding='utf8').readlines()
version_line = [l.strip() for l in libinfo_content if l.startswith('__version__')][
0
]
exec(version_line) # gives __version__
except FileNotFoundError:
__version__ = "0.0.0"
__version__ = '0.0.0'

try:
with open("../README.md", encoding="utf8") as fp:
with open('../README.md', encoding='utf8') as fp:
_long_description = fp.read()
except FileNotFoundError:
_long_description = ""
_long_description = ''

setup(
name=pkg_name,
packages=find_packages(),
version=__version__,
include_package_data=True,
description="Embed images and sentences into fixed-length vectors via CLIP",
author="Jina AI",
author_email="[email protected]",
license="Apache 2.0",
url="https://github.com/jina-ai/clip-as-service",
download_url="https://github.com/jina-ai/clip-as-service/tags",
description='Embed images and sentences into fixed-length vectors via CLIP',
author='Jina AI',
author_email='[email protected]',
license='Apache 2.0',
url='https://github.com/jina-ai/clip-as-service',
download_url='https://github.com/jina-ai/clip-as-service/tags',
long_description=_long_description,
long_description_content_type="text/markdown",
long_description_content_type='text/markdown',
zip_safe=False,
setup_requires=["setuptools>=18.0", "wheel"],
setup_requires=['setuptools>=18.0', 'wheel'],
install_requires=[
"ftfy",
"torch",
"regex",
"torchvision<=0.13.0" if sys.version_info <= (3, 7, 2) else "torchvision",
"jina>=3.12.0",
"docarray==0.21.0",
"prometheus-client",
"open_clip_torch>=2.8.0,<2.9.0",
"pillow-avif-plugin",
'ftfy',
'torch',
'regex',
'torchvision<=0.13.0' if sys.version_info <= (3, 7, 2) else 'torchvision',
'jina>=3.12.0',
'docarray==0.21.0',
'prometheus-client',
'open_clip_torch>=2.8.0,<2.9.0',
'pillow-avif-plugin',
],
extras_require={
"onnx": [
"onnx",
"onnxmltools<1.12.0",
'onnx': [
'onnx',
'onnxmltools<1.12.0',
]
+ (
["onnxruntime-gpu<=1.13.1"]
if sys.platform != "darwin"
else ["onnxruntime<=1.13.1"]
['onnxruntime-gpu<=1.13.1']
if sys.platform != 'darwin'
else ['onnxruntime<=1.13.1']
),
"tensorrt": [
"nvidia-tensorrt==8.4.1.5",
'tensorrt': [
'nvidia-tensorrt==8.4.1.5',
],
"transformers": ["transformers>=4.16.2"],
"search": ["annlite>=0.3.10"],
"flash-attn": ["flash-attn"],
"cn_clip": ["cn_clip"],
'transformers': ['transformers>=4.16.2'],
'search': ['annlite>=0.3.10'],
'flash-attn': ['flash-attn'],
'cn_clip': ['cn_clip'],
},
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"Intended Audience :: Education",
"Intended Audience :: Science/Research",
"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",
"Operating System :: OS Independent",
"Topic :: Database :: Database Engines/Servers",
"Topic :: Scientific/Engineering :: Artificial Intelligence",
"Topic :: Internet :: WWW/HTTP :: Indexing/Search",
"Topic :: Scientific/Engineering :: Image Recognition",
"Topic :: Multimedia :: Video",
"Topic :: Scientific/Engineering",
"Topic :: Scientific/Engineering :: Mathematics",
"Topic :: Software Development",
"Topic :: Software Development :: Libraries",
"Topic :: Software Development :: Libraries :: Python Modules",
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'Intended Audience :: Education',
'Intended Audience :: Science/Research',
'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',
'Operating System :: OS Independent',
'Topic :: Database :: Database Engines/Servers',
'Topic :: Scientific/Engineering :: Artificial Intelligence',
'Topic :: Internet :: WWW/HTTP :: Indexing/Search',
'Topic :: Scientific/Engineering :: Image Recognition',
'Topic :: Multimedia :: Video',
'Topic :: Scientific/Engineering',
'Topic :: Scientific/Engineering :: Mathematics',
'Topic :: Software Development',
'Topic :: Software Development :: Libraries',
'Topic :: Software Development :: Libraries :: Python Modules',
],
project_urls={
"Documentation": "https://clip-as-service.jina.ai",
"Source": "https://github.com/jina-ai/clip-as-service/",
"Tracker": "https://github.com/jina-ai/clip-as-service/issues",
'Documentation': 'https://clip-as-service.jina.ai',
'Source': 'https://github.com/jina-ai/clip-as-service/',
'Tracker': 'https://github.com/jina-ai/clip-as-service/issues',
},
keywords="jina openai clip deep-learning cross-modal multi-modal neural-search",
keywords='jina openai clip deep-learning cross-modal multi-modal neural-search',
)

0 comments on commit 1c17697

Please sign in to comment.