Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
12 changes: 7 additions & 5 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ 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_125: 1.25.34
WEAVIATE_126: 1.26.17
WEAVIATE_127: 1.27.14
WEAVIATE_128: 1.28.8
WEAVIATE_129: 1.29.0
WEAVIATE_130: 1.30.0-dev-680e323

jobs:
checks:
Expand Down Expand Up @@ -43,7 +44,8 @@ jobs:
{ 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: "22.x", weaviate: $WEAVIATE_130}
]
steps:
- uses: actions/checkout@v3
Expand Down
36 changes: 31 additions & 5 deletions src/collections/deserialize/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ import {
AggregateResult,
AggregateText,
AggregateType,
GenerativeConfigRuntime,
GenerativeMetadata,
PropertiesMetrics,
} from '../index.js';
import { referenceFromObjects } from '../references/utils.js';
Expand Down Expand Up @@ -207,19 +209,43 @@ export class Deserialize {
};
}

public generate<T>(reply: SearchReply): GenerativeReturn<T> {
public generate<T, C extends GenerativeConfigRuntime | undefined>(
reply: SearchReply
): GenerativeReturn<T, C> {
return {
objects: reply.results.map((result) => {
return {
generated: result.metadata?.generativePresent ? result.metadata?.generative : undefined,
generated: result.metadata?.generativePresent
? result.metadata?.generative
: result.generative
? result.generative.values[0].result
: undefined,
generative: result.generative
? {
text: result.generative.values[0].result,
debug: result.generative.values[0].debug,
metadata: result.generative.values[0].metadata as GenerativeMetadata<C>,
}
: undefined,
metadata: Deserialize.metadata(result.metadata),
properties: this.properties(result.properties),
references: this.references(result.properties),
uuid: Deserialize.uuid(result.metadata),
vectors: Deserialize.vectors(result.metadata),
} as any;
}),
generated: reply.generativeGroupedResult,
generated:
reply.generativeGroupedResult !== ''
? reply.generativeGroupedResult
: reply.generativeGroupedResults
? reply.generativeGroupedResults.values[0].result
: undefined,
generative: reply.generativeGroupedResults
? {
text: reply.generativeGroupedResults?.values[0].result,
metadata: reply.generativeGroupedResults?.values[0].metadata as GenerativeMetadata<C>,
}
: undefined,
};
}

Expand Down Expand Up @@ -252,9 +278,9 @@ export class Deserialize {
};
}

public generateGroupBy<T>(reply: SearchReply): GenerativeGroupByReturn<T> {
public generateGroupBy<T>(reply: SearchReply): GenerativeGroupByReturn<T, any> {
const objects: GroupByObject<T>[] = [];
const groups: Record<string, GenerativeGroupByResult<T>> = {};
const groups: Record<string, GenerativeGroupByResult<T, any>> = {};
reply.groupByResults.forEach((result) => {
const objs = result.objects.map((object) => {
return {
Expand Down
Loading
Loading