Fix other tests

_includes/code/python/howto.configure.rbac.permissions.py

@@ -1,4 +1,5 @@
 import weaviate
+from weaviate import WeaviateClient
 
 # START-ANY
 from weaviate.classes.rbac import Permissions
@@ -13,18 +14,18 @@
     auth_credentials=Auth.api_key("admin-key")
 )
 
-def reset_user(user: str):
+def reset_user(user: str, client: WeaviateClient):
     # Clean slate
-    current_roles = admin_client.roles.by_user(user)  # check if user exists
+    current_roles = client.roles.by_user(user)  # check if user exists
     for k in current_roles.keys():
-        admin_client.roles.revoke_from_user(role_names=k, user=user)  # revoke all roles
+        client.roles.revoke_from_user(role_names=k, user=user)  # revoke all roles
 
 # =================================================================
 # =============== EXAMPLE: READ + WRITE PERMISSIONS
 # =================================================================
 
 # Clean slate
-reset_user("other-user")
+reset_user("other-user", client=admin_client)
 admin_client.roles.delete("rw_role_target_collections")  # delete if exists
 
 # START ReadWritePermissionDefinition
@@ -66,7 +67,7 @@ def reset_user(user: str):
 # =================================================================
 
 # Clean slate
-reset_user("other-user")
+reset_user("other-user", client=admin_client)
 admin_client.roles.delete("viewer_role_target_collections")  # delete if exists
 
 # START ViewerPermissionDefinition

tests/docker-compose-anon-2.yml

@@ -18,7 +18,7 @@ services:
       AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED: 'true'
       PERSISTENCE_DATA_PATH: '/var/lib/weaviate'
       ASYNC_INDEXING: 'true'
-      ENABLE_MODULES: 'text2vec-ollama,generative-ollama,backup-filesystem,offload-s3'
+      ENABLE_MODULES: 'text2vec-ollama,generative-ollama,backup-filesystem'
       ENABLE_API_BASED_MODULES: 'true'
       BACKUP_FILESYSTEM_PATH: '/var/lib/weaviate/backups'
       CLUSTER_HOSTNAME: 'node1'

tests/docker-compose-anon-bind.yml

@@ -22,7 +22,7 @@ services:
       PERSISTENCE_DATA_PATH: '/var/lib/weaviate'
       BACKUP_FILESYSTEM_PATH: '/var/lib/weaviate/backups'
       ASYNC_INDEXING: 'true'
-      ENABLE_MODULES: 'multi2vec-bind,text2vec-ollama,generative-ollama,backup-filesystem,offload-s3'
+      ENABLE_MODULES: 'multi2vec-bind,text2vec-ollama,generative-ollama,backup-filesystem'
       ENABLE_API_BASED_MODULES: 'true'
       CLUSTER_HOSTNAME: 'node1'
   multi2vec-bind:

tests/docker-compose-anon-clip.yml

@@ -22,7 +22,7 @@ services:
       PERSISTENCE_DATA_PATH: '/var/lib/weaviate'
       BACKUP_FILESYSTEM_PATH: '/var/lib/weaviate/backups'
       ASYNC_INDEXING: 'true'
-      ENABLE_MODULES: 'multi2vec-clip,text2vec-ollama,generative-ollama,backup-filesystem,offload-s3'
+      ENABLE_MODULES: 'multi2vec-clip,text2vec-ollama,generative-ollama,backup-filesystem'
       ENABLE_API_BASED_MODULES: 'true'
       CLUSTER_HOSTNAME: 'node1'
   multi2vec-clip:

tests/docker-compose-anon-offload.yml

