Skip to content

Commit 9078467

Browse files
siakmun-awssiakmun-aws
committed
Fix review
1 parent 3170ff8 commit 9078467

File tree

3 files changed

+35
-54
lines changed

3 files changed

+35
-54
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@ enum class FeatureDevOperation(private val operationName: String) {
4040
}
4141

4242
enum class MetricDataOperationName(private val operationName: String) {
43-
START_CODE_GENERATION("StartCodeGeneration"),
44-
END_CODE_GENERATION("EndCodeGeneration"),
43+
StartCodeGeneration("StartCodeGeneration"),
44+
EndCodeGeneration("EndCodeGeneration"),
4545
;
4646

4747
override fun toString(): String = operationName
4848
}
4949

5050
enum class MetricDataResult(private val resultName: String) {
51-
SUCCESS("Success"),
52-
FAULT("Fault"),
53-
ERROR("Error"),
54-
LLMFAILURE("LLMFailure"),
51+
Success("Success"),
52+
Fault("Fault"),
53+
Error("Error"),
54+
LlmFailure("LLMFailure"),
5555
;
5656

5757
override fun toString(): String = resultName

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

Lines changed: 16 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import com.intellij.notification.NotificationAction
77
import software.aws.toolkits.jetbrains.services.amazonq.messages.MessagePublisher
88
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.CODE_GENERATION_RETRY_LIMIT
99
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.EmptyPatchException
10-
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevException
1110
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.GuardrailsException
1211
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MetricDataOperationName
1312
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MetricDataResult
@@ -72,8 +71,8 @@ suspend fun FeatureDevController.onCodeGeneration(
7271
messenger.sendUpdatePlaceholder(tabId = tabId, newPlaceholder = message("amazonqFeatureDev.placeholder.generating_code"))
7372

7473
session.sendMetricDataTelemetry(
75-
MetricDataOperationName.START_CODE_GENERATION,
76-
MetricDataResult.SUCCESS
74+
MetricDataOperationName.StartCodeGeneration,
75+
MetricDataResult.Success
7776
)
7877

7978
session.send(message) // Trigger code generation
@@ -148,50 +147,32 @@ suspend fun FeatureDevController.onCodeGeneration(
148147

149148
messenger.sendSystemPrompt(tabId = tabId, followUp = getFollowUpOptions(session.sessionState.phase, InsertAction.ALL))
150149
messenger.sendUpdatePlaceholder(tabId = tabId, newPlaceholder = message("amazonqFeatureDev.placeholder.after_code_generation"))
151-
} catch (err: FeatureDevException) {
152-
when (true) {
153-
(err is GuardrailsException) -> {
154-
session.sendMetricDataTelemetry(
155-
MetricDataOperationName.END_CODE_GENERATION,
156-
MetricDataResult.ERROR
157-
)
158-
}
159-
(err is PromptRefusalException) -> {
160-
session.sendMetricDataTelemetry(
161-
MetricDataOperationName.END_CODE_GENERATION,
162-
MetricDataResult.ERROR
163-
)
164-
}
165-
(err is EmptyPatchException) -> {
166-
session.sendMetricDataTelemetry(
167-
MetricDataOperationName.END_CODE_GENERATION,
168-
MetricDataResult.LLMFAILURE
169-
)
170-
}
171-
(err is NoChangeRequiredException) -> {
150+
} catch (err: Exception) {
151+
when (err) {
152+
is GuardrailsException, is NoChangeRequiredException, is PromptRefusalException, is ThrottlingException -> {
172153
session.sendMetricDataTelemetry(
173-
MetricDataOperationName.END_CODE_GENERATION,
174-
MetricDataResult.ERROR
154+
MetricDataOperationName.EndCodeGeneration,
155+
MetricDataResult.Error
175156
)
176157
}
177-
(err is ThrottlingException) -> {
158+
is EmptyPatchException -> {
178159
session.sendMetricDataTelemetry(
179-
MetricDataOperationName.END_CODE_GENERATION,
180-
MetricDataResult.ERROR
160+
MetricDataOperationName.EndCodeGeneration,
161+
MetricDataResult.LlmFailure
181162
)
182163
}
183164
else -> {
184165
session.sendMetricDataTelemetry(
185-
MetricDataOperationName.END_CODE_GENERATION,
186-
MetricDataResult.FAULT
166+
MetricDataOperationName.EndCodeGeneration,
167+
MetricDataResult.Fault
187168
)
188169
}
189170
}
190171
throw err
191172
} catch (err: Exception) {
192173
session.sendMetricDataTelemetry(
193-
MetricDataOperationName.END_CODE_GENERATION,
194-
MetricDataResult.FAULT
174+
MetricDataOperationName.EndCodeGeneration,
175+
MetricDataResult.Fault
195176
)
196177
throw err
197178
} finally {
@@ -215,8 +196,8 @@ suspend fun FeatureDevController.onCodeGeneration(
215196
}
216197

217198
session.sendMetricDataTelemetry(
218-
MetricDataOperationName.END_CODE_GENERATION,
219-
MetricDataResult.SUCCESS
199+
MetricDataOperationName.EndCodeGeneration,
200+
MetricDataResult.Success
220201
)
221202
}
222203

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -462,13 +462,13 @@ class FeatureDevControllerTest : FeatureDevTestBase() {
462462
val mockInOrder = inOrder(mockSession)
463463

464464
mockInOrder.verify(mockSession).sendMetricDataTelemetry(
465-
MetricDataOperationName.START_CODE_GENERATION,
466-
MetricDataResult.SUCCESS
465+
MetricDataOperationName.StartCodeGeneration,
466+
MetricDataResult.Success
467467

468468
)
469469
mockInOrder.verify(mockSession).sendMetricDataTelemetry(
470-
MetricDataOperationName.END_CODE_GENERATION,
471-
MetricDataResult.SUCCESS
470+
MetricDataOperationName.EndCodeGeneration,
471+
MetricDataResult.Success
472472
)
473473
}
474474

@@ -482,27 +482,27 @@ class FeatureDevControllerTest : FeatureDevTestBase() {
482482
val testCases = listOf(
483483
ErrorTestCase(
484484
EmptyPatchException("EmptyPatchException", "Empty patch"),
485-
MetricDataResult.LLMFAILURE
485+
MetricDataResult.LlmFailure
486486
),
487487
ErrorTestCase(
488488
GuardrailsException(operation = "GenerateCode", desc = "Failed guardrails"),
489-
MetricDataResult.ERROR
489+
MetricDataResult.Error
490490
),
491491
ErrorTestCase(
492492
PromptRefusalException(operation = "GenerateCode", desc = "Prompt refused"),
493-
MetricDataResult.ERROR
493+
MetricDataResult.Error
494494
),
495495
ErrorTestCase(
496496
NoChangeRequiredException(operation = "GenerateCode", desc = "No changes needed"),
497-
MetricDataResult.ERROR
497+
MetricDataResult.Error
498498
),
499499
ErrorTestCase(
500500
ThrottlingException(operation = "GenerateCode", desc = "Request throttled"),
501-
MetricDataResult.ERROR
501+
MetricDataResult.Error
502502
),
503503
ErrorTestCase(
504504
RuntimeException("Unknown error"),
505-
MetricDataResult.FAULT
505+
MetricDataResult.Fault
506506
)
507507
)
508508

@@ -530,12 +530,12 @@ class FeatureDevControllerTest : FeatureDevTestBase() {
530530
val mockInOrder = inOrder(mockSession)
531531

532532
mockInOrder.verify(mockSession).sendMetricDataTelemetry(
533-
MetricDataOperationName.START_CODE_GENERATION,
534-
MetricDataResult.SUCCESS
533+
MetricDataOperationName.StartCodeGeneration,
534+
MetricDataResult.Success
535535

536536
)
537537
mockInOrder.verify(mockSession).sendMetricDataTelemetry(
538-
MetricDataOperationName.END_CODE_GENERATION,
538+
MetricDataOperationName.EndCodeGeneration,
539539
expectedResult
540540
)
541541
}

0 commit comments

Comments
 (0)