bk-resource 0.4.10__tar.gz → 0.4.11b0__tar.gz

{bk_resource-0.4.10 → bk_resource-0.4.11b0}/PKG-INFO

@@ -1,25 +1,25 @@
 Metadata-Version: 2.1
 Name: bk_resource
-Version: 0.4.10
+Version: 0.4.11b0
 Summary: Bk Resource
 Home-page: https://bk.tencent.com
 Author: blueking
 Author-email: blueking@tencent.com
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: blueapps<5,>=4.10.0
+Requires-Dist: blueapps>=4.12.0
 Requires-Dist: django>=3.2.18
 Requires-Dist: djangorestframework>=3.12.0
 Requires-Dist: drf-yasg>=1.20.0
 Requires-Dist: pyinstrument>=3.4.2
 Requires-Dist: arrow>=1.2.0
 Requires-Dist: django-rest-framework-condition>=0.1.1
-Requires-Dist: celery<5,>=4
+Requires-Dist: celery>=5
 
 ![logo.png](assests/logo.png)
 
 [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)](https://github.com/TencentBlueKing/bk-resource/blob/main/LICENSE.txt)
-[![Release Version](https://img.shields.io/badge/release-0.4.10-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
+[![Release Version](https://img.shields.io/badge/release-0.4.11-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/pulls)
 [![codecov](https://codecov.io/gh/TencentBlueKing/bk-resource/branch/main/graph/badge.svg)](https://codecov.io/gh/TencentBlueKing/bk-resource)
 [![Unittest Py3](https://github.com/TencentBlueKing/bk-resource/actions/workflows/unittest.yml/badge.svg)](https://github.com/TencentBlueKing/bk-resource/actions/workflows/unittest.yml)

{bk_resource-0.4.10 → bk_resource-0.4.11b0}/bk_resource/tasks.py

@@ -18,8 +18,8 @@ to the current version of the project delivered to anyone in the future.
 
 from functools import wraps
 
+from blueapps.core.celery import celery_app
 from celery.result import AsyncResult
-from celery.task import task
 from django.utils.module_loading import import_string
 
 from bk_resource.exceptions import CustomError
@@ -27,7 +27,7 @@ from bk_resource.utils.logger import logger
 from bk_resource.utils.request import set_local_username
 
 
-@task(bind=True)
+@celery_app.task(bind=True)
 def run_perform_request(self, resource_obj, username, request_data):
     """
     将resource作为异步任务执行

{bk_resource-0.4.10 → bk_resource-0.4.11b0}/bk_resource/viewsets.py

@@ -51,7 +51,7 @@ class ResourceRoute(object):
         decorators=None,
     ):
         """
-        :param method: 请求方法，目前仅支持GET和POST
+        :param method: 请求方法，目前支持GET, POST, PUT, PATCH, DELETE
         :param resource_class: 所用到的Resource类
         :param endpoint: 端点名称，不提供则为list或create
         :param pk_field: 主键名称，如果不为空，则该视图为 detail route
@@ -59,8 +59,6 @@ class ResourceRoute(object):
         :param content_encoding: 返回数据内容编码类型
         :params decorators: 给view_func添加的装饰器列表
         """
-        # if method.upper() not in ["GET", "POST"]:
-        #     raise ValueError(_("method参数错误，目前仅支持GET或POST方法"))
 
         self.method = method.upper()
 
@@ -167,7 +165,9 @@ class ResourceViewSet(viewsets.GenericViewSet):
                     500: bk_resource_settings.DEFAULT_ERROR_RESPONSE_SERIALIZER,
                 },
                 operation_description=resource_route.resource_class.__doc__,
-                request_body=request_serializer if resource_route.method in ["POST", "PUT", "DELETE"] else None,
+                request_body=request_serializer
+                if resource_route.method in ["POST", "PUT", "PATCH", "DELETE"]
+                else None,
                 query_serializer=request_serializer if resource_route.method == "GET" else None,
                 operation_summary=getattr(resource_route.resource_class, "name", None),
                 tags=getattr(resource_route.resource_class, "tags", None),

{bk_resource-0.4.10 → bk_resource-0.4.11b0}/bk_resource.egg-info/PKG-INFO

@@ -1,25 +1,25 @@
 Metadata-Version: 2.1
 Name: bk_resource
-Version: 0.4.10
+Version: 0.4.11b0
 Summary: Bk Resource
 Home-page: https://bk.tencent.com
 Author: blueking
 Author-email: blueking@tencent.com
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: blueapps<5,>=4.10.0
+Requires-Dist: blueapps>=4.12.0
 Requires-Dist: django>=3.2.18
 Requires-Dist: djangorestframework>=3.12.0
 Requires-Dist: drf-yasg>=1.20.0
 Requires-Dist: pyinstrument>=3.4.2
 Requires-Dist: arrow>=1.2.0
 Requires-Dist: django-rest-framework-condition>=0.1.1
-Requires-Dist: celery<5,>=4
+Requires-Dist: celery>=5
 
 ![logo.png](assests/logo.png)
 
 [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)](https://github.com/TencentBlueKing/bk-resource/blob/main/LICENSE.txt)
-[![Release Version](https://img.shields.io/badge/release-0.4.10-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
+[![Release Version](https://img.shields.io/badge/release-0.4.11-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/pulls)
 [![codecov](https://codecov.io/gh/TencentBlueKing/bk-resource/branch/main/graph/badge.svg)](https://codecov.io/gh/TencentBlueKing/bk-resource)
 [![Unittest Py3](https://github.com/TencentBlueKing/bk-resource/actions/workflows/unittest.yml/badge.svg)](https://github.com/TencentBlueKing/bk-resource/actions/workflows/unittest.yml)

{bk_resource-0.4.10 → bk_resource-0.4.11b0}/bk_resource.egg-info/requires.txt

@@ -1,8 +1,8 @@
-blueapps<5,>=4.10.0
+blueapps>=4.12.0
 django>=3.2.18
 djangorestframework>=3.12.0
 drf-yasg>=1.20.0
 pyinstrument>=3.4.2
 arrow>=1.2.0
 django-rest-framework-condition>=0.1.1
-celery<5,>=4
+celery>=5

{bk_resource-0.4.10 → bk_resource-0.4.11b0}/readme.md

@@ -1,7 +1,7 @@
 ![logo.png](assests/logo.png)
 
 [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)](https://github.com/TencentBlueKing/bk-resource/blob/main/LICENSE.txt)
-[![Release Version](https://img.shields.io/badge/release-0.4.10-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
+[![Release Version](https://img.shields.io/badge/release-0.4.11-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/pulls)
 [![codecov](https://codecov.io/gh/TencentBlueKing/bk-resource/branch/main/graph/badge.svg)](https://codecov.io/gh/TencentBlueKing/bk-resource)
 [![Unittest Py3](https://github.com/TencentBlueKing/bk-resource/actions/workflows/unittest.yml/badge.svg)](https://github.com/TencentBlueKing/bk-resource/actions/workflows/unittest.yml)

{bk_resource-0.4.10 → bk_resource-0.4.11b0}/setup.py

@@ -16,14 +16,14 @@ We undertake not to change the open source license (MIT license) applicable
 to the current version of the project delivered to anyone in the future.
 """
 
-from setuptools import setup, find_packages
+from setuptools import setup
 
 with open("readme.md") as f:
     readme = f.read()
 
 setup(
     name="bk_resource",
-    version="0.4.10",
+    version="0.4.11b0",
     author="blueking",
     url="https://bk.tencent.com",
     author_email="blueking@tencent.com",
@@ -39,14 +39,14 @@ setup(
         "bk_resource.utils",
     ],
     install_requires=[
-        "blueapps>=4.10.0,<5",
+        "blueapps>=4.12.0",
         "django>=3.2.18",
         "djangorestframework>=3.12.0",
         "drf-yasg>=1.20.0",
         "pyinstrument>=3.4.2",
         "arrow>=1.2.0",
         "django-rest-framework-condition>=0.1.1",
-        "celery>=4,<5",
+        "celery>=5",
     ],
     include_package_data=True,
 )