clean up even more code

kristianka · Nov 11, 2024 · 17149f0 · 17149f0
1 parent 089dc01
commit 17149f0
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 70 deletions.
diff --git a/nextjs/src/app/api/cards/route.ts b/nextjs/src/app/api/cards/route.ts
@@ -1,7 +1,7 @@
 "use server";
 import { createServiceRoleClient } from "@/utils/supabase/server";
 import { NextResponse } from "next/server";
-import initClients from "@/lib/initClient";
+import { initClients } from "@/utils/initClients";
 
 // retrieve thread history
 async function getThreadHistory(

diff --git a/nextjs/src/app/api/flashcards/route.ts b/nextjs/src/app/api/flashcards/route.ts
@@ -1,23 +1,8 @@
 "use server";
 import { createServiceRoleClient } from "@/utils/supabase/server";
 import { NextResponse } from "next/server";
-import initClients from "@/lib/initClient";
-
-// retrieve assistant from database
-async function getAssistant(supabase: ReturnType<typeof createServiceRoleClient>) {
-    const { data, error } = await supabase
-        .from("assistants")
-        .select("*")
-        .eq("name", "StudyHelper")
-        .single();
-
-    if (error) {
-        console.error("Error fetching assistant:", error);
-        throw new Error("Assistant not found");
-    }
-
-    return data;
-}
+import { initClients } from "@/utils/initClients";
+import { getAssistant } from "@/utils/initClients";
 
 // create thread and store it in database
 async function getOrCreateThread(

diff --git a/nextjs/src/app/api/history/route.ts b/nextjs/src/app/api/history/route.ts
@@ -1,23 +1,8 @@
 "use server";
 import { createServiceRoleClient } from "@/utils/supabase/server";
 import { NextResponse } from "next/server";
-import initClients from "@/lib/initClient";
-
-// retrieve assistant from database
-async function getAssistant(supabase: ReturnType<typeof createServiceRoleClient>) {
-    const { data, error } = await supabase
-        .from("assistants")
-        .select("*")
-        .eq("name", "StudyHelper")
-        .single();
-
-    if (error) {
-        console.error("Error fetching assistant:", error);
-        throw new Error("Assistant not found");
-    }
-
-    return data;
-}
+import { initClients } from "@/utils/initClients";
+import { getAssistant } from "@/utils/initClients";
 
 // create thread and store it in database
 async function getOrCreateThread(

diff --git a/nextjs/src/app/api/openai/route.ts b/nextjs/src/app/api/openai/route.ts
@@ -1,23 +1,8 @@
 "use server";
 import { createServiceRoleClient } from "@/utils/supabase/server";
 import { NextResponse } from "next/server";
-import initClients from "@/lib/initClient";
-
-// retrieve assistant from database
-async function getAssistant(supabase: ReturnType<typeof createServiceRoleClient>) {
-    const { data, error } = await supabase
-        .from("assistants")
-        .select("*")
-        .eq("name", "StudyHelper")
-        .single();
-
-    if (error) {
-        console.error("Error fetching assistant:", error);
-        throw new Error("Assistant not found");
-    }
-
-    return data;
-}
+import { initClients } from "@/utils/initClients";
+import { getAssistant } from "@/utils/initClients";
 
 // create thread and store it in database
 async function getOrCreateThread(

diff --git a/nextjs/src/app/api/profile/cards/route.ts b/nextjs/src/app/api/profile/cards/route.ts
@@ -2,7 +2,7 @@
 import { createServiceRoleClient } from "@/utils/supabase/server";
 import { NextResponse } from "next/server";
 import { CardsDifficultyType } from "@/types";
-import initClients from "@/lib/initClient";
+import { initClients } from "@/utils/initClients";
 
 async function updateCards(
     supabase: ReturnType<typeof createServiceRoleClient>,

diff --git a/nextjs/src/app/api/profile/route.ts b/nextjs/src/app/api/profile/route.ts
@@ -1,7 +1,7 @@
 "use server";
 import { createServiceRoleClient } from "@/utils/supabase/server";
 import { NextResponse } from "next/server";
-import initClients from "@/lib/initClient";
+import { initClients } from "@/utils/initClients";
 
 async function getProfile(supabase: ReturnType<typeof createServiceRoleClient>, userId: string) {
     const { data, error } = await supabase.from("profiles").select("*").eq("id", userId);

diff --git a/nextjs/src/app/api/results/route.ts b/nextjs/src/app/api/results/route.ts
@@ -1,7 +1,7 @@
 "use server";
 import { createServiceRoleClient } from "@/utils/supabase/server";
 import { NextResponse } from "next/server";
-import initClients from "@/lib/initClient";
+import { initClients } from "@/utils/initClients";
 
 interface Results {
     result: string;

diff --git a/nextjs/src/lib/initClient.ts b/nextjs/src/lib/initClient.ts
diff --git a/nextjs/src/utils/initClients.ts b/nextjs/src/utils/initClients.ts
@@ -0,0 +1,31 @@
+import { createServiceRoleClient } from "@/utils/supabase/server";
+import { OpenAI } from "openai";
+
+export async function initClients() {
+    try {
+        const supabase = createServiceRoleClient();
+        const openai = new OpenAI({
+            apiKey: process.env.OPENAI_API_KEY
+        });
+        return { supabase, openai };
+    } catch (error) {
+        console.error("Error initializing clients:", error);
+        throw new Error("Failed to initialize clients");
+    }
+}
+
+// retrieve assistant from database
+export async function getAssistant(supabase: ReturnType<typeof createServiceRoleClient>) {
+    const { data, error } = await supabase
+        .from("assistants")
+        .select("*")
+        .eq("name", "StudyHelper")
+        .single();
+
+    if (error) {
+        console.error("Error fetching assistant:", error);
+        throw new Error("Assistant not found");
+    }
+
+    return data;
+}