@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
|
@@ -39,7 +39,11 @@ class InMemoryArtifactService {
|
|
|
39
39
|
}
|
|
40
40
|
return Promise.resolve(versions[version]);
|
|
41
41
|
}
|
|
42
|
-
listArtifactKeys({
|
|
42
|
+
listArtifactKeys({
|
|
43
|
+
appName,
|
|
44
|
+
userId,
|
|
45
|
+
sessionId
|
|
46
|
+
}) {
|
|
43
47
|
const sessionPrefix = "".concat(appName, "/").concat(userId, "/").concat(sessionId, "/");
|
|
44
48
|
const usernamespacePrefix = "".concat(appName, "/").concat(userId, "/user/");
|
|
45
49
|
const filenames = [];
|
|
@@ -54,7 +58,12 @@ class InMemoryArtifactService {
|
|
|
54
58
|
}
|
|
55
59
|
return Promise.resolve(filenames.sort());
|
|
56
60
|
}
|
|
57
|
-
deleteArtifact({
|
|
61
|
+
deleteArtifact({
|
|
62
|
+
appName,
|
|
63
|
+
userId,
|
|
64
|
+
sessionId,
|
|
65
|
+
filename
|
|
66
|
+
}) {
|
|
58
67
|
const path = artifactPath(appName, userId, sessionId, filename);
|
|
59
68
|
if (!this.artifacts[path]) {
|
|
60
69
|
return Promise.resolve();
|
|
@@ -62,13 +71,18 @@ class InMemoryArtifactService {
|
|
|
62
71
|
delete this.artifacts[path];
|
|
63
72
|
return Promise.resolve();
|
|
64
73
|
}
|
|
65
|
-
listVersions({
|
|
74
|
+
listVersions({
|
|
75
|
+
appName,
|
|
76
|
+
userId,
|
|
77
|
+
sessionId,
|
|
78
|
+
filename
|
|
79
|
+
}) {
|
|
66
80
|
const path = artifactPath(appName, userId, sessionId, filename);
|
|
67
81
|
const artifacts = this.artifacts[path];
|
|
68
82
|
if (!artifacts) {
|
|
69
83
|
return Promise.resolve([]);
|
|
70
84
|
}
|
|
71
|
-
|
|
85
|
+
const versions = [];
|
|
72
86
|
for (let i = 0; i < artifacts.length; i++) {
|
|
73
87
|
versions.push(i);
|
|
74
88
|
}
|
|
@@ -37,7 +37,9 @@ class AuthHandler {
|
|
|
37
37
|
};
|
|
38
38
|
}
|
|
39
39
|
if (!this.authConfig.rawAuthCredential.oauth2.clientId || !this.authConfig.rawAuthCredential.oauth2.clientSecret) {
|
|
40
|
-
throw new Error(
|
|
40
|
+
throw new Error(
|
|
41
|
+
"Auth Scheme ".concat(authSchemeType, " requires both clientId and clientSecret in authCredential.oauth2.")
|
|
42
|
+
);
|
|
41
43
|
}
|
|
42
44
|
return {
|
|
43
45
|
credentialKey: this.authConfig.credentialKey,
|
|
@@ -4,7 +4,9 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
var _a;
|
|
7
|
-
const BASE_CODE_EXECUTOR_SIGNATURE_SYMBOL = Symbol.for(
|
|
7
|
+
const BASE_CODE_EXECUTOR_SIGNATURE_SYMBOL = Symbol.for(
|
|
8
|
+
"google.adk.baseCodeExecutor"
|
|
9
|
+
);
|
|
8
10
|
function isBaseCodeExecutor(obj) {
|
|
9
11
|
return typeof obj === "object" && obj !== null && BASE_CODE_EXECUTOR_SIGNATURE_SYMBOL in obj && obj[BASE_CODE_EXECUTOR_SIGNATURE_SYMBOL] === true;
|
|
10
12
|
}
|
|
@@ -6,7 +6,9 @@
|
|
|
6
6
|
var _a, _b;
|
|
7
7
|
import { isGemini2OrAbove } from "../utils/model_name.js";
|
|
8
8
|
import { BaseCodeExecutor } from "./base_code_executor.js";
|
|
9
|
-
const BUILT_IN_CODE_EXECUTOR_SIGNATURE_SYMBOL = Symbol.for(
|
|
9
|
+
const BUILT_IN_CODE_EXECUTOR_SIGNATURE_SYMBOL = Symbol.for(
|
|
10
|
+
"google.adk.builtInCodeExecutor"
|
|
11
|
+
);
|
|
10
12
|
function isBuiltInCodeExecutor(obj) {
|
|
11
13
|
return typeof obj === "object" && obj !== null && BUILT_IN_CODE_EXECUTOR_SIGNATURE_SYMBOL in obj && obj[BUILT_IN_CODE_EXECUTOR_SIGNATURE_SYMBOL] === true;
|
|
12
14
|
}
|
|
@@ -16,7 +18,7 @@ class BuiltInCodeExecutor extends (_b = BaseCodeExecutor, _a = BUILT_IN_CODE_EXE
|
|
|
16
18
|
/** A unique symbol to identify BuiltInCodeExecutor class. */
|
|
17
19
|
this[_a] = true;
|
|
18
20
|
}
|
|
19
|
-
executeCode(
|
|
21
|
+
executeCode(_params) {
|
|
20
22
|
return Promise.resolve({
|
|
21
23
|
stdout: "",
|
|
22
24
|
stderr: "",
|
|
@@ -30,7 +32,9 @@ class BuiltInCodeExecutor extends (_b = BaseCodeExecutor, _a = BUILT_IN_CODE_EXE
|
|
|
30
32
|
llmRequest.config.tools.push({ codeExecution: {} });
|
|
31
33
|
return;
|
|
32
34
|
}
|
|
33
|
-
throw new Error(
|
|
35
|
+
throw new Error(
|
|
36
|
+
"Gemini code execution tool is not supported for model ".concat(llmRequest.model)
|
|
37
|
+
);
|
|
34
38
|
}
|
|
35
39
|
}
|
|
36
40
|
export {
|
|
@@ -142,7 +142,9 @@ class CodeExecutorContext {
|
|
|
142
142
|
if (!(CODE_EXECUTION_RESULTS_KEY in this.sessionState)) {
|
|
143
143
|
this.sessionState.set(CODE_EXECUTION_RESULTS_KEY, {});
|
|
144
144
|
}
|
|
145
|
-
const codeExecutionResults = this.sessionState.get(
|
|
145
|
+
const codeExecutionResults = this.sessionState.get(
|
|
146
|
+
CODE_EXECUTION_RESULTS_KEY
|
|
147
|
+
);
|
|
146
148
|
if (!(invocationId in codeExecutionResults)) {
|
|
147
149
|
codeExecutionResults[invocationId] = [];
|
|
148
150
|
}
|
|
@@ -154,12 +156,10 @@ class CodeExecutorContext {
|
|
|
154
156
|
});
|
|
155
157
|
}
|
|
156
158
|
/**
|
|
157
|
-
* Gets the code
|
|
158
|
-
* @param invocationId The session state to get the code executor context
|
|
159
|
-
* from.
|
|
159
|
+
* Gets the code execution context from the session state.
|
|
160
160
|
* @return The code execution context for the given invocation ID.
|
|
161
161
|
*/
|
|
162
|
-
getCodeExecutionContext(
|
|
162
|
+
getCodeExecutionContext() {
|
|
163
163
|
return this.sessionState.get(CONTEXT_KEY) || {};
|
|
164
164
|
}
|
|
165
165
|
}
|
package/dist/web/common.js
CHANGED
|
@@ -63,7 +63,7 @@ import { GOOGLE_SEARCH, GoogleSearchTool } from "./tools/google_search_tool.js";
|
|
|
63
63
|
import { LongRunningFunctionTool } from "./tools/long_running_tool.js";
|
|
64
64
|
import { ToolConfirmation } from "./tools/tool_confirmation.js";
|
|
65
65
|
import { ToolContext } from "./tools/tool_context.js";
|
|
66
|
-
import { LogLevel, setLogLevel } from "./utils/logger.js";
|
|
66
|
+
import { LogLevel, getLogger, setLogLevel, setLogger } from "./utils/logger.js";
|
|
67
67
|
import { isGemini2OrAbove } from "./utils/model_name.js";
|
|
68
68
|
import { zodObjectToSchema } from "./utils/simple_zod_to_json.js";
|
|
69
69
|
import { GoogleLLMVariant } from "./utils/variant_utils.js";
|
|
@@ -124,6 +124,7 @@ export {
|
|
|
124
124
|
getAskUserConfirmationFunctionCalls,
|
|
125
125
|
getFunctionCalls,
|
|
126
126
|
getFunctionResponses,
|
|
127
|
+
getLogger,
|
|
127
128
|
hasTrailingCodeExecutionResult,
|
|
128
129
|
isAgentTool,
|
|
129
130
|
isBaseAgent,
|
|
@@ -138,6 +139,7 @@ export {
|
|
|
138
139
|
isParallelAgent,
|
|
139
140
|
isSequentialAgent,
|
|
140
141
|
setLogLevel,
|
|
142
|
+
setLogger,
|
|
141
143
|
stringifyContent,
|
|
142
144
|
version,
|
|
143
145
|
zodObjectToSchema
|
package/dist/web/events/event.js
CHANGED
|
@@ -84,9 +84,7 @@ const ASCII_LETTERS_AND_NUMBERS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRS
|
|
|
84
84
|
function createNewEventId() {
|
|
85
85
|
let id = "";
|
|
86
86
|
for (let i = 0; i < 8; i++) {
|
|
87
|
-
id += ASCII_LETTERS_AND_NUMBERS[Math.floor(
|
|
88
|
-
Math.random() * ASCII_LETTERS_AND_NUMBERS.length
|
|
89
|
-
)];
|
|
87
|
+
id += ASCII_LETTERS_AND_NUMBERS[Math.floor(Math.random() * ASCII_LETTERS_AND_NUMBERS.length)];
|
|
90
88
|
}
|
|
91
89
|
return id;
|
|
92
90
|
}
|