Skip to content

Commit b621414

Browse files
authored
fix: Fixed failure logging not to logs as IDE error for Q feature-dev (#4181)
1 parent 73fc53d commit b621414

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import com.intellij.openapi.editor.Editor
1717
import com.intellij.openapi.fileChooser.FileChooser
1818
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
1919
import com.intellij.openapi.fileEditor.FileEditorManager
20-
import com.intellij.openapi.project.guessProjectDir
2120
import com.intellij.openapi.vfs.VfsUtil
2221
import com.intellij.openapi.wm.ToolWindowManager
2322
import kotlinx.coroutines.withContext
@@ -644,7 +643,8 @@ class FeatureDevController(
644643
}
645644

646645
private suspend fun modifyDefaultSourceFolder(tabId: String) {
647-
val uri = context.project.guessProjectDir() ?: error("Cannot guess base directory for project ${context.project.name}")
646+
val session = getSessionInfo(tabId)
647+
val uri = session.context.projectRoot
648648
val fileChooserDescriptor = FileChooserDescriptorFactory.createSingleFolderDescriptor()
649649

650650
val modifyFolderFollowUp = FollowUp(
@@ -683,7 +683,6 @@ class FeatureDevController(
683683

684684
logger.info { "Selected correct folder inside workspace: ${selectedFolder.path}" }
685685

686-
val session = getSessionInfo(tabId)
687686
session.context.projectRoot = selectedFolder
688687

689688
messenger.sendAnswer(

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/FeatureDevClientUtil.kt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import software.amazon.awssdk.services.codewhispererruntime.model.ValidationExce
1313
import software.amazon.awssdk.services.codewhispererstreaming.model.CodeWhispererStreamingException
1414
import software.amazon.awssdk.services.codewhispererstreaming.model.ThrottlingException
1515
import software.aws.toolkits.core.utils.debug
16-
import software.aws.toolkits.core.utils.error
1716
import software.aws.toolkits.core.utils.getLogger
17+
import software.aws.toolkits.core.utils.warn
1818
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.CodeIterationLimitError
1919
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ContentLengthError
2020
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FEATURE_NAME
@@ -43,12 +43,12 @@ fun createConversation(proxyClient: FeatureDevClient): String {
4343

4444
return conversationId
4545
} catch (e: Exception) {
46-
logger.error(e) { "$FEATURE_NAME: Failed to start conversation: ${e.message}" }
46+
logger.warn(e) { "$FEATURE_NAME: Failed to start conversation: ${e.message}" }
4747

4848
var errMssg = e.message
4949
if (e is CodeWhispererRuntimeException) {
5050
errMssg = e.awsErrorDetails().errorMessage()
51-
logger.error(e) { "Start conversation failed for request: ${e.requestId()}" }
51+
logger.warn(e) { "Start conversation failed for request: ${e.requestId()}" }
5252
}
5353
apiError(errMssg, e.cause)
5454
}
@@ -68,12 +68,12 @@ fun createUploadUrl(proxyClient: FeatureDevClient, conversationId: String, conte
6868
}
6969
return uploadUrlResponse
7070
} catch (e: Exception) {
71-
logger.error(e) { "$FEATURE_NAME: Failed to generate presigned url: ${e.message}" }
71+
logger.warn(e) { "$FEATURE_NAME: Failed to generate presigned url: ${e.message}" }
7272

7373
var errMssg = e.message
7474
if (e is CodeWhispererRuntimeException) {
7575
errMssg = e.awsErrorDetails().errorMessage()
76-
logger.error(e) { "Create UploadUrl failed for request: ${e.requestId()}" }
76+
logger.warn(e) { "Create UploadUrl failed for request: ${e.requestId()}" }
7777

7878
if (e is ValidationException && e.message?.contains("Invalid contentLength") == true) {
7979
throw ContentLengthError(message("amazonqFeatureDev.content_length.error_text"), e.cause)
@@ -107,12 +107,12 @@ suspend fun generatePlan(
107107
)
108108
return generatePlanResult
109109
} catch (e: Exception) {
110-
logger.error(e) { "$FEATURE_NAME: Failed to execute planning : ${e.message}" }
110+
logger.warn(e) { "$FEATURE_NAME: Failed to execute planning : ${e.message}" }
111111

112112
var errMssg = e.message
113113
if (e is CodeWhispererStreamingException) {
114114
errMssg = e.awsErrorDetails().errorMessage()
115-
logger.error(e) { "Generate plan failed for request: ${e.requestId()}" }
115+
logger.warn(e) { "Generate plan failed for request: ${e.requestId()}" }
116116

117117
if (e is ThrottlingException && e.message?.contains("limit for number of iterations on an implementation plan") == true) {
118118
throw PlanIterationLimitError(message("amazonqFeatureDev.approach_gen.iteration_limit.error_text"), e.cause)
@@ -135,12 +135,12 @@ fun startTaskAssistCodeGeneration(proxyClient: FeatureDevClient, conversationId:
135135
logger.debug { "$FEATURE_NAME: Started code generation with requestId: ${startCodeGenerationResponse.responseMetadata().requestId()}" }
136136
return startCodeGenerationResponse
137137
} catch (e: Exception) {
138-
logger.error(e) { "$FEATURE_NAME: Failed to execute startTaskAssistCodeGeneration ${e.message}" }
138+
logger.warn(e) { "$FEATURE_NAME: Failed to execute startTaskAssistCodeGeneration ${e.message}" }
139139

140140
var errMssg = e.message
141141
if (e is CodeWhispererRuntimeException) {
142142
errMssg = e.awsErrorDetails().errorMessage()
143-
logger.error(e) { "StartTaskAssistCodeGeneration failed for request: ${e.requestId()}" }
143+
logger.warn(e) { "StartTaskAssistCodeGeneration failed for request: ${e.requestId()}" }
144144

145145
if (e is software.amazon.awssdk.services.codewhispererruntime.model.ThrottlingException && e.message?.contains(
146146
"limit for number of iterations on a code generation"
@@ -165,12 +165,12 @@ fun getTaskAssistCodeGeneration(proxyClient: FeatureDevClient, conversationId: S
165165
}
166166
return getCodeGenerationResponse
167167
} catch (e: Exception) {
168-
logger.error(e) { "$FEATURE_NAME: Failed to execute GetTaskAssistCodeGeneration ${e.message}" }
168+
logger.warn(e) { "$FEATURE_NAME: Failed to execute GetTaskAssistCodeGeneration ${e.message}" }
169169

170170
var errMssg = e.message
171171
if (e is CodeWhispererRuntimeException) {
172172
errMssg = e.awsErrorDetails().errorMessage()
173-
logger.error(e) { "GetTaskAssistCodeGeneration failed for request: ${e.requestId()}" }
173+
logger.warn(e) { "GetTaskAssistCodeGeneration failed for request: ${e.requestId()}" }
174174
}
175175
apiError(errMssg, e.cause)
176176
}
@@ -182,12 +182,12 @@ suspend fun exportTaskAssistArchiveResult(proxyClient: FeatureDevClient, convers
182182
exportResponse = proxyClient.exportTaskAssistResultArchive(conversationId)
183183
logger.debug { "$FEATURE_NAME: Received export task assist result archive response" }
184184
} catch (e: Exception) {
185-
logger.error(e) { "$FEATURE_NAME: Failed to export archive result: ${e.message}" }
185+
logger.warn(e) { "$FEATURE_NAME: Failed to export archive result: ${e.message}" }
186186

187187
var errMssg = e.message
188188
if (e is CodeWhispererStreamingException) {
189189
errMssg = e.awsErrorDetails().errorMessage()
190-
logger.error(e) { "ExportTaskAssistArchiveResult failed for request: ${e.requestId()}" }
190+
logger.warn(e) { "ExportTaskAssistArchiveResult failed for request: ${e.requestId()}" }
191191
}
192192
apiError(errMssg, e.cause)
193193
}

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/UploadArtifact.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util
55

66
import com.intellij.util.io.HttpRequests
77
import software.amazon.awssdk.utils.IoUtils
8-
import software.aws.toolkits.core.utils.error
98
import software.aws.toolkits.core.utils.getLogger
109
import software.aws.toolkits.core.utils.warn
1110
import software.aws.toolkits.jetbrains.core.AwsClientManager
@@ -38,7 +37,7 @@ fun uploadArtifactToS3(url: String, fileToUpload: File, checksumSha256: String,
3837
IoUtils.copy(fileToUpload.inputStream(), connection.outputStream)
3938
}
4039
} catch (err: Exception) {
41-
logger.error(err) { "$FEATURE_NAME: Failed to upload code to S3" }
40+
logger.warn(err) { "$FEATURE_NAME: Failed to upload code to S3" }
4241
uploadCodeError()
4342
}
4443
}

0 commit comments

Comments
 (0)