Skip to content

Commit 4f4894f

Browse files
fix(assistantv2): add discrim bug hand edit for TurnEvent models
1 parent faea1a2 commit 4f4894f

12 files changed

+122
-30
lines changed

assistant/src/main/java/com/ibm/watson/assistant/v2/model/Environment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public String getEnvironmentId() {
108108
/**
109109
* Gets the environment.
110110
*
111-
* <p>The type of the environment. All environments other than the draft and live environments
111+
* <p>The type of the environment. All environments other than the `draft` and `live` environments
112112
* have the type `staging`.
113113
*
114114
* @return the environment
@@ -131,7 +131,7 @@ public EnvironmentReleaseReference getReleaseReference() {
131131
/**
132132
* Gets the orchestration.
133133
*
134-
* <p>The search skill orchestration settings for message API.
134+
* <p>The search skill orchestration settings for the environment.
135135
*
136136
* @return the orchestration
137137
*/
@@ -142,7 +142,7 @@ public EnvironmentOrchestration getOrchestration() {
142142
/**
143143
* Gets the sessionTimeout.
144144
*
145-
* <p>The session inactivity timeout setting of for the environment.
145+
* <p>The session inactivity timeout setting for the environment.
146146
*
147147
* @return the sessionTimeout
148148
*/

assistant/src/main/java/com/ibm/watson/assistant/v2/model/EnvironmentOrchestration.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import com.google.gson.annotations.SerializedName;
1616
import com.ibm.cloud.sdk.core.service.model.GenericModel;
1717

18-
/** The search skill orchestration settings for message API. */
18+
/** The search skill orchestration settings for the environment. */
1919
public class EnvironmentOrchestration extends GenericModel {
2020

2121
@SerializedName("search_skill_fallback")
@@ -24,8 +24,9 @@ public class EnvironmentOrchestration extends GenericModel {
2424
/**
2525
* Gets the searchSkillFallback.
2626
*
27-
* <p>Whether to connect to discovery in the event a response cannot be matched. If search skill
28-
* is not enabled for the environment, this property is ignored.
27+
* <p>Whether assistants deployed to the environment fall back to a search skill when responding
28+
* to messages that do not match any intent. If no search skill is configured for the assistant,
29+
* this property is ignored.
2930
*
3031
* @return the searchSkillFallback
3132
*/

assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEvent.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ public interface Reason {
8181
}
8282

8383
protected String event;
84-
protected TurnEventActionSource source;
8584

8685
@SerializedName("action_start_time")
8786
protected String actionStartTime;
@@ -99,7 +98,6 @@ public interface Reason {
9998

10099
protected Boolean prompted;
101100
protected TurnEventCalloutCallout callout;
102-
protected TurnEventCalloutError error;
103101

104102
protected MessageOutputDebugTurnEvent() {}
105103

@@ -114,15 +112,6 @@ public String getEvent() {
114112
return event;
115113
}
116114

117-
/**
118-
* Gets the source.
119-
*
120-
* @return the source
121-
*/
122-
public TurnEventActionSource getSource() {
123-
return source;
124-
}
125-
126115
/**
127116
* Gets the actionStartTime.
128117
*
@@ -198,13 +187,4 @@ public Boolean isPrompted() {
198187
public TurnEventCalloutCallout getCallout() {
199188
return callout;
200189
}
201-
202-
/**
203-
* Gets the error.
204-
*
205-
* @return the error
206-
*/
207-
public TurnEventCalloutError getError() {
208-
return error;
209-
}
210190
}

assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEventTurnEventActionFinished.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
public class MessageOutputDebugTurnEventTurnEventActionFinished
1717
extends MessageOutputDebugTurnEvent {
1818

19+
private TurnEventActionSource source;
20+
1921
/** The type of condition (if any) that is defined for the action. */
2022
public interface ConditionType {
2123
/** user_defined. */
@@ -41,4 +43,13 @@ public interface Reason {
4143
/** fallback. */
4244
String FALLBACK = "fallback";
4345
}
46+
47+
/**
48+
* Gets the source.
49+
*
50+
* @return the source
51+
*/
52+
public TurnEventActionSource getSource() {
53+
return source;
54+
}
4455
}

assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEventTurnEventActionVisited.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
/** MessageOutputDebugTurnEventTurnEventActionVisited. */
1616
public class MessageOutputDebugTurnEventTurnEventActionVisited extends MessageOutputDebugTurnEvent {
1717

18+
private TurnEventActionSource source;
19+
1820
/** The type of condition (if any) that is defined for the action. */
1921
public interface ConditionType {
2022
/** user_defined. */
@@ -46,4 +48,13 @@ public interface Reason {
4648
/** no_action_matches. */
4749
String NO_ACTION_MATCHES = "no_action_matches";
4850
}
51+
52+
/**
53+
* Gets the source.
54+
*
55+
* @return the source
56+
*/
57+
public TurnEventActionSource getSource() {
58+
return source;
59+
}
4960
}

assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEventTurnEventCallout.java

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,26 @@
1313
package com.ibm.watson.assistant.v2.model;
1414

1515
/** MessageOutputDebugTurnEventTurnEventCallout. */
16-
public class MessageOutputDebugTurnEventTurnEventCallout extends MessageOutputDebugTurnEvent {}
16+
public class MessageOutputDebugTurnEventTurnEventCallout extends MessageOutputDebugTurnEvent {
17+
18+
private TurnEventActionSource source;
19+
private TurnEventCalloutError error;
20+
21+
/**
22+
* Gets the source.
23+
*
24+
* @return the source
25+
*/
26+
public TurnEventActionSource getSource() {
27+
return source;
28+
}
29+
30+
/**
31+
* Gets the error.
32+
*
33+
* @return the error
34+
*/
35+
public TurnEventCalloutError getError() {
36+
return error;
37+
}
38+
}

assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEventTurnEventHandlerVisited.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,16 @@
1414

1515
/** MessageOutputDebugTurnEventTurnEventHandlerVisited. */
1616
public class MessageOutputDebugTurnEventTurnEventHandlerVisited
17-
extends MessageOutputDebugTurnEvent {}
17+
extends MessageOutputDebugTurnEvent {
18+
19+
private TurnEventActionSource source;
20+
21+
/**
22+
* Gets the source.
23+
*
24+
* @return the source
25+
*/
26+
public TurnEventActionSource getSource() {
27+
return source;
28+
}
29+
}

assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEventTurnEventNodeVisited.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
/** MessageOutputDebugTurnEventTurnEventNodeVisited. */
1616
public class MessageOutputDebugTurnEventTurnEventNodeVisited extends MessageOutputDebugTurnEvent {
1717

18+
private TurnEventNodeSource source;
19+
1820
/** The reason the dialog node was visited. */
1921
public interface Reason {
2022
/** welcome. */
@@ -30,4 +32,13 @@ public interface Reason {
3032
/** jump. */
3133
String JUMP = "jump";
3234
}
35+
36+
/**
37+
* Gets the source.
38+
*
39+
* @return the source
40+
*/
41+
public TurnEventNodeSource getSource() {
42+
return source;
43+
}
3344
}

assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEventTurnEventSearch.java

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,26 @@
1313
package com.ibm.watson.assistant.v2.model;
1414

1515
/** MessageOutputDebugTurnEventTurnEventSearch. */
16-
public class MessageOutputDebugTurnEventTurnEventSearch extends MessageOutputDebugTurnEvent {}
16+
public class MessageOutputDebugTurnEventTurnEventSearch extends MessageOutputDebugTurnEvent {
17+
18+
private TurnEventActionSource source;
19+
private TurnEventSearchError error;
20+
21+
/**
22+
* Gets the source.
23+
*
24+
* @return the source
25+
*/
26+
public TurnEventActionSource getSource() {
27+
return source;
28+
}
29+
30+
/**
31+
* Gets the error.
32+
*
33+
* @return the error
34+
*/
35+
public TurnEventSearchError getError() {
36+
return error;
37+
}
38+
}

assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEventTurnEventStepAnswered.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
/** MessageOutputDebugTurnEventTurnEventStepAnswered. */
1616
public class MessageOutputDebugTurnEventTurnEventStepAnswered extends MessageOutputDebugTurnEvent {
1717

18+
private TurnEventActionSource source;
1819
/** The type of condition (if any) that is defined for the action. */
1920
public interface ConditionType {
2021
/** user_defined. */
@@ -24,4 +25,13 @@ public interface ConditionType {
2425
/** anything_else. */
2526
String ANYTHING_ELSE = "anything_else";
2627
}
28+
29+
/**
30+
* Gets the source.
31+
*
32+
* @return the source
33+
*/
34+
public TurnEventActionSource getSource() {
35+
return source;
36+
}
2737
}

assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageOutputDebugTurnEventTurnEventStepVisited.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
/** MessageOutputDebugTurnEventTurnEventStepVisited. */
1616
public class MessageOutputDebugTurnEventTurnEventStepVisited extends MessageOutputDebugTurnEvent {
1717

18+
private TurnEventActionSource source;
19+
1820
/** The type of condition (if any) that is defined for the action. */
1921
public interface ConditionType {
2022
/** user_defined. */
@@ -24,4 +26,13 @@ public interface ConditionType {
2426
/** anything_else. */
2527
String ANYTHING_ELSE = "anything_else";
2628
}
29+
30+
/**
31+
* Gets the source.
32+
*
33+
* @return the source
34+
*/
35+
public TurnEventActionSource getSource() {
36+
return source;
37+
}
2738
}

assistant/src/main/java/com/ibm/watson/assistant/v2/model/SkillReference.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ public String getSnapshot() {
8787
/**
8888
* Gets the skillReference.
8989
*
90-
* <p>The type of skill identified by the skill reference.
90+
* <p>The type of skill identified by the skill reference. The possible values are `main skill`
91+
* (for a dialog skill), `actions skill`, and `search skill`.
9192
*
9293
* @return the skillReference
9394
*/

0 commit comments

Comments
 (0)