Skip to content

Commit 03c59f1

Browse files
chungjacchungjac
committed
refactor shortAnswer
just testgen related objects extractShortAnswer: use packageInfoList
1 parent 99a555a commit 03c59f1

File tree

6 files changed

+128
-42
lines changed

6 files changed

+128
-42
lines changed

‎packages/core/src/amazonqTest/app.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export function init(appContext: AmazonQAppInitContext) {
2323
authClicked: new vscode.EventEmitter<any>(),
2424
startTestGen: new vscode.EventEmitter<any>(),
2525
processHumanChatMessage: new vscode.EventEmitter<any>(),
26-
updateShortAnswer: new vscode.EventEmitter<any>(),
26+
updateTargetFileInfo: new vscode.EventEmitter<any>(),
2727
showCodeGenerationResults: new vscode.EventEmitter<any>(),
2828
openDiff: new vscode.EventEmitter<any>(),
2929
formActionClicked: new vscode.EventEmitter<any>(),

‎packages/core/src/amazonqTest/chat/controller/controller.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import { randomUUID } from '../../../shared/crypto'
5353
import { tempDirPath, testGenerationLogsDir } from '../../../shared/filesystemUtilities'
5454
import { CodeReference } from '../../../codewhispererChat/view/connector/connector'
5555
import { TelemetryHelper } from '../../../codewhisperer/util/telemetryHelper'
56-
import { ShortAnswer, ShortAnswerReference, testGenState } from '../../../codewhisperer/models/model'
56+
import { Reference, testGenState } from '../../../codewhisperer/models/model'
5757
import {
5858
referenceLogText,
5959
TestGenerationBuildStep,
@@ -63,14 +63,15 @@ import {
6363
} from '../../../codewhisperer/models/constants'
6464
import { UserWrittenCodeTracker } from '../../../codewhisperer/tracker/userWrittenCodeTracker'
6565
import { ReferenceLogViewProvider } from '../../../codewhisperer/service/referenceLogViewProvider'
66+
import { TargetFileInfo } from '../../../codewhisperer/client/codewhispereruserclient'
6667

6768
export interface TestChatControllerEventEmitters {
6869
readonly tabOpened: vscode.EventEmitter<any>
6970
readonly tabClosed: vscode.EventEmitter<any>
7071
readonly authClicked: vscode.EventEmitter<any>
7172
readonly startTestGen: vscode.EventEmitter<any>
7273
readonly processHumanChatMessage: vscode.EventEmitter<any>
73-
readonly updateShortAnswer: vscode.EventEmitter<any>
74+
readonly updateTargetFileInfo: vscode.EventEmitter<any>
7475
readonly showCodeGenerationResults: vscode.EventEmitter<any>
7576
readonly openDiff: vscode.EventEmitter<any>
7677
readonly formActionClicked: vscode.EventEmitter<any>
@@ -131,8 +132,8 @@ export class TestController {
131132
return this.handleFormActionClicked(data)
132133
})
133134

134-
this.chatControllerMessageListeners.updateShortAnswer.event((data) => {
135-
return this.updateShortAnswer(data)
135+
this.chatControllerMessageListeners.updateTargetFileInfo.event((data) => {
136+
return this.updateTargetFileInfo(data)
136137
})
137138

138139
this.chatControllerMessageListeners.showCodeGenerationResults.event((data) => {
@@ -586,10 +587,9 @@ export class TestController {
586587
}
587588
}
588589

589-
private async updateShortAnswer(message: {
590+
private async updateTargetFileInfo(message: {
590591
tabID: string
591-
status: string
592-
shortAnswer?: ShortAnswer
592+
targetFileInfo?: TargetFileInfo
593593
testGenerationJobGroupName: string
594594
testGenerationJobId: string
595595
type: ChatItemType
@@ -599,11 +599,11 @@ export class TestController {
599599
type: 'answer',
600600
tabID: message.tabID,
601601
message: testGenSummaryMessage(
602-
path.basename(message.shortAnswer?.sourceFilePath ?? message.filePath),
603-
message.shortAnswer?.planSummary?.replaceAll('```', '')
602+
path.basename(message.targetFileInfo?.filePath ?? message.filePath),
603+
message.targetFileInfo?.filePlan?.replaceAll('```', '')
604604
),
605605
canBeVoted: true,
606-
filePath: message.shortAnswer?.testFilePath,
606+
filePath: message.targetFileInfo?.testFilePath,
607607
})
608608
}
609609

@@ -663,7 +663,7 @@ export class TestController {
663663
filePaths: [data.filePath],
664664
},
665665
codeReference: session.references.map(
666-
(ref: ShortAnswerReference) =>
666+
(ref: Reference) =>
667667
({
668668
...ref,
669669
information: `${ref.licenseName} - <a href="${ref.url}">${ref.repository}</a>`,

‎packages/core/src/amazonqTest/chat/session/session.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
import { ShortAnswer, ShortAnswerReference } from '../../../codewhisperer/models/model'
7-
import { TestGenerationJob } from '../../../codewhisperer/client/codewhispereruserclient'
6+
import { ShortAnswer, Reference } from '../../../codewhisperer/models/model'
7+
import { TargetFileInfo, TestGenerationJob } from '../../../codewhisperer/client/codewhispereruserclient'
88

99
export enum ConversationState {
1010
IDLE,
@@ -42,6 +42,7 @@ export class Session {
4242
public projectRootPath: string = ''
4343
public fileLanguage: string | undefined = 'plaintext'
4444
public stopIteration: boolean = false
45+
public targetFileInfo: TargetFileInfo | undefined
4546

4647
// Telemetry
4748
public testGenerationStartTime: number = 0
@@ -64,7 +65,7 @@ export class Session {
6465
public testCoveragePercentage: number = 90
6566
public isInProgress: boolean = false
6667
public acceptedJobId = ''
67-
public references: ShortAnswerReference[] = []
68+
public references: Reference[] = []
6869

6970
constructor() {}
7071

‎packages/core/src/codewhisperer/client/user-service-2.json‎

Lines changed: 89 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1760,6 +1760,39 @@
17601760
"type": "string",
17611761
"enum": ["OPTIN", "OPTOUT"]
17621762
},
1763+
"PackageInfo": {
1764+
"type": "structure",
1765+
"members": {
1766+
"executionCommand": { "shape": "SensitiveString" },
1767+
"buildCommand": { "shape": "SensitiveString" },
1768+
"buildOrder": { "shape": "PackageInfoBuildOrderInteger" },
1769+
"testFramework": { "shape": "String" },
1770+
"packageSummary": { "shape": "PackageInfoPackageSummaryString" },
1771+
"packagePlan": { "shape": "PackageInfoPackagePlanString" },
1772+
"targetFileInfoList": { "shape": "TargetFileInfoList" }
1773+
}
1774+
},
1775+
"PackageInfoBuildOrderInteger": {
1776+
"type": "integer",
1777+
"box": true,
1778+
"min": 0
1779+
},
1780+
"PackageInfoList": {
1781+
"type": "list",
1782+
"member": { "shape": "PackageInfo" }
1783+
},
1784+
"PackageInfoPackagePlanString": {
1785+
"type": "string",
1786+
"max": 30720,
1787+
"min": 0,
1788+
"sensitive": true
1789+
},
1790+
"PackageInfoPackageSummaryString": {
1791+
"type": "string",
1792+
"max": 30720,
1793+
"min": 0,
1794+
"sensitive": true
1795+
},
17631796
"PaginationToken": {
17641797
"type": "string",
17651798
"max": 2048,
@@ -2418,6 +2451,45 @@
24182451
"min": 1,
24192452
"sensitive": true
24202453
},
2454+
"TargetFileInfo": {
2455+
"type": "structure",
2456+
"members": {
2457+
"filePath": { "shape": "SensitiveString" },
2458+
"testFilePath": { "shape": "SensitiveString" },
2459+
"testCoverage": { "shape": "TargetFileInfoTestCoverageInteger" },
2460+
"fileSummary": { "shape": "TargetFileInfoFileSummaryString" },
2461+
"filePlan": { "shape": "TargetFileInfoFilePlanString" },
2462+
"codeReferences": { "shape": "References" },
2463+
"numberOfTestMethods": { "shape": "TargetFileInfoNumberOfTestMethodsInteger" }
2464+
}
2465+
},
2466+
"TargetFileInfoFilePlanString": {
2467+
"type": "string",
2468+
"max": 30720,
2469+
"min": 0,
2470+
"sensitive": true
2471+
},
2472+
"TargetFileInfoFileSummaryString": {
2473+
"type": "string",
2474+
"max": 30720,
2475+
"min": 0,
2476+
"sensitive": true
2477+
},
2478+
"TargetFileInfoList": {
2479+
"type": "list",
2480+
"member": { "shape": "TargetFileInfo" }
2481+
},
2482+
"TargetFileInfoNumberOfTestMethodsInteger": {
2483+
"type": "integer",
2484+
"box": true,
2485+
"min": 0
2486+
},
2487+
"TargetFileInfoTestCoverageInteger": {
2488+
"type": "integer",
2489+
"box": true,
2490+
"max": 100,
2491+
"min": 0
2492+
},
24212493
"TaskAssistPlan": {
24222494
"type": "list",
24232495
"member": { "shape": "TaskAssistPlanStep" },
@@ -2556,7 +2628,11 @@
25562628
"status": { "shape": "TestGenerationJobStatus" },
25572629
"shortAnswer": { "shape": "SensitiveString" },
25582630
"creationTime": { "shape": "Timestamp" },
2559-
"progressRate": { "shape": "TestGenerationJobProgressRateInteger" }
2631+
"progressRate": { "shape": "TestGenerationJobProgressRateInteger" },
2632+
"jobStatusReason": { "shape": "String" },
2633+
"jobSummary": { "shape": "TestGenerationJobJobSummaryString" },
2634+
"jobPlan": { "shape": "TestGenerationJobJobPlanString" },
2635+
"packageInfoList": { "shape": "PackageInfoList" }
25602636
},
25612637
"documentation": "<p>Represents a test generation job</p>"
25622638
},
@@ -2567,6 +2643,18 @@
25672643
"min": 1,
25682644
"pattern": "[a-zA-Z0-9-_]+"
25692645
},
2646+
"TestGenerationJobJobPlanString": {
2647+
"type": "string",
2648+
"max": 30720,
2649+
"min": 0,
2650+
"sensitive": true
2651+
},
2652+
"TestGenerationJobJobSummaryString": {
2653+
"type": "string",
2654+
"max": 30720,
2655+
"min": 0,
2656+
"sensitive": true
2657+
},
25702658
"TestGenerationJobProgressRateInteger": {
25712659
"type": "integer",
25722660
"box": true,

‎packages/core/src/codewhisperer/models/model.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,7 +1165,7 @@ export interface FolderInfo {
11651165
name: string
11661166
}
11671167

1168-
export interface ShortAnswerReference {
1168+
export interface Reference {
11691169
licenseName?: string
11701170
repository?: string
11711171
url?: string
@@ -1175,6 +1175,7 @@ export interface ShortAnswerReference {
11751175
}
11761176
}
11771177

1178+
// TODO: remove ShortAnswer because it will be deprecated
11781179
export interface ShortAnswer {
11791180
testFilePath: string
11801181
buildCommands: string[]
@@ -1185,6 +1186,6 @@ export interface ShortAnswer {
11851186
testCoverage?: number
11861187
stopIteration?: string
11871188
errorMessage?: string
1188-
codeReferences?: ShortAnswerReference[]
1189+
codeReferences?: References
11891190
numberOfTestMethods?: number
11901191
}

‎packages/core/src/codewhisperer/service/testGenHandler.ts‎

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@ import {
1818
CreateUploadUrlError,
1919
ExportResultsArchiveError,
2020
InvalidSourceZipError,
21-
TestGenFailedError,
2221
TestGenStoppedError,
2322
TestGenTimedOutError,
2423
} from '../../amazonqTest/error'
2524
import { getMd5, uploadArtifactToS3 } from './securityScanHandler'
26-
import { ShortAnswer, testGenState } from '../models/model'
25+
import { testGenState, Reference } from '../models/model'
2726
import { ChatSessionManager } from '../../amazonqTest/chat/storages/chatSession'
2827
import { createCodeWhispererChatStreamingClient } from '../../shared/clients/codewhispererChatClient'
2928
import { downloadExportResultArchive } from '../../shared/utilities/download'
@@ -156,44 +155,41 @@ export async function pollTestJobStatus(
156155
status: 'InProgress',
157156
progressRate,
158157
})
159-
const shortAnswerString = resp.testGenerationJob?.shortAnswer
160-
if (shortAnswerString) {
161-
const parsedShortAnswer = JSON.parse(shortAnswerString)
162-
const shortAnswer: ShortAnswer = JSON.parse(parsedShortAnswer)
163-
// Stop the Unit test generation workflow if IDE receive stopIteration = true
164-
if (shortAnswer.stopIteration === 'true') {
165-
session.stopIteration = true
166-
throw new TestGenFailedError(shortAnswer.planSummary)
167-
}
168-
if (shortAnswer.numberOfTestMethods) {
169-
session.numberOfTestsGenerated = Number(shortAnswer.numberOfTestMethods)
158+
const packageInfoList = resp.testGenerationJob?.packageInfoList ?? []
159+
const packageInfo = packageInfoList[0]
160+
const targetFileInfo = packageInfo?.targetFileInfoList?.[0]
161+
162+
if (packageInfo) {
163+
// TODO: will need some fields from packageInfo
164+
}
165+
if (targetFileInfo) {
166+
if (targetFileInfo.numberOfTestMethods) {
167+
session.numberOfTestsGenerated = Number(targetFileInfo.numberOfTestMethods)
170168
}
171-
if (shortAnswer.codeReferences) {
172-
session.references = shortAnswer.codeReferences
169+
if (targetFileInfo.codeReferences) {
170+
session.references = targetFileInfo.codeReferences as Reference[]
173171
}
174172
if (initialExecution) {
175-
session.generatedFilePath = shortAnswer?.testFilePath ?? ''
176-
const currentPlanSummary = session.shortAnswer?.planSummary
177-
const newPlanSummary = shortAnswer?.planSummary
178-
const status = shortAnswer.stopIteration
173+
session.generatedFilePath = targetFileInfo.testFilePath ?? ''
174+
const currentPlanSummary = session.targetFileInfo?.filePlan
175+
const newPlanSummary = targetFileInfo?.filePlan
179176

180177
if (currentPlanSummary !== newPlanSummary && newPlanSummary) {
181178
const chatControllers = testGenState.getChatControllers()
182179
if (chatControllers) {
183180
const currentSession = ChatSessionManager.Instance.getSession()
184-
chatControllers.updateShortAnswer.fire({
181+
chatControllers.updateTargetFileInfo.fire({
185182
tabID: currentSession.tabID,
186-
status,
187-
shortAnswer,
183+
targetFileInfo,
188184
testGenerationJobGroupName: resp.testGenerationJob?.testGenerationJobGroupName,
189185
testGenerationJobId: resp.testGenerationJob?.testGenerationJobId,
190186
filePath,
191187
})
192188
}
193189
}
194190
}
195-
ChatSessionManager.Instance.getSession().shortAnswer = shortAnswer
196191
}
192+
ChatSessionManager.Instance.getSession().targetFileInfo = targetFileInfo
197193
if (resp.testGenerationJob?.status !== CodeWhispererConstants.TestGenerationJobStatus.IN_PROGRESS) {
198194
// This can be FAILED or COMPLETED
199195
status = resp.testGenerationJob?.status as CodeWhispererConstants.TestGenerationJobStatus
@@ -243,7 +239,7 @@ export async function exportResultsArchive(
243239
const zip = new AdmZip(pathToArchive)
244240
zip.extractAllTo(pathToArchiveDir, true)
245241

246-
const testFilePathFromResponse = session?.shortAnswer?.testFilePath
242+
const testFilePathFromResponse = session?.targetFileInfo?.testFilePath
247243
const testFilePath = testFilePathFromResponse
248244
? testFilePathFromResponse.split('/').slice(1).join('/') // remove the project name
249245
: await getTestFilePathFromZip(pathToArchiveDir)

0 commit comments

Comments
 (0)