Skip to content

Commit 98aac91

Browse files
tverneytverney
committed
Revert "fix(amazonqFeatureDev): include stop generation"
This reverts commit aa1a1c4.
1 parent 153ddb8 commit 98aac91

File tree

18 files changed

+1601
-1801
lines changed

18 files changed

+1601
-1801
lines changed

‎package-lock.json‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/clients/FeatureDevClient.kt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.calculateTo
3636
import software.aws.toolkits.jetbrains.services.telemetry.ClientMetadata
3737
import software.aws.toolkits.jetbrains.settings.AwsSettings
3838
import java.time.Instant
39-
import java.util.UUID
4039
import software.amazon.awssdk.services.codewhispererruntime.model.ChatTriggerType as SyncChatTriggerType
4140

4241
@Service(Service.Level.PROJECT)
@@ -88,10 +87,9 @@ class FeatureDevClient(private val project: Project) {
8887
CreateTaskAssistConversationRequest.builder().build()
8988
)
9089

91-
fun createTaskAssistUploadUrl(conversationId: String, contentChecksumSha256: String, contentLength: Long, uploadId: String): CreateUploadUrlResponse =
90+
fun createTaskAssistUploadUrl(conversationId: String, contentChecksumSha256: String, contentLength: Long): CreateUploadUrlResponse =
9291
bearerClient().createUploadUrl {
9392
it.contentChecksumType(ContentChecksumType.SHA_256)
94-
.uploadId(uploadId)
9593
.contentChecksum(contentChecksumSha256)
9694
.contentLength(contentLength)
9795
.artifactType(ArtifactType.SOURCE_CODE)
@@ -107,7 +105,7 @@ class FeatureDevClient(private val project: Project) {
107105
)
108106
}
109107

110-
fun startTaskAssistCodeGeneration(conversationId: String, uploadId: String, userMessage: String, codeGenerationId: UUID, currentCodeGenerationId: UUID?): StartTaskAssistCodeGenerationResponse = bearerClient()
108+
fun startTaskAssistCodeGeneration(conversationId: String, uploadId: String, userMessage: String): StartTaskAssistCodeGenerationResponse = bearerClient()
111109
.startTaskAssistCodeGeneration {
112110
request ->
113111
request
@@ -121,7 +119,7 @@ class FeatureDevClient(private val project: Project) {
121119
it
122120
.programmingLanguage { pl -> pl.languageName("javascript") } // This parameter is omitted by featureDev but required in the request
123121
.uploadId(uploadId)
124-
}.codeGenerationId(codeGenerationId.toString()).currentCodeGenerationId(currentCodeGenerationId.toString())
122+
}
125123
}
126124

127125
fun getTaskAssistCodeGeneration(conversationId: String, codeGenerationId: String): GetTaskAssistCodeGenerationResponse = bearerClient()

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,6 @@ class FeatureDevController(
541541
}
542542
}
543543

