Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
140 commits
Select commit Hold shift + click to select a range
f206682
Add initial skeleton of API structure with pseudo-code test usage
tsmith023 Nov 4, 2024
ff8e7e6
Add implementation for RBAC REST requests and initial testing suite
tsmith023 Nov 5, 2024
f6c8a3e
Remove rbac compose file for now
tsmith023 Nov 5, 2024
9608586
Rename types.py to models.py
tsmith023 Nov 5, 2024
7ac4565
Fix import
tsmith023 Nov 5, 2024
3ffedb1
Actually skip nonfunctioning test
tsmith023 Nov 5, 2024
c276c85
Remove scratch test file
tsmith023 Nov 5, 2024
6998a98
Add back CI test that fails due to known issue
tsmith023 Nov 5, 2024
3f7ab4e
Reallign actions with new server impl
tsmith023 Nov 6, 2024
d239bfe
Update CI to use functional image
tsmith023 Nov 6, 2024
0af7fba
Merge branch 'main' of https://github.com/weaviate/weaviate-python-cl…
tsmith023 Nov 6, 2024
ed526c4
Change to correct ports for CI
tsmith023 Nov 6, 2024
37ab8fc
Update CI images
tsmith023 Nov 6, 2024
2e9b229
Skip rbac test if not supported
tsmith023 Nov 6, 2024
d99b520
Adapt role names plural
dirkkul Nov 7, 2024
abf3d8e
Refactor connection removing `level` from internal Permissions object
tsmith023 Nov 7, 2024
b822e94
Merge branch '1.28/add-support-for-rbac' of https://github.com/weavia…
tsmith023 Nov 7, 2024
51de75b
Use `/` instead of `;;` in collection-tenant resources string
tsmith023 Nov 7, 2024
aa25b17
Merge pull request #1397 from weaviate/rbac/reallign-with-new-server-api
dirkkul Nov 7, 2024
60d6829
Adapt to simplified rbac permissions
dirkkul Nov 7, 2024
0b90206
Merge pull request #1398 from weaviate/adapt_to_simplified_permissions
dirkkul Nov 7, 2024
002ea00
Adapt to changes in schema resources
dirkkul Nov 11, 2024
8a7b873
Merge pull request #1405 from weaviate/adapt_schema_changes
dirkkul Nov 13, 2024
16814ca
Move *_collection actions to Collection
dirkkul Nov 13, 2024
42dc0a9
Really fix test
dirkkul Nov 13, 2024
92fed33
Update CI image
dirkkul Nov 13, 2024
ce286d6
really really fix test
dirkkul Nov 13, 2024
506284f
Refactor actions for latest domains in backend, add further tests, up…
tsmith023 Nov 14, 2024
69b24bc
Merge pull request #1411 from weaviate/rbac_adapt_actions
tsmith023 Nov 14, 2024
f3efe5f
Remove `rbac/model.conf` file from CI
tsmith023 Nov 14, 2024
59bef5c
add manage users action
moogacs Nov 15, 2024
2ee484b
run black and add _UserPermission
moogacs Nov 15, 2024
0e89199
fix test
moogacs Nov 15, 2024
cba38ed
Merge pull request #1415 from weaviate/manage-users
moogacs Nov 15, 2024
3a5b8d6
Add exists role method.
jfrancoa Nov 18, 2024
13007de
Merge pull request #1417 from weaviate/jose/1.28/add-roles-exists
dirkkul Nov 18, 2024
536bbfd
Adapt enum names
dirkkul Nov 18, 2024
a35a6dd
Udpate CI
dirkkul Nov 18, 2024
88e2b32
Merge pull request #1420 from weaviate/adapt_action_names
dirkkul Nov 18, 2024
cfca88a
Refactor API surface for new nomenclature of permissions
tsmith023 Nov 19, 2024
b2f2e36
Refactor `from_weaviate_role` to account for new actions
tsmith023 Nov 19, 2024
8d69a42
Simplify metadata rules
dirkkul Nov 20, 2024
e1a07a8
Refactor `from_weaviate_role` to account for new actions
tsmith023 Nov 20, 2024
8c0f9bd
Merge branch 'rbac/support-add-remove-permissions' of https://github.…
tsmith023 Nov 20, 2024
7a95184
Add support for add/remove premissions
tsmith023 Nov 20, 2024
4f2f366
Correct typo for cluster attribute.
jfrancoa Nov 20, 2024
8538026
Update CI images
dirkkul Nov 21, 2024
b994ae2
remove paramter
dirkkul Nov 21, 2024
1d009f4
Remove more tenant things
dirkkul Nov 21, 2024
0e801eb
Merge pull request #1427 from weaviate/simplify_metadata
dirkkul Nov 21, 2024
5003a70
combine data actions
moogacs Nov 21, 2024
c2e8dcc
Hookup simplified objects action
dirkkul Nov 21, 2024
7ff8ba7
Merge branch '1.28/add-support-for-rbac' into rbac/support-add-remove…
dirkkul Nov 21, 2024
447b688
Merge pull request #1428 from weaviate/rbac/support-add-remove-permis…
dirkkul Nov 21, 2024
539e08c
Merge pull request #1430 from weaviate/combin-data-actions
tsmith023 Nov 21, 2024
5e88f87
Handle case that we cannot access all collections
dirkkul Nov 22, 2024
fe6528a
Simplify naming convention in API surface
tsmith023 Nov 22, 2024
84aa99d
Remove tenant filtering option from config and data perm factory methods
tsmith023 Nov 22, 2024
d991917
Merge pull request #1433 from weaviate/rbac/remove-tenant-filtering-o…
dirkkul Nov 22, 2024
22e8d1a
Merge pull request #1432 from weaviate/rbac/rename-perms-and-acts
tsmith023 Nov 22, 2024
53b07f3
Merge pull request #1431 from weaviate/fix_batching_rbac
dirkkul Nov 22, 2024
a4a3bc2
Merge branch 'main' into 1.28/add-support-for-rbac
dirkkul Nov 26, 2024
aa7388b
return dict instead of list for users and roles
dirkkul Nov 26, 2024
a749c3f
Add models for working with backups permissions
tsmith023 Nov 26, 2024
3aa1d16
Merge pull request #1438 from weaviate/rbac/add-backups-permission
tsmith023 Nov 26, 2024
a768b21
Fix docstring
dirkkul Nov 26, 2024
43e12ac
Merge pull request #1437 from weaviate/role_return
dirkkul Nov 26, 2024
b22dca3
Add support for getting own roles
dirkkul Nov 27, 2024
d5572d6
Add backup permissions to Roles and filter on collection.
jfrancoa Nov 27, 2024
9fc49ee
Merge pull request #1440 from weaviate/jose/add_backup_permissions_to…
tsmith023 Nov 28, 2024
f343984
Add support for permissions on `v1/nodes` endpoint
tsmith023 Nov 28, 2024
a1deabb
Merge pull request #1443 from weaviate/rbac/support-nodes-permissions
tsmith023 Nov 28, 2024
3e4893a
Replace schema/config by collections.
jfrancoa Dec 2, 2024
9487aa4
Replace schema/config by collections.
jfrancoa Dec 2, 2024
aa94e4c
Merge pull request #1448 from weaviate/jose/restructure-schema-permis…
jfrancoa Dec 3, 2024
f3bc256
testing
dirkkul Dec 3, 2024
b40b3db
Fix typing issues, move classes definitions around
tsmith023 Dec 3, 2024
4b53081
Merge branch '1.28/add-support-for-rbac' of https://github.com/weavia…
tsmith023 Dec 3, 2024
c942aa1
Allow lists of str for collection inputs
tsmith023 Dec 3, 2024
7be237d
Update CI image, fix test
tsmith023 Dec 3, 2024
209ceb8
Rename and multi collections
dirkkul Dec 4, 2024
0c62bda
Fix typing issues
dirkkul Dec 4, 2024
93f1a56
Make permission in role non optional
dirkkul Dec 4, 2024
7fe57d3
Remove copy of v3
dirkkul Dec 4, 2024
4766a39
Remove dependecies
dirkkul Dec 4, 2024
680185c
Move backup tests to normal integration test folder
dirkkul Dec 4, 2024
f24fe47
Readd removed package from setup.cfg
dirkkul Dec 4, 2024
18437ca
Fix failing tests
dirkkul Dec 4, 2024
c141eb9
Also run package tests with loadgroup
dirkkul Dec 4, 2024
b90a0e6
Merge pull request #1452 from weaviate/remove_v3
dirkkul Dec 4, 2024
364c1f0
Narrow `PermissionsCreateType`, fix typing of test
tsmith023 Dec 4, 2024
5d93093
Merge branch 'dev/1.28' of https://github.com/weaviate/weaviate-pytho…
tsmith023 Dec 4, 2024
e0f25c5
Merge branch '1.28/add-support-for-rbac' of https://github.com/weavia…
tsmith023 Dec 4, 2024
f7e4583
Merge pull request #1451 from weaviate/rework_ux
dirkkul Dec 4, 2024
086487a
Merge branch '1.28/add-support-for-rbac' into own_role_endpoint
dirkkul Dec 4, 2024
4ea6b6a
Fix path
dirkkul Dec 4, 2024
39bf6b1
Merge pull request #1439 from weaviate/own_role_endpoint
dirkkul Dec 4, 2024
460f29e
Update to protobuf 5
dirkkul Dec 4, 2024
1849e8b
Reggen with correct grcpio tools installed
dirkkul Dec 4, 2024
5696ee0
Update pydantic to be compatible with 3.13
dirkkul Dec 4, 2024
938bbf4
Update litestart for 3.13
dirkkul Dec 4, 2024
a1113bc
remove litestar dependency
dirkkul Dec 4, 2024
486e11b
Update pytest profiling
dirkkul Dec 4, 2024
2abdc6b
Remove v3 test coverage report
dirkkul Dec 4, 2024
1134a5b
Merge pull request #1453 from weaviate/update_grpcio_5
dirkkul Dec 4, 2024
34217a7
Merge pull request #1388 from weaviate/1.28/add-support-for-rbac
dirkkul Dec 4, 2024
0bf726c
Add `role.permissions` helper method, tidy export files for rbac classes
tsmith023 Dec 4, 2024
2b463fa
Merge branch 'main' of https://github.com/weaviate/weaviate-python-cl…
tsmith023 Dec 4, 2024
0721989
Fix bad assertion in test
tsmith023 Dec 4, 2024
2ae369f
Actually fix test, bump CI image to RC ver
tsmith023 Dec 4, 2024
c917c22
Merge pull request #1455 from weaviate/rbac/add-helper-method-to-role…
dirkkul Dec 5, 2024
12af700
Generate GRPC code with lowest version we support
dirkkul Dec 5, 2024
e978abb
Merge pull request #1458 from weaviate/generate_grpc_with_lower_version
dirkkul Dec 5, 2024
1aca00b
Rename `role -> role_name` everywhere, add custom exception to REST e…
tsmith023 Dec 5, 2024
bbed519
Fix failing tests
tsmith023 Dec 5, 2024
d3160f7
Merge pull request #1459 from weaviate/1.28/respond-to-rbac-surface-f…
tsmith023 Dec 5, 2024
d8c832a
Change inheritance of new exception to maintain BC
tsmith023 Dec 5, 2024
ca95702
Fix typing issues
tsmith023 Dec 5, 2024
75c9d82
Merge pull request #1460 from weaviate/1.28/refactor-insufficient-per…
tsmith023 Dec 6, 2024
e4b47a4
Rename methods in .roles for better UX
tsmith023 Dec 6, 2024
c785520
Fix incorrect naming of arg in assigned_users
tsmith023 Dec 6, 2024
512f9af
Merge pull request #1463 from weaviate/rbac/refactor-api-methods
tsmith023 Dec 6, 2024
2871ad9
Check status code of gRPC message to throw insuf perms err
tsmith023 Dec 6, 2024
3763f29
Fix incorrect arg name in `revoke` method
tsmith023 Dec 6, 2024
532112f
Replace "PERMISSION_DENIED" with const
tsmith023 Dec 6, 2024
d6645b6
Merge pull request #1464 from weaviate/1.28/raise-insufficient-perms-…
tsmith023 Dec 6, 2024
e19fd0f
Add exists to sync.pyi
jfrancoa Dec 9, 2024
92d3eeb
Merge pull request #1467 from weaviate/jose/add-exists-sync
dirkkul Dec 9, 2024
066d4f4
Rename assign/revoke
dirkkul Dec 9, 2024
79643ef
Merge pull request #1468 from weaviate/rbac_delete_revoke
dirkkul Dec 9, 2024
efc57c0
Add `.has_permission` method and test of its usage wth server image
tsmith023 Dec 5, 2024
8a0cd9f
Refactor logic for new endpoints implementation
tsmith023 Dec 10, 2024
31ceb82
Merge pull request #1457 from weaviate/1.28/support-has-permissions-e…
tsmith023 Dec 10, 2024
69319cd
Merge branch 'dev/1.28' of https://github.com/weaviate/weaviate-pytho…
tsmith023 Dec 10, 2024
957f932
Add test of remove permissions logic
tsmith023 Dec 10, 2024
d987ac8
Merge pull request #1469 from weaviate/rbac/refactor-add-remove-permi…
tsmith023 Dec 10, 2024
47ec90a
Remove manage_collection/data from factories
dirkkul Dec 10, 2024
0bcf78a
Rename role names
dirkkul Dec 10, 2024
9281646
Merge pull request #1470 from weaviate/remove_manage
dirkkul Dec 10, 2024
e11b2f4
Merge branch 'main' into dev/1.28
dirkkul Dec 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 20 additions & 84 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@ on:
pull_request:

