diff --git a/apps/dashboard/.env-example b/apps/dashboard/.env-example index ba1d0b6e1..8879879a8 100644 --- a/apps/dashboard/.env-example +++ b/apps/dashboard/.env-example @@ -49,5 +49,5 @@ PLAIN_API_KEY= BASELIME_SERVICE= BASELIME_API_KEY= -# Groq -GROQ_API_KEY= +# OpenAI +OPENAI_API_KEY= diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json index 41d8a9a2b..f74283383 100644 --- a/apps/dashboard/package.json +++ b/apps/dashboard/package.json @@ -17,7 +17,6 @@ "@baselime/node-opentelemetry": "^0.5.8", "@date-fns/utc": "^1.2.0", "@hookform/resolvers": "^3.4.0", - "@langchain/groq": "^0.0.11", "@midday/events": "workspace:*", "@midday/inbox": "workspace:*", "@midday/jobs": "workspace:*", diff --git a/apps/dashboard/src/actions/ai/get-vat-rate.ts b/apps/dashboard/src/actions/ai/get-vat-rate.ts index f41e02fb0..c1b994ded 100644 --- a/apps/dashboard/src/actions/ai/get-vat-rate.ts +++ b/apps/dashboard/src/actions/ai/get-vat-rate.ts @@ -1,16 +1,16 @@ "use server"; import { ChatPromptTemplate } from "@langchain/core/prompts"; -import { ChatGroq } from "@langchain/groq"; +import { ChatOpenAI } from "@langchain/openai"; import { getCountry } from "@midday/location"; import { z } from "zod"; import { action } from "../safe-action"; import { getVatRateSchema } from "../schema"; -const model = new ChatGroq({ +const model = new ChatOpenAI({ temperature: 0, - model: "mixtral-8x7b-32768", - apiKey: process.env.GROQ_API_KEY, + model: "gpt-4o", + apiKey: process.env.OPENAI_API_KEY, }); const vatSchema = z.object({ diff --git a/apps/dashboard/src/env.mjs b/apps/dashboard/src/env.mjs index 2fbcc70bc..4225d7a2d 100644 --- a/apps/dashboard/src/env.mjs +++ b/apps/dashboard/src/env.mjs @@ -8,18 +8,6 @@ export const env = createEnv({ .optional() .transform((v) => (v ? `https://${v}` : undefined)), PORT: z.coerce.number().default(3000), - RESEND_API_KEY: z.string(), - LOOPS_ENDPOINT: z.string(), - LOOPS_API_KEY: z.string(), - GOCARDLESS_SECRET_ID: z.string(), - GOCARDLESS_SECRET_KEY: z.string(), - NOVU_API_KEY: z.string(), - UPSTASH_REDIS_REST_URL: z.string(), - UPSTASH_REDIS_REST_TOKEN: z.string(), - SUPABASE_SERVICE_KEY: z.string(), - GROQ_API_KEY: z.string(), - API_ROUTE_SECRET: z.string(), - PLAIN_API_KEY: z.string(), }, /** * Specify your server-side environment variables schema here. This way you can ensure the app isn't @@ -30,7 +18,7 @@ export const env = createEnv({ GOOGLE_APPLICATION_EXPENSE_PROCESSOR_ID: z.string(), PLAIN_API_KEY: z.string(), API_ROUTE_SECRET: z.string(), - GROQ_API_KEY: z.string(), + OPENAI_API_KEY: z.string(), SUPABASE_SERVICE_KEY: z.string(), UPSTASH_REDIS_REST_TOKEN: z.string(), UPSTASH_REDIS_REST_URL: z.string(), @@ -88,7 +76,7 @@ export const env = createEnv({ NEXT_PUBLIC_LOGSNAG_TOKEN: process.env.NEXT_PUBLIC_LOGSNAG_TOKEN, NEXT_PUBLIC_LOGSNAG_PROJECT: process.env.NEXT_PUBLIC_LOGSNAG_PROJECT, SUPABASE_SERVICE_KEY: process.env.SUPABASE_SERVICE_KEY, - GROQ_API_KEY: process.env.GROQ_API_KEY, + OPENAI_API_KEY: process.env.OPENAI_API_KEY, API_ROUTE_SECRET: process.env.API_ROUTE_SECRET, PLAIN_API_KEY: process.env.PLAIN_API_KEY, GOOGLE_APPLICATION_INVOICE_PROCESSOR_ID: process.env.PLAIN_API_KEY, diff --git a/bun.lockb b/bun.lockb index ef75c234a..3195c0610 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/packages/import/src/index.ts b/packages/import/src/index.ts index 6db28fd4c..aad05eebe 100644 --- a/packages/import/src/index.ts +++ b/packages/import/src/index.ts @@ -13,7 +13,7 @@ export function csvTransformed({ teamId, }: CsvTransformedParams) { const originalCsv = parseCsv(raw); - const firstFewRows = extracted.splice(0, 20); + const firstFewRows = extracted.splice(5, 20); const dateIndex = findIndexesByKey({ raw: originalCsv, diff --git a/packages/import/src/utils.ts b/packages/import/src/utils.ts index 3f29ec565..caf425d33 100644 --- a/packages/import/src/utils.ts +++ b/packages/import/src/utils.ts @@ -40,7 +40,7 @@ export function transform(transaction: TransformTransaction) { export function parseCsv(input: string) { return parse(input, { - delimiter: [",", ";", ".", " "], + delimiter: [",", ";", "."], skip_empty_lines: true, skip_records_with_empty_values: true, skip_records_with_error: true, diff --git a/packages/jobs/src/transactions/import.ts b/packages/jobs/src/transactions/import.ts index f7834dba3..295ee33cb 100644 --- a/packages/jobs/src/transactions/import.ts +++ b/packages/jobs/src/transactions/import.ts @@ -101,8 +101,6 @@ client.defineJob({ const results = await extractionChain.batch(extractionChainParams); const transactions = results.flatMap((result) => result.transactions); - console.log(transactions); - const transformedTransactions = csvTransformed({ raw: rawText, extracted: transactions,