Merge pull request #579 from watson-developer-cloud/feat/icp4d-support

mamoonraja · web-flow · commit e9954ef963ab · 2019-06-26T09:58:55.000-04:00
feat(icp4d): add support for icp4d
diff --git a/README.md b/README.md
@@ -451,6 +451,48 @@ void Example()
 }
 ```
 
+## IBM Cloud Pak for Data(ICP4D)
+If your service instance is of ICP4D, below are two ways of initializing the assistant service.
+
+#### 1) Supplying the `username`, `password`, `icp4d_url` and `authentication_type`
+
+The SDK will manage the token for the user
+
+```cs
+    Icp4dTokenOptions tokenOptions = new Icp4dTokenOptions()
+    {
+        Username = "<username>",
+        Password = "<password>",
+        Url = "<icp4dUrl>",
+        DisableSslVerification = true
+    };
+    credentials = new Credentials(tokenOptions, "<serviceUrl>");
+    while(!credentials.HasTokenData())
+    {
+        yield return null;
+    }
+    service = new AssistantService(versionDate, credentials);
+```
+
+#### 2) Supplying the access token
+
+```cs
+    Icp4dTokenOptions tokenOptions = new Icp4dTokenOptions()
+    {
+        Username = "<username>",
+        Password = "<password>",
+        Url = "<icp4dUrl>",
+        AccessToken = "<accessToken>",
+        DisableSslVerification = true
+    };
+    credentials = new Credentials(tokenOptions, "<serviceUrl>");
+    while(!credentials.HasTokenData())
+    {
+        yield return null;
+    }
+    service = new AssistantService(versionDate, credentials);
+```
+
 ## IBM Cloud Private
 The Watson Unity SDK does not support IBM Cloud Private because connection via proxy is not supported in UnityWebRequest. 
 
diff --git a/Scripts/Services/Assistant/V1/AssistantService.cs b/Scripts/Services/Assistant/V1/AssistantService.cs
@@ -111,7 +111,7 @@ public AssistantService(string versionDate, Credentials credentials) : base(vers
                 VersionDate = versionDate;
             }
 
-            if (credentials.HasCredentials() || credentials.HasIamTokenData())
+            if (credentials.HasCredentials() || credentials.HasTokenData())
             {
                 Credentials = credentials;
 
diff --git a/Scripts/Services/Assistant/V2/AssistantService.cs b/Scripts/Services/Assistant/V2/AssistantService.cs
@@ -111,7 +111,7 @@ public AssistantService(string versionDate, Credentials credentials) : base(vers
                 VersionDate = versionDate;
             }
 
-            if (credentials.HasCredentials() || credentials.HasIamTokenData())
+            if (credentials.HasCredentials() || credentials.HasTokenData())
             {
                 Credentials = credentials;
 
diff --git a/Scripts/Services/CompareComply/V1/CompareComplyService.cs b/Scripts/Services/CompareComply/V1/CompareComplyService.cs
@@ -111,7 +111,7 @@ public CompareComplyService(string versionDate, Credentials credentials) : base(
                 VersionDate = versionDate;
             }
 
-            if (credentials.HasCredentials() || credentials.HasIamTokenData())
+            if (credentials.HasCredentials() || credentials.HasTokenData())
             {
                 Credentials = credentials;
 
diff --git a/Scripts/Services/Discovery/V1/DiscoveryService.cs b/Scripts/Services/Discovery/V1/DiscoveryService.cs
@@ -111,7 +111,7 @@ public DiscoveryService(string versionDate, Credentials credentials) : base(vers
                 VersionDate = versionDate;
             }
 
-            if (credentials.HasCredentials() || credentials.HasIamTokenData())
+            if (credentials.HasCredentials() || credentials.HasTokenData())
             {
                 Credentials = credentials;
 
diff --git a/Scripts/Services/LanguageTranslator/V3/LanguageTranslatorService.cs b/Scripts/Services/LanguageTranslator/V3/LanguageTranslatorService.cs
@@ -111,7 +111,7 @@ public LanguageTranslatorService(string versionDate, Credentials credentials) :
                 VersionDate = versionDate;
             }
 
-            if (credentials.HasCredentials() || credentials.HasIamTokenData())
+            if (credentials.HasCredentials() || credentials.HasTokenData())
             {
                 Credentials = credentials;
 
diff --git a/Scripts/Services/NaturalLanguageClassifier/V1/NaturalLanguageClassifierService.cs b/Scripts/Services/NaturalLanguageClassifier/V1/NaturalLanguageClassifierService.cs
@@ -93,7 +93,7 @@ public NaturalLanguageClassifierService() : base(serviceId)
         /// <param name="credentials">The service credentials.</param>
         public NaturalLanguageClassifierService(Credentials credentials) : base(credentials, serviceId)
         {
-            if (credentials.HasCredentials() || credentials.HasIamTokenData())
+            if (credentials.HasCredentials() || credentials.HasTokenData())
             {
                 Credentials = credentials;
 
diff --git a/Scripts/Services/NaturalLanguageUnderstanding/V1/NaturalLanguageUnderstandingService.cs b/Scripts/Services/NaturalLanguageUnderstanding/V1/NaturalLanguageUnderstandingService.cs
@@ -111,7 +111,7 @@ public NaturalLanguageUnderstandingService(string versionDate, Credentials crede
                 VersionDate = versionDate;
             }
 
-            if (credentials.HasCredentials() || credentials.HasIamTokenData())
+            if (credentials.HasCredentials() || credentials.HasTokenData())
             {
                 Credentials = credentials;
 
diff --git a/Scripts/Services/PersonalityInsights/V3/PersonalityInsightsService.cs b/Scripts/Services/PersonalityInsights/V3/PersonalityInsightsService.cs
@@ -111,7 +111,7 @@ public PersonalityInsightsService(string versionDate, Credentials credentials) :
                 VersionDate = versionDate;
             }
 
-            if (credentials.HasCredentials() || credentials.HasIamTokenData())
+            if (credentials.HasCredentials() || credentials.HasTokenData())
             {
                 Credentials = credentials;
 
diff --git a/Scripts/Services/SpeechToText/V1/Model/TrainingResponse.cs b/Scripts/Services/SpeechToText/V1/Model/TrainingResponse.cs
diff --git a/Scripts/Services/SpeechToText/V1/Model/TrainingResponse.cs.meta b/Scripts/Services/SpeechToText/V1/Model/TrainingResponse.cs.meta
diff --git a/Scripts/Services/SpeechToText/V1/Model/TrainingWarning.cs b/Scripts/Services/SpeechToText/V1/Model/TrainingWarning.cs
diff --git a/Scripts/Services/SpeechToText/V1/Model/TrainingWarning.cs.meta b/Scripts/Services/SpeechToText/V1/Model/TrainingWarning.cs.meta
diff --git a/Scripts/Services/SpeechToText/V1/SpeechToTextService.cs b/Scripts/Services/SpeechToText/V1/SpeechToTextService.cs
@@ -1941,7 +1941,7 @@ public bool TrainLanguageModel(Callback<object> callback, string customizationId
 
         private void OnTrainLanguageModelResponse(RESTConnector.Request req, RESTConnector.Response resp)
         {
-            DetailedResponse<TrainingResponse> response = new DetailedResponse<TrainingResponse>();
+            DetailedResponse<object> response = new DetailedResponse<object>();
             foreach (KeyValuePair<string, string> kvp in resp.Headers)
             {
                 response.Headers.Add(kvp.Key, kvp.Value);
@@ -1951,7 +1951,7 @@ private void OnTrainLanguageModelResponse(RESTConnector.Request req, RESTConnect
             try
             {
                 string json = Encoding.UTF8.GetString(resp.Data);
-                response.Result = JsonConvert.DeserializeObject<TrainingResponse>(json);
+                response.Result = JsonConvert.DeserializeObject<object>(json);
                 response.Response = json;
             }
             catch (Exception e)
@@ -1960,8 +1960,8 @@ private void OnTrainLanguageModelResponse(RESTConnector.Request req, RESTConnect
                 resp.Success = false;
             }
 
-            if (((RequestObject<TrainingResponse>)req).Callback != null)
-                ((RequestObject<TrainingResponse>)req).Callback(response, resp.Error);
+            if (((RequestObject<object>)req).Callback != null)
+                ((RequestObject<object>)req).Callback(response, resp.Error);
         }
         /// <summary>
         /// Reset a custom language model.
@@ -3848,7 +3848,7 @@ public bool TrainAcousticModel(Callback<object> callback, string customizationId
 
         private void OnTrainAcousticModelResponse(RESTConnector.Request req, RESTConnector.Response resp)
         {
-            DetailedResponse<TrainingResponse> response = new DetailedResponse<TrainingResponse>();
+            DetailedResponse<object> response = new DetailedResponse<object>();
             foreach (KeyValuePair<string, string> kvp in resp.Headers)
             {
                 response.Headers.Add(kvp.Key, kvp.Value);
@@ -3858,7 +3858,7 @@ private void OnTrainAcousticModelResponse(RESTConnector.Request req, RESTConnect
             try
             {
                 string json = Encoding.UTF8.GetString(resp.Data);
-                response.Result = JsonConvert.DeserializeObject<TrainingResponse>(json);
+                response.Result = JsonConvert.DeserializeObject<object>(json);
                 response.Response = json;
             }
             catch (Exception e)
@@ -3867,8 +3867,8 @@ private void OnTrainAcousticModelResponse(RESTConnector.Request req, RESTConnect
                 resp.Success = false;
             }
 
-            if (((RequestObject<TrainingResponse>)req).Callback != null)
-                ((RequestObject<TrainingResponse>)req).Callback(response, resp.Error);
+            if (((RequestObject<object>)req).Callback != null)
+                ((RequestObject<object>)req).Callback(response, resp.Error);
         }
         /// <summary>
         /// Reset a custom acoustic model.
diff --git a/Scripts/Services/TextToSpeech/V1/TextToSpeechService.cs b/Scripts/Services/TextToSpeech/V1/TextToSpeechService.cs
@@ -93,7 +93,7 @@ public TextToSpeechService() : base(serviceId)
         /// <param name="credentials">The service credentials.</param>
         public TextToSpeechService(Credentials credentials) : base(credentials, serviceId)
         {
-            if (credentials.HasCredentials() || credentials.HasIamTokenData())
+            if (credentials.HasCredentials() || credentials.HasTokenData())
             {
                 Credentials = credentials;
 
diff --git a/Scripts/Services/ToneAnalyzer/V3/ToneAnalyzerService.cs b/Scripts/Services/ToneAnalyzer/V3/ToneAnalyzerService.cs
@@ -111,7 +111,7 @@ public ToneAnalyzerService(string versionDate, Credentials credentials) : base(v
                 VersionDate = versionDate;
             }
 
-            if (credentials.HasCredentials() || credentials.HasIamTokenData())
+            if (credentials.HasCredentials() || credentials.HasTokenData())
             {
                 Credentials = credentials;
 
diff --git a/Scripts/Services/VisualRecognition/V3/VisualRecognitionService.cs b/Scripts/Services/VisualRecognition/V3/VisualRecognitionService.cs
@@ -110,7 +110,7 @@ public VisualRecognitionService(string versionDate, Credentials credentials) : b
                 VersionDate = versionDate;
             }
 
-            if (credentials.HasCredentials() || credentials.HasIamTokenData())
+            if (credentials.HasCredentials() || credentials.HasTokenData())
             {
                 Credentials = credentials;
 

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public AssistantService(string versionDate, Credentials credentials) : base(vers`
`111`	`111`	`VersionDate = versionDate;`
`112`	`112`	`}`
`113`	`113`
`114`		`- if (credentials.HasCredentials() \|\| credentials.HasIamTokenData())`
	`114`	`+ if (credentials.HasCredentials() \|\| credentials.HasTokenData())`
