Merge pull request #8 from modzy/v0.5routes_update

V0.5routes update

Author: raul-casallas

src/job-client.js

@@ -125,6 +125,7 @@ class JobClient{
             .then(
                 ( response )=>{
                     logger.info(`submitJob(${job.model.identifier}, ${job.model.version}) :: ${response.status} ${response.statusText}`);
+                    response.data.status = "SUBMITTED"; 
                     return response.data;
                 }
             )

src/model-client.js

@@ -343,7 +343,7 @@ class ModelClient{
 	 * @return {String} A json string with the output sample
 	 * @throws {ApiError} Error if there is something wrong with the service or the call
 	 */
-    getModelVersionInputSample(modelId, versionId){
+    getModelVersionOutputSample(modelId, versionId){
         const requestURL = `${this.baseURL}/${modelId}/versions/${versionId}/sample-output`;
         logger.debug(`getModelVersionOutputSample(${modelId}, ${versionId}) GET ${requestURL}`);
         return axios.get(

src/modzy-client.js

@@ -283,27 +283,31 @@ class ModzyClient {
 	 */
 	blockUntilComplete(job) {
 		logger.debug(`blockUntilComplete(${job.jobIdentifier}}) :: ${job.status}`);
-		return this.jobClient.getJob(job.jobIdentifier)
-			.then(
-				(updatedJob) => {
-					if (updatedJob.status === "SUBMITTED" || updatedJob.status === "IN_PROGRESS") {
-						return new Promise(
-							(resolve, reject) => {
-								setTimeout(
-									() => {
-										resolve(
-											this.blockUntilComplete(updatedJob)
-										);
-									},
-									20000
-								);
-							}
-						);
-					}
-					logger.debug(`blockUntilComplete(${updatedJob.jobIdentifier}}) :: returning :: ${updatedJob.status}`);
-					return updatedJob;
-				}
-			)
+		return new Promise(
+			(resolve, reject) => {
+				setTimeout(
+					() => {
+						this.jobClient.getJob(job.jobIdentifier)
+							.then(
+								(updatedJob) => {
+									if (updatedJob.status === "SUBMITTED" || updatedJob.status === "IN_PROGRESS") {
+										resolve(this.blockUntilComplete(updatedJob));
+									}
+									logger.debug(`blockUntilComplete(${updatedJob.jobIdentifier}}) :: returning :: ${updatedJob.status}`);
+									resolve(updatedJob);
+								}
+							)
+							.catch(
+								(error) => {
+									logger.error(error);
+									reject(error);
+								}
+							);
+					},
+					2000
+				);
+			}
+		);		
 	}
 
    /**

tests/job-client.test.js

@@ -115,9 +115,26 @@ test(
                 }
             )
             .then(
-                (jobIdentifier)=>{
-                    logger.debug(`testCancelJob :: canceling job :: ${jobIdentifier}`);
-                    return jobClient.cancelJob(jobIdentifier);
+                (jobIdentifier) => { 
+                    return new Promise(
+                        (resolve, reject) => {                            
+                            setTimeout(
+                                () => {                                    
+                                    resolve(jobClient.getJob(jobIdentifier));
+                                },
+                                5000
+                            );
+                        }
+                    );
+                }
+            )
+            .then(
+                (job)=>{
+                    if( job.status != "COMPLETED" ){
+                        logger.debug(`testCancelJob :: canceling job :: ${job.jobIdentifier}`);
+                        return jobClient.cancelJob(job.jobIdentifier);
+                    }                    
+                    return job;
                 }
             )
             .then(