| @@ -226,7 +226,7 @@ class SearchModelConditionParameter(Schema): | |||||
| if not isinstance(attr, str): | if not isinstance(attr, str): | ||||
| raise LineageParamValueError('The search attribute not supported.') | raise LineageParamValueError('The search attribute not supported.') | ||||
| if attr not in FIELD_MAPPING and not attr.startswith(('metric/','user_defined/')): | |||||
| if attr not in FIELD_MAPPING and not attr.startswith(('metric/', 'user_defined/')): | |||||
| raise LineageParamValueError('The search attribute not supported.') | raise LineageParamValueError('The search attribute not supported.') | ||||
| if not isinstance(condition, dict): | if not isinstance(condition, dict): | ||||
| @@ -354,9 +354,8 @@ def validate_condition(search_condition): | |||||
| log.error(err_msg) | log.error(err_msg) | ||||
| raise LineageParamValueError(err_msg) | raise LineageParamValueError(err_msg) | ||||
| if not (sorted_name in FIELD_MAPPING | if not (sorted_name in FIELD_MAPPING | ||||
| or (sorted_name.startswith('metric/') and len(sorted_name) > 7) | |||||
| or (sorted_name.startswith('user_defined/') and len(sorted_name) > 13) | |||||
| ): | |||||
| or (sorted_name.startswith('metric/') and len(sorted_name) > 7) | |||||
| or (sorted_name.startswith('user_defined/') and len(sorted_name) > 13)): | |||||
| log.error(err_msg) | log.error(err_msg) | ||||
| raise LineageParamValueError(err_msg) | raise LineageParamValueError(err_msg) | ||||
| @@ -429,4 +428,4 @@ def validate_user_defined_info(user_defined_info): | |||||
| all_keys = field_map | user_defined_keys | all_keys = field_map | user_defined_keys | ||||
| if len(field_map) + len(user_defined_keys) != len(all_keys): | if len(field_map) + len(user_defined_keys) != len(all_keys): | ||||
| raise LineageParamValueError("There are some keys have defined in lineage.") | |||||
| raise LineageParamValueError("There are some keys have defined in lineage.") | |||||
| @@ -15,8 +15,8 @@ | |||||
| """The converter between proto format event of lineage and dict.""" | """The converter between proto format event of lineage and dict.""" | ||||
| import time | import time | ||||
| from mindinsight.datavisual.proto_files.mindinsight_lineage_pb2 import LineageEvent, UserDefinedInfo | |||||
| from mindinsight.lineagemgr.common.exceptions.exceptions import LineageParamTypeError,\ | |||||
| from mindinsight.datavisual.proto_files.mindinsight_lineage_pb2 import LineageEvent | |||||
| from mindinsight.lineagemgr.common.exceptions.exceptions import LineageParamTypeError, \ | |||||
| LineageParamValueError | LineageParamValueError | ||||
| from mindinsight.lineagemgr.common.log import logger as log | from mindinsight.lineagemgr.common.log import logger as log | ||||
| @@ -345,4 +345,4 @@ def _package_user_defined_info(user_defined_dict, user_defined_message): | |||||
| try: | try: | ||||
| getattr(add_user_defined_info, attr_name)[key] = value | getattr(add_user_defined_info, attr_name)[key] = value | ||||
| except ValueError: | except ValueError: | ||||
| raise LineageParamValueError("Value is out of range or not be supported yet.") | |||||
| raise LineageParamValueError("Value is out of range or not be supported yet.") | |||||
| @@ -179,4 +179,4 @@ class LineageSummary: | |||||
| """ | """ | ||||
| self.event_writer.write_event_to_file( | self.event_writer.write_event_to_file( | ||||
| package_user_defined_info(user_dict).SerializeToString() | package_user_defined_info(user_dict).SerializeToString() | ||||
| ) | |||||
| ) | |||||
| @@ -30,10 +30,9 @@ from mindinsight.lineagemgr import filter_summary_lineage, get_summary_lineage | |||||
| from mindinsight.lineagemgr.common.exceptions.exceptions import (LineageFileNotFoundError, LineageParamSummaryPathError, | from mindinsight.lineagemgr.common.exceptions.exceptions import (LineageFileNotFoundError, LineageParamSummaryPathError, | ||||
| LineageParamTypeError, LineageParamValueError, | LineageParamTypeError, LineageParamValueError, | ||||
| LineageSearchConditionParamError) | LineageSearchConditionParamError) | ||||
| from ..conftest import BASE_SUMMARY_DIR, DATASET_GRAPH, SUMMARY_DIR, SUMMARY_DIR_2 | from ..conftest import BASE_SUMMARY_DIR, DATASET_GRAPH, SUMMARY_DIR, SUMMARY_DIR_2 | ||||
| from .....ut.lineagemgr.querier import event_data | from .....ut.lineagemgr.querier import event_data | ||||
| from os import environ | |||||
| LINEAGE_INFO_RUN1 = { | LINEAGE_INFO_RUN1 = { | ||||
| 'summary_dir': os.path.join(BASE_SUMMARY_DIR, 'run1'), | 'summary_dir': os.path.join(BASE_SUMMARY_DIR, 'run1'), | ||||
| 'metric': { | 'metric': { | ||||