Merge branch '1.29/colbert-multivector-support' of https://github.com/weaviate/typescript-client into 1.29/map-include-vector-to-return-vector-generic

Author: tsmith023

.github/workflows/main.yaml

@@ -8,11 +8,16 @@ on:
 
 env:
   WEAVIATE_124: 1.24.26
-  WEAVIATE_125: 1.25.30
-  WEAVIATE_126: 1.26.14
-  WEAVIATE_127: 1.27.11
-  WEAVIATE_128: 1.28.4
-  WEAVIATE_129: 1.29.0-rc.1
+  WEAVIATE_125: 1.25.34
+  WEAVIATE_126: 1.26.17
+  WEAVIATE_127: 1.27.15
+  WEAVIATE_128: 1.28.11
+  WEAVIATE_129: 1.29.1
+  WEAVIATE_130: 1.30.0-rc.0-6b9a01c
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   checks:
@@ -29,7 +34,7 @@ jobs:
         npm run format:check
         npm run docs
 
-  tests:
+  tests-without-auth:
     needs: checks
     runs-on: ubuntu-latest
     strategy:
@@ -41,9 +46,41 @@ jobs:
           { node: "22.x", weaviate: $WEAVIATE_126},
           { node: "22.x", weaviate: $WEAVIATE_127},
           { node: "22.x", weaviate: $WEAVIATE_128},
-          { node: "18.x", weaviate: $WEAVIATE_129},
-          { node: "20.x", weaviate: $WEAVIATE_129},
-          { node: "22.x", weaviate: $WEAVIATE_129}
+          { node: "22.x", weaviate: $WEAVIATE_129},
+          { node: "18.x", weaviate: $WEAVIATE_130},
+          { node: "20.x", weaviate: $WEAVIATE_130},
+          { node: "22.x", weaviate: $WEAVIATE_130}
+        ]
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.versions.node }}
+    - name: Login to Docker Hub
+      if: ${{ !github.event.pull_request.head.repo.fork && github.triggering_actor != 'dependabot[bot]' }}
+      uses: docker/login-action@v3
+      with:
+        username: ${{secrets.DOCKER_USERNAME}}
+        password: ${{secrets.DOCKER_PASSWORD}}
+    - name: "Install dependencies"
+      run: |
+        npm ci
+        ci/run_dependencies.sh ${{ matrix.versions.weaviate }}
+    - name: "Run tests without authentication tests"
+      run: WEAVIATE_VERSION=${{ matrix.versions.weaviate }} npm test
+    - name: "Transpile the package"
+      run: npm run build
+    - name: "Stop Weaviate"
+      run: ci/stop_dependencies.sh ${{ matrix.versions.weaviate }}
+
+  tests-with-auth:
+    needs: checks
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        versions: [
+          { node: "22.x", weaviate: $WEAVIATE_130}
         ]
     steps:
     - uses: actions/checkout@v3
@@ -68,16 +105,11 @@ jobs:
         AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
         OKTA_CLIENT_SECRET: ${{ secrets.OKTA_CLIENT_SECRET }}
       run: WEAVIATE_VERSION=${{ matrix.versions.weaviate }} npm test
-    - name: "Run tests without authentication tests (for forks)"
-      if: ${{ github.event.pull_request.head.repo.fork }}
-      run: WEAVIATE_VERSION=${{ matrix.versions.weaviate }} npm test
-    - name: "Transpile the package"
-      run: npm run build
     - name: "Stop Weaviate"
       run: ci/stop_dependencies.sh ${{ matrix.versions.weaviate }}
 
   publish:
-    needs: tests
+    needs: [tests-with-auth, tests-without-auth]
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
     runs-on: ubuntu-latest
     permissions:
@@ -107,4 +139,4 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           generate_release_notes: true
-          draft: true
+          draft: true

ci/compose.sh

@@ -28,4 +28,10 @@ services:
       AUTHORIZATION_RBAC_ENABLED: "true"
       AUTHORIZATION_ADMIN_USERS: "admin-user"
       AUTHORIZATION_VIEWER_USERS: "viewer-user"
+      AUTHENTICATION_DB_USERS_ENABLED: "true"
+      AUTHENTICATION_OIDC_ENABLED: "true"
+      AUTHENTICATION_OIDC_CLIENT_ID: "wcs"
+      AUTHENTICATION_OIDC_ISSUER: "https://auth.wcs.api.weaviate.io/auth/realms/SeMI"
+      AUTHENTICATION_OIDC_USERNAME_CLAIM: "email"
+      AUTHENTICATION_OIDC_GROUPS_CLAIM: "groups"
 ...

ci/docker-compose-rbac.yml

@@ -23,10 +23,10 @@ services:
       AUTHENTICATION_OIDC_USERNAME_CLAIM: 'email'
       AUTHENTICATION_OIDC_GROUPS_CLAIM: 'groups'
       AUTHORIZATION_ADMINLIST_ENABLED: 'true'
-      AUTHORIZATION_ADMINLIST_USERS: '[email protected]'
+      AUTHORIZATION_ADMINLIST_USERS: '[email protected]'
       AUTHENTICATION_OIDC_SCOPES: 'openid,email'
       AUTHENTICATION_APIKEY_ENABLED: 'true'
       AUTHENTICATION_APIKEY_ALLOWED_KEYS: 'my-secret-key'