544-
545544
private suspend fun handleChat(
546545
tabId: String,
547546
message: String,

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.ge
2424
import software.aws.toolkits.resources.message
2525
import software.aws.toolkits.telemetry.AmazonqTelemetry
2626
import software.aws.toolkits.telemetry.Result
27-
import java.util.UUID
2827

2928
private val logger = getLogger<CodeGenerationState>()
3029

@@ -38,8 +37,7 @@ class CodeGenerationState(
3837
val repositorySize: Double,
3938
val messenger: MessagePublisher,
4039
var codeGenerationRemainingIterationCount: Int? = null,
41-
var codeGenerationTotalIterationCount: Int? = null,
42-
var currentCodeGenerationId: UUID? = null
40+
var codeGenerationTotalIterationCount: Int? = null
4341
) : SessionState {
4442
override val phase = SessionStatePhase.CODEGEN
4543

@@ -52,13 +50,10 @@ class CodeGenerationState(
5250
var numberOfReferencesGenerated: Int? = null
5351
var numberOfFilesGenerated: Int? = null
5452
try {
55-
val codeGenerationId = UUID.randomUUID()
5653
val response = config.featureDevService.startTaskAssistCodeGeneration(
5754
conversationId = config.conversationId,
5855
uploadId = uploadId,
59-
message = action.msg,
60-
codeGenerationId = codeGenerationId,
61-
currentCodeGenerationId = currentCodeGenerationId
56+
message = action.msg
6257
)
6358

6459
messenger.sendAnswerPart(

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/PrepareCodeGenerationState.kt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import software.aws.toolkits.resources.message
1717
import software.aws.toolkits.telemetry.AmazonqTelemetry
1818
import software.aws.toolkits.telemetry.AmazonqUploadIntent
1919
import software.aws.toolkits.telemetry.Result
20-
import java.util.UUID
2120

2221
private val logger = getLogger<PrepareCodeGenerationState>()
2322

@@ -52,18 +51,16 @@ class PrepareCodeGenerationState(
5251
zipFileLength = repoZipResult.contentLength
5352
val fileToUpload = repoZipResult.payload
5453

55-
val uploadId = UUID.randomUUID();
5654
val uploadUrlResponse = config.featureDevService.createUploadUrl(
5755
config.conversationId,
5856
zipFileChecksum,
59-
zipFileLength,
60-
uploadId
57+
zipFileLength
6158
)
6259

6360
uploadArtifactToS3(uploadUrlResponse.uploadUrl(), fileToUpload, zipFileChecksum, zipFileLength, uploadUrlResponse.kmsKeyArn())
6461
deleteUploadArtifact(fileToUpload)
6562

66-
this.uploadId = uploadId.toString()
63+
this.uploadId = uploadUrlResponse.uploadId()
6764
messenger.sendAnswerPart(tabId = this.tabID, message = message("amazonqFeatureDev.placeholder.context_gathering_complete"))
6865
messenger.sendUpdatePlaceholder(tabId = this.tabID, newPlaceholder = message("amazonqFeatureDev.placeholder.context_gathering_complete"))
6966
nextState = CodeGenerationState(

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/FeatureDevService.kt‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.Export
3131
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
3232
import software.aws.toolkits.telemetry.AmazonqTelemetry
3333
import software.aws.toolkits.telemetry.Result
34-
import java.util.UUID
3534

3635
private val logger = getLogger<FeatureDevClient>()
3736

@@ -83,18 +82,17 @@ class FeatureDevService(val proxyClient: FeatureDevClient, val project: Project)
8382
}
8483
}
8584

86-
fun createUploadUrl(conversationId: String, contentChecksumSha256: String, contentLength: Long, uploadId: UUID):
85+
fun createUploadUrl(conversationId: String, contentChecksumSha256: String, contentLength: Long):
8786
CreateUploadUrlResponse {
8887
try {
8988
logger.debug { "Executing createUploadUrl with conversationId $conversationId" }
9089
val uploadUrlResponse = proxyClient.createTaskAssistUploadUrl(
9190
conversationId,
9291
contentChecksumSha256,
93-
contentLength,
94-
uploadId.toString()
92+
contentLength
9593
)
9694
logger.debug {
97-
"$FEATURE_NAME: Created upload url: {uploadId: ${uploadId.toString()}, requestId: ${uploadUrlResponse.responseMetadata().requestId()}}"
95+
"$FEATURE_NAME: Created upload url: {uploadId: ${uploadUrlResponse.uploadId()}, requestId: ${uploadUrlResponse.responseMetadata().requestId()}}"
9896
}
9997
return uploadUrlResponse
10098
} catch (e: Exception) {
@@ -113,16 +111,14 @@ class FeatureDevService(val proxyClient: FeatureDevClient, val project: Project)
113111
}
114112
}
115113

116-
fun startTaskAssistCodeGeneration(conversationId: String, uploadId: String, message: String, codeGenerationId: UUID, currentCodeGenerationId: UUID?):
114+
fun startTaskAssistCodeGeneration(conversationId: String, uploadId: String, message: String):
117115
StartTaskAssistCodeGenerationResponse {
118116
try {
119117
logger.debug { "Executing startTaskAssistCodeGeneration with conversationId: $conversationId , uploadId: $uploadId" }
120118
val startCodeGenerationResponse = proxyClient.startTaskAssistCodeGeneration(
121119
conversationId,
122120
uploadId,
123-
message,
124-
codeGenerationId,
125-
currentCodeGenerationId
121+
message
126122
)
127123

128124
logger.debug { "$FEATURE_NAME: Started code generation with requestId: ${startCodeGenerationResponse.responseMetadata().requestId()}" }

‎plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevTestBase.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import software.aws.toolkits.jetbrains.utils.rules.JavaCodeInsightTestFixtureRul
4242
import software.aws.toolkits.jetbrains.utils.rules.addModule
4343
import java.io.File
4444
import java.time.Instant
45-
import java.util.UUID
4645

4746
open class FeatureDevTestBase(
4847
@Rule @JvmField
@@ -60,8 +59,6 @@ open class FeatureDevTestBase(
6059
internal val testRequestId = "test_aws_request_id"
6160
internal val testConversationId = "1234"
6261
internal val userMessage = "test-user-message"
63-
internal val codeGenerationId = UUID.randomUUID()
64-
internal val currentCodeGenerationId = UUID.randomUUID()
6562
internal val testUploadId = "5678"
6663
internal val testRepositorySize = 20.0 // Picked a random size
6764
internal val testCodeGenerationId = "1234"
@@ -72,7 +69,6 @@ open class FeatureDevTestBase(
7269
internal val testReferences = listOf(CodeReferenceGenerated())
7370
internal val testChecksumSha = "test-sha"
7471
internal val testContentLength: Long = 40
75-
internal val uploadId = UUID.randomUUID()
7672

7773
internal val exampleSendTelemetryEventResponse = SendTelemetryEventResponse.builder()
7874
.responseMetadata(DefaultAwsResponseMetadata.create(mapOf(AwsHeader.AWS_REQUEST_ID to testRequestId)))

‎plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationStateTest.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class CodeGenerationStateTest : FeatureDevTestBase() {
7171
fun `test code generated is complete`() {
7272
val action = SessionStateAction("test-task", userMessage)
7373
every { featureDevService.getTaskAssistCodeGeneration(any(), any()) } returns exampleCompleteGetTaskAssistCodeGenerationResponse
74-
every { featureDevService.startTaskAssistCodeGeneration(any(), any(), any(), any(), any()) } returns exampleStartTaskAssistConversationResponse
74+
every { featureDevService.startTaskAssistCodeGeneration(any(), any(), any()) } returns exampleStartTaskAssistConversationResponse
7575
coEvery { featureDevService.exportTaskAssistArchiveResult(any()) } returns
7676
CodeGenerationStreamResult(testFilePaths, testDeletedFiles, testReferences)
7777

@@ -95,26 +95,26 @@ class CodeGenerationStateTest : FeatureDevTestBase() {
9595
}
9696
assertThat(codeGenerationState.phase).isEqualTo(SessionStatePhase.CODEGEN)
9797
coVerify(exactly = 1) { messenger.sendAnswerPart(testTabId, message("amazonqFeatureDev.code_generation.generating_code")) }
98-
verify(exactly = 1) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage, codeGenerationId, currentCodeGenerationId) }
98+
verify(exactly = 1) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage) }
9999
verify(exactly = 1) { featureDevService.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId) }
100100
coVerify(exactly = 1) { featureDevService.exportTaskAssistArchiveResult(testConversationId) }
101101
}
102102

103103
@Test(expected = FeatureDevException::class)
104104
fun `test code generation failed`() = runTest {
105-
every { featureDevService.startTaskAssistCodeGeneration(any(), any(), any(), any(), any()) } returns exampleStartTaskAssistConversationResponse
105+
every { featureDevService.startTaskAssistCodeGeneration(any(), any(), any()) } returns exampleStartTaskAssistConversationResponse
106106
every { featureDevService.getTaskAssistCodeGeneration(any(), any()) } returns exampleFailedGetTaskAssistCodeGenerationResponse
107107

108108
codeGenerationState.interact(action)
109109

110-
verify(exactly = 1) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage, codeGenerationId, currentCodeGenerationId) }
110+
verify(exactly = 1) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage) }
111111
verify(exactly = 1) { featureDevService.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId) }
112112
coVerify(exactly = 0) { featureDevService.exportTaskAssistArchiveResult(any()) }
113113
}
114114

115115
@Test
116116
fun `test code generation returns any other handled status`() {
117-
every { featureDevService.startTaskAssistCodeGeneration(any(), any(), any(), any(), any()) } returns exampleStartTaskAssistConversationResponse
117+
every { featureDevService.startTaskAssistCodeGeneration(any(), any(), any()) } returns exampleStartTaskAssistConversationResponse
118118
every { featureDevService.getTaskAssistCodeGeneration(any(), any()) } returns exampleOtherGetTaskAssistCodeGenerationResponse
119119

120120
assertThatThrownBy {
@@ -123,14 +123,14 @@ class CodeGenerationStateTest : FeatureDevTestBase() {
123123
}
124124
}.isExactlyInstanceOf(IllegalStateException::class.java).withFailMessage("Unknown status: $otherStatus")
125125

126-
verify(exactly = 1) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage, codeGenerationId, currentCodeGenerationId) }
126+
verify(exactly = 1) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage) }
127127
verify(exactly = 1) { featureDevService.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId) }
128128
coVerify(exactly = 0) { featureDevService.exportTaskAssistArchiveResult(any()) }
129129
}
130130

