Skip to content

Commit f3fbd5f

Browse files
authored
Merge branch 'main' into manodnyb/tryPuppeteerWithAuth
2 parents 3b5fd0e + f8fa131 commit f3fbd5f

File tree

17 files changed

+89
-52
lines changed

17 files changed

+89
-52
lines changed

.changes/3.56.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"date" : "2025-02-20",
3+
"version" : "3.56",
4+
"entries" : [ {
5+
"type" : "feature",
6+
"description" : "Amazon Q /doc: support making changes to architecture diagrams"
7+
} ]
8+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "Amazon Q /doc: update workspace too large error message"
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "Amazon Q /doc: Fix uploading file method throwing incorrect workspace too large error message"
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "/transform: skip running tests locally when user chooses to do so"
4+
}

.changes/next-release/feature-bfb6687a-a302-4968-8e7e-8fa0d4ef6c53.json

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

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# _3.56_ (2025-02-20)
2+
- **(Feature)** Amazon Q /doc: support making changes to architecture diagrams
3+
14
# _3.55_ (2025-02-13)
25
- **(Feature)** /transform: support transformations to Java 21
36
- **(Bug Fix)** Enable syntax highlighting when viewing diff for /test

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
# Toolkit Version
5-
toolkitVersion=3.56-SNAPSHOT
5+
toolkitVersion=3.57-SNAPSHOT
66

77
# Publish Settings
88
publishToken=

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/common/util/AmazonQCodeGenService.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import software.aws.toolkits.core.utils.getLogger
2020
import software.aws.toolkits.core.utils.warn
2121
import software.aws.toolkits.jetbrains.common.clients.AmazonQCodeGenerateClient
2222
import software.aws.toolkits.jetbrains.common.session.Intent
23+
import software.aws.toolkits.jetbrains.services.amazonqDoc.docServiceError
2324
import software.aws.toolkits.jetbrains.services.amazonqDoc.session.DocGenerationStreamResult
2425
import software.aws.toolkits.jetbrains.services.amazonqDoc.session.ExportDocTaskAssistResultArchiveStreamResult
2526
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.CodeIterationLimitException
@@ -31,6 +32,7 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevOper
3132
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MonthlyConversationLimitError
3233
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ZipFileCorruptedException
3334
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
35+
import software.aws.toolkits.resources.message
3436
import software.aws.toolkits.telemetry.AmazonqTelemetry
3537
import software.aws.toolkits.telemetry.MetricResult
3638

@@ -82,7 +84,7 @@ class AmazonQCodeGenService(val proxyClient: AmazonQCodeGenerateClient, val proj
8284
}
8385
}
8486

85-
fun createUploadUrl(conversationId: String, contentChecksumSha256: String, contentLength: Long, uploadId: String):
87+
fun createUploadUrl(conversationId: String, contentChecksumSha256: String, contentLength: Long, uploadId: String, featureName: String? = null):
8688
CreateUploadUrlResponse {
8789
try {
8890
logger.debug { "Executing createUploadUrl with conversationId $conversationId" }
@@ -104,6 +106,9 @@ class AmazonQCodeGenService(val proxyClient: AmazonQCodeGenerateClient, val proj
104106
logger.warn(e) { "Create UploadUrl failed for request: ${e.requestId()}" }
105107

106108
if (e is ValidationException && e.message?.contains("Invalid contentLength") == true) {
109+
if (featureName?.equals("docGeneration") == true) {
110+
throw docServiceError(message("amazonqDoc.exception.content_length_error"))
111+
}
107112
throw ContentLengthException(operation = FeatureDevOperation.CreateUploadUrl.toString(), desc = null, cause = e.cause)
108113
}
109114
}

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/session/PrepareDocGenerationState.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ class PrepareDocGenerationState(
4848
config.conversationId,
4949
zipFileChecksum,
5050
zipFileLength,
51-
uploadId
51+
uploadId,
52+
"docGeneration"
5253
)
5354

5455
uploadArtifactToS3(

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,10 @@ import kotlinx.coroutines.job
3232
import kotlinx.coroutines.withContext
3333
import migration.software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
3434
import software.amazon.awssdk.services.codewhispererstreaming.model.UserIntent
35-
import software.aws.toolkits.core.utils.debug
3635
import software.aws.toolkits.core.utils.getLogger
3736
import software.aws.toolkits.core.utils.info
3837
import software.aws.toolkits.core.utils.warn
3938
import software.aws.toolkits.jetbrains.core.coroutines.EDT
40-
import software.aws.toolkits.jetbrains.services.amazonq.CHAT_IMPLICIT_PROJECT_CONTEXT_TIMEOUT
4139
import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
4240
import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthController
4341
import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthNeededState
@@ -140,7 +138,6 @@ class ChatController private constructor(
140138
val triggerId = UUID.randomUUID().toString()
141139
var shouldAddIndexInProgressMessage: Boolean = false
142140
var shouldUseWorkspaceContext: Boolean = false
143-
val startUrl = getStartUrl(context.project)
144141

145142
if (prompt.contains("@workspace")) {
146143
if (CodeWhispererSettings.getInstance().isProjectContextEnabled()) {
@@ -153,13 +150,6 @@ class ChatController private constructor(
153150
} else {
154151
sendOpenSettingsMessage(message.tabId)
155152
}
156-
} else if (CodeWhispererSettings.getInstance().isProjectContextEnabled()) {
157-
if (ProjectContextController.getInstance(context.project).getProjectContextIndexComplete()) {
158-
val projectContextController = ProjectContextController.getInstance(context.project)
159-
queryResult = projectContextController.queryChat(prompt, timeout = CHAT_IMPLICIT_PROJECT_CONTEXT_TIMEOUT)
160-
} else {
161-
logger.debug { "skipping implicit workspace context as index is not ready" }
162-
}
163153
}
164154

165155
handleChat(

0 commit comments

Comments
 (0)