route through backend

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "viewer/svelte-table"]
-	path = viewer/svelte-table
-	url = https://github.com/dylanebert/svelte-table.git
-	branch = master

viewer/package.json

@@ -11,6 +11,7 @@
         "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch"
     },
     "devDependencies": {
+        "@rollup/rollup-linux-x64-gnu": "^4.9.6",
         "@sveltejs/adapter-auto": "^3.0.0",
         "@sveltejs/adapter-node": "^4.0.0",
         "@sveltejs/kit": "^2.0.0",
@@ -19,12 +20,11 @@
         "svelte-check": "^3.6.0",
         "tslib": "^2.4.1",
         "typescript": "^5.0.0",
-        "vite": "^5.0.12",
-        "@rollup/rollup-linux-x64-gnu": "^4.9.6"
+        "vite": "^5.0.12"
     },
     "type": "module",
     "dependencies": {
         "esbuild": "^0.19.12",
-        "svelte-table": "file:./svelte-table"
+        "svelte-table": "^0.6.3"
     }
 }

viewer/src/routes/+page.svelte

@@ -373,11 +373,7 @@
     let isModalOpen = false;
 </script>
 
-{#if !import.meta.env.VITE_HF_TOKEN}
-    <div style="text-align: center; margin-top: 1rem;">
-        <p>Missing VITE_HF_TOKEN environment variable</p>
-    </div>
-{:else if fetching}
+{#if fetching}
     <div style="text-align: center; margin-top: 1rem;">
         <p>{@html $statusMessage}</p>
     </div>

viewer/src/routes/api/fetchRows/+server.ts

@@ -0,0 +1,11 @@
+export const GET = async () => {
+    const response = await fetch("https://dylanebert-research-tracker-backend.hf.space/data", {
+        method: "GET",
+        headers: {
+            Authorization: "Bearer " + import.meta.env.VITE_HF_TOKEN,
+            "Cache-Control": "no-cache",
+        },
+    });
+    const rows = await response.json();
+    return new Response(JSON.stringify(rows));
+};

viewer/src/routes/api/request/+server.ts

@@ -0,0 +1,14 @@
+export const POST = async ({ request }) => {
+    const endpoint = request.headers.get("endpoint");
+    const row = await request.json();
+    const response = await fetch(`https://dylanebert-research-tracker-backend.hf.space/${endpoint}`, {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json",
+            Authorization: "Bearer " + import.meta.env.VITE_HF_TOKEN,
+        },
+        body: JSON.stringify(row),
+    });
+    const data = await response.json();
+    return new Response(JSON.stringify(data));
+};

viewer/src/routes/bridge.ts

@@ -1,19 +1,10 @@
 import Row from "./Row";
 import { statusMessage } from "./store";
 
-const baseURL = "https://dylanebert-research-tracker-backend.hf.space";
-// const baseURL = "http://localhost:8000";
-
 export const fetchRows = async (): Promise<Row[] | null> => {
     statusMessage.set(`<span>Fetching data from https://dylanebert-research-tracker-backend.hf.space/data</span>`);
     try {
-        const response = await fetch(baseURL + "/data", {
-            method: "GET",
-            headers: {
-                Authorization: "Bearer " + import.meta.env.VITE_HF_TOKEN,
-                "Cache-Control": "no-cache",
-            },
-        });
+        const response = await fetch("/api/fetchRows");
         const rows = await response.json();
         statusMessage.reset();
         return rows;
@@ -54,11 +45,11 @@ export const addEntry = async (selection: Record<string | number, any>): Promise
     if (!row) {
         return null;
     }
-    const response = await fetch(baseURL + "/add-entry", {
+    const response = await fetch("/api/request", {
         method: "POST",
         headers: {
             "Content-Type": "application/json",
-            Authorization: "Bearer " + import.meta.env.VITE_HF_TOKEN,
+            endpoint: "add-entry",
         },
         body: JSON.stringify(row),
     });
@@ -82,11 +73,11 @@ export const editEntry = async (row: Row): Promise<Row | null> => {
         ? row.Authors
         : (row.Authors as any).split(",").map((author: string) => author.trim());
     row.Tags = Array.isArray(row.Tags) ? row.Tags : (row.Tags as any).split(",").map((tag: string) => tag.trim());
-    const response = await fetch(baseURL + "/edit-entry", {
+    const response = await fetch("/api/request", {
         method: "POST",
         headers: {
             "Content-Type": "application/json",
-            Authorization: "Bearer " + import.meta.env.VITE_HF_TOKEN,
+            endpoint: "edit-entry",
         },
         body: JSON.stringify(row),
     });
@@ -109,11 +100,11 @@ export const deleteEntry = async (row: Row): Promise<Row | null> => {
         ? row.Authors
         : (row.Authors as any).split(",").map((author: string) => author.trim());
     row.Tags = Array.isArray(row.Tags) ? row.Tags : (row.Tags as any).split(",").map((tag: string) => tag.trim());
-    const response = await fetch(baseURL + "/delete-entry", {
+    const response = await fetch("/api/request", {
         method: "POST",
         headers: {
             "Content-Type": "application/json",
-            Authorization: "Bearer " + import.meta.env.VITE_HF_TOKEN,
+            endpoint: "delete-entry",
         },
         body: JSON.stringify(row),
     });
@@ -181,11 +172,11 @@ export const inferFields = async (row: Row): Promise<Row | null> => {
 const inferFieldType = async (row: Row, value: string): Promise<string | null> => {
     let data;
     try {
-        const response = await fetch(baseURL + "/infer-field", {
+        const response = await fetch("/api/request", {
             method: "POST",
             headers: {
                 "Content-Type": "application/json",
-                Authorization: "Bearer " + import.meta.env.VITE_HF_TOKEN,
+                endpoint: "infer-field",
             },
             body: JSON.stringify({ value }),
         });
@@ -208,11 +199,11 @@ const inferPaper = async (row: Row) => {
     statusMessage.append(`<br><span>Inferring paper...</span>`);
     let data;
     try {
-        const response = await fetch(baseURL + "/infer-paper", {
+        const response = await fetch("/api/request", {
             method: "POST",
             headers: {
                 "Content-Type": "application/json",
-                Authorization: "Bearer " + import.meta.env.VITE_HF_TOKEN,
+                endpoint: "infer-paper",
             },
             body: JSON.stringify(row),
         });
@@ -242,11 +233,11 @@ const inferCode = async (row: Row) => {
     statusMessage.append(`<br><span>Inferring code...</span>`);
     let data;
     try {
-        const response = await fetch(baseURL + "/infer-code", {
+        const response = await fetch("/api/request", {
             method: "POST",
             headers: {
+                endpoint: "infer-code",
                 "Content-Type": "application/json",
-                Authorization: "Bearer " + import.meta.env.VITE_HF_TOKEN,
             },
             body: JSON.stringify(row),
         });
@@ -276,11 +267,11 @@ const inferName = async (row: Row) => {
     statusMessage.append(`<br><span>Inferring name...</span>`);
     let data;
     try {
-        const response = await fetch(baseURL + "/infer-name", {
+        const response = await fetch("/api/request", {
             method: "POST",
             headers: {
+                endpoint: "infer-name",
                 "Content-Type": "application/json",
-                Authorization: "Bearer " + import.meta.env.VITE_HF_TOKEN,
             },
             body: JSON.stringify(row),
         });
@@ -309,11 +300,11 @@ const inferAuthors = async (row: Row) => {
     statusMessage.append(`<br><span>Inferring authors...</span>`);
     let data;
     try {
-        const response = await fetch(baseURL + "/infer-authors", {
+        const response = await fetch("/api/request", {
             method: "POST",
             headers: {
+                endpoint: "infer-authors",
                 "Content-Type": "application/json",
-                Authorization: "Bearer " + import.meta.env.VITE_HF_TOKEN,
             },
             body: JSON.stringify(row),
         });
@@ -342,11 +333,11 @@ const inferOrgs = async (row: Row) => {
     statusMessage.append(`<br><span>Inferring orgs...</span>`);
     let data;
     try {
-        const response = await fetch(baseURL + "/infer-orgs", {
+        const response = await fetch("/api/request", {
             method: "POST",
             headers: {
+                endpoint: "infer-orgs",
                 "Content-Type": "application/json",
-                Authorization: "Bearer " + import.meta.env.VITE_HF_TOKEN,
             },
             body: JSON.stringify(row),
         });
@@ -375,11 +366,11 @@ const inferDate = async (row: Row) => {
     statusMessage.append(`<br><span>Inferring date...</span>`);
     let data;
     try {
-        const response = await fetch(baseURL + "/infer-date", {
+        const response = await fetch("/api/request", {
             method: "POST",
             headers: {
+                endpoint: "infer-date",
                 "Content-Type": "application/json",
-                Authorization: "Bearer " + import.meta.env.VITE_HF_TOKEN,
             },
             body: JSON.stringify(row),
         });
@@ -408,11 +399,11 @@ const inferModel = async (row: Row) => {
     statusMessage.append(`<br><span>Inferring model...</span>`);
     let data;
     try {
-        const response = await fetch(baseURL + "/infer-model", {
+        const response = await fetch("/api/request", {
             method: "POST",
             headers: {
+                endpoint: "infer-model",
                 "Content-Type": "application/json",
-                Authorization: "Bearer " + import.meta.env.VITE_HF_TOKEN,
             },
             body: JSON.stringify(row),
         });
@@ -441,11 +432,11 @@ const inferDataset = async (row: Row) => {
     statusMessage.append(`<br><span>Inferring dataset...</span>`);
     let data;
     try {
-        const response = await fetch(baseURL + "/infer-dataset", {
+        const response = await fetch("/api/request", {
             method: "POST",
             headers: {
+                endpoint: "infer-dataset",
                 "Content-Type": "application/json",
-                Authorization: "Bearer " + import.meta.env.VITE_HF_TOKEN,
             },
             body: JSON.stringify(row),
         });
@@ -474,11 +465,11 @@ const inferSpace = async (row: Row) => {
     statusMessage.append(`<br><span>Inferring space...</span>`);
     let data;
     try {
-        const response = await fetch(baseURL + "/infer-space", {
+        const response = await fetch("/api/request", {
             method: "POST",
             headers: {
+                endpoint: "infer-space",
                 "Content-Type": "application/json",
-                Authorization: "Bearer " + import.meta.env.VITE_HF_TOKEN,
             },
             body: JSON.stringify(row),
         });
@@ -507,11 +498,11 @@ const inferLicense = async (row: Row) => {
     statusMessage.append(`<br><span>Inferring license...</span>`);
     let data;
     try {
-        const response = await fetch(baseURL + "/infer-license", {
+        const response = await fetch("/api/request", {
             method: "POST",
             headers: {
+                endpoint: "infer-license",
                 "Content-Type": "application/json",
-                Authorization: "Bearer " + import.meta.env.VITE_HF_TOKEN,
             },
             body: JSON.stringify(row),
         });

viewer/svelte-table

@@ -1 +0,0 @@
-Subproject commit 0b3742da9031342a5ce9af34c673be8f48c1eefb