feat: update EM and fix package

implement ENG-5055

Author: cowan-macady

indykite_sdk/config/__init__.py

@@ -47,6 +47,8 @@ def __init__(self, token_source=None):
                               create_entity_matching_pipeline_config_node,
                               update_entity_matching_pipeline_config_node,
                               entity_matching_pipeline_config,
+                              entity_matching_pipeline_config_create,
+                              entity_matching_pipeline_config_update,
                               validate_entity_matching_status
                               )
     from .create_application_with_agent_credentials import create_application_with_agent_credentials

indykite_sdk/config/config_node.py

@@ -650,7 +650,7 @@ def update_entity_matching_pipeline_config_node(self,
 
 
 def entity_matching_pipeline_config(self,
-                                  node_filter,
+                                  node_filter=None,
                                   similarity_score_cutoff=None,
                                   property_mapping_status=None,
                                   property_mapping_message=None,
@@ -683,7 +683,7 @@ def entity_matching_pipeline_config(self,
         property_mapping_status = self.validate_entity_matching_status(property_mapping_status)
         entity_matching_status = self.validate_entity_matching_status(entity_matching_status)
         external_config = model_pb2.EntityMatchingPipelineConfig(
-            node_filter=node_filter,
+            node_filter = node_filter,
             similarity_score_cutoff=similarity_score_cutoff,
             property_mapping_status=property_mapping_status,
             property_mapping_message=wrappers.StringValue(value=property_mapping_message),
@@ -700,6 +700,40 @@ def entity_matching_pipeline_config(self,
         return logger.logger_error(exception)
 
 
+def entity_matching_pipeline_config_create(self,node_filter):
+    """
+    create EntityMatchingPipelineConfig
+    :param self:
+    :param node_filter: EntityMatchingPipelineConfig.NodeFilter object
+    :return: EntityMatchingPipelineConfig object
+    """
+    sys.excepthook = logger.handle_excepthook
+    try:
+        external_config = model_pb2.EntityMatchingPipelineConfig(
+            node_filter = node_filter,
+            )
+        return external_config
+    except Exception as exception:
+        return logger.logger_error(exception)
+
+
+def entity_matching_pipeline_config_update(self, similarity_score_cutoff):
+    """
+    create EntityMatchingPipelineConfig
+    :param self:
+    :param similarity_score_cutoff: float
+    :return: EntityMatchingPipelineConfig object
+    """
+    sys.excepthook = logger.handle_excepthook
+    try:
+        external_config = model_pb2.EntityMatchingPipelineConfig(
+            similarity_score_cutoff = similarity_score_cutoff,
+            )
+        return external_config
+    except Exception as exception:
+        return logger.logger_error(exception)
+
+
 def validate_data_points(self, data_points):
     """
     validate data_points requirement

indykite_sdk/entitymatching/run_entity_matching_pipeline.py

@@ -10,7 +10,7 @@ def run_entity_matching_pipeline(self, id, similarity_score_cutoff, custom_prope
     run entitymatching pipeline
     :param self:
     :param id: confg node GID id
-    :param custom_property_mappings array of PropertyMapping
+    :param custom_property_mappings array of CustomPropertyMappings
     :param similarity_score_cutoff float required threshold (in range [0,1])
     :return: deserialized RunEntityMatchingPipelineResponse
     """

indykite_sdk/indykite/entitymatching/__init__.py

@@ -24,11 +24,6 @@ def __init__(self, channel):
                 request_serializer=indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadSuggestedPropertyMappingRequest.SerializeToString,
                 response_deserializer=indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadSuggestedPropertyMappingResponse.FromString,
                 )
-        self.ReadEntityMatchingReport = channel.unary_unary(
-                '/indykite.entitymatching.v1beta1.EntityMatchingAPI/ReadEntityMatchingReport',
-                request_serializer=indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadEntityMatchingReportRequest.SerializeToString,
-                response_deserializer=indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadEntityMatchingReportResponse.FromString,
-                )
 
 
 class EntityMatchingAPIServicer(object):
@@ -48,13 +43,6 @@ def ReadSuggestedPropertyMapping(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def ReadEntityMatchingReport(self, request, context):
-        """ReadEntityMatchingReport by Pipeline ID for a successful Pipeline.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
 
 def add_EntityMatchingAPIServicer_to_server(servicer, server):
     rpc_method_handlers = {
@@ -68,11 +56,6 @@ def add_EntityMatchingAPIServicer_to_server(servicer, server):
                     request_deserializer=indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadSuggestedPropertyMappingRequest.FromString,
                     response_serializer=indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadSuggestedPropertyMappingResponse.SerializeToString,
             ),
-            'ReadEntityMatchingReport': grpc.unary_unary_rpc_method_handler(
-                    servicer.ReadEntityMatchingReport,
-                    request_deserializer=indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadEntityMatchingReportRequest.FromString,
-                    response_serializer=indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadEntityMatchingReportResponse.SerializeToString,
-            ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
             'indykite.entitymatching.v1beta1.EntityMatchingAPI', rpc_method_handlers)
@@ -116,20 +99,3 @@ def ReadSuggestedPropertyMapping(request,
             indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadSuggestedPropertyMappingResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
-
-    @staticmethod
-    def ReadEntityMatchingReport(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/indykite.entitymatching.v1beta1.EntityMatchingAPI/ReadEntityMatchingReport',
-            indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadEntityMatchingReportRequest.SerializeToString,
-            indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadEntityMatchingReportResponse.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)