`115`	`115`	`{`
`116`	`116`	`Credentials = credentials;`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public CompareComplyService(string versionDate, Credentials credentials) : base(`
`111`	`111`	`VersionDate = versionDate;`
`112`	`112`	`}`
`113`	`113`
`114`		`- if (credentials.HasCredentials() \|\| credentials.HasIamTokenData())`
	`114`	`+ if (credentials.HasCredentials() \|\| credentials.HasTokenData())`
`115`	`115`	`{`
`116`	`116`	`Credentials = credentials;`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public DiscoveryService(string versionDate, Credentials credentials) : base(vers`
`111`	`111`	`VersionDate = versionDate;`
`112`	`112`	`}`
`113`	`113`
`114`		`- if (credentials.HasCredentials() \|\| credentials.HasIamTokenData())`
	`114`	`+ if (credentials.HasCredentials() \|\| credentials.HasTokenData())`
`115`	`115`	`{`
`116`	`116`	`Credentials = credentials;`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public LanguageTranslatorService(string versionDate, Credentials credentials) :`
`111`	`111`	`VersionDate = versionDate;`
`112`	`112`	`}`
`113`	`113`
`114`		`- if (credentials.HasCredentials() \|\| credentials.HasIamTokenData())`
	`114`	`+ if (credentials.HasCredentials() \|\| credentials.HasTokenData())`
`115`	`115`	`{`
`116`	`116`	`Credentials = credentials;`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public NaturalLanguageClassifierService() : base(serviceId)`
`93`	`93`	`/// <param name="credentials">The service credentials.</param>`
`94`	`94`	`public NaturalLanguageClassifierService(Credentials credentials) : base(credentials, serviceId)`
`95`	`95`	`{`
`96`		`- if (credentials.HasCredentials() \|\| credentials.HasIamTokenData())`
	`96`	`+ if (credentials.HasCredentials() \|\| credentials.HasTokenData())`
`97`	`97`	`{`
`98`	`98`	`Credentials = credentials;`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public NaturalLanguageUnderstandingService(string versionDate, Credentials crede`
`111`	`111`	`VersionDate = versionDate;`
`112`	`112`	`}`
`113`	`113`
`114`		`- if (credentials.HasCredentials() \|\| credentials.HasIamTokenData())`
	`114`	`+ if (credentials.HasCredentials() \|\| credentials.HasTokenData())`
`115`	`115`	`{`
`116`	`116`	`Credentials = credentials;`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public PersonalityInsightsService(string versionDate, Credentials credentials) :`
`111`	`111`	`VersionDate = versionDate;`
`112`	`112`	`}`
`113`	`113`
`114`		`- if (credentials.HasCredentials() \|\| credentials.HasIamTokenData())`
	`114`	`+ if (credentials.HasCredentials() \|\| credentials.HasTokenData())`
`115`	`115`	`{`
`116`	`116`	`Credentials = credentials;`
`117`	`117`