From 1adf9102eec7511be398190d009e3b2260a866c5 Mon Sep 17 00:00:00 2001 From: Paul-Philippe Wortmann <65237023+TottySnowman@users.noreply.github.com> Date: Sun, 29 Oct 2023 13:08:44 +0100 Subject: [PATCH] added history creation with api --- backend/package-lock.json | 72 ++++++++++++++++++++++++++++++++ backend/package.json | 1 + backend/src/controllers/index.ts | 31 ++++++++++---- 3 files changed, 97 insertions(+), 7 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 113bfa7..a441f95 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -9,6 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { + "axios": "^1.6.0", "cors": "^2.8.5", "dotenv": "^16.3.1", "express": "^4.18.2", @@ -262,6 +263,21 @@ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "node_modules/axios": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz", + "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -413,6 +429,17 @@ "fsevents": "~2.3.2" } }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -489,6 +516,14 @@ "node": ">= 0.4" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -630,6 +665,38 @@ "node": ">= 0.8" } }, + "node_modules/follow-redirects": { + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -1191,6 +1258,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/pstree.remy": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", diff --git a/backend/package.json b/backend/package.json index 569e2c6..6f34c74 100644 --- a/backend/package.json +++ b/backend/package.json @@ -12,6 +12,7 @@ "author": "", "license": "ISC", "dependencies": { + "axios": "^1.6.0", "cors": "^2.8.5", "dotenv": "^16.3.1", "express": "^4.18.2", diff --git a/backend/src/controllers/index.ts b/backend/src/controllers/index.ts index cd12624..2c397d8 100644 --- a/backend/src/controllers/index.ts +++ b/backend/src/controllers/index.ts @@ -13,6 +13,7 @@ import { createdResponse, docs, } from "../types/conversation"; +import axios from "axios"; dotenv.config(); @@ -85,6 +86,7 @@ app.post("/search", async (req: Request, res: Response) => { const { userID, historyID } = req.query; const data = req.body; + console.log({ data }); const convo = req.body; const prompt = "Prompt from MML"; const results: docs[] = []; @@ -94,9 +96,17 @@ app.post("/search", async (req: Request, res: Response) => { const session = driver.session(); if (!historyID) { - const { response, statusCode, hID} = await createHistory(Number(userID), data[0].question); + const { response, statusCode, hID } = await createHistory( + Number(userID), + data[0].question + ); if (statusCode === 200) { + const axiosResp = await axios.get( + `http://185.119.87.85:8001/api/questions/get_answer?question=${data[0].question}` + ); + + const createdHistoryConversationRel = await session.run( "MATCH (h:History) WHERE ID(h) = $hID CREATE (c:Conversation {createdAt: localdatetime()}) SET c += $conversation CREATE (h)-[:HAS_CONVERSATION]->(c)", { conversation: data, hID: Number(hID) } @@ -120,18 +130,25 @@ async function createHistory( const session = driver.session(); - const response = await fetch( - "http://185.119.87.85:8000/api/questions/get_title?question=" + question + const axiosResponse = await axios.get( + `http://185.119.87.85:8001/api/questions/get_title?question=${question}` ); - if (!response.ok) { + console.log(axiosResponse); + + if (axiosResponse.status !== 200) { const response = { statusCode: 500, response: "Failed to fetch title", }; return response; } + const responseData = axiosResponse.data; + const allTitles = responseData.title + .split("\n") + .filter((step: any) => step.trim() !== ""); + let historyData = { - title: "Test", + title: allTitles[0], }; try { const createdUserHistoryRel = await session.run( @@ -141,7 +158,7 @@ async function createHistory( const historyID: number = createdUserHistoryRel.records[0].get("nodeId"); const response = { statusCode: 200, - response: "Successfully created conversation", + response: "Successfully created History", }; return { response: response, @@ -151,7 +168,7 @@ async function createHistory( } catch (error) { const response = { statusCode: 500, - response: "Successfully created conversation", + response: "Error creating History", }; return {