Bump versions and remove Redis and safetensors

packages/syft/setup.cfg

@@ -26,47 +26,45 @@ package_dir =
 # Add here dependencies of your project (semicolon/line-separated), e.g.
 
 syft =
-    bcrypt==4.0.1
-    boto3==1.28.65
+    bcrypt==4.1.2
+    boto3==1.34.56
     forbiddenfruit==0.1.4
     gevent==23.9.1
     loguru==0.7.2
     networkx==3.2.1
     packaging>=23.0
-    pyarrow==14.0.1
+    pyarrow==15.0.0
     # pycapnp is beta version, update to stable version when available
     pycapnp==2.0.0b2
     pydantic[email]==2.6.0
     pydantic-settings==2.2.1
-    pymongo==4.6.1
+    pymongo==4.6.2
     pynacl==1.5.0
     pyzmq>=23.2.1,<=25.1.1
-    redis==4.6.0
     requests==2.31.0
     RestrictedPython==7.0
-    result==0.16.0
-    tqdm==4.66.1
+    result==0.16.1
+    tqdm==4.66.2
     typeguard==4.1.5
-    typing_extensions==4.8.0
-    sherlock[redis,filelock]==0.4.1
-    uvicorn[standard]==0.24.0.post1
-    fastapi==0.103.2
-    psutil==5.9.6
+    typing_extensions==4.10.0
+    sherlock[filelock]==0.4.1
+    uvicorn[standard]==0.27.1
+    fastapi==0.110.0
+    psutil==5.9.8
     hagrid>=0.3
-    itables==1.6.2
-    safetensors==0.4.1
+    itables==1.7.1
     argon2-cffi==23.1.0
-    matplotlib==3.8.0
+    matplotlib==3.8.3
     # jaxlib is a DL library but we are needing it for serialization
     jaxlib==0.4.20
     jax==0.4.20
     # numpy and pandas are ML packages but are needed in many places througout the codebase
     numpy>=1.23.5,<=1.24.4
     pandas==1.5.3
     docker==6.1.3
-    kr8s==0.13.1
+    kr8s==0.13.5
     PyYAML==6.0.1
-    azure-storage-blob==12.19
+    azure-storage-blob==12.19.1
 
 install_requires =
     %(syft)s
@@ -94,11 +92,11 @@ dev =
     %(test_plugins)s
     %(telemetry)s
     bandit==1.7.7
-    ruff==0.1.6
+    ruff==0.3.0
     importlib-metadata==6.8.0
-    isort==5.12.0
+    isort==5.13.2
     mypy==1.7.1
-    pre-commit==3.5.0
+    pre-commit==3.6.2
     safety>=2.4.0b2
 
 telemetry =

packages/syft/src/syft/store/dict_document_store.py

@@ -92,7 +92,6 @@ class DictStoreConfig(StoreConfig):
                 * NoLockingConfig: no locking, ideal for single-thread stores.
                 * ThreadingLockingConfig: threading-based locking, ideal for same-process in-memory stores.
                 * FileLockingConfig: file based locking, ideal for same-device different-processes/threads stores.
-                * RedisLockingConfig: Redis-based locking, ideal for multi-device stores.
             Defaults to ThreadingLockingConfig.
     """
 

packages/syft/src/syft/store/document_store.py

@@ -775,7 +775,6 @@ class StoreConfig(SyftBaseObject):
                 * NoLockingConfig: no locking, ideal for single-thread stores.
                 * ThreadingLockingConfig: threading-based locking, ideal for same-process in-memory stores.
                 * FileLockingConfig: file based locking, ideal for same-device different-processes/threads stores.
-                * RedisLockingConfig: Redis-based locking, ideal for multi-device stores.
             Defaults to NoLockingConfig.
     """
 

packages/syft/src/syft/store/locks.py

@@ -9,16 +9,12 @@
 from typing import Callable
 from typing import Dict
 from typing import Optional