@@ -0,0 +1,28 @@
+---
+services:
+  weaviate_anon:
+    command:
+    - --host
+    - 0.0.0.0
+    - --port
+    - '8080'
+    - --scheme
+    - http
+    image: cr.weaviate.io/semitechnologies/weaviate:1.28.0
+    ports:
+    - 8080:8080
+    - 50051:50051
+    restart: on-failure:0
+    environment:
+      QUERY_DEFAULTS_LIMIT: 25
+      AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED: 'true'
+      PERSISTENCE_DATA_PATH: '/var/lib/weaviate'
+      ASYNC_INDEXING: 'true'
+      ENABLE_MODULES: 'text2vec-ollama,generative-ollama,backup-filesystem,offload-s3'
+      ENABLE_API_BASED_MODULES: 'true'
+      BACKUP_FILESYSTEM_PATH: '/var/lib/weaviate/backups'
+      OFFLOAD_S3_BUCKET_AUTO_CREATE: 'true'
+      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY:-}
+      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_KEY:-}
+      CLUSTER_HOSTNAME: 'node1'
+...

tests/docker-compose-anon.yml

@@ -18,8 +18,8 @@ services:
       AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED: 'true'
       PERSISTENCE_DATA_PATH: '/var/lib/weaviate'
       ASYNC_INDEXING: 'true'
-      ENABLE_MODULES: ''
+      ENABLE_MODULES: 'text2vec-ollama,generative-ollama,backup-filesystem'
       ENABLE_API_BASED_MODULES: 'true'
       BACKUP_FILESYSTEM_PATH: '/var/lib/weaviate/backups'
       CLUSTER_HOSTNAME: 'node1'
-...
+...

tests/docker-compose-three-nodes.yml

@@ -20,11 +20,8 @@ services:
       AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED: 'true'
       PERSISTENCE_DATA_PATH: '/var/lib/weaviate'
       ASYNC_INDEXING: 'true'
-      ENABLE_MODULES: 'text2vec-ollama,generative-ollama,backup-filesystem,offload-s3'
+      ENABLE_MODULES: 'text2vec-ollama,generative-ollama,backup-filesystem'
       ENABLE_API_BASED_MODULES: 'true'
-      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY:-}
-      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_KEY:-}
-      OFFLOAD_S3_BUCKET_AUTO_CREATE: 'true'
       BACKUP_FILESYSTEM_PATH: '/var/lib/weaviate/backups'
       CLUSTER_HOSTNAME: 'node1'
       CLUSTER_GOSSIP_BIND_PORT: '7100'
@@ -51,11 +48,8 @@ services:
       AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED: 'true'
       PERSISTENCE_DATA_PATH: '/var/lib/weaviate'
       ASYNC_INDEXING: 'true'
-      ENABLE_MODULES: 'text2vec-ollama,generative-ollama,backup-filesystem,offload-s3'
+      ENABLE_MODULES: 'text2vec-ollama,generative-ollama,backup-filesystem'
       ENABLE_API_BASED_MODULES: 'true'
-      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY:-}
-      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_KEY:-}
-      OFFLOAD_S3_BUCKET_AUTO_CREATE: 'true'
       BACKUP_FILESYSTEM_PATH: '/var/lib/weaviate/backups'
       CLUSTER_HOSTNAME: 'node2'
       CLUSTER_GOSSIP_BIND_PORT: '7102'
@@ -83,11 +77,8 @@ services:
       AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED: 'true'
       PERSISTENCE_DATA_PATH: '/var/lib/weaviate'
       ASYNC_INDEXING: 'true'
-      ENABLE_MODULES: 'text2vec-ollama,generative-ollama,backup-filesystem,offload-s3'
+      ENABLE_MODULES: 'text2vec-ollama,generative-ollama,backup-filesystem'
       ENABLE_API_BASED_MODULES: 'true'
-      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY:-}
-      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_KEY:-}
-      OFFLOAD_S3_BUCKET_AUTO_CREATE: 'true'
       BACKUP_FILESYSTEM_PATH: '/var/lib/weaviate/backups'
       CLUSTER_HOSTNAME: 'node3'
       CLUSTER_GOSSIP_BIND_PORT: '7104'