Skip to content

Commit 30f773e

Browse files
authored
Merge pull request #142 from redbus-labs/upstream-sync-2026-03-07
Upstream sync 2026 03 07
2 parents 4f1bc9e + a2edac0 commit 30f773e

111 files changed

Lines changed: 4687 additions & 2019 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/devcontainer.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"name": "Java 17",
3+
"image": "mcr.microsoft.com/devcontainers/java:1-17-bullseye",
4+
"features": {
5+
"ghcr.io/devcontainers/features/github-cli:1": {},
6+
"ghcr.io/devcontainers/features/git-lfs:1": {}
7+
},
8+
"customizations": {
9+
"vscode": {
10+
"extensions": [
11+
"extension-pack-for-java",
12+
"redhat.vscode-xml"
13+
],
14+
"settings": {
15+
"java.jdt.download.server": "latest",
16+
"java.help.firstView": "none",
17+
"java.showBuildStatusOnStart": "notification",
18+
"java.configuration.updateBuildConfiguration": "interactive",
19+
"java.autobuild.enabled": true,
20+
"terminal.integrated.focusOnOutput": false
21+
}
22+
}
23+
},
24+
"remoteUser": "vscode",
25+
"forwardPorts": [8000, 8080, 8081, 8082],
26+
"postCreateCommand": "git config --global credential.helper '!gh auth git-credential' && git config --global lfs.locksverify false",
27+
"hostRequirements": {
28+
"cpus": 4
29+
}
30+
}

.github/workflows/release-please.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414
steps:
1515
- uses: googleapis/release-please-action@v4
1616
with:
17-
token: ${{ secrets.GITHUB_TOKEN }}
17+
token: ${{ secrets.RELEASE_PLEASE_TOKEN }}

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "1.2.0"
2+
".": "0.8.0"
33
}

CHANGELOG.md

Lines changed: 135 additions & 234 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 2 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,3 @@
1-
2-
# Capability Supported
3-
4-
Of course. Here is the table with the 4th column for "Bedrock API" added.
5-
6-
| Feature | Gemini | Anthropic | AWS Bedrock API | Ollama | Azure OAI (redBus) | Bedrock+Anthropic |
7-
| :--- | :--- | :--- | :--- | :--- | :--- | :--- |
8-
| **Chat** |||||||
9-
| **Tools/Function** |||||||
10-
| **Chat Stream** |||||||
11-
| **Image (Input)** | ✅ (Multimodal models) || ✅ (Via models like Claude 3) ||| ❌ (Claude 3 models) |
12-
| **Image Gen (Output)** ||| ✅ (Via Titan, Stable Diffusion) ||| ❌ (Via other models like Titan Image Generator) |
13-
| **Audio Streaming (Input)** | ✅ (Some APIs/integrations) || ❌ (Via Amazon Transcribe) |||❌ (Via services like Amazon Transcribe) |
14-
| **Transcription** | ✅ (Some APIs/integrations) || ❌ (Via Amazon Transcribe) ||| ❌ (Via Amazon Transcribe) |
15-
| **Persistent session (MapDB)** |||||||
16-
| **Agents as Tool/Function** |||||||
17-
| **Interoperability (A2A)** |||||||
18-
| **Interoperability (Tools/Functions)** |||||||
19-
| **Interoperability (Agents as Tool/Function)** |||||||
20-
| **Agent Workflow** |||||||
21-
| **Parallel Agents** |||||||
22-
| **Sequential Agents** |||||||
23-
| **Agent Orchestration** |||||||
24-
| **Hierarchical Task Decomposition** |||||||
25-
26-
27-
# Core Differences
28-
29-
## Persistent session storage added,
30-
31-
| Store | Chat | Stream | Artifact |
32-
| :--- | :--- | :--- | :--- |
33-
| **MapDB** ||||
34-
| **MongoDB** ||||
35-
| **Postgres** ||||
36-
37-
### MapDbSessionService("map.db")
38-
39-
```
40-
public BaseSessionService sessionService() {
41-
42-
try {
43-
// TODO: Add logic to select service based on config (e.g., DB URL)
44-
log.info("Using MapDbSessionService");
45-
return new MapDbSessionService("map.db");
46-
} catch (Exception ex) {
47-
java.util.logging.Logger.getLogger(AdkWebServer.class.getName()).log(Level.SEVERE, null, ex);
48-
}
49-
50-
// TODO: Add logic to select service based on config (e.g., DB URL)
51-
log.info("Using InMemorySessionService");
52-
return new InMemorySessionService();
53-
}
54-
```
55-
56-
## Ollama API Supported,
57-
58-
### OllamaBaseLM("qwen3:0.6b")
59-
```
60-
LlmAgent coordinator = LlmAgent.builder()
61-
.name("Coordinator")
62-
. model(new com.google.adk.models.OllamaBaseLM("qwen3:0.6b"))//
63-
.instruction("You are an assistant. Delegate requests to appropriate agent")
64-
.description("Main coordinator.")
65-
.build();
66-
```
67-
68-
## Secondary Auth Over Azure API
69-
70-
### RedbusADG("40")
71-
72-
```
73-
LlmAgent.builder()
74-
.name(NAME)
75-
.model(new com.google.adk.models.OllamaBaseLM("qwen3:0.6b"))//.model(new RedbusADG("40"))
76-
.description("Agent to calculate trigonometric functions (sine, cosine, tangent) for given angles.") // Updated description
77-
.instruction(
78-
"You are a helpful agent who can calculate trigonometric functions (sine, cosine, and"
79-
+ " tangent). Use the provided tools to perform these calculations."
80-
+ " When the user provides an angle, identify the value and the unit (degrees or radians)."
81-
+ " Call the appropriate tool based on the requested function (sin, cos, tan) and provide the angle value and unit."
82-
+ " Ensure the angle unit is explicitly passed to the tool as 'degrees' or 'radians'.") // Updated instruction
83-
.tools(
84-
// Register the new trigonometry tools
85-
FunctionTool.create(TrigonometryAgent.class, "calculateSine"),
86-
FunctionTool.create(TrigonometryAgent.class, "calculateCosine"),
87-
FunctionTool.create(TrigonometryAgent.class, "calculateTangent")
88-
// Removed FunctionTool.create for getCurrentTime and getWeather
89-
)
90-
.build();
91-
```
92-
93-
94-
951
# Agent Development Kit (ADK) for Java
962