env:
WEAVIATE_123: 1.23.16
WEAVIATE_124: 1.24.26
WEAVIATE_125: 1.25.24
WEAVIATE_126: 1.26.8
WEAVIATE_127: stable-v1.27-372397e

WEAVIATE_127: 1.27.1
WEAVIATE_128: 1.28.0-rc.0-09ea6b2
jobs:
lint-and-format:
name: Run Linter and Formatter
Expand Down Expand Up @@ -114,79 +112,21 @@ jobs:
name: coverage-report-integration-embedded
path: coverage-integration-embedded.xml

integration-tests-v3:
name: Run Integration Tests v3
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
versions: [
{ py: "3.9", weaviate: $WEAVIATE_126},
{ py: "3.10", weaviate: $WEAVIATE_126},
{ py: "3.11", weaviate: $WEAVIATE_123},
{ py: "3.11", weaviate: $WEAVIATE_124},
{ py: "3.11", weaviate: $WEAVIATE_125},
{ py: "3.11", weaviate: $WEAVIATE_126},
{ py: "3.12", weaviate: $WEAVIATE_127}
]
optional_dependencies: [false]
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.versions.py }}
cache: 'pip' # caching pip dependencies
- name: Login to Docker Hub
uses: docker/login-action@v3
if: ${{ !github.event.pull_request.head.repo.fork && github.triggering_actor != 'dependabot[bot]' }}
with:
username: ${{secrets.DOCKER_USERNAME}}
password: ${{secrets.DOCKER_PASSWORD}}
- run: |
pip install -r requirements-devel.txt
pip install .
- name: free space
run: sudo rm -rf /usr/local/lib/android
- name: start weaviate
run: /bin/bash ci/start_weaviate.sh ${{ matrix.versions.weaviate }}
- name: Run integration tests with auth secrets
if: ${{ !github.event.pull_request.head.repo.fork }}
env:
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
OKTA_CLIENT_SECRET: ${{ secrets.OKTA_CLIENT_SECRET }}
WCS_DUMMY_CI_PW: ${{ secrets.WCS_DUMMY_CI_PW }}
OKTA_DUMMY_CI_PW: ${{ secrets.OKTA_DUMMY_CI_PW }}
# OPENAI_APIKEY: ${{ secrets.OPENAI_APIKEY }} disabled until we have a working key
run: pytest -v --cov --cov-report=term-missing --cov=weaviate --cov-report xml:coverage-integration-v3.xml integration_v3
- name: Run integration tests without auth secrets (for forks)
if: ${{ github.event.pull_request.head.repo.fork }}
run: pytest -v --cov --cov-report=term-missing --cov=weaviate --cov-report xml:coverage-integration-v3.xml integration_v3
- name: Archive code coverage results
if: matrix.versions.py == '3.10' && (github.ref_name != 'main')
uses: actions/upload-artifact@v4
with:
name: coverage-report-integration-v3
path: coverage-integration-v3.xml
- name: stop weaviate
run: /bin/bash ci/stop_weaviate.sh ${{ matrix.versions.weaviate }}

