Skip to content

Commit b740033

Browse files
author
Jicheng Lu
committed
rename knowledge search
1 parent 73d49d7 commit b740033

10 files changed

Lines changed: 29 additions & 29 deletions

File tree

src/lib/helpers/http.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ function skipLoader(config) {
191191
new RegExp('http(s*)://(.*?)/conversation/(.*?)/(.*?)', 'g'),
192192
new RegExp('http(s*)://(.*?)/agent', 'g'),
193193
new RegExp('http(s*)://(.*?)/knowledge/collection/(.*?)/data/page', 'g'),
194-
new RegExp('http(s*)://(.*?)/knowledge/collection/(.*?)/search', 'g'),
194+
new RegExp('http(s*)://(.*?)/knowledge/collection/(.*?)/query', 'g'),
195195
new RegExp('http(s*)://(.*?)/knowledge/collection/(.*?)', 'g'),
196196
new RegExp('http(s*)://(.*?)/knowledge/collection/(.*?)/file/page', 'g'),
197197
new RegExp('http(s*)://(.*?)/knowledge/collection/(.*?)/file/upload', 'g'),
@@ -277,7 +277,7 @@ function skipGlobalError(config) {
277277
const postRegexes = [
278278
new RegExp('http(s*)://(.*?)/knowledge/collection/(.*?)/data', 'g'),
279279
new RegExp('http(s*)://(.*?)/knowledge/collection/(.*?)/data/page', 'g'),
280-
new RegExp('http(s*)://(.*?)/knowledge/collection/(.*?)/search', 'g'),
280+
new RegExp('http(s*)://(.*?)/knowledge/collection/(.*?)/query', 'g'),
281281
new RegExp('http(s*)://(.*?)/knowledge/collection/(.*?)', 'g'),
282282
new RegExp('http(s*)://(.*?)/knowledge/collection', 'g'),
283283
new RegExp('http(s*)://(.*?)/knowledge/collection/(.*?)/file/page', 'g'),

src/lib/helpers/types/knowledgeTypes.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
/**
11-
* @typedef {Object} SearchKnowledgeRequest
11+
* @typedef {Object} KnowledgeQueryRequest
1212
* @property {string} text - The text.
1313
* @property {string[]} [fields] - Data fields.
1414
* @property {number} [limit] - Data limit.
@@ -80,7 +80,7 @@
8080
*/
8181

8282
/**
83-
* @typedef {Object} KnowledgeSearchViewModel
83+
* @typedef {Object} KnowledgeQueryViewModel
8484
* @property {string} id - The knowledge data id.
8585
* @property {any} payload - The knowledge payload.
8686
* @property {any} data - The knowledge payload.
@@ -92,7 +92,7 @@
9292
/**
9393
* @typedef {Object} KnowledgeSearchPageResult
9494
* @property {number} count - The total data count.
95-
* @property {KnowledgeSearchViewModel[]} items - The data items.
95+
* @property {KnowledgeQueryViewModel[]} items - The data items.
9696
* @property {string} [next_id] - The next id.
9797
*/
9898

src/lib/services/api-endpoints.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export const endpoints = {
103103
knowledgeCollectionCreateUrl: `${host}/knowledge/collection`,
104104
knowledgeCollectionDeleteUrl: `${host}/knowledge/collection/{collection}`,
105105

106-
knowledgeDataSearchUrl: `${host}/knowledge/collection/{collection}/search`,
106+
knowledgeDataQueryUrl: `${host}/knowledge/collection/{collection}/query`,
107107
knowledgeDataPageListUrl: `${host}/knowledge/collection/{collection}/data/page`,
108108
knowledgeDataCreateUrl: `${host}/knowledge/collection/{collection}/data`,
109109
knowledgeDataUpdateUrl: `${host}/knowledge/collection/{collection}/data`,

src/lib/services/knowledge-base-service.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ export async function getKnowledgeCollectionDetails(collection, knowledgeType, d
6161

6262
/**
6363
* @param {string} collection
64-
* @param {import('$knowledgeTypes').SearchKnowledgeRequest} request
64+
* @param {import('$knowledgeTypes').KnowledgeQueryRequest} request
6565
* @param {string} knowledgeType
6666
* @param {string?} dbProvider
67-
* @returns {Promise<import('$knowledgeTypes').KnowledgeSearchViewModel[]>}
67+
* @returns {Promise<import('$knowledgeTypes').KnowledgeQueryViewModel[]>}
6868
*/
69-
export async function searchKnowledge(collection, request, knowledgeType, dbProvider = null) {
70-
const url = replaceUrl(endpoints.knowledgeDataSearchUrl, {
69+
export async function executeKnowledgeQuery(collection, request, knowledgeType, dbProvider = null) {
70+
const url = replaceUrl(endpoints.knowledgeDataQueryUrl, {
7171
collection: collection
7272
});
7373

src/routes/page/knowledge-base/common/vector-table/vector-item-edit-modal.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import Select from "$lib/common/dropdowns/Select.svelte";
1212
1313
let {
14-
/** @type {import('$knowledgeTypes').KnowledgeSearchViewModel | null} */
14+
/** @type {import('$knowledgeTypes').KnowledgeQueryViewModel | null} */
1515
item = null,
1616
/** @type {string} */
1717
collection = '',

src/routes/page/knowledge-base/common/vector-table/vector-item.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import { KnowledgeBaseType, KnowledgePayloadName } from "$lib/helpers/enums";
66
77
let {
8-
/** @type {import('$knowledgeTypes').KnowledgeSearchViewModel} */
8+
/** @type {import('$knowledgeTypes').KnowledgeQueryViewModel} */
99
item,
1010
/** @type {string} */
1111
collection,

src/routes/page/knowledge-base/dictionary/+page.svelte

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import {
77
getEntityAnalyzers,
88
getEntityDataLoaders,
9-
searchKnowledge
9+
executeKnowledgeQuery
1010
} from '$lib/services/knowledge-base-service';
1111
import Breadcrumb from '$lib/common/shared/Breadcrumb.svelte';
1212
import HeadTitle from '$lib/common/shared/HeadTitle.svelte';
@@ -41,7 +41,7 @@
4141
/** @type {string[]} */
4242
let selectedDataLoaders = $state([]);
4343
44-
/** @type {import('$knowledgeTypes').KnowledgeSearchViewModel[]} */
44+
/** @type {import('$knowledgeTypes').KnowledgeQueryViewModel[]} */
4545
let items = $state([]);
4646
4747
/** @type {import('$commonTypes').LabelValuePair[]} */
@@ -157,13 +157,13 @@
157157
158158
function getAnalysisResult() {
159159
return new Promise((resolve, reject) => {
160-
/** @type {import('$knowledgeTypes').SearchKnowledgeRequest} */
160+
/** @type {import('$knowledgeTypes').KnowledgeQueryRequest} */
161161
const request = {
162162
text: util.trim(text),
163163
dataProviders: selectedDataLoaders?.length > 0 ? selectedDataLoaders : null
164164
};
165165
166-
searchKnowledge(knowledgeType, request, knowledgeType, selectedAnalyzer).then(res => {
166+
executeKnowledgeQuery(knowledgeType, request, knowledgeType, selectedAnalyzer).then(res => {
167167
items = res || [];
168168
totalDataCount = items.length;
169169
resolve(res);

src/routes/page/knowledge-base/documents/+page.svelte

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import {
99
getKnowledgeCollections,
1010
getKnowledgePageList,
11-
searchKnowledge,
11+
executeKnowledgeQuery,
1212
createKnowledgeData,
1313
updateKnowledgeData,
1414
deleteKnowledgeCollection,
@@ -59,7 +59,7 @@
5959
/** @type {string} */
6060
let selectedCollection = $state('');
6161
62-
/** @type {import('$knowledgeTypes').KnowledgeSearchViewModel[]} */
62+
/** @type {import('$knowledgeTypes').KnowledgeQueryViewModel[]} */
6363
let items = $state([]);
6464
6565
/** @type {import('$commonTypes').LabelValuePair[]} */
@@ -74,7 +74,7 @@
7474
/** @type {string} */
7575
let editCollection = $state('');
7676
77-
/** @type {import('$knowledgeTypes').KnowledgeSearchViewModel | null} */
77+
/** @type {import('$knowledgeTypes').KnowledgeQueryViewModel | null} */
7878
let editItem = $state(null);
7979
8080
/** @type {string} */
@@ -212,7 +212,7 @@
212212
elapsedTime = `${(gap / 1000).toFixed(3)}s`;
213213
});
214214
} else {
215-
/** @type {import('$knowledgeTypes').SearchKnowledgeRequest} */
215+
/** @type {import('$knowledgeTypes').KnowledgeQueryRequest} */
216216
const params = {
217217
text: util.trim(text),
218218
limit: searchLimit,
@@ -222,7 +222,7 @@
222222
searchParam: { exact_search: isExactSearch }
223223
};
224224
225-
searchKnowledge(selectedCollection, params, knowledgeType).then(res => {
225+
executeKnowledgeQuery(selectedCollection, params, knowledgeType).then(res => {
226226
items = res || [];
227227
totalDataCount = items.length;
228228
isFromSearch = true;

src/routes/page/knowledge-base/question-answer/+page.svelte

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import {
99
getKnowledgeCollections,
1010
getKnowledgePageList,
11-
searchKnowledge,
11+
executeKnowledgeQuery,
1212
createKnowledgeData,
1313
updateKnowledgeData,
1414
deleteKnowledgeCollection,
@@ -56,7 +56,7 @@
5656
/** @type {string} */
5757
let selectedCollection = $state('');
5858
59-
/** @type {import('$knowledgeTypes').KnowledgeSearchViewModel[]} */
59+
/** @type {import('$knowledgeTypes').KnowledgeQueryViewModel[]} */
6060
let items = $state([]);
6161
6262
/** @type {import('$commonTypes').LabelValuePair[]} */
@@ -71,7 +71,7 @@
7171
/** @type {string} */
7272
let editCollection = $state('');
7373
74-
/** @type {import('$knowledgeTypes').KnowledgeSearchViewModel | null} */
74+
/** @type {import('$knowledgeTypes').KnowledgeQueryViewModel | null} */
7575
let editItem = $state(null);
7676
7777
/** @type {string} */
@@ -197,7 +197,7 @@
197197
elapsedTime = `${(gap / 1000).toFixed(3)}s`;
198198
});
199199
} else {
200-
/** @type {import('$knowledgeTypes').SearchKnowledgeRequest} */
200+
/** @type {import('$knowledgeTypes').KnowledgeQueryRequest} */
201201
const params = {
202202
text: util.trim(text),
203203
limit: searchLimit,
@@ -207,7 +207,7 @@
207207
searchParam: { exact_search: isExactSearch }
208208
};
209209
210-
searchKnowledge(selectedCollection, params, knowledgeType).then(res => {
210+
executeKnowledgeQuery(selectedCollection, params, knowledgeType).then(res => {
211211
items = res || [];
212212
totalDataCount = items.length;
213213
isFromSearch = true;

src/routes/page/knowledge-base/relationships/+page.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import LoadingDots from '$lib/common/spinners/LoadingDots.svelte';
77
import HeadTitle from '$lib/common/shared/HeadTitle.svelte';
88
import Breadcrumb from '$lib/common/shared/Breadcrumb.svelte';
9-
import { searchKnowledge } from '$lib/services/knowledge-base-service';
9+
import { executeKnowledgeQuery } from '$lib/services/knowledge-base-service';
1010
import { KnowledgeBaseType } from '$lib/helpers/enums';
1111
1212
const knowledgeType = KnowledgeBaseType.SemanticGraph;
@@ -31,12 +31,12 @@
3131
searchDone = false;
3232
isSearching = true;
3333
34-
/** @type {import('$knowledgeTypes').SearchKnowledgeRequest} */
34+
/** @type {import('$knowledgeTypes').KnowledgeQueryRequest} */
3535
const request = {
3636
text: util.trim(text)
3737
};
3838
39-
searchKnowledge(knowledgeType, request, knowledgeType).then(res => {
39+
executeKnowledgeQuery(knowledgeType, request, knowledgeType).then(res => {
4040
const results = res || [];
4141
result = JSON.stringify(results);
4242
}).catch(() => {

0 commit comments

Comments
 (0)