deps: updated codewhispererstreaming client with latest model changes (#5523)

patvid · web-flow · commit 5f35e4d6efeb · 2025-04-11T09:52:53.000-07:00
1. Updated the service-2.json file of the codewhispererstreaming client, copied the output from `/aws-sdk-external-2023-11-27/c2j/codewhispererstreaming-2023-11-27.normal.json`.
2. Certain build (`./gradlew :plugin-amazonq:buildPlugin`) and  test case (`./gradlew :plugin-amazonq:test`) were failing as a result also applied small fixes for it in files:
- plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/v1/ChatSessionV1.kt
- plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt
- plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt
- plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/v1/ChatSessionV1.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/v1/ChatSessionV1.kt
@@ -294,6 +294,8 @@ class ChatSessionV1(
         UserIntent.EXPLAIN_CODE_SELECTION -> FollowUpType.ExplainInDetail
         UserIntent.UNKNOWN_TO_SDK_VERSION -> FollowUpType.Generated
         UserIntent.GENERATE_UNIT_TESTS -> FollowUpType.Generated
+        UserIntent.GENERATE_CLOUDFORMATION_TEMPLATE -> FollowUpType.Generated
+        UserIntent.CODE_GENERATION -> FollowUpType.Generated
         null -> FollowUpType.Generated
     }
 
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt
@@ -64,6 +64,8 @@ class TelemetryHelper(private val project: Project, private val sessionStorage:
         UserIntent.EXPLAIN_CODE_SELECTION -> CwsprChatUserIntent.ExplainCodeSelection
         UserIntent.GENERATE_UNIT_TESTS -> CwsprChatUserIntent.GenerateUnitTests
         UserIntent.UNKNOWN_TO_SDK_VERSION -> CwsprChatUserIntent.Unknown
+        UserIntent.GENERATE_CLOUDFORMATION_TEMPLATE -> CwsprChatUserIntent.Unknown
+        UserIntent.CODE_GENERATION -> CwsprChatUserIntent.Unknown
     }
 
     private fun getTelemetryTriggerType(triggerType: TriggerType): CwsprChatTriggerInteraction = when (triggerType) {
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt
@@ -528,6 +528,7 @@ class ArtifactHandler(
             TransformationDownloadArtifactType.CLIENT_INSTRUCTIONS -> CodeTransformArtifactType.ClientInstructions
             TransformationDownloadArtifactType.LOGS -> CodeTransformArtifactType.Logs
             TransformationDownloadArtifactType.UNKNOWN_TO_SDK_VERSION -> CodeTransformArtifactType.Unknown
+            TransformationDownloadArtifactType.GENERATED_CODE -> CodeTransformArtifactType.Unknown
         }
 
     companion object {
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt
@@ -778,4 +778,5 @@ fun getDownloadedArtifactTextFromType(artifactType: TransformationDownloadArtifa
         TransformationDownloadArtifactType.CLIENT_INSTRUCTIONS -> "upgraded code"
         TransformationDownloadArtifactType.LOGS -> "build log"
         TransformationDownloadArtifactType.UNKNOWN_TO_SDK_VERSION -> "code"
+        TransformationDownloadArtifactType.GENERATED_CODE -> "code"
     }
diff --git a/plugins/core/sdk-codegen/codegen-resources/codewhispererstreaming/service-2.json b/plugins/core/sdk-codegen/codegen-resources/codewhispererstreaming/service-2.json

Original file line number	Diff line number	Diff line change
`@@ -294,6 +294,8 @@ class ChatSessionV1(`
`294`	`294`	`UserIntent.EXPLAIN_CODE_SELECTION -> FollowUpType.ExplainInDetail`
`295`	`295`	`UserIntent.UNKNOWN_TO_SDK_VERSION -> FollowUpType.Generated`
`296`	`296`	`UserIntent.GENERATE_UNIT_TESTS -> FollowUpType.Generated`
	`297`	`+ UserIntent.GENERATE_CLOUDFORMATION_TEMPLATE -> FollowUpType.Generated`
	`298`	`+ UserIntent.CODE_GENERATION -> FollowUpType.Generated`
`297`	`299`	`null -> FollowUpType.Generated`
`298`	`300`	`}`
`299`	`301`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,8 @@ class TelemetryHelper(private val project: Project, private val sessionStorage:`
`64`	`64`	`UserIntent.EXPLAIN_CODE_SELECTION -> CwsprChatUserIntent.ExplainCodeSelection`
`65`	`65`	`UserIntent.GENERATE_UNIT_TESTS -> CwsprChatUserIntent.GenerateUnitTests`
`66`	`66`	`UserIntent.UNKNOWN_TO_SDK_VERSION -> CwsprChatUserIntent.Unknown`
	`67`	`+ UserIntent.GENERATE_CLOUDFORMATION_TEMPLATE -> CwsprChatUserIntent.Unknown`
	`68`	`+ UserIntent.CODE_GENERATION -> CwsprChatUserIntent.Unknown`
`67`	`69`	`}`
`68`	`70`
`69`	`71`	`private fun getTelemetryTriggerType(triggerType: TriggerType): CwsprChatTriggerInteraction = when (triggerType) {`
Original file line number	Diff line number	Diff line change
`@@ -528,6 +528,7 @@ class ArtifactHandler(`
`528`	`528`	`TransformationDownloadArtifactType.CLIENT_INSTRUCTIONS -> CodeTransformArtifactType.ClientInstructions`
`529`	`529`	`TransformationDownloadArtifactType.LOGS -> CodeTransformArtifactType.Logs`
`530`	`530`	`TransformationDownloadArtifactType.UNKNOWN_TO_SDK_VERSION -> CodeTransformArtifactType.Unknown`
	`531`	`+ TransformationDownloadArtifactType.GENERATED_CODE -> CodeTransformArtifactType.Unknown`
`531`	`532`	`}`
`532`	`533`
`533`	`534`	`companion object {`
Original file line number	Diff line number	Diff line change
`@@ -778,4 +778,5 @@ fun getDownloadedArtifactTextFromType(artifactType: TransformationDownloadArtifa`
`778`	`778`	`TransformationDownloadArtifactType.CLIENT_INSTRUCTIONS -> "upgraded code"`
`779`	`779`	`TransformationDownloadArtifactType.LOGS -> "build log"`
`780`	`780`	`TransformationDownloadArtifactType.UNKNOWN_TO_SDK_VERSION -> "code"`
	`781`	`+ TransformationDownloadArtifactType.GENERATED_CODE -> "code"`
`781`	`782`	`}`