bk-plugin-framework 2.2.2__tar.gz → 2.2.4__tar.gz

{bk-plugin-framework-2.2.2 → bk-plugin-framework-2.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bk-plugin-framework
-Version: 2.2.2
+Version: 2.2.4
 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.5)
+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)

{bk-plugin-framework-2.2.2 → bk-plugin-framework-2.2.4}/bk_plugin_framework/__version__.py

@@ -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.4"

{bk-plugin-framework-2.2.2 → bk-plugin-framework-2.2.4}/bk_plugin_framework/envs.py

@@ -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")

{bk-plugin-framework-2.2.2 → bk-plugin-framework-2.2.4}/bk_plugin_framework/kit/__init__.py

@@ -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,

{bk-plugin-framework-2.2.2 → bk-plugin-framework-2.2.4}/bk_plugin_framework/kit/plugin.py

@@ -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

{bk-plugin-framework-2.2.2 → bk-plugin-framework-2.2.4}/bk_plugin_framework/runtime/executor.py

@@ -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

{bk-plugin-framework-2.2.2 → bk-plugin-framework-2.2.4}/bk_plugin_framework/services/bpf_service/management/commands/data/api-definition.yml

@@ -11,7 +11,7 @@ stage:
     upstreams:
       loadbalance: "roundrobin"
       hosts:
-        - host: "http://{{ settings.BK_PLUGIN_APIGW_BACKEND_NETLOC }}/"
+        - host: "{{ settings.BK_PLUGIN_APIGW_BACKEND_SCHEME }}://{{ settings.BK_PLUGIN_APIGW_BACKEND_NETLOC }}/"
           weight: 100
 
 release:

{bk-plugin-framework-2.2.2 → bk-plugin-framework-2.2.4}/pyproject.toml

@@ -1,16 +1,16 @@
 [tool.poetry]
 name = "bk-plugin-framework"
-version = "2.2.2"
+version = "2.2.4"
 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.5"
+bk-plugin-runtime = "2.0.7"
 jsonschema = ">=2.5.0,<5.0.0"
 
 [tool.poetry.dev-dependencies]

{bk-plugin-framework-2.2.2 → bk-plugin-framework-2.2.4}/setup.py

@@ -32,14 +32,14 @@ package_data = \
 
 install_requires = \
 ['apigw-manager[extra]>=1.0.6,<1.2.0',
- 'bk-plugin-runtime==2.0.5',
+ '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.2',
+    'version': '2.2.4',
     'description': 'bk plugin python framework',
     'long_description': None,
     'author': 'Your Name',