PyPI - bk-plugin-framework - Versions diffs - 2.2.3__tar.gz → 2.2.5__tar.gz - Mend

@@ -9,7 +9,7 @@ Unless required by applicable law or agreed to in writing, software distributed
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
+import json
 import logging
 import re
@@ -41,6 +41,12 @@ class PluginAPIDispatchParamsSerializer(serializers.Serializer):
     method = serializers.CharField(help_text="调用方法", required=True)
     username = serializers.CharField(help_text="用户名", required=True)
     data = serializers.DictField(help_text="接口数据", required=False, default={})
+    dumped_data = serializers.CharField(help_text="json dumps后的接口数据", required=False)
+    def validate(self, values):
+        if values.get("dumped_data"):
+            values["data"].update(json.loads(values["dumped_data"]))
+        return values
     def validate_url(self, value):
         if not value.startswith("/bk_plugin/plugin_api/"):
@@ -105,13 +111,20 @@ class PluginAPIDispatch(APIView):
             # get apigw jwt info
             custom_headers["HTTP_X_BKAPI_JWT"] = request.META.get("HTTP_X_BKAPI_JWT", "")
-            fake_request = getattr(RequestFactory(), request_data["method"].lower())(
-                path=request_data["url"], content_type=request.content_type, data=request_data["data"], **custom_headers
-            )
-            # inject upload FILES
-            for f in request.FILES:
-                fake_request.FILES[f] = request.FILES[f]
+            if request.FILES:
+                fake_request = getattr(RequestFactory(), request_data["method"].lower())(
+                    path=request_data["url"], data=request_data["data"], **custom_headers
+                )
+                # inject upload FILES
+                for f in request.FILES:
+                    fake_request.FILES[f] = request.FILES[f]
+            else:
+                fake_request = getattr(RequestFactory(), request_data["method"].lower())(
+                    path=request_data["url"],
+                    content_type=request.content_type,
+                    data=request_data["data"],
+                    **custom_headers
+                )
             # inject APIGW jwt
             fake_request.jwt = request.jwt

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bk-plugin-framework
-Version: 2.2.3
+Version: 2.2.5
 Summary: bk plugin python framework
 License: MIT
 Author: Your Name
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Requires-Dist: apigw-manager[extra] (>=1.0.6,<1.2.0)
-Requires-Dist: bk-plugin-runtime (==2.0.6)
+Requires-Dist: bk-plugin-runtime (==2.0.7)
 Requires-Dist: jsonschema (>=2.5.0,<5.0.0)
-Requires-Dist: pydantic (>=1.0,<2.0)
-Requires-Dist: werkzeug (>=2.0.0,<3.0.0)
+Requires-Dist: pydantic (>=1.0,<3)
+Requires-Dist: werkzeug (>=2.0.0,<4.0)

@@ -10,4 +10,4 @@ an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express o
 specific language governing permissions and limitations under the License.
 """
-__version__ = "2.2.2"
+__version__ = "2.2.5"

@@ -14,7 +14,10 @@ import base64
 import hashlib
 import logging
-from pydantic import BaseSettings
+try:
+    from pydantic.v1 import BaseSettings
+except ImportError:
+    from pydantic import BaseSettings
 from django.conf import settings as default_settings
 logger = logging.getLogger("bk_plugin")

@@ -10,7 +10,10 @@ an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express o
 specific language governing permissions and limitations under the License.
 """
-from pydantic import Field  # noqa
+try:
+    from pydantic.v1 import Field
+except ImportError:
+    from pydantic import Field  # noqa
 from bk_plugin_framework.kit.plugin import (  # noqa
     Plugin,
     InputsModel,

@@ -14,7 +14,10 @@ import re
 import typing
 import inspect
-from pydantic import BaseModel
+try:
+    from pydantic.v1 import BaseModel
+except ImportError:
+    from pydantic import BaseModel
 from bk_plugin_framework.hub import VersionHub
 from bk_plugin_framework.constants import State

@@ -15,7 +15,11 @@ import typing
 import logging
 from celery import current_app
-from pydantic import ValidationError
+try:
+    from pydantic.v1 import ValidationError
+except ImportError:
+    from pydantic import ValidationError
 from django.utils.timezone import now
 from bk_plugin_framework.kit import Plugin, Context, State, InputsModel, ContextRequire, Callback

@@ -1,16 +1,16 @@
 [tool.poetry]
 name = "bk-plugin-framework"
-version = "2.2.3"
+version = "2.2.5"
 description = "bk plugin python framework"
 authors = ["Your Name <you@example.com>"]
 license = "MIT"
 [tool.poetry.dependencies]
 python = "^3.6.1,<4.0"
-pydantic = "^1.0"
-werkzeug = "^2.0.0"
+pydantic = ">=1.0,<3"
+werkzeug = ">=2.0.0, <4.0"
 apigw-manager = {version = ">=1.0.6, <1.2.0", extras = ["extra"]}
-bk-plugin-runtime = "2.0.6"
+bk-plugin-runtime = "2.0.7"
 jsonschema = ">=2.5.0,<5.0.0"
 [tool.poetry.dev-dependencies]

@@ -32,14 +32,14 @@ package_data = \
 install_requires = \
 ['apigw-manager[extra]>=1.0.6,<1.2.0',
- 'bk-plugin-runtime==2.0.6',
+ 'bk-plugin-runtime==2.0.7',
  'jsonschema>=2.5.0,<5.0.0',
- 'pydantic>=1.0,<2.0',
- 'werkzeug>=2.0.0,<3.0.0']
+ 'pydantic>=1.0,<3',
+ 'werkzeug>=2.0.0,<4.0']
 setup_kwargs = {
     'name': 'bk-plugin-framework',
-    'version': '2.2.3',
+    'version': '2.2.5',
     'description': 'bk plugin python framework',
     'long_description': None,
     'author': 'Your Name',

bk-plugin-framework 2.2.3__tar.gz → 2.2.5__tar.gz

bk-plugin-framework 2.2.3tar.gz → 2.2.5tar.gz