diff --git a/.oxlintrc.json b/.oxlintrc.json index 00a4313378..71100fb660 100644 --- a/.oxlintrc.json +++ b/.oxlintrc.json @@ -16,8 +16,6 @@ ".gitignore", "scripts/cloudflare-worker.js", "src/main/services/nutstore/sso/lib/**", - "src/main/integration/cherryai/index.js", - "src/main/services/nutstore/sso/lib/**", "src/renderer/ui/**", "packages/**/dist", "eslint.config.mjs", diff --git a/eslint.config.mjs b/eslint.config.mjs index f4f6657cb2..4f87f61450 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -123,7 +123,6 @@ export default defineConfig([ '.conductor/**', 'scripts/cloudflare-worker.js', 'src/main/services/nutstore/sso/lib/**', - 'src/main/integration/cherryai/index.js', 'src/renderer/ui/**', 'src/renderer/routeTree.gen.ts', 'packages/**/dist', diff --git a/src/main/integration/cherryai/config.ts b/src/main/ai/provider/cherryai/config.ts similarity index 100% rename from src/main/integration/cherryai/config.ts rename to src/main/ai/provider/cherryai/config.ts diff --git a/src/main/integration/cherryai/index.ts b/src/main/ai/provider/cherryai/index.ts similarity index 100% rename from src/main/integration/cherryai/index.ts rename to src/main/ai/provider/cherryai/index.ts diff --git a/src/main/ai/provider/config.ts b/src/main/ai/provider/config.ts index f563af1c47..5db9bc9c10 100644 --- a/src/main/ai/provider/config.ts +++ b/src/main/ai/provider/config.ts @@ -6,7 +6,6 @@ import { formatPrivateKey, hasProviderConfig, type StringKeys } from '@cherrystudio/ai-core/provider' import type { CherryInProviderSettings } from '@cherrystudio/ai-sdk-provider' import { providerService } from '@main/data/services/ProviderService' -import { generateSignature } from '@main/integration/cherryai' import { copilotService } from '@main/services/CopilotService' import type { EndpointType, Model } from '@shared/data/types/model' import { ENDPOINT_TYPE } from '@shared/data/types/model' @@ -20,6 +19,7 @@ import { isEmpty } from 'lodash' import type { ProviderConfig } from '../types' import { type AppProviderId, appProviderIds, type AppProviderSettingsMap } from '../types' import { getBaseUrl, getExtraHeaders, routeToEndpoint } from '../utils/provider' +import { generateSignature } from './cherryai' import { COPILOT_DEFAULT_HEADERS } from './constants' import { resolveAiSdkProviderId, resolveEffectiveEndpoint } from './endpoint' diff --git a/src/main/ipc.ts b/src/main/ipc.ts index be1938ab63..a6dd10e6b3 100644 --- a/src/main/ipc.ts +++ b/src/main/ipc.ts @@ -4,8 +4,8 @@ import path from 'node:path' import { application } from '@application' import { loggerService } from '@logger' +import { generateSignature } from '@main/ai/provider/cherryai' import { isMac, isWin } from '@main/core/platform' -import { generateSignature } from '@main/integration/cherryai' import { listDirectory as searchListDirectory } from '@main/services/file/tree/search' import { getIpCountry } from '@main/utils/ipService' import { diff --git a/tsconfig.web.json b/tsconfig.web.json index 8592bd8a2b..68ef80833a 100644 --- a/tsconfig.web.json +++ b/tsconfig.web.json @@ -35,7 +35,6 @@ "include": [ "local/src/renderer/**/*", "src/renderer/**/*", - "src/main/integration/cherryai/index.js", "src/preload/*.d.ts", "tests/__mocks__/**/*", "packages/aiCore/src/**/*",