Merge branch 'staging' into reasoning-parsing-streaming

e5e2c9fe490a74e2d996980ed57338e19cabdb85

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: 994d69508b9aff6fc0e25b67f3c445a0a08a9ad4 580856064e05faeb7375eb2b95a63648aea0d028
2 files changed, +67 -73Showing whitespace changes
public/scripts/extensions/vectors/index.js+56 -62
@@ -746,74 +746,65 @@ async function getQueryText(chat, initiator) {
746746}
747747
748748/**
749749 * Gets thecommon savedbody hashesparameters for avector collectionrequests.
750750 * @paramreturns {stringobject} collectionId
751-* @returns {Promise<number[]>} Saved hashes
752751 */
753752async function getSavedHashesgetVectorsRequestBody(collectionId) {
754- const response = await fetch('/api/vector/list', {
753+ const body = {};
755- method: 'POST',
756- headers: getVectorHeaders(),
757- body: JSON.stringify({
758- collectionId: collectionId,
759- source: settings.source,
760- }),
761- });
762-
763- if (!response.ok) {
764- throw new Error(`Failed to get saved hashes for collection ${collectionId}`);
765- }
766-
767- const hashes = await response.json();
768- return hashes;
769-}
770-
771-function getVectorHeaders() {
772- const headers = getRequestHeaders();
773754 switch (settings.source) {
774755 case 'extras':
775- Object.assign(headers, {
756+ body.extrasUrl = extension_settings.apiUrl;
776- 'X-Extras-Url': extension_settings.apiUrl,
757+ body.extrasKey = extension_settings.apiKey;
777- 'X-Extras-Key': extension_settings.apiKey,
778- });
779758 break;
780759 case 'togetherai':
781- Object.assign(headers, {
760+ body.model = extension_settings.vectors.togetherai_model;
782- 'X-Togetherai-Model': extension_settings.vectors.togetherai_model,
783- });
784761 break;
785762 case 'openai':
786- Object.assign(headers, {
763+ body.model = extension_settings.vectors.openai_model;
787- 'X-OpenAI-Model': extension_settings.vectors.openai_model,
788- });
789764 break;
790765 case 'cohere':
791- Object.assign(headers, {
766+ body.model = extension_settings.vectors.cohere_model;
792- 'X-Cohere-Model': extension_settings.vectors.cohere_model,
793- });
794767 break;
795768 case 'ollama':
796- Object.assign(headers, {
769+ body.model = extension_settings.vectors.ollama_model;
797- 'X-Ollama-Model': extension_settings.vectors.ollama_model,
770+ body.apiUrl = textgenerationwebui_settings.server_urls[textgen_types.OLLAMA];
798- 'X-Ollama-URL': textgenerationwebui_settings.server_urls[textgen_types.OLLAMA],
771+ body.keep = !!extension_settings.vectors.ollama_keep;
799- 'X-Ollama-Keep': !!extension_settings.vectors.ollama_keep,
800- });
801772 break;
802773 case 'llamacpp':
803- Object.assign(headers, {
774+ body.apiUrl = textgenerationwebui_settings.server_urls[textgen_types.LLAMACPP];
804- 'X-LlamaCpp-URL': textgenerationwebui_settings.server_urls[textgen_types.LLAMACPP],
805- });
806775 break;
807776 case 'vllm':
808- Object.assign(headers, {
777+ body.apiUrl = textgenerationwebui_settings.server_urls[textgen_types.VLLM];
809- 'X-Vllm-URL': textgenerationwebui_settings.server_urls[textgen_types.VLLM],
778+ body.model = extension_settings.vectors.vllm_model;
810- 'X-Vllm-Model': extension_settings.vectors.vllm_model,
811- });
812779 break;
813780 default:
814781 break;
815782 }
816783 return headersbody;
784+}
785+
786+/**
787+ * Gets the saved hashes for a collection
788+* @param {string} collectionId
789+* @returns {Promise<number[]>} Saved hashes
790+*/
791+async function getSavedHashes(collectionId) {
792+ const response = await fetch('/api/vector/list', {
793+ method: 'POST',
794+ headers: getRequestHeaders(),
795+ body: JSON.stringify({
796+ ...getVectorsRequestBody(),
797+ collectionId: collectionId,
798+ source: settings.source,
799+ }),
800+ });
801+
802+ if (!response.ok) {
803+ throw new Error(`Failed to get saved hashes for collection ${collectionId}`);
804+ }
805+
806+ const hashes = await response.json();
807+ return hashes;
817808}
818809
819810/**
@@ -825,12 +816,11 @@ function getVectorHeaders() {
825816async function insertVectorItems(collectionId, items) {
826817 throwIfSourceInvalid();
827818
828- const headers = getVectorHeaders();
829-
830819 const response = await fetch('/api/vector/insert', {
831820 method: 'POST',
832821 headers: headersgetRequestHeaders(),
833822 body: JSON.stringify({
823+ ...getVectorsRequestBody(),
834824 collectionId: collectionId,
835825 items: items,
836826 source: settings.source,
@@ -879,8 +869,9 @@ function throwIfSourceInvalid() {
879869async function deleteVectorItems(collectionId, hashes) {
880870 const response = await fetch('/api/vector/delete', {
881871 method: 'POST',
882872 headers: getVectorHeadersgetRequestHeaders(),
883873 body: JSON.stringify({
874+ ...getVectorsRequestBody(),
884875 collectionId: collectionId,
885876 hashes: hashes,
886877 source: settings.source,
@@ -899,12 +890,11 @@ async function deleteVectorItems(collectionId, hashes) {
899890 * @returns {Promise<{ hashes: number[], metadata: object[]}>} - Hashes of the results
900891 */
901892async function queryCollection(collectionId, searchText, topK) {
902- const headers = getVectorHeaders();
903-
904893 const response = await fetch('/api/vector/query', {
905894 method: 'POST',
906895 headers: headersgetRequestHeaders(),
907896 body: JSON.stringify({
897+ ...getVectorsRequestBody(),
908898 collectionId: collectionId,
909899 searchText: searchText,
910900 topK: topK,
@@ -929,12 +919,11 @@ async function queryCollection(collectionId, searchText, topK) {
929919 * @returns {Promise<Record<string, { hashes: number[], metadata: object[] }>>} - Results mapped to collection IDs
930920 */
931921async function queryMultipleCollections(collectionIds, searchText, topK, threshold) {
932- const headers = getVectorHeaders();
933-
934922 const response = await fetch('/api/vector/query-multi', {
935923 method: 'POST',
936924 headers: headersgetRequestHeaders(),
937925 body: JSON.stringify({
926+ ...getVectorsRequestBody(),
938927 collectionIds: collectionIds,
939928 searchText: searchText,
940929 topK: topK,
@@ -965,8 +954,9 @@ async function purgeFileVectorIndex(fileUrl) {
965954
966955 const response = await fetch('/api/vector/purge', {
967956 method: 'POST',
968957 headers: getVectorHeadersgetRequestHeaders(),
969958 body: JSON.stringify({
959+ ...getVectorsRequestBody(),
970960 collectionId: collectionId,
971961 }),
972962 });
@@ -994,8 +984,9 @@ async function purgeVectorIndex(collectionId) {
994984
995985 const response = await fetch('/api/vector/purge', {
996986 method: 'POST',
997987 headers: getVectorHeadersgetRequestHeaders(),
998988 body: JSON.stringify({
989+ ...getVectorsRequestBody(),
999990 collectionId: collectionId,
1000991 }),
1001992 });
@@ -1019,7 +1010,10 @@ async function purgeAllVectorIndexes() {
10191010 try {
10201011 const response = await fetch('/api/vector/purge-all', {
10211012 method: 'POST',
10221013 headers: getVectorHeadersgetRequestHeaders(),
1014+ body: JSON.stringify({
1015+ ...getVectorsRequestBody(),
1016+ }),
10231017 });
10241018
10251019 if (!response.ok) {
src/endpoints/vectors.js+11 -11
@@ -132,35 +132,35 @@ function getSourceSettings(source, request) {
132132 switch (source) {
133133 case 'togetherai':
134134 return {
135135 model: String(request.headers['x-togetherai-body.model']),
136136 };
137137 case 'openai':
138138 return {
139139 model: String(request.headers['x-openai-body.model']),
140140 };
141141 case 'cohere':
142142 return {
143143 model: String(request.headers['x-cohere-body.model']),
144144 };
145145 case 'llamacpp':
146146 return {
147147 apiUrl: String(request.headers['x-llamacpp-url']body.apiUrl),
148148 };
149149 case 'vllm':
150150 return {
151151 apiUrl: String(request.headers['x-vllm-url']body.apiUrl),
152152 model: String(request.headers['x-vllm-body.model']),
153153 };
154154 case 'ollama':
155155 return {
156156 apiUrl: String(request.headers['x-ollama-url']body.apiUrl),
157157 model: String(request.headers['x-ollama-body.model']),
158158 keep: Boolean(request.headers['x-ollama-body.keep']),
159159 };
160160 case 'extras':
161161 return {
162162 extrasUrl: String(request.headers['x-extras-url']body.extrasUrl),
163163 extrasKey: String(request.headers['x-extras-key']body.extrasKey),
164164 };
165165 case 'transformers':
166166 return {