-      AUTHENTICATION_APIKEY_USERS: '[email protected]'
+      AUTHENTICATION_APIKEY_USERS: '[email protected]'
       DISABLE_TELEMETRY: 'true'
 ...

ci/docker-compose-wcs.yml

@@ -1,6 +1,6 @@
 {
   "name": "weaviate-client",
-  "version": "3.3.6",
+  "version": "3.5.1",
   "description": "JS/TS client for Weaviate",
   "main": "dist/node/cjs/index.js",
   "type": "module",
@@ -52,11 +52,11 @@
   "homepage": "https://github.com/weaviate/typescript-client#readme",
   "dependencies": {
     "abort-controller-x": "^0.4.3",
-    "graphql": "^16.9.0",
+    "graphql": "^16.10.0",
     "graphql-request": "^6.1.0",
-    "long": "^5.2.3",
-    "nice-grpc": "^2.1.10",
-    "nice-grpc-client-middleware-retry": "^3.1.9",
+    "long": "^5.2.4",
+    "nice-grpc": "^2.1.11",
+    "nice-grpc-client-middleware-retry": "^3.1.10",
     "nice-grpc-common": "^2.0.2",
     "uuid": "^9.0.1"
   },

package-lock.json

@@ -39,7 +39,7 @@ describe('Testing of the collection.aggregate methods', () => {
 
   beforeAll(async () => {
     client = await weaviate.connectToLocal();
-    collection = client.collections.get(collectionName);
+    collection = client.collections.use(collectionName);
     return client.collections
       .create({
         name: collectionName,
@@ -168,7 +168,7 @@ describe('Testing of the collection.aggregate methods', () => {
   });
 
   it('should aggregate data without a search and one non-generic property metric', async () => {
-    const result = await (await client).collections.get(collectionName).aggregate.overAll({
+    const result = await (await client).collections.use(collectionName).aggregate.overAll({
       returnMetrics: collection.metrics
         .aggregate('text')
         .text(['count', 'topOccurrencesOccurs', 'topOccurrencesValue']),
@@ -307,7 +307,7 @@ describe('Testing of the collection.aggregate methods with named vectors', () =>
 
   beforeAll(async () => {
     client = await weaviate.connectToLocal();
-    collection = client.collections.get(collectionName);
+    collection = client.collections.use(collectionName);
     const query = () =>
       client.collections.create<TestCollectionAggregateVectors>({
         name: collectionName,
@@ -355,7 +355,7 @@ describe('Testing of collection.aggregate.overAll with a multi-tenancy collectio
 
   beforeAll(async () => {
     client = await weaviate.connectToLocal();
-    collection = client.collections.get(collectionName);
+    collection = client.collections.use(collectionName);
     return client.collections
       .create({
         name: collectionName,
@@ -407,7 +407,7 @@ describe('Testing of collection.aggregate search methods', () => {
 
   beforeAll(async () => {
     client = await weaviate.connectToLocal();
-    collection = client.collections.get(collectionName);
+    collection = client.collections.use(collectionName);
     return client.collections
       .create({
         name: collectionName,

package.json

@@ -11,7 +11,7 @@ describe('Integration testing of backups', () => {
     grpcPort: 50061,
   });
 
-  const getCollection = (client: WeaviateClient) => client.collections.get('TestBackupCollection');
+  const getCollection = (client: WeaviateClient) => client.collections.use('TestBackupCollection');
 
   beforeAll(() =>
     clientPromise.then((client) =>

src/collections/aggregate/integration.test.ts

@@ -109,8 +109,8 @@ describe('Mock testing of backup cancellation', () => {
   let mock: CancelMock;
 
   beforeAll(async () => {
-    mock = await CancelMock.use('1.27.0', 8958, 8959);
-    client = await weaviate.connectToLocal({ port: 8958, grpcPort: 8959 });
+    mock = await CancelMock.use('1.27.0', 8912, 8913);
+    client = await weaviate.connectToLocal({ port: 8912, grpcPort: 8913 });
   });
 
   it('should throw while waiting for creation if backup is cancelled in the meantime', async () => {
@@ -133,7 +133,7 @@ describe('Mock testing of backup cancellation', () => {
   });
 
   it('should return false if creation backup does not exist', async () => {
-    const success = await client.backup.cancel({ backupId: `${BACKUP_ID}4`, backend: BACKEND });
+    const success = await client.backup.cancel({ backupId: `${BACKUP_ID}-unknown`, backend: BACKEND });
     expect(success).toBe(false);
   });
 

src/collections/backup/integration.test.ts

@@ -583,7 +583,7 @@ describe('Testing of the collection.config namespace', () => {
         vectorizer: 'none',
       })
       .do();
-    const collection = client.collections.get(collectionName);
+    const collection = client.collections.use(collectionName);
     const config = await collection.config
       .update({
         vectorizers: weaviate.reconfigure.vectorizer.update({
@@ -635,7 +635,7 @@ describe('Testing of the collection.config namespace', () => {
       return;
     }
     const collectionName = 'TestCollectionConfigUpdateGenerative';
-    const collection = client.collections.get(collectionName);
+    const collection = client.collections.use(collectionName);
     await client.collections.create({
       name: collectionName,
       vectorizers: weaviate.configure.vectorizer.none(),