Addition of parameter type in metadata

House_Price_Prediction/hpp_databroker/dataset_features.txt

+type,aiod-dataset/v1(kaggle Dataset)
 datasetname,House Prices dataset
 description,https://www.kaggle.com/datasets/lespin/house-prices-dataset
 size,204 kB

House_Price_Prediction/hpp_databroker/model.proto

@@ -18,10 +18,11 @@ message Features {
 
 //To extract dataset features
 message DatasetFeatues{
-  string datasetname = 1;
-  string description = 2;
-  string size = 3;
-  string DOI_ID = 4;
+  string type = 1;
+  string datasetname = 2;
+  string description = 3;
+  string size = 4;
+  string DOI_ID = 5;
 }
 
 //Define the service

House_Price_Prediction/hpp_databroker/model_pb2.py

@@ -19,7 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
   syntax='proto3',
   serialized_options=None,
   create_key=_descriptor._internal_create_key,
-  serialized_pb=b'\n\x0bmodel.proto\"\x07\n\x05\x45mpty\"\x94\x01\n\x08\x46\x65\x61tures\x12\x12\n\nMSSubClass\x18\x01 \x01(\x02\x12\x0f\n\x07LotArea\x18\x02 \x01(\x02\x12\x11\n\tYearBuilt\x18\x03 \x01(\x02\x12\x14\n\x0cTotRmsAbvGrd\x18\x04 \x01(\x02\x12\x12\n\nGarageCars\x18\x05 \x01(\x02\x12\x11\n\tGrLivArea\x18\x06 \x01(\x02\x12\x13\n\x0bOverallQual\x18\x07 \x01(\x02\"w\n\x0e\x44\x61tasetFeatues\x12\x13\n\x0b\x64\x61tasetname\x18\x01 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x02 \x01(\t\x12\x0c\n\x04size\x18\x03 \x01(\t\x12\x0c\n\x04tags\x18\x04 \x01(\t\x12\x0f\n\x07license\x18\x05 \x01(\t\x12\x0e\n\x06\x44OI_ID\x18\x06 \x01(\t2a\n\nDatabroker\x12\"\n\rhppdatabroker\x12\x06.Empty\x1a\t.Features\x12/\n\x14get_dataset_metadata\x12\x06.Empty\x1a\x0f.DatasetFeatuesb\x06proto3'
+  serialized_pb=b'\n\x0bmodel.proto\"\x07\n\x05\x45mpty\"\x94\x01\n\x08\x46\x65\x61tures\x12\x12\n\nMSSubClass\x18\x01 \x01(\x02\x12\x0f\n\x07LotArea\x18\x02 \x01(\x02\x12\x11\n\tYearBuilt\x18\x03 \x01(\x02\x12\x14\n\x0cTotRmsAbvGrd\x18\x04 \x01(\x02\x12\x12\n\nGarageCars\x18\x05 \x01(\x02\x12\x11\n\tGrLivArea\x18\x06 \x01(\x02\x12\x13\n\x0bOverallQual\x18\x07 \x01(\x02\"f\n\x0e\x44\x61tasetFeatues\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x13\n\x0b\x64\x61tasetname\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x03 \x01(\t\x12\x0c\n\x04size\x18\x04 \x01(\t\x12\x0e\n\x06\x44OI_ID\x18\x05 \x01(\t2a\n\nDatabroker\x12\"\n\rhppdatabroker\x12\x06.Empty\x1a\t.Features\x12/\n\x14get_dataset_metadata\x12\x06.Empty\x1a\x0f.DatasetFeatuesb\x06proto3'
 )
 
 
