Merge branch 'main' into deepsparse-clip-backend

HISTORY.md

@@ -1,3 +1,8 @@
+## 2.38.0
+
+* Add webp to list of supported files in reader.
+* Remove version constraint of fsspec.
+
 ## 2.37.0
 
 * Update versions to fix pex and npm build

Makefile

@@ -16,7 +16,7 @@ black: ## [Local development] Auto-format python code using black
 build-pex:
 	python3 -m venv .pexing
 	. .pexing/bin/activate && python -m pip install -U pip && python -m pip install pex
-	. .pexing/bin/activate && python -m pex --layout packed  -f https://download.pytorch.org/whl/cu113/torch_stable.html setuptools gcsfs==2022.11.0 charset-normalizer==2.1.1 s3fs==2022.11.0 pyspark==3.2.0 torch==1.10.2+cu113 torchvision==0.11.3+cu113 . -o clip_retrieval.pex -v
+	. .pexing/bin/activate && python -m pex --layout packed  -f https://download.pytorch.org/whl/cu113/torch_stable.html setuptools gcsfs charset-normalizer==2.1.1 s3fs pyspark==3.2.0 torch==1.10.2+cu113 torchvision==0.11.3+cu113 . -o clip_retrieval.pex -v
 	rm -rf .pexing
 	tar czf clip_retrieval_torch.tgz clip_retrieval.pex/.deps/torch-1.10.2+cu113-cp38-cp38-linux_x86_64.whl
 	tar czf clip_retrieval.tgz --exclude clip_retrieval.pex/.deps/torch-1.10.2+cu113-cp38-cp38-linux_x86_64.whl clip_retrieval.pex

requirements.txt

@@ -15,7 +15,7 @@ autofaiss>=2.9.6,<3
 webdataset>=0.2,<0.3
 h5py>=3.1.0,<4
 prometheus-client>=0.13.1,<1
-fsspec==2022.11.0
+fsspec
 sentence-transformers>=2.2.0,<3
 wandb>=0.12.10,<0.13
 open-clip-torch>=2.0.0,<3.0.0

setup.py

@@ -29,7 +29,7 @@ def _read_reqs(relpath):
         packages=find_packages(),
         package_data={"": extra_files},
         include_package_data=True,
-        version="2.37.0",
+        version="2.38.0",
         license="MIT",
         description="Easily computing clip embeddings and building a clip retrieval system with them",
         long_description=long_description,

tests/test_clip_client.py

@@ -1,5 +1,6 @@
 """Test the ClipClient class."""
 import logging
+import pytest
 
 LOGGER = logging.getLogger(__name__)
 LOGGER.info("Test ClipClient.query()")
@@ -14,6 +15,7 @@
 
 
 # NOTE: This test may fail if the backend is down.
+@pytest.mark.skip(reason="temporarily skipping this test while laion knn is down")
 def test_query():
     """
     Test the ClipClient.query() method.