Skip to content
Merged

4.0.0 #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4d2a36f
feat(regerate): regenerate services for pre-release
mamoonraja Aug 29, 2019
95d9505
test: update tests and examples to use new authenticator methods
mamoonraja Aug 29, 2019
82b99f8
build: add meta files
mamoonraja Aug 29, 2019
9b81639
docs: update bearer token example in readme
mamoonraja Aug 30, 2019
c20297f
Merge pull request #588 from watson-developer-cloud/feat/regenerate-p…
mediumTaj Aug 30, 2019
a6df1b8
feat(SetServiceUrl): provide setServiceUrl method and use serviceUrl …
mamoonraja Sep 16, 2019
66fcbf0
Merge pull request #591 from watson-developer-cloud/feat/service-url
mamoonraja Sep 17, 2019
1dcc5d2
feat(additionalProps): add support for dynamic additional properties …
mamoonraja Sep 18, 2019
eaec06c
feat(regenerate): regenerate services to include model and connector …
mamoonraja Sep 18, 2019
40a4ba4
test: update tests after regeneration
mamoonraja Sep 18, 2019
a499c63
Merge 4.0.0-rc2 into feat/dynamic-model
mamoonraja Sep 18, 2019
ad05c24
Merge pull request #594 from watson-developer-cloud/feat/dynamic-model
mamoonraja Sep 18, 2019
7fb1a52
Merge pull request #598 from watson-developer-cloud/4.0.0-rc2
mamoonraja Oct 3, 2019
b47e990
feat(VisualRecognitionV4): add support for visual recognition v4
mamoonraja Oct 3, 2019
3df4a99
test: add tests for visual recognition v4
mamoonraja Oct 3, 2019
2f220b8
feat(Examples): add examples for NLU, LT and Discovery
mamoonraja Oct 3, 2019
dc402cb
refactor(SpeechToText): move authentication to WSConnector
mamoonraja Oct 3, 2019
12194cf
feat: add meta file for vis rec v4
mamoonraja Oct 3, 2019
affd1f9
feat(regenerate): regenerate services using current api def
mamoonraja Oct 4, 2019
3f582d1
feat(Discovery): add suggested query to query response
mamoonraja Oct 4, 2019
4a86839
refactor: regenerate vis rec V4
mamoonraja Oct 4, 2019
7c1458f
docs: add migration guide for vis rec 4.0.0
mamoonraja Oct 4, 2019
0b658a6
Merge pull request #599 from watson-developer-cloud/4.0.0-rc3
mamoonraja Oct 4, 2019
690c2f5
Merge branch 'master' into 4.0.0-rc
mamoonraja Oct 4, 2019
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
13 changes: 9 additions & 4 deletions Examples/ExampleAssistantV1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
using UnityEngine;
using IBM.Watson.Assistant.V1;
using IBM.Cloud.SDK;
using IBM.Cloud.SDK.Authentication;
using IBM.Cloud.SDK.Authentication.Iam;
using IBM.Cloud.SDK.Utilities;
using IBM.Watson.Assistant.V1.Model;
using System;
Expand Down Expand Up @@ -104,12 +106,15 @@ private void Start()

private IEnumerator CreateService()
{
service = new AssistantService("2019-02-18");

// Wait for authorization token
while (!service.Credentials.HasIamTokenData())
IamAuthenticator authenticator = new IamAuthenticator(apikey: "{iamApikey}");

// Wait for tokendata
while (!authenticator.CanAuthenticate())
yield return null;

service = new AssistantService("2019-02-18", authenticator);

workspaceId = Environment.GetEnvironmentVariable("CONVERSATION_WORKSPACE_ID");
Runnable.Run(Examples());
}
Expand All @@ -118,7 +123,7 @@ private IEnumerator Examples()
{
// List Workspaces
Log.Debug("ExampleAssistantV1", "Attempting to ListWorkspaces...");
service.ListWorkspaces(callback: OnListWorkspaces, pageLimit: 1, includeCount: true, sort: "-name", includeAudit: true);
service.ListWorkspaces(callback: OnListWorkspaces, pageLimit: 1, sort: "-name", includeAudit: true);
while (!listWorkspacesTested)
yield return null;

Expand Down
16 changes: 5 additions & 11 deletions Examples/ExampleAssistantV2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

using System.Collections;
using IBM.Cloud.SDK;
using IBM.Cloud.SDK.Authentication;
using IBM.Cloud.SDK.Authentication.Iam;
using IBM.Cloud.SDK.Utilities;
using IBM.Watson.Assistant.V2;
using IBM.Watson.Assistant.V2.Model;
Expand Down Expand Up @@ -68,21 +70,13 @@ private IEnumerator CreateService()
}

