From 72ed214b41e6cfc3f55b9c7d9783320863f566fa Mon Sep 17 00:00:00 2001
From: xiaoxialulu <546464268@qq.com>
Date: Thu, 26 Sep 2024 10:57:56 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Aproto=20message=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
unit-backend/.idea/workspace.xml | 33 +++++++++--------
.../api/services/protos/executor.proto | 29 +++++++++------
.../api/services/protos/executor_pb2.py | 36 ++++++++++---------
unit-backend/logs/EasyPost_collect.log | 6 ++++
unit-executor/protos/executor.proto | 29 +++++++++------
unit-executor/protos/executor_pb2.py | 36 ++++++++++---------
6 files changed, 100 insertions(+), 69 deletions(-)
diff --git a/unit-backend/.idea/workspace.xml b/unit-backend/.idea/workspace.xml
index a2e1337..99535b4 100644
--- a/unit-backend/.idea/workspace.xml
+++ b/unit-backend/.idea/workspace.xml
@@ -4,10 +4,13 @@
-
-
+
+
+
+
-
+
+
@@ -534,15 +537,7 @@
-
-
-
-
- 1715849805458
-
-
-
- 1715849805458
+
@@ -928,7 +923,15 @@
1727259278112
-
+
+
+ 1727317446270
+
+
+
+ 1727317446270
+
+
@@ -958,7 +961,6 @@
-
@@ -983,7 +985,8 @@
-
+
+
diff --git a/unit-backend/api/services/protos/executor.proto b/unit-backend/api/services/protos/executor.proto
index 19c9402..5ec08b0 100644
--- a/unit-backend/api/services/protos/executor.proto
+++ b/unit-backend/api/services/protos/executor.proto
@@ -25,18 +25,27 @@ message Extract {
string env = 4;
}
+message Parameters {
+ string count = 1;
+ string key_variable = 2;
+ string operator = 3;
+ string value_variable = 4;
+ string timeout = 5;
+}
message ApiDocRequest {
- string mode = 1;
- string title = 2;
- Interface interface = 3;
- map headers = 4;
- Request request = 5;
- string setup_script = 6;
- string teardown_script = 7;
- repeated Extract extract = 8;
- repeated Validators validators = 9;
- repeated ApiDocRequest children = 10;
+ string type = 1;
+ string mode = 2;
+ string title = 3;
+ Interface interface = 4;
+ map headers = 5;
+ Request request = 6;
+ string setup_script = 7;
+ string teardown_script = 8;
+ repeated Extract extract = 9;
+ repeated Validators validators = 10;
+ repeated ApiDocRequest children = 11;
+ Parameters parameters = 12;
}
message ValidateExtractor {
diff --git a/unit-backend/api/services/protos/executor_pb2.py b/unit-backend/api/services/protos/executor_pb2.py
index aafa9ec..c23601d 100644
--- a/unit-backend/api/services/protos/executor_pb2.py
+++ b/unit-backend/api/services/protos/executor_pb2.py
@@ -14,7 +14,7 @@
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0e\x65xecutor.proto\"6\n\tInterface\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0e\n\x06method\x18\x03 \x01(\t\"<\n\nValidators\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x0e\n\x06\x61\x63tual\x18\x02 \x01(\t\x12\x0e\n\x06\x65xpect\x18\x03 \x01(\t\"\xa7\x01\n\x07Request\x12 \n\x04\x64\x61ta\x18\x01 \x03(\x0b\x32\x12.Request.DataEntry\x12 \n\x04json\x18\x02 \x03(\x0b\x32\x12.Request.JsonEntry\x1a+\n\tDataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a+\n\tJsonEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"G\n\x07\x45xtract\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x03 \x01(\t\x12\x0b\n\x03\x65nv\x18\x04 \x01(\t\"\xd1\x02\n\rApiDocRequest\x12\x0c\n\x04mode\x18\x01 \x01(\t\x12\r\n\x05title\x18\x02 \x01(\t\x12\x1d\n\tinterface\x18\x03 \x01(\x0b\x32\n.Interface\x12,\n\x07headers\x18\x04 \x03(\x0b\x32\x1b.ApiDocRequest.HeadersEntry\x12\x19\n\x07request\x18\x05 \x01(\x0b\x32\x08.Request\x12\x14\n\x0csetup_script\x18\x06 \x01(\t\x12\x17\n\x0fteardown_script\x18\x07 \x01(\t\x12\x19\n\x07\x65xtract\x18\x08 \x03(\x0b\x32\x08.Extract\x12\x1f\n\nvalidators\x18\t \x03(\x0b\x32\x0b.Validators\x12 \n\x08\x63hildren\x18\n \x03(\x0b\x32\x0e.ApiDocRequest\x1a.\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"u\n\x11ValidateExtractor\x12\x10\n\x08\x65xpected\x18\x01 \x01(\t\x12\x0f\n\x07methods\x18\x02 \x01(\t\x12\x0e\n\x06\x61\x63tual\x18\x03 \x01(\t\x12\x0e\n\x06result\x18\x04 \x01(\t\x12\r\n\x05state\x18\x05 \x01(\t\x12\x0e\n\x06\x65xpect\x18\x06 \x01(\t\"w\n\rDataExtractor\x12\x11\n\tvars_name\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x12\n\nexpression\x18\x03 \x01(\t\x12\x12\n\nresult_val\x18\x04 \x01(\t\x12\x0e\n\x06result\x18\x05 \x01(\t\x12\r\n\x05state\x18\x06 \x01(\t\"\xc4\x03\n\x05\x43\x61ses\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08log_data\x18\x02 \x03(\t\x12\r\n\x05l_env\x18\x03 \x03(\t\x12\r\n\x05g_env\x18\x04 \x03(\t\x12\x10\n\x08hook_gen\x18\x05 \x03(\t\x12\x0b\n\x03url\x18\x06 \x01(\t\x12\x0e\n\x06method\x18\x07 \x01(\t\x12\x13\n\x0bstatus_code\x18\x08 \x01(\x05\x12\x16\n\x0e\x63ontent_length\x18\t \x01(\x03\x12\x14\n\x0c\x63ontent_type\x18\n \x01(\t\x12\x17\n\x0fresponse_header\x18\x0b \x01(\t\x12\x17\n\x0frequests_header\x18\x0c \x01(\t\x12\x15\n\rresponse_body\x18\r \x01(\t\x12\x1a\n\x12performance_figure\x18\x0e \x01(\t\x12\r\n\x05\x63ount\x18\x0f \x01(\x05\x12\r\n\x05state\x18\x10 \x01(\t\x12\x0b\n\x03tag\x18\x11 \x01(\t\x12\x10\n\x08run_time\x18\x12 \x01(\t\x12.\n\x12validate_extractor\x18\x13 \x03(\x0b\x32\x12.ValidateExtractor\x12&\n\x0e\x64\x61ta_extractor\x18\x14 \x03(\x0b\x32\x0e.DataExtractor\x12\x11\n\terror_msg\x18\x15 \x01(\t\"\x87\x01\n\tClassList\x12\x0b\n\x03\x61ll\x18\x01 \x01(\x05\x12\x0f\n\x07success\x18\x02 \x01(\x05\x12\r\n\x05\x65rror\x18\x03 \x01(\x05\x12\x0c\n\x04\x66\x61il\x18\x04 \x01(\x05\x12\x15\n\x05\x63\x61ses\x18\x05 \x03(\x0b\x32\x06.Cases\x12\x0b\n\x03res\x18\x06 \x01(\t\x12\x0c\n\x04name\x18\x07 \x01(\t\x12\r\n\x05state\x18\x08 \x01(\t\"\xd3\x01\n\x0e\x41piDocResponse\x12\x0b\n\x03\x61ll\x18\x01 \x01(\x05\x12\x0f\n\x07success\x18\x02 \x01(\x05\x12\r\n\x05\x65rror\x18\x03 \x01(\x05\x12\x0c\n\x04\x66\x61il\x18\x04 \x01(\x05\x12\x0f\n\x07runtime\x18\x05 \x01(\t\x12\x0f\n\x07\x61rgtime\x18\x06 \x01(\t\x12\x12\n\nbegin_time\x18\x07 \x01(\t\x12\x11\n\tpass_rate\x18\x08 \x01(\t\x12\r\n\x05state\x18\t \x01(\t\x12\x0e\n\x06tester\x18\n \x01(\t\x12\x1e\n\nclass_list\x18\x0b \x03(\x0b\x32\n.ClassList2?\n\x0f\x45xecutorService\x12,\n\tRunApiDoc\x12\x0e.ApiDocRequest\x1a\x0f.ApiDocResponseb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0e\x65xecutor.proto\"6\n\tInterface\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0e\n\x06method\x18\x03 \x01(\t\"<\n\nValidators\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x0e\n\x06\x61\x63tual\x18\x02 \x01(\t\x12\x0e\n\x06\x65xpect\x18\x03 \x01(\t\"\xa7\x01\n\x07Request\x12 \n\x04\x64\x61ta\x18\x01 \x03(\x0b\x32\x12.Request.DataEntry\x12 \n\x04json\x18\x02 \x03(\x0b\x32\x12.Request.JsonEntry\x1a+\n\tDataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a+\n\tJsonEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"G\n\x07\x45xtract\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x03 \x01(\t\x12\x0b\n\x03\x65nv\x18\x04 \x01(\t\"l\n\nParameters\x12\r\n\x05\x63ount\x18\x01 \x01(\t\x12\x14\n\x0ckey_variable\x18\x02 \x01(\t\x12\x10\n\x08operator\x18\x03 \x01(\t\x12\x16\n\x0evalue_variable\x18\x04 \x01(\t\x12\x0f\n\x07timeout\x18\x05 \x01(\t\"\x80\x03\n\rApiDocRequest\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x0c\n\x04mode\x18\x02 \x01(\t\x12\r\n\x05title\x18\x03 \x01(\t\x12\x1d\n\tinterface\x18\x04 \x01(\x0b\x32\n.Interface\x12,\n\x07headers\x18\x05 \x03(\x0b\x32\x1b.ApiDocRequest.HeadersEntry\x12\x19\n\x07request\x18\x06 \x01(\x0b\x32\x08.Request\x12\x14\n\x0csetup_script\x18\x07 \x01(\t\x12\x17\n\x0fteardown_script\x18\x08 \x01(\t\x12\x19\n\x07\x65xtract\x18\t \x03(\x0b\x32\x08.Extract\x12\x1f\n\nvalidators\x18\n \x03(\x0b\x32\x0b.Validators\x12 \n\x08\x63hildren\x18\x0b \x03(\x0b\x32\x0e.ApiDocRequest\x12\x1f\n\nparameters\x18\x0c \x01(\x0b\x32\x0b.Parameters\x1a.\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"u\n\x11ValidateExtractor\x12\x10\n\x08\x65xpected\x18\x01 \x01(\t\x12\x0f\n\x07methods\x18\x02 \x01(\t\x12\x0e\n\x06\x61\x63tual\x18\x03 \x01(\t\x12\x0e\n\x06result\x18\x04 \x01(\t\x12\r\n\x05state\x18\x05 \x01(\t\x12\x0e\n\x06\x65xpect\x18\x06 \x01(\t\"w\n\rDataExtractor\x12\x11\n\tvars_name\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x12\n\nexpression\x18\x03 \x01(\t\x12\x12\n\nresult_val\x18\x04 \x01(\t\x12\x0e\n\x06result\x18\x05 \x01(\t\x12\r\n\x05state\x18\x06 \x01(\t\"\xc4\x03\n\x05\x43\x61ses\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08log_data\x18\x02 \x03(\t\x12\r\n\x05l_env\x18\x03 \x03(\t\x12\r\n\x05g_env\x18\x04 \x03(\t\x12\x10\n\x08hook_gen\x18\x05 \x03(\t\x12\x0b\n\x03url\x18\x06 \x01(\t\x12\x0e\n\x06method\x18\x07 \x01(\t\x12\x13\n\x0bstatus_code\x18\x08 \x01(\x05\x12\x16\n\x0e\x63ontent_length\x18\t \x01(\x03\x12\x14\n\x0c\x63ontent_type\x18\n \x01(\t\x12\x17\n\x0fresponse_header\x18\x0b \x01(\t\x12\x17\n\x0frequests_header\x18\x0c \x01(\t\x12\x15\n\rresponse_body\x18\r \x01(\t\x12\x1a\n\x12performance_figure\x18\x0e \x01(\t\x12\r\n\x05\x63ount\x18\x0f \x01(\x05\x12\r\n\x05state\x18\x10 \x01(\t\x12\x0b\n\x03tag\x18\x11 \x01(\t\x12\x10\n\x08run_time\x18\x12 \x01(\t\x12.\n\x12validate_extractor\x18\x13 \x03(\x0b\x32\x12.ValidateExtractor\x12&\n\x0e\x64\x61ta_extractor\x18\x14 \x03(\x0b\x32\x0e.DataExtractor\x12\x11\n\terror_msg\x18\x15 \x01(\t\"\x87\x01\n\tClassList\x12\x0b\n\x03\x61ll\x18\x01 \x01(\x05\x12\x0f\n\x07success\x18\x02 \x01(\x05\x12\r\n\x05\x65rror\x18\x03 \x01(\x05\x12\x0c\n\x04\x66\x61il\x18\x04 \x01(\x05\x12\x15\n\x05\x63\x61ses\x18\x05 \x03(\x0b\x32\x06.Cases\x12\x0b\n\x03res\x18\x06 \x01(\t\x12\x0c\n\x04name\x18\x07 \x01(\t\x12\r\n\x05state\x18\x08 \x01(\t\"\xd3\x01\n\x0e\x41piDocResponse\x12\x0b\n\x03\x61ll\x18\x01 \x01(\x05\x12\x0f\n\x07success\x18\x02 \x01(\x05\x12\r\n\x05\x65rror\x18\x03 \x01(\x05\x12\x0c\n\x04\x66\x61il\x18\x04 \x01(\x05\x12\x0f\n\x07runtime\x18\x05 \x01(\t\x12\x0f\n\x07\x61rgtime\x18\x06 \x01(\t\x12\x12\n\nbegin_time\x18\x07 \x01(\t\x12\x11\n\tpass_rate\x18\x08 \x01(\t\x12\r\n\x05state\x18\t \x01(\t\x12\x0e\n\x06tester\x18\n \x01(\t\x12\x1e\n\nclass_list\x18\x0b \x03(\x0b\x32\n.ClassList2?\n\x0f\x45xecutorService\x12,\n\tRunApiDoc\x12\x0e.ApiDocRequest\x1a\x0f.ApiDocResponseb\x06proto3')
_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -39,20 +39,22 @@
_globals['_REQUEST_JSONENTRY']._serialized_end=304
_globals['_EXTRACT']._serialized_start=306
_globals['_EXTRACT']._serialized_end=377
- _globals['_APIDOCREQUEST']._serialized_start=380
- _globals['_APIDOCREQUEST']._serialized_end=717
- _globals['_APIDOCREQUEST_HEADERSENTRY']._serialized_start=671
- _globals['_APIDOCREQUEST_HEADERSENTRY']._serialized_end=717
- _globals['_VALIDATEEXTRACTOR']._serialized_start=719
- _globals['_VALIDATEEXTRACTOR']._serialized_end=836
- _globals['_DATAEXTRACTOR']._serialized_start=838
- _globals['_DATAEXTRACTOR']._serialized_end=957
- _globals['_CASES']._serialized_start=960
- _globals['_CASES']._serialized_end=1412
- _globals['_CLASSLIST']._serialized_start=1415
- _globals['_CLASSLIST']._serialized_end=1550
- _globals['_APIDOCRESPONSE']._serialized_start=1553
- _globals['_APIDOCRESPONSE']._serialized_end=1764
- _globals['_EXECUTORSERVICE']._serialized_start=1766
- _globals['_EXECUTORSERVICE']._serialized_end=1829
+ _globals['_PARAMETERS']._serialized_start=379
+ _globals['_PARAMETERS']._serialized_end=487
+ _globals['_APIDOCREQUEST']._serialized_start=490
+ _globals['_APIDOCREQUEST']._serialized_end=874
+ _globals['_APIDOCREQUEST_HEADERSENTRY']._serialized_start=828
+ _globals['_APIDOCREQUEST_HEADERSENTRY']._serialized_end=874
+ _globals['_VALIDATEEXTRACTOR']._serialized_start=876
+ _globals['_VALIDATEEXTRACTOR']._serialized_end=993
+ _globals['_DATAEXTRACTOR']._serialized_start=995
+ _globals['_DATAEXTRACTOR']._serialized_end=1114
+ _globals['_CASES']._serialized_start=1117
+ _globals['_CASES']._serialized_end=1569
+ _globals['_CLASSLIST']._serialized_start=1572
+ _globals['_CLASSLIST']._serialized_end=1707
+ _globals['_APIDOCRESPONSE']._serialized_start=1710
+ _globals['_APIDOCRESPONSE']._serialized_end=1921
+ _globals['_EXECUTORSERVICE']._serialized_start=1923
+ _globals['_EXECUTORSERVICE']._serialized_end=1986
# @@protoc_insertion_point(module_scope)
diff --git a/unit-backend/logs/EasyPost_collect.log b/unit-backend/logs/EasyPost_collect.log
index 6fc0444..172a0e5 100644
--- a/unit-backend/logs/EasyPost_collect.log
+++ b/unit-backend/logs/EasyPost_collect.log
@@ -3564,3 +3564,9 @@ Traceback (most recent call last):
django.core.exceptions.SuspiciousFileOperation: The joined path (C:\Users\86135\Desktop\EasyPost\backend\api\templates\media\default.png) is located outside of the base path component (C:\Users\86135\Desktop\EasyPost\unit-backend\api\templates\media)
WARNING [2024-09-26 10:23:31,136] [58b782256439499585a4469d4c4848ba] django.request: Not Found: /media/C:/Users/86135/Desktop/EasyPost/unit-backend/api/templates/media/default.png
WARNING [2024-09-26 10:23:31,152] [e586f3be2c734cd4a5dad6a1aaecdc5f] django.request: Bad Request: /media/C:/Users/86135/Desktop/EasyPost/backend/api/templates/media/default.png
+INFO [2024-09-26 10:40:01,373] [none] django.utils.autoreload: C:\Users\86135\Desktop\EasyPost\unit-backend\api\services\protos\executor_pb2_grpc.py changed, reloading.
+INFO [2024-09-26 10:40:01,427] [none] django.utils.autoreload: C:\Users\86135\Desktop\EasyPost\unit-backend\api\services\protos\executor_pb2.py changed, reloading.
+INFO [2024-09-26 10:40:01,695] [none] django.utils.autoreload: C:\Users\86135\Desktop\EasyPost\unit-backend\api\services\protos\executor_pb2_grpc.py changed, reloading.
+INFO [2024-09-26 10:40:02,821] [none] django.utils.autoreload: Watching for file changes with StatReloader
+INFO [2024-09-26 10:40:02,824] [none] django.utils.autoreload: Watching for file changes with StatReloader
+INFO [2024-09-26 10:40:02,972] [none] django.utils.autoreload: Watching for file changes with StatReloader
diff --git a/unit-executor/protos/executor.proto b/unit-executor/protos/executor.proto
index 19c9402..5ec08b0 100644
--- a/unit-executor/protos/executor.proto
+++ b/unit-executor/protos/executor.proto
@@ -25,18 +25,27 @@ message Extract {
string env = 4;
}
+message Parameters {
+ string count = 1;
+ string key_variable = 2;
+ string operator = 3;
+ string value_variable = 4;
+ string timeout = 5;
+}
message ApiDocRequest {
- string mode = 1;
- string title = 2;
- Interface interface = 3;
- map headers = 4;
- Request request = 5;
- string setup_script = 6;
- string teardown_script = 7;
- repeated Extract extract = 8;
- repeated Validators validators = 9;
- repeated ApiDocRequest children = 10;
+ string type = 1;
+ string mode = 2;
+ string title = 3;
+ Interface interface = 4;
+ map headers = 5;
+ Request request = 6;
+ string setup_script = 7;
+ string teardown_script = 8;
+ repeated Extract extract = 9;
+ repeated Validators validators = 10;
+ repeated ApiDocRequest children = 11;
+ Parameters parameters = 12;
}
message ValidateExtractor {
diff --git a/unit-executor/protos/executor_pb2.py b/unit-executor/protos/executor_pb2.py
index aafa9ec..c23601d 100644
--- a/unit-executor/protos/executor_pb2.py
+++ b/unit-executor/protos/executor_pb2.py
@@ -14,7 +14,7 @@
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0e\x65xecutor.proto\"6\n\tInterface\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0e\n\x06method\x18\x03 \x01(\t\"<\n\nValidators\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x0e\n\x06\x61\x63tual\x18\x02 \x01(\t\x12\x0e\n\x06\x65xpect\x18\x03 \x01(\t\"\xa7\x01\n\x07Request\x12 \n\x04\x64\x61ta\x18\x01 \x03(\x0b\x32\x12.Request.DataEntry\x12 \n\x04json\x18\x02 \x03(\x0b\x32\x12.Request.JsonEntry\x1a+\n\tDataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a+\n\tJsonEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"G\n\x07\x45xtract\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x03 \x01(\t\x12\x0b\n\x03\x65nv\x18\x04 \x01(\t\"\xd1\x02\n\rApiDocRequest\x12\x0c\n\x04mode\x18\x01 \x01(\t\x12\r\n\x05title\x18\x02 \x01(\t\x12\x1d\n\tinterface\x18\x03 \x01(\x0b\x32\n.Interface\x12,\n\x07headers\x18\x04 \x03(\x0b\x32\x1b.ApiDocRequest.HeadersEntry\x12\x19\n\x07request\x18\x05 \x01(\x0b\x32\x08.Request\x12\x14\n\x0csetup_script\x18\x06 \x01(\t\x12\x17\n\x0fteardown_script\x18\x07 \x01(\t\x12\x19\n\x07\x65xtract\x18\x08 \x03(\x0b\x32\x08.Extract\x12\x1f\n\nvalidators\x18\t \x03(\x0b\x32\x0b.Validators\x12 \n\x08\x63hildren\x18\n \x03(\x0b\x32\x0e.ApiDocRequest\x1a.\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"u\n\x11ValidateExtractor\x12\x10\n\x08\x65xpected\x18\x01 \x01(\t\x12\x0f\n\x07methods\x18\x02 \x01(\t\x12\x0e\n\x06\x61\x63tual\x18\x03 \x01(\t\x12\x0e\n\x06result\x18\x04 \x01(\t\x12\r\n\x05state\x18\x05 \x01(\t\x12\x0e\n\x06\x65xpect\x18\x06 \x01(\t\"w\n\rDataExtractor\x12\x11\n\tvars_name\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x12\n\nexpression\x18\x03 \x01(\t\x12\x12\n\nresult_val\x18\x04 \x01(\t\x12\x0e\n\x06result\x18\x05 \x01(\t\x12\r\n\x05state\x18\x06 \x01(\t\"\xc4\x03\n\x05\x43\x61ses\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08log_data\x18\x02 \x03(\t\x12\r\n\x05l_env\x18\x03 \x03(\t\x12\r\n\x05g_env\x18\x04 \x03(\t\x12\x10\n\x08hook_gen\x18\x05 \x03(\t\x12\x0b\n\x03url\x18\x06 \x01(\t\x12\x0e\n\x06method\x18\x07 \x01(\t\x12\x13\n\x0bstatus_code\x18\x08 \x01(\x05\x12\x16\n\x0e\x63ontent_length\x18\t \x01(\x03\x12\x14\n\x0c\x63ontent_type\x18\n \x01(\t\x12\x17\n\x0fresponse_header\x18\x0b \x01(\t\x12\x17\n\x0frequests_header\x18\x0c \x01(\t\x12\x15\n\rresponse_body\x18\r \x01(\t\x12\x1a\n\x12performance_figure\x18\x0e \x01(\t\x12\r\n\x05\x63ount\x18\x0f \x01(\x05\x12\r\n\x05state\x18\x10 \x01(\t\x12\x0b\n\x03tag\x18\x11 \x01(\t\x12\x10\n\x08run_time\x18\x12 \x01(\t\x12.\n\x12validate_extractor\x18\x13 \x03(\x0b\x32\x12.ValidateExtractor\x12&\n\x0e\x64\x61ta_extractor\x18\x14 \x03(\x0b\x32\x0e.DataExtractor\x12\x11\n\terror_msg\x18\x15 \x01(\t\"\x87\x01\n\tClassList\x12\x0b\n\x03\x61ll\x18\x01 \x01(\x05\x12\x0f\n\x07success\x18\x02 \x01(\x05\x12\r\n\x05\x65rror\x18\x03 \x01(\x05\x12\x0c\n\x04\x66\x61il\x18\x04 \x01(\x05\x12\x15\n\x05\x63\x61ses\x18\x05 \x03(\x0b\x32\x06.Cases\x12\x0b\n\x03res\x18\x06 \x01(\t\x12\x0c\n\x04name\x18\x07 \x01(\t\x12\r\n\x05state\x18\x08 \x01(\t\"\xd3\x01\n\x0e\x41piDocResponse\x12\x0b\n\x03\x61ll\x18\x01 \x01(\x05\x12\x0f\n\x07success\x18\x02 \x01(\x05\x12\r\n\x05\x65rror\x18\x03 \x01(\x05\x12\x0c\n\x04\x66\x61il\x18\x04 \x01(\x05\x12\x0f\n\x07runtime\x18\x05 \x01(\t\x12\x0f\n\x07\x61rgtime\x18\x06 \x01(\t\x12\x12\n\nbegin_time\x18\x07 \x01(\t\x12\x11\n\tpass_rate\x18\x08 \x01(\t\x12\r\n\x05state\x18\t \x01(\t\x12\x0e\n\x06tester\x18\n \x01(\t\x12\x1e\n\nclass_list\x18\x0b \x03(\x0b\x32\n.ClassList2?\n\x0f\x45xecutorService\x12,\n\tRunApiDoc\x12\x0e.ApiDocRequest\x1a\x0f.ApiDocResponseb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0e\x65xecutor.proto\"6\n\tInterface\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0e\n\x06method\x18\x03 \x01(\t\"<\n\nValidators\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x0e\n\x06\x61\x63tual\x18\x02 \x01(\t\x12\x0e\n\x06\x65xpect\x18\x03 \x01(\t\"\xa7\x01\n\x07Request\x12 \n\x04\x64\x61ta\x18\x01 \x03(\x0b\x32\x12.Request.DataEntry\x12 \n\x04json\x18\x02 \x03(\x0b\x32\x12.Request.JsonEntry\x1a+\n\tDataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a+\n\tJsonEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"G\n\x07\x45xtract\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x03 \x01(\t\x12\x0b\n\x03\x65nv\x18\x04 \x01(\t\"l\n\nParameters\x12\r\n\x05\x63ount\x18\x01 \x01(\t\x12\x14\n\x0ckey_variable\x18\x02 \x01(\t\x12\x10\n\x08operator\x18\x03 \x01(\t\x12\x16\n\x0evalue_variable\x18\x04 \x01(\t\x12\x0f\n\x07timeout\x18\x05 \x01(\t\"\x80\x03\n\rApiDocRequest\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x0c\n\x04mode\x18\x02 \x01(\t\x12\r\n\x05title\x18\x03 \x01(\t\x12\x1d\n\tinterface\x18\x04 \x01(\x0b\x32\n.Interface\x12,\n\x07headers\x18\x05 \x03(\x0b\x32\x1b.ApiDocRequest.HeadersEntry\x12\x19\n\x07request\x18\x06 \x01(\x0b\x32\x08.Request\x12\x14\n\x0csetup_script\x18\x07 \x01(\t\x12\x17\n\x0fteardown_script\x18\x08 \x01(\t\x12\x19\n\x07\x65xtract\x18\t \x03(\x0b\x32\x08.Extract\x12\x1f\n\nvalidators\x18\n \x03(\x0b\x32\x0b.Validators\x12 \n\x08\x63hildren\x18\x0b \x03(\x0b\x32\x0e.ApiDocRequest\x12\x1f\n\nparameters\x18\x0c \x01(\x0b\x32\x0b.Parameters\x1a.\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"u\n\x11ValidateExtractor\x12\x10\n\x08\x65xpected\x18\x01 \x01(\t\x12\x0f\n\x07methods\x18\x02 \x01(\t\x12\x0e\n\x06\x61\x63tual\x18\x03 \x01(\t\x12\x0e\n\x06result\x18\x04 \x01(\t\x12\r\n\x05state\x18\x05 \x01(\t\x12\x0e\n\x06\x65xpect\x18\x06 \x01(\t\"w\n\rDataExtractor\x12\x11\n\tvars_name\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x12\n\nexpression\x18\x03 \x01(\t\x12\x12\n\nresult_val\x18\x04 \x01(\t\x12\x0e\n\x06result\x18\x05 \x01(\t\x12\r\n\x05state\x18\x06 \x01(\t\"\xc4\x03\n\x05\x43\x61ses\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08log_data\x18\x02 \x03(\t\x12\r\n\x05l_env\x18\x03 \x03(\t\x12\r\n\x05g_env\x18\x04 \x03(\t\x12\x10\n\x08hook_gen\x18\x05 \x03(\t\x12\x0b\n\x03url\x18\x06 \x01(\t\x12\x0e\n\x06method\x18\x07 \x01(\t\x12\x13\n\x0bstatus_code\x18\x08 \x01(\x05\x12\x16\n\x0e\x63ontent_length\x18\t \x01(\x03\x12\x14\n\x0c\x63ontent_type\x18\n \x01(\t\x12\x17\n\x0fresponse_header\x18\x0b \x01(\t\x12\x17\n\x0frequests_header\x18\x0c \x01(\t\x12\x15\n\rresponse_body\x18\r \x01(\t\x12\x1a\n\x12performance_figure\x18\x0e \x01(\t\x12\r\n\x05\x63ount\x18\x0f \x01(\x05\x12\r\n\x05state\x18\x10 \x01(\t\x12\x0b\n\x03tag\x18\x11 \x01(\t\x12\x10\n\x08run_time\x18\x12 \x01(\t\x12.\n\x12validate_extractor\x18\x13 \x03(\x0b\x32\x12.ValidateExtractor\x12&\n\x0e\x64\x61ta_extractor\x18\x14 \x03(\x0b\x32\x0e.DataExtractor\x12\x11\n\terror_msg\x18\x15 \x01(\t\"\x87\x01\n\tClassList\x12\x0b\n\x03\x61ll\x18\x01 \x01(\x05\x12\x0f\n\x07success\x18\x02 \x01(\x05\x12\r\n\x05\x65rror\x18\x03 \x01(\x05\x12\x0c\n\x04\x66\x61il\x18\x04 \x01(\x05\x12\x15\n\x05\x63\x61ses\x18\x05 \x03(\x0b\x32\x06.Cases\x12\x0b\n\x03res\x18\x06 \x01(\t\x12\x0c\n\x04name\x18\x07 \x01(\t\x12\r\n\x05state\x18\x08 \x01(\t\"\xd3\x01\n\x0e\x41piDocResponse\x12\x0b\n\x03\x61ll\x18\x01 \x01(\x05\x12\x0f\n\x07success\x18\x02 \x01(\x05\x12\r\n\x05\x65rror\x18\x03 \x01(\x05\x12\x0c\n\x04\x66\x61il\x18\x04 \x01(\x05\x12\x0f\n\x07runtime\x18\x05 \x01(\t\x12\x0f\n\x07\x61rgtime\x18\x06 \x01(\t\x12\x12\n\nbegin_time\x18\x07 \x01(\t\x12\x11\n\tpass_rate\x18\x08 \x01(\t\x12\r\n\x05state\x18\t \x01(\t\x12\x0e\n\x06tester\x18\n \x01(\t\x12\x1e\n\nclass_list\x18\x0b \x03(\x0b\x32\n.ClassList2?\n\x0f\x45xecutorService\x12,\n\tRunApiDoc\x12\x0e.ApiDocRequest\x1a\x0f.ApiDocResponseb\x06proto3')
_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -39,20 +39,22 @@
_globals['_REQUEST_JSONENTRY']._serialized_end=304
_globals['_EXTRACT']._serialized_start=306
_globals['_EXTRACT']._serialized_end=377
- _globals['_APIDOCREQUEST']._serialized_start=380
- _globals['_APIDOCREQUEST']._serialized_end=717
- _globals['_APIDOCREQUEST_HEADERSENTRY']._serialized_start=671
- _globals['_APIDOCREQUEST_HEADERSENTRY']._serialized_end=717
- _globals['_VALIDATEEXTRACTOR']._serialized_start=719
- _globals['_VALIDATEEXTRACTOR']._serialized_end=836
- _globals['_DATAEXTRACTOR']._serialized_start=838
- _globals['_DATAEXTRACTOR']._serialized_end=957
- _globals['_CASES']._serialized_start=960
- _globals['_CASES']._serialized_end=1412
- _globals['_CLASSLIST']._serialized_start=1415
- _globals['_CLASSLIST']._serialized_end=1550
- _globals['_APIDOCRESPONSE']._serialized_start=1553
- _globals['_APIDOCRESPONSE']._serialized_end=1764
- _globals['_EXECUTORSERVICE']._serialized_start=1766
- _globals['_EXECUTORSERVICE']._serialized_end=1829
+ _globals['_PARAMETERS']._serialized_start=379
+ _globals['_PARAMETERS']._serialized_end=487
+ _globals['_APIDOCREQUEST']._serialized_start=490
+ _globals['_APIDOCREQUEST']._serialized_end=874
+ _globals['_APIDOCREQUEST_HEADERSENTRY']._serialized_start=828
+ _globals['_APIDOCREQUEST_HEADERSENTRY']._serialized_end=874
+ _globals['_VALIDATEEXTRACTOR']._serialized_start=876
+ _globals['_VALIDATEEXTRACTOR']._serialized_end=993
+ _globals['_DATAEXTRACTOR']._serialized_start=995
+ _globals['_DATAEXTRACTOR']._serialized_end=1114
+ _globals['_CASES']._serialized_start=1117
+ _globals['_CASES']._serialized_end=1569
+ _globals['_CLASSLIST']._serialized_start=1572
+ _globals['_CLASSLIST']._serialized_end=1707
+ _globals['_APIDOCRESPONSE']._serialized_start=1710
+ _globals['_APIDOCRESPONSE']._serialized_end=1921
+ _globals['_EXECUTORSERVICE']._serialized_start=1923
+ _globals['_EXECUTORSERVICE']._serialized_end=1986
# @@protoc_insertion_point(module_scope)