From 812bca8cfbf7555e82d09ba6996cc643f6e9bdb3 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 24 Nov 2025 15:35:32 +0100 Subject: [PATCH] working on implementing everything Currently getting stuck on the assembly module as assembly ai for some fucking reason blocks me from making any requests This includes making a new user account --- electron/main/index.html | 4 +- main.js | 68 +++++----- package-lock.json | 122 +++++++++++++++++- package.json | 1 + requires.js | 6 +- .../modules/transcription-remote/assembly.js | 10 +- services/modules/utility/@startup.js | 4 +- 7 files changed, 169 insertions(+), 46 deletions(-) diff --git a/electron/main/index.html b/electron/main/index.html index b4bfb5f..6099453 100644 --- a/electron/main/index.html +++ b/electron/main/index.html @@ -21,7 +21,9 @@ diff --git a/main.js b/main.js index 6bb7c72..1c2c0e7 100644 --- a/main.js +++ b/main.js @@ -35,6 +35,8 @@ console.log("------------------------------------------------------------------- + + // --------------------------------------------------------- CLI COMMANDS --------------------------------------------------------- // const rl = readline.createInterface({ @@ -139,7 +141,7 @@ electron.ipcMain.on("file_submit", async (event, args) => { // This code handles the Video to Audio extraction module call await mapFunctions.get("module-handler").function(args.video.module, {inputVideoPath: args.video.inputVideoPath, outputType: args.video.outputType}).then(resp => { - // console.log(resp); + console.log(resp); audiopath = resp curstep++ mainWindow.webContents.send("progress", {curstep:curstep, totalsteps:totalsteps}) @@ -150,42 +152,42 @@ electron.ipcMain.on("file_submit", async (event, args) => { // TODO implement transcription module - // // This code handles the Audio to Text transcription module call - // await mapFunctions.get("module-handler").function(args.transcription.module, audiopath).then(resp => { - // console.log(resp); - // transcriptpath = resp - // curstep++ - // mainWindow.webContents.send("progress", {curstep:curstep, totalsteps:totalsteps}) - // }).catch(err => { - // mainWindow.webContents.send("error", err) - // return - // }) + // This code handles the Audio to Text transcription module call + await mapFunctions.get("module-handler").function(args.transcription.module, audiopath).then(resp => { + console.log(resp); + transcriptpath = resp + curstep++ + mainWindow.webContents.send("progress", {curstep:curstep, totalsteps:totalsteps}) + }).catch(err => { + mainWindow.webContents.send("error", err) + return + }) - // // This code summarises the transcript, so that it can be used by an llm - // await mapFunctions.get("summarize-transcription").function(transcriptpath).then(resp => { - // console.log(resp); - // transcriptpath = resp - // curstep++ - // mainWindow.webContents.send("progress", {curstep:curstep, totalsteps:totalsteps}) - // }).catch(err => { - // mainWindow.webContents.send("error", err) - // return - // }) + // This code summarises the transcript, so that it can be used by an llm + await mapFunctions.get("summarize-transcription").function(transcriptpath).then(resp => { + console.log(resp); + transcriptpath = resp + curstep++ + mainWindow.webContents.send("progress", {curstep:curstep, totalsteps:totalsteps}) + }).catch(err => { + mainWindow.webContents.send("error", err) + return + }) // TODO implement documentation module - // // This code handles the Text to Document processing module call - // for (let i = 0; i < args.document.styles.length; i++) { - // await mapFunctions.get("module-handler").function(args.document.module, {prompt: args.document.styles[i].prompt, transcript: transcriptpath}).then(resp => { - // console.log(resp); - // transcriptpath = resp - // curstep++ - // mainWindow.webContents.send("progress", {curstep:curstep, totalsteps:totalsteps}) - // }).catch(err => { - // mainWindow.webContents.send("error", err) - // return - // }) - // } + // This code handles the Text to Document processing module call + for (let i = 0; i < args.document.styles.length; i++) { + await mapFunctions.get("module-handler").function(args.document.module, {prompt: args.document.styles[i].prompt, transcript: transcriptpath}).then(resp => { + console.log(resp); + transcriptpath = resp + curstep++ + mainWindow.webContents.send("progress", {curstep:curstep, totalsteps:totalsteps}) + }).catch(err => { + mainWindow.webContents.send("error", err) + return + }) + } } catch (error) { diff --git a/package-lock.json b/package-lock.json index 175bfea..76227c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "dependencies": { "@google/genai": "^1.30.0", "@types/axios": "^0.9.36", + "axios": "^1.13.2", "cli-progress": "^3.12.0", "dotenv": "^17.2.3", "electron": "^39.1.1", @@ -401,6 +402,21 @@ "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==" }, + "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.13.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz", + "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.4", + "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", @@ -591,6 +607,17 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "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-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", @@ -767,6 +794,14 @@ "url": "https://github.com/sponsors/ljharb" } }, + "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", @@ -795,7 +830,6 @@ "version": "17.2.3", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz", "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==", - "license": "BSD-2-Clause", "engines": { "node": ">=12" }, @@ -922,6 +956,20 @@ "node": ">= 0.4" } }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es6-error": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", @@ -1093,6 +1141,25 @@ "node": ">=18" } }, + "node_modules/follow-redirects": { + "version": "1.15.11", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz", + "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/foreground-child": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", @@ -1108,6 +1175,40 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/form-data": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz", + "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.2", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/form-data/node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/form-data/node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/formdata-polyfill": { "version": "4.0.10", "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", @@ -1416,6 +1517,20 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/hasown": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", @@ -1900,6 +2015,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/pump": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz", diff --git a/package.json b/package.json index 6ac1c4b..4b6cc7b 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "dependencies": { "@google/genai": "^1.30.0", "@types/axios": "^0.9.36", + "axios": "^1.13.2", "cli-progress": "^3.12.0", "dotenv": "^17.2.3", "electron": "^39.1.1", diff --git a/requires.js b/requires.js index e947400..6036867 100644 --- a/requires.js +++ b/requires.js @@ -16,4 +16,8 @@ cliProgress = require('cli-progress'); // { app, BrowserWindow, ipcMain, dialog } = require('electron'); electron = require('electron'); -genai = require("@google/genai"); \ No newline at end of file +genai = require("@google/genai"); + +axios = require("axios") + +console.log(require('dotenv').config({path: __dirname + '/.env'})); \ No newline at end of file diff --git a/services/modules/transcription-remote/assembly.js b/services/modules/transcription-remote/assembly.js index d31a67b..f2fbe0f 100644 --- a/services/modules/transcription-remote/assembly.js +++ b/services/modules/transcription-remote/assembly.js @@ -1,6 +1,4 @@ -require('dotenv').config(); - -const API_KEY = process.env.API_KEY; +const API_KEY = process.env.ASSEMBLYAI_API_KEY; const BASE_URL = 'https://api.assemblyai.com/v2'; //---------------------------------------------------Upload audio--------------------------------------------------- @@ -93,11 +91,7 @@ module.exports = { async function(audioFileName) { try { // audioFileName ist nur "datei.mp3" - const audioPath = path.join( - __dirname, - '../../../storage/audio', - audioFileName - ); + const audioPath = audioFileName; let audioUrl; diff --git a/services/modules/utility/@startup.js b/services/modules/utility/@startup.js index 2628723..cf6eaf8 100644 --- a/services/modules/utility/@startup.js +++ b/services/modules/utility/@startup.js @@ -6,9 +6,9 @@ module.exports = { // We are now calling the example function from the example folder mapFunctions.get("example").function("Startup") - let transcript = await mapFunctions.get("assembly").function('../../storage/audio/IMG_2978.wav'); + // let transcript = await mapFunctions.get("assembly").function('../../storage/audio/IMG_2978.wav'); - let summary = await mapFunctions.get("summarize-transcription").function({jsonPath:'/Users/santa/Proj25/video2document/storage/transcripts/IMG_2978.json'}); + // let summary = await mapFunctions.get("summarize-transcription").function({jsonPath:'/Users/santa/Proj25/video2document/storage/transcripts/IMG_2978.json'});