transform data before insert to supabase

example/openai_res.json

@@ -11,7 +11,7 @@
 				"content": "- แปลเป็นภาษาไทย: บรรพบุรุษ, สิ่งที่มาก่อน\n- คำอ่านในภาษาอังกฤษ: แอน-ติ-ซี-เดนท์\n- ประเภทของคำ: คำนาม (Noun)\n- ตัวอย่างประโยคในภาษาอังกฤษ: In grammar, the noun \"dog\" is the antecedent of the pronoun \"it\" in the sentence \"The dog chased its tail.\"",
 				"refusal": null
 			},
-			"logprobs": null,
+		"logprobs": null,
 			"finish_reason": "stop"
 		}
 	],

libs/api/openai.api.ts

@@ -1,6 +1,6 @@
 import { injectable  } from "inversify";
 import OpenAI from "openai";
-import { Env } from "../config/index.ts";
+import { Env } from "../utils/config/index.ts";
 
 const openai = new OpenAI({
   apiKey: Env.openaiApiKey,

libs/mod/auth/repository.ts

@@ -1,7 +1,7 @@
 import type { AuthTokenResponsePassword, SupabaseClient, UserResponse } from "@supabase/supabase-js";
 
 import { injectable } from "inversify";
-import { supabase } from "../../db/index.ts";
+import { supabase } from "../../utils/db/index.ts";
 
 export interface IUserRepository {
 //   auth(): Promise<any>;

libs/mod/auth/routes.ts

@@ -1,9 +1,9 @@
 import { IUserService } from "./service.ts";
 import { Hono } from "hono";
 import { setCookie } from "hono/cookie";
-import { zValidator } from "../../middleware/zodValidator.middleware.ts";
+import { zValidator } from "../../utils/middleware/zodValidator.middleware.ts";
 import { z } from "zod";
-import { container, Instances } from "../../config/container.ts";
+import { container, Instances } from "../../utils/config/container.ts";
 
 const authRoutes = new Hono().post(
   "/sign-in",

libs/mod/vocabulary/repository.ts

@@ -1,14 +1,18 @@
 import type { SupabaseClient } from "@supabase/supabase-js";
 import { injectable } from "inversify";
-import { Env } from "../../config/index.ts";
-import { supabase } from "../../db/index.ts";
 
 import "reflect-metadata";
+import { supabase } from "../../utils/db/index.ts";
+import { Env } from "../../utils/config/index.ts";
 
 type TVocabulary = {
   word: string;
   content: string;
   remark: string;
+  thai: string;
+  english: string;
+  type: string;
+  example: string;
 };
 
 export interface IVocabularyRepository {
@@ -46,12 +50,11 @@ export class VocabularyRepository implements IVocabularyRepository {
     return data;
   }
   public async insert(v: TVocabulary) {
-    // const auth = await this._db.auth.signInWithPassword({
-    //   email: Env.supabaseUser!,
-    //   password: Env.supabasePass!,
-    // });
-
-    // console.log("auth", auth);
+    // TODO: Fix this
+    await this._db.auth.signInWithPassword({
+      email: Env.supabaseUser!,
+      password: Env.supabasePass!,
+      }); 
     const { data, error } = await this._db.from(TableName).insert([{ ...v }]);
     if (error) {
       console.error(error);

libs/mod/vocabulary/service.ts

@@ -1,14 +1,12 @@
+import { transform } from './../../utils/common/transform.ts';
 import { injectable, inject } from "inversify";
-import type { IVocabularyRepository, VocabularyRepository } from "./repository.ts";
+import type { IVocabularyRepository } from "./repository.ts";
 import { OpenAIAPI } from "../../api/openai.api.ts";
 
 import "reflect-metadata";
 
 export interface IVocabularyService {
   insert(word: string): Promise<any>;
-  // TODO: move to auth service file
-  // auth(): Promise<any>;
-  // getUser(token: string): Promise<any>;
 }
 
 @injectable()
@@ -42,10 +40,19 @@ export class VocabularyService implements IVocabularyService {
       console.log(`call openai: ${word}`);
       const res = await this._openai.translate(word);
       const content = res.choices[0].message.content ?? "";
+      const {thai, english, example, type, remark} = transform(content);
+      console.log("==============")
+      console.log(content)
+      // console.log(data);
+      console.log("==============")
       vocabulary = await this._repo.insert({
         word,
         content,
-        remark: "auto",
+        remark,
+        thai,
+        english,
+        type,
+        example,
       });
     }
     return vocabulary;

libs/utils/common/transform.ts

@@ -0,0 +1,32 @@
+export const transform = (content: string) => {
+  return content.split("\n").reduce(
+    (p, c) => {
+      //     console.log("p", p);
+      //     console.log("c", c.split(":"));
+      const [k, v] = c.split(":");
+      return { ...p, [key(k)]: v.trim() };
+    },
+    {
+      thai: "",
+      english: "",
+      type: "",
+      example: "",
+      remark: "",
+    }
+  );
+};
+
+const key = (k: string) => {
+  switch (k.replace("-", "").trim()) {
+    case "แปลเป็นภาษาไทย":
+      return "thai";
+    case "คำอ่านในภาษาอังกฤษ":
+      return "english";
+    case "ประเภทของคำ":
+      return "type";
+    case "ตัวอย่างประโยคในภาษาอังกฤษ":
+      return "example";
+    default:
+      return "remark";
+  }
+};

libs/utils/config/container.ts

@@ -1,16 +1,9 @@
-import { IUserRepository } from "./../mod/auth/repository.ts";
 import { Container } from "inversify";
-import {
-  VocabularyRepository,
-  type IVocabularyRepository,
-} from "../mod/vocabulary/repository.ts";
-import { OpenAIAPI } from "../api/openai.api.ts";
-import {
-  VocabularyService,
-  type IVocabularyService,
-} from "../mod/vocabulary/service.ts";
-import { UserRepository } from "../mod/auth/repository.ts";
-import { UserService, type IUserService } from "../mod/auth/service.ts";
+import { VocabularyRepository, type IVocabularyRepository } from "../../mod/vocabulary/repository.ts";
+import { OpenAIAPI } from "../../api/openai.api.ts";
+import { VocabularyService, type IVocabularyService } from "../../mod/vocabulary/service.ts";
+import { UserRepository, type IUserRepository } from "../../mod/auth/repository.ts";
+import { UserService, type IUserService } from "../../mod/auth/service.ts";
 
 enum Instances {
   OpenAIAPI = "OpenAIAPI",

test/transform_test.ts

@@ -0,0 +1,16 @@
+import { assertEquals } from "jsr:@std/assert";
+import { transform } from "../libs/utils/common/transform.ts";
+
+Deno.test("transform", () => {
+  const input = `- แปลเป็นภาษาไทย: บรรพบุรุษ, สิ่งที่มาก่อน\n- คำอ่านในภาษาอังกฤษ: แอน-ติ-ซี-เดนท์\n- ประเภทของคำ: คำนาม (Noun)\n- ตัวอย่างประโยคในภาษาอังกฤษ: In grammar, the noun "dog" is the antecedent of the pronoun "it" in the sentence "The dog chased its tail."`;
+  const result = transform(input);
+  console.log("result", result);
+  assertEquals(result, {
+    thai: "บรรพบุรุษ, สิ่งที่มาก่อน",
+    english: "แอน-ติ-ซี-เดนท์",
+    type: "คำนาม (Noun)",
+    example:
+      'In grammar, the noun "dog" is the antecedent of the pronoun "it" in the sentence "The dog chased its tail."',
+    remark: "",
+  });
+});