Skip to content

Commit 300638a

Browse files
mediumTajmediumTaj
committed
increase timeout in visual recognition getclassifiers, debugging retrieveandrank unit test
1 parent 0cc3be2 commit 300638a

File tree

5 files changed

+54
-25
lines changed

5 files changed

+54
-25
lines changed

‎Examples/ServiceExamples/ServiceExamples.unity‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Transform:
124124
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
125125
m_Children: []
126126
m_Father: {fileID: 0}
127-
m_RootOrder: 9
127+
m_RootOrder: 10
128128
--- !u!1 &525603453
129129
GameObject:
130130
m_ObjectHideFlags: 0
@@ -140,7 +140,7 @@ GameObject:
140140
m_Icon: {fileID: 0}
141141
m_NavMeshLayer: 0
142142
m_StaticEditorFlags: 0
143-
m_IsActive: 1
143+
m_IsActive: 0
144144
--- !u!114 &525603454
145145
MonoBehaviour:
146146
m_ObjectHideFlags: 0
@@ -180,7 +180,7 @@ GameObject:
180180
m_Icon: {fileID: 0}
181181
m_NavMeshLayer: 0
182182
m_StaticEditorFlags: 0
183-
m_IsActive: 1
183+
m_IsActive: 0
184184
--- !u!114 &659829312
185185
MonoBehaviour:
186186
m_ObjectHideFlags: 0
@@ -204,7 +204,7 @@ Transform:
204204
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
205205
m_Children: []
206206
m_Father: {fileID: 0}
207-
m_RootOrder: 12
207+
m_RootOrder: 13
208208
--- !u!1 &725710367
209209
GameObject:
210210
m_ObjectHideFlags: 0
@@ -291,7 +291,7 @@ Transform:
291291
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
292292
m_Children: []
293293
m_Father: {fileID: 0}
294-
m_RootOrder: 6
294+
m_RootOrder: 7
295295
--- !u!1 &748186939
296296
GameObject:
297297
m_ObjectHideFlags: 0
@@ -331,7 +331,7 @@ Transform:
331331
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
332332
m_Children: []
333333
m_Father: {fileID: 0}
334-
m_RootOrder: 11
334+
m_RootOrder: 12
335335
--- !u!1 &859102722
336336
GameObject:
337337
m_ObjectHideFlags: 0
@@ -387,7 +387,7 @@ GameObject:
387387
m_Icon: {fileID: 0}
388388
m_NavMeshLayer: 0
389389
m_StaticEditorFlags: 0
390-
m_IsActive: 1
390+
m_IsActive: 0
391391
--- !u!114 &1053617510
392392
MonoBehaviour:
393393
m_ObjectHideFlags: 0
@@ -411,7 +411,7 @@ Transform:
411411
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
412412
m_Children: []
413413
m_Father: {fileID: 0}
414-
m_RootOrder: 12
414+
m_RootOrder: 14
415415
--- !u!1 &1073418922
416416
GameObject:
417417
m_ObjectHideFlags: 0
@@ -451,7 +451,7 @@ Transform:
451451
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
452452
m_Children: []
453453
m_Father: {fileID: 0}
454-
m_RootOrder: 7
454+
m_RootOrder: 8
455455
--- !u!1 &1160237478
456456
GameObject:
457457
m_ObjectHideFlags: 0
@@ -548,7 +548,7 @@ GameObject:
548548
m_Icon: {fileID: 0}
549549
m_NavMeshLayer: 0
550550
m_StaticEditorFlags: 0
551-
m_IsActive: 1
551+
m_IsActive: 0
552552
--- !u!114 &1310649319
553553
MonoBehaviour:
554554
m_ObjectHideFlags: 0
@@ -572,7 +572,7 @@ Transform:
572572
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
573573
m_Children: []
574574
m_Father: {fileID: 0}
575-
m_RootOrder: 12
575+
m_RootOrder: 15
576576
--- !u!1 &1713392457
577577
GameObject:
578578
m_ObjectHideFlags: 0
@@ -588,7 +588,7 @@ GameObject:
588588
m_Icon: {fileID: 0}
589589
m_NavMeshLayer: 0
590590
m_StaticEditorFlags: 0
591-
m_IsActive: 0
591+
m_IsActive: 1
592592
--- !u!114 &1713392458
593593
MonoBehaviour:
594594
m_ObjectHideFlags: 0
@@ -612,7 +612,7 @@ Transform:
612612
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
613613
m_Children: []
614614
m_Father: {fileID: 0}
615-
m_RootOrder: 8
615+
m_RootOrder: 9
616616
--- !u!1 &1740459831
617617
GameObject:
618618
m_ObjectHideFlags: 0
@@ -668,7 +668,7 @@ GameObject:
668668
m_Icon: {fileID: 0}
669669
m_NavMeshLayer: 0
670670
m_StaticEditorFlags: 0
671-
m_IsActive: 1
671+
m_IsActive: 0
672672
--- !u!114 &1937656528
673673
MonoBehaviour:
674674
m_ObjectHideFlags: 0
@@ -692,7 +692,7 @@ Transform:
692692
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
693693
m_Children: []
694694
m_Father: {fileID: 0}
695-
m_RootOrder: 5
695+
m_RootOrder: 6
696696
--- !u!1 &1979050314
697697
GameObject:
698698
m_ObjectHideFlags: 0
@@ -772,4 +772,4 @@ Transform:
772772
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
773773
m_Children: []
774774
m_Father: {fileID: 0}
775-
m_RootOrder: 10
775+
m_RootOrder: 11