-from typing import Union
 import uuid
 
 # third party
 from pydantic import BaseModel
-import redis
-from redis.client import Redis
 from sherlock.lock import BaseLock
 from sherlock.lock import FileLock
-from sherlock.lock import RedisLock
 
 # relative
 from ..serde.serializable import serializable
@@ -76,22 +72,6 @@ class FileLockingConfig(LockingConfig):
     client_path: Optional[Path] = None
 
 
-@serializable()
-class RedisClientConfig(BaseModel):
-    host: str = "localhost"
-    port: int = 6379
-    db: int = 0
-    username: Optional[str] = None
-    password: Optional[str] = None
-
-
-@serializable()
-class RedisLockingConfig(LockingConfig):
-    """Redis locking policy"""
-
-    client: RedisClientConfig = RedisClientConfig()
-
-
 class ThreadingLock(BaseLock):
     """
     Threading-based Lock. Used to provide the same API as the rest of the locks.
@@ -343,18 +323,11 @@ def __init__(self, config: LockingConfig):
         elif isinstance(config, ThreadingLockingConfig):
             self._lock = ThreadingLock(**base_params)
         elif isinstance(config, FileLockingConfig):
-            client: Optional[Union[Path, Redis]] = config.client_path
+            client: Optional[Path] = config.client_path
             self._lock = PatchedFileLock(
                 **base_params,
                 client=client,
             )
-        elif isinstance(config, RedisLockingConfig):
-            client = redis.StrictRedis(**config.client.dict())
-
-            self._lock = RedisLock(
-                **base_params,
-                client=client,
-            )
         else:
             raise ValueError("Unsupported config type")
 

packages/syft/src/syft/store/mongo_document_store.py

@@ -864,7 +864,6 @@ class MongoStoreConfig(StoreConfig):
                 * NoLockingConfig: no locking, ideal for single-thread stores.
                 * ThreadingLockingConfig: threading-based locking, ideal for same-process in-memory stores.
                 * FileLockingConfig: file based locking, ideal for same-device different-processes/threads stores.
-                * RedisLockingConfig: Redis-based locking, ideal for multi-device stores.
             Defaults to NoLockingConfig.
     """
 

packages/syft/src/syft/store/sqlite_document_store.py

@@ -466,7 +466,6 @@ class SQLiteStoreConfig(StoreConfig):
                 * NoLockingConfig: no locking, ideal for single-thread stores.
                 * ThreadingLockingConfig: threading-based locking, ideal for same-process in-memory stores.
                 * FileLockingConfig: file based locking, ideal for same-device different-processes/threads stores.
