Skip to content

fix: Steps is not optional #1015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Steps is not optional #1015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions examples/src/main/java/com/google/genai/examples/InteractionBasic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,25 @@ public static void main(String[] args) {
System.out.println("Status: " + interaction.status());

// Print the text outputs from the interaction.
for (Step step : interaction.steps()) {
if (step.isModelOutput()) {
step.asModelOutput()
.content()
.ifPresent(
contents -> {
for (Content content : contents) {
content
.text()
.ifPresent(text -> System.out.println("Output: " + text.text()));
}
});
}
}
interaction
.steps()
.ifPresent(
steps -> {
for (Step step : steps) {
if (step.isModelOutput()) {
step.asModelOutput()
.content()
.ifPresent(
contents -> {
for (Content content : contents) {
content
.text()
.ifPresent(text -> System.out.println("Output: " + text.text()));
}
});
}
}
});
}

private InteractionBasic() {}
Expand Down
33 changes: 19 additions & 14 deletions examples/src/main/java/com/google/genai/examples/InteractionCreate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,20 +77,25 @@ public static void main(String[] args) {
System.out.println("Status: " + interaction.status());

// Print the text outputs from the interaction.
for (Step step : interaction.steps()) {
if (step.isModelOutput()) {
step.asModelOutput()
.content()
.ifPresent(
contents -> {
for (Content content : contents) {
content
.text()
.ifPresent(text -> System.out.println("Output: " + text.text()));
}
});
}
}
interaction
.steps()
.ifPresent(
steps -> {
for (Step step : steps) {
if (step.isModelOutput()) {
step.asModelOutput()
.content()
.ifPresent(
contents -> {
for (Content content : contents) {
content
.text()
.ifPresent(text -> System.out.println("Output: " + text.text()));
}
});
}
}
});
}

