@google/adk 0.2.5 → 0.3.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/dist/cjs/agents/base_agent.js +43 -21
- package/dist/cjs/agents/callback_context.js +4 -1
- package/dist/cjs/agents/content_processor_utils.js +15 -7
- package/dist/cjs/agents/functions.js +79 -29
- package/dist/cjs/agents/llm_agent.js +59 -33
- package/dist/cjs/agents/loop_agent.js +2 -1
- package/dist/cjs/agents/parallel_agent.js +3 -4
- package/dist/cjs/artifacts/gcs_artifact_service.js +28 -20
- package/dist/cjs/artifacts/in_memory_artifact_service.js +18 -4
- package/dist/cjs/auth/auth_handler.js +3 -1
- package/dist/cjs/code_executors/base_code_executor.js +3 -1
- package/dist/cjs/code_executors/built_in_code_executor.js +7 -3
- package/dist/cjs/code_executors/code_executor_context.js +5 -5
- package/dist/cjs/common.js +4 -0
- package/dist/cjs/events/event.js +1 -3
- package/dist/cjs/index.js +19 -19
- package/dist/cjs/index.js.map +4 -4
- package/dist/cjs/memory/in_memory_memory_service.js +3 -1
- package/dist/cjs/models/base_llm.js +8 -4
- package/dist/cjs/models/gemini_llm_connection.js +1 -0
- package/dist/cjs/models/google_llm.js +3 -3
- package/dist/cjs/plugins/base_plugin.js +12 -0
- package/dist/cjs/plugins/logging_plugin.js +50 -13
- package/dist/cjs/plugins/plugin_manager.js +56 -24
- package/dist/cjs/plugins/security_plugin.js +1 -1
- package/dist/cjs/runner/runner.js +110 -95
- package/dist/cjs/sessions/in_memory_session_service.js +38 -14
- package/dist/cjs/telemetry/google_cloud.js +7 -9
- package/dist/cjs/telemetry/setup.js +15 -7
- package/dist/cjs/telemetry/tracing.js +37 -15
- package/dist/cjs/tools/agent_tool.js +8 -4
- package/dist/cjs/tools/base_tool.js +4 -2
- package/dist/cjs/tools/forwarding_artifact_service.js +1 -1
- package/dist/cjs/tools/function_tool.js +1 -2
- package/dist/cjs/tools/google_search_tool.js +1 -2
- package/dist/cjs/tools/mcp/mcp_session_manager.js +16 -10
- package/dist/cjs/tools/mcp/mcp_tool.js +1 -3
- package/dist/cjs/tools/mcp/mcp_toolset.js +1 -1
- package/dist/cjs/utils/env_aware_utils.js +1 -1
- package/dist/cjs/utils/gemini_schema_util.js +9 -4
- package/dist/cjs/utils/logger.js +47 -3
- package/dist/cjs/utils/simple_zod_to_json.js +100 -141
- package/dist/cjs/utils/variant_utils.js +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/agents/base_agent.js +48 -22
- package/dist/esm/agents/callback_context.js +4 -1
- package/dist/esm/agents/content_processor_utils.js +25 -9
- package/dist/esm/agents/functions.js +83 -29
- package/dist/esm/agents/llm_agent.js +63 -33
- package/dist/esm/agents/loop_agent.js +2 -1
- package/dist/esm/agents/parallel_agent.js +3 -4
- package/dist/esm/artifacts/gcs_artifact_service.js +28 -20
- package/dist/esm/artifacts/in_memory_artifact_service.js +18 -4
- package/dist/esm/auth/auth_handler.js +3 -1
- package/dist/esm/code_executors/base_code_executor.js +3 -1
- package/dist/esm/code_executors/built_in_code_executor.js +7 -3
- package/dist/esm/code_executors/code_executor_context.js +5 -5
- package/dist/esm/common.js +3 -1
- package/dist/esm/events/event.js +1 -3
- package/dist/esm/index.js +19 -19
- package/dist/esm/index.js.map +4 -4
- package/dist/esm/memory/in_memory_memory_service.js +3 -1
- package/dist/esm/models/base_llm.js +8 -4
- package/dist/esm/models/gemini_llm_connection.js +1 -0
- package/dist/esm/models/google_llm.js +8 -4
- package/dist/esm/plugins/base_plugin.js +12 -0
- package/dist/esm/plugins/logging_plugin.js +55 -14
- package/dist/esm/plugins/plugin_manager.js +56 -24
- package/dist/esm/plugins/security_plugin.js +1 -1
- package/dist/esm/runner/runner.js +114 -96
- package/dist/esm/sessions/in_memory_session_service.js +41 -15
- package/dist/esm/telemetry/google_cloud.js +7 -9
- package/dist/esm/telemetry/setup.js +23 -9
- package/dist/esm/telemetry/tracing.js +37 -15
- package/dist/esm/tools/agent_tool.js +8 -4
- package/dist/esm/tools/base_tool.js +4 -2
- package/dist/esm/tools/forwarding_artifact_service.js +1 -1
- package/dist/esm/tools/function_tool.js +1 -2
- package/dist/esm/tools/google_search_tool.js +2 -5
- package/dist/esm/tools/long_running_tool.js +3 -1
- package/dist/esm/tools/mcp/mcp_session_manager.js +22 -12
- package/dist/esm/tools/mcp/mcp_tool.js +1 -3
- package/dist/esm/tools/mcp/mcp_toolset.js +1 -1
- package/dist/esm/utils/env_aware_utils.js +1 -1
- package/dist/esm/utils/gemini_schema_util.js +9 -4
- package/dist/esm/utils/logger.js +43 -2
- package/dist/esm/utils/simple_zod_to_json.js +102 -141
- package/dist/esm/utils/variant_utils.js +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/types/agents/base_agent.d.ts +2 -1
- package/dist/types/agents/callback_context.d.ts +1 -1
- package/dist/types/agents/llm_agent.d.ts +1 -1
- package/dist/types/agents/loop_agent.d.ts +1 -1
- package/dist/types/agents/parallel_agent.d.ts +1 -1
- package/dist/types/artifacts/in_memory_artifact_service.d.ts +3 -3
- package/dist/types/code_executors/built_in_code_executor.d.ts +1 -1
- package/dist/types/code_executors/code_executor_context.d.ts +2 -4
- package/dist/types/common.d.ts +2 -1
- package/dist/types/index.d.ts +3 -3
- package/dist/types/models/base_llm_connection.d.ts +1 -1
- package/dist/types/models/llm_response.d.ts +1 -1
- package/dist/types/plugins/logging_plugin.d.ts +12 -12
- package/dist/types/plugins/plugin_manager.d.ts +12 -12
- package/dist/types/plugins/security_plugin.d.ts +1 -1
- package/dist/types/runner/runner.d.ts +1 -1
- package/dist/types/sessions/in_memory_session_service.d.ts +5 -5
- package/dist/types/telemetry/setup.d.ts +1 -1
- package/dist/types/telemetry/tracing.d.ts +7 -6
- package/dist/types/tools/agent_tool.d.ts +1 -1
- package/dist/types/tools/base_tool.d.ts +1 -1
- package/dist/types/tools/base_toolset.d.ts +2 -1
- package/dist/types/tools/forwarding_artifact_service.d.ts +2 -2
- package/dist/types/tools/function_tool.d.ts +4 -3
- package/dist/types/tools/google_search_tool.d.ts +3 -3
- package/dist/types/tools/mcp/mcp_session_manager.d.ts +10 -3
- package/dist/types/tools/mcp/mcp_toolset.d.ts +1 -2
- package/dist/types/utils/gemini_schema_util.d.ts +4 -12
- package/dist/types/utils/logger.d.ts +11 -10
- package/dist/types/utils/simple_zod_to_json.d.ts +5 -4
- package/dist/types/version.d.ts +1 -1
- package/dist/web/agents/base_agent.js +94 -33
- package/dist/web/agents/callback_context.js +4 -1
- package/dist/web/agents/content_processor_utils.js +25 -9
- package/dist/web/agents/functions.js +83 -29
- package/dist/web/agents/llm_agent.js +117 -54
- package/dist/web/agents/loop_agent.js +2 -1
- package/dist/web/agents/parallel_agent.js +3 -4
- package/dist/web/artifacts/gcs_artifact_service.js +25 -17
- package/dist/web/artifacts/in_memory_artifact_service.js +18 -4
- package/dist/web/auth/auth_handler.js +3 -1
- package/dist/web/code_executors/base_code_executor.js +3 -1
- package/dist/web/code_executors/built_in_code_executor.js +7 -3
- package/dist/web/code_executors/code_executor_context.js +5 -5
- package/dist/web/common.js +3 -1
- package/dist/web/events/event.js +1 -3
- package/dist/web/index.js +1 -1
- package/dist/web/index.js.map +4 -4
- package/dist/web/memory/in_memory_memory_service.js +3 -1
- package/dist/web/models/base_llm.js +8 -4
- package/dist/web/models/gemini_llm_connection.js +1 -0
- package/dist/web/models/google_llm.js +8 -4
- package/dist/web/plugins/base_plugin.js +12 -0
- package/dist/web/plugins/logging_plugin.js +55 -14
- package/dist/web/plugins/plugin_manager.js +56 -24
- package/dist/web/plugins/security_plugin.js +1 -1
- package/dist/web/runner/runner.js +159 -108
- package/dist/web/sessions/in_memory_session_service.js +41 -15
- package/dist/web/telemetry/google_cloud.js +7 -9
- package/dist/web/telemetry/setup.js +23 -9
- package/dist/web/telemetry/tracing.js +37 -15
- package/dist/web/tools/agent_tool.js +8 -4
- package/dist/web/tools/base_tool.js +4 -2
- package/dist/web/tools/forwarding_artifact_service.js +1 -1
- package/dist/web/tools/function_tool.js +1 -2
- package/dist/web/tools/google_search_tool.js +2 -5
- package/dist/web/tools/long_running_tool.js +3 -1
- package/dist/web/tools/mcp/mcp_session_manager.js +22 -12
- package/dist/web/tools/mcp/mcp_tool.js +1 -3
- package/dist/web/tools/mcp/mcp_toolset.js +1 -1
- package/dist/web/utils/env_aware_utils.js +1 -1
- package/dist/web/utils/gemini_schema_util.js +9 -4
- package/dist/web/utils/logger.js +43 -2
- package/dist/web/utils/simple_zod_to_json.js +102 -155
- package/dist/web/utils/variant_utils.js +1 -1
- package/dist/web/version.js +1 -1
- package/package.json +4 -2
|
@@ -68,7 +68,11 @@ class InMemoryArtifactService {
|
|
|
68
68
|
}
|
|
69
69
|
return Promise.resolve(versions[version]);
|
|
70
70
|
}
|
|
71
|
-
listArtifactKeys({
|
|
71
|
+
listArtifactKeys({
|
|
72
|
+
appName,
|
|
73
|
+
userId,
|
|
74
|
+
sessionId
|
|
75
|
+
}) {
|
|
72
76
|
const sessionPrefix = `${appName}/${userId}/${sessionId}/`;
|
|
73
77
|
const usernamespacePrefix = `${appName}/${userId}/user/`;
|
|
74
78
|
const filenames = [];
|
|
@@ -83,7 +87,12 @@ class InMemoryArtifactService {
|
|
|
83
87
|
}
|
|
84
88
|
return Promise.resolve(filenames.sort());
|
|
85
89
|
}
|
|
86
|
-
deleteArtifact({
|
|
90
|
+
deleteArtifact({
|
|
91
|
+
appName,
|
|
92
|
+
userId,
|
|
93
|
+
sessionId,
|
|
94
|
+
filename
|
|
95
|
+
}) {
|
|
87
96
|
const path = artifactPath(appName, userId, sessionId, filename);
|
|
88
97
|
if (!this.artifacts[path]) {
|
|
89
98
|
return Promise.resolve();
|
|
@@ -91,13 +100,18 @@ class InMemoryArtifactService {
|
|
|
91
100
|
delete this.artifacts[path];
|
|
92
101
|
return Promise.resolve();
|
|
93
102
|
}
|
|
94
|
-
listVersions({
|
|
103
|
+
listVersions({
|
|
104
|
+
appName,
|
|
105
|
+
userId,
|
|
106
|
+
sessionId,
|
|
107
|
+
filename
|
|
108
|
+
}) {
|
|
95
109
|
const path = artifactPath(appName, userId, sessionId, filename);
|
|
96
110
|
const artifacts = this.artifacts[path];
|
|
97
111
|
if (!artifacts) {
|
|
98
112
|
return Promise.resolve([]);
|
|
99
113
|
}
|
|
100
|
-
|
|
114
|
+
const versions = [];
|
|
101
115
|
for (let i = 0; i < artifacts.length; i++) {
|
|
102
116
|
versions.push(i);
|
|
103
117
|
}
|
|
@@ -66,7 +66,9 @@ class AuthHandler {
|
|
|
66
66
|
};
|
|
67
67
|
}
|
|
68
68
|
if (!this.authConfig.rawAuthCredential.oauth2.clientId || !this.authConfig.rawAuthCredential.oauth2.clientSecret) {
|
|
69
|
-
throw new Error(
|
|
69
|
+
throw new Error(
|
|
70
|
+
`Auth Scheme ${authSchemeType} requires both clientId and clientSecret in authCredential.oauth2.`
|
|
71
|
+
);
|
|
70
72
|
}
|
|
71
73
|
return {
|
|
72
74
|
credentialKey: this.authConfig.credentialKey,
|
|
@@ -34,7 +34,9 @@ module.exports = __toCommonJS(base_code_executor_exports);
|
|
|
34
34
|
* SPDX-License-Identifier: Apache-2.0
|
|
35
35
|
*/
|
|
36
36
|
var _a;
|
|
37
|
-
const BASE_CODE_EXECUTOR_SIGNATURE_SYMBOL = Symbol.for(
|
|
37
|
+
const BASE_CODE_EXECUTOR_SIGNATURE_SYMBOL = Symbol.for(
|
|
38
|
+
"google.adk.baseCodeExecutor"
|
|
39
|
+
);
|
|
38
40
|
function isBaseCodeExecutor(obj) {
|
|
39
41
|
return typeof obj === "object" && obj !== null && BASE_CODE_EXECUTOR_SIGNATURE_SYMBOL in obj && obj[BASE_CODE_EXECUTOR_SIGNATURE_SYMBOL] === true;
|
|
40
42
|
}
|
|
@@ -36,7 +36,9 @@ var import_base_code_executor = require("./base_code_executor.js");
|
|
|
36
36
|
* SPDX-License-Identifier: Apache-2.0
|
|
37
37
|
*/
|
|
38
38
|
var _a, _b;
|
|
39
|
-
const BUILT_IN_CODE_EXECUTOR_SIGNATURE_SYMBOL = Symbol.for(
|
|
39
|
+
const BUILT_IN_CODE_EXECUTOR_SIGNATURE_SYMBOL = Symbol.for(
|
|
40
|
+
"google.adk.builtInCodeExecutor"
|
|
41
|
+
);
|
|
40
42
|
function isBuiltInCodeExecutor(obj) {
|
|
41
43
|
return typeof obj === "object" && obj !== null && BUILT_IN_CODE_EXECUTOR_SIGNATURE_SYMBOL in obj && obj[BUILT_IN_CODE_EXECUTOR_SIGNATURE_SYMBOL] === true;
|
|
42
44
|
}
|
|
@@ -46,7 +48,7 @@ class BuiltInCodeExecutor extends (_b = import_base_code_executor.BaseCodeExecut
|
|
|
46
48
|
/** A unique symbol to identify BuiltInCodeExecutor class. */
|
|
47
49
|
this[_a] = true;
|
|
48
50
|
}
|
|
49
|
-
executeCode(
|
|
51
|
+
executeCode(_params) {
|
|
50
52
|
return Promise.resolve({
|
|
51
53
|
stdout: "",
|
|
52
54
|
stderr: "",
|
|
@@ -60,7 +62,9 @@ class BuiltInCodeExecutor extends (_b = import_base_code_executor.BaseCodeExecut
|
|
|
60
62
|
llmRequest.config.tools.push({ codeExecution: {} });
|
|
61
63
|
return;
|
|
62
64
|
}
|
|
63
|
-
throw new Error(
|
|
65
|
+
throw new Error(
|
|
66
|
+
`Gemini code execution tool is not supported for model ${llmRequest.model}`
|
|
67
|
+
);
|
|
64
68
|
}
|
|
65
69
|
}
|
|
66
70
|
// Annotate the CommonJS export names for ESM import in node:
|
|
@@ -171,7 +171,9 @@ class CodeExecutorContext {
|
|
|
171
171
|
if (!(CODE_EXECUTION_RESULTS_KEY in this.sessionState)) {
|
|
172
172
|
this.sessionState.set(CODE_EXECUTION_RESULTS_KEY, {});
|
|
173
173
|
}
|
|
174
|
-
const codeExecutionResults = this.sessionState.get(
|
|
174
|
+
const codeExecutionResults = this.sessionState.get(
|
|
175
|
+
CODE_EXECUTION_RESULTS_KEY
|
|
176
|
+
);
|
|
175
177
|
if (!(invocationId in codeExecutionResults)) {
|
|
176
178
|
codeExecutionResults[invocationId] = [];
|
|
177
179
|
}
|
|
@@ -183,12 +185,10 @@ class CodeExecutorContext {
|
|
|
183
185
|
});
|
|
184
186
|
}
|
|
185
187
|
/**
|
|
186
|
-
* Gets the code
|
|
187
|
-
* @param invocationId The session state to get the code executor context
|
|
188
|
-
* from.
|
|
188
|
+
* Gets the code execution context from the session state.
|
|
189
189
|
* @return The code execution context for the given invocation ID.
|
|
190
190
|
*/
|
|
191
|
-
getCodeExecutionContext(
|
|
191
|
+
getCodeExecutionContext() {
|
|
192
192
|
return this.sessionState.get(CONTEXT_KEY) || {};
|
|
193
193
|
}
|
|
194
194
|
}
|
package/dist/cjs/common.js
CHANGED
|
@@ -76,6 +76,7 @@ __export(common_exports, {
|
|
|
76
76
|
getAskUserConfirmationFunctionCalls: () => import_security_plugin.getAskUserConfirmationFunctionCalls,
|
|
77
77
|
getFunctionCalls: () => import_event.getFunctionCalls,
|
|
78
78
|
getFunctionResponses: () => import_event.getFunctionResponses,
|
|
79
|
+
getLogger: () => import_logger.getLogger,
|
|
79
80
|
hasTrailingCodeExecutionResult: () => import_event.hasTrailingCodeExecutionResult,
|
|
80
81
|
isAgentTool: () => import_agent_tool.isAgentTool,
|
|
81
82
|
isBaseAgent: () => import_base_agent.isBaseAgent,
|
|
@@ -90,6 +91,7 @@ __export(common_exports, {
|
|
|
90
91
|
isParallelAgent: () => import_parallel_agent.isParallelAgent,
|
|
91
92
|
isSequentialAgent: () => import_sequential_agent.isSequentialAgent,
|
|
92
93
|
setLogLevel: () => import_logger.setLogLevel,
|
|
94
|
+
setLogger: () => import_logger.setLogger,
|
|
93
95
|
stringifyContent: () => import_event.stringifyContent,
|
|
94
96
|
version: () => import_version.version,
|
|
95
97
|
zodObjectToSchema: () => import_simple_zod_to_json.zodObjectToSchema
|
|
@@ -203,6 +205,7 @@ __reExport(common_exports, require("./tools/base_tool.js"), module.exports);
|
|
|
203
205
|
getAskUserConfirmationFunctionCalls,
|
|
204
206
|
getFunctionCalls,
|
|
205
207
|
getFunctionResponses,
|
|
208
|
+
getLogger,
|
|
206
209
|
hasTrailingCodeExecutionResult,
|
|
207
210
|
isAgentTool,
|
|
208
211
|
isBaseAgent,
|
|
@@ -217,6 +220,7 @@ __reExport(common_exports, require("./tools/base_tool.js"), module.exports);
|
|
|
217
220
|
isParallelAgent,
|
|
218
221
|
isSequentialAgent,
|
|
219
222
|
setLogLevel,
|
|
223
|
+
setLogger,
|
|
220
224
|
stringifyContent,
|
|
221
225
|
version,
|
|
222
226
|
zodObjectToSchema,
|
package/dist/cjs/events/event.js
CHANGED
|
@@ -101,9 +101,7 @@ const ASCII_LETTERS_AND_NUMBERS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRS
|
|
|
101
101
|
function createNewEventId() {
|
|
102
102
|
let id = "";
|
|
103
103
|
for (let i = 0; i < 8; i++) {
|
|
104
|
-
id += ASCII_LETTERS_AND_NUMBERS[Math.floor(
|
|
105
|
-
Math.random() * ASCII_LETTERS_AND_NUMBERS.length
|
|
106
|
-
)];
|
|
104
|
+
id += ASCII_LETTERS_AND_NUMBERS[Math.floor(Math.random() * ASCII_LETTERS_AND_NUMBERS.length)];
|
|
107
105
|
}
|
|
108
106
|
return id;
|
|
109
107
|
}
|