-                * RedisLockingConfig: Redis-based locking, ideal for multi-device stores.
             Defaults to FileLockingConfig.
     """
 

packages/syft/tests/syft/locks_test.py

@@ -12,18 +12,14 @@
 from joblib import Parallel
 from joblib import delayed
 import pytest
-from pytest_mock_resources import create_redis_fixture
 
 # syft absolute
 from syft.store.locks import FileLockingConfig
 from syft.store.locks import LockingConfig
 from syft.store.locks import NoLockingConfig
-from syft.store.locks import RedisLockingConfig
 from syft.store.locks import SyftLock
 from syft.store.locks import ThreadingLockingConfig
 
-redis_server_mock = create_redis_fixture(scope="session")
-
 def_params = {
     "lock_name": "testing_lock",
     "expire": 5,  # seconds,
@@ -55,20 +51,12 @@ def locks_file_config():
     return FileLockingConfig(**def_params)
 
 
-@pytest.fixture(scope="function")
-def locks_redis_config(redis_server_mock):
-    def_params["lock_name"] = generate_lock_name()
-    redis_config = redis_server_mock.pmr_credentials.as_redis_kwargs()
-    return RedisLockingConfig(**def_params, client=redis_config)
-
-
 @pytest.mark.parametrize(
     "config",
     [
         pytest.lazy_fixture("locks_nop_config"),
         pytest.lazy_fixture("locks_threading_config"),
         pytest.lazy_fixture("locks_file_config"),
-        pytest.lazy_fixture("locks_redis_config"),
     ],
 )
 @pytest.mark.skipif(
@@ -106,7 +94,6 @@ def test_acquire_nop(config: LockingConfig):
     [
         pytest.lazy_fixture("locks_threading_config"),
         pytest.lazy_fixture("locks_file_config"),
-        pytest.lazy_fixture("locks_redis_config"),
     ],
 )
 @pytest.mark.skipif(
@@ -137,7 +124,6 @@ def test_acquire_release(config: LockingConfig):
     [
         pytest.lazy_fixture("locks_threading_config"),
         pytest.lazy_fixture("locks_file_config"),
-        pytest.lazy_fixture("locks_redis_config"),
     ],
 )
 @pytest.mark.skipif(
@@ -158,7 +144,6 @@ def test_acquire_release_with(config: LockingConfig):
     [
         pytest.lazy_fixture("locks_threading_config"),
         pytest.lazy_fixture("locks_file_config"),
-        pytest.lazy_fixture("locks_redis_config"),
     ],
 )
 @pytest.mark.skipif(
@@ -189,7 +174,6 @@ def test_acquire_expire(config: LockingConfig):
     [
         pytest.lazy_fixture("locks_threading_config"),
         pytest.lazy_fixture("locks_file_config"),
-        pytest.lazy_fixture("locks_redis_config"),
     ],
 )
 @pytest.mark.skipif(
@@ -216,7 +200,6 @@ def test_acquire_double_aqcuire_timeout_fail(config: LockingConfig):
     [
         pytest.lazy_fixture("locks_threading_config"),
         pytest.lazy_fixture("locks_file_config"),
-        pytest.lazy_fixture("locks_redis_config"),
     ],
 )
 @pytest.mark.skipif(
@@ -245,7 +228,6 @@ def test_acquire_double_aqcuire_timeout_ok(config: LockingConfig):
     [
         pytest.lazy_fixture("locks_threading_config"),
         pytest.lazy_fixture("locks_file_config"),
-        pytest.lazy_fixture("locks_redis_config"),
     ],
 )
 @pytest.mark.skipif(
@@ -274,7 +256,6 @@ def test_acquire_double_aqcuire_nonblocking(config: LockingConfig):
     [
         pytest.lazy_fixture("locks_threading_config"),
         pytest.lazy_fixture("locks_file_config"),
-        pytest.lazy_fixture("locks_redis_config"),
     ],
 )
 @pytest.mark.skipif(
@@ -304,7 +285,6 @@ def test_acquire_double_aqcuire_retry_interval(config: LockingConfig):
     [
         pytest.lazy_fixture("locks_threading_config"),
         pytest.lazy_fixture("locks_file_config"),
-        pytest.lazy_fixture("locks_redis_config"),
     ],
 )
 @pytest.mark.skipif(
@@ -325,7 +305,6 @@ def test_acquire_double_release(config: LockingConfig):
     [
         pytest.lazy_fixture("locks_threading_config"),
         pytest.lazy_fixture("locks_file_config"),
-        pytest.lazy_fixture("locks_redis_config"),
     ],
 )
 @pytest.mark.skipif(
@@ -351,7 +330,6 @@ def test_acquire_same_name_diff_namespace(config: LockingConfig):
     [
         pytest.lazy_fixture("locks_threading_config"),
         pytest.lazy_fixture("locks_file_config"),
-        pytest.lazy_fixture("locks_redis_config"),
     ],
 )
 @pytest.mark.skipif(
@@ -414,7 +392,6 @@ def _kv_cbk(tid: int) -> None:
     "config",
     [
         pytest.lazy_fixture("locks_file_config"),
-        pytest.lazy_fixture("locks_redis_config"),
     ],
 )
 @pytest.mark.skipif(