!986 change restful api to keep same format

From: @yelihua
Reviewed-by: @wangyue01,@ouwenchang,@lilongfei15
Signed-off-by: @lilongfei15

mindinsight/backend/debugger/debugger_api.py

@@ -59,7 +59,7 @@ def _wrap_reply(func, *args, **kwargs):
     return jsonify(reply)
 
 
-@BLUEPRINT.route("/debugger/poll_data", methods=["GET"])
+@BLUEPRINT.route("/debugger/poll-data", methods=["GET"])
 def poll_data():
     """
     Wait for data to be updated on UI.
@@ -70,7 +70,7 @@ def poll_data():
         str, the updated data.
 
     Examples:
-        >>> Get http://xxxx/v1/mindinsight/debugger/poll_data?pos=xx
+        >>> Get http://xxxx/v1/mindinsight/debugger/poll-data?pos=xx
     """
     pos = request.args.get('pos')
 
@@ -160,7 +160,7 @@ def retrieve():
     return reply
 
 
-@BLUEPRINT.route("/debugger/retrieve_tensor_history", methods=["POST"])
+@BLUEPRINT.route("/debugger/tensor-history", methods=["POST"])
 def retrieve_tensor_history():
     """
     Retrieve data according to mode and params.
@@ -169,7 +169,7 @@ def retrieve_tensor_history():
         str, the required data.
 
     Examples:
-        >>> POST http://xxxx/v1/mindinsight/debugger/retrieve_tensor_history
+        >>> POST http://xxxx/v1/mindinsight/debugger/tensor-history
     """
     body = _read_post_request(request)
     name = body.get('name')
@@ -199,7 +199,7 @@ def retrieve_tensor_value():
     return reply
 
 
-@BLUEPRINT.route("/debugger/create_watchpoint", methods=["POST"])
+@BLUEPRINT.route("/debugger/create-watchpoint", methods=["POST"])
 def create_watchpoint():
     """
     Create watchpoint.
@@ -211,7 +211,7 @@ def create_watchpoint():
         MindInsightException: If method fails to be called.
 
     Examples:
-        >>> POST http://xxxx/v1/mindinsight/debugger/create_watchpoint
+        >>> POST http://xxxx/v1/mindinsight/debugger/create-watchpoint
     """
     params = _read_post_request(request)
     params['watch_condition'] = params.pop('condition', None)
@@ -219,7 +219,7 @@ def create_watchpoint():
     return reply
 
 
-@BLUEPRINT.route("/debugger/update_watchpoint", methods=["POST"])
+@BLUEPRINT.route("/debugger/update-watchpoint", methods=["POST"])
 def update_watchpoint():
     """
     Update watchpoint.
@@ -231,14 +231,14 @@ def update_watchpoint():
         MindInsightException: If method fails to be called.
 
     Examples:
-        >>> POST http://xxxx/v1/mindinsight/debugger/update_watchpoint
+        >>> POST http://xxxx/v1/mindinsight/debugger/update-watchpoint
     """
     params = _read_post_request(request)
     reply = _wrap_reply(BACKEND_SERVER.update_watchpoint, params)
     return reply
 
 
-@BLUEPRINT.route("/debugger/delete_watchpoint", methods=["POST"])
+@BLUEPRINT.route("/debugger/delete-watchpoint", methods=["POST"])
 def delete_watchpoint():
     """
     delete watchpoint.
@@ -250,7 +250,7 @@ def delete_watchpoint():
         MindInsightException: If method fails to be called.
 
     Examples:
-        >>> POST http://xxxx/v1/mindinsight/debugger/delete_watchpoint
+        >>> POST http://xxxx/v1/mindinsight/debugger/delete-watchpoint
     """
     body = _read_post_request(request)
 

mindinsight/ui/src/services/request-service.js

