move ModelsService to modelsService.ts

lib/shared/src/index.ts

@@ -4,8 +4,10 @@ export {
     modelsService,
     mockModelsService,
     ModelsService,
+    ModelCategory,
+    ModelTier,
     type ServerModelConfiguration,
-} from './models'
+} from './models/modelsService'
 export {
     type Model,
     type ServerModel,
@@ -30,6 +32,7 @@ export {
     isCodyProModel,
     isCustomModel,
     toModelRefStr,
+    isWaitlistModel,
 } from './models/utils'
 export { BotResponseMultiplexer } from './chat/bot-response-multiplexer'
 export { ChatClient } from './chat/chat'

lib/shared/src/llm-providers/clients.ts

@@ -1,6 +1,6 @@
 import type { ChatNetworkClient, ChatNetworkClientParams } from '.'
 import { googleChatClient, groqChatClient, ollamaChatClient } from '..'
-import { modelsService } from '../models'
+import { modelsService } from '../models/modelsService'
 import { isCustomModel } from '../models/utils'
 import { anthropicChatClient } from './anthropic/chat-client'
 

lib/shared/src/llm-providers/utils.ts

@@ -1,5 +1,5 @@
 import type { CompletionsModelConfig } from '.'
-import { modelsService } from '../models'
+import { modelsService } from '../models/modelsService'
 
 export function getCompletionsModelConfig(modelID: string): CompletionsModelConfig | undefined {
     const provider = modelsService.getModelByID(modelID)

lib/shared/src/models/model.ts

@@ -1,3 +1,4 @@
+import { CHAT_INPUT_TOKEN_BUDGET, CHAT_OUTPUT_TOKEN_BUDGET } from '../token/constants'
 import {
     type ClientSideConfig,
     type ContextWindow,
@@ -8,8 +9,7 @@ import {
     type ModelStatus,
     type ModelTier,
     capabilityToUsage,
-} from '.'
-import { CHAT_INPUT_TOKEN_BUDGET, CHAT_OUTPUT_TOKEN_BUDGET } from '../token/constants'
+} from './modelsService'
 import { ModelTag } from './tags'
 import type { ModelContextWindow, ModelUsage } from './types'
 import { getModelInfo } from './utils'

lib/shared/src/models/index.test.ts → lib/shared/src/models/modelsService.test.ts

@@ -1,19 +1,19 @@
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { mockAuthStatus } from '../auth/authStatus'
 import { AUTH_STATUS_FIXTURE_AUTHED, type AuthenticatedAuthStatus } from '../auth/types'
+import { DOTCOM_URL } from '../sourcegraph-api/environments'
+import { CHAT_INPUT_TOKEN_BUDGET, CHAT_OUTPUT_TOKEN_BUDGET } from '../token/constants'
+import { getDotComDefaultModels } from './dotcom'
+import type { ServerModel } from './model'
+import { createModel, createModelFromServerModel, modelTier } from './model'
 import {
     type ModelCategory,
     type ModelTier,
     ModelsService,
     type ServerModelConfiguration,
     type TestStorage,
     mockModelsService,
-} from '../models/index'
-import { DOTCOM_URL } from '../sourcegraph-api/environments'
-import { CHAT_INPUT_TOKEN_BUDGET, CHAT_OUTPUT_TOKEN_BUDGET } from '../token/constants'
-import { getDotComDefaultModels } from './dotcom'
-import type { ServerModel } from './model'
-import { createModel, createModelFromServerModel, modelTier } from './model'
+} from './modelsService'
 import { ModelTag } from './tags'
 import { ModelUsage } from './types'
 

lib/shared/src/models/utils.ts

@@ -1,6 +1,6 @@
-import type { ModelRef, ModelRefStr } from '.'
 import { ModelTag } from '..'
 import type { Model } from './model'
+import type { ModelRef, ModelRefStr } from './modelsService'
 
 export function getProviderName(name: string): string {
     const providerName = name.toLowerCase()

lib/shared/src/sourcegraph-api/rest/client.ts

@@ -1,4 +1,4 @@
-import type { ServerModelConfiguration } from '../../models/index'
+import type { ServerModelConfiguration } from '../../models/modelsService'
 
 import { fetch } from '../../fetch'
 import { logError } from '../../logger'

vscode/test/e2e/enterprise-server-sent-models.test.ts

@@ -1,9 +1,5 @@
 import { expect } from '@playwright/test'
-import type {
-    ModelCategory,
-    ModelTier,
-    ServerModelConfiguration,
-} from '@sourcegraph/cody-shared/src/models'
+import type { ModelCategory, ModelTier, ServerModelConfiguration } from '@sourcegraph/cody-shared'
 import { createEmptyChatPanel, sidebarSignin } from './common'
 import { test } from './helpers'
 

vscode/test/fixtures/mock-server.ts

@@ -4,7 +4,7 @@ import { PubSub } from "@google-cloud/pubsub";
 import express from "express";
 import * as uuid from "uuid";
 
-import type { ServerModelConfiguration } from "@sourcegraph/cody-shared/src/models";
+import type { ServerModelConfiguration } from "@sourcegraph/cody-shared";
 import type { TelemetryEventInput } from "@sourcegraph/telemetry";
 
 // create interface for the request

vscode/webviews/components/modelSelectField/ModelSelectField.story.tsx

@@ -2,8 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'
 
 import { VSCodeStandaloneComponent } from '../../storybook/VSCodeStoryDecorator'
 
-import { type Model, ModelUsage, getDotComDefaultModels } from '@sourcegraph/cody-shared'
-import { ModelTag } from '@sourcegraph/cody-shared/src/models/tags'
+import { type Model, ModelTag, ModelUsage, getDotComDefaultModels } from '@sourcegraph/cody-shared'
 import { useArgs } from '@storybook/preview-api'
 import { ModelSelectField } from './ModelSelectField'
 

vscode/webviews/components/modelSelectField/ModelSelectField.tsx

@@ -1,5 +1,4 @@
-import { type Model, ModelTag, isCodyProModel } from '@sourcegraph/cody-shared'
-import { isWaitlistModel } from '@sourcegraph/cody-shared/src/models/utils'
+import { type Model, ModelTag, isCodyProModel, isWaitlistModel } from '@sourcegraph/cody-shared'
 import { clsx } from 'clsx'
 import { BookOpenIcon, BuildingIcon, ExternalLinkIcon } from 'lucide-react'
 import { type FunctionComponent, type ReactNode, useCallback, useMemo } from 'react'