// Create credential and instantiate service
Credentials credentials = null;

// Authenticate using iamApikey
TokenOptions tokenOptions = new TokenOptions()
{
IamApiKey = iamApikey
};

credentials = new Credentials(tokenOptions, serviceUrl);
IamAuthenticator authenticator = new IamAuthenticator(apikey: iamApikey);

// Wait for tokendata
while (!credentials.HasIamTokenData())
while (!authenticator.CanAuthenticate())
yield return null;

service = new AssistantService(versionDate, credentials);
service = new AssistantService(versionDate, authenticator);

Runnable.Run(Examples());
}
Expand Down
89 changes: 89 additions & 0 deletions Examples/ExampleDiscoveryV1.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
using IBM.Watson.Discovery.V1;
using IBM.Watson.Discovery.V1.Model;
using IBM.Cloud.SDK.Utilities;
using IBM.Cloud.SDK.Authentication;
using IBM.Cloud.SDK.Authentication.Iam;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using IBM.Cloud.SDK;

public class ExampleDiscoveryV1 : MonoBehaviour
{
#region PLEASE SET THESE VARIABLES IN THE INSPECTOR
[Space(10)]
[Tooltip("The IAM apikey.")]
[SerializeField]
private string iamApikey;
[Tooltip("The service URL (optional). This defaults to \"https://gateway.watsonplatform.net/discovery/api\"")]
[SerializeField]
private string serviceUrl;
[Tooltip("The version date with which you would like to use the service in the form YYYY-MM-DD.")]
[SerializeField]
private string versionDate;
#endregion

private DiscoveryService service;
// Start is called before the first frame update
void Start()
{
LogSystem.InstallDefaultReactors();
Runnable.Run(CreateService());
}

// Update is called once per frame
public IEnumerator CreateService()
{
if (string.IsNullOrEmpty(iamApikey))
{
throw new IBMException("Plesae provide IAM ApiKey for the service.");
}

// Create credential and instantiate service
IamAuthenticator authenticator = new IamAuthenticator(apikey: iamApikey);

// Wait for tokendata
while (!authenticator.CanAuthenticate())
yield return null;

service = new DiscoveryService(versionDate, authenticator);


Runnable.Run(ExampleCreateEnvironment());
Runnable.Run(ExampleListEnvironments());
}

private IEnumerator ExampleCreateEnvironment()
{
ModelEnvironment createEnvironmentResponse = null;
service.CreateEnvironment(
callback: (DetailedResponse<ModelEnvironment> response, IBMError error) =>
{
Log.Debug("DiscoveryServiceV1", "CreateEnvironment result: {0}", response.Response);
createEnvironmentResponse = response.Result;
// environmentId = createEnvironmentResponse.EnvironmentId;
},
name: "my_environment",
description: "My environment"
);

while (createEnvironmentResponse == null)
yield return null;
}

private IEnumerator ExampleListEnvironments()
{
Log.Debug("DiscoveryServiceV1", "ListEnvironments");
ListEnvironmentsResponse listEnvironmentsResponse = null;
service.ListEnvironments(
callback: (DetailedResponse<ListEnvironmentsResponse> response, IBMError error) =>
{
Log.Debug("DiscoveryServiceV1", "ListEnvironments result: {0}", response.Response);
listEnvironmentsResponse = response.Result;
}
);

while (listEnvironmentsResponse == null)
yield return null;
}
}
11 changes: 11 additions & 0 deletions Examples/ExampleDiscoveryV1.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

168 changes: 168 additions & 0 deletions Examples/ExampleDiscoveryV1.unity
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 11
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 1
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 256
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVRBounces: 2
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 2
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &444819960
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 444819963}
- component: {fileID: 444819961}
m_Layer: 0
m_Name: ExampleDiscoveryV1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &444819961
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 444819960}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c8cc5579d4a384f8ca87dccdf800981f, type: 3}
m_Name:
m_EditorClassIdentifier:
iamApikey: S
serviceUrl: S
versionDate: 2019-09-16
--- !u!4 &444819963
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 444819960}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7 changes: 7 additions & 0 deletions Examples/ExampleDiscoveryV1.unity.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading