Skip to content

Commit f186eda

Browse files
committed
feat: update EM and fix package
implement ENG-5055
1 parent a68f754 commit f186eda

12 files changed

+81
-86
lines changed

indykite_sdk/config/__init__.py

+2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ def __init__(self, token_source=None):
4747
create_entity_matching_pipeline_config_node,
4848
update_entity_matching_pipeline_config_node,
4949
entity_matching_pipeline_config,
50+
entity_matching_pipeline_config_create,
51+
entity_matching_pipeline_config_update,
5052
validate_entity_matching_status
5153
)
5254
from .create_application_with_agent_credentials import create_application_with_agent_credentials

indykite_sdk/config/config_node.py

+36-2
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ def update_entity_matching_pipeline_config_node(self,
650650

651651

652652
def entity_matching_pipeline_config(self,
653-
node_filter,
653+
node_filter=None,
654654
similarity_score_cutoff=None,
655655
property_mapping_status=None,
656656
property_mapping_message=None,
@@ -683,7 +683,7 @@ def entity_matching_pipeline_config(self,
683683
property_mapping_status = self.validate_entity_matching_status(property_mapping_status)
684684
entity_matching_status = self.validate_entity_matching_status(entity_matching_status)
685685
external_config = model_pb2.EntityMatchingPipelineConfig(
686-
node_filter=node_filter,
686+
node_filter = node_filter,
687687
similarity_score_cutoff=similarity_score_cutoff,
688688
property_mapping_status=property_mapping_status,
689689
property_mapping_message=wrappers.StringValue(value=property_mapping_message),
@@ -700,6 +700,40 @@ def entity_matching_pipeline_config(self,
700700
return logger.logger_error(exception)
701701

702702

703+
def entity_matching_pipeline_config_create(self,node_filter):
704+
"""
705+
create EntityMatchingPipelineConfig
706+
:param self:
707+
:param node_filter: EntityMatchingPipelineConfig.NodeFilter object
708+
:return: EntityMatchingPipelineConfig object
709+
"""
710+
sys.excepthook = logger.handle_excepthook
711+
try:
712+
external_config = model_pb2.EntityMatchingPipelineConfig(
713+
node_filter = node_filter,
714+
)
715+
return external_config
716+
except Exception as exception:
717+
return logger.logger_error(exception)
718+
719+
720+
def entity_matching_pipeline_config_update(self, similarity_score_cutoff):
721+
"""
722+
create EntityMatchingPipelineConfig
723+
:param self:
724+
:param similarity_score_cutoff: float
725+
:return: EntityMatchingPipelineConfig object
726+
"""
727+
sys.excepthook = logger.handle_excepthook
728+
try:
729+
external_config = model_pb2.EntityMatchingPipelineConfig(
730+
similarity_score_cutoff = similarity_score_cutoff,
731+
)
732+
return external_config
733+
except Exception as exception:
734+
return logger.logger_error(exception)
735+
736+
703737
def validate_data_points(self, data_points):
704738
"""
705739
validate data_points requirement

indykite_sdk/entitymatching/run_entity_matching_pipeline.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def run_entity_matching_pipeline(self, id, similarity_score_cutoff, custom_prope
1010
run entitymatching pipeline
1111
:param self:
1212
:param id: confg node GID id
13-
:param custom_property_mappings array of PropertyMapping
13+
:param custom_property_mappings array of CustomPropertyMappings
1414
:param similarity_score_cutoff float required threshold (in range [0,1])
1515
:return: deserialized RunEntityMatchingPipelineResponse
1616
"""

indykite_sdk/indykite/entitymatching/__init__.py

Whitespace-only changes.

indykite_sdk/indykite/entitymatching/v1beta1/__init__.py

Whitespace-only changes.

indykite_sdk/indykite/entitymatching/v1beta1/entity_matching_api_pb2.py

+10-20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

indykite_sdk/indykite/entitymatching/v1beta1/entity_matching_api_pb2_grpc.py

-34
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ def __init__(self, channel):
2424
request_serializer=indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadSuggestedPropertyMappingRequest.SerializeToString,
2525
response_deserializer=indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadSuggestedPropertyMappingResponse.FromString,
2626
)
27-
self.ReadEntityMatchingReport = channel.unary_unary(
28-
'/indykite.entitymatching.v1beta1.EntityMatchingAPI/ReadEntityMatchingReport',
29-
request_serializer=indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadEntityMatchingReportRequest.SerializeToString,
30-
response_deserializer=indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadEntityMatchingReportResponse.FromString,
31-
)
3227

3328

3429
class EntityMatchingAPIServicer(object):
@@ -48,13 +43,6 @@ def ReadSuggestedPropertyMapping(self, request, context):
4843
context.set_details('Method not implemented!')
4944
raise NotImplementedError('Method not implemented!')
5045

51-
def ReadEntityMatchingReport(self, request, context):
52-
"""ReadEntityMatchingReport by Pipeline ID for a successful Pipeline.
53-
"""
54-
context.set_code(grpc.StatusCode.UNIMPLEMENTED)
55-
context.set_details('Method not implemented!')
56-
raise NotImplementedError('Method not implemented!')
57-
5846

5947
def add_EntityMatchingAPIServicer_to_server(servicer, server):
6048
rpc_method_handlers = {
@@ -68,11 +56,6 @@ def add_EntityMatchingAPIServicer_to_server(servicer, server):
6856
request_deserializer=indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadSuggestedPropertyMappingRequest.FromString,
6957
response_serializer=indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadSuggestedPropertyMappingResponse.SerializeToString,
7058
),
71-
'ReadEntityMatchingReport': grpc.unary_unary_rpc_method_handler(
72-
servicer.ReadEntityMatchingReport,
73-
request_deserializer=indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadEntityMatchingReportRequest.FromString,
74-
response_serializer=indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadEntityMatchingReportResponse.SerializeToString,
75-
),
7659
}
7760
generic_handler = grpc.method_handlers_generic_handler(
7861
'indykite.entitymatching.v1beta1.EntityMatchingAPI', rpc_method_handlers)
@@ -116,20 +99,3 @@ def ReadSuggestedPropertyMapping(request,
11699
indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadSuggestedPropertyMappingResponse.FromString,
117100
options, channel_credentials,
118101
insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
119-
120-
@staticmethod
121-
def ReadEntityMatchingReport(request,
122-
target,
123-
options=(),
124-
channel_credentials=None,
125-
call_credentials=None,
126-
insecure=False,
127-
compression=None,
128-
wait_for_ready=None,
129-
timeout=None,
130-
metadata=None):
131-
return grpc.experimental.unary_unary(request, target, '/indykite.entitymatching.v1beta1.EntityMatchingAPI/ReadEntityMatchingReport',
132-
indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadEntityMatchingReportRequest.SerializeToString,
133-
indykite_dot_entitymatching_dot_v1beta1_dot_entity__matching__api__pb2.ReadEntityMatchingReportResponse.FromString,
134-
options, channel_credentials,
135-
insecure, call_credentials, compression, wait_for_ready, timeout, metadata)

indykite_sdk/indykite/entitymatching/v1beta1/model_pb2.py

+5-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)