private InteractionCreate() {}
Expand Down
36 changes: 21 additions & 15 deletions examples/src/main/java/com/google/genai/examples/InteractionCreateAsync.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,21 +82,27 @@ public static void main(String[] args) {
System.out.println("Status: " + interaction.status());

// Print the text outputs from the interaction.
for (Step step : interaction.steps()) {
if (step.isModelOutput()) {
step.asModelOutput()
.content()
.ifPresent(
contents -> {
for (Content content : contents) {
content
.text()
.ifPresent(
text -> System.out.println("Output: " + text.text()));
}
});
}
}
interaction
.steps()
.ifPresent(
steps -> {
for (Step step : steps) {
if (step.isModelOutput()) {
step.asModelOutput()
.content()
.ifPresent(
contents -> {
for (Content content : contents) {
content
.text()
.ifPresent(
text ->
System.out.println("Output: " + text.text()));
}
});
}
}
});
})
.join();
}
Expand Down
37 changes: 21 additions & 16 deletions examples/src/main/java/com/google/genai/examples/InteractionFunctionCallingClientState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public static void main(String[] args) {
String functionCallId = null;
String functionName = null;

List<Step> steps = response.steps();
List<Step> steps = response.steps().orElse(null);
if (steps != null) {
for (Step step : steps) {
if (step.isFunctionCall()) {
Expand Down Expand Up @@ -191,21 +191,26 @@ public static void main(String[] args) {
Interaction followUpResponse = client.interactions.create(followUpParams);

System.out.println("Final response status: " + followUpResponse.status());
for (Step step : followUpResponse.steps()) {
if (step.isModelOutput()) {
step.asModelOutput()
.content()
.ifPresent(
contents -> {
for (Content output : contents) {
output
.text()
.ifPresent(
text -> System.out.println("Final Output: " + text.text()));
}
});
}
}
followUpResponse
.steps()
.ifPresent(
finalSteps -> {
for (Step step : finalSteps) {
if (step.isModelOutput()) {
step.asModelOutput()
.content()
.ifPresent(
contents -> {
for (Content output : contents) {
output
.text()
.ifPresent(
text -> System.out.println("Final Output: " + text.text()));
}
});
}
}
});
} else {
System.out.println("No function call requested by the model.");
}
Expand Down
37 changes: 21 additions & 16 deletions examples/src/main/java/com/google/genai/examples/InteractionFunctionCallingServerState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public static void main(String[] args) {
String functionCallId = null;
String functionName = null;

List<Step> steps = response.steps();
List<Step> steps = response.steps().orElse(null);
if (steps != null) {
for (Step step : steps) {
if (step.isFunctionCall()) {
Expand Down Expand Up @@ -170,21 +170,26 @@ public static void main(String[] args) {
Interaction followUpResponse = client.interactions.create(followUpParams);

System.out.println("Final response status: " + followUpResponse.status());
for (Step step : followUpResponse.steps()) {
if (step.isModelOutput()) {
step.asModelOutput()
.content()
.ifPresent(
contents -> {
for (Content output : contents) {
output
.text()
.ifPresent(
text -> System.out.println("Final Output: " + text.text()));
}
});
}
}
followUpResponse
.steps()
.ifPresent(
finalSteps -> {
for (Step step : finalSteps) {
if (step.isModelOutput()) {
step.asModelOutput()
.content()
.ifPresent(
contents -> {
for (Content output : contents) {
output
.text()
.ifPresent(
text -> System.out.println("Final Output: " + text.text()));
}
});
}
}
});
} else {
System.out.println("No function call requested by the model.");
}
Expand Down
33 changes: 19 additions & 14 deletions examples/src/main/java/com/google/genai/examples/InteractionGet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,20 +75,25 @@ public static void main(String[] args) {
System.out.println("Status: " + retrievedInteraction.status());

// Print the text outputs from the retrieved interaction.
for (Step step : retrievedInteraction.steps()) {
if (step.isModelOutput()) {
step.asModelOutput()
.content()
.ifPresent(
contents -> {
for (Content content : contents) {
content
.text()
.ifPresent(text -> System.out.println("Output: " + text.text()));
}
});
}
}
retrievedInteraction
.steps()
.ifPresent(
steps -> {
for (Step step : steps) {
if (step.isModelOutput()) {
step.asModelOutput()
.content()
.ifPresent(
contents -> {
for (Content content : contents) {
content
.text()
.ifPresent(text -> System.out.println("Output: " + text.text()));
}
});
}
}
});
}

private InteractionGet() {}
Expand Down
12 changes: 8 additions & 4 deletions examples/src/main/java/com/google/genai/examples/InteractionMultimodalInputTextAndAudio.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,14 @@ private static void createInteractions(Client client) {

Interaction interaction = client.interactions.create(params);

List<Step> steps = interaction.steps();
for (int i = 0; i < steps.size(); i++) {
System.out.println("Step " + (i + 1) + ": " + steps.get(i));
}
interaction
.steps()
.ifPresent(
steps -> {
for (int i = 0; i < steps.size(); i++) {
System.out.println("Step " + (i + 1) + ": " + steps.get(i));
}
});
}

public static void main(String[] args) {
Expand Down
12 changes: 8 additions & 4 deletions examples/src/main/java/com/google/genai/examples/InteractionMultimodalInputTextAndImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,14 @@ private static void createInteractions(Client client) {

Interaction interaction = client.interactions.create(params);

List<Step> steps = interaction.steps();
for (int i = 0; i < steps.size(); i++) {
System.out.println("Step " + (i + 1) + ": " + steps.get(i));
}
interaction
.steps()
.ifPresent(
steps -> {
for (int i = 0; i < steps.size(); i++) {
System.out.println("Step " + (i + 1) + ": " + steps.get(i));
}
});
}

public static void main(String[] args) {
Expand Down
14 changes: 8 additions & 6 deletions examples/src/main/java/com/google/genai/examples/InteractionMultimodalResponseAudio.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
import com.google.genai.interactions.models.interactions.GenerationConfig;
import com.google.genai.interactions.models.interactions.Interaction;
import com.google.genai.interactions.models.interactions.SpeechConfig;
import com.google.genai.interactions.models.interactions.Step;
import java.util.Arrays;

/** Example of generating audio using the Interactions API. */
Expand All @@ -69,11 +68,14 @@ private static void createInteractions(Client client) {

Interaction interaction = client.interactions.create(params);

int i = 1;
for (Step step : interaction.steps()) {
System.out.println("Output " + i + ": " + step);
i++;
}
interaction
.steps()
.ifPresent(
outputs -> {
for (int i = 0; i < outputs.size(); i++) {
System.out.println("Output " + (i + 1) + ": " + outputs.get(i));
}
});
}

public static void main(String[] args) {
Expand Down
14 changes: 9 additions & 5 deletions ...java/com/google/genai/examples/InteractionMultimodalResponseAudioWithGenerateContent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,15 @@ public static void main(String[] args) {
System.out.println("Interaction ID: " + interaction.id());
System.out.println("Status: " + interaction.status());

int i = 1;
for (Step step : interaction.steps()) {
System.out.println("Step " + i + ": " + step);
i++;
}
interaction
.steps()
.ifPresent(
steps -> {
for (int i = 0; i < steps.size(); i++) {
Step step = steps.get(i);
System.out.println("Step " + (i + 1) + ": " + step);
}
});

System.out.println("[Generate Content] Start generate content");
GenerateContentConfig config =
Expand Down
14 changes: 8 additions & 6 deletions examples/src/main/java/com/google/genai/examples/InteractionMultimodalResponseImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import com.google.genai.interactions.models.interactions.CreateModelInteractionParams;
import com.google.genai.interactions.models.interactions.CreateModelInteractionParams.ResponseModality;
import com.google.genai.interactions.models.interactions.Interaction;
import com.google.genai.interactions.models.interactions.Step;
import java.util.Arrays;

/** Example of generating an image using the Interactions API. */
Expand All @@ -61,11 +60,14 @@ private static void createInteractions(Client client) {

Interaction interaction = client.interactions.create(params);

int i = 1;
for (Step step : interaction.steps()) {
System.out.println("Output " + i + ": " + step);
i++;
}
interaction
.steps()
.ifPresent(
outputs -> {
for (int i = 0; i < outputs.size(); i++) {
System.out.println("Output " + (i + 1) + ": " + outputs.get(i));
}
});
}

public static void main(String[] args) {
Expand Down
Loading
Loading