‎Scripts/Connection/RESTConnector.cs‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
// uncomment to enable debugging
19-
//#define ENABLE_DEBUGGING
19+
#define ENABLE_DEBUGGING
2020

2121
using IBM.Watson.DeveloperCloud.Utilities;
2222
using IBM.Watson.DeveloperCloud.Logging;
@@ -489,6 +489,11 @@ private IEnumerator ProcessRequestQueue()
489489
}
490490
else
491491
{
492+
493+
#if ENABLE_DEBUGGING
494+
Log.Debug("RESTConnector", "Delete Request URL: {0}", url);
495+
#endif
496+
492497
#if UNITY_EDITOR
493498
float timeout = Mathf.Max(Config.Instance.TimeOut, req.Timeout);
494499

@@ -507,6 +512,7 @@ private IEnumerator ProcessRequestQueue()
507512
continue;
508513

509514
resp.Success = deleteReq.Success;
515+
510516
#else
511517
Log.Warning( "RESTConnector", "DELETE method is supported in the editor only." );
512518
resp.Success = false;
@@ -530,8 +536,13 @@ private class DeleteRequest
530536
public bool IsComplete { get; set; }
531537
public bool Success { get; set; }
532538

539+
private Thread m_Thread = null;
540+
533541
public bool Send(string url, Dictionary<string, string> headers)
534542
{
543+
#if ENABLE_DEBUGGING
544+
Log.Debug("RESTConnector", "DeleteRequest, Send: {0}, m_Thread:{1}", url, m_Thread);
545+
#endif
535546
if (m_Thread != null && m_Thread.IsAlive)
536547
return false;
537548

@@ -544,24 +555,37 @@ public bool Send(string url, Dictionary<string, string> headers)
544555
}
545556

546557
m_Thread = new Thread(ProcessRequest);
558+
547559
m_Thread.Start();
548560
return true;
549561
}
550-
551-
private Thread m_Thread = null;
552-
562+
553563
private void ProcessRequest()
554564
{
555565
// This fixes the exception thrown by self-signed certificates.
556566
ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(delegate { return true; });
557567

568+
#if ENABLE_DEBUGGING
569+
Log.Debug("RESTConnector", "DeleteRequest, ProcessRequest {0}", URL);
570+
#endif
571+
558572
WebRequest deleteReq = WebRequest.Create(URL);
573+
559574
foreach (var kp in Headers)
560575
deleteReq.Headers.Add(kp.Key, kp.Value);
561576
deleteReq.Method = "DELETE";
562577

578+
#if ENABLE_DEBUGGING
579+
Log.Debug("RESTConnector", "DeleteRequest, sending deletereq {0}", deleteReq);
580+
#endif
563581
HttpWebResponse deleteResp = deleteReq.GetResponse() as HttpWebResponse;
582+
#if ENABLE_DEBUGGING
583+
Log.Debug("RESTConnector", "DELETE Request SENT: {0}", URL);
584+
#endif
564585
Success = deleteResp.StatusCode == HttpStatusCode.OK;
586+
#if ENABLE_DEBUGGING
587+
Log.Debug("RESTConnector", "DELETE Request COMPLETE: {0}", URL);
588+
#endif
565589
IsComplete = true;
566590
}
567591
};

