Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
15 changes: 15 additions & 0 deletions src/collections/config/types/generative.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,17 @@ export type GenerativeContextualAIConfig = {
avoidCommentary?: boolean;
};

export type GenerativeMetaConfig = {
baseURL?: string;
model?: string;
temperature?: number;
topP?: number;
maxTokens?: number;
frequencyPenalty?: number;
presencePenalty?: number;
reasoningEffort?: 'none' | 'minimal' | 'low' | 'medium' | 'high' | 'xhigh';
};

export type GenerativeConfig =
| GenerativeAnthropicConfig
| GenerativeAnyscaleConfig
Expand All @@ -125,6 +136,7 @@ export type GenerativeConfig =
| GenerativeDatabricksConfig
| GenerativeGoogleConfig
| GenerativeFriendliAIConfig
| GenerativeMetaConfig
| GenerativeMistralConfig
| GenerativeOllamaConfig
| GenerativeOpenAIConfig
Expand All @@ -151,6 +163,8 @@ export type GenerativeConfigType<G> = G extends 'generative-anthropic'
? GenerativeGoogleConfig
: G extends 'generative-friendliai'
? GenerativeFriendliAIConfig
: G extends 'generative-meta'
? GenerativeMetaConfig
: G extends 'generative-mistral'
? GenerativeMistralConfig
: G extends 'generative-ollama'
Expand Down Expand Up @@ -178,6 +192,7 @@ export type GenerativeSearch =
| 'generative-databricks'
| 'generative-google'
| 'generative-friendliai'
| 'generative-meta'
| 'generative-mistral'
| 'generative-ollama'
| 'generative-openai'
Expand Down
18 changes: 18 additions & 0 deletions src/collections/configure/generative.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
GenerativeDatabricksConfig,
GenerativeFriendliAIConfig,
GenerativeGoogleConfig,
GenerativeMetaConfig,
GenerativeMistralConfig,
GenerativeNvidiaConfig,
GenerativeOllamaConfig,
Expand All @@ -25,6 +26,7 @@ import {
GenerativeContextualAIConfigCreate,
GenerativeDatabricksConfigCreate,
GenerativeFriendliAIConfigCreate,
GenerativeMetaConfigCreate,
GenerativeMistralConfigCreate,
GenerativeNvidiaConfigCreate,
GenerativeOllamaConfigCreate,
Expand Down Expand Up @@ -184,6 +186,22 @@ export default {
config,
};
},
/**
* Create a `ModuleConfig<'generative-meta', GenerativeMetaConfig | undefined>` object for use when performing AI generation using the `generative-meta` module.
*
* See the [documentation](https://weaviate.io/developers/weaviate/model-providers/meta/generative) for detailed usage.
*
* @param {GenerativeMetaConfigCreate} [config] The configuration for the `generative-meta` module.
* @returns {ModuleConfig<'generative-meta', GenerativeMetaConfig | undefined>} The configuration object.
*/
meta(
config?: GenerativeMetaConfigCreate
): ModuleConfig<'generative-meta', GenerativeMetaConfig | undefined> {
return {
name: 'generative-meta',
config,
};
},
/**
* Create a `ModuleConfig<'generative-mistral', GenerativeMistralConfig | undefined>` object for use when performing AI generation using the `generative-mistral` module.
*
Expand Down
6 changes: 6 additions & 0 deletions src/collections/configure/types/generative.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
GenerativeAnyscaleConfig,
GenerativeDatabricksConfig,
GenerativeFriendliAIConfig,
GenerativeMetaConfig,
GenerativeMistralConfig,
GenerativeNvidiaConfig,
GenerativeOllamaConfig,
Expand Down Expand Up @@ -44,6 +45,8 @@ export type GenerativeDatabricksConfigCreate = GenerativeDatabricksConfig;

export type GenerativeFriendliAIConfigCreate = GenerativeFriendliAIConfig;

export type GenerativeMetaConfigCreate = GenerativeMetaConfig;

export type GenerativeMistralConfigCreate = GenerativeMistralConfig;

export type GenerativeNvidiaConfigCreate = GenerativeNvidiaConfig;
Expand Down Expand Up @@ -76,6 +79,7 @@ export type GenerativeConfigCreate =
| GenerativeContextualAIConfigCreate
| GenerativeDatabricksConfigCreate
| GenerativeFriendliAIConfigCreate
| GenerativeMetaConfigCreate
| GenerativeMistralConfigCreate
| GenerativeNvidiaConfigCreate
| GenerativeOllamaConfigCreate
Expand All @@ -99,6 +103,8 @@ export type GenerativeConfigCreateType<G> = G extends 'generative-anthropic'
? GenerativeDatabricksConfigCreate
: G extends 'generative-friendliai'
? GenerativeFriendliAIConfigCreate
: G extends 'generative-meta'
? GenerativeMetaConfigCreate
: G extends 'generative-mistral'
? GenerativeMistralConfigCreate
: G extends 'generative-nvidia'
Expand Down
35 changes: 35 additions & 0 deletions src/collections/configure/unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
GenerativeDatabricksConfig,
GenerativeFriendliAIConfig,
GenerativeGoogleConfig,
GenerativeMetaConfig,
GenerativeMistralConfig,
GenerativeOllamaConfig,
GenerativeOpenAIConfig,
Expand Down Expand Up @@ -2074,6 +2075,40 @@ describe('Unit testing of the generative factory class', () => {
});
});

it('should create the correct GenerativeMetaConfig type with required & default values', () => {
const config = configure.generative.meta();
expect(config).toEqual<ModuleConfig<'generative-meta', GenerativeMetaConfig | undefined>>({
name: 'generative-meta',
config: undefined,
});
});

it('should create the correct GenerativeMetaConfig type with all values', () => {
const config = configure.generative.meta({
baseURL: 'base-url',
model: 'muse-spark-1.2',
temperature: 0.5,
topP: 0.9,
maxTokens: 100,
frequencyPenalty: 0.1,
presencePenalty: 0.2,
reasoningEffort: 'medium',
});
expect(config).toEqual<ModuleConfig<'generative-meta', GenerativeMetaConfig | undefined>>({
name: 'generative-meta',
config: {
baseURL: 'base-url',
model: 'muse-spark-1.2',
temperature: 0.5,
topP: 0.9,
maxTokens: 100,
frequencyPenalty: 0.1,
presencePenalty: 0.2,
reasoningEffort: 'medium',
},
});
});

it('should create the correct GenerativeMistralConfig type with required & default values', () => {
const config = configure.generative.mistral();
expect(config).toEqual<ModuleConfig<'generative-mistral', GenerativeMistralConfig | undefined>>({
Expand Down
5 changes: 4 additions & 1 deletion src/collections/deserialize/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,10 @@ export class Deserialize {
objects: verbose
? reply.objects.map((obj) => {
return {
id: stringify(obj.uuid),
// stringify() throws on anything but a 16-byte uuid; the server
// can omit the uuid on a BatchDeleteObject, so guard it here
// instead of letting an opaque TypeError escape.
id: obj.uuid.length === 16 ? stringify(obj.uuid) : undefined,
successful: obj.successful,
error: obj.error,
};
Expand Down
30 changes: 30 additions & 0 deletions src/collections/deserialize/unit.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { v4 } from 'uuid';
import { describe, expect, it } from 'vitest';
import { BatchDeleteReply } from '../../proto/v1/batch_delete.js';
import { Deserialize } from './index.js';

describe('Unit testing of Deserialize.deleteMany', () => {
const baseReply = (uuid: Uint8Array): BatchDeleteReply => ({
took: 0,
failed: 0,
matches: 1,
successful: 1,
objects: [{ uuid, successful: true, error: '' }],
});

it('should stringify a well-formed 16-byte uuid', () => {
const id = v4();
const uuid = Uint8Array.from(Buffer.from(id.replace(/-/g, ''), 'hex'));

const result = Deserialize.deleteMany(baseReply(uuid), true);

expect(result.objects![0].id).toBe(id);
});

it('should return an undefined id instead of throwing when the server omits the uuid', () => {
const result = Deserialize.deleteMany(baseReply(new Uint8Array(0)), true);

expect(result.objects![0].id).toBeUndefined();
expect(result.objects![0].successful).toBe(true);
});
});
3 changes: 2 additions & 1 deletion src/collections/types/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ export type DataObject<T> = {
};

export type DeleteManyObject = {
id: string;
/** Undefined when the server returned no uuid for this object. */
id?: string;
successful: boolean;
error?: string;
};
Expand Down
2 changes: 1 addition & 1 deletion test/collections/journey.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ describe('Journey testing of the client using a WCD cluster', () => {
dateOfBirth: Date;
};

afterAll(() => client.collections.delete(collectionName));
afterAll(() => client?.collections.delete(collectionName));

beforeAll(async () => {
client = await weaviate.connectToWeaviateCloud(
Expand Down
Loading