* NaturalLanguageClassifier & DIalog now do more extensive testing to verify the service is up and running.

* TODO: Need to add the concept of a deep/shallow check for the service status checks.

Author: Richard Lyle

Scripts/Services/Dialog/Dialog.cs

@@ -452,20 +452,53 @@ private class CheckServiceStatus
         {
             private Dialog m_Service = null;
             private ServiceStatus m_Callback = null;
+            private int m_DialogCount = 0;
 
             public CheckServiceStatus( Dialog service, ServiceStatus callback )
             {
                 m_Service = service;
                 m_Callback = callback;
 
                 if (! m_Service.GetDialogs( OnGetDialogs ) )
-                    m_Callback( SERVICE_ID, false );
+                    OnFailure( "Failed to invoke GetDialogs()." );
             }
 
             private void OnGetDialogs( Dialogs dialogs )
             {
-                if ( m_Callback != null ) 
-                    m_Callback( SERVICE_ID, dialogs != null );
+                if ( m_Callback != null )
+                {
+                    foreach( var dialog in dialogs.dialogs )
+                    {
+                        if (! m_Service.Converse( dialog.dialog_id, "Hello", OnDialog ) )
+                            OnFailure( "Failed to invoke Converse()." );
+                        else
+                            m_DialogCount += 1;
+                    }
+                }
+                else
+                    OnFailure( "GetDialogs() failed." );
+            }
+
+            private void OnDialog( ConverseResponse resp )
+            {
+                if ( m_DialogCount > 0 )
+                {
+                    m_DialogCount -= 1;
+                    if ( resp != null )
+                    {
+                        if ( m_DialogCount == 0 )
+                            m_Callback( SERVICE_ID, true );
+                    }
+                    else
+                        OnFailure( "ConverseResponse is null." );
+                }
+            }
+
+            private void OnFailure(string msg)
+            {
+                Log.Error("NaturalLanguageClassifier", msg);
+                m_Callback(SERVICE_ID, false);
+                m_DialogCount = 0;
             }
         };
         #endregion

Scripts/Services/NaturalLanguageClassifier/NaturalLanguageClassifier.cs

@@ -504,14 +504,16 @@ private class CheckServiceStatus
         {
             private NaturalLanguageClassifier m_Service = null;
             private ServiceStatus m_Callback = null;
+            private int m_GetClassifierCount = 0;
+            private int m_ClassifyCount = 0;
 
             public CheckServiceStatus( NaturalLanguageClassifier service, ServiceStatus callback )
             {
                 m_Service = service;
                 m_Callback = callback;
 
                 if (! m_Service.GetClassifiers( OnCheckServices ) )
-                    m_Callback( SERVICE_ID, false );
+                    OnFailure( "Failed to call GetClassifiers()" );
             }
 
             private void OnCheckServices( Classifiers classifiers )
@@ -520,9 +522,17 @@ private void OnCheckServices( Classifiers classifiers )
                 {
                     if ( classifiers.classifiers.Length > 0 )
                     {
-                        // check the status of one classifier, if it's listed as "Unavailable" then fail 
-                        if (! m_Service.GetClassifier( classifiers.classifiers[0].classifier_id, OnCheckService ) )
-                            m_Callback( SERVICE_ID, false );
+                        foreach( var classifier in classifiers.classifiers )
+                        {
+                            // check the status of one classifier, if it's listed as "Unavailable" then fail 
+                            if (! m_Service.GetClassifier( classifier.classifier_id, OnCheckService ) )
+                            {
+                                OnFailure( "Failed to call GetClassifier()" );
+                                break;
+                            }
+                            else
+                                m_GetClassifierCount += 1;
+                        }
                     }
                     else
                         m_Callback( SERVICE_ID, true );     // no classifiers to check, just return success then..
@@ -533,26 +543,53 @@ private void OnCheckServices( Classifiers classifiers )
 
             private void OnCheckService( Classifier classifier )
             {
-                if ( classifier != null )
+                if ( m_GetClassifierCount > 0 )
                 {
-                    if ( classifier.status == "Unavailable" || classifier.status == "Failed" )
+                    m_GetClassifierCount -= 1;
+                    if ( classifier != null )
                     {
-                        Log.Error( "NaturalLanguageClassifier", "Status of classifier {0} came back as {1}.", 
-                            classifier.classifier_id, classifier.status );
-                        m_Callback( SERVICE_ID, false );
+                        if ( classifier.status == "Unavailable" || classifier.status == "Failed" )
+                        {
+                            OnFailure( string.Format("Status of classifier {0} came back as {1}.", 
+                                classifier.classifier_id, classifier.status) );
+                        }
+                        else
+                        {
+                            // try to classify something with this classifier..
+                            if (! m_Service.Classify( classifier.classifier_id, "Hello World", OnClassify ) )
+                                OnFailure( "Failed to invoke Classify" );
+                            else
+                                m_ClassifyCount += 1;
+                        }
                     }
                     else
-                    {
-                        m_Callback( SERVICE_ID, true );
-                    }
+                        OnFailure( "Failed to get classifier." );
                 }
-                else
+            }
+
+            private void OnClassify( ClassifyResult result )
+            {
+                if ( m_ClassifyCount > 0 )
                 {
-                    Log.Error( "NaturalLanguageClassifier", "Failed to get classifier." );
-                    m_Callback( SERVICE_ID, false );
+                    m_ClassifyCount -= 1;
+                    if ( result != null )
+                    {
+                        // success!
+                        if ( m_ClassifyCount == 0 )
+                            m_Callback(SERVICE_ID, true);
+                    }
+                    else
+                        OnFailure( "Failed to classify." );
                 }
             }
 
+            void OnFailure( string msg )
+            {
+                Log.Error( "NaturalLanguageClassifier", msg );
+                m_Callback(SERVICE_ID, false);
+                m_GetClassifierCount = m_ClassifyCount = 0;
+            }
+
         };
         #endregion
     }