‎Scripts/Services/RetrieveAndRank/RetrieveAndRank.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,12 +267,12 @@ private void OnCreateClusterResponse(RESTConnector.Request req, RESTConnector.Re
267267
req.ClusterID = clusterID;
268268
req.Delete = true;
269269
req.Timeout = REQUEST_TIMEOUT;
270-
271-
RESTConnector connector = RESTConnector.GetConnector(SERVICE_ID, string.Format(SERVICE_CLUSTER, clusterID));
270+
req.OnResponse = OnDeleteClusterResponse;
271+
string service = string.Format(SERVICE_CLUSTER, clusterID);
272+
RESTConnector connector = RESTConnector.GetConnector(SERVICE_ID, service);
272273
if (connector == null)
273274
return false;
274-
275-
req.OnResponse = OnDeleteClusterResponse;
275+
276276
return connector.Send(req);
277277
}
278278

@@ -293,6 +293,7 @@ public class DeleteClusterRequest : RESTConnector.Request
293293
/// <param name="resp"></param>
294294
private void OnDeleteClusterResponse(RESTConnector.Request req, RESTConnector.Response resp)
295295
{
296+
Log.Debug("RetrieveAndRank", "OnDeleteClusterResponse!!");
296297
if (((DeleteClusterRequest)req).Callback != null)
297298
((DeleteClusterRequest)req).Callback(resp.Success, ((DeleteClusterRequest)req).Data);
298299
}

‎Scripts/Services/VisualRecognition/VisualRecognition.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,7 @@ public bool GetClassifiers(OnGetClassifiers callback)
610610
req.Callback = callback;
611611
req.Parameters["api_key"] = mp_ApiKey;
612612
req.Parameters["version"] = VisualRecognitionVersion.Version;
613+
req.Timeout = 10.0f * 60.0f;
613614
req.OnResponse = OnGetClassifiersResp;
614615

615616
return connector.Send(req);

‎Scripts/UnitTests/TestRetrieveAndRank.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,15 @@ public override IEnumerator RunTest()
201201
m_RetrieveAndRank.DeleteClusterConfig(OnDeleteClusterConfig, IsFullTest ? m_CreatedClusterID : m_ExampleClusterID, m_ConfigToCreateName);
202202
while (!m_DeleteClusterConfigTested)
203203
yield return null;
204-
204+
205+
yield return new WaitForSeconds(10f);
206+
205207
// Delete cluster
206208
Log.Debug("TestRetrieveAndRank", "*** Attempting to delete cluster {0}!", m_CreatedClusterID);
207209
m_RetrieveAndRank.DeleteCluster(OnDeleteCluster, m_CreatedClusterID);
208210
while (!m_DeleteClusterTested)
209211
yield return null;
212+
210213
yield break;
211214
}
212215

0 commit comments

Comments
 (0)