integration-tests:
name: Run Integration Tests
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
versions: [
{ py: "3.9", weaviate: $WEAVIATE_126},
{ py: "3.10", weaviate: $WEAVIATE_126},
{ py: "3.11", weaviate: $WEAVIATE_123},
{ py: "3.11", weaviate: $WEAVIATE_124},
{ py: "3.9", weaviate: $WEAVIATE_128},
{ py: "3.10", weaviate: $WEAVIATE_128},
{ py: "3.11", weaviate: $WEAVIATE_125},
{ py: "3.11", weaviate: $WEAVIATE_126},
{ py: "3.12", weaviate: $WEAVIATE_127}
{ py: "3.11", weaviate: $WEAVIATE_127},
{ py: "3.11", weaviate: $WEAVIATE_128},
{ py: "3.12", weaviate: $WEAVIATE_128},
{ py: "3.13", weaviate: $WEAVIATE_128}
]
optional_dependencies: [false]
steps:
Expand Down Expand Up @@ -219,7 +159,7 @@ jobs:
WCS_DUMMY_CI_PW: ${{ secrets.WCS_DUMMY_CI_PW }}
OKTA_DUMMY_CI_PW: ${{ secrets.OKTA_DUMMY_CI_PW }}
# OPENAI_APIKEY: ${{ secrets.OPENAI_APIKEY }} disabled until we have a working key
run: pytest -n auto -v --cov --cov-report=term-missing --cov=weaviate --cov-report xml:coverage-integration.xml integration
run: pytest -n auto --dist loadgroup -v --cov --cov-report=term-missing --cov=weaviate --cov-report xml:coverage-integration.xml integration
- name: Run integration tests without auth secrets (for forks)
if: ${{ github.event.pull_request.head.repo.fork }}
run: pytest -v --cov --cov-report=term-missing --cov=weaviate --cov-report xml:coverage-integration.xml integration
Expand All @@ -239,10 +179,11 @@ jobs:
fail-fast: false
matrix:
versions: [
{ py: "3.9", weaviate: $WEAVIATE_125},
{ py: "3.10", weaviate: $WEAVIATE_125},
{ py: "3.11", weaviate: $WEAVIATE_125},
{ py: "3.12", weaviate: $WEAVIATE_125}
{ py: "3.9", weaviate: $WEAVIATE_128},
{ py: "3.10", weaviate: $WEAVIATE_128},
{ py: "3.11", weaviate: $WEAVIATE_128},
{ py: "3.12", weaviate: $WEAVIATE_128},
{ py: "3.13", weaviate: $WEAVIATE_128}
]
optional_dependencies: [false]
steps:
Expand All @@ -269,7 +210,7 @@ jobs:
run: /bin/bash ci/stop_weaviate.sh ${{ matrix.versions.weaviate }}

