Merge pull request #345 from browngraphicslab/audio_refactor

Audio refactor

2 files changed, 35 insertions, 23 deletions

diff --git a/src/server/ApiManagers/UploadManager.ts b/src/server/ApiManagers/UploadManager.ts
index 50a759c9d..42e33ece0 100644
--- a/src/server/ApiManagers/UploadManager.ts
+++ b/src/server/ApiManagers/UploadManager.ts
@@ -19,7 +19,8 @@ export enum Directory {
     videos = "videos",
     pdfs = "pdfs",
     text = "text",
-    pdf_thumbnails = "pdf_thumbnails"
+    pdf_thumbnails = "pdf_thumbnails",
+    audio = "audio"
 }
 
 export function serverPathToFile(directory: Directory, filename: string) {
@@ -61,9 +62,18 @@ export default class UploadManager extends ApiManager {
         });
 
         register({
+            method: Method.GET,
+            subscription: "/hello",
+            secureHandler: ({ req, res }) => {
+                res.send("<h1>world!</h1>");
+            }
+        });
+
+        register({
             method: Method.POST,
             subscription: "/uploadRemoteImage",
             secureHandler: async ({ req, res }) => {
+
                 const { sources } = req.body;
                 if (Array.isArray(sources)) {
                     const results = await Promise.all(sources.map(source => DashUploadUtils.UploadImage(source)));
@@ -77,6 +87,7 @@ export default class UploadManager extends ApiManager {
             method: Method.POST,
             subscription: "/uploadDoc",
             secureHandler: ({ req, res }) => {
+
                 const form = new formidable.IncomingForm();
                 form.keepExtensions = true;
                 // let path = req.body.path;
@@ -181,6 +192,7 @@ export default class UploadManager extends ApiManager {
             method: Method.POST,
             subscription: "/inspectImage",
             secureHandler: async ({ req, res }) => {
+
                 const { source } = req.body;
                 if (typeof source === "string") {
                     return res.send(await DashUploadUtils.InspectImage(source));
diff --git a/src/server/ApiManagers/UtilManager.ts b/src/server/ApiManagers/UtilManager.ts
index d18529cf2..ad8119bf4 100644
--- a/src/server/ApiManagers/UtilManager.ts
+++ b/src/server/ApiManagers/UtilManager.ts
@@ -3,11 +3,11 @@ import { Method } from "../RouteManager";
 import { exec } from 'child_process';
 import RouteSubscriber from "../RouteSubscriber";
 import { red } from "colors";
-import { IBM_Recommender } from "../../client/apis/IBM_Recommender";
-import { Recommender } from "../Recommender";
+// import { IBM_Recommender } from "../../client/apis/IBM_Recommender";
+// import { Recommender } from "../Recommender";
 
-const recommender = new Recommender();
-recommender.testModel();
+// const recommender = new Recommender();
+// recommender.testModel();
 import executeImport from "../../scraping/buxton/final/BuxtonImporter";
 
 export default class UtilManager extends ApiManager {
@@ -27,25 +27,25 @@ export default class UtilManager extends ApiManager {
             }
         });
 
-        register({
-            method: Method.POST,
-            subscription: "/IBMAnalysis",
-            secureHandler: async ({ req, res }) => res.send(await IBM_Recommender.analyze(req.body))
-        });
+        // register({
+        //     method: Method.POST,
+        //     subscription: "/IBMAnalysis",
+        //     secureHandler: async ({ req, res }) => res.send(await IBM_Recommender.analyze(req.body))
+        // });
 
-        register({
-            method: Method.POST,
-            subscription: "/recommender",
-            secureHandler: async ({ req, res }) => {
-                const keyphrases = req.body.keyphrases;
-                const wordvecs = await recommender.vectorize(keyphrases);
-                let embedding: Float32Array = new Float32Array();
-                if (wordvecs && wordvecs.dataSync()) {
-                    embedding = wordvecs.dataSync() as Float32Array;
-                }
-                res.send(embedding);
-            }
-        });
+        // register({
+        //     method: Method.POST,
+        //     subscription: "/recommender",
+        //     secureHandler: async ({ req, res }) => {
+        //         const keyphrases = req.body.keyphrases;
+        //         const wordvecs = await recommender.vectorize(keyphrases);
+        //         let embedding: Float32Array = new Float32Array();
+        //         if (wordvecs && wordvecs.dataSync()) {
+        //             embedding = wordvecs.dataSync() as Float32Array;
+        //         }
+        //         res.send(embedding);
+        //     }
+        // });
 
 
         register({