diff --git a/Samples/customvision/customVisionImgClassify.js b/Samples/customvision/customVisionImgClassify.js index 050019a..083e79f 100644 --- a/Samples/customvision/customVisionImgClassify.js +++ b/Samples/customvision/customVisionImgClassify.js @@ -26,6 +26,9 @@ const predictionKey = process.env[predictionKeyVar]; // Add your Custom Vision endpoint to your environment variables. const endPoint = process.env['CUSTOM_VISION_ENDPOINT'] +const predictionResourceId = ""; +const publishIterationName = "classifyModel"; + const trainer = new TrainingApiClient(trainingKey, endPoint); async function sample() { @@ -68,14 +71,14 @@ async function sample() { } console.log("Training status: " + trainingIteration.status); - trainingIteration.isDefault = true; - await trainer.updateIteration(sampleProject.id, trainingIteration.id, trainingIteration); + // Publish the iteration to the end point + await trainer.publishIteration(sampleProject.id, trainingIteration.id, publishIterationName, predictionResourceId); // Step 5. Prediction const predictor = new PredictionApiClient(predictionKey, endPoint); const testFile = fs.readFileSync(`${sampleDataRoot}/Test/test_image.jpg`); - const results = await predictor.predictImage(sampleProject.id, testFile, { iterationId: trainingIteration.id }); + const results = await predictor.classifyImage(sampleProject.id, publishIterationName, testFile); // Step 6. Show results console.log("Results:"); diff --git a/Samples/customvision/customVisionObjDetect.js b/Samples/customvision/customVisionObjDetect.js index 4536163..8766816 100644 --- a/Samples/customvision/customVisionObjDetect.js +++ b/Samples/customvision/customVisionObjDetect.js @@ -26,6 +26,9 @@ const predictionKey = process.env[predictionKeyVar]; // Add your Custom Vision endpoint to your environment variables. const endPoint = process.env['CUSTOM_VISION_ENDPOINT'] +const predictionResourceId = ""; +const publishIterationName = "detectModel"; + const trainer = new TrainingApi.TrainingAPIClient(trainingKey, endPoint); async function sample() { @@ -146,14 +149,14 @@ async function sample() { } console.log("Training status: " + trainingIteration.status); - trainingIteration.isDefault = true; - await trainer.updateIteration(sampleProject.id, trainingIteration.id, trainingIteration); + // Publish the iteration to the end point + await trainer.publishIteration(sampleProject.id, trainingIteration.id, publishIterationName, predictionResourceId); // Step 5. Prediction const predictor = new PredictionApi.PredictionAPIClient(predictionKey, endPoint); const testFile = fs.readFileSync(`${sampleDataRoot}/Test/test_od_image.jpg`); - const results = await predictor.predictImage(sampleProject.id, testFile, { iterationId: trainingIteration.id }) + const results = await predictor.detectImage(sampleProject.id, publishIterationName, testFile) // Step 6. Show results console.log("Results:"); diff --git a/package.json b/package.json index 913be99..9562020 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,9 @@ "azure-cognitiveservices-textanalytics": "^3.0.0", "azure-cognitiveservices-vision": "^1.0.0-preview", "azure-cognitiveservices-visualsearch": "^1.1.0-preview", + "azure-cognitiveservices-customvision-training": "^3.0.0", + "azure-cognitiveservices-customvision-prediction": "^3.0.0", + "ms-rest": "^2.3.3", "ms-rest-azure": "^2.5.5", "npm": "^5.8.0",