Skip to content

Commit 21f7e6f

Browse files
cdxkerskeptrunedev
authored andcommitted
bugfix: make fetch override opt-in only via prop
1 parent d67ae20 commit 21f7e6f

6 files changed

Lines changed: 26 additions & 13 deletions

File tree

clients/search-component/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ declare module "solid-js" {
113113
| initialAiMessage | string (example: "<p>Hi! How can I help</p>") | null |
114114
| ignoreEventListeners | boolean | false |
115115
| hideOverlay | boolean | false |
116+
| overrideFetch | boolean | false |
117+
116118

117119
### Search Results
118120

clients/search-component/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"react-snap-carousel": "^0.5.0",
8686
"remark-gfm": "^4.0.1",
8787
"tailwind-merge": "^3.0.2",
88-
"trieve-ts-sdk": "^0.0.100"
88+
"trieve-ts-sdk": "^0.0.102"
8989
},
9090
"peerDependencies": {
9191
"react": "^18.3.1 || ^19.0.0-rc",

clients/search-component/src/utils/hooks/chat-context.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {
55
useModalState,
66
} from "./modal-context";
77
import { Chunk } from "../types";
8-
import { getFingerprint } from "@thumbmarkjs/thumbmarkjs";
98
import { useEffect } from "react";
109
import { trackViews } from "../trieve";
1110
import {
@@ -722,7 +721,7 @@ function ChatProvider({ children }: { children: React.ReactNode }) {
722721
filters: filtersWithoutGroupIds,
723722
page_size: 10,
724723
group_id: curGroup.id,
725-
user_id: await getFingerprint(),
724+
user_id: fingerprint,
726725
},
727726
searchAbortController.current.signal,
728727
);
@@ -749,7 +748,7 @@ function ChatProvider({ children }: { children: React.ReactNode }) {
749748
filters: filters,
750749
page_size: 20,
751750
group_size: 1,
752-
user_id: await getFingerprint(),
751+
user_id: fingerprint,
753752
},
754753
searchAbortController.current.signal,
755754
);
@@ -917,9 +916,11 @@ function ChatProvider({ children }: { children: React.ReactNode }) {
917916
: "OpenAI is down unfortunately. Please try again later.",
918917
);
919918
},
920-
imageUrl || curAudioBase64 ? 20000 : 10000,
919+
imageUrl || curAudioBase64 ? 20000 : 1000000,
921920
);
922921
try {
922+
// wait 5 seconds
923+
await new Promise((resolve) => setTimeout(resolve, 1000));
923924
const createMessageResp =
924925
await trieveSDK.createMessageReaderWithQueryId(
925926
{
@@ -934,7 +935,7 @@ function ChatProvider({ children }: { children: React.ReactNode }) {
934935
completion_first: false,
935936
},
936937
concat_user_messages_query: true,
937-
user_id: await getFingerprint(),
938+
user_id: fingerprint,
938939
page_size: props.searchOptions?.page_size ?? (curGroup ? 10 : 8),
939940
score_threshold: props.searchOptions?.score_threshold || null,
940941
use_group_search: props.useGroupSearch,
@@ -957,6 +958,7 @@ function ChatProvider({ children }: { children: React.ReactNode }) {
957958
transcribedQuery = headers["x-tr-query"];
958959
}
959960
},
961+
props.overrideFetch ?? false
960962
);
961963
reader = createMessageResp.reader;
962964
queryId = createMessageResp.queryId;

clients/search-component/src/utils/hooks/modal-context.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ export type ModalProps = {
192192
};
193193
usePortal?: boolean;
194194
previewTopicId?: string;
195+
overrideFetch?: boolean;
195196
};
196197

197198
const defaultProps = {

clients/ts-sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"files": [
1818
"dist"
1919
],
20-
"version": "0.0.100",
20+
"version": "0.0.102",
2121
"license": "MIT",
2222
"scripts": {
2323
"lint": "eslint 'src/**/*.ts'",

clients/ts-sdk/src/functions/message/index.ts

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,18 @@ export async function createMessageReader(
7373
this: TrieveSDK,
7474
data: CreateMessageReqPayload,
7575
signal?: AbortSignal,
76-
parseHeaders?: (headers: Record<string, string>) => void
76+
parseHeaders?: (headers: Record<string, string>) => void,
77+
overrideFetch: boolean = false
7778
) {
7879
if (!this.datasetId) {
7980
throw new Error("datasetId is required");
8081
}
8182

82-
const cleanFetch = getCleanFetch();
83-
const fetchToUse = cleanFetch ?? fetch;
83+
let fetchToUse = fetch;
84+
if (overrideFetch) {
85+
const cleanFetch = getCleanFetch();
86+
fetchToUse = cleanFetch ?? fetch;
87+
}
8488

8589
const response = await fetchToUse(this.trieve.baseUrl + "/api/message", {
8690
method: "post",
@@ -122,14 +126,18 @@ export async function createMessageReaderWithQueryId(
122126
this: TrieveSDK,
123127
data: CreateMessageReqPayload,
124128
signal?: AbortSignal,
125-
parseHeaders?: (headers: Record<string, string>) => void
129+
parseHeaders?: (headers: Record<string, string>) => void,
130+
overrideFetch: boolean = false,
126131
) {
127132
if (!this.datasetId) {
128133
throw new Error("datasetId is required");
129134
}
130135

131-
const cleanFetch = getCleanFetch();
132-
const fetchToUse = cleanFetch ?? fetch;
136+
let fetchToUse = fetch;
137+
if (overrideFetch) {
138+
const cleanFetch = getCleanFetch();
139+
fetchToUse = cleanFetch ?? fetch;
140+
}
133141

134142
const response = await fetchToUse(this.trieve.baseUrl + "/api/message", {
135143
method: "post",

0 commit comments

Comments
 (0)