From 150bf1890290d83a2c3fb89cdd0d115c3eb68440 Mon Sep 17 00:00:00 2001
From: "Josue(MSFT)" <v-zhli15@microsoft.com>
Date: Thu, 28 Jan 2021 14:35:00 +0800
Subject: [PATCH] Update anomaly detector sample(JS) from t1 to t2

---
 quickstarts/sdk/node/package.json |  3 ++-
 quickstarts/sdk/node/src/index.ts | 39 ++++++++++++-------------------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/quickstarts/sdk/node/package.json b/quickstarts/sdk/node/package.json
index 68cd4e5..f7e9e8d 100644
--- a/quickstarts/sdk/node/package.json
+++ b/quickstarts/sdk/node/package.json
@@ -11,7 +11,8 @@
   "author": "zhuxia@microsoft.com",
   "license": "ISC",
   "dependencies": {
-    "@azure/cognitiveservices-anomalydetector": "^1.0.0",
+    "@azure/ai-anomaly-detector": "^3.0.0-beta.2",
+    "@azure/core-auth": "^1.1.4",
     "csv-parse": "^4.4.0",
     "tsc": "^1.20150623.0",
     "typescript": "^3.4.3"
diff --git a/quickstarts/sdk/node/src/index.ts b/quickstarts/sdk/node/src/index.ts
index 8b7c21b..01d502a 100644
--- a/quickstarts/sdk/node/src/index.ts
+++ b/quickstarts/sdk/node/src/index.ts
@@ -1,18 +1,14 @@
-import * as msRest from "@azure/ms-rest-js";
-import { AnomalyDetectorClient, AnomalyDetectorModels, AnomalyDetectorMappers } from "@azure/cognitiveservices-anomalydetector";
+import { AzureKeyCredential } from "@azure/core-auth";
+import { AnomalyDetectorClient, DetectRequest, DetectEntireResponse, TimeSeriesPoint, TimeGranularity } from "@azure/ai-anomaly-detector";
 import * as fs from "fs";
 import parse from "csv-parse/lib/sync";
 
-function entire_detect_sample(endpoint: string, key: string, request: AnomalyDetectorModels.Request){
+function entire_detect_sample(endpoint: string, key: string, request: DetectRequest){
   console.log("Sample of detecting anomalies in the entire series.");
-  const options: msRest.ApiKeyCredentialOptions = {
-    inHeader: {
-      "Ocp-Apim-Subscription-Key": key
-    }
-  };
 
-  const client = new AnomalyDetectorClient(new msRest.ApiKeyCredentials(options), endpoint);
-  client.entireDetect(request).then((result) => {
+
+  const client = new AnomalyDetectorClient(endpoint ,new AzureKeyCredential(key));
+  client.detectEntireSeries(request).then((result) => {
     if(result.isAnomaly.some(function(e){return e === true;})){
       console.log("Anomaly was detected from the series at index:");
       result.isAnomaly.forEach(function(e, i){
@@ -31,16 +27,11 @@ function entire_detect_sample(endpoint: string, key: string, request: AnomalyDet
   });
 }
 
-function last_detect_sample(endpoint: string, key: string, request: AnomalyDetectorModels.Request){
+function last_detect_sample(endpoint: string, key: string, request: DetectRequest){
   console.log("Sample of detecting whether the latest point in series is anomaly.");
-  const options: msRest.ApiKeyCredentialOptions = {
-    inHeader: {
-      "Ocp-Apim-Subscription-Key": key
-    }
-  };
 
-  const client = new AnomalyDetectorClient(new msRest.ApiKeyCredentials(options), endpoint);
-  client.lastDetect(request).then((result) => {
+  const client = new AnomalyDetectorClient(endpoint, new AzureKeyCredential(key));
+  client.detectLastPoint(request).then((result) => {
     if(result.isAnomaly){
       console.log("The latest point is detected as anomaly.");
     }else{
@@ -56,8 +47,8 @@ function last_detect_sample(endpoint: string, key: string, request: AnomalyDetec
   });
 }
 
-function read_series_from_file(path: string): Array<AnomalyDetectorModels.Point>{
-  let result = Array<AnomalyDetectorModels.Point>();
+function read_series_from_file(path: string): Array<TimeSeriesPoint>{
+  let result = Array<TimeSeriesPoint>();
   let input = fs.readFileSync(path).toString();
   let parsed = parse(input, {skip_empty_lines:true});
   parsed.forEach(function(e: Array<string>){
@@ -66,13 +57,13 @@ function read_series_from_file(path: string): Array<AnomalyDetectorModels.Point>
   return result;
 }
 
-const endpoint = "[YOUR_ENDPOINT_URL]";
-const key = "[YOUR_SUBSCRIPTION_KEY]";
+const endpoint = "[YOUR_ANOMALY_DETECTOR_ENDPOINT_URL]";
+const key = "[YOUR_ANOMALY_DETECTOR_KEY]";
 const path = "[PATH_TO_TIME_SERIES_DATA]";
 
-const request: AnomalyDetectorModels.Request = {
+const request: DetectRequest = {
   series: read_series_from_file(path),
-  granularity: "daily",
+  granularity: TimeGranularity.daily,
 };
 entire_detect_sample(endpoint, key, request);
 last_detect_sample(endpoint, key, request);