genaicode 0.11.0 → 0.12.0
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 -9
- package/dist/ai-service/ai-studio.d.ts +18 -1
- package/dist/ai-service/ai-studio.js +92 -21
- package/dist/ai-service/ai-studio.js.map +1 -1
- package/dist/ai-service/anthropic.js +59 -25
- package/dist/ai-service/anthropic.js.map +1 -1
- package/dist/ai-service/common-types.d.ts +8 -3
- package/dist/ai-service/common.d.ts +5 -1
- package/dist/ai-service/common.js +9 -0
- package/dist/ai-service/common.js.map +1 -1
- package/dist/ai-service/dall-e.js +1 -0
- package/dist/ai-service/dall-e.js.map +1 -1
- package/dist/ai-service/github-models.d.ts +13 -0
- package/dist/ai-service/github-models.js +51 -0
- package/dist/ai-service/github-models.js.map +1 -0
- package/dist/ai-service/local-llm.js +2 -1
- package/dist/ai-service/local-llm.js.map +1 -1
- package/dist/ai-service/openai-responses.d.ts +9 -0
- package/dist/ai-service/openai-responses.js +286 -0
- package/dist/ai-service/openai-responses.js.map +1 -0
- package/dist/ai-service/openai.js +22 -10
- package/dist/ai-service/openai.js.map +1 -1
- package/dist/ai-service/service-configurations-types.d.ts +7 -7
- package/dist/ai-service/service-configurations.d.ts +1 -0
- package/dist/ai-service/service-configurations.js +41 -36
- package/dist/ai-service/service-configurations.js.map +1 -1
- package/dist/ai-service/vertex-ai-claude.js +2 -2
- package/dist/ai-service/vertex-ai-claude.js.map +1 -1
- package/dist/ai-service/vertex-ai.d.ts +1 -0
- package/dist/ai-service/vertex-ai.js +4 -332
- package/dist/ai-service/vertex-ai.js.map +1 -1
- package/dist/cli/cli-options.js +1 -1
- package/dist/cli/cli-options.js.map +1 -1
- package/dist/cli/validate-cli-params.js +1 -1
- package/dist/cli/validate-cli-params.js.map +1 -1
- package/dist/files/cache-file.d.ts +4 -0
- package/dist/files/cache-file.js +21 -0
- package/dist/files/cache-file.js.map +1 -1
- package/dist/files/find-files.d.ts +1 -0
- package/dist/files/find-files.js +4 -1
- package/dist/files/find-files.js.map +1 -1
- package/dist/files/source-code-utils.js +1 -1
- package/dist/files/summary-cache.d.ts +1 -1
- package/dist/files/summary-cache.js +1 -1
- package/dist/files/summary-cache.js.map +1 -1
- package/dist/main/codegen-utils.d.ts +6 -1
- package/dist/main/codegen-utils.js +21 -2
- package/dist/main/codegen-utils.js.map +1 -1
- package/dist/main/codegen.js +2 -2
- package/dist/main/codegen.js.map +1 -1
- package/dist/main/common/content-bus-types.d.ts +17 -1
- package/dist/main/common/content-bus.d.ts +3 -1
- package/dist/main/common/content-bus.js +23 -1
- package/dist/main/common/content-bus.js.map +1 -1
- package/dist/main/common/user-actions.d.ts +3 -0
- package/dist/main/common/user-actions.js +10 -0
- package/dist/main/common/user-actions.js.map +1 -1
- package/dist/main/config-lib.js +3 -2
- package/dist/main/config-lib.js.map +1 -1
- package/dist/main/config-types.d.ts +4 -0
- package/dist/main/config.js +4 -0
- package/dist/main/config.js.map +1 -1
- package/dist/main/interactive/select-ai-service.js +0 -1
- package/dist/main/interactive/select-ai-service.js.map +1 -1
- package/dist/main/interactive/user-action-handlers.js +7 -2
- package/dist/main/interactive/user-action-handlers.js.map +1 -1
- package/dist/main/knowledge/knowledge-store.d.ts +6 -0
- package/dist/main/knowledge/knowledge-store.js +128 -0
- package/dist/main/knowledge/knowledge-store.js.map +1 -0
- package/dist/main/knowledge/types.d.ts +20 -0
- package/dist/main/knowledge/types.js +2 -0
- package/dist/main/knowledge/types.js.map +1 -0
- package/dist/main/ui/backend/endpoints/interrupt-execution-endpoint.js +17 -3
- package/dist/main/ui/backend/endpoints/interrupt-execution-endpoint.js.map +1 -1
- package/dist/main/ui/common/api-types.d.ts +67 -4
- package/dist/main/ui/common/api-types.js +12 -1
- package/dist/main/ui/common/api-types.js.map +1 -1
- package/dist/main/ui/frontend/assets/index-BbIYZZub.js +2635 -0
- package/dist/main/ui/frontend/index.html +1 -1
- package/dist/main/ui/user-action-handlers.js +7 -1
- package/dist/main/ui/user-action-handlers.js.map +1 -1
- package/dist/project-profiles/types.d.ts +4 -4
- package/dist/project-profiles/types.js +4 -4
- package/dist/project-profiles/types.js.map +1 -1
- package/dist/prompt/function-calling-validate.js +2 -1
- package/dist/prompt/function-calling-validate.js.map +1 -1
- package/dist/prompt/function-calling.js +4 -0
- package/dist/prompt/function-calling.js.map +1 -1
- package/dist/prompt/function-defs/ask-question.js +4 -0
- package/dist/prompt/function-defs/ask-question.js.map +1 -1
- package/dist/prompt/function-defs/container-task-commands.d.ts +10 -0
- package/dist/prompt/function-defs/container-task-commands.js +185 -0
- package/dist/prompt/function-defs/container-task-commands.js.map +1 -0
- package/dist/prompt/function-defs/run-container-task.d.ts +11 -0
- package/dist/prompt/function-defs/run-container-task.js +41 -0
- package/dist/prompt/function-defs/run-container-task.js.map +1 -0
- package/dist/prompt/function-defs/web-search.d.ts +9 -0
- package/dist/prompt/function-defs/web-search.js +16 -0
- package/dist/prompt/function-defs/web-search.js.map +1 -0
- package/dist/prompt/limits.js +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/container-task/command-execution-loop.d.ts +7 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/command-execution-loop.js +301 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/command-execution-loop.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/check-context.d.ts +12 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/check-context.js +41 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/check-context.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/complete-task.d.ts +4 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/complete-task.js +49 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/complete-task.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/copy-from-container.d.ts +4 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/copy-from-container.js +190 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/copy-from-container.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/copy-to-container.d.ts +4 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/copy-to-container.js +139 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/copy-to-container.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/edit-file.d.ts +10 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/edit-file.js +93 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/edit-file.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/fail-task.d.ts +4 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/fail-task.js +72 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/fail-task.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/gain-knowledge.d.ts +10 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/gain-knowledge.js +125 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/gain-knowledge.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/interrupt-controller.d.ts +19 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/interrupt-controller.js +33 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/interrupt-controller.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/query-knowledge.d.ts +8 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/query-knowledge.js +85 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/query-knowledge.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/request-secret.d.ts +6 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/request-secret.js +122 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/request-secret.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/run-command.d.ts +7 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/run-command.js +146 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/run-command.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/send-message.d.ts +4 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/send-message.js +56 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/send-message.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/set-execution-plan.d.ts +4 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/set-execution-plan.js +56 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/set-execution-plan.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/update-execution-plan.d.ts +4 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/update-execution-plan.js +39 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/update-execution-plan.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/view-file.d.ts +10 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/view-file.js +95 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/view-file.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/web-search.d.ts +2 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/web-search.js +96 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/web-search.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/wrap-context.d.ts +4 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/wrap-context.js +123 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/commands/wrap-context.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/container-command-handlers.d.ts +34 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/container-command-handlers.js +332 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/container-command-handlers.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/container-commands-registry.d.ts +11 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/container-commands-registry.js +50 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/container-commands-registry.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/container-commands-types.d.ts +28 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/container-commands-types.js +2 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/container-commands-types.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/container-task-orchestrator.d.ts +2 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/container-task-orchestrator.js +202 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/container-task-orchestrator.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/container-task-types.d.ts +52 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/container-task-types.js +2 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/container-task-types.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/utils/docker-check.d.ts +4 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/utils/docker-check.js +15 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/utils/docker-check.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/utils/docker-utils.d.ts +50 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/utils/docker-utils.js +358 -0
- package/dist/prompt/steps/step-ask-question/handlers/container-task/utils/docker-utils.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/handle-compound-action.js +2 -2
- package/dist/prompt/steps/step-ask-question/handlers/handle-compound-action.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-explore-external-directories.js +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-explore-external-directories.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-genaicode-help.js +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-genaicode-help.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-generate-image.js +2 -2
- package/dist/prompt/steps/step-ask-question/handlers/handle-generate-image.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-perform-analysis.js +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-perform-analysis.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-run-container-task.d.ts +2 -0
- package/dist/prompt/steps/step-ask-question/handlers/handle-run-container-task.js +7 -0
- package/dist/prompt/steps/step-ask-question/handlers/handle-run-container-task.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/handle-send-message.js +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-send-message.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-web-search.d.ts +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/handle-web-search.js +85 -0
- package/dist/prompt/steps/step-ask-question/handlers/handle-web-search.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/step-ask-question-types.d.ts +1 -1
- package/dist/prompt/steps/step-ask-question/step-ask-question.d.ts +2 -0
- package/dist/prompt/steps/step-ask-question/step-ask-question.js +11 -1
- package/dist/prompt/steps/step-ask-question/step-ask-question.js.map +1 -1
- package/dist/prompt/steps/step-codegen-planning.js +1 -1
- package/dist/prompt/steps/step-codegen-planning.js.map +1 -1
- package/dist/prompt/steps/step-summarization.js +17 -10
- package/dist/prompt/steps/step-summarization.js.map +1 -1
- package/dist/prompt/systemprompt.js +3 -0
- package/dist/prompt/systemprompt.js.map +1 -1
- package/dist/utils/docker-utils.d.ts +37 -0
- package/dist/utils/docker-utils.js +258 -0
- package/dist/utils/docker-utils.js.map +1 -0
- package/dist/vite-genaicode/vite-genaicode-plugin.js +9 -2
- package/dist/vite-genaicode/vite-genaicode-plugin.js.map +1 -1
- package/package.json +12 -4
- package/dist/main/ui/frontend/assets/index-C1H0vVGm.js +0 -2256
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"github-models.js","sourceRoot":"","sources":["../../src/ai-service/github-models.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,eAAe,GAA4B,KAAK,UAAU,eAAe,CACpF,GAAG,IAAyB;IAE5B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAC9B,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;QACxD,MAAM,CACJ,aAAa,EAAE,MAAM,EACrB,6GAA6G,CAC9G,CAAC;QAEF,oDAAoD;QACpD,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;YACxB,MAAM,EAAE,aAAa,CAAC,MAAM;YAC5B,OAAO,EAAE,uCAAuC;SACjD,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,SAAS,CAAC,OAAO,CAAC;QACxD,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE;YAClB,QAAQ,SAAS,EAAE,CAAC;gBAClB,KAAK,SAAS,CAAC,KAAK;oBAClB,OAAO,aAAa,CAAC,cAAc,EAAE,KAAK,IAAI,aAAa,CAAC;gBAC9D,KAAK,SAAS,CAAC,IAAI;oBACjB,OAAO,aAAa,CAAC,cAAc,EAAE,IAAI,IAAI,aAAa,CAAC;gBAC7D,KAAK,SAAS,CAAC,SAAS;oBACtB,OAAO,aAAa,CAAC,cAAc,EAAE,SAAS,IAAI,SAAS,CAAC;gBAC9D;oBACE,OAAO,aAAa,CAAC,cAAc,EAAE,OAAO,IAAI,QAAQ,CAAC;YAC7D,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;QAEL,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;QAEnC,2EAA2E;QAC3E,OAAO,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;IACjF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAC,EAAE,CAAC;YACjF,MAAM,IAAI,KAAK,CAAC,kFAAkF,CAAC,CAAC;QACtG,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -3,6 +3,7 @@ import assert from 'node:assert';
|
|
|
3
3
|
import { ModelType } from './common-types.js';
|
|
4
4
|
import { getServiceConfig } from './service-configurations.js';
|
|
5
5
|
import { internalGenerateContent } from './openai.js'; // Import the exported function
|
|
6
|
+
import { optimizeFunctionDefs } from './common.js';
|
|
6
7
|
/**
|
|
7
8
|
* This function generates content using the local llm service.
|
|
8
9
|
* Local llm provides an OpenAI-compatible API, so we can reuse the OpenAI implementation.
|
|
@@ -37,7 +38,7 @@ export const generateContent = async function generateContent(...args) {
|
|
|
37
38
|
const config = {
|
|
38
39
|
modelType,
|
|
39
40
|
temperature,
|
|
40
|
-
functionDefs,
|
|
41
|
+
functionDefs: optimizeFunctionDefs(prompt, functionDefs, requiredFunctionName ?? undefined),
|
|
41
42
|
requiredFunctionName,
|
|
42
43
|
expectedResponseType: { functionCall: true, text: false, media: false }, // Old interface expects only function calls
|
|
43
44
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-llm.js","sourceRoot":"","sources":["../../src/ai-service/local-llm.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,MAAM,MAAM,aAAa,CAAC;AAGjC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC,CAAC,+BAA+B;
|
|
1
|
+
{"version":3,"file":"local-llm.js","sourceRoot":"","sources":["../../src/ai-service/local-llm.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import OpenAI from 'openai';
|
|
2
|
+
import { GenerateContentArgs, GenerateContentFunction, GenerateContentResult } from './common-types.js';
|
|
3
|
+
import { PromptItem } from './common-types.js';
|
|
4
|
+
import { AiServiceType } from './service-configurations-types.js';
|
|
5
|
+
/**
|
|
6
|
+
* New function to generate content using the OpenAI responses model with a new signature.
|
|
7
|
+
*/
|
|
8
|
+
export declare const generateContentResponses: GenerateContentFunction;
|
|
9
|
+
export declare function internalGenerateContentResponses(prompt: PromptItem[], config: GenerateContentArgs[1], model: string, openai: OpenAI, serviceType?: AiServiceType): Promise<GenerateContentResult>;
|
|
@@ -0,0 +1,286 @@
|
|
|
1
|
+
import OpenAI, { APIError } from 'openai';
|
|
2
|
+
import assert from 'node:assert';
|
|
3
|
+
import { optimizeFunctionDefs, printTokenUsageAndCost } from './common.js';
|
|
4
|
+
import { ModelType } from './common-types.js';
|
|
5
|
+
import { abortController } from '../main/common/abort-controller.js';
|
|
6
|
+
import { getServiceConfig, getModelSettings } from './service-configurations.js';
|
|
7
|
+
/**
|
|
8
|
+
* New function to generate content using the OpenAI responses model with a new signature.
|
|
9
|
+
*/
|
|
10
|
+
export const generateContentResponses = async function generateContent(...args) {
|
|
11
|
+
const [prompt, config] = args;
|
|
12
|
+
try {
|
|
13
|
+
const serviceConfig = getServiceConfig('openai');
|
|
14
|
+
assert(serviceConfig?.apiKey, 'OpenAI API key not configured, use OPENAI_API_KEY environment variable.');
|
|
15
|
+
const openai = new OpenAI({ apiKey: serviceConfig?.apiKey, baseURL: serviceConfig?.openaiBaseUrl });
|
|
16
|
+
const modelType = config.modelType ?? ModelType.DEFAULT;
|
|
17
|
+
const model = (() => {
|
|
18
|
+
switch (modelType) {
|
|
19
|
+
case ModelType.CHEAP:
|
|
20
|
+
return serviceConfig.modelOverrides?.cheap ?? 'gpt-5-mini';
|
|
21
|
+
case ModelType.LITE:
|
|
22
|
+
return serviceConfig.modelOverrides?.lite ?? 'gpt-5-nano';
|
|
23
|
+
case ModelType.REASONING:
|
|
24
|
+
return serviceConfig.modelOverrides?.reasoning ?? 'gpt-5';
|
|
25
|
+
default:
|
|
26
|
+
return serviceConfig.modelOverrides?.default ?? 'gpt-5';
|
|
27
|
+
}
|
|
28
|
+
})();
|
|
29
|
+
return internalGenerateContentResponses(prompt, config, model, openai, 'openai');
|
|
30
|
+
}
|
|
31
|
+
catch (error) {
|
|
32
|
+
if (error instanceof Error && error.message.includes('API key not configured')) {
|
|
33
|
+
throw new Error('OpenAI API key not configured. Please set up the service configuration.');
|
|
34
|
+
}
|
|
35
|
+
throw error;
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
export async function internalGenerateContentResponses(prompt, config, model, openai, serviceType = 'openai') {
|
|
39
|
+
const modelType = config.modelType ?? ModelType.DEFAULT;
|
|
40
|
+
const temperature = config.temperature ?? 0.7; // Default temperature
|
|
41
|
+
const functionDefs = optimizeFunctionDefs(prompt, config.functionDefs, config.requiredFunctionName ?? undefined);
|
|
42
|
+
const requiredFunctionName = config.requiredFunctionName;
|
|
43
|
+
// Get model-specific settings
|
|
44
|
+
const { systemInstruction: modelSystemInstruction, outputTokenLimit, thinkingEnabled, thinkingBudget, temperatureUnsupported, } = getModelSettings(serviceType, model);
|
|
45
|
+
const expectedResponseType = config.expectedResponseType ?? {
|
|
46
|
+
text: false,
|
|
47
|
+
functionCall: true,
|
|
48
|
+
media: false,
|
|
49
|
+
webSearch: false,
|
|
50
|
+
};
|
|
51
|
+
const messages = prompt
|
|
52
|
+
.map((item, idx) => {
|
|
53
|
+
if (item.type === 'systemPrompt') {
|
|
54
|
+
let systemPrompt = item.systemPrompt;
|
|
55
|
+
// Add model-specific system instructions if available
|
|
56
|
+
if (modelSystemInstruction?.length) {
|
|
57
|
+
systemPrompt += `\n${modelSystemInstruction.join('\n')}`;
|
|
58
|
+
}
|
|
59
|
+
return {
|
|
60
|
+
role: modelType === ModelType.REASONING && serviceType === 'openai'
|
|
61
|
+
? 'developer'
|
|
62
|
+
: 'system',
|
|
63
|
+
content: systemPrompt,
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
else if (item.type === 'user') {
|
|
67
|
+
const messages = [];
|
|
68
|
+
if (item.functionResponses) {
|
|
69
|
+
messages.push(...item.functionResponses.map((response, fridx) => ({
|
|
70
|
+
type: 'function_call_output',
|
|
71
|
+
output: response.content ?? '',
|
|
72
|
+
id: `fc_${idx}_${fridx}`,
|
|
73
|
+
call_id: response.call_id ?? response.name, // Use call_id if available, fallback to name
|
|
74
|
+
})));
|
|
75
|
+
}
|
|
76
|
+
if ((item.images?.length ?? 0) > 0) {
|
|
77
|
+
messages.push({
|
|
78
|
+
id: `msg_${idx}`,
|
|
79
|
+
role: 'user',
|
|
80
|
+
content: [
|
|
81
|
+
...item.images.map((image) => ({
|
|
82
|
+
type: 'input_image',
|
|
83
|
+
detail: 'auto',
|
|
84
|
+
image_url: image.uri ? image.uri : 'data:' + image.mediaType + ';base64,' + image.base64url,
|
|
85
|
+
})),
|
|
86
|
+
...(item.text
|
|
87
|
+
? [
|
|
88
|
+
{
|
|
89
|
+
type: 'input_text',
|
|
90
|
+
text: item.text,
|
|
91
|
+
},
|
|
92
|
+
]
|
|
93
|
+
: []),
|
|
94
|
+
],
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
else if (item.text) {
|
|
98
|
+
messages.push({
|
|
99
|
+
id: `msg_${idx}`,
|
|
100
|
+
role: 'user',
|
|
101
|
+
content: [
|
|
102
|
+
{
|
|
103
|
+
type: 'input_text',
|
|
104
|
+
text: item.text,
|
|
105
|
+
},
|
|
106
|
+
],
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
return messages;
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
assert(item.type === 'assistant');
|
|
113
|
+
const messages = [];
|
|
114
|
+
if (item.text) {
|
|
115
|
+
// Only text content if no images or function calls
|
|
116
|
+
messages.push({
|
|
117
|
+
id: `msg_${idx}`,
|
|
118
|
+
role: 'assistant',
|
|
119
|
+
status: 'completed',
|
|
120
|
+
type: 'message',
|
|
121
|
+
content: [{ type: 'output_text', text: item.text, annotations: [] }],
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
if (item.functionCalls && item.functionCalls.length > 0) {
|
|
125
|
+
messages.push(...item.functionCalls.map((call, fxidx) => ({
|
|
126
|
+
id: `fc_${idx}_${fxidx}`,
|
|
127
|
+
type: 'function_call',
|
|
128
|
+
call_id: call.id ?? call.name,
|
|
129
|
+
name: call.name,
|
|
130
|
+
arguments: JSON.stringify(call.args ?? {}),
|
|
131
|
+
})));
|
|
132
|
+
}
|
|
133
|
+
return messages;
|
|
134
|
+
}
|
|
135
|
+
})
|
|
136
|
+
.flat();
|
|
137
|
+
console.log(`Using OpenAI Responses model: ${model}`);
|
|
138
|
+
let retryCount = 0;
|
|
139
|
+
const maxRetries = 3;
|
|
140
|
+
let response = undefined;
|
|
141
|
+
// Determine tool choice based on function defs and required function name
|
|
142
|
+
let toolChoice = undefined;
|
|
143
|
+
const tools = [];
|
|
144
|
+
if (functionDefs.length > 0) {
|
|
145
|
+
tools.push(...functionDefs.map((funDef) => ({
|
|
146
|
+
type: 'function',
|
|
147
|
+
name: funDef.name,
|
|
148
|
+
description: funDef.description,
|
|
149
|
+
parameters: { additionalProperties: false, ...funDef.parameters },
|
|
150
|
+
strict: false,
|
|
151
|
+
})));
|
|
152
|
+
if (requiredFunctionName && expectedResponseType.functionCall !== false) {
|
|
153
|
+
toolChoice = { type: 'function', name: requiredFunctionName };
|
|
154
|
+
}
|
|
155
|
+
else if (expectedResponseType.functionCall !== false) {
|
|
156
|
+
// Require tool use unless explicitly text-only is expected
|
|
157
|
+
toolChoice = 'required';
|
|
158
|
+
}
|
|
159
|
+
else if (expectedResponseType.functionCall === false) {
|
|
160
|
+
toolChoice = 'none';
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
if (expectedResponseType.webSearch) {
|
|
164
|
+
tools.push({ type: 'web_search' });
|
|
165
|
+
}
|
|
166
|
+
// For now, image generation will be a tool that can be called.
|
|
167
|
+
// The actual image generation logic will be handled by a separate service/function.
|
|
168
|
+
if (expectedResponseType.media) {
|
|
169
|
+
// In the future, we might add an ImageGenerationTool here.
|
|
170
|
+
}
|
|
171
|
+
let reasoning = undefined;
|
|
172
|
+
if (modelType === ModelType.REASONING) {
|
|
173
|
+
reasoning = {
|
|
174
|
+
effort: 'high',
|
|
175
|
+
};
|
|
176
|
+
}
|
|
177
|
+
else if (typeof thinkingEnabled === 'boolean') {
|
|
178
|
+
reasoning = {
|
|
179
|
+
effort: typeof thinkingBudget === 'number'
|
|
180
|
+
? thinkingBudget <= 1024
|
|
181
|
+
? 'low'
|
|
182
|
+
: thinkingBudget <= 8192
|
|
183
|
+
? 'medium'
|
|
184
|
+
: 'high'
|
|
185
|
+
: 'medium',
|
|
186
|
+
};
|
|
187
|
+
}
|
|
188
|
+
while (retryCount < maxRetries) {
|
|
189
|
+
try {
|
|
190
|
+
// Assuming openai.responses.create exists and has a similar signature
|
|
191
|
+
response = await openai.responses.create({
|
|
192
|
+
model: model,
|
|
193
|
+
reasoning: reasoning,
|
|
194
|
+
input: messages,
|
|
195
|
+
...(tools.length > 0 ? { tools } : {}),
|
|
196
|
+
...(toolChoice ? { tool_choice: toolChoice } : {}),
|
|
197
|
+
...(modelType !== ModelType.REASONING && !temperatureUnsupported ? { temperature } : {}),
|
|
198
|
+
...(outputTokenLimit && modelType !== ModelType.REASONING ? { max_tokens: outputTokenLimit } : {}),
|
|
199
|
+
}, { signal: abortController?.signal });
|
|
200
|
+
break; // Exit loop if successful
|
|
201
|
+
}
|
|
202
|
+
catch (error) {
|
|
203
|
+
if (error instanceof APIError && error.status === 429) {
|
|
204
|
+
// Rate limit error
|
|
205
|
+
let retryAfter = error.headers?.['retry-after'] ? parseInt(error.headers['retry-after'], 10) : 60;
|
|
206
|
+
retryAfter = Math.min(retryAfter, 30);
|
|
207
|
+
console.log(`Rate limited. Retrying after ${retryAfter} seconds. Attempt ${retryCount + 1} of ${maxRetries}.`);
|
|
208
|
+
await new Promise((resolve) => setTimeout(resolve, retryAfter * 1000));
|
|
209
|
+
retryCount++;
|
|
210
|
+
}
|
|
211
|
+
else {
|
|
212
|
+
console.error('An error occurred during OpenAI API call:', error);
|
|
213
|
+
// Throw a more specific error or handle based on error type
|
|
214
|
+
if (error instanceof Error) {
|
|
215
|
+
throw new Error(`API request failed: ${error.message}. Operation aborted.`);
|
|
216
|
+
}
|
|
217
|
+
else {
|
|
218
|
+
throw new Error('API request failed due to an unknown error. Operation aborted.');
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
if (retryCount === maxRetries) {
|
|
224
|
+
console.error(`Failed to complete request after ${maxRetries} attempts due to rate limiting.`);
|
|
225
|
+
throw new Error('Rate limit exceeded. Operation aborted.');
|
|
226
|
+
}
|
|
227
|
+
assert(response, 'API response is undefined after retries.');
|
|
228
|
+
// Print token usage for openai
|
|
229
|
+
const usage = {
|
|
230
|
+
inputTokens: response.usage.input_tokens,
|
|
231
|
+
outputTokens: response.usage.output_tokens,
|
|
232
|
+
totalTokens: response.usage.total_tokens,
|
|
233
|
+
};
|
|
234
|
+
printTokenUsageAndCost({
|
|
235
|
+
aiService: serviceType,
|
|
236
|
+
usage,
|
|
237
|
+
inputCostPerToken: 0.000005, // Example cost for gpt-4o
|
|
238
|
+
outputCostPerToken: 0.000015, // Example cost for gpt-4o
|
|
239
|
+
modelType,
|
|
240
|
+
});
|
|
241
|
+
const responseMessage = response.output;
|
|
242
|
+
const result = [];
|
|
243
|
+
if (responseMessage.some((msg) => msg.type === 'function_call') && expectedResponseType.functionCall) {
|
|
244
|
+
result.push(...responseMessage
|
|
245
|
+
.filter((msg) => msg.type === 'function_call')
|
|
246
|
+
.map((call) => {
|
|
247
|
+
const name = call.name;
|
|
248
|
+
let parsedArgs;
|
|
249
|
+
try {
|
|
250
|
+
parsedArgs = JSON.parse(call.arguments);
|
|
251
|
+
}
|
|
252
|
+
catch (e) {
|
|
253
|
+
console.warn(`Failed to parse arguments for function call ${name}: ${call.arguments}`);
|
|
254
|
+
parsedArgs = { _raw_args: call.arguments }; // Keep raw args if parsing fails
|
|
255
|
+
}
|
|
256
|
+
return {
|
|
257
|
+
type: 'functionCall',
|
|
258
|
+
functionCall: {
|
|
259
|
+
id: call.id,
|
|
260
|
+
name,
|
|
261
|
+
args: parsedArgs,
|
|
262
|
+
},
|
|
263
|
+
};
|
|
264
|
+
}));
|
|
265
|
+
}
|
|
266
|
+
for (const part of responseMessage
|
|
267
|
+
.filter((msg) => msg.type === 'message')
|
|
268
|
+
.flatMap((msg) => msg.content)
|
|
269
|
+
.filter((p) => p.type === 'output_text')) {
|
|
270
|
+
if (expectedResponseType.webSearch === true) {
|
|
271
|
+
result.push({
|
|
272
|
+
type: 'webSearch',
|
|
273
|
+
text: part.text,
|
|
274
|
+
urls: part.annotations.filter((a) => a.type === 'url_citation').map((a) => a.url),
|
|
275
|
+
});
|
|
276
|
+
}
|
|
277
|
+
else {
|
|
278
|
+
result.push({
|
|
279
|
+
type: 'text',
|
|
280
|
+
text: part.text,
|
|
281
|
+
});
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
return result;
|
|
285
|
+
}
|
|
286
|
+
//# sourceMappingURL=openai-responses.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openai-responses.js","sourceRoot":"","sources":["../../src/ai-service/openai-responses.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import OpenAI, { APIError } from 'openai';
|
|
2
2
|
import assert from 'node:assert';
|
|
3
|
-
import { printTokenUsageAndCost } from './common.js';
|
|
3
|
+
import { optimizeFunctionDefs, printTokenUsageAndCost } from './common.js';
|
|
4
4
|
import { ModelType } from './common-types.js';
|
|
5
5
|
import { abortController } from '../main/common/abort-controller.js';
|
|
6
6
|
import { getServiceConfig, getModelSettings } from './service-configurations.js';
|
|
7
|
+
import { internalGenerateContentResponses } from './openai-responses.js';
|
|
7
8
|
/**
|
|
8
9
|
* New function to generate content using the OpenAI chat model with a new signature.
|
|
9
10
|
*/
|
|
@@ -17,16 +18,16 @@ export const generateContent = async function generateContent(...args) {
|
|
|
17
18
|
const model = (() => {
|
|
18
19
|
switch (modelType) {
|
|
19
20
|
case ModelType.CHEAP:
|
|
20
|
-
return serviceConfig.modelOverrides?.cheap ?? 'gpt-
|
|
21
|
+
return serviceConfig.modelOverrides?.cheap ?? 'gpt-5-mini';
|
|
21
22
|
case ModelType.LITE:
|
|
22
|
-
return serviceConfig.modelOverrides?.lite ?? 'gpt-
|
|
23
|
+
return serviceConfig.modelOverrides?.lite ?? 'gpt-5-nano';
|
|
23
24
|
case ModelType.REASONING:
|
|
24
|
-
return serviceConfig.modelOverrides?.reasoning ?? '
|
|
25
|
+
return serviceConfig.modelOverrides?.reasoning ?? 'gpt-5';
|
|
25
26
|
default:
|
|
26
|
-
return serviceConfig.modelOverrides?.default ?? 'gpt-
|
|
27
|
+
return serviceConfig.modelOverrides?.default ?? 'gpt-5';
|
|
27
28
|
}
|
|
28
29
|
})();
|
|
29
|
-
return
|
|
30
|
+
return internalGenerateContentResponses(prompt, config, model, openai, 'openai');
|
|
30
31
|
}
|
|
31
32
|
catch (error) {
|
|
32
33
|
if (error instanceof Error && error.message.includes('API key not configured')) {
|
|
@@ -38,10 +39,10 @@ export const generateContent = async function generateContent(...args) {
|
|
|
38
39
|
export async function internalGenerateContent(prompt, config, model, openai, serviceType = 'openai') {
|
|
39
40
|
const modelType = config.modelType ?? ModelType.DEFAULT;
|
|
40
41
|
const temperature = config.temperature ?? 0.7; // Default temperature
|
|
41
|
-
const functionDefs = config.functionDefs ??
|
|
42
|
+
const functionDefs = optimizeFunctionDefs(prompt, config.functionDefs, config.requiredFunctionName ?? undefined);
|
|
42
43
|
const requiredFunctionName = config.requiredFunctionName;
|
|
43
44
|
// Get model-specific settings
|
|
44
|
-
const { systemInstruction: modelSystemInstruction, outputTokenLimit, thinkingEnabled, thinkingBudget, } = getModelSettings(serviceType, model);
|
|
45
|
+
const { systemInstruction: modelSystemInstruction, outputTokenLimit, thinkingEnabled, thinkingBudget, temperatureUnsupported, } = getModelSettings(serviceType, model);
|
|
45
46
|
const expectedResponseType = config.expectedResponseType ?? {
|
|
46
47
|
text: false,
|
|
47
48
|
functionCall: true,
|
|
@@ -183,7 +184,7 @@ export async function internalGenerateContent(prompt, config, model, openai, ser
|
|
|
183
184
|
messages,
|
|
184
185
|
...(tools ? { tools } : {}),
|
|
185
186
|
...(toolChoice ? { tool_choice: toolChoice } : {}),
|
|
186
|
-
...(modelType !== ModelType.REASONING ? { temperature } : {}),
|
|
187
|
+
...(modelType !== ModelType.REASONING && !temperatureUnsupported ? { temperature } : {}),
|
|
187
188
|
...(outputTokenLimit && modelType !== ModelType.REASONING ? { max_tokens: outputTokenLimit } : {}),
|
|
188
189
|
}, { signal: abortController?.signal });
|
|
189
190
|
break; // Exit loop if successful
|
|
@@ -217,6 +218,7 @@ export async function internalGenerateContent(prompt, config, model, openai, ser
|
|
|
217
218
|
// Print token usage for openai
|
|
218
219
|
const usage = {
|
|
219
220
|
inputTokens: response.usage.prompt_tokens - (response.usage?.prompt_tokens_details?.cached_tokens ?? 0),
|
|
221
|
+
thinkingTokens: response.usage.completion_tokens_details?.reasoning_tokens,
|
|
220
222
|
outputTokens: response.usage.completion_tokens,
|
|
221
223
|
totalTokens: response.usage.total_tokens,
|
|
222
224
|
cacheReadTokens: response.usage?.prompt_tokens_details?.cached_tokens,
|
|
@@ -249,7 +251,9 @@ export async function internalGenerateContent(prompt, config, model, openai, ser
|
|
|
249
251
|
}
|
|
250
252
|
const result = [];
|
|
251
253
|
if (responseMessage.tool_calls && expectedResponseType.functionCall) {
|
|
252
|
-
result.push(...responseMessage.tool_calls
|
|
254
|
+
result.push(...responseMessage.tool_calls
|
|
255
|
+
.filter((call) => call.type === 'function')
|
|
256
|
+
.map((call) => {
|
|
253
257
|
const name = call.function.name;
|
|
254
258
|
let parsedArgs;
|
|
255
259
|
try {
|
|
@@ -275,6 +279,14 @@ export async function internalGenerateContent(prompt, config, model, openai, ser
|
|
|
275
279
|
text: responseMessage.content,
|
|
276
280
|
});
|
|
277
281
|
}
|
|
282
|
+
if (responseMessage.content && expectedResponseType.webSearch) {
|
|
283
|
+
const urls = [];
|
|
284
|
+
result.push({
|
|
285
|
+
type: 'webSearch',
|
|
286
|
+
text: responseMessage.content,
|
|
287
|
+
urls,
|
|
288
|
+
});
|
|
289
|
+
}
|
|
278
290
|
return result;
|
|
279
291
|
}
|
|
280
292
|
//# sourceMappingURL=openai.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/ai-service/openai.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/ai-service/openai.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,12 +31,7 @@ export type ServiceConfigRequirements = {
|
|
|
31
31
|
'vertex-ai': {
|
|
32
32
|
apiKey?: never;
|
|
33
33
|
googleCloudProjectId: string;
|
|
34
|
-
googleCloudRegion?:
|
|
35
|
-
};
|
|
36
|
-
'vertex-ai-claude': {
|
|
37
|
-
apiKey?: never;
|
|
38
|
-
googleCloudProjectId: string;
|
|
39
|
-
googleCloudRegion: string;
|
|
34
|
+
googleCloudRegion?: string;
|
|
40
35
|
};
|
|
41
36
|
openai: {
|
|
42
37
|
apiKey: string | undefined;
|
|
@@ -60,7 +55,12 @@ export type ServiceConfigRequirements = {
|
|
|
60
55
|
googleCloudProjectId?: never;
|
|
61
56
|
googleCloudRegion?: never;
|
|
62
57
|
};
|
|
58
|
+
'github-models': {
|
|
59
|
+
apiKey: string | undefined;
|
|
60
|
+
googleCloudProjectId?: never;
|
|
61
|
+
googleCloudRegion?: never;
|
|
62
|
+
};
|
|
63
63
|
}; /** Example: {@link ../../examples/genaicode_plugins/grok_ai_service.ts} */
|
|
64
64
|
export type PluginAiServiceType = `plugin:${string}`; /** Example: {@link ../../examples/genaicode_plugins/nonsense_action_handlers.ts} */
|
|
65
65
|
export type PluginActionType = `plugin:${string}`;
|
|
66
|
-
export type AiServiceType = 'vertex-ai' | 'ai-studio' | '
|
|
66
|
+
export type AiServiceType = 'vertex-ai' | 'ai-studio' | 'openai' | 'local-llm' | 'anthropic' | 'github-models' | PluginAiServiceType;
|