genaicode 0.1.1 → 0.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -1
- package/bin/genaicode.cjs +7 -0
- package/dist/ai-service/ai-studio.d.ts +2 -1
- package/dist/ai-service/ai-studio.js +5 -5
- package/dist/ai-service/ai-studio.js.map +1 -1
- package/dist/ai-service/anthropic.d.ts +2 -1
- package/dist/ai-service/anthropic.js +6 -4
- package/dist/ai-service/anthropic.js.map +1 -1
- package/dist/ai-service/chat-gpt.js +2 -1
- package/dist/ai-service/chat-gpt.js.map +1 -1
- package/dist/ai-service/common.d.ts +4 -3
- package/dist/ai-service/common.js.map +1 -1
- package/dist/ai-service/dall-e.js +3 -2
- package/dist/ai-service/dall-e.js.map +1 -1
- package/dist/ai-service/vertex-ai-claude.js +2 -1
- package/dist/ai-service/vertex-ai-claude.js.map +1 -1
- package/dist/ai-service/vertex-ai-imagen.js +3 -0
- package/dist/ai-service/vertex-ai-imagen.js.map +1 -1
- package/dist/ai-service/vertex-ai.d.ts +3 -3
- package/dist/ai-service/vertex-ai.js +18 -23
- package/dist/ai-service/vertex-ai.js.map +1 -1
- package/dist/cli/cli-options.js +2 -2
- package/dist/cli/cli-options.js.map +1 -1
- package/dist/cli/cli-params.d.ts +4 -3
- package/dist/cli/cli-params.js +12 -6
- package/dist/cli/cli-params.js.map +1 -1
- package/dist/cli/validate-cli-params.js +2 -1
- package/dist/cli/validate-cli-params.js.map +1 -1
- package/dist/files/read-files.d.ts +6 -1
- package/dist/files/read-files.js +13 -8
- package/dist/files/read-files.js.map +1 -1
- package/dist/files/read-files.test.js +5 -6
- package/dist/files/read-files.test.js.map +1 -1
- package/dist/files/update-files.d.ts +2 -1
- package/dist/files/update-files.js +6 -6
- package/dist/files/update-files.js.map +1 -1
- package/dist/main/codegen-interactive-utils.d.ts +8 -0
- package/dist/main/codegen-interactive-utils.js +148 -0
- package/dist/main/codegen-interactive-utils.js.map +1 -0
- package/dist/main/codegen-interactive.d.ts +2 -0
- package/dist/main/codegen-interactive.js +68 -0
- package/dist/main/codegen-interactive.js.map +1 -0
- package/dist/main/codegen-types.d.ts +28 -0
- package/dist/main/codegen-types.js +2 -0
- package/dist/main/codegen-types.js.map +1 -0
- package/dist/main/codegen.d.ts +2 -0
- package/dist/main/codegen.js +88 -25
- package/dist/main/codegen.js.map +1 -1
- package/dist/main/codegen.test.js +36 -22
- package/dist/main/codegen.test.js.map +1 -1
- package/dist/main/config-lib.d.ts +8 -0
- package/dist/main/config-lib.js.map +1 -1
- package/dist/main/config.d.ts +2 -1
- package/dist/main/config.js +12 -0
- package/dist/main/config.js.map +1 -1
- package/dist/main/interactive/codegen-interactive.d.ts +2 -0
- package/dist/main/interactive/codegen-interactive.js +55 -0
- package/dist/main/interactive/codegen-interactive.js.map +1 -0
- package/dist/main/interactive/codegen-interactive.test.d.ts +4 -0
- package/dist/main/interactive/codegen-interactive.test.js +77 -0
- package/dist/main/interactive/codegen-interactive.test.js.map +1 -0
- package/dist/main/interactive/codegen-worker.d.ts +3 -0
- package/dist/main/interactive/codegen-worker.js +47 -0
- package/dist/main/interactive/codegen-worker.js.map +1 -0
- package/dist/main/interactive/common.d.ts +5 -0
- package/dist/main/interactive/common.js +51 -0
- package/dist/main/interactive/common.js.map +1 -0
- package/dist/main/interactive/configure.d.ts +2 -0
- package/dist/main/interactive/configure.js +99 -0
- package/dist/main/interactive/configure.js.map +1 -0
- package/dist/main/interactive/error-handling.d.ts +4 -0
- package/dist/main/interactive/error-handling.js +49 -0
- package/dist/main/interactive/error-handling.js.map +1 -0
- package/dist/main/interactive/help.d.ts +1 -0
- package/dist/main/interactive/help.js +22 -0
- package/dist/main/interactive/help.js.map +1 -0
- package/dist/main/interactive/process-comments.d.ts +2 -0
- package/dist/main/interactive/process-comments.js +39 -0
- package/dist/main/interactive/process-comments.js.map +1 -0
- package/dist/main/interactive/select-ai-service.d.ts +2 -0
- package/dist/main/interactive/select-ai-service.js +27 -0
- package/dist/main/interactive/select-ai-service.js.map +1 -0
- package/dist/main/interactive/task-file.d.ts +2 -0
- package/dist/main/interactive/task-file.js +28 -0
- package/dist/main/interactive/task-file.js.map +1 -0
- package/dist/main/interactive/text-prompt.d.ts +2 -0
- package/dist/main/interactive/text-prompt.js +18 -0
- package/dist/main/interactive/text-prompt.js.map +1 -0
- package/dist/main/interactive/user-interrupt.d.ts +1 -0
- package/dist/main/interactive/user-interrupt.js +36 -0
- package/dist/main/interactive/user-interrupt.js.map +1 -0
- package/dist/main/interactive/worker-script.d.ts +1 -0
- package/dist/main/interactive/worker-script.js +24 -0
- package/dist/main/interactive/worker-script.js.map +1 -0
- package/dist/main/interactive/worker.d.ts +2 -0
- package/dist/main/interactive/worker.js +55 -0
- package/dist/main/interactive/worker.js.map +1 -0
- package/dist/prompt/function-calling-validate.d.ts +1 -1
- package/dist/prompt/function-calling-validate.js +21 -15
- package/dist/prompt/function-calling-validate.js.map +1 -1
- package/dist/prompt/function-defs/ask-question.d.ts +38 -1
- package/dist/prompt/function-defs/ask-question.js +39 -1
- package/dist/prompt/function-defs/ask-question.js.map +1 -1
- package/dist/prompt/function-defs/codegen-summary.d.ts +5 -5
- package/dist/prompt/function-defs/codegen-summary.js +8 -8
- package/dist/prompt/function-defs/codegen-summary.js.map +1 -1
- package/dist/prompt/function-defs/generate-image.d.ts +8 -15
- package/dist/prompt/function-defs/generate-image.js +8 -15
- package/dist/prompt/function-defs/generate-image.js.map +1 -1
- package/dist/prompt/limits.js +2 -2
- package/dist/prompt/limits.test.js +5 -5
- package/dist/prompt/prompt-codegen.d.ts +7 -2
- package/dist/prompt/prompt-codegen.js +26 -17
- package/dist/prompt/prompt-codegen.js.map +1 -1
- package/dist/prompt/prompt-codegen.test.js +11 -7
- package/dist/prompt/prompt-codegen.test.js.map +1 -1
- package/dist/prompt/prompt-service-ask-question.test.js +14 -18
- package/dist/prompt/prompt-service-ask-question.test.js.map +1 -1
- package/dist/prompt/prompt-service.d.ts +20 -5
- package/dist/prompt/prompt-service.js +40 -153
- package/dist/prompt/prompt-service.js.map +1 -1
- package/dist/prompt/prompt-service.test.js +42 -22
- package/dist/prompt/prompt-service.test.js.map +1 -1
- package/dist/prompt/steps/step-ask-question.d.ts +6 -0
- package/dist/prompt/steps/step-ask-question.js +80 -0
- package/dist/prompt/steps/step-ask-question.js.map +1 -0
- package/dist/prompt/steps/step-generate-image.d.ts +2 -0
- package/dist/prompt/steps/step-generate-image.js +29 -0
- package/dist/prompt/steps/step-generate-image.js.map +1 -0
- package/dist/prompt/steps/step-validate-recover.d.ts +13 -0
- package/dist/prompt/steps/step-validate-recover.js +51 -0
- package/dist/prompt/steps/step-validate-recover.js.map +1 -0
- package/dist/prompt/steps/step-verify-patch.d.ts +7 -0
- package/dist/prompt/steps/step-verify-patch.js +41 -0
- package/dist/prompt/steps/step-verify-patch.js.map +1 -0
- package/dist/prompt/steps/steps-types.d.ts +4 -0
- package/dist/prompt/steps/steps-types.js +6 -0
- package/dist/prompt/steps/steps-types.js.map +1 -0
- package/dist/prompt/systemprompt.d.ts +2 -1
- package/dist/prompt/systemprompt.js +11 -7
- package/dist/prompt/systemprompt.js.map +1 -1
- package/dist/prompt/systemprompt.test.d.ts +1 -0
- package/dist/prompt/systemprompt.test.js +4 -5
- package/dist/prompt/systemprompt.test.js.map +1 -1
- package/package.json +4 -3
- package/bin/vertex-monkey-patch.cjs +0 -33
|
@@ -15,7 +15,7 @@ vi.mock('../cli/cli-params.js', () => ({
|
|
|
15
15
|
requireExplanations: false,
|
|
16
16
|
considerAllFiles: false,
|
|
17
17
|
dependencyTree: false,
|
|
18
|
-
|
|
18
|
+
cliExplicitPrompt: false,
|
|
19
19
|
allowFileCreate: false,
|
|
20
20
|
allowFileDelete: false,
|
|
21
21
|
allowDirectoryCreate: false,
|
|
@@ -38,7 +38,12 @@ describe('getCodeGenPrompt', () => {
|
|
|
38
38
|
vi.mocked(cliParams).allowDirectoryCreate = false;
|
|
39
39
|
vi.mocked(cliParams).allowFileMove = false;
|
|
40
40
|
vi.spyOn(limits, 'verifyCodegenPromptLimit').mockImplementation(() => { });
|
|
41
|
-
const prompt = getCodeGenPrompt(
|
|
41
|
+
const prompt = getCodeGenPrompt({
|
|
42
|
+
considerAllFiles: true,
|
|
43
|
+
aiService: 'vertex-ai',
|
|
44
|
+
temperature: 0.7,
|
|
45
|
+
cheap: false,
|
|
46
|
+
}).prompt;
|
|
42
47
|
expect(prompt).toContain('You are allowed to modify all files in the application');
|
|
43
48
|
expect(prompt).toContain('Do not create new files.');
|
|
44
49
|
expect(prompt).toContain('Do not delete files.');
|
|
@@ -56,7 +61,7 @@ describe('getLintFixPrompt', () => {
|
|
|
56
61
|
const command = 'eslint --fix';
|
|
57
62
|
const stdout = 'Fixed 2 errors';
|
|
58
63
|
const stderr = '';
|
|
59
|
-
const prompt = getLintFixPrompt(command, stdout, stderr);
|
|
64
|
+
const prompt = getLintFixPrompt(command, { aiService: 'vertex-ai' }, stdout, stderr);
|
|
60
65
|
expect(prompt).toContain('The following lint errors were encountered after the initial code generation:');
|
|
61
66
|
expect(prompt).toContain(`Lint command: ${command}`);
|
|
62
67
|
expect(prompt).toContain('Lint command stdout:');
|
|
@@ -68,7 +73,7 @@ describe('getLintFixPrompt', () => {
|
|
|
68
73
|
const command = 'eslint --fix';
|
|
69
74
|
const stdout = '';
|
|
70
75
|
const stderr = 'Error: Unable to resolve path';
|
|
71
|
-
const prompt = getLintFixPrompt(command, stdout, stderr);
|
|
76
|
+
const prompt = getLintFixPrompt(command, { aiService: 'vertex-ai' }, stdout, stderr);
|
|
72
77
|
expect(prompt).toContain('Lint command stderr:');
|
|
73
78
|
expect(prompt).toContain(stderr);
|
|
74
79
|
});
|
|
@@ -76,16 +81,15 @@ describe('getLintFixPrompt', () => {
|
|
|
76
81
|
const command = 'eslint --fix';
|
|
77
82
|
const stdout = 'Fixed 1 error';
|
|
78
83
|
const stderr = '';
|
|
79
|
-
getLintFixPrompt(command, stdout, stderr);
|
|
84
|
+
getLintFixPrompt(command, { aiService: 'vertex-ai' }, stdout, stderr);
|
|
80
85
|
expect(limits.verifyCodegenPromptLimit).toHaveBeenCalledWith(expect.any(String));
|
|
81
86
|
});
|
|
82
87
|
it('should log the prompt when verbosePrompt is true', () => {
|
|
83
|
-
vi.mocked(cliParams).verbosePrompt = true;
|
|
84
88
|
const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
|
|
85
89
|
const command = 'eslint --fix';
|
|
86
90
|
const stdout = 'Fixed 1 error';
|
|
87
91
|
const stderr = '';
|
|
88
|
-
getLintFixPrompt(command, stdout, stderr);
|
|
92
|
+
getLintFixPrompt(command, { aiService: 'vertex-ai', verbose: true }, stdout, stderr);
|
|
89
93
|
expect(consoleSpy).toHaveBeenCalledWith('Lint fix prompt:');
|
|
90
94
|
expect(consoleSpy).toHaveBeenCalledWith(expect.stringContaining('The following lint errors were encountered'));
|
|
91
95
|
consoleSpy.mockRestore();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt-codegen.test.js","sourceRoot":"","sources":["../../src/prompt/prompt-codegen.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,KAAK,SAAS,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,SAAS,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AACtC,OAAO,wBAAwB,CAAC;AAEhC,EAAE,CAAC,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,QAAQ,EAAE,EAAE;IACZ,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE;CACxB,CAAC,CAAC,CAAC;AACJ,EAAE,CAAC,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;CAC1B,CAAC,CAAC,CAAC;AACJ,EAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,GAAG,EAAE,CAAC,CAAC;IACrC,mBAAmB,EAAE,KAAK;IAC1B,gBAAgB,EAAE,KAAK;IACvB,cAAc,EAAE,KAAK;IACrB,
|
|
1
|
+
{"version":3,"file":"prompt-codegen.test.js","sourceRoot":"","sources":["../../src/prompt/prompt-codegen.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
2
2
|
import { promptService } from './prompt-service.js';
|
|
3
3
|
import * as vertexAi from '../ai-service/vertex-ai.js';
|
|
4
|
-
import * as
|
|
4
|
+
import * as prompts from '@inquirer/prompts';
|
|
5
|
+
import { CancelablePromise } from '@inquirer/type';
|
|
5
6
|
import '../cli/cli-params.js';
|
|
6
7
|
import '../files/read-files.js';
|
|
7
8
|
import '../files/find-files.js';
|
|
9
|
+
import { getCodeGenPrompt } from './prompt-codegen.js';
|
|
8
10
|
vi.mock('../ai-service/vertex-ai.js', () => ({ generateContent: vi.fn() }));
|
|
9
|
-
vi.mock('
|
|
10
|
-
|
|
11
|
+
vi.mock('@inquirer/prompts', () => ({
|
|
12
|
+
input: vi.fn(),
|
|
11
13
|
}));
|
|
12
14
|
vi.mock('../cli/cli-params.js', () => ({
|
|
13
15
|
requireExplanations: false,
|
|
@@ -42,18 +44,14 @@ vi.mock('../main/config.js', () => ({
|
|
|
42
44
|
rootDir: '.',
|
|
43
45
|
extensions: ['.js', '.ts', '.tsx', '.jsx'],
|
|
44
46
|
},
|
|
47
|
+
importantContext: {},
|
|
45
48
|
}));
|
|
49
|
+
const GENERATE_CONTENT_FNS = { 'vertex-ai': vertexAi.generateContent };
|
|
50
|
+
const GENERATE_IMAGE_FNS = {};
|
|
46
51
|
describe('promptService with askQuestion', () => {
|
|
47
|
-
let mockReadline;
|
|
48
52
|
beforeEach(() => {
|
|
49
53
|
vi.resetAllMocks();
|
|
50
54
|
console.log = vi.fn();
|
|
51
|
-
mockReadline = {
|
|
52
|
-
question: vi.fn(),
|
|
53
|
-
close: vi.fn(),
|
|
54
|
-
};
|
|
55
|
-
// @ts-expect-error (avoid complex mock)
|
|
56
|
-
vi.spyOn(readline, 'createInterface').mockReturnValue(mockReadline);
|
|
57
55
|
});
|
|
58
56
|
afterEach(() => {
|
|
59
57
|
vi.clearAllMocks();
|
|
@@ -95,12 +93,10 @@ describe('promptService with askQuestion', () => {
|
|
|
95
93
|
.mockResolvedValueOnce(mockAskQuestionCall)
|
|
96
94
|
.mockResolvedValueOnce(mockAskQuestionCall2)
|
|
97
95
|
.mockResolvedValueOnce(mockCodegenSummary);
|
|
98
|
-
vi.mocked(
|
|
99
|
-
|
|
100
|
-
});
|
|
101
|
-
await promptService(vertexAi.generateContent, undefined);
|
|
96
|
+
vi.mocked(prompts.input).mockImplementationOnce(() => CancelablePromise.resolve('Yes'));
|
|
97
|
+
await promptService(GENERATE_CONTENT_FNS, GENERATE_IMAGE_FNS, getCodeGenPrompt({ aiService: 'vertex-ai', interactive: true, askQuestion: true }));
|
|
102
98
|
expect(vertexAi.generateContent).toHaveBeenCalledTimes(3);
|
|
103
|
-
expect(
|
|
99
|
+
expect(prompts.input).toHaveBeenCalledWith({ message: 'Your answer' });
|
|
104
100
|
expect(console.log).toHaveBeenCalledWith('Assistant asks:', expect.any(Object));
|
|
105
101
|
expect(console.log).toHaveBeenCalledWith('The question was answered');
|
|
106
102
|
});
|
|
@@ -117,7 +113,7 @@ describe('promptService with askQuestion', () => {
|
|
|
117
113
|
},
|
|
118
114
|
];
|
|
119
115
|
vi.mocked(vertexAi.generateContent).mockResolvedValueOnce(mockAskQuestionCall);
|
|
120
|
-
const result = await promptService(
|
|
116
|
+
const result = await promptService(GENERATE_CONTENT_FNS, GENERATE_IMAGE_FNS, getCodeGenPrompt({ aiService: 'vertex-ai', interactive: true }));
|
|
121
117
|
expect(vertexAi.generateContent).toHaveBeenCalledTimes(1);
|
|
122
118
|
expect(result).toEqual([]);
|
|
123
119
|
expect(console.log).toHaveBeenCalledWith('Assistant requested to stop code generation. Exiting...');
|
|
@@ -137,9 +133,9 @@ describe('promptService with askQuestion', () => {
|
|
|
137
133
|
vi.mocked(vertexAi.generateContent)
|
|
138
134
|
.mockResolvedValueOnce(mockAskQuestionCall)
|
|
139
135
|
.mockResolvedValueOnce(mockCodegenSummary);
|
|
140
|
-
await promptService(
|
|
136
|
+
await promptService(GENERATE_CONTENT_FNS, GENERATE_IMAGE_FNS, getCodeGenPrompt({ aiService: 'vertex-ai', interactive: true }));
|
|
141
137
|
expect(vertexAi.generateContent).toHaveBeenCalledTimes(2);
|
|
142
|
-
expect(
|
|
138
|
+
expect(prompts.input).not.toHaveBeenCalled();
|
|
143
139
|
expect(console.log).toHaveBeenCalledWith('Assistant did not ask a question. Proceeding with code generation.');
|
|
144
140
|
});
|
|
145
141
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt-service-ask-question.test.js","sourceRoot":"","sources":["../../src/prompt/prompt-service-ask-question.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAEvD,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"prompt-service-ask-question.test.js","sourceRoot":"","sources":["../../src/prompt/prompt-service-ask-question.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,28 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
(prompt: PromptItem[], functionDefs: FunctionDef[], requiredFunctionName: string, temperature: number, cheap: boolean): Promise<FunctionCall[]>;
|
|
4
|
-
}
|
|
1
|
+
import { FunctionCall, GenerateContentFunction } from '../ai-service/common.js';
|
|
2
|
+
import { AiServiceType, ImagenType } from '../main/codegen-types.js';
|
|
5
3
|
interface GenerateImageFunction {
|
|
6
4
|
(prompt: string, contextImagePath: string | undefined, size: {
|
|
7
5
|
width: number;
|
|
8
6
|
height: number;
|
|
9
7
|
}, cheap: boolean): Promise<string>;
|
|
10
8
|
}
|
|
9
|
+
import { CodegenPrompt } from './prompt-codegen.js';
|
|
11
10
|
/** A function that communicates with model using */
|
|
12
|
-
export declare function promptService(
|
|
11
|
+
export declare function promptService(generateContentFns: Record<AiServiceType, GenerateContentFunction>, generateImageFns: Record<ImagenType, GenerateImageFunction>, codegenPrompt: CodegenPrompt): Promise<FunctionCall[]>;
|
|
12
|
+
export type PromptMessages = ReturnType<typeof prepareMessages>;
|
|
13
|
+
/**
|
|
14
|
+
* Function to prepare messages for AI services
|
|
15
|
+
*/
|
|
16
|
+
declare function prepareMessages(codegen: CodegenPrompt): {
|
|
17
|
+
suggestSourceCode: string;
|
|
18
|
+
requestSourceCode: string;
|
|
19
|
+
suggestImageAssets: string;
|
|
20
|
+
requestImageAssets: string;
|
|
21
|
+
prompt: string;
|
|
22
|
+
sourceCode: string;
|
|
23
|
+
contextSourceCode: (paths: string[]) => string;
|
|
24
|
+
imageAssets: string;
|
|
25
|
+
partialPromptTemplate(path: string): string;
|
|
26
|
+
invalidFunctionCall: string;
|
|
27
|
+
};
|
|
13
28
|
export {};
|
|
@@ -1,21 +1,27 @@
|
|
|
1
1
|
import assert from 'node:assert';
|
|
2
2
|
import fs from 'fs';
|
|
3
|
-
import * as diff from 'diff';
|
|
4
3
|
import mime from 'mime-types';
|
|
5
|
-
import { createInterface } from 'readline';
|
|
6
4
|
import { getSystemPrompt } from './systemprompt.js';
|
|
7
|
-
import { getCodeGenPrompt } from './prompt-codegen.js';
|
|
8
5
|
import { functionDefs } from './function-calling.js';
|
|
9
6
|
import { getSourceCode, getImageAssets } from '../files/read-files.js';
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
7
|
+
import { importantContext } from '../main/config.js';
|
|
8
|
+
import { executeStepAskQuestion } from './steps/step-ask-question.js';
|
|
9
|
+
import { validateAndRecoverSingleResult } from './steps/step-validate-recover.js';
|
|
10
|
+
import { executeStepVerifyPatch } from './steps/step-verify-patch.js';
|
|
11
|
+
import { executeStepGenerateImage } from './steps/step-generate-image.js';
|
|
12
|
+
import { StepResult } from './steps/steps-types.js';
|
|
12
13
|
/** A function that communicates with model using */
|
|
13
|
-
export async function promptService(
|
|
14
|
+
export async function promptService(generateContentFns, generateImageFns, codegenPrompt) {
|
|
14
15
|
const messages = prepareMessages(codegenPrompt);
|
|
16
|
+
const generateContentFn = (...args) => generateContentFns[codegenPrompt.options.aiService](...args);
|
|
17
|
+
const generateImageFn = (...args) => {
|
|
18
|
+
assert(codegenPrompt.options.imagen, 'imagen value must be provided');
|
|
19
|
+
return generateImageFns[codegenPrompt.options.imagen](...args);
|
|
20
|
+
};
|
|
15
21
|
// First stage: generate code generation summary, which should not take a lot of output tokens
|
|
16
22
|
const getSourceCodeRequest = { name: 'getSourceCode' };
|
|
17
23
|
const prompt = [
|
|
18
|
-
{ type: 'systemPrompt', systemPrompt: getSystemPrompt() },
|
|
24
|
+
{ type: 'systemPrompt', systemPrompt: getSystemPrompt(codegenPrompt.options) },
|
|
19
25
|
{ type: 'user', text: messages.suggestSourceCode },
|
|
20
26
|
{ type: 'assistant', text: messages.requestSourceCode, functionCalls: [getSourceCodeRequest] },
|
|
21
27
|
];
|
|
@@ -25,50 +31,27 @@ export async function promptService(generateContentFn, generateImageFn, codegenP
|
|
|
25
31
|
cache: true,
|
|
26
32
|
};
|
|
27
33
|
prompt.push(getSourceCodeResponse);
|
|
28
|
-
if (vision) {
|
|
34
|
+
if (codegenPrompt.options.vision) {
|
|
29
35
|
prompt.slice(-1)[0].text = messages.suggestImageAssets;
|
|
30
36
|
prompt.push({ type: 'assistant', text: messages.requestImageAssets, functionCalls: [{ name: 'getImageAssets' }] }, { type: 'user', functionResponses: [{ name: 'getImageAssets', content: messages.imageAssets }] });
|
|
31
37
|
}
|
|
32
38
|
prompt.slice(-1)[0].text = messages.prompt;
|
|
33
|
-
//
|
|
34
|
-
if (askQuestion
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
console.log('Assistant asks:', askQuestionCall.args);
|
|
42
|
-
const userAnswer = askQuestionCall.args?.shouldPrompt
|
|
43
|
-
? await getUserInput('Your answer: ')
|
|
44
|
-
: 'Lets proceed with code generation.';
|
|
45
|
-
prompt.push({ type: 'assistant', functionCalls: [askQuestionCall] }, {
|
|
46
|
-
type: 'user',
|
|
47
|
-
text: userAnswer,
|
|
48
|
-
functionResponses: [{ name: 'askQuestion', call_id: askQuestionCall.id }],
|
|
49
|
-
});
|
|
50
|
-
console.log('The question was answered');
|
|
51
|
-
if (askQuestionCall.args?.stopCodegen) {
|
|
52
|
-
console.log('Assistant requested to stop code generation. Exiting...');
|
|
53
|
-
return [];
|
|
54
|
-
}
|
|
55
|
-
if (!askQuestionCall.args?.shouldPrompt) {
|
|
56
|
-
console.log('Proceeding with code generation.');
|
|
57
|
-
break;
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
else {
|
|
61
|
-
console.log('Assistant did not ask a question. Proceeding with code generation.');
|
|
62
|
-
break;
|
|
63
|
-
}
|
|
64
|
-
}
|
|
39
|
+
// Execute the ask question step
|
|
40
|
+
if (codegenPrompt.options.askQuestion !== false &&
|
|
41
|
+
codegenPrompt.options.interactive &&
|
|
42
|
+
(await executeStepAskQuestion(generateContentFn, prompt, functionDefs, codegenPrompt.options.temperature ?? 0.7, codegenPrompt.options.cheap ?? false, messages, codegenPrompt.options)) === StepResult.BREAK) {
|
|
43
|
+
return [];
|
|
44
|
+
}
|
|
45
|
+
else if (codegenPrompt.options.askQuestion === false) {
|
|
46
|
+
console.log('Ask question is not enabled.');
|
|
65
47
|
}
|
|
66
48
|
const baseRequest = [
|
|
67
49
|
prompt,
|
|
68
50
|
functionDefs,
|
|
69
51
|
'codegenSummary',
|
|
70
|
-
temperature,
|
|
71
|
-
cheap,
|
|
52
|
+
codegenPrompt.options.temperature ?? 0.7,
|
|
53
|
+
codegenPrompt.options.cheap ?? false,
|
|
54
|
+
codegenPrompt.options,
|
|
72
55
|
];
|
|
73
56
|
let baseResult = await generateContentFn(...baseRequest);
|
|
74
57
|
let codegenSummaryRequest = baseResult.find((call) => call.name === 'codegenSummary');
|
|
@@ -80,13 +63,14 @@ export async function promptService(generateContentFn, generateImageFn, codegenP
|
|
|
80
63
|
// Sometimes the result happens to be a string
|
|
81
64
|
assert(Array.isArray(codegenSummaryRequest?.args?.fileUpdates), 'fileUpdates is not an array');
|
|
82
65
|
assert(Array.isArray(codegenSummaryRequest?.args.contextPaths), 'contextPaths is not an array');
|
|
83
|
-
if (
|
|
66
|
+
if (!codegenPrompt.options.disableContextOptimization) {
|
|
84
67
|
console.log('Optimize with context paths.');
|
|
85
68
|
// Monkey patch the initial getSourceCode, do not send parts of source code that are consider irrelevant
|
|
86
69
|
getSourceCodeRequest.args = {
|
|
87
70
|
filePaths: [
|
|
88
71
|
...codegenSummaryRequest.args.fileUpdates.map((file) => file.path),
|
|
89
72
|
...codegenSummaryRequest.args.contextPaths,
|
|
73
|
+
...(importantContext.files ?? []),
|
|
90
74
|
],
|
|
91
75
|
};
|
|
92
76
|
getSourceCodeResponse.functionResponses.find((item) => item.name === 'getSourceCode').content =
|
|
@@ -105,7 +89,7 @@ export async function promptService(generateContentFn, generateImageFn, codegenP
|
|
|
105
89
|
console.log('- Prompt:', file.prompt);
|
|
106
90
|
console.log('- Temperature', file.temperature);
|
|
107
91
|
console.log('- Cheap', file.cheap);
|
|
108
|
-
if (vision) {
|
|
92
|
+
if (codegenPrompt.options.vision) {
|
|
109
93
|
console.log('- Context image assets', file.contextImageAssets);
|
|
110
94
|
}
|
|
111
95
|
// this is needed, otherwise we will get an error
|
|
@@ -115,81 +99,33 @@ export async function promptService(generateContentFn, generateImageFn, codegenP
|
|
|
115
99
|
else {
|
|
116
100
|
prompt.push({ type: 'user', text: file.prompt ?? messages.partialPromptTemplate(file.path) });
|
|
117
101
|
}
|
|
118
|
-
if (vision && file.contextImageAssets) {
|
|
102
|
+
if (codegenPrompt.options.vision && file.contextImageAssets) {
|
|
119
103
|
prompt.slice(-1)[0].images = file.contextImageAssets.map((path) => ({
|
|
120
104
|
path,
|
|
121
105
|
base64url: fs.readFileSync(path, 'base64'),
|
|
122
106
|
mediaType: mime.lookup(path) || '',
|
|
123
107
|
}));
|
|
124
108
|
}
|
|
125
|
-
|
|
109
|
+
const partialRequest = [
|
|
126
110
|
prompt,
|
|
127
111
|
functionDefs,
|
|
128
112
|
file.updateToolName,
|
|
129
|
-
file.temperature ?? temperature,
|
|
113
|
+
file.temperature ?? codegenPrompt.options.temperature,
|
|
130
114
|
file.cheap === true,
|
|
115
|
+
codegenPrompt.options,
|
|
131
116
|
];
|
|
132
117
|
let partialResult = await generateContentFn(...partialRequest);
|
|
133
|
-
|
|
134
|
-
|
|
118
|
+
// Validate if function call is compliant with the schema
|
|
119
|
+
partialResult = await validateAndRecoverSingleResult(partialRequest, partialResult, messages, generateContentFn);
|
|
135
120
|
// Handle image generation requests
|
|
136
121
|
const generateImageCall = partialResult.find((call) => call.name === 'generateImage');
|
|
137
122
|
if (generateImageCall) {
|
|
138
|
-
|
|
139
|
-
console.log('Processing image generation request:', generateImageCall.args);
|
|
140
|
-
try {
|
|
141
|
-
const { prompt: imagePrompt, filePath, contextImagePath, size, cheap, } = generateImageCall.args;
|
|
142
|
-
const generatedImageUrl = await generateImageFn(imagePrompt, contextImagePath, size, cheap === true);
|
|
143
|
-
// Add a createFile call to the result to ensure the generated image is tracked
|
|
144
|
-
partialResult.push({
|
|
145
|
-
name: 'downloadFile',
|
|
146
|
-
args: {
|
|
147
|
-
filePath: filePath,
|
|
148
|
-
downloadUrl: generatedImageUrl,
|
|
149
|
-
explanation: `Downloading generated image`,
|
|
150
|
-
},
|
|
151
|
-
});
|
|
152
|
-
}
|
|
153
|
-
catch (error) {
|
|
154
|
-
console.error('Error generating image:', error);
|
|
155
|
-
// Add an explanation about the failed image generation
|
|
156
|
-
partialResult.push({
|
|
157
|
-
name: 'explanation',
|
|
158
|
-
args: {
|
|
159
|
-
text: `Failed to generate image: ${error.message}`,
|
|
160
|
-
},
|
|
161
|
-
});
|
|
162
|
-
}
|
|
163
|
-
}
|
|
164
|
-
else {
|
|
165
|
-
partialResult = await validateAndRecoverSingleResult(partialRequest, partialResult, messages, generateContentFn);
|
|
123
|
+
partialResult.push(await executeStepGenerateImage(generateImageFn, generateImageCall));
|
|
166
124
|
}
|
|
167
125
|
// Verify if patchFile is one of the functions called, and test if patch is valid and can be applied successfully
|
|
168
126
|
const patchFileCall = partialResult.find((call) => call.name === 'patchFile');
|
|
169
127
|
if (patchFileCall) {
|
|
170
|
-
|
|
171
|
-
console.log('Verification of patch for file:', filePath);
|
|
172
|
-
let updatedContent = false;
|
|
173
|
-
const currentContent = fs.readFileSync(filePath, 'utf-8');
|
|
174
|
-
try {
|
|
175
|
-
updatedContent = diff.applyPatch(currentContent, patch);
|
|
176
|
-
}
|
|
177
|
-
catch (e) {
|
|
178
|
-
console.log('Error when applying patch', e);
|
|
179
|
-
}
|
|
180
|
-
if (!updatedContent) {
|
|
181
|
-
console.log(`Patch could not be applied for ${filePath}. Retrying without patchFile function.`);
|
|
182
|
-
// Rerun content generation without patchFile function
|
|
183
|
-
partialRequest = [prompt, functionDefs, 'updateFile', file.temperature ?? temperature, file.cheap === true];
|
|
184
|
-
partialResult = await generateContentFn(...partialRequest);
|
|
185
|
-
partialResult = await validateAndRecoverSingleResult(partialRequest, partialResult, messages, generateContentFn);
|
|
186
|
-
const getSourceCodeCall = partialResult.find((call) => call.name === 'getSourceCode');
|
|
187
|
-
assert(!getSourceCodeCall, 'Unexpected getSourceCode: ' + JSON.stringify(getSourceCodeCall));
|
|
188
|
-
assert(!partialResult.find((call) => call.name === 'patchFile'), 'Unexpected patchFile in retry response');
|
|
189
|
-
}
|
|
190
|
-
else {
|
|
191
|
-
console.log('Patch verified successfully');
|
|
192
|
-
}
|
|
128
|
+
partialResult = await executeStepVerifyPatch(patchFileCall.args, generateContentFn, prompt, functionDefs, file.temperature ?? codegenPrompt.options.temperature, file.cheap === true, messages, codegenPrompt.options);
|
|
193
129
|
}
|
|
194
130
|
// add the code gen result to the context, as the subsequent code gen may depend on the result
|
|
195
131
|
prompt.push({ type: 'assistant', functionCalls: partialResult }, {
|
|
@@ -206,56 +142,19 @@ export async function promptService(generateContentFn, generateImageFn, codegenP
|
|
|
206
142
|
return baseResult;
|
|
207
143
|
}
|
|
208
144
|
}
|
|
209
|
-
async function validateAndRecoverSingleResult([prompt, functionDefs, requiredFunctionName, temperature, cheap], result, messages, generateContentFn) {
|
|
210
|
-
if (result.length !== 1) {
|
|
211
|
-
return result;
|
|
212
|
-
}
|
|
213
|
-
const call = result[0];
|
|
214
|
-
const validatorError = validateFunctionCall(call);
|
|
215
|
-
if (validatorError) {
|
|
216
|
-
console.log('Invalid function call', call, validatorError);
|
|
217
|
-
prompt.push({ type: 'assistant', functionCalls: [call] }, {
|
|
218
|
-
type: 'user',
|
|
219
|
-
text: messages.invalidFunctionCall,
|
|
220
|
-
functionResponses: [
|
|
221
|
-
{
|
|
222
|
-
name: call.name,
|
|
223
|
-
call_id: call.id,
|
|
224
|
-
content: JSON.stringify({ args: call.args, error: validatorError }),
|
|
225
|
-
isError: true,
|
|
226
|
-
},
|
|
227
|
-
],
|
|
228
|
-
});
|
|
229
|
-
console.log('Trying to recover...');
|
|
230
|
-
if (cheap) {
|
|
231
|
-
console.log('Disabling --cheap for recovery.');
|
|
232
|
-
}
|
|
233
|
-
result = await generateContentFn(prompt, functionDefs, requiredFunctionName, temperature, false);
|
|
234
|
-
console.log('Recover result:', result);
|
|
235
|
-
if (result.length === 1) {
|
|
236
|
-
const recoveryError = validateFunctionCall(result[0]);
|
|
237
|
-
assert(!recoveryError, 'Recovery failed');
|
|
238
|
-
console.log('Recovery was successful');
|
|
239
|
-
}
|
|
240
|
-
else {
|
|
241
|
-
console.log('Unexpected number of function calls', result);
|
|
242
|
-
}
|
|
243
|
-
}
|
|
244
|
-
return result;
|
|
245
|
-
}
|
|
246
145
|
/**
|
|
247
146
|
* Function to prepare messages for AI services
|
|
248
147
|
*/
|
|
249
|
-
function prepareMessages(
|
|
148
|
+
function prepareMessages(codegen) {
|
|
250
149
|
return {
|
|
251
150
|
suggestSourceCode: 'I should provide you with application source code.',
|
|
252
151
|
requestSourceCode: 'Please provide application source code.',
|
|
253
152
|
suggestImageAssets: 'I should also provide you with a summary of application image assets',
|
|
254
153
|
requestImageAssets: 'Please provide summary of application image assets.',
|
|
255
|
-
prompt: prompt +
|
|
154
|
+
prompt: codegen.prompt +
|
|
256
155
|
'\n Start from generating codegen summary, this summary will be used as a context to generate updates, so make sure that it contains useful information.',
|
|
257
|
-
sourceCode: JSON.stringify(getSourceCode()),
|
|
258
|
-
contextSourceCode: (paths) => JSON.stringify(getSourceCode(paths)),
|
|
156
|
+
sourceCode: JSON.stringify(getSourceCode({ taskFile: codegen.options.taskFile }, codegen.options)),
|
|
157
|
+
contextSourceCode: (paths) => JSON.stringify(getSourceCode({ filterPaths: paths, taskFile: codegen.options.taskFile, forceAll: true }, codegen.options)),
|
|
259
158
|
imageAssets: JSON.stringify(getImageAssets()),
|
|
260
159
|
partialPromptTemplate(path) {
|
|
261
160
|
return `Thank you for providing the summary, now suggest changes for the \`${path}\` file using appropriate tools.`;
|
|
@@ -263,16 +162,4 @@ function prepareMessages(prompt) {
|
|
|
263
162
|
invalidFunctionCall: 'Function call was invalid, please analyze the error and respond with corrected function call.',
|
|
264
163
|
};
|
|
265
164
|
}
|
|
266
|
-
async function getUserInput(prompt) {
|
|
267
|
-
const rl = createInterface({
|
|
268
|
-
input: process.stdin,
|
|
269
|
-
output: process.stdout,
|
|
270
|
-
});
|
|
271
|
-
return new Promise((resolve) => {
|
|
272
|
-
rl.question(prompt, (answer) => {
|
|
273
|
-
rl.close();
|
|
274
|
-
resolve(answer);
|
|
275
|
-
});
|
|
276
|
-
});
|
|
277
|
-
}
|
|
278
165
|
//# sourceMappingURL=prompt-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt-service.js","sourceRoot":"","sources":["../../src/prompt/prompt-service.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,IAAI,MAAM,YAAY,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,0BAA0B,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC3G,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAsBtE,oDAAoD;AACpD,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,iBAA0C,EAC1C,eAAkD,EAClD,gBAAwB,gBAAgB,EAAE;IAE1C,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,CAAC,CAAC;IAEhD,8FAA8F;IAC9F,MAAM,oBAAoB,GAAiB,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;IAErE,MAAM,MAAM,GAAiB;QAC3B,EAAE,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,eAAe,EAAE,EAAE;QACzD,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,iBAAiB,EAAE;QAClD,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,CAAC,iBAAiB,EAAE,aAAa,EAAE,CAAC,oBAAoB,CAAC,EAAE;KAC/F,CAAC;IAEF,MAAM,qBAAqB,GAAe;QACxC,IAAI,EAAE,MAAM;QACZ,iBAAiB,EAAE,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC;QAC5E,KAAK,EAAE,IAAI;KACZ,CAAC;IACF,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAEnC,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,QAAQ,CAAC,kBAAkB,CAAC;QACvD,MAAM,CAAC,IAAI,CACT,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,CAAC,kBAAkB,EAAE,aAAa,EAAE,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,EAAE,EACrG,EAAE,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC,EAAE,CACjG,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC;IAE3C,+EAA+E;IAC/E,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;QAC3D,MAAM,aAAa,GAAG,KAAK,CAAC;QAC5B,OAAO,CAAC,aAAa,EAAE,CAAC;YACtB,MAAM,iBAAiB,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;YAC3G,MAAM,eAAe,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC;YACtF,IAAI,eAAe,EAAE,CAAC;gBACpB,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;gBACrD,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,EAAE,YAAY;oBACnD,CAAC,CAAC,MAAM,YAAY,CAAC,eAAe,CAAC;oBACrC,CAAC,CAAC,oCAAoC,CAAC;gBACzC,MAAM,CAAC,IAAI,CACT,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC,eAAe,CAAC,EAAE,EACvD;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,UAAU;oBAChB,iBAAiB,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,eAAe,CAAC,EAAE,EAAE,CAAC;iBAC1E,CACF,CAAC;gBACF,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;gBACzC,IAAI,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC;oBACtC,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;oBACvE,OAAO,EAAE,CAAC;gBACZ,CAAC;gBACD,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,CAAC;oBACxC,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;oBAChD,MAAM;gBACR,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAC;gBAClF,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,WAAW,GAA2D;QAC1E,MAAM;QACN,YAAY;QACZ,gBAAgB;QAChB,WAAW;QACX,KAAK;KACN,CAAC;IACF,IAAI,UAAU,GAAG,MAAM,iBAAiB,CAAC,GAAG,WAAW,CAAC,CAAC;IAEzD,IAAI,qBAAqB,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC;IAEtF,IAAI,qBAAqB,EAAE,CAAC;QAC1B,8DAA8D;QAC9D,OAAO,CAAC,GAAG,CAAC,wDAAwD,EAAE,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAElG,UAAU,GAAG,MAAM,8BAA8B,CAAC,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC;QACxG,qBAAqB,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC;QAElF,8CAA8C;QAC9C,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,6BAA6B,CAAC,CAAC;QAC/F,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,IAAI,CAAC,YAAY,CAAC,EAAE,8BAA8B,CAAC,CAAC;QAEhG,IAAI,qBAAqB,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC;YACvF,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;YAC5C,wGAAwG;YACxG,oBAAoB,CAAC,IAAI,GAAG;gBAC1B,SAAS,EAAE;oBACT,GAAG,qBAAqB,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAsB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;oBACpF,GAAG,qBAAqB,CAAC,IAAI,CAAC,YAAY;iBAC3C;aACF,CAAC;YACF,qBAAqB,CAAC,iBAAkB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,eAAe,CAAE,CAAC,OAAO;gBAC7F,QAAQ,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,IAAI,EAAE,SAAqB,CAAC,CAAC;QACjF,CAAC;QAED,kEAAkE;QAClE,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC,CAAC;QAC9D,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,MAAM;YACZ,iBAAiB,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YACpF,KAAK,EAAE,IAAI;SACZ,CAAC,CAAC;QAEH,MAAM,MAAM,GAAmB,EAAE,CAAC;QAElC,KAAK,MAAM,IAAI,IAAI,qBAAsB,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAC3D,OAAO,CAAC,GAAG,CAAC,iCAAiC,GAAG,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;YACnG,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACtC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAC/C,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YACnC,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;YACjE,CAAC;YAED,iDAAiD;YACjD,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACxC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtF,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAChG,CAAC;YAED,IAAI,MAAM,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACtC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC;oBAC1E,IAAI;oBACJ,SAAS,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC;oBAC1C,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE;iBACnC,CAAC,CAAC,CAAC;YACN,CAAC;YAED,IAAI,cAAc,GAA2D;gBAC3E,MAAM;gBACN,YAAY;gBACZ,IAAI,CAAC,cAAc;gBACnB,IAAI,CAAC,WAAW,IAAI,WAAW;gBAC/B,IAAI,CAAC,KAAK,KAAK,IAAI;aACpB,CAAC;YACF,IAAI,aAAa,GAAG,MAAM,iBAAiB,CAAC,GAAG,cAAc,CAAC,CAAC;YAE/D,MAAM,iBAAiB,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;YACtF,MAAM,CAAC,CAAC,iBAAiB,EAAE,4BAA4B,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC;YAE7F,mCAAmC;YACnC,MAAM,iBAAiB,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;YACtF,IAAI,iBAAiB,EAAE,CAAC;gBACtB,MAAM,CAAC,CAAC,CAAC,eAAe,EAAE,6EAA6E,CAAC,CAAC;gBAEzG,OAAO,CAAC,GAAG,CAAC,sCAAsC,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC;gBAC5E,IAAI,CAAC;oBACH,MAAM,EACJ,MAAM,EAAE,WAAW,EACnB,QAAQ,EACR,gBAAgB,EAChB,IAAI,EACJ,KAAK,GACN,GAAG,iBAAiB,CAAC,IAMrB,CAAC;oBACF,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,gBAAgB,EAAE,IAAI,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC;oBAErG,+EAA+E;oBAC/E,aAAa,CAAC,IAAI,CAAC;wBACjB,IAAI,EAAE,cAAc;wBACpB,IAAI,EAAE;4BACJ,QAAQ,EAAE,QAAQ;4BAClB,WAAW,EAAE,iBAAiB;4BAC9B,WAAW,EAAE,6BAA6B;yBAC3C;qBACF,CAAC,CAAC;gBACL,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;oBAChD,uDAAuD;oBACvD,aAAa,CAAC,IAAI,CAAC;wBACjB,IAAI,EAAE,aAAa;wBACnB,IAAI,EAAE;4BACJ,IAAI,EAAE,6BAA8B,KAAe,CAAC,OAAO,EAAE;yBAC9D;qBACF,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,aAAa,GAAG,MAAM,8BAA8B,CAClD,cAAc,EACd,aAAa,EACb,QAAQ,EACR,iBAAiB,CAClB,CAAC;YACJ,CAAC;YAED,iHAAiH;YACjH,MAAM,aAAa,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;YAC9E,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC,IAA2C,CAAC;gBACtF,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE,QAAQ,CAAC,CAAC;gBAEzD,IAAI,cAAc,GAAqB,KAAK,CAAC;gBAC7C,MAAM,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;gBAE1D,IAAI,CAAC;oBACH,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;gBAC1D,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,CAAC,CAAC,CAAC;gBAC9C,CAAC;gBAED,IAAI,CAAC,cAAc,EAAE,CAAC;oBACpB,OAAO,CAAC,GAAG,CAAC,kCAAkC,QAAQ,wCAAwC,CAAC,CAAC;oBAEhG,sDAAsD;oBACtD,cAAc,GAAG,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,IAAI,CAAC,WAAW,IAAI,WAAW,EAAE,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;oBAC5G,aAAa,GAAG,MAAM,iBAAiB,CAAC,GAAG,cAAc,CAAC,CAAC;oBAE3D,aAAa,GAAG,MAAM,8BAA8B,CAClD,cAAc,EACd,aAAa,EACb,QAAQ,EACR,iBAAiB,CAClB,CAAC;oBAEF,MAAM,iBAAiB,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;oBACtF,MAAM,CAAC,CAAC,iBAAiB,EAAE,4BAA4B,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC;oBAC7F,MAAM,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,EAAE,wCAAwC,CAAC,CAAC;gBAC7G,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;gBAC7C,CAAC;YACH,CAAC;YAED,8FAA8F;YAC9F,MAAM,CAAC,IAAI,CACT,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,EACnD;gBACE,IAAI,EAAE,MAAM;gBACZ,iBAAiB,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;aACxF,CACF,CAAC;YAEF,MAAM,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;QAChC,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;SAAM,CAAC;QACN,iEAAiE;QACjE,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;QAClE,OAAO,UAAU,CAAC;IACpB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,8BAA8B,CAC3C,CAAC,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,WAAW,EAAE,KAAK,CAM9D,EACD,MAAsB,EACtB,QAA4C,EAC5C,iBAA0C;IAE1C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACvB,MAAM,cAAc,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAClD,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAE3D,MAAM,CAAC,IAAI,CACT,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC,IAAI,CAAC,EAAE,EAC5C;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ,CAAC,mBAAmB;YAClC,iBAAiB,EAAE;gBACjB;oBACE,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,OAAO,EAAE,IAAI,CAAC,EAAE;oBAChB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;oBACnE,OAAO,EAAE,IAAI;iBACd;aACF;SACF,CACF,CAAC;QAEF,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;QACpC,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;QACjD,CAAC;QACD,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;QACjG,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;QAEvC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,MAAM,aAAa,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACtD,MAAM,CAAC,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;YAC1C,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QACzC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,qCAAqC,EAAE,MAAM,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,SAAS,eAAe,CAAC,MAAc;IACrC,OAAO;QACL,iBAAiB,EAAE,oDAAoD;QACvE,iBAAiB,EAAE,yCAAyC;QAC5D,kBAAkB,EAAE,sEAAsE;QAC1F,kBAAkB,EAAE,qDAAqD;QACzE,MAAM,EACJ,MAAM;YACN,yJAAyJ;QAC3J,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;QAC3C,iBAAiB,EAAE,CAAC,KAAe,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC5E,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;QAC7C,qBAAqB,CAAC,IAAY;YAChC,OAAO,sEAAsE,IAAI,kCAAkC,CAAC;QACtH,CAAC;QACD,mBAAmB,EACjB,+FAA+F;KAClG,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,MAAc;IACxC,MAAM,EAAE,GAAG,eAAe,CAAC;QACzB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC;IAEH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE;YAC7B,EAAE,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,CAAC,MAAM,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
1
|
+
{"version":3,"file":"prompt-service.js","sourceRoot":"","sources":["../../src/prompt/prompt-service.ts"],"names":[],"mappings":"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"}
|