Revert "feat(sagemaker): free tier Q Chat with auto-login for iam users and login option for pro tier users" (#5884)

Reverts #5858

Author: hayemaxi

docs/build.md

@@ -1,23 +1,11 @@
 # Build
 
-The AmazonQ features rely on the `codewhisperer-streaming` service, to support both Sigv4 and Bearer token modes of this service,
-two clients are generated from the service's smithy models and placed in
-`src.gen/@amzn/amazon-q-developer-streaming-client` and `src.gen/@amzn/codewhisperer-streaming` respectively (For more
-information about these clients and how they are generated, please see this
+The AmazonQ features rely on the `codewhisperer-streaming` service, who's client
+is generated from the service's smithy models and placed in
+`src.gen/@amzn/codewhisperer-streaming` (For more
+information about this client and how it is generated, please see this
 [quip document](https://quip-amazon.com/2dAWAvTIYXXr/Build-instructions-for-AWS-CodeWhisperer-Streaming-Typescript-client)).
 
-## @amzn/amazon-q-developer-streaming client
-
-This client is a standalone npm project in typescript, and it is added to
-the project as a workspace in the project's root `package.json` with the line `"workspaces": [ ..., "src.gen/@amzn/amazon-q-developer-streaming" ]`.
-The client may be manually built using `npm run build -w @amzn/amazon-q-developer-streaming"`.
-The `generateClients` run script ensures that this dependency is
-built before the toolkit project itself. Workspaces are automatically ready to
-be imported in the root toolkit project by their declared package.json name,
-(`@amzn/amazon-q-developer-streaming` in this case).
-
-## @amzn/codewhisperer-streaming client
-
 This client is a standalone npm project in typescript, and it is added to
 the project as a workspace in the project's root `package.json` with the line `"workspaces": [ ..., "src.gen/@amzn/codewhisperer-streaming" ]`.
 The client may be manually built using `npm run build -w @amzn/codewhisperer-streaming"`.

package-lock.json

@@ -20,7 +20,7 @@
     },
     "scripts": {
         "prepare": "ts-node ./scripts/prepare.ts",
-        "preinstall": "cd src.gen/@amzn/codewhisperer-streaming && npm i && cd ../amazon-q-developer-streaming-client && npm i",
+        "preinstall": "cd src.gen/@amzn/codewhisperer-streaming && npm i",
         "postinstall": "npm run buildCustomLintPlugin && npm run postinstall -ws --if-present",
         "buildCustomLintPlugin": "npm run build -w plugins/eslint-plugin-aws-toolkits",
         "compile": "npm run compile -w packages/",

package.json

@@ -196,13 +196,13 @@
                     "type": "webview",
                     "id": "aws.amazonq.AmazonCommonAuth",
                     "name": "%AWS.amazonq.login%",
-                    "when": "!aws.isWebExtHost && aws.amazonq.showLoginView"
+                    "when": "!aws.isSageMaker && !aws.isWebExtHost && aws.amazonq.showLoginView"
                 },
                 {
                     "type": "webview",
                     "id": "aws.AmazonQChatView",
                     "name": "%AWS.amazonq.chat%",
-                    "when": "!aws.isWebExtHost && !aws.amazonq.showLoginView"
+                    "when": "!aws.isSageMaker && !aws.isWebExtHost && !aws.amazonq.showLoginView"
                 },
                 {
                     "id": "aws.AmazonQNeverShowBadge",

packages/amazonq/.changes/next-release/Bug Fix-0ee7be24-b0f8-460b-a852-a2d08b6d289e.json

@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { SendMessageCommandOutput, SendMessageRequest } from '@amzn/amazon-q-developer-streaming-client'
 import { GenerateAssistantResponseCommandOutput, GenerateAssistantResponseRequest } from '@amzn/codewhisperer-streaming'
 import { AuthUtil } from 'aws-core-vscode/codewhisperer'
 import { ChatSession } from 'aws-core-vscode/codewhispererChat'
@@ -13,11 +12,7 @@ export default {
     chatApi: {
         async chat(request: GenerateAssistantResponseRequest): Promise<GenerateAssistantResponseCommandOutput> {
             const chatSession = new ChatSession()
-            return chatSession.chatSso(request)
-        },
-        async chatIam(request: SendMessageRequest): Promise<SendMessageCommandOutput> {
-            const chatSession = new ChatSession()
-            return chatSession.chatIam(request)
+            return chatSession.chat(request)
         },
     },
     authApi: {

packages/amazonq/.changes/next-release/Bug Fix-4db8f989-da38-467f-bf2e-598c9ed9af81.json

@@ -44,7 +44,6 @@ import {
     setContext,
     setupUninstallHandler,
     maybeShowMinVscodeWarning,
-    isSageMaker,
 } from 'aws-core-vscode/shared'
 import { ExtStartUpSources, telemetry } from 'aws-core-vscode/telemetry'
 import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
@@ -194,7 +193,7 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
                 }
             }
             const currConn = AuthUtil.instance.conn
-            if (currConn !== undefined && !(isAnySsoConnection(currConn) || isSageMaker())) {
+            if (currConn !== undefined && !isAnySsoConnection(currConn)) {
                 getLogger().error(`Current Amazon Q connection is not SSO, type is: %s`, currConn?.type)
             }