Codecov:
needs: [Unit-Tests, Integration-Tests, Integration-Tests-v3]
needs: [Unit-Tests, Integration-Tests]
runs-on: ubuntu-latest
if: github.ref_name != 'main'
steps:
Expand All @@ -286,10 +227,6 @@ jobs:
uses: actions/download-artifact@v4
with:
name: coverage-report-integration
- name: Download coverage integration v3
uses: actions/download-artifact@v4
with:
name: coverage-report-integration-v3
- name: Download coverage integration embedded
uses: actions/download-artifact@v4
with:
Expand All @@ -298,7 +235,7 @@ jobs:
uses: codecov/codecov-action@v4
with:
fail_ci_if_error: true
files: ./coverage-integration.xml, ./coverage-integration-v3.xml, ./coverage-integration-embedded.xml, ./coverage-test.xml, ./coverage-mock_tests.xml
files: ./coverage-integration.xml, ./coverage-integration-embedded.xml, ./coverage-test.xml, ./coverage-mock_tests.xml
verbose: true
token: ${{ secrets.CODECOV_TOKEN }}

Expand Down Expand Up @@ -334,11 +271,10 @@ jobs:
fail-fast: false
matrix:
server: [
$WEAVIATE_123,
$WEAVIATE_124,
$WEAVIATE_125,
$WEAVIATE_126,
$WEAVIATE_127
$WEAVIATE_127,
$WEAVIATE_128
]
steps:
- name: Checkout
Expand Down Expand Up @@ -370,7 +306,7 @@ jobs:
OKTA_CLIENT_SECRET: ${{ secrets.OKTA_CLIENT_SECRET }}
WCS_DUMMY_CI_PW: ${{ secrets.WCS_DUMMY_CI_PW }}
OKTA_DUMMY_CI_PW: ${{ secrets.OKTA_DUMMY_CI_PW }}
run: pytest -v -n auto integration
run: pytest -v -n auto --dist loadgroup integration
- name: Run integration tests without auth secrets (for forks)
if: ${{ github.event.pull_request.head.repo.fork }}
run: pytest -v -n auto integration
Expand Down Expand Up @@ -417,4 +353,4 @@ jobs:
with:
generate_release_notes: true
draft: true
files: dist/*.whl
files: dist/*.whl
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/myint/autoflake
rev: v1.4
rev: v2.2.1 # autoflake v2.2.1 is the latest version that supports Python 3.12
hooks:
- id: autoflake
args: [--in-place, --remove-all-unused-imports, --exclude=weaviate/proto/*]
Expand All @@ -36,13 +36,13 @@ repos:
]
files: '^weaviate/collections'

- repo: local
hooks:
- repo: local
hooks:
- id: mypy
name: mypy
entry: ./run-mypy.sh
language: python
language_version: "3.11"
language_version: "3.12"
# use require_serial so that script
# is only called once per commit
require_serial: true
Expand Down
2 changes: 1 addition & 1 deletion ci/compose.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function compose_down_all {
}

function all_weaviate_ports {
echo "8090 8081 8087 8088 8089 8086 8082 8083 8075 8079 8085 8080" # in alphabetic order of appearance in docker-compose files
echo "8090 8081 8087 8088 8089 8086 8082 8083 8075 8079 8092 8085 8080" # in alphabetic order of appearance in docker-compose files
}

function wait(){
Expand Down
30 changes: 30 additions & 0 deletions ci/docker-compose-rbac.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
version: '3.4'
services:
weaviate-rbac:
command:
- --host
- 0.0.0.0
- --port
- '8085'
- --scheme
- http
- --write-timeout=600s
image: semitechnologies/weaviate:${WEAVIATE_VERSION}
ports:
- 8092:8085
- "50063:50051"
restart: on-failure:0
environment:
ENABLE_MODULES: "generative-dummy,reranker-dummy"
AUTHENTICATION_APIKEY_ENABLED: "true"
AUTHENTICATION_APIKEY_ALLOWED_KEYS: "existing-key"
AUTHENTICATION_APIKEY_USERS: "existing-user"
AUTHORIZATION_ADMIN_USERS: "existing-user"
PERSISTENCE_DATA_PATH: "./data-weaviate-0"
CLUSTER_IN_LOCALHOST: "true"
CLUSTER_GOSSIP_BIND_PORT: "7100"
CLUSTER_DATA_BIND_PORT: "7101"
RAFT_BOOTSTRAP_EXPECT: "1"
AUTHORIZATION_ENABLE_RBAC: "true"
...
3 changes: 3 additions & 0 deletions integration/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ def __call__(
self,
headers: Optional[Dict[str, str]] = None,
ports: Tuple[int, int] = (8080, 50051),
auth_credentials: Optional[weaviate.auth.AuthCredentials] = None,
) -> weaviate.WeaviateClient:
"""Typing for fixture."""
...
Expand All @@ -82,6 +83,7 @@ def client_factory() -> Generator[ClientFactory, None, None]:
def _factory(
headers: Optional[Dict[str, str]] = None,
ports: Tuple[int, int] = (8080, 50051),
auth_credentials: Optional[weaviate.auth.AuthCredentials] = None,
) -> weaviate.WeaviateClient:
nonlocal client_fixture
if client_fixture is None:
Expand All @@ -90,6 +92,7 @@ def _factory(
grpc_port=ports[1],
port=ports[0],
additional_config=AdditionalConfig(timeout=(60, 120)), # for image tests
auth_credentials=auth_credentials,
)
return client_fixture

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
BackupFailedException,
)

pytestmark = pytest.mark.xdist_group(name="backup")

BACKEND = BackupStorage.FILESYSTEM

PARAGRAPHS_IDS = [
Expand Down
Loading
Loading