131131
@Test
132132
fun `test code generation returns in progress at least once`() {
133-
every { featureDevService.startTaskAssistCodeGeneration(any(), any(), any(), any(), any()) } returns exampleStartTaskAssistConversationResponse
133+
every { featureDevService.startTaskAssistCodeGeneration(any(), any(), any()) } returns exampleStartTaskAssistConversationResponse
134134
every {
135135
featureDevService.getTaskAssistCodeGeneration(any(), any())
136136
} returnsMany listOf(exampleGetTaskAssistConversationResponse, exampleCompleteGetTaskAssistCodeGenerationResponse)
@@ -140,14 +140,14 @@ class CodeGenerationStateTest : FeatureDevTestBase() {
140140
codeGenerationState.interact(action)
141141
}
142142

143-
verify(exactly = 1) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage, codeGenerationId, currentCodeGenerationId) }
143+
verify(exactly = 1) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage) }
144144
verify(exactly = 2) { featureDevService.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId) }
145145
coVerify(exactly = 1) { featureDevService.exportTaskAssistArchiveResult(testConversationId) }
146146
}
147147

148148
@Test
149149
fun `test using all polling count`() {
150-
every { featureDevService.startTaskAssistCodeGeneration(any(), any(), any(), any(), any()) } returns exampleStartTaskAssistConversationResponse
150+
every { featureDevService.startTaskAssistCodeGeneration(any(), any(), any()) } returns exampleStartTaskAssistConversationResponse
151151
every { featureDevService.getTaskAssistCodeGeneration(any(), any()) } returns exampleGetTaskAssistConversationResponse
152152

153153
runTest {
@@ -163,7 +163,7 @@ class CodeGenerationStateTest : FeatureDevTestBase() {
163163
assertThat(actual.interaction.content).isEqualTo("")
164164
}
165165

166-
verify(exactly = 1) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage, codeGenerationId, currentCodeGenerationId) }
166+
verify(exactly = 1) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage) }
167167
verify(exactly = 180) { featureDevService.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId) }
168168
coVerify(exactly = 0) { featureDevService.exportTaskAssistArchiveResult(testConversationId) }
169169
}

