Skip to content

Commit 737ab9e

Browse files
committed
Merge branch 'main' of https://github.com/weaviate/typescript-client into 20241127-update-docstring-for-alpha
2 parents 372171d + 369f09b commit 737ab9e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+11403
-3748
lines changed

.github/workflows/main.yaml

Lines changed: 43 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ on:
88

99
env:
1010
WEAVIATE_124: 1.24.26
11-
WEAVIATE_125: 1.25.25
12-
WEAVIATE_126: 1.26.10
13-
WEAVIATE_127: 1.27.3
11+
WEAVIATE_125: 1.25.30
12+
WEAVIATE_126: 1.26.14
13+
WEAVIATE_127: 1.27.11
14+
WEAVIATE_128: 1.28.4
15+
WEAVIATE_129: 1.29.0
1416

1517
jobs:
1618
checks:
@@ -27,7 +29,7 @@ jobs:
2729
npm run format:check
2830
npm run docs
2931
30-
tests:
32+
tests-without-auth:
3133
needs: checks
3234
runs-on: ubuntu-latest
3335
strategy:
@@ -37,9 +39,42 @@ jobs:
3739
{ node: "22.x", weaviate: $WEAVIATE_124},
3840
{ node: "22.x", weaviate: $WEAVIATE_125},
3941
{ node: "22.x", weaviate: $WEAVIATE_126},
40-
{ node: "18.x", weaviate: $WEAVIATE_127},
41-
{ node: "20.x", weaviate: $WEAVIATE_127},
42-
{ node: "22.x", weaviate: $WEAVIATE_127}
42+
{ node: "22.x", weaviate: $WEAVIATE_127},
43+
{ node: "22.x", weaviate: $WEAVIATE_128},
44+
{ node: "18.x", weaviate: $WEAVIATE_129},
45+
{ node: "20.x", weaviate: $WEAVIATE_129},
46+
{ node: "22.x", weaviate: $WEAVIATE_129}
47+
]
48+
steps:
49+
- uses: actions/checkout@v3
50+
- uses: actions/setup-node@v3
51+
with:
52+
node-version: ${{ matrix.versions.node }}
53+
- name: Login to Docker Hub
54+
if: ${{ !github.event.pull_request.head.repo.fork && github.triggering_actor != 'dependabot[bot]' }}
55+
uses: docker/login-action@v3
56+
with:
57+
username: ${{secrets.DOCKER_USERNAME}}
58+
password: ${{secrets.DOCKER_PASSWORD}}
59+
- name: "Install dependencies"
60+
run: |
61+
npm ci
62+
ci/run_dependencies.sh ${{ matrix.versions.weaviate }}
63+
- name: "Run tests without authentication tests"
64+
run: WEAVIATE_VERSION=${{ matrix.versions.weaviate }} npm test
65+
- name: "Transpile the package"
66+
run: npm run build
67+
- name: "Stop Weaviate"
68+
run: ci/stop_dependencies.sh ${{ matrix.versions.weaviate }}
69+
70+
tests-with-auth:
71+
needs: checks
72+
runs-on: ubuntu-latest
73+
strategy:
74+
fail-fast: false
75+
matrix:
76+
versions: [
77+
{ node: "22.x", weaviate: $WEAVIATE_129}
4378
]
4479
steps:
4580
- uses: actions/checkout@v3
@@ -64,16 +99,11 @@ jobs:
6499
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
65100
OKTA_CLIENT_SECRET: ${{ secrets.OKTA_CLIENT_SECRET }}
66101
run: WEAVIATE_VERSION=${{ matrix.versions.weaviate }} npm test
67-
- name: "Run tests without authentication tests (for forks)"
68-
if: ${{ github.event.pull_request.head.repo.fork }}
69-
run: WEAVIATE_VERSION=${{ matrix.versions.weaviate }} npm test
70-
- name: "Transpile the package"
71-
run: npm run build
72102
- name: "Stop Weaviate"
73103
run: ci/stop_dependencies.sh ${{ matrix.versions.weaviate }}
74104

75105
publish:
76-
needs: tests
106+
needs: [tests-with-auth, tests-without-auth]
77107
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
78108
runs-on: ubuntu-latest
79109
permissions:

ci/compose.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ function compose_down_all {
2121
}
2222

2323
function all_weaviate_ports {
24-
echo "8078 8080 8081 8082 8083 8085 8086 8087 8088 8089 8090"
24+
echo "8078 8080 8081 8082 8083 8085 8086 8087 8088 8089 8090 8091"
2525
}

