diff options
| -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 | ||||
| -rw-r--r-- | packages/shared/package.json | 2 | ||||
| -rw-r--r-- | pnpm-lock.yaml | 13 |
5 files changed, 13 insertions, 12 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; diff --git a/packages/shared/package.json b/packages/shared/package.json index 69d93075..f6774263 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -8,6 +8,8 @@ "@hoarder/queue": "workspace:^0.1.0", "glob": "^11.0.0", "meilisearch": "^0.37.0", + "ollama": "^0.5.9", + "openai": "^4.67.1", "winston": "^3.11.0", "zod": "^3.22.4" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d6638882..04cb0c62 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -749,12 +749,6 @@ importers: metascraper-url: specifier: ^5.45.22 version: 5.45.22 - ollama: - specifier: ^0.5.9 - version: 0.5.9 - openai: - specifier: ^4.67.1 - version: 4.67.1(zod@3.22.4) pdf2json: specifier: ^3.0.5 version: 3.0.5 @@ -955,6 +949,12 @@ importers: meilisearch: specifier: ^0.37.0 version: 0.37.0 + ollama: + specifier: ^0.5.9 + version: 0.5.9 + openai: + specifier: ^4.67.1 + version: 4.67.1(zod@3.22.4) winston: specifier: ^3.11.0 version: 3.11.0 @@ -4709,6 +4709,7 @@ packages: '@xmldom/xmldom@0.7.13': resolution: {integrity: sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g==} engines: {node: '>=10.0.0'} + deprecated: this version is no longer supported, please update to at least 0.8.* '@xmldom/xmldom@0.8.10': resolution: {integrity: sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==} |