Skip to content

Commit 393af0b

Browse files
authored
connectors: use front-service for all requests to front[D (#9736)
1 parent 2e2fec6 commit 393af0b

File tree

2 files changed

+14
-17
lines changed

2 files changed

+14
-17
lines changed

connectors/src/lib/api/config.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ export const apiConfig = {
77
apiKey: EnvironmentConfig.getOptionalEnvVariable("OAUTH_API_KEY") ?? null,
88
};
99
},
10+
getDustFrontAPIUrl: (): string => {
11+
return EnvironmentConfig.getEnvVariable("DUST_FRONT_API");
12+
},
1013
getDustAPIConfig: (): { url: string; nodeEnv: string } => {
1114
return {
12-
// Dust production API URL is hardcoded for now.
13-
url: "https://dust.tt",
15+
url: EnvironmentConfig.getEnvVariable("DUST_FRONT_API"),
1416
nodeEnv: EnvironmentConfig.getEnvVariable("NODE_ENV"),
1517
};
1618
},

connectors/src/lib/data_sources.ts

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@ const axiosWithTimeout = axios.create({
4444
httpsAgent: new https.Agent({ keepAlive: false }),
4545
});
4646

47-
const { DUST_FRONT_API } = process.env;
48-
if (!DUST_FRONT_API) {
49-
throw new Error("FRONT_API not set");
50-
}
51-
5247
// We limit the document size we support. Beyond a certain size, upsert is simply too slow (>300s)
5348
// and large files are generally less useful anyway.
5449
export const MAX_DOCUMENT_TXT_LEN = 750000;
@@ -123,7 +118,7 @@ async function _upsertDataSourceDocument({
123118
});
124119

125120
const endpoint =
126-
`${DUST_FRONT_API}/api/v1/w/${dataSourceConfig.workspaceId}` +
121+
`${apiConfig.getDustFrontAPIUrl()}/api/v1/w/${dataSourceConfig.workspaceId}` +
127122
`/data_sources/${dataSourceConfig.dataSourceId}/documents/${documentId}`;
128123

129124
const localLogger = logger.child({
@@ -257,7 +252,7 @@ export async function getDataSourceDocument({
257252
});
258253

259254
const endpoint =
260-
`${DUST_FRONT_API}/api/v1/w/${dataSourceConfig.workspaceId}` +
255+
`${apiConfig.getDustFrontAPIUrl()}/api/v1/w/${dataSourceConfig.workspaceId}` +
261256
`/data_sources/${dataSourceConfig.dataSourceId}/documents?document_ids=${documentId}`;
262257
const dustRequestConfig: AxiosRequestConfig = {
263258
headers: {
@@ -288,7 +283,7 @@ export async function deleteDataSourceDocument(
288283
const localLogger = logger.child({ ...loggerArgs, documentId });
289284

290285
const endpoint =
291-
`${DUST_FRONT_API}/api/v1/w/${dataSourceConfig.workspaceId}` +
286+
`${apiConfig.getDustFrontAPIUrl()}/api/v1/w/${dataSourceConfig.workspaceId}` +
292287
`/data_sources/${dataSourceConfig.dataSourceId}/documents/${documentId}`;
293288
const dustRequestConfig: AxiosRequestConfig = {
294289
headers: {
@@ -382,7 +377,7 @@ async function _updateDocumentOrTableParentsField({
382377
? logger.child({ ...loggerArgs, documentId: id })
383378
: logger.child({ ...loggerArgs, tableId: id });
384379
const endpoint =
385-
`${DUST_FRONT_API}/api/v1/w/${dataSourceConfig.workspaceId}` +
380+
`${apiConfig.getDustFrontAPIUrl()}/api/v1/w/${dataSourceConfig.workspaceId}` +
386381
`/data_sources/${dataSourceConfig.dataSourceId}/${tableOrDocument}s/${id}/parents`;
387382
const dustRequestConfig: AxiosRequestConfig = {
388383
headers: {
@@ -663,7 +658,7 @@ export async function upsertDataSourceRemoteTable({
663658
const now = new Date();
664659

665660
const endpoint =
666-
`${DUST_FRONT_API}/api/v1/w/${dataSourceConfig.workspaceId}` +
661+
`${apiConfig.getDustFrontAPIUrl()}/api/v1/w/${dataSourceConfig.workspaceId}` +
667662
`/data_sources/${dataSourceConfig.dataSourceId}/tables`;
668663
const dustRequestPayload: UpsertDatabaseTableRequestType = {
669664
name: tableName,
@@ -823,7 +818,7 @@ export async function upsertDataSourceTableFromCsv({
823818
}
824819

825820
const endpoint =
826-
`${DUST_FRONT_API}/api/v1/w/${dataSourceConfig.workspaceId}` +
821+
`${apiConfig.getDustFrontAPIUrl()}/api/v1/w/${dataSourceConfig.workspaceId}` +
827822
`/data_sources/${dataSourceConfig.dataSourceId}/tables/csv`;
828823
const dustRequestPayload: UpsertTableFromCsvRequestType = {
829824
name: tableName,
@@ -986,7 +981,7 @@ export async function deleteDataSourceTableRow({
986981
const now = new Date();
987982

988983
const endpoint =
989-
`${DUST_FRONT_API}/api/v1/w/${dataSourceConfig.workspaceId}` +
984+
`${apiConfig.getDustFrontAPIUrl()}/api/v1/w/${dataSourceConfig.workspaceId}` +
990985
`/data_sources/${dataSourceConfig.dataSourceId}/tables/${tableId}/rows/${rowId}`;
991986
const dustRequestConfig: AxiosRequestConfig = {
992987
headers: {
@@ -1068,7 +1063,7 @@ export async function _getDataSourceTable({
10681063
});
10691064

10701065
const endpoint =
1071-
`${DUST_FRONT_API}/api/v1/w/${dataSourceConfig.workspaceId}` +
1066+
`${apiConfig.getDustFrontAPIUrl()}/api/v1/w/${dataSourceConfig.workspaceId}` +
10721067
`/data_sources/${dataSourceConfig.dataSourceId}/tables/${tableId}`;
10731068
const dustRequestConfig: AxiosRequestConfig = {
10741069
headers: {
@@ -1120,7 +1115,7 @@ export async function deleteDataSourceTable({
11201115
const now = new Date();
11211116

11221117
const endpoint =
1123-
`${DUST_FRONT_API}/api/v1/w/${dataSourceConfig.workspaceId}` +
1118+
`${apiConfig.getDustFrontAPIUrl()}/api/v1/w/${dataSourceConfig.workspaceId}` +
11241119
`/data_sources/${dataSourceConfig.dataSourceId}/tables/${tableId}`;
11251120
const dustRequestConfig: AxiosRequestConfig = {
11261121
headers: {
@@ -1202,7 +1197,7 @@ export async function _getDataSourceFolder({
12021197
});
12031198

12041199
const endpoint =
1205-
`${DUST_FRONT_API}/api/v1/w/${dataSourceConfig.workspaceId}` +
1200+
`${apiConfig.getDustFrontAPIUrl()}/api/v1/w/${dataSourceConfig.workspaceId}` +
12061201
`/data_sources/${dataSourceConfig.dataSourceId}/folders/${folderId}`;
12071202
const dustRequestConfig: AxiosRequestConfig = {
12081203
headers: {

0 commit comments

Comments
 (0)