@@ -133,47 +133,40 @@ _DATASETFEATUES = _descriptor.Descriptor(
   create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
-      name='datasetname', full_name='DatasetFeatues.datasetname', index=0,
+      name='type', full_name='DatasetFeatues.type', index=0,
       number=1, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=b"".decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
     _descriptor.FieldDescriptor(
-      name='description', full_name='DatasetFeatues.description', index=1,
+      name='datasetname', full_name='DatasetFeatues.datasetname', index=1,
       number=2, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=b"".decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
     _descriptor.FieldDescriptor(
-      name='size', full_name='DatasetFeatues.size', index=2,
+      name='description', full_name='DatasetFeatues.description', index=2,
       number=3, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=b"".decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
     _descriptor.FieldDescriptor(
-      name='tags', full_name='DatasetFeatues.tags', index=3,
+      name='size', full_name='DatasetFeatues.size', index=3,
       number=4, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=b"".decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
     _descriptor.FieldDescriptor(
-      name='license', full_name='DatasetFeatues.license', index=4,
+      name='DOI_ID', full_name='DatasetFeatues.DOI_ID', index=4,
       number=5, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=b"".decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
-    _descriptor.FieldDescriptor(
-      name='DOI_ID', full_name='DatasetFeatues.DOI_ID', index=5,
-      number=6, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=b"".decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -187,7 +180,7 @@ _DATASETFEATUES = _descriptor.Descriptor(
   oneofs=[
   ],
   serialized_start=175,
-  serialized_end=294,
+  serialized_end=277,
 )
 
 DESCRIPTOR.message_types_by_name['Empty'] = _EMPTY
@@ -225,8 +218,8 @@ _DATABROKER = _descriptor.ServiceDescriptor(
   index=0,
   serialized_options=None,
   create_key=_descriptor._internal_create_key,
-  serialized_start=296,
-  serialized_end=393,
+  serialized_start=279,
+  serialized_end=376,
   methods=[
   _descriptor.MethodDescriptor(
     name='hppdatabroker',

House_Price_Prediction/hpp_model/house_price_prediction_server.py

@@ -41,6 +41,7 @@ class PredictServicer(model_pb2_grpc.PredictServicer):
     #The function will get the metrics calculated in predict_sale_price.py    
     def regressor_metrics(self, request, context):
         response = model_pb2.TrainingStatus()
+        response.type = 'regression-metrics/v1' # Type-in the type of metrics here
         _, response.mse, response.rmse, response.r_squared, response.adjusted_r_squared = psp.predict_sale_price(request.MSSubClass, request.LotArea, request.YearBuilt, request.TotRmsAbvGrd, request.GarageCars, request.GrLivArea, request.OverallQual)
         response.status_text = 'success'
 

House_Price_Prediction/hpp_model/model.proto

@@ -18,11 +18,12 @@ message Prediction {
 }
 
 message TrainingStatus {
-  double mse = 1;
-  double rmse = 2;
-  double r_squared = 3;
-  double adjusted_r_squared = 4;
-  string status_text = 5;
+  string type = 1;
+  double mse = 2;
+  double rmse = 3;
+  double r_squared = 4;
+  double adjusted_r_squared = 5;
+  string status_text = 6;
 }
 
 //Define the service

House_Price_Prediction/hpp_model/model_pb2.py

@@ -19,7 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
   syntax='proto3',
   serialized_options=None,
   create_key=_descriptor._internal_create_key,
-  serialized_pb=b'\n\x0bmodel.proto\"\x94\x01\n\x08\x46\x65\x61tures\x12\x12\n\nMSSubClass\x18\x01 \x01(\x02\x12\x0f\n\x07LotArea\x18\x02 \x01(\x02\x12\x11\n\tYearBuilt\x18\x03 \x01(\x02\x12\x14\n\x0cTotRmsAbvGrd\x18\x04 \x01(\x02\x12\x12\n\nGarageCars\x18\x05 \x01(\x02\x12\x11\n\tGrLivArea\x18\x06 \x01(\x02\x12\x13\n\x0bOverallQual\x18\x07 \x01(\x02\"\x1f\n\nPrediction\x12\x11\n\tsalePrice\x18\x01 \x01(\x02\"o\n\x0eTrainingStatus\x12\x0b\n\x03mse\x18\x01 \x01(\x01\x12\x0c\n\x04rmse\x18\x02 \x01(\x01\x12\x11\n\tr_squared\x18\x03 \x01(\x01\x12\x1a\n\x12\x61\x64justed_r_squared\x18\x04 \x01(\x01\x12\x13\n\x0bstatus_text\x18\x05 \x01(\t2\xa2\x01\n\x07Predict\x12,\n\x12predict_sale_price\x12\t.Features\x1a\x0b.Prediction\x12/\n\x11regressor_metrics\x12\t.Features\x1a\x0f.TrainingStatus\x12\x38\n\x14get_metrics_metadata\x12\x0f.TrainingStatus\x1a\x0f.TrainingStatusb\x06proto3'
+  serialized_pb=b'\n\x0bmodel.proto\"\x94\x01\n\x08\x46\x65\x61tures\x12\x12\n\nMSSubClass\x18\x01 \x01(\x02\x12\x0f\n\x07LotArea\x18\x02 \x01(\x02\x12\x11\n\tYearBuilt\x18\x03 \x01(\x02\x12\x14\n\x0cTotRmsAbvGrd\x18\x04 \x01(\x02\x12\x12\n\nGarageCars\x18\x05 \x01(\x02\x12\x11\n\tGrLivArea\x18\x06 \x01(\x02\x12\x13\n\x0bOverallQual\x18\x07 \x01(\x02\"\x1f\n\nPrediction\x12\x11\n\tsalePrice\x18\x01 \x01(\x02\"}\n\x0eTrainingStatus\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x0b\n\x03mse\x18\x02 \x01(\x01\x12\x0c\n\x04rmse\x18\x03 \x01(\x01\x12\x11\n\tr_squared\x18\x04 \x01(\x01\x12\x1a\n\x12\x61\x64justed_r_squared\x18\x05 \x01(\x01\x12\x13\n\x0bstatus_text\x18\x06 \x01(\t2\xa2\x01\n\x07Predict\x12,\n\x12predict_sale_price\x12\t.Features\x1a\x0b.Prediction\x12/\n\x11regressor_metrics\x12\t.Features\x1a\x0f.TrainingStatus\x12\x38\n\x14get_metrics_metadata\x12\x0f.TrainingStatus\x1a\x0f.TrainingStatusb\x06proto3'
 )
 
 
@@ -140,36 +140,43 @@ _TRAININGSTATUS = _descriptor.Descriptor(
   create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
-      name='mse', full_name='TrainingStatus.mse', index=0,
-      number=1, type=1, cpp_type=5, label=1,
-      has_default_value=False, default_value=float(0),
+      name='type', full_name='TrainingStatus.type', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
     _descriptor.FieldDescriptor(
-      name='rmse', full_name='TrainingStatus.rmse', index=1,
+      name='mse', full_name='TrainingStatus.mse', index=1,
       number=2, type=1, cpp_type=5, label=1,
       has_default_value=False, default_value=float(0),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
     _descriptor.FieldDescriptor(
-      name='r_squared', full_name='TrainingStatus.r_squared', index=2,
+      name='rmse', full_name='TrainingStatus.rmse', index=2,
       number=3, type=1, cpp_type=5, label=1,
       has_default_value=False, default_value=float(0),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
     _descriptor.FieldDescriptor(
-      name='adjusted_r_squared', full_name='TrainingStatus.adjusted_r_squared', index=3,
+      name='r_squared', full_name='TrainingStatus.r_squared', index=3,
       number=4, type=1, cpp_type=5, label=1,
       has_default_value=False, default_value=float(0),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
     _descriptor.FieldDescriptor(
-      name='status_text', full_name='TrainingStatus.status_text', index=4,
-      number=5, type=9, cpp_type=9, label=1,
+      name='adjusted_r_squared', full_name='TrainingStatus.adjusted_r_squared', index=4,
+      number=5, type=1, cpp_type=5, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='status_text', full_name='TrainingStatus.status_text', index=5,
+      number=6, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=b"".decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
@@ -187,7 +194,7 @@ _TRAININGSTATUS = _descriptor.Descriptor(
   oneofs=[
   ],
   serialized_start=199,
-  serialized_end=310,
+  serialized_end=324,
 )
 
 DESCRIPTOR.message_types_by_name['Features'] = _FEATURES
@@ -225,8 +232,8 @@ _PREDICT = _descriptor.ServiceDescriptor(
   index=0,
   serialized_options=None,
   create_key=_descriptor._internal_create_key,
-  serialized_start=313,
-  serialized_end=475,
+  serialized_start=327,
+  serialized_end=489,
   methods=[
   _descriptor.MethodDescriptor(
     name='predict_sale_price',