Fix issue #124: Rest service api/v1/nni/metric-data can not retrieve metric data for multiple trial jobs

src/nni_manager/common/datastore.ts

@@ -78,7 +78,7 @@ abstract class DataStore {
     public abstract listTrialJobs(status?: TrialJobStatus): Promise<TrialJobInfo[]>;
     public abstract getTrialJob(trialJobId: string): Promise<TrialJobInfo>;
     public abstract storeMetricData(trialJobId: string, data: string): Promise<void>;
-    public abstract getMetricData(trialJobId: string, metricType: MetricType): Promise<MetricDataRecord[]>;
+    public abstract getMetricData(trialJobId?: string, metricType?: MetricType): Promise<MetricDataRecord[]>;
 }
 
 abstract class Database {

src/nni_manager/common/manager.ts

@@ -90,7 +90,7 @@ abstract class Manager {
     public abstract setClusterMetadata(key: string, value: string): Promise<void>;
     public abstract getClusterMetadata(key: string): Promise<string>;
 
-    public abstract getMetricData(trialJobId: string, metricType: MetricType): Promise<MetricDataRecord[]>;
+    public abstract getMetricData(trialJobId?: string, metricType?: MetricType): Promise<MetricDataRecord[]>;
     public abstract getTrialJobStatistics(): Promise<TrialJobStatistics[]>;
     public abstract getStatus(): NNIManagerStatus;
 }

src/nni_manager/core/nniDataStore.ts

@@ -138,7 +138,7 @@ class NNIDataStore implements DataStore {
         }));
     }
 
-    public getMetricData(trialJobId: string, metricType: MetricType): Promise<MetricDataRecord[]> {
+    public getMetricData(trialJobId?: string, metricType?: MetricType): Promise<MetricDataRecord[]> {
         return this.db.queryMetricData(trialJobId, metricType);
     }
 

src/nni_manager/core/nnimanager.ts

@@ -204,7 +204,7 @@ class NNIManager implements Manager {
         }
     }
 
-    public async getMetricData(trialJobId: string, metricType: MetricType): Promise<MetricDataRecord[]> {
+    public async getMetricData(trialJobId?: string, metricType?: MetricType): Promise<MetricDataRecord[]> {
         return this.dataStore.getMetricData(trialJobId, metricType);
     }
 

src/nni_manager/rest_server/restHandler.ts

@@ -245,7 +245,7 @@ class NNIRestHandler {
     }
 
     private getMetricData(router: Router): void {
-        router.get('/metric-data/:job_id', async (req: Request, res: Response) => {
+        router.get('/metric-data/:job_id*?', async (req: Request, res: Response) => {
             this.nniManager.getMetricData(req.params.job_id, req.query.type).then((metricsData: MetricDataRecord[]) => {
                 res.send(metricsData);
             }).catch((err: Error) => {