Skip to content

Commit

Permalink
samples: added lro code snippet and removed webhook snippet (#408)
Browse files Browse the repository at this point in the history
* samples: added lro code snippet and removed webhook snippet

* changed intent id for list intent id due to deletion

* moved then random test name creation into each test

* tried to solve nullExceptionPointer

* revert testing changes

* reverted pom changes

* lint fix

* lint fix

* added shutdowns

* fixed lint

* commented print statements

* uncommented print code

* Commented Print Statements

* 🦉 Updates from OwlBot

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
  • Loading branch information
galz10 and gcf-owl-bot[bot] authored Mar 1, 2022
1 parent 1131f07 commit 3044fad
Show file tree
Hide file tree
Showing 9 changed files with 182 additions and 150 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,10 @@ public static Flow createFlow(

// Performs the create flow request.
Flow response = flowsClient.createFlow(parent, flow);
System.out.format("Flow created: %s\n", response);

// TODO : Uncomment if you want to print response
// System.out.format("Flow created: %s\n", response.toString());
flowsClient.shutdown();
return response;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ public static Intent createIntent(

// Performs the create intent request.
Intent response = intentsClient.createIntent(parent, intent);
System.out.format("Intent created: %s\n", response);

// TODO : Uncomment if you want to print response
// System.out.format("Intent created: %s\n", response);

return response;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,11 @@ public static Page createPage(

// Performs the create page request.
Page response = pagesClient.createPage(parent, page);
System.out.format("Page created: %s\n", response);

// TODO : Uncomment if you want to print response
// System.out.format("Page created: %s\n", response.toString());

pagesClient.shutdown();
return response;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,11 @@ public static Map<String, QueryResult> detectIntent(
try (SessionsClient sessionsClient = SessionsClient.create(sessionsSettings)) {
// Set the session name using the projectID (my-project-id), locationID (global), agentID
// (UUID), and sessionId (UUID).
SessionName session = SessionName.of(projectId, locationId, agentId, sessionId);
System.out.println("Session Path: " + session.toString());
SessionName session =
SessionName.ofProjectLocationAgentSessionName(projectId, locationId, agentId, sessionId);

// TODO : Uncomment if you want to print session path
// System.out.println("Session Path: " + session.toString());

// Detect intents for each text input.
for (String text : texts) {
Expand All @@ -81,11 +84,13 @@ public static Map<String, QueryResult> detectIntent(
// Display the query result.
QueryResult queryResult = response.getQueryResult();

System.out.println("====================");
System.out.format("Query Text: '%s'\n", queryResult.getText());
System.out.format(
"Detected Intent: %s (confidence: %f)\n",
queryResult.getIntent().getDisplayName(), queryResult.getIntentDetectionConfidence());
// TODO : Uncomment if you want to print queryResult
// System.out.println("====================");
// System.out.format("Query Text: '%s'\n", queryResult.getText());
// System.out.format(
// "Detected Intent: %s (confidence: %f)\n",
// queryResult.getIntent().getDisplayName(),
// queryResult.getIntentDetectionConfidence());

queryResults.put(text, queryResult);
}
Expand Down
67 changes: 0 additions & 67 deletions dialogflow-cx/snippets/src/main/java/dialogflow/cx/Example.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*
* Copyright 2021 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package dialogflow.cx;

// [START dialogflow_cx_export_agent]

import com.google.api.gax.longrunning.OperationFuture;
import com.google.cloud.dialogflow.cx.v3.AgentName;
import com.google.cloud.dialogflow.cx.v3.AgentsClient;
import com.google.cloud.dialogflow.cx.v3.AgentsSettings;
import com.google.cloud.dialogflow.cx.v3.ExportAgentRequest;
import com.google.cloud.dialogflow.cx.v3.ExportAgentResponse;
import com.google.protobuf.Struct;
import java.io.IOException;
import java.util.concurrent.ExecutionException;

public class ExportAgent {

public static void main(String[] args)
throws IOException, InterruptedException, ExecutionException {
// TODO(developer): Replace these variables before running the sample.
String projectId = "my-project-id";
String agentId = "my-agent-id";
String location = "my-location";

exportAgent(projectId, agentId, location);
}

public static void exportAgent(String projectId, String agentId, String location)
throws IOException, InterruptedException, ExecutionException {

// Sets the api endpoint to specified location
String apiEndpoint = String.format("%s-dialogflow.googleapis.com:443", location);

AgentsSettings agentsSettings = AgentsSettings.newBuilder().setEndpoint(apiEndpoint).build();
try (AgentsClient agentsClient = AgentsClient.create(agentsSettings)) {
ExportAgentRequest request =
ExportAgentRequest.newBuilder()
.setName(AgentName.of(projectId, location, agentId).toString())
.build();

// Returns a future of the operation
OperationFuture<ExportAgentResponse, Struct> future =
agentsClient.exportAgentOperationCallable().futureCall(request);

// get the export agent response after the operation is completed
ExportAgentResponse response = future.get();
System.out.println(response);
}
}
}
// [END dialogflow_cx_export_agent]
72 changes: 0 additions & 72 deletions dialogflow-cx/snippets/src/test/java/dialogflow/cx/ExampleIT.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
/*
* Copyright 2021 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package dialogflow.cx;

import static com.google.common.truth.Truth.assertThat;

import com.google.cloud.dialogflow.cx.v3.Agent;
import com.google.cloud.dialogflow.cx.v3.Agent.Builder;
import com.google.cloud.dialogflow.cx.v3.AgentsClient;
import com.google.cloud.dialogflow.cx.v3.AgentsSettings;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;

public class ExportAgentIT {

private static String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
private static String parent = "";
private static String agentPath = "";
private static String agentID = "";

private ByteArrayOutputStream stdOut;

@BeforeClass
public static void beforeAll() {
assertThat(PROJECT_ID).isNotNull();
}

@Before
public void setUp() throws IOException {
stdOut = new ByteArrayOutputStream();
System.setOut(new PrintStream(stdOut));

Builder build = Agent.newBuilder();
build.setDefaultLanguageCode("en");
build.setDisplayName("temp_agent_" + UUID.randomUUID().toString());
build.setTimeZone("America/Los_Angeles");

Agent agent = build.build();

String apiEndpoint = "global-dialogflow.googleapis.com:443";
String parentPath = "projects/" + PROJECT_ID + "/locations/global";

AgentsSettings agentsSettings = AgentsSettings.newBuilder().setEndpoint(apiEndpoint).build();
AgentsClient client = AgentsClient.create(agentsSettings);

parent = client.createAgent(parentPath, agent).getName();
ExportAgentIT.agentPath = parent;
ExportAgentIT.agentID = parent.split("/")[5];
client.close();
}

@After
public void tearDown() throws IOException {
stdOut = null;
System.setOut(null);
String apiEndpoint = "global-dialogflow.googleapis.com:443";

AgentsSettings agentsSettings = AgentsSettings.newBuilder().setEndpoint(apiEndpoint).build();
AgentsClient client = AgentsClient.create(agentsSettings);

client.deleteAgent(ExportAgentIT.agentPath);
client.close();
}

@Test
public void testUpdateExportAgent() throws IOException, InterruptedException, ExecutionException {

ExportAgent.exportAgent(PROJECT_ID, ExportAgentIT.agentID, "global");

assertThat(stdOut.toString()).contains(ExportAgentIT.agentID);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class ListTrainingPhrasesTest {
private static String PROJECT_ID = System.getenv().get("GOOGLE_CLOUD_PROJECT");
private static String LOCATION = "global";
private static String AGENT_ID = "b8d0e85d-0741-4e6d-a66a-3671184b7b93";
private static String INTENT_ID = "45974f75-9412-445a-9863-47bfdfa3d96d";
private static String INTENT_ID = "e2d688a6-c8b4-448e-a7d6-208f147ae689";

private ByteArrayOutputStream stdOut;

Expand Down

0 comments on commit 3044fad

Please sign in to comment.