973
[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](LICENSE)
@@ -144,13 +50,13 @@ If you're using Maven, add the following to your dependencies:
14450
<dependency>
14551
<groupId>com.google.adk</groupId>
14652
<artifactId>google-adk</artifactId>
147-
<version>1.2.0</version>
53+
<version>0.8.0</version>
14854
</dependency>
14955
<!-- Dev UI -->
15056
<dependency>
15157
<groupId>com.google.adk</groupId>
15258
<artifactId>google-adk-dev</artifactId>
153-
<version>1.2.0</version>
59+
<version>0.8.0</version>
15460
</dependency>
15561
```
15662

a2a/pom.xml

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.google.adk</groupId>
77
<artifactId>google-adk-parent</artifactId>
8-
<version>1.2.0</version><!-- {x-version-update:google-adk:current} -->
8+
<version>0.8.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
99
</parent>
1010

1111
<artifactId>google-adk-a2a</artifactId>
@@ -19,17 +19,22 @@
1919
<a2a.sdk.version>0.3.2.Final</a2a.sdk.version>
2020
<google.adk.version>${project.version}</google.adk.version>
2121
<guava.version>33.0.0-jre</guava.version>
22-
<jackson.version>2.19.0</jackson.version>
2322
<rxjava.version>3.1.5</rxjava.version>
23+
<jackson.version>2.19.0</jackson.version>
2424
<jspecify.version>1.0.0</jspecify.version>
25-
<slf4j.version>2.0.17</slf4j.version>
2625
<errorprone.version>2.38.0</errorprone.version>
26+
<grpc.version>1.76.2</grpc.version>
27+
<slf4j.version>2.0.17</slf4j.version>
2728
<truth.version>1.4.4</truth.version>
2829
<junit4.version>4.13.2</junit4.version>
29-
<grpc.version>1.62.2</grpc.version>
3030
</properties>
3131

3232
<dependencies>
33+
<dependency>
34+
<groupId>com.google.adk</groupId>
35+
<artifactId>google-adk</artifactId>
36+
<version>${google.adk.version}</version>
37+
</dependency>
3338
<dependency>
3439
<groupId>io.grpc</groupId>
3540
<artifactId>grpc-netty-shaded</artifactId>
@@ -51,11 +56,6 @@
5156
<artifactId>gson</artifactId>
5257
<version>2.10.1</version>
5358
</dependency>
54-
<dependency>
55-
<groupId>com.google.adk</groupId>
56-
<artifactId>google-adk</artifactId>
57-
<version>${google.adk.version}</version>
58-
</dependency>
5959
<dependency>
6060
<groupId>com.google.guava</groupId>
6161
<artifactId>guava</artifactId>
@@ -76,6 +76,11 @@
7676
<artifactId>jackson-databind</artifactId>
7777
<version>${jackson.version}</version>
7878
</dependency>
79+
<dependency>
80+
<groupId>com.fasterxml.jackson.datatype</groupId>
81+
<artifactId>jackson-datatype-jsr310</artifactId>
82+
<version>${jackson.version}</version>
83+
</dependency>
7984
<dependency>
8085
<groupId>com.fasterxml.jackson.module</groupId>
8186
<artifactId>jackson-module-parameter-names</artifactId>
@@ -129,13 +134,13 @@
129134
<scope>test</scope>
130135
</dependency>
131136
<dependency>
132-
<groupId>org.junit.jupiter</groupId>
133-
<artifactId>junit-jupiter-api</artifactId>
137+
<groupId>org.mockito</groupId>
138+
<artifactId>mockito-core</artifactId>
134139
<scope>test</scope>
135140
</dependency>
136141
<dependency>
137-
<groupId>org.mockito</groupId>
138-
<artifactId>mockito-core</artifactId>
142+
<groupId>org.junit.jupiter</groupId>
143+
<artifactId>junit-jupiter-api</artifactId>
139144
<scope>test</scope>
140145
</dependency>
141146
<dependency>
@@ -149,7 +154,6 @@
149154
<scope>test</scope>
150155
</dependency>
151156
</dependencies>
152-
153157
<build>
154158
<extensions>
155159
<extension>
@@ -159,6 +163,14 @@
159163
</extension>
160164
</extensions>
161165
<plugins>
166+
<plugin>
167+
<groupId>org.apache.maven.plugins</groupId>
168+
<artifactId>maven-compiler-plugin</artifactId>
169+
<version>3.13.0</version>
170+
<configuration>
171+
<release>${java.version}</release>
172+
</configuration>
173+
</plugin>
162174
<plugin>
163175
<groupId>org.apache.maven.plugins</groupId>
164176
<artifactId>maven-surefire-plugin</artifactId>
@@ -187,7 +199,7 @@
187199
</protocArtifact>
188200
<pluginId>grpc-java</pluginId>
189201
<pluginArtifact>
190-
io.grpc:protoc-gen-grpc-java:1.48.1:exe:${os.detected.classifier}
202+
io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
191203
</pluginArtifact>
192204
</configuration>
193205
<executions>

0 commit comments

Comments
 (0)