ci/docker-compose-proxy.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,6 @@ services:
2626
AUTOSCHEMA_ENABLED: 'false'
2727
DISABLE_TELEMETRY: 'true'
2828
GRPC_PORT: 8021
29-
contextionary:
30-
environment:
31-
OCCURRENCE_WEIGHT_LINEAR_FACTOR: 0.75
32-
EXTENSIONS_STORAGE_MODE: weaviate
33-
EXTENSIONS_STORAGE_ORIGIN: http://weaviate-proxy:8020
34-
NEIGHBOR_OCCURRENCE_IGNORE_PERCENTILE: 5
35-
ENABLE_COMPOUND_SPLITTING: 'false'
36-
image: semitechnologies/contextionary:en0.16.0-v1.2.0
37-
ports:
38-
- 9999:9999
3929
proxy-http:
4030
image: envoyproxy/envoy:v1.29-latest
4131
command: envoy --config-path /etc/envoy/http.yaml

ci/docker-compose-rbac.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
version: '3.4'
3+
services:
4+
weaviate-rbac:
5+
command:
6+
- --host
7+
- 0.0.0.0
8+
- --port
9+
- '8085'
10+
- --scheme
11+
- http
12+
- --write-timeout=600s
13+
image: semitechnologies/weaviate:${WEAVIATE_VERSION}
14+
ports:
15+
- 8091:8085
16+
- 50062:50051
17+
restart: on-failure:0
18+
environment:
19+
ENABLE_MODULES: "generative-dummy,reranker-dummy"
20+
PERSISTENCE_DATA_PATH: "./data-weaviate-0"
21+
CLUSTER_IN_LOCALHOST: "true"
22+
CLUSTER_GOSSIP_BIND_PORT: "7100"
23+
CLUSTER_DATA_BIND_PORT: "7101"
24+
RAFT_BOOTSTRAP_EXPECT: "1"
25+
AUTHENTICATION_APIKEY_ENABLED: "true"
26+
AUTHENTICATION_APIKEY_ALLOWED_KEYS: 'viewer-key,editor-key,admin-key,custom-key'
27+
AUTHENTICATION_APIKEY_USERS: 'viewer-user,editor-user,admin-user,custom-user'
28+
AUTHORIZATION_RBAC_ENABLED: "true"
29+
AUTHORIZATION_ADMIN_USERS: "admin-user"
30+
AUTHORIZATION_VIEWER_USERS: "viewer-user"
31+
...

ci/docker-compose-wcs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ services:
1919
AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED: 'false'
2020
AUTHENTICATION_OIDC_ENABLED: 'true'
2121
AUTHENTICATION_OIDC_CLIENT_ID: 'wcs'
22-
AUTHENTICATION_OIDC_ISSUER: 'https://auth.wcs.api.semi.technology/auth/realms/SeMI'
22+
AUTHENTICATION_OIDC_ISSUER: 'https://auth.wcs.api.weaviate.io/auth/realms/SeMI'
2323
AUTHENTICATION_OIDC_USERNAME_CLAIM: 'email'
2424
AUTHENTICATION_OIDC_GROUPS_CLAIM: 'groups'
2525
AUTHORIZATION_ADMINLIST_ENABLED: 'true'
26-
AUTHORIZATION_ADMINLIST_USERS: '[email protected]'
26+
AUTHORIZATION_ADMINLIST_USERS: '[email protected]'
2727
AUTHENTICATION_OIDC_SCOPES: 'openid,email'
2828
AUTHENTICATION_APIKEY_ENABLED: 'true'
2929
AUTHENTICATION_APIKEY_ALLOWED_KEYS: 'my-secret-key'
30-
AUTHENTICATION_APIKEY_USERS: '[email protected]'
30+
AUTHENTICATION_APIKEY_USERS: '[email protected]'
3131
DISABLE_TELEMETRY: 'true'
3232
...

ci/docker-compose.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ services:
2121
AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED: 'true'
2222
PERSISTENCE_DATA_PATH: '/var/lib/weaviate'
2323
DEFAULT_VECTORIZER_MODULE: 'text2vec-contextionary'
24-
ENABLE_MODULES: text2vec-contextionary,backup-filesystem,img2vec-neural
24+
ENABLE_MODULES: text2vec-contextionary,backup-filesystem,generative-cohere,reranker-cohere
2525
BACKUP_FILESYSTEM_PATH: "/tmp/backups"
2626
CLUSTER_GOSSIP_BIND_PORT: "7100"
2727
CLUSTER_DATA_BIND_PORT: "7101"
@@ -39,6 +39,4 @@ services:
3939
image: semitechnologies/contextionary:en0.16.0-v1.2.0
4040
ports:
4141
- 9999:9999
42-
i2v-neural:
43-
image: semitechnologies/img2vec-pytorch:resnet50
4442
...

0 commit comments

Comments
 (0)