diff options
| author | Mohamed Bassem <me@mbassem.com> | 2024-10-26 20:07:16 +0000 |
|---|---|---|
| committer | Mohamed Bassem <me@mbassem.com> | 2024-10-26 20:07:16 +0000 |
| commit | 3e727f7ba3ad157ca1ccc6100711266cae1bde23 (patch) | |
| tree | 767639f897f258886921162eb5bb1c73f318e61e /apps/workers | |
| parent | db45aaf1f61f57287bd2d98e73ec0a071b6caf88 (diff) | |
| download | karakeep-3e727f7ba3ad157ca1ccc6100711266cae1bde23.tar.zst | |
refactor: Move inference to the shared package
Diffstat (limited to '')
| -rw-r--r-- | apps/workers/openaiWorker.ts | 4 | ||||
| -rw-r--r-- | apps/workers/package.json | 2 | ||||
| -rw-r--r-- | packages/shared/inference.ts (renamed from apps/workers/inference.ts) | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/apps/workers/openaiWorker.ts b/apps/workers/openaiWorker.ts index f436f71b..b1394f73 100644 --- a/apps/workers/openaiWorker.ts +++ b/apps/workers/openaiWorker.ts @@ -1,6 +1,7 @@ import { and, Column, eq, inArray, sql } from "drizzle-orm"; import { z } from "zod"; +import type { InferenceClient } from "@hoarder/shared/inference"; import type { ZOpenAIRequest } from "@hoarder/shared/queues"; import { db } from "@hoarder/db"; import { @@ -13,6 +14,7 @@ import { import { DequeuedJob, Runner } from "@hoarder/queue"; import { readAsset } from "@hoarder/shared/assetdb"; import serverConfig from "@hoarder/shared/config"; +import { InferenceClientFactory } from "@hoarder/shared/inference"; import logger from "@hoarder/shared/logger"; import { buildImagePrompt, buildTextPrompt } from "@hoarder/shared/prompts"; import { @@ -21,8 +23,6 @@ import { zOpenAIRequestSchema, } from "@hoarder/shared/queues"; -import type { InferenceClient } from "./inference"; -import { InferenceClientFactory } from "./inference"; import { readImageText, readPDFText } from "./utils"; const openAIResponseSchema = z.object({ diff --git a/apps/workers/package.json b/apps/workers/package.json index 0ab7caa2..289f7315 100644 --- a/apps/workers/package.json +++ b/apps/workers/package.json @@ -26,8 +26,6 @@ "metascraper-title": "^5.45.22", "metascraper-twitter": "^5.45.6", "metascraper-url": "^5.45.22", - "ollama": "^0.5.9", - "openai": "^4.67.1", "pdf2json": "^3.0.5", "pdfjs-dist": "^4.0.379", "puppeteer": "^22.0.0", diff --git a/apps/workers/inference.ts b/packages/shared/inference.ts index fed9478f..f34c2880 100644 --- a/apps/workers/inference.ts +++ b/packages/shared/inference.ts @@ -1,8 +1,8 @@ import { Ollama } from "ollama"; import OpenAI from "openai"; -import serverConfig from "@hoarder/shared/config"; -import logger from "@hoarder/shared/logger"; +import serverConfig from "./config"; +import logger from "./logger"; export interface InferenceResponse { response: string; |
