Skip to content

Commit d7cf203

Browse files
filintodfilintod
committed
Merge branch 'release-1.16' into filinto/conversation-sdk-116
2 parents 217d4ce + 12aa7a9 commit d7cf203

File tree

59 files changed

+1473
-124
lines changed

Some content is hidden

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

59 files changed

+1473
-124
lines changed

‎.github/env/global.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
DAPR_CLI_VERSION: 1.16.0-rc.1
2-
DAPR_RUNTIME_VERSION: 1.16.0-rc.3
2+
DAPR_RUNTIME_VERSION: 1.16.0-rc.4
33
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v${DAPR_CLI_VERSION}/install/
44
DAPR_DEFAULT_IMAGE_REGISTRY: ghcr
55

66
MACOS_PYTHON_VERSION: 3.10
77

88
PODMAN_VERSION: 4.4.4
99

10-
GOVER: 1.22
10+
GOVER: 1.24
1111

1212
KUBERNETES_VERSION: v1.32.0
1313
KIND_VERSION: v0.26.0

‎actors/csharp/sdk/client/SmartDevice.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Dapr.Actors" Version="1.15.0" />
11+
<PackageReference Include="Dapr.Actors" Version="1.16.0-rc15" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎actors/csharp/sdk/interfaces/SmartDevice.Interfaces.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Dapr.Actors" Version="1.15.0" />
10+
<PackageReference Include="Dapr.Actors" Version="1.16.0-rc15" />
1111
</ItemGroup>
1212

1313
</Project>

‎actors/csharp/sdk/service/SmartDevice.Service.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Dapr.Actors" Version="1.15.0" />
11-
<PackageReference Include="Dapr.Actors.AspNetCore" Version="1.15.0" />
10+
<PackageReference Include="Dapr.Actors" Version="1.16.0-rc15" />
11+
<PackageReference Include="Dapr.Actors.AspNetCore" Version="1.16.0-rc15" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎bindings/csharp/sdk/batch/batch.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Dapr.AspNetCore" Version="1.15.0" />
11+
<PackageReference Include="Dapr.AspNetCore" Version="1.16.0-rc15" />
1212
</ItemGroup>
1313

1414
</Project>

‎bindings/java/sdk/batch/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
<dependency>
2929
<groupId>io.dapr</groupId>
3030
<artifactId>dapr-sdk-springboot</artifactId>
31-
<version>1.15.0</version>
31+
<version>1.16.0-rc-1</version>
3232
</dependency>
3333
<dependency>
3434
<groupId>io.dapr</groupId>
3535
<artifactId>dapr-sdk</artifactId>
36-
<version>1.15.0</version>
36+
<version>1.16.0-rc-1</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>org.projectlombok</groupId>

‎configuration/csharp/sdk/order-processor/Program.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Dapr.AspNetCore" Version="1.15.0" />
9+
<PackageReference Include="Dapr.AspNetCore" Version="1.16.0-rc15" />
1010
</ItemGroup>
1111

1212
</Project>

‎configuration/java/sdk/order-processor/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>io.dapr</groupId>
1919
<artifactId>dapr-sdk</artifactId>
20-
<version>1.15.0</version>
20+
<version>1.16.0-rc-1</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>io.projectreactor</groupId>

‎conversation/csharp/sdk/conversation/Program.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Dapr.AI" Version="1.15.0" />
11+
<PackageReference Include="Dapr.AI" Version="1.16.0-rc15" />
1212
</ItemGroup>
1313

1414
</Project>

‎conversation/go/http/README.md‎

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Visit [this](https://docs.dapr.io/developing-applications/building-blocks/conver
88
99
This quickstart includes one app:
1010

11-
- `conversation.go`, responsible for sending an input to the underlying LLM and retrieving an output.
11+
- `conversation.go`, responsible for sending an input to the underlying LLM and retrieving an output. It includes a secondary conversation request to showcase tool calling to the underlying LLM.
1212

1313
## Run the app with the template file
1414

@@ -23,6 +23,9 @@ name: Run multi app run template
2323
expected_stdout_lines:
2424
- '== APP - conversation == Input sent: What is dapr?'
2525
- '== APP - conversation == Output response: What is dapr?'
26+
- '== APP - conversation == Tool calling input sent: What is the weather like in San Francisco in celsius?'
27+
- '== APP - conversation == Output message: What is the weather like in San Francisco in celsius?'
28+
- '== APP - conversation == Tool calls detected:'
2629
expected_stderr_lines:
2730
output_match_mode: substring
2831
match_order: none
@@ -37,25 +40,55 @@ dapr run -f .
3740

3841
The terminal console output should look similar to this, where:
3942

40-
- The app sends an input `What is dapr?` to the `echo` Component mock LLM.
43+
- The app first sends an input `What is dapr?` to the `echo` Component mock LLM.
4144
- The mock LLM echoes `What is dapr?`.
45+
- The app then sends a weather request to the component with tools available to the LLM.
46+
- The LLM will either respond back with a tool call for the user, or an ask for more information.
4247

4348
```text
4449
== APP - conversation == Input sent: What is dapr?
4550
== APP - conversation == Output response: What is dapr?
4651
```
4752

53+
- The app then sends an input `What is the weather like in San Francisco in celsius?` to the `echo` Component mock LLM.
54+
- The mock LLM echoes `What is the weather like in San Francisco in celsius?` and calls the `get_weather` tool.
55+
- The echo Component returns the tool call information.
56+
57+
```text
58+
== APP - conversation == Tool calling input sent: What is the weather like in San Francisco in celsius?
59+
== APP - conversation == Output message: What is the weather like in San Francisco in celsius?
60+
== APP - conversation == Tool calls detected:
61+
== APP - conversation == Tool call: map[function:map[arguments:unit,location name:get_weather] id:0]
62+
```
63+
4864
<!-- END_STEP -->
4965

5066
2. Stop and clean up application processes.
5167

52-
<!-- STEP
53-
name: Stop multi-app run
54-
sleep: 5
55-
-->
56-
5768
```bash
5869
dapr stop -f .
5970
```
6071

61-
<!-- END_STEP -->
72+
## Run the app with the Dapr CLI
73+
74+
1. Run the application:
75+
76+
```bash
77+
dapr run --app-id conversation --resources-path ../../../components -- go run conversation.go
78+
```
79+
80+
The terminal console output should look similar to this, where:
81+
82+
- The app first sends an input `What is dapr?` to the `echo` Component mock LLM.
83+
- The mock LLM echoes `What is dapr?`.
84+
- The app then sends an input `What is the weather like in San Francisco in celsius?` to the `echo` Component mock LLM.
85+
- The mock LLM echoes `What is the weather like in San Francisco in celsius?`
86+
87+
```text
88+
== APP - conversation == Input sent: What is dapr?
89+
== APP - conversation == Output response: What is dapr?
90+
== APP - conversation == Tool calling input sent: What is the weather like in San Francisco in celsius?
91+
== APP - conversation == Output message: What is the weather like in San Francisco in celsius?
92+
== APP - conversation == Tool calls detected:
93+
== APP - conversation == Tool call: map[function:map[arguments:unit,location name:get_weather] id:0]
94+
```

0 commit comments

Comments
 (0)