remove more

Author: mkondratek

agent/bindings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/CodyAgentServer.kt

@@ -64,12 +64,8 @@ interface CodyAgentServer {
   fun graphql_getRepoIds(params: Graphql_GetRepoIdsParams): CompletableFuture<Graphql_GetRepoIdsResult>
   @JsonRequest("graphql/currentUserId")
   fun graphql_currentUserId(params: Null?): CompletableFuture<String>
-  @JsonRequest("graphql/currentUserIsPro")
-  fun graphql_currentUserIsPro(params: Null?): CompletableFuture<Boolean>
   @JsonRequest("featureFlags/getFeatureFlag")
   fun featureFlags_getFeatureFlag(params: FeatureFlags_GetFeatureFlagParams): CompletableFuture<Boolean?>
-  @JsonRequest("graphql/getCurrentUserCodySubscription")
-  fun graphql_getCurrentUserCodySubscription(params: Null?): CompletableFuture<CurrentUserCodySubscription?>
   @JsonRequest("telemetry/recordEvent")
   fun telemetry_recordEvent(params: TelemetryEvent): CompletableFuture<Null?>
   @JsonRequest("graphql/getRepoIdIfEmbeddingExists")

agent/bindings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/CurrentUserCodySubscription.kt

@@ -729,6 +729,7 @@ export class TestClient extends MessageHandler {
         const jsonText = message.split('\n').slice(1).join('\n')
         const json = JSON.parse(jsonText)
         const bodyText = json?.body ?? '{}'
+        console.log(`[mixer] bodyText: ${bodyText}`)
         const body = JSON.parse(bodyText)
         const { closestBody } = await this.request('testing/closestPostData', {
             url: json?.url ?? '',

agent/src/TestClient.ts

@@ -1090,24 +1090,6 @@ export class Agent extends MessageHandler implements ExtensionClient {
             throw id
         })
 
-        this.registerAuthenticatedRequest('graphql/currentUserIsPro', async () => {
-            const res = await graphqlClient.getCurrentUserCodyProEnabled()
-            if (res instanceof Error) {
-                throw res
-            }
-
-            return Boolean(res?.codyProEnabled)
-        })
-
-        this.registerAuthenticatedRequest('graphql/getCurrentUserCodySubscription', async () => {
-            const res = await graphqlClient.getCurrentUserCodySubscription()
-            if (res instanceof Error) {
-                throw res
-            }
-
-            return res
-        })
-
         this.registerAuthenticatedRequest('telemetry/recordEvent', async event => {
             telemetryRecorder.recordEvent(
                 // 👷 HACK: We have no control over what gets sent over JSON RPC,

agent/src/agent.ts

@@ -173,25 +173,6 @@ describe('Agent', () => {
         )
     }, 10_000)
 
-    it('graphql/getCurrentUserCodySubscription', async () => {
-        const currentUserCodySubscription = await client.request(
-            'graphql/getCurrentUserCodySubscription',
-            null
-        )
-        expect(currentUserCodySubscription).toMatchInlineSnapshot(`
-          {
-            "applyProRateLimits": true,
-            "currentPeriodEndAt": "2025-01-14T22:11:32Z",
-            "currentPeriodStartAt": "2024-12-14T22:11:32Z",
-            "plan": "PRO",
-            "status": "ACTIVE",
-          }
-        `)
-        // telemetry assertion, to validate the expected events fired during the test run
-        // Do not remove this assertion, and instead update the expectedEvents list above
-        expect(await exportedTelemetryEvents(client)).toEqual(expect.arrayContaining([]))
-    }, 10_000)
-
     describe('Chat', () => {
         it('chat/submitMessage (short message)', async () => {
             await setChatModel('anthropic::2024-10-22::claude-3-5-sonnet-latest')

agent/src/index.test.ts

@@ -1,6 +1,5 @@
 import { isDotCom } from '../sourcegraph-api/environments'
 import type { AuthError } from '../sourcegraph-api/errors'
-import type { UserProductSubscription } from '../sourcegraph-api/userProductSubscription'
 
 /**
  * The authentication status, which includes representing the state when authentication failed or
@@ -73,14 +72,6 @@ export const AUTH_STATUS_FIXTURE_AUTHED_DOTCOM: AuthenticatedAuthStatus = {
     endpoint: 'https://sourcegraph.com' as string,
 }
 
-export function isCodyProUser(authStatus: AuthStatus, sub: UserProductSubscription | null): boolean {
-    return isDotCom(authStatus) && authStatus.authenticated && sub !== null && !sub.userCanUpgrade
-}
-
-export function isFreeUser(authStatus: AuthStatus, sub: UserProductSubscription | null): boolean {
-    return isDotCom(authStatus) && authStatus.authenticated && sub !== null && !!sub.userCanUpgrade
-}
-
 export function isEnterpriseUser(authStatus: AuthStatus): boolean {
     return !isDotCom(authStatus)
 }

lib/shared/src/auth/types.ts

@@ -343,7 +343,6 @@ export {
     promise,
     type ReadonlyDeep,
 } from './utils'
-export type { CurrentUserCodySubscription } from './sourcegraph-api/graphql/client'
 export * from './auth/types'
 export * from './auth/tokens'
 export * from './auth/referral'
@@ -421,13 +420,6 @@ export * from './singletons'
 export * from './auth/authStatus'
 export { fetchLocalOllamaModels } from './llm-providers/ollama/utils'
 export * from './editor/editorState'
-export {
-    currentUserProductSubscription,
-    checkIfEnterpriseUser,
-    type UserProductSubscription,
-    cachedUserProductSubscription,
-    userProductSubscription,
-} from './sourcegraph-api/userProductSubscription'
 export {
     siteVersion,
     currentSiteVersion,

lib/shared/src/index.ts

@@ -1,5 +1,5 @@
 import { type Observable, map } from 'observable-fns'
-import type { AuthStatus, ModelsData, ResolvedConfiguration, UserProductSubscription } from '../..'
+import type { AuthStatus, ModelsData, ResolvedConfiguration } from '../..'
 import type { SerializedPromptEditorState } from '../..'
 import type { ChatHistoryType, LightweightChatHistory } from '../../chat/transcript'
 import type { ChatMessage, UserLocalHistory } from '../../chat/transcript/messages'
@@ -106,11 +106,6 @@ export interface WebviewToExtensionAPI {
      */
     userHistory(type?: ChatHistoryType): Observable<LightweightChatHistory | UserLocalHistory | null>
 
-    /**
-     * The current user's product subscription information (Cody Free/Pro).
-     */
-    userProductSubscription(): Observable<UserProductSubscription | null>
-
     mcpSettings(): Observable<McpServer[] | null>
 }
 
@@ -160,7 +155,6 @@ export function createExtensionAPI(
         authStatus: proxyExtensionAPI(messageAPI, 'authStatus'),
         transcript: proxyExtensionAPI(messageAPI, 'transcript'),
         userHistory: proxyExtensionAPI(messageAPI, 'userHistory'),
-        userProductSubscription: proxyExtensionAPI(messageAPI, 'userProductSubscription'),
         repos: proxyExtensionAPI(messageAPI, 'repos'),
         mcpSettings: proxyExtensionAPI(messageAPI, 'mcpSettings'),
     }

lib/shared/src/misc/rpc/webviewAPI.ts

@@ -4,9 +4,6 @@ import { currentAuthStatus, mockAuthStatus } from '../auth/authStatus'
 import { AUTH_STATUS_FIXTURE_AUTHED, type AuthenticatedAuthStatus } from '../auth/types'
 import { FeatureFlag, featureFlagProvider } from '../experimentation/FeatureFlagProvider'
 import { firstValueFrom } from '../misc/observable'
-import { DOTCOM_URL } from '../sourcegraph-api/environments'
-import * as userProductSubscriptionModule from '../sourcegraph-api/userProductSubscription'
-import type { UserProductSubscription } from '../sourcegraph-api/userProductSubscription'
 import { CHAT_INPUT_TOKEN_BUDGET, CHAT_OUTPUT_TOKEN_BUDGET } from '../token/constants'
 import { FIXTURE_MODELS } from './fixtures'
 import type { Model } from './model'
@@ -31,22 +28,6 @@ describe('modelsService', () => {
         return modelsService
     }
 
-    const freeUserAuthStatus: AuthenticatedAuthStatus = {
-        ...AUTH_STATUS_FIXTURE_AUTHED,
-        endpoint: DOTCOM_URL.toString(),
-        authenticated: true,
-    }
-    const freeUserSub: UserProductSubscription = {
-        userCanUpgrade: true,
-    }
-
-    const codyProAuthStatus: AuthenticatedAuthStatus = {
-        ...freeUserAuthStatus,
-    }
-    const codyProSub: UserProductSubscription = {
-        userCanUpgrade: false,
-    }
-
     const enterpriseAuthStatus: AuthenticatedAuthStatus = {
         ...AUTH_STATUS_FIXTURE_AUTHED,
         endpoint: 'https://sourcegraph.example.com',
@@ -173,10 +154,7 @@ describe('modelsService', () => {
 
         let modelsService: ModelsService
         beforeEach(() => {
-            mockAuthStatus(codyProAuthStatus)
-            vi.spyOn(userProductSubscriptionModule, 'userProductSubscription', 'get').mockReturnValue(
-                Observable.of(codyProSub)
-            )
+            mockAuthStatus(enterpriseAuthStatus)
             modelsService = modelsServiceWithModels([
                 model1chat,
                 model2chat,
@@ -247,78 +225,29 @@ describe('modelsService', () => {
             usage: [ModelUsage.Chat],
             tags: [ModelTag.Enterprise],
         })
-        const proModel = createModel({
-            id: 'pro-model',
-            usage: [ModelUsage.Chat],
-            tags: [ModelTag.Pro],
-        })
-        const freeModel = createModel({
-            id: 'free-model',
-            usage: [ModelUsage.Chat],
-            // We don't include ModelTag.Free here to test that it's not required.
-            tags: [],
-        })
 
         beforeEach(() => {
             vi.spyOn(modelsService, 'modelsChanges', 'get').mockReturnValue(
                 Observable.of({
                     ...EMPTY_MODELS_DATA,
-                    primaryModels: [enterpriseModel, proModel, freeModel],
+                    primaryModels: [enterpriseModel],
                 })
             )
         })
 
         it('returns false for unknown model', async () => {
-            mockAuthStatus(codyProAuthStatus)
-            vi.spyOn(userProductSubscriptionModule, 'userProductSubscription', 'get').mockReturnValue(
-                Observable.of(codyProSub)
-            )
+            mockAuthStatus(enterpriseAuthStatus)
             expect(await firstValueFrom(modelsService.isModelAvailable('unknown-model'))).toBe(false)
         })
 
         it('allows enterprise user to use any model', async () => {
             mockAuthStatus(enterpriseAuthStatus)
-            vi.spyOn(userProductSubscriptionModule, 'userProductSubscription', 'get').mockReturnValue(
-                Observable.of(null)
-            )
             expect(await firstValueFrom(modelsService.isModelAvailable(enterpriseModel))).toBe(true)
-            expect(await firstValueFrom(modelsService.isModelAvailable(proModel))).toBe(true)
-            expect(await firstValueFrom(modelsService.isModelAvailable(freeModel))).toBe(true)
-        })
-
-        it('allows Cody Pro user to use Pro and Free models', async () => {
-            mockAuthStatus(codyProAuthStatus)
-            vi.spyOn(userProductSubscriptionModule, 'userProductSubscription', 'get').mockReturnValue(
-                Observable.of(codyProSub)
-            )
-            expect(await firstValueFrom(modelsService.isModelAvailable(enterpriseModel))).toBe(false)
-            expect(await firstValueFrom(modelsService.isModelAvailable(proModel))).toBe(true)
-            expect(await firstValueFrom(modelsService.isModelAvailable(freeModel))).toBe(true)
-        })
-
-        it('allows free user to use only Free models', async () => {
-            mockAuthStatus(freeUserAuthStatus)
-            vi.spyOn(userProductSubscriptionModule, 'userProductSubscription', 'get').mockReturnValue(
-                Observable.of(freeUserSub)
-            )
-            expect(await firstValueFrom(modelsService.isModelAvailable(enterpriseModel))).toBe(false)
-            expect(await firstValueFrom(modelsService.isModelAvailable(proModel))).toBe(false)
-            expect(await firstValueFrom(modelsService.isModelAvailable(freeModel))).toBe(true)
         })
 
         it('handles model passed as string', async () => {
-            mockAuthStatus(freeUserAuthStatus)
-            vi.spyOn(userProductSubscriptionModule, 'userProductSubscription', 'get').mockReturnValue(
-                Observable.of(freeUserSub)
-            )
-            expect(await firstValueFrom(modelsService.isModelAvailable(freeModel.id))).toBe(true)
-            expect(await firstValueFrom(modelsService.isModelAvailable(proModel.id))).toBe(false)
-
-            mockAuthStatus(codyProAuthStatus)
-            vi.spyOn(userProductSubscriptionModule, 'userProductSubscription', 'get').mockReturnValue(
-                Observable.of(codyProSub)
-            )
-            expect(await firstValueFrom(modelsService.isModelAvailable(proModel.id))).toBe(true)
+            mockAuthStatus(enterpriseAuthStatus)
+            expect(await firstValueFrom(modelsService.isModelAvailable(enterpriseModel.id))).toBe(true)
         })
     })
 
@@ -475,10 +404,7 @@ describe('modelsService', () => {
         })
 
         beforeEach(() => {
-            mockAuthStatus(codyProAuthStatus)
-            vi.spyOn(userProductSubscriptionModule, 'userProductSubscription', 'get').mockReturnValue(
-                Observable.of(codyProSub)
-            )
+            mockAuthStatus(enterpriseAuthStatus)
 
             modelsService = new ModelsService()
             storage = new TestLocalStorageForModelPreferences()
@@ -674,12 +600,8 @@ describe('modelsService', () => {
         })
 
         beforeEach(() => {
-            mockAuthStatus(freeUserAuthStatus)
+            mockAuthStatus(enterpriseAuthStatus)
             vi.spyOn(featureFlagProvider, 'evaluatedFeatureFlag').mockReturnValue(Observable.of(true))
-            vi.spyOn(userProductSubscriptionModule, 'userProductSubscription', 'get').mockReturnValue(
-                Observable.of(codyProSub)
-            )
-
             storage = new TestLocalStorageForModelPreferences()
         })
 
@@ -704,7 +626,7 @@ describe('modelsService', () => {
             expect(defaultEditModelId).toBe('gpt-4o-mini')
 
             const prefsAfter = storage.getModelPreferences()
-            const selectedEditModel = prefsAfter[freeUserAuthStatus.endpoint]?.selected?.edit
+            const selectedEditModel = prefsAfter[enterpriseAuthStatus.endpoint]?.selected?.edit
             expect(selectedEditModel).toBe('gpt-4o-mini')
         })
 
@@ -733,7 +655,7 @@ describe('modelsService', () => {
             expect(defaultEditModelId).toBe('other-edit-model')
 
             const prefsAfter = storage.getModelPreferences()
-            const selectedEditModel = prefsAfter[freeUserAuthStatus.endpoint]?.selected?.edit
+            const selectedEditModel = prefsAfter[enterpriseAuthStatus.endpoint]?.selected?.edit
             expect(selectedEditModel).toBe('other-edit-model')
         })
     })