@@ -312,7 +312,7 @@ export default {
   pollData(params) {
     return axios({
       method: 'get',
-      url: 'v1/mindinsight/debugger/poll_data',
+      url: 'v1/mindinsight/debugger/poll-data',
       params: params,
       headers: {
         ignoreError: true,
@@ -329,21 +329,21 @@ export default {
   createWatchpoint(params) {
     return axios({
       method: 'post',
-      url: 'v1/mindinsight/debugger/create_watchpoint',
+      url: 'v1/mindinsight/debugger/create-watchpoint',
       data: params,
     });
   },
   updateWatchpoint(params) {
     return axios({
       method: 'post',
-      url: 'v1/mindinsight/debugger/update_watchpoint',
+      url: 'v1/mindinsight/debugger/update-watchpoint',
       data: params,
     });
   },
   deleteWatchpoint(params) {
     return axios({
       method: 'post',
-      url: 'v1/mindinsight/debugger/delete_watchpoint',
+      url: 'v1/mindinsight/debugger/delete-watchpoint',
       data: params,
     });
   },
@@ -385,7 +385,7 @@ export default {
   retrieveTensorHistory(params) {
     return axios({
       method: 'post',
-      url: 'v1/mindinsight/debugger/retrieve_tensor_history',
+      url: 'v1/mindinsight/debugger/tensor-history',
       data: params,
     });
   },

tests/st/func/debugger/test_restful_api.py

@@ -141,7 +141,7 @@ class TestAscendDebugger:
             for idx, condition in enumerate(conditions):
                 create_watchpoint(app_client, condition, idx + 1)
             # delete 4-th watchpoint
-            url = 'delete_watchpoint'
+            url = 'delete-watchpoint'
             body_data = {'watch_point_id': 4}
             get_request_result(app_client, url, body_data)
             # test watchpoint list
@@ -166,7 +166,7 @@ class TestAscendDebugger:
             condition = {'id': 'tensor_too_large', 'params': [{'name': 'max_gt', 'value': 1.0}]}
             create_watchpoint(app_client, condition, watch_point_id)
             # update watchpoint watchpoint list
-            url = 'update_watchpoint'
+            url = 'update-watchpoint'
             body_data = {'watch_point_id': watch_point_id,
                          'watch_nodes': [leaf_node_name],
                          'mode': 0}
@@ -218,13 +218,13 @@ class TestAscendDebugger:
         with self._debugger_client.get_thread_instance():
             check_state(app_client)
             # prepare tensor value
-            url = 'retrieve_tensor_history'
+            url = 'tensor-history'
             body_data = {'name': node_name}
             expect_file = 'retrieve_empty_tensor_history.json'
             send_and_compare_result(app_client, url, body_data, expect_file)
             # check full tensor history from poll data
             res = get_request_result(
-                app_client=app_client, url='poll_data', body_data={'pos': 0}, method='get')
+                app_client=app_client, url='poll-data', body_data={'pos': 0}, method='get')
             assert res.get('receive_tensor', {}).get('node_name') == node_name
             expect_file = 'retrieve_full_tensor_history.json'
             send_and_compare_result(app_client, url, body_data, expect_file)
@@ -257,9 +257,9 @@ class TestAscendDebugger:
             get_request_result(app_client, url, body_data)
             check_state(app_client)
             get_request_result(
-                app_client=app_client, url='retrieve_tensor_history', body_data={'name': node_name})
+                app_client=app_client, url='tensor-history', body_data={'name': node_name})
             res = get_request_result(
-                app_client=app_client, url='poll_data', body_data={'pos': 0}, method='get')
+                app_client=app_client, url='poll-data', body_data={'pos': 0}, method='get')
             assert res.get('receive_tensor', {}).get('node_name') == node_name
             # get compare results
             url = 'tensor-comparisons'
@@ -322,16 +322,16 @@ class TestAscendDebugger:
     @pytest.mark.platform_x86_gpu_training
     @pytest.mark.platform_x86_ascend_training
     @pytest.mark.parametrize("url, body_data, enable_recheck", [
-        ('create_watchpoint',
+        ('create-watchpoint',
          {'condition': {'id': 'tensor_too_large', 'params': [{'name': 'max_gt', 'value': 1.0}]},
           'watch_nodes': ['Default']}, True),
-        ('update_watchpoint',
+        ('update-watchpoint',
          {'watch_point_id': 1, 'watch_nodes': ['Default/optimizer-Momentum/Parameter[18]_7'],
           'mode': 0}, True),
-        ('update_watchpoint',
+        ('update-watchpoint',
          {'watch_point_id': 1, 'watch_nodes': ['Default/optimizer-Momentum'],
           'mode': 1}, True),
-        ('delete_watchpoint', {}, True)
+        ('delete-watchpoint', {}, True)
     ])
     def test_recheck(self, app_client, url, body_data, enable_recheck):
         """Test recheck."""
@@ -382,7 +382,7 @@ class TestAscendDebugger:
             get_request_result(app_client, url, body_data, method='GET')
             # check full tensor history from poll data
             res = get_request_result(
-                app_client=app_client, url='poll_data', body_data={'pos': 0}, method='get')
+                app_client=app_client, url='poll-data', body_data={'pos': 0}, method='get')
             assert res.get('receive_tensor', {}).get('tensor_name') == body_data.get('tensor_name')
             send_and_compare_result(app_client, url, body_data, expect_file, method='GET')
             send_terminate_cmd(app_client)
@@ -429,31 +429,31 @@ class TestGPUDebugger:
     @pytest.mark.platform_x86_gpu_training
     @pytest.mark.platform_x86_ascend_training
     @pytest.mark.parametrize("url, body_data, enable_recheck", [
-        ('create_watchpoint',
+        ('create-watchpoint',
          {'condition': {'id': 'tensor_too_large', 'params': [{'name': 'max_gt', 'value': 1.0}]},
           'watch_nodes': ['Default']}, True),
-        ('create_watchpoint',
+        ('create-watchpoint',
          {'condition': {'id': 'tensor_too_large', 'params': [{'name': 'max_gt', 'value': 1.0}]},
           'watch_nodes': ['Default/TransData-op99']}, True),
-        ('update_watchpoint',
+        ('update-watchpoint',
          {'watch_point_id': 1, 'watch_nodes': ['Default/optimizer-Momentum/Parameter[18]_7'],
           'mode': 0}, True),
-        ('update_watchpoint',
+        ('update-watchpoint',
          {'watch_point_id': 1, 'watch_nodes': ['Default/optimizer-Momentum'],
           'mode': 1}, True),
-        ('update_watchpoint',
+        ('update-watchpoint',
          [{'watch_point_id': 1, 'watch_nodes': ['Default/optimizer-Momentum'],
            'mode': 1},
           {'watch_point_id': 1, 'watch_nodes': ['Default/optimizer-Momentum'],
            'mode': 0}
           ], True),
-        ('update_watchpoint',
+        ('update-watchpoint',
          [{'watch_point_id': 1, 'watch_nodes': ['Default/TransData-op99'],
            'mode': 0},
           {'watch_point_id': 1, 'watch_nodes': ['Default/TransData-op99'],
            'mode': 1}
           ], True),
-        ('delete_watchpoint', {'watch_point_id': 1}, True)
+        ('delete-watchpoint', {'watch_point_id': 1}, True)
     ])
     def test_recheck_state(self, app_client, url, body_data, enable_recheck):
         """Test update watchpoint and check the value of enable_recheck."""
@@ -585,7 +585,7 @@ class TestMultiGraphDebugger:
     ])
     def test_create_watchpoint(self, app_client, filter_condition, expect_id):
         """Test create watchpoint with multiple graphs."""
-        url = 'create_watchpoint'
+        url = 'create-watchpoint'
         with self._debugger_client.get_thread_instance():
             check_state(app_client)
             res = get_request_result(app_client, url, filter_condition)
@@ -649,7 +649,7 @@ class TestMultiGraphDebugger:
 
 def create_watchpoint(app_client, condition, expect_id):
     """Create watchpoint."""
-    url = 'create_watchpoint'
+    url = 'create-watchpoint'
     body_data = {'condition': condition,
                  'watch_nodes': ['Default/optimizer-Momentum/Parameter[18]_7',
                                  'Default/optimizer-Momentum/Parameter[18]_7/moments.fc3.bias',