Refactor attribute response handling to utilize centralized key removal mapping

- Introduced a `KEYS_TO_REMOVE_MAPPING` dictionary in `tool_utils.py` to streamline the removal of unnecessary keys based on attribute types.
- Updated `process_attribute_response` to leverage this mapping, enhancing maintainability and reducing redundancy across multiple attribute handling files.
- Simplified the attribute response processing in `tools_account_attribute.py`, `tools_boolean_attribute.py`, `tools_datetime_attribute.py`, `tools_decimal_attribute.py`, `tools_document_attribute.py`, `tools_drawing_attribute.py`, `tools_duration_attribute.py`, `tools_enum_attribute.py`, `tools_image_attribute.py`, `tools_record_attribute.py`, `tools_role_attribute.py`, and `tools_text_attribute.py` by replacing manual key removal logic with a call to the updated function.

tools/attributes_tools/tools_account_attribute.py

@@ -137,39 +137,10 @@ def get_account_attribute(
 
     result = requests_._get_request(f"{ATTRIBUTE_ENDPOINT}/{application_system_name}/{attribute_global_alias}")
 
-    # Check if the request was successful and has the expected structure
-    if not result.get('success', False):
-        return result
-    
-    result_body = result.get('raw_response')
-    if result_body is None:
-        result.update({"error": "No response data received from server"})
-        return result
-    
-    # Check if result_body has the expected 'response' key
-    if not isinstance(result_body, dict) or 'response' not in result_body:
-        result.update({"error": "Unexpected response structure from server"})
-        return result
-
-    keys_to_remove = ['isUnique', 'isIndexed', 'isMandatory', 'isOwnership', 'imageColorType', 'imagePreserveAspectRatio']
-
-    for key in keys_to_remove:
-        if key in result_body['response']:
-            result_body['response'].pop(key, None)
-
-    # Extract the data
-    data = result_body['response']
-    
-    # Create the final result with the data
-    final_result = {
-        "success": True,
-        "status_code": result.get("status_code", 200),
-        "data": data,
-        "error": None
-    }
-    
-    validated = AttributeResult(**final_result)
-    return validated.model_dump()
+    return process_attribute_response(
+        request_result=result,
+        result_model=AttributeResult
+    )
 
 if __name__ == "__main__":
     results = edit_or_create_account_attribute.invoke({

tools/attributes_tools/tools_boolean_attribute.py

@@ -103,39 +103,10 @@ def get_boolean_attribute(
 
     result = requests_._get_request(f"{ATTRIBUTE_ENDPOINT}/{application_system_name}/{attribute_global_alias}")
 
-    # Check if the request was successful and has the expected structure
-    if not result.get('success', False):
-        return result
-    
-    result_body = result.get('raw_response')
-    if result_body is None:
-        result.update({"error": "No response data received from server"})
-        return result
-    
-    # Check if result_body has the expected 'response' key
-    if not isinstance(result_body, dict) or 'response' not in result_body:
-        result.update({"error": "Unexpected response structure from server"})
-        return result
-
-    keys_to_remove = ['isMultiValue', 'isMandatory', 'isOwnership', 'instanceGlobalAlias', 'imageColorType', 'imagePreserveAspectRatio']
-
-    for key in keys_to_remove:
-        if key in result_body['response']:
-            result_body['response'].pop(key, None)
-
-    # Extract the data
-    data = result_body['response']
-    
-    # Create the final result with the data
-    final_result = {
-        "success": True,
-        "status_code": result.get("status_code", 200),
-        "data": data,
-        "error": None
-    }
-    
-    validated = AttributeResult(**final_result)
-    return validated.model_dump()
+    return process_attribute_response(
+        request_result=result,
+        result_model=AttributeResult
+    )
 
 if __name__ == "__main__":
     results = edit_or_create_boolean_attribute.invoke({

tools/attributes_tools/tools_datetime_attribute.py

@@ -159,39 +159,10 @@ def get_date_time_attribute(
 
     result = requests_._get_request(f"{ATTRIBUTE_ENDPOINT}/{application_system_name}/{attribute_global_alias}")
 
-    # Check if the request was successful and has the expected structure
-    if not result.get('success', False):
-        return result
-    
-    result_body = result.get('raw_response')
-    if result_body is None:
-        result.update({"error": "No response data received from server"})
-        return result
-    
-    # Check if result_body has the expected 'response' key
-    if not isinstance(result_body, dict) or 'response' not in result_body:
-        result.update({"error": "Unexpected response structure from server"})
-        return result
-
-    keys_to_remove = ['isUnique', 'isIndexed', 'isMultiValue', 'isMandatory', 'isOwnership', 'instanceGlobalAlias', 'imageColorType', 'imagePreserveAspectRatio']
-
-    for key in keys_to_remove:
-        if key in result_body['response']:
-            result_body['response'].pop(key, None)
-
-    # Extract the data
-    data = result_body['response']
-    
-    # Create the final result with the data
-    final_result = {
-        "success": True,
-        "status_code": result.get("status_code", 200),
-        "data": data,
-        "error": None
-    }
-    
-    validated = AttributeResult(**final_result)
-    return validated.model_dump()
+    return process_attribute_response(
+        request_result=result,
+        result_model=AttributeResult
+    )
 
 if __name__ == "__main__":
     results = edit_or_create_date_time_attribute.invoke({

tools/attributes_tools/tools_decimal_attribute.py

@@ -129,39 +129,10 @@ def get_numeric_attribute(
 
     result = requests_._get_request(f"{ATTRIBUTE_ENDPOINT}/{application_system_name}/{attribute_global_alias}")
 
-    # Check if the request was successful and has the expected structure
-    if not result.get('success', False):
-        return result
-    
-    result_body = result.get('raw_response')
-    if result_body is None:
-        result.update({"error": "No response data received from server"})
-        return result
-    
-    # Check if result_body has the expected 'response' key
-    if not isinstance(result_body, dict) or 'response' not in result_body:
-        result.update({"error": "Unexpected response structure from server"})
-        return result
-
-    keys_to_remove = ['isMultiValue', 'isMandatory', 'isOwnership', 'instanceGlobalAlias', 'imageColorType', 'imagePreserveAspectRatio']
-
-    for key in keys_to_remove:
-        if key in result_body['response']:
-            result_body['response'].pop(key, None)
-
-    # Extract the data
-    data = result_body['response']
-    
-    # Create the final result with the data
-    final_result = {
-        "success": True,
-        "status_code": result.get("status_code", 200),
-        "data": data,
-        "error": None
-    }
-    
-    validated = AttributeResult(**final_result)
-    return validated.model_dump()
+    return process_attribute_response(
+        request_result=result,
+        result_model=AttributeResult
+    )
 
 if __name__ == "__main__":
     results = edit_or_create_numeric_attribute.invoke({

tools/attributes_tools/tools_document_attribute.py

@@ -85,7 +85,7 @@ def edit_or_create_document_attribute(
             "type": "Undefined",
             "alias": system_name
         },
-        "type": "String",
+        "type": "Document",
         "format": display_format,
         "name": name,
         "description": description,
@@ -156,39 +156,10 @@ def get_document_attribute(
 
     result = requests_._get_request(f"{ATTRIBUTE_ENDPOINT}/{application_system_name}/{attribute_global_alias}")
 
-    # Check if the request was successful and has the expected structure
-    if not result.get('success', False):
-        return result
-    
-    result_body = result.get('raw_response')
-    if result_body is None:
-        result.update({"error": "No response data received from server"})
-        return result
-    
-    # Check if result_body has the expected 'response' key
-    if not isinstance(result_body, dict) or 'response' not in result_body:
-        result.update({"error": "Unexpected response structure from server"})
-        return result
-
-    keys_to_remove = ['isTitle', 'isUnique', 'isCalculated', 'isMandatory', 'isOwnership', 'instanceGlobalAlias', 'imageColorType', 'imagePreserveAspectRatio']
-
-    for key in keys_to_remove:
-        if key in result_body['response']:
-            result_body['response'].pop(key, None)
-
-    # Extract the data
-    data = result_body['response']
-    
-    # Create the final result with the data
-    final_result = {
-        "success": True,
-        "status_code": result.get("status_code", 200),
-        "data": data,
-        "error": None
-    }
-    
-    validated = AttributeResult(**final_result)
-    return validated.model_dump()
+    return process_attribute_response(
+        request_result=result,
+        result_model=AttributeResult
+    )
 
 if __name__ == "__main__":
     results = edit_or_create_document_attribute.invoke({

tools/attributes_tools/tools_drawing_attribute.py

@@ -32,7 +32,7 @@ def edit_or_create_drawing_attribute(
             "type": "Undefined",
             "alias": system_name
         },
-        "type": "Image",
+        "type": "Drawing",
         "name": name,
         "description": description,
         "isTracked": write_changes_to_the_log
@@ -99,39 +99,10 @@ def get_drawing_attribute(
 
     result = requests_._get_request(f"{ATTRIBUTE_ENDPOINT}/{application_system_name}/{attribute_global_alias}")
 
-    # Check if the request was successful and has the expected structure
-    if not result.get('success', False):
-        return result
-    
-    result_body = result.get('raw_response')
-    if result_body is None:
-        result.update({"error": "No response data received from server"})
-        return result
-    
-    # Check if result_body has the expected 'response' key
-    if not isinstance(result_body, dict) or 'response' not in result_body:
-        result.update({"error": "Unexpected response structure from server"})
-        return result
-
-    keys_to_remove = ['isIndexed', 'isMultiValue', 'imageColorType', 'imagePreserveAspectRatio', 'isUnique', 'format', 'isCalculated', 'isTitle', 'isMandatory', 'isOwnership', 'instanceGlobalAlias']
-
-    for key in keys_to_remove:
-        if key in result_body['response']:
-            result_body['response'].pop(key, None)
-
-    # Extract the data
-    data = result_body['response']
-    
-    # Create the final result with the data
-    final_result = {
-        "success": True,
-        "status_code": result.get("status_code", 200),
-        "data": data,
-        "error": None
-    }
-    
-    validated = AttributeResult(**final_result)
-    return validated.model_dump()
+    return process_attribute_response(
+        request_result=result,
+        result_model=AttributeResult
+    )
 
 if __name__ == "__main__":
     results = edit_or_create_drawing_attribute.invoke({

tools/attributes_tools/tools_duration_attribute.py

@@ -147,39 +147,10 @@ def get_duration_attribute(
 
     result = requests_._get_request(f"{ATTRIBUTE_ENDPOINT}/{application_system_name}/{attribute_global_alias}")
 
-    # Check if the request was successful and has the expected structure
-    if not result.get('success', False):
-        return result
-    
-    result_body = result.get('raw_response')
-    if result_body is None:
-        result.update({"error": "No response data received from server"})
-        return result
-    
-    # Check if result_body has the expected 'response' key
-    if not isinstance(result_body, dict) or 'response' not in result_body:
-        result.update({"error": "Unexpected response structure from server"})
-        return result
-
-    keys_to_remove = ['isUnique', 'isIndexed', 'isMultiValue', 'isMandatory', 'isOwnership', 'instanceGlobalAlias', 'imageColorType', 'imagePreserveAspectRatio']
-
-    for key in keys_to_remove:
-        if key in result_body['response']:
-            result_body['response'].pop(key, None)
-
-    # Extract the data
-    data = result_body['response']
-    
-    # Create the final result with the data
-    final_result = {
-        "success": True,
-        "status_code": result.get("status_code", 200),
-        "data": data,
-        "error": None
-    }
-    
-    validated = AttributeResult(**final_result)
-    return validated.model_dump()
+    return process_attribute_response(
+        request_result=result,
+        result_model=AttributeResult
+    )
 
 if __name__ == "__main__":
     results = edit_or_create_duration_attribute.invoke({

tools/attributes_tools/tools_enum_attribute.py

@@ -206,11 +206,8 @@ def get_enum_attribute(
 
     result = requests_._get_request(f"{ATTRIBUTE_ENDPOINT}/{application_system_name}/{attribute_global_alias}")
 
-    keys_to_remove = ['isMultiValue', 'isMandatory', 'isOwnership', 'instanceGlobalAlias', 'imageColorType', 'imagePreserveAspectRatio']
-
     return process_attribute_response(
         request_result=result,
-        keys_to_remove=keys_to_remove,
         result_model=AttributeResult
     )
 

tools/attributes_tools/tools_image_attribute.py

@@ -172,39 +172,10 @@ def get_image_attribute(
 
     result = requests_._get_request(f"{ATTRIBUTE_ENDPOINT}/{application_system_name}/{attribute_global_alias}")
 
-    # Check if the request was successful and has the expected structure
-    if not result.get('success', False):
-        return result
-    
-    result_body = result.get('raw_response')
-    if result_body is None:
-        result.update({"error": "No response data received from server"})
-        return result
-    
-    # Check if result_body has the expected 'response' key
-    if not isinstance(result_body, dict) or 'response' not in result_body:
-        result.update({"error": "Unexpected response structure from server"})
-        return result
-
-    keys_to_remove = ['isUnique', 'format', 'isCalculated', 'isTitle', 'isMandatory', 'isOwnership', 'instanceGlobalAlias']
-
-    for key in keys_to_remove:
-        if key in result_body['response']:
-            result_body['response'].pop(key, None)
-
-    # Extract the data
-    data = result_body['response']
-    
-    # Create the final result with the data
-    final_result = {
-        "success": True,
-        "status_code": result.get("status_code", 200),
-        "data": data,
-        "error": None
-    }
-    
-    validated = AttributeResult(**final_result)
-    return validated.model_dump()
+    return process_attribute_response(
+        request_result=result,
+        result_model=AttributeResult
+    )
 
 if __name__ == "__main__":
     results = edit_or_create_image_attribute.invoke({

tools/attributes_tools/tools_record_attribute.py

@@ -138,39 +138,10 @@ def get_record_attribute(
 
     result = requests_._get_request(f"{ATTRIBUTE_ENDPOINT}/{application_system_name}/{attribute_global_alias}")
 
-    # Check if the request was successful and has the expected structure
-    if not result.get('success', False):
-        return result
-    
-    result_body = result.get('raw_response')
-    if result_body is None:
-        result.update({"error": "No response data received from server"})
-        return result
-    
-    # Check if result_body has the expected 'response' key
-    if not isinstance(result_body, dict) or 'response' not in result_body:
-        result.update({"error": "Unexpected response structure from server"})
-        return result
-
-    keys_to_remove = ['isTitle', 'isUnique', 'isIndexed', 'isMandatory', 'isOwnership', 'imageColorType', 'imagePreserveAspectRatio']
-
-    for key in keys_to_remove:
-        if key in result_body['response']:
-            result_body['response'].pop(key, None)
-
-    # Extract the data
-    data = result_body['response']
-    
-    # Create the final result with the data
-    final_result = {
-        "success": True,
-        "status_code": result.get("status_code", 200),
-        "data": data,
-        "error": None
-    }
-    
-    validated = AttributeResult(**final_result)
-    return validated.model_dump()
+    return process_attribute_response(
+        request_result=result,
+        result_model=AttributeResult
+    )
 
 if __name__ == "__main__":
     results = edit_or_create_record_attribute.invoke({

tools/attributes_tools/tools_role_attribute.py

@@ -39,7 +39,7 @@ def edit_or_create_role_attribute(
             "type": "Undefined",
             "alias": system_name
         },
-        "type": "Instance",
+        "type": "Role",
         "name": name,
         "description": description,
         "isTracked": write_changes_to_the_log,
@@ -113,39 +113,10 @@ def get_role_attribute(
 
     result = requests_._get_request(f"{ATTRIBUTE_ENDPOINT}/{application_system_name}/{attribute_global_alias}")
 
-    # Check if the request was successful and has the expected structure
-    if not result.get('success', False):
-        return result
-    
-    result_body = result.get('raw_response')
-    if result_body is None:
-        result.update({"error": "No response data received from server"})
-        return result
-    
-    # Check if result_body has the expected 'response' key
-    if not isinstance(result_body, dict) or 'response' not in result_body:
-        result.update({"error": "Unexpected response structure from server"})
-        return result
-
-    keys_to_remove = ['instanceGlobalAlias', 'isTitle', 'isUnique', 'isIndexed', 'isMandatory', 'isOwnership', 'imageColorType', 'imagePreserveAspectRatio']
-
-    for key in keys_to_remove:
-        if key in result_body['response']:
-            result_body['response'].pop(key, None)
-
-    # Extract the data
-    data = result_body['response']
-    
-    # Create the final result with the data
-    final_result = {
-        "success": True,
-        "status_code": result.get("status_code", 200),
-        "data": data,
-        "error": None
-    }
-    
-    validated = AttributeResult(**final_result)
-    return validated.model_dump()
+    return process_attribute_response(
+        request_result=result,
+        result_model=AttributeResult
+    )
 
 if __name__ == "__main__":
     results = edit_or_create_role_attribute.invoke({

tools/attributes_tools/tools_text_attribute.py

@@ -212,11 +212,8 @@ def get_text_attribute(
 
     result = requests_._get_request(f"{ATTRIBUTE_ENDPOINT}/{application_system_name}/{attribute_global_alias}")
 
-    keys_to_remove = ['isMultiValue', 'isMandatory', 'isOwnership', 'instanceGlobalAlias', 'imageColorType', 'imagePreserveAspectRatio']
-
     return process_attribute_response(
         request_result=result,
-        keys_to_remove=keys_to_remove,
         result_model=AttributeResult
     )
 

tools/tool_utils.py

@@ -11,6 +11,20 @@ from .models import (
 
 # Common constants
 ATTRIBUTE_ENDPOINT = "webapi/Attribute"
+KEYS_TO_REMOVE_MAPPING = {
+    "String": ['isMultiValue', 'isMandatory', 'isOwnership', 'instanceGlobalAlias', 'imageColorType', 'imagePreserveAspectRatio'],
+    "Role": ['instanceGlobalAlias', 'isTitle', 'isUnique', 'isIndexed', 'isMandatory', 'isOwnership', 'imageColorType', 'imagePreserveAspectRatio'],
+    "Instance": ['isTitle', 'isUnique', 'isIndexed', 'isMandatory', 'isOwnership', 'imageColorType', 'imagePreserveAspectRatio'],
+    "Image": ['isUnique', 'format', 'isCalculated', 'isTitle', 'isMandatory', 'isOwnership', 'instanceGlobalAlias'],
+    "Enum": ['isMultiValue', 'isMandatory', 'isOwnership', 'instanceGlobalAlias', 'imageColorType', 'imagePreserveAspectRatio'],
+    "Duration": ['isUnique', 'isIndexed', 'isMultiValue', 'isMandatory', 'isOwnership', 'instanceGlobalAlias', 'imageColorType', 'imagePreserveAspectRatio'],
+    "Drawing": ['isIndexed', 'isMultiValue', 'imageColorType', 'imagePreserveAspectRatio', 'isUnique', 'format', 'isCalculated', 'isTitle', 'isMandatory', 'isOwnership', 'instanceGlobalAlias'],
+    "Document": ['isTitle', 'isUnique', 'isCalculated', 'isMandatory', 'isOwnership', 'instanceGlobalAlias', 'imageColorType', 'imagePreserveAspectRatio'],
+    "Decimal": ['isMultiValue', 'isMandatory', 'isOwnership', 'instanceGlobalAlias', 'imageColorType', 'imagePreserveAspectRatio'],
+    "DateTime": ['isUnique', 'isIndexed', 'isMultiValue', 'isMandatory', 'isOwnership', 'instanceGlobalAlias', 'imageColorType', 'imagePreserveAspectRatio'],
+    "Boolean": ['isMultiValue', 'isMandatory', 'isOwnership', 'instanceGlobalAlias', 'imageColorType', 'imagePreserveAspectRatio'],
+    "Account": ['isUnique', 'isIndexed', 'isMandatory', 'isOwnership', 'imageColorType', 'imagePreserveAspectRatio']
+}
 
 def remove_nones(obj: Any) -> Any:
     """
@@ -33,7 +47,6 @@ def remove_nones(obj: Any) -> Any:
 
 def process_attribute_response(
     request_result: Dict[str, Any],
-    keys_to_remove: List[str],
     result_model: Type[BaseModel]
 ) -> Dict[str, Any]:
     """
@@ -78,8 +91,12 @@ def process_attribute_response(
     # Копируем данные, чтобы не мутировать оригинал
     attribute_data = raw_response['response'].copy() if isinstance(raw_response['response'], dict) else raw_response['response']
 
-    # Удаляем ненужные ключи (если это словарь)
+    # Работаем только если attribute_data - словарь
     if isinstance(attribute_data, dict):
+        # Определяем тип атрибута
+        attr_type = attribute_data.get("type")
+        keys_to_remove = KEYS_TO_REMOVE_MAPPING.get(attr_type, []) # по умолчанию - пустой список
+        # Удаляем ненужные ключи (если это словарь)
         for key in keys_to_remove:
             attribute_data.pop(key, None)
 
@@ -93,7 +110,7 @@ def process_attribute_response(
             if "alias" in global_alias:
                 attribute_data["alias"] = global_alias["alias"]
             # type игнорируется и не добавляется
-            
+
 
     # Формируем финальный результат
     final_result = {