@google/adk 0.2.1 → 0.2.3
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/dist/cjs/agents/base_agent.js +14 -2
- package/dist/cjs/agents/content_processor_utils.js +12 -2
- package/dist/cjs/agents/functions.js +16 -3
- package/dist/cjs/agents/llm_agent.js +341 -4
- package/dist/cjs/{utils/deep_clone.js → auth/exchanger/base_credential_exchanger.js} +6 -10
- package/dist/cjs/auth/exchanger/credential_exchanger_registry.js +59 -0
- package/dist/cjs/code_executors/built_in_code_executor.js +1 -1
- package/dist/cjs/code_executors/code_execution_utils.js +12 -2
- package/dist/cjs/code_executors/code_executor_context.js +12 -2
- package/dist/cjs/common.js +10 -0
- package/dist/cjs/index.js +58 -5
- package/dist/cjs/index.js.map +4 -4
- package/dist/cjs/models/base_llm.js +16 -4
- package/dist/cjs/runner/runner.js +10 -1
- package/dist/cjs/sessions/in_memory_session_service.js +13 -3
- package/dist/cjs/sessions/state.js +1 -1
- package/dist/cjs/tools/agent_tool.js +2 -2
- package/dist/cjs/tools/mcp/mcp_session_manager.js +7 -1
- package/dist/cjs/utils/gemini_schema_util.js +16 -0
- package/dist/cjs/utils/model_name.js +24 -4
- package/dist/cjs/version.js +1 -1
- package/dist/esm/agents/base_agent.js +12 -1
- package/dist/esm/agents/content_processor_utils.js +2 -2
- package/dist/esm/agents/functions.js +6 -3
- package/dist/esm/agents/llm_agent.js +330 -4
- package/dist/esm/auth/exchanger/base_credential_exchanger.js +10 -0
- package/dist/esm/auth/exchanger/credential_exchanger_registry.js +29 -0
- package/dist/esm/code_executors/built_in_code_executor.js +2 -2
- package/dist/esm/code_executors/code_execution_utils.js +2 -2
- package/dist/esm/code_executors/code_executor_context.js +2 -2
- package/dist/esm/common.js +8 -2
- package/dist/esm/index.js +58 -5
- package/dist/esm/index.js.map +4 -4
- package/dist/esm/models/base_llm.js +14 -3
- package/dist/esm/runner/runner.js +10 -1
- package/dist/esm/sessions/in_memory_session_service.js +3 -3
- package/dist/esm/sessions/state.js +1 -1
- package/dist/esm/tools/agent_tool.js +2 -2
- package/dist/esm/tools/function_tool.js +3 -1
- package/dist/esm/tools/mcp/mcp_session_manager.js +7 -1
- package/dist/esm/utils/gemini_schema_util.js +16 -0
- package/dist/esm/utils/model_name.js +23 -3
- package/dist/esm/version.js +1 -1
- package/dist/types/agents/base_agent.d.ts +15 -0
- package/dist/types/agents/functions.d.ts +2 -0
- package/dist/types/agents/llm_agent.d.ts +23 -0
- package/dist/types/auth/exchanger/base_credential_exchanger.d.ts +32 -0
- package/dist/types/auth/exchanger/credential_exchanger_registry.d.ts +28 -0
- package/dist/types/code_executors/code_executor_context.d.ts +0 -5
- package/dist/types/common.d.ts +4 -2
- package/dist/types/models/base_llm.d.ts +16 -0
- package/dist/types/sessions/in_memory_session_service.d.ts +0 -5
- package/dist/types/sessions/state.d.ts +2 -2
- package/dist/types/tools/function_tool.d.ts +3 -3
- package/dist/types/tools/tool_confirmation.d.ts +1 -1
- package/dist/types/utils/gemini_schema_util.d.ts +2 -2
- package/dist/types/utils/model_name.d.ts +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/web/agents/base_agent.js +12 -1
- package/dist/web/agents/content_processor_utils.js +2 -2
- package/dist/web/agents/functions.js +6 -3
- package/dist/web/agents/llm_agent.js +315 -4
- package/dist/web/auth/exchanger/base_credential_exchanger.js +10 -0
- package/dist/web/auth/exchanger/credential_exchanger_registry.js +29 -0
- package/dist/web/code_executors/built_in_code_executor.js +2 -2
- package/dist/web/code_executors/code_execution_utils.js +2 -2
- package/dist/web/code_executors/code_executor_context.js +2 -2
- package/dist/web/common.js +8 -2
- package/dist/web/index.js +1 -1
- package/dist/web/index.js.map +4 -4
- package/dist/web/models/base_llm.js +14 -3
- package/dist/web/runner/runner.js +10 -1
- package/dist/web/sessions/in_memory_session_service.js +3 -3
- package/dist/web/sessions/state.js +1 -1
- package/dist/web/tools/agent_tool.js +2 -2
- package/dist/web/tools/function_tool.js +3 -1
- package/dist/web/tools/mcp/mcp_session_manager.js +7 -1
- package/dist/web/utils/gemini_schema_util.js +16 -0
- package/dist/web/utils/model_name.js +23 -3
- package/dist/web/version.js +1 -1
- package/package.json +3 -1
- package/dist/esm/utils/deep_clone.js +0 -14
- package/dist/types/utils/deep_clone.d.ts +0 -1
- package/dist/web/utils/deep_clone.js +0 -14
|
@@ -24,7 +24,8 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
24
24
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
25
25
|
var base_llm_exports = {};
|
|
26
26
|
__export(base_llm_exports, {
|
|
27
|
-
BaseLlm: () => BaseLlm
|
|
27
|
+
BaseLlm: () => BaseLlm,
|
|
28
|
+
isBaseLlm: () => isBaseLlm
|
|
28
29
|
});
|
|
29
30
|
module.exports = __toCommonJS(base_llm_exports);
|
|
30
31
|
var import_client_labels = require("../utils/client_labels.js");
|
|
@@ -33,6 +34,12 @@ var import_client_labels = require("../utils/client_labels.js");
|
|
|
33
34
|
* Copyright 2025 Google LLC
|
|
34
35
|
* SPDX-License-Identifier: Apache-2.0
|
|
35
36
|
*/
|
|
37
|
+
var _a;
|
|
38
|
+
const BASE_MODEL_SYMBOL = Symbol.for("google.adk.baseModel");
|
|
39
|
+
function isBaseLlm(obj) {
|
|
40
|
+
return typeof obj === "object" && obj !== null && BASE_MODEL_SYMBOL in obj && obj[BASE_MODEL_SYMBOL] === true;
|
|
41
|
+
}
|
|
42
|
+
_a = BASE_MODEL_SYMBOL;
|
|
36
43
|
class BaseLlm {
|
|
37
44
|
/**
|
|
38
45
|
* Creates an instance of BaseLLM.
|
|
@@ -41,6 +48,10 @@ class BaseLlm {
|
|
|
41
48
|
* gemini-1.5-flash-001.
|
|
42
49
|
*/
|
|
43
50
|
constructor({ model }) {
|
|
51
|
+
/**
|
|
52
|
+
* A unique symbol to identify BaseLlm classes.
|
|
53
|
+
*/
|
|
54
|
+
this[_a] = true;
|
|
44
55
|
this.model = model;
|
|
45
56
|
}
|
|
46
57
|
get trackingHeaders() {
|
|
@@ -57,7 +68,7 @@ class BaseLlm {
|
|
|
57
68
|
* @param llmRequest LlmRequest, the request to send to the LLM.
|
|
58
69
|
*/
|
|
59
70
|
maybeAppendUserContent(llmRequest) {
|
|
60
|
-
var
|
|
71
|
+
var _a2;
|
|
61
72
|
if (llmRequest.contents.length === 0) {
|
|
62
73
|
llmRequest.contents.push({
|
|
63
74
|
role: "user",
|
|
@@ -66,7 +77,7 @@ class BaseLlm {
|
|
|
66
77
|
]
|
|
67
78
|
});
|
|
68
79
|
}
|
|
69
|
-
if (((
|
|
80
|
+
if (((_a2 = llmRequest.contents[llmRequest.contents.length - 1]) == null ? void 0 : _a2.role) !== "user") {
|
|
70
81
|
llmRequest.contents.push({
|
|
71
82
|
role: "user",
|
|
72
83
|
parts: [{
|
|
@@ -82,5 +93,6 @@ class BaseLlm {
|
|
|
82
93
|
BaseLlm.supportedModels = [];
|
|
83
94
|
// Annotate the CommonJS export names for ESM import in node:
|
|
84
95
|
0 && (module.exports = {
|
|
85
|
-
BaseLlm
|
|
96
|
+
BaseLlm,
|
|
97
|
+
isBaseLlm
|
|
86
98
|
});
|
|
@@ -32,6 +32,7 @@ var import_api = require("@opentelemetry/api");
|
|
|
32
32
|
var import_invocation_context = require("../agents/invocation_context.js");
|
|
33
33
|
var import_llm_agent = require("../agents/llm_agent.js");
|
|
34
34
|
var import_run_config = require("../agents/run_config.js");
|
|
35
|
+
var import_built_in_code_executor = require("../code_executors/built_in_code_executor.js");
|
|
35
36
|
var import_event = require("../events/event.js");
|
|
36
37
|
var import_event_actions = require("../events/event_actions.js");
|
|
37
38
|
var import_plugin_manager = require("../plugins/plugin_manager.js");
|
|
@@ -77,6 +78,11 @@ class Runner {
|
|
|
77
78
|
try {
|
|
78
79
|
const session = await this.sessionService.getSession({ appName: this.appName, userId, sessionId });
|
|
79
80
|
if (!session) {
|
|
81
|
+
if (!this.appName) {
|
|
82
|
+
throw new Error(
|
|
83
|
+
`Session lookup failed: appName must be provided in runner constructor`
|
|
84
|
+
);
|
|
85
|
+
}
|
|
80
86
|
throw new Error(`Session not found: ${sessionId}`);
|
|
81
87
|
}
|
|
82
88
|
if (runConfig.supportCfc && this.agent instanceof import_llm_agent.LlmAgent) {
|
|
@@ -85,6 +91,9 @@ class Runner {
|
|
|
85
91
|
throw new Error(`CFC is not supported for model: ${modelName} in agent: ${this.agent.name}`);
|
|
86
92
|
}
|
|
87
93
|
}
|
|
94
|
+
if (this.agent instanceof import_llm_agent.LlmAgent && !(this.agent.codeExecutor instanceof import_built_in_code_executor.BuiltInCodeExecutor)) {
|
|
95
|
+
this.agent.codeExecutor = new import_built_in_code_executor.BuiltInCodeExecutor();
|
|
96
|
+
}
|
|
88
97
|
const invocationContext = new import_invocation_context.InvocationContext({
|
|
89
98
|
artifactService: this.artifactService,
|
|
90
99
|
sessionService: this.sessionService,
|
|
@@ -106,7 +115,7 @@ class Runner {
|
|
|
106
115
|
}
|
|
107
116
|
if (newMessage) {
|
|
108
117
|
if (!((_a = newMessage.parts) == null ? void 0 : _a.length)) {
|
|
109
|
-
throw new Error("No parts in the
|
|
118
|
+
throw new Error("No parts in the newMessage.");
|
|
110
119
|
}
|
|
111
120
|
if (runConfig.saveInputBlobsAsArtifacts) {
|
|
112
121
|
await this.saveArtifacts(
|
|
@@ -5,9 +5,11 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
"use strict";
|
|
8
|
+
var __create = Object.create;
|
|
8
9
|
var __defProp = Object.defineProperty;
|
|
9
10
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
10
11
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
12
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
11
13
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
12
14
|
var __export = (target, all) => {
|
|
13
15
|
for (var name in all)
|
|
@@ -21,13 +23,21 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
21
23
|
}
|
|
22
24
|
return to;
|
|
23
25
|
};
|
|
26
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
27
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
28
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
29
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
30
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
31
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
32
|
+
mod
|
|
33
|
+
));
|
|
24
34
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
25
35
|
var in_memory_session_service_exports = {};
|
|
26
36
|
__export(in_memory_session_service_exports, {
|
|
27
37
|
InMemorySessionService: () => InMemorySessionService
|
|
28
38
|
});
|
|
29
39
|
module.exports = __toCommonJS(in_memory_session_service_exports);
|
|
30
|
-
var
|
|
40
|
+
var import_cloneDeep = __toESM(require("lodash-es/cloneDeep.js"), 1);
|
|
31
41
|
var import_env_aware_utils = require("../utils/env_aware_utils.js");
|
|
32
42
|
var import_logger = require("../utils/logger.js");
|
|
33
43
|
var import_base_session_service = require("./base_session_service.js");
|
|
@@ -72,7 +82,7 @@ class InMemorySessionService extends import_base_session_service.BaseSessionServ
|
|
|
72
82
|
}
|
|
73
83
|
this.sessions[appName][userId][session.id] = session;
|
|
74
84
|
return Promise.resolve(
|
|
75
|
-
this.mergeState(appName, userId, (0,
|
|
85
|
+
this.mergeState(appName, userId, (0, import_cloneDeep.default)(session))
|
|
76
86
|
);
|
|
77
87
|
}
|
|
78
88
|
getSession({ appName, userId, sessionId, config }) {
|
|
@@ -80,7 +90,7 @@ class InMemorySessionService extends import_base_session_service.BaseSessionServ
|
|
|
80
90
|
return Promise.resolve(void 0);
|
|
81
91
|
}
|
|
82
92
|
const session = this.sessions[appName][userId][sessionId];
|
|
83
|
-
const copiedSession = (0,
|
|
93
|
+
const copiedSession = (0, import_cloneDeep.default)(session);
|
|
84
94
|
if (config) {
|
|
85
95
|
if (config.numRecentEvents) {
|
|
86
96
|
copiedSession.events = copiedSession.events.slice(-config.numRecentEvents);
|
|
@@ -124,8 +124,8 @@ class AgentTool extends import_base_tool.BaseTool {
|
|
|
124
124
|
return "";
|
|
125
125
|
}
|
|
126
126
|
const hasOutputSchema = this.agent instanceof import_llm_agent.LlmAgent && this.agent.outputSchema;
|
|
127
|
-
const
|
|
128
|
-
return hasOutputSchema ? JSON.parse(
|
|
127
|
+
const mergedText = lastEvent.content.parts.map((part) => part.text).filter((text) => text).join("\n");
|
|
128
|
+
return hasOutputSchema ? JSON.parse(mergedText) : mergedText;
|
|
129
129
|
}
|
|
130
130
|
}
|
|
131
131
|
// Annotate the CommonJS export names for ESM import in node:
|
|
@@ -48,8 +48,14 @@ class MCPSessionManager {
|
|
|
48
48
|
);
|
|
49
49
|
break;
|
|
50
50
|
case "StreamableHTTPConnectionParams":
|
|
51
|
+
const transportOptions = this.connectionParams.header ? {
|
|
52
|
+
requestInit: {
|
|
53
|
+
headers: this.connectionParams.header
|
|
54
|
+
}
|
|
55
|
+
} : void 0;
|
|
51
56
|
await client.connect(new import_streamableHttp.StreamableHTTPClientTransport(
|
|
52
|
-
new URL(this.connectionParams.url)
|
|
57
|
+
new URL(this.connectionParams.url),
|
|
58
|
+
transportOptions
|
|
53
59
|
));
|
|
54
60
|
break;
|
|
55
61
|
default:
|
|
@@ -63,6 +63,22 @@ function toGeminiSchema(mcpSchema) {
|
|
|
63
63
|
return void 0;
|
|
64
64
|
}
|
|
65
65
|
function recursiveConvert(mcp) {
|
|
66
|
+
if (!mcp.type && mcp.anyOf && Array.isArray(mcp.anyOf)) {
|
|
67
|
+
const nonNullOption = mcp.anyOf.find((opt) => {
|
|
68
|
+
const t = opt.type;
|
|
69
|
+
return t !== "null" && t !== "NULL";
|
|
70
|
+
});
|
|
71
|
+
if (nonNullOption) {
|
|
72
|
+
mcp = nonNullOption;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
if (!mcp.type) {
|
|
76
|
+
if (mcp.properties || mcp.$ref) {
|
|
77
|
+
mcp.type = "object";
|
|
78
|
+
} else if (mcp.items) {
|
|
79
|
+
mcp.type = "array";
|
|
80
|
+
}
|
|
81
|
+
}
|
|
66
82
|
const geminiType = toGeminiType(mcp.type);
|
|
67
83
|
const geminiSchema = { type: geminiType, description: mcp.description };
|
|
68
84
|
if (geminiType === import_genai.Type.OBJECT) {
|
|
@@ -26,7 +26,7 @@ var model_name_exports = {};
|
|
|
26
26
|
__export(model_name_exports, {
|
|
27
27
|
extractModelName: () => extractModelName,
|
|
28
28
|
isGemini1Model: () => isGemini1Model,
|
|
29
|
-
|
|
29
|
+
isGemini2OrAbove: () => isGemini2OrAbove,
|
|
30
30
|
isGeminiModel: () => isGeminiModel
|
|
31
31
|
});
|
|
32
32
|
module.exports = __toCommonJS(model_name_exports);
|
|
@@ -47,18 +47,38 @@ function isGeminiModel(modelString) {
|
|
|
47
47
|
const modelName = extractModelName(modelString);
|
|
48
48
|
return modelName.startsWith("gemini-");
|
|
49
49
|
}
|
|
50
|
+
function parseVersion(versionString) {
|
|
51
|
+
if (!/^\d+(\.\d+)*$/.test(versionString)) {
|
|
52
|
+
return { valid: false, major: 0, minor: 0, patch: 0 };
|
|
53
|
+
}
|
|
54
|
+
const parts = versionString.split(".").map((part) => parseInt(part, 10));
|
|
55
|
+
return {
|
|
56
|
+
valid: true,
|
|
57
|
+
major: parts[0],
|
|
58
|
+
minor: parts.length > 1 ? parts[1] : 0,
|
|
59
|
+
patch: parts.length > 2 ? parts[2] : 0
|
|
60
|
+
};
|
|
61
|
+
}
|
|
50
62
|
function isGemini1Model(modelString) {
|
|
51
63
|
const modelName = extractModelName(modelString);
|
|
52
64
|
return modelName.startsWith("gemini-1");
|
|
53
65
|
}
|
|
54
|
-
function
|
|
66
|
+
function isGemini2OrAbove(modelString) {
|
|
67
|
+
if (!modelString) {
|
|
68
|
+
return false;
|
|
69
|
+
}
|
|
55
70
|
const modelName = extractModelName(modelString);
|
|
56
|
-
|
|
71
|
+
if (!modelName.startsWith("gemini-")) {
|
|
72
|
+
return false;
|
|
73
|
+
}
|
|
74
|
+
const versionString = modelName.slice("gemini-".length).split("-", 1)[0];
|
|
75
|
+
const parsedVersion = parseVersion(versionString);
|
|
76
|
+
return parsedVersion.valid && parsedVersion.major >= 2;
|
|
57
77
|
}
|
|
58
78
|
// Annotate the CommonJS export names for ESM import in node:
|
|
59
79
|
0 && (module.exports = {
|
|
60
80
|
extractModelName,
|
|
61
81
|
isGemini1Model,
|
|
62
|
-
|
|
82
|
+
isGemini2OrAbove,
|
|
63
83
|
isGeminiModel
|
|
64
84
|
});
|
package/dist/cjs/version.js
CHANGED
|
@@ -32,7 +32,7 @@ module.exports = __toCommonJS(version_exports);
|
|
|
32
32
|
* Copyright 2025 Google LLC
|
|
33
33
|
* SPDX-License-Identifier: Apache-2.0
|
|
34
34
|
*/
|
|
35
|
-
const version = "0.2.
|
|
35
|
+
const version = "0.2.3";
|
|
36
36
|
// Annotate the CommonJS export names for ESM import in node:
|
|
37
37
|
0 && (module.exports = {
|
|
38
38
|
version
|
|
@@ -3,12 +3,22 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
+
var _a;
|
|
6
7
|
import { trace } from "@opentelemetry/api";
|
|
7
8
|
import { createEvent } from "../events/event.js";
|
|
8
9
|
import { CallbackContext } from "./callback_context.js";
|
|
9
10
|
import { InvocationContext } from "./invocation_context.js";
|
|
11
|
+
const BASE_AGENT_SIGNATURE_SYMBOL = Symbol.for("google.adk.baseAgent");
|
|
12
|
+
function isBaseAgent(obj) {
|
|
13
|
+
return typeof obj === "object" && obj !== null && BASE_AGENT_SIGNATURE_SYMBOL in obj && obj[BASE_AGENT_SIGNATURE_SYMBOL] === true;
|
|
14
|
+
}
|
|
15
|
+
_a = BASE_AGENT_SIGNATURE_SYMBOL;
|
|
10
16
|
class BaseAgent {
|
|
11
17
|
constructor(config) {
|
|
18
|
+
/**
|
|
19
|
+
* A unique symbol to identify ADK agent classes.
|
|
20
|
+
*/
|
|
21
|
+
this[_a] = true;
|
|
12
22
|
this.name = validateAgentName(config.name);
|
|
13
23
|
this.description = config.description;
|
|
14
24
|
this.parentAgent = config.parentAgent;
|
|
@@ -210,5 +220,6 @@ function getCannonicalCallback(callbacks) {
|
|
|
210
220
|
}
|
|
211
221
|
export {
|
|
212
222
|
BaseAgent,
|
|
213
|
-
getCannonicalCallback
|
|
223
|
+
getCannonicalCallback,
|
|
224
|
+
isBaseAgent
|
|
214
225
|
};
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
+
import cloneDeep from "lodash-es/cloneDeep.js";
|
|
6
7
|
import { createEvent, getFunctionCalls, getFunctionResponses } from "../events/event.js";
|
|
7
|
-
import { deepClone } from "../utils/deep_clone.js";
|
|
8
8
|
import { removeClientFunctionCallId, REQUEST_CONFIRMATION_FUNCTION_CALL_NAME, REQUEST_EUC_FUNCTION_CALL_NAME } from "./functions.js";
|
|
9
9
|
function getContents(events, agentName, currentBranch) {
|
|
10
10
|
var _a, _b, _c;
|
|
@@ -30,7 +30,7 @@ function getContents(events, agentName, currentBranch) {
|
|
|
30
30
|
resultEvents = rearrangeEventsForAsyncFunctionResponsesInHistory(resultEvents);
|
|
31
31
|
const contents = [];
|
|
32
32
|
for (const event of resultEvents) {
|
|
33
|
-
const content =
|
|
33
|
+
const content = cloneDeep(event.content);
|
|
34
34
|
removeClientFunctionCallId(content);
|
|
35
35
|
contents.push(content);
|
|
36
36
|
}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { createUserContent } from "@google/genai";
|
|
7
|
+
import isEmpty from "lodash-es/isEmpty.js";
|
|
7
8
|
import { createEvent, getFunctionCalls } from "../events/event.js";
|
|
8
9
|
import { mergeEventActions } from "../events/event_actions.js";
|
|
9
10
|
import { ToolContext } from "../tools/tool_context.js";
|
|
@@ -13,7 +14,9 @@ const AF_FUNCTION_CALL_ID_PREFIX = "adk-";
|
|
|
13
14
|
const REQUEST_EUC_FUNCTION_CALL_NAME = "adk_request_credential";
|
|
14
15
|
const REQUEST_CONFIRMATION_FUNCTION_CALL_NAME = "adk_request_confirmation";
|
|
15
16
|
const functionsExportedForTestingOnly = {
|
|
16
|
-
handleFunctionCallList
|
|
17
|
+
handleFunctionCallList,
|
|
18
|
+
generateAuthEvent,
|
|
19
|
+
generateRequestConfirmationEvent
|
|
17
20
|
};
|
|
18
21
|
function generateClientFunctionCallId() {
|
|
19
22
|
return `${AF_FUNCTION_CALL_ID_PREFIX}${randomUUID()}`;
|
|
@@ -52,7 +55,7 @@ function getLongRunningFunctionCalls(functionCalls, toolsDict) {
|
|
|
52
55
|
}
|
|
53
56
|
function generateAuthEvent(invocationContext, functionResponseEvent) {
|
|
54
57
|
var _a;
|
|
55
|
-
if (!((_a = functionResponseEvent.actions) == null ? void 0 : _a.requestedAuthConfigs)) {
|
|
58
|
+
if (!((_a = functionResponseEvent.actions) == null ? void 0 : _a.requestedAuthConfigs) || isEmpty(functionResponseEvent.actions.requestedAuthConfigs)) {
|
|
56
59
|
return void 0;
|
|
57
60
|
}
|
|
58
61
|
const parts = [];
|
|
@@ -88,7 +91,7 @@ function generateRequestConfirmationEvent({
|
|
|
88
91
|
functionResponseEvent
|
|
89
92
|
}) {
|
|
90
93
|
var _a, _b;
|
|
91
|
-
if (!((_a = functionResponseEvent.actions) == null ? void 0 : _a.requestedToolConfirmations)) {
|
|
94
|
+
if (!((_a = functionResponseEvent.actions) == null ? void 0 : _a.requestedToolConfirmations) || isEmpty(functionResponseEvent.actions.requestedToolConfirmations)) {
|
|
92
95
|
return;
|
|
93
96
|
}
|
|
94
97
|
const parts = [];
|