Skip to content

Commit 77b299f

Browse files
committed
fixes bad merge conflict
1 parent 384de1f commit 77b299f

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

apps/chatbot-server/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"author": "",
1818
"license": "Apache-2.0",
1919
"dependencies": {
20-
"@lg-tools/crawler": "workspace:^",
2120
"@emotion/css": "^11.13.5",
2221
"@lg-tools/crawler": "workspace:^",
2322
"dotenv": "^16.5.0",

apps/chatbot-server/src/index.ts

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,29 @@ Be concise in your answers.
1717
`,
1818
};
1919

20-
const {
21-
llm,
22-
embeddedContentStore,
23-
generateUserPrompt,
24-
mongodbClient,
25-
conversations,
26-
} = await initChatBot();
20+
// Start the server and clean up resources on SIGINT.
21+
const PORT = process.env.PORT || 3030;
2722

28-
// Create the MongoDB Chatbot Server Express.js app configuration
29-
const config: AppConfig = {
30-
conversationsRouterConfig: {
23+
const startServer = async () => {
24+
const {
3125
llm,
32-
conversations,
26+
embeddedContentStore,
3327
generateUserPrompt,
34-
systemPrompt,
35-
},
36-
maxRequestTimeoutMs: 30000,
37-
};
28+
mongodbClient,
29+
conversations,
30+
} = await initChatBot();
3831

39-
// Start the server and clean up resources on SIGINT.
40-
const PORT = process.env.PORT || 3030;
32+
// Create the MongoDB Chatbot Server Express.js app configuration
33+
const config: AppConfig = {
34+
conversationsRouterConfig: {
35+
llm,
36+
conversations,
37+
generateUserPrompt,
38+
systemPrompt,
39+
},
40+
maxRequestTimeoutMs: 30000,
41+
};
4142

42-
const startServer = async () => {
4343
logger.info('Starting server...');
4444
const app = await makeApp(config);
4545
const server = app.listen(PORT, () => {

0 commit comments

Comments
 (0)