Spaces:
Running
Running
fix(assistants): remove websearch from assistant tool options, add websearch in backend logic (#1465)
Browse files
src/lib/server/textGeneration/tools.ts
CHANGED
@@ -32,9 +32,14 @@ export async function getTools(
|
|
32 |
if (assistant) {
|
33 |
if (assistant?.tools?.length) {
|
34 |
preferences = assistant.tools;
|
35 |
-
|
36 |
-
|
|
|
|
|
37 |
} else {
|
|
|
|
|
|
|
38 |
return [directlyAnswer];
|
39 |
}
|
40 |
}
|
|
|
32 |
if (assistant) {
|
33 |
if (assistant?.tools?.length) {
|
34 |
preferences = assistant.tools;
|
35 |
+
|
36 |
+
if (assistantHasWebSearch(assistant)) {
|
37 |
+
preferences.push(websearch._id.toString());
|
38 |
+
}
|
39 |
} else {
|
40 |
+
if (assistantHasWebSearch(assistant)) {
|
41 |
+
return [websearch, directlyAnswer];
|
42 |
+
}
|
43 |
return [directlyAnswer];
|
44 |
}
|
45 |
}
|
src/routes/api/tools/search/+server.ts
CHANGED
@@ -33,6 +33,7 @@ export async function GET({ url, locals }) {
|
|
33 |
|
34 |
const matchingConfigTools = toolFromConfigs
|
35 |
.filter((tool) => !tool?.isHidden)
|
|
|
36 |
.filter((tool) => {
|
37 |
if (queryTokens) {
|
38 |
return generateSearchTokens(tool.displayName).some((token) =>
|
|
|
33 |
|
34 |
const matchingConfigTools = toolFromConfigs
|
35 |
.filter((tool) => !tool?.isHidden)
|
36 |
+
.filter((tool) => tool.name !== "websearch") // filter out websearch tool from config tools since its added separately
|
37 |
.filter((tool) => {
|
38 |
if (queryTokens) {
|
39 |
return generateSearchTokens(tool.displayName).some((token) =>
|