‎plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/PrepareCodeGenerationStateTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class PrepareCodeGenerationStateTest : FeatureDevTestBase() {
6666
every { deleteUploadArtifact(any()) } just runs
6767

6868
every { featureDevService.getTaskAssistCodeGeneration(any(), any()) } returns exampleCompleteGetTaskAssistCodeGenerationResponse
69-
every { featureDevService.startTaskAssistCodeGeneration(any(), any(), any(), any(), any()) } returns exampleStartTaskAssistConversationResponse
69+
every { featureDevService.startTaskAssistCodeGeneration(any(), any(), any()) } returns exampleStartTaskAssistConversationResponse
7070
coEvery { featureDevService.exportTaskAssistArchiveResult(any()) } returns exampleExportTaskAssistResultArchiveResponse
7171

7272
mockkStatic(MessagePublisher::sendAnswerPart)
@@ -85,7 +85,7 @@ class PrepareCodeGenerationStateTest : FeatureDevTestBase() {
8585
val action = SessionStateAction("test-task", userMessage)
8686

8787
whenever(repoContext.getProjectZip()).thenReturn(repoZipResult)
88-
every { featureDevService.createUploadUrl(any(), any(), any(), any()) } returns exampleCreateUploadUrlResponse
88+
every { featureDevService.createUploadUrl(any(), any(), any()) } returns exampleCreateUploadUrlResponse
8989

9090
runTest {
9191
val actual = prepareCodeGenerationState.interact(action)
@@ -94,6 +94,6 @@ class PrepareCodeGenerationStateTest : FeatureDevTestBase() {
9494
}
9595
assertThat(prepareCodeGenerationState.phase).isEqualTo(SessionStatePhase.CODEGEN)
9696
verify(repoContext, times(1)).getProjectZip()
97-
io.mockk.verify(exactly = 1) { featureDevService.createUploadUrl(testConversationId, testChecksumSha, testContentLength, uploadId) }
97+
io.mockk.verify(exactly = 1) { featureDevService.createUploadUrl(testConversationId, testChecksumSha, testContentLength) }
9898
}
9999
}

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ object CodeWhispererConstants {
119119
}
120120

121121
object Config {
122-
const val CODEWHISPERER_ENDPOINT = "https://rts.gamma-us-east-1.codewhisperer.ai.aws.dev/" // PROD
122+
const val CODEWHISPERER_ENDPOINT = "https://codewhisperer.us-east-1.amazonaws.com/" // PROD
123123
const val CODEWHISPERER_IDPOOL_ID = "us-east-1:70717e99-906f-4add-908c-bd9074a2f5b9"
124124
val Sigv4ClientRegion = Region.US_EAST_1
125125
val BearerClientRegion = Region.US_EAST_1

0 commit comments

Comments
 (0)