fix incorerct id, should be instance_id

src/qoa4ml/qoa_client.py

@@ -11,10 +11,6 @@
 import requests
 from pydantic import create_model
 
-from qoa4ml.probes.docker_monitoring_probe import DockerMonitoringProbe
-from qoa4ml.probes.process_monitoring_probe import ProcessMonitoringProbe
-from qoa4ml.probes.system_monitoring_probe import SystemMonitoringProbe
-
 # from .connector.mqtt_connector import Mqtt_Connector
 from .config.configs import (
     AMQPConnectorConfig,
@@ -37,9 +33,12 @@
     ServiceAPIEnum,
     ServiceMetricNameEnum,
 )
+from .probes.docker_monitoring_probe import DockerMonitoringProbe
 from .probes.probe import Probe
+from .probes.process_monitoring_probe import ProcessMonitoringProbe
+from .probes.system_monitoring_probe import SystemMonitoringProbe
 from .reports.abstract_report import AbstractReport
-from .reports.rohe_reports import RoheReport
+from .reports.ml_reports import MLReport
 from .utils.logger import qoa_logger
 from .utils.qoa_utils import (
     load_config,
@@ -57,7 +56,7 @@ class QoaClient(Generic[T]):
     def __init__(
         self,
         # NOTE: use text, number, enum
-        report_cls: type[T] = RoheReport,
+        report_cls: type[T] = MLReport,
         config_dict: Optional[dict] = None,
         config_path: Optional[str] = None,
         registration_url: Optional[str] = None,

src/qoa4ml/reports/general_application_report.py

@@ -23,7 +23,7 @@ def reset(self):
         self.report = GeneralApplicationReportModel()
 
         self.execution_instance = MicroserviceInstance(
-            id=UUID(self.client_config.id),
+            id=UUID(self.client_config.instance_id),
             name=self.client_config.name,
             functionality=self.client_config.functionality,
             stage=self.client_config.stage_id,

src/qoa4ml/reports/ml_reports.py

@@ -74,7 +74,7 @@ def observe_metric(self, report_type, stage, metric: Metric):
                 self.report.service[stage].metrics[metric.metric_name] = {}
 
             self.report.service[stage].metrics[metric.metric_name] |= {
-                UUID(self.client_config.id): metric
+                UUID(self.client_config.instance_id): metric
             }
 
         elif report_type == ReportTypeEnum.data:
@@ -84,32 +84,36 @@ def observe_metric(self, report_type, stage, metric: Metric):
                 self.report.data[stage].metrics[metric.metric_name] = {}
 
             self.report.data[stage].metrics[metric.metric_name] |= {
-                UUID(self.client_config.id): metric
+                UUID(self.client_config.instance_id): metric
             }
         else:
             raise ValueError(f"Can't handle report type {report_type}")
 
     def observe_inference(self, inference_value):
-        if self.client_config.id in self.report.ml_inference:
+        if self.client_config.instance_id in self.report.ml_inference:
             raise RuntimeWarning(
                 "Inference existed, will override the existing inference"
             )
-        self.report.ml_inference[self.client_config.id] = InferenceInstance(
+        self.report.ml_inference[self.client_config.instance_id] = InferenceInstance(
             inference_id=uuid4(),
-            instance_id=UUID(self.client_config.id),
+            instance_id=UUID(self.client_config.instance_id),
             functionality=self.client_config.functionality,
             prediction=inference_value,
         )
 
     def observe_inference_metric(self, metric: Metric):
-        if self.client_config.id in self.report.ml_inference:
-            self.report.ml_inference[self.client_config.id].metrics.append(metric)
+        if self.client_config.instance_id in self.report.ml_inference:
+            self.report.ml_inference[self.client_config.instance_id].metrics.append(
+                metric
+            )
         else:
-            self.report.ml_inference[self.client_config.id] = InferenceInstance(
-                inference_id=uuid4(),
-                instance_id=UUID(self.client_config.id),
-                functionality=self.client_config.functionality,
-                metrics=[metric],
+            self.report.ml_inference[self.client_config.instance_id] = (
+                InferenceInstance(
+                    inference_id=uuid4(),
+                    instance_id=UUID(self.client_config.instance_id),
+                    functionality=self.client_config.functionality,
+                    metrics=[metric],
+                )
             )
 
     def generate_report(

src/qoa4ml/reports/rohe_reports.py

@@ -36,7 +36,7 @@ def reset(self):
         self.report = RoheReportModel()
         self.previous_microservice_instance = []
         self.execution_instance = MicroserviceInstance(
-            id=UUID(self.client_config.id),
+            id=UUID(self.client_config.instance_id),
             name=self.client_config.name,
             functionality=self.client_config.functionality,
             stage=self.client_config.stage_id,
@@ -163,7 +163,7 @@ def observe_metric(self, report_type: ReportTypeEnum, stage: str, metric: Metric
                 self.inference_report.service[stage].metrics[metric.metric_name] = {}
 
             self.inference_report.service[stage].metrics[metric.metric_name] |= {
-                UUID(self.client_config.id): metric
+                UUID(self.client_config.instance_id): metric
             }
 
         elif report_type == ReportTypeEnum.data:
@@ -173,7 +173,7 @@ def observe_metric(self, report_type: ReportTypeEnum, stage: str, metric: Metric
                 self.inference_report.data[stage].metrics[metric.metric_name] = {}
 
             self.inference_report.data[stage].metrics[metric.metric_name] |= {
-                UUID(self.client_config.id): metric
+                UUID(self.client_config.instance_id): metric
             }
         else:
             raise ValueError(f"Can't handle report type {report_type}")