bk-resource 0.4.10__py3-none-any.whl → 0.4.11b0__py3-none-any.whl

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/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.dist-info → bk_resource-0.4.11b0.dist-info}/METADATA

@@ -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.dist-info → bk_resource-0.4.11b0.dist-info}/RECORD

@@ -5,9 +5,9 @@ bk_resource/exceptions.py,sha256=lrO1pHGzy8P0AvdCYMk1SR-qKCy-bbPNapZcINBw9c0,388
 bk_resource/routers.py,sha256=IrMurTJXlxyo8IIjMx9w0iOvagB6rORmZlZFtAwFxr8,2516
 bk_resource/serializers.py,sha256=Az_2Qsp_5gUrhU_0iZS45komm5upU5u1UpNE-ArSX4s,2690
 bk_resource/settings.py,sha256=QCGKeetjdDIWHHu1_93MKPeJ_VpGlQXvW7gpln1pGlU,3827
-bk_resource/tasks.py,sha256=WH9uXuwhX2t9pmcKocHQogEzte9Pb_gd7F7Hqi5b9QI,4064
+bk_resource/tasks.py,sha256=OeBy41GfSDNL_0adGeKBG6LlVRqNUfP7KzXe7pxpr3I,4090
 bk_resource/tools.py,sha256=fPmiDNxh2FWo5Yo7CXtvYyHxyG3_JrGs5wYZMaVFAhE,8166
-bk_resource/viewsets.py,sha256=-Py1q8Rx5aeu2DKbQgagCY03cbCWFIg8awE8D3HGorg,11699
+bk_resource/viewsets.py,sha256=QhCIHiJ227N8njqr6bSJZxP5eBh3z5Q4u1dGzBjHHXs,11614
 bk_resource/conf/__init__.py,sha256=39m-gTk6pr0j_6xwdfTFEFuj_ER_MDoEll2zkEdCPBo,891
 bk_resource/conf/app_template/__init__.py-tpl,sha256=iwhKnzeBJLKxpRVjvzwiRE63_zNpIBfaKLITauVph-0,24
 bk_resource/conf/app_template/admin.py-tpl,sha256=n0NQrWDbx74lHja8g2s5vTKjR954SCtizSehZCQLBK0,60
@@ -48,8 +48,8 @@ bk_resource/utils/request_log.py,sha256=VMSFu0c8e53e7TUFJtdKXpkM0_pl-mk1UaFFdrGY
 bk_resource/utils/text.py,sha256=exu7gEFANcU6apQOut_1VSzoddOvcKR3CXEF1Z19M4Y,3313
 bk_resource/utils/thread_backend.py,sha256=AdMWzXreFARinPdDaMiRJwwxSWL1EB4MUSz1Q7kYz90,5017
 bk_resource/utils/time_tools.py,sha256=y-eP-6Gu5ur3ET0bOp2ML8Z0HtrguvTPlbsSA1dNhWU,10967
-bk_resource-0.4.10.dist-info/LICENSE.txt,sha256=dnlkOMrlbRgRXlBt-a_QF6cs1MFG6WYmcotYbI6_gpo,859
-bk_resource-0.4.10.dist-info/METADATA,sha256=7VxDDSJcSUDN77Jir56JnfKekOCaW_uY0nSHpWMAtPM,5503
-bk_resource-0.4.10.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-bk_resource-0.4.10.dist-info/top_level.txt,sha256=UJxO1tbrqlmnvSTYCLoqg39_gvBesvjp3CcGEPjzXY4,12
-bk_resource-0.4.10.dist-info/RECORD,,
+bk_resource-0.4.11b0.dist-info/LICENSE.txt,sha256=dnlkOMrlbRgRXlBt-a_QF6cs1MFG6WYmcotYbI6_gpo,859
+bk_resource-0.4.11b0.dist-info/METADATA,sha256=hK2bY984uT4XvPbbb2a6R6Jd0sIeR3AFbUuPM0xiEqU,5499
+bk_resource-0.4.11b0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+bk_resource-0.4.11b0.dist-info/top_level.txt,sha256=UJxO1tbrqlmnvSTYCLoqg39_gvBesvjp3CcGEPjzXY4,12
+bk_resource-0.4.11b0.dist-info/RECORD,,

{bk_resource-0.4.10.dist-info → bk_resource-0.4.11b0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any