bk-resource 0.4.11__py3-none-any.whl → 0.4.12__py3-none-any.whl

bk_resource/contrib/model.py

@@ -26,11 +26,8 @@ from rest_framework.generics import GenericAPIView
 from rest_framework.viewsets import ModelViewSet
 
 from bk_resource import Resource
-from bk_resource.utils.request import get_moke_request
-
-
-class Empty:
-    ...
+from bk_resource.base import Empty
+from bk_resource.utils.request import get_mock_request
 
 
 class ViewMixin(GenericAPIView):
@@ -63,7 +60,7 @@ class ViewMixin(GenericAPIView):
 
     def build_request(self, *, method: str, params: dict) -> WSGIRequest:
         # 构造虚拟请求对象
-        request = get_moke_request(REQUEST_METHOD=method)
+        request = get_mock_request(REQUEST_METHOD=method)
         # 为对应的方法添加请求体
         if request.method.lower() in ["get"]:
             setattr(request, "query_params", params)

bk_resource/routers.py

@@ -48,8 +48,10 @@ class ResourceRouter(DefaultRouter):
             # 全小写的属性不是类，忽略
             if attr.startswith("_") or attr[0].islower():
                 continue
-
-            if isinstance(viewset, type) and issubclass(viewset, GenericViewSet):
+            # viewset is not ResourceViewSet：
+            # 1. 在 DRF >= 3.15.0 版本，重复注册会抛出 ImproperlyConfigured 异常
+            # 2. 对于用户导入的 ResourceViewSet 类不需要注册
+            if isinstance(viewset, type) and issubclass(viewset, GenericViewSet) and viewset is not ResourceViewSet:
                 module_prefix = self.get_default_basename(viewset)
                 if prefix:
                     module_prefix = f"{prefix}/{module_prefix}" if module_prefix else prefix

bk_resource/utils/cache.py

@@ -25,7 +25,7 @@ from django.core.cache import cache, caches
 from django.utils.encoding import force_bytes
 from django.utils.translation import gettext
 
-from bk_resource.contrib.model import Empty
+from bk_resource.base import Empty
 from bk_resource.settings import bk_resource_settings
 from bk_resource.utils.common_utils import count_md5
 from bk_resource.utils.local import local

bk_resource/utils/request.py

@@ -42,5 +42,5 @@ def set_local_username(username):
     local.username = username
 
 
-def get_moke_request(**kwargs):
+def get_mock_request(**kwargs):
     return RequestFactory().request(**kwargs)

{bk_resource-0.4.11.dist-info → bk_resource-0.4.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bk_resource
-Version: 0.4.11
+Version: 0.4.12
 Summary: Bk Resource
 Home-page: https://bk.tencent.com
 Author: blueking
@@ -14,12 +14,12 @@ 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
+Requires-Dist: celery >=4.4.0
 
 ![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.11-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
+[![Release Version](https://img.shields.io/badge/release-0.4.12-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.11.dist-info → bk_resource-0.4.12.dist-info}/RECORD

@@ -2,7 +2,7 @@ bk_resource/__init__.py,sha256=tg0Iia2kgKtdZyJdpxtmtTnjpbGogRjZAeP7NUAMwgM,2058
 bk_resource/apps.py,sha256=b25uBl-7a4agVSB29BiqBblctoVrM1-d6WY4s8JfEnc,1132
 bk_resource/base.py,sha256=ABs1QI0isexmIP7LQJrQ5ZkzmbqRkVVhgsQfxV45nJA,14062
 bk_resource/exceptions.py,sha256=lrO1pHGzy8P0AvdCYMk1SR-qKCy-bbPNapZcINBw9c0,3883
-bk_resource/routers.py,sha256=IrMurTJXlxyo8IIjMx9w0iOvagB6rORmZlZFtAwFxr8,2516
+bk_resource/routers.py,sha256=tF1n15vj64v3Y-8IopOnLi8PDR6Z2p7pZRQAmtHXlzk,2766
 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=OeBy41GfSDNL_0adGeKBG6LlVRqNUfP7KzXe7pxpr3I,4090
@@ -22,7 +22,7 @@ bk_resource/contrib/__init__.py,sha256=bP18WkBTSVynqrmGO6UDjhTdOCO0w18myXynyHMg6
 bk_resource/contrib/api.py,sha256=DFcjJsuwU9pKwvQE-nZhN2wApqkaC0feBIh4Es5mUxc,8658
 bk_resource/contrib/bk_api.py,sha256=HJW5GWM0tT-oR6AnYHjcU9JaymyKPrrx_0aCnZD1BaM,6304
 bk_resource/contrib/cache.py,sha256=Gp91ajqDUelXKDu2WTC_QXoTJiO--iWEMsNjl_hxAlg,2969
-bk_resource/contrib/model.py,sha256=l5Sx_fPQhor4wcauX_Q-YPn4YP8Se0nDastdah9ghKQ,5941
+bk_resource/contrib/model.py,sha256=-zQOjnXllDYDMo6nxcvD8WrfzQuThfzcqf97gnRhwaE,5953
 bk_resource/locale/en/LC_MESSAGES/django.mo,sha256=2Pf2WZXzYQeGcnnNWo78xZ58vuOr7Tj5sc9v675SwSk,2943
 bk_resource/locale/en/LC_MESSAGES/django.po,sha256=VIssUCnLPT1BUKjTB93yR7uyc0IvHdgGS93wpV18cCg,4322
 bk_resource/locale/zh_CN/LC_MESSAGES/django.mo,sha256=3GCXKryGcXqFnoIDIDaz97SBpl5C99nbSzjSkM6bBkg,3022
@@ -36,20 +36,20 @@ bk_resource/management/commands/__init__.py,sha256=zTvK51uqIT4Sy_bCfeXQbIyI-Sskb
 bk_resource/management/commands/generate_resource_stub_file.py,sha256=M_S1eLxx-1eeF3VwbzJJl0DE2ABB3Z-i75Kb23nyi38,1110
 bk_resource/management/commands/start_resource.py,sha256=BHohJIXIsT2Ur0GbK1FctrEdY2RbJtIGs2myyRsOb8M,1243
 bk_resource/utils/__init__.py,sha256=zTvK51uqIT4Sy_bCfeXQbIyI-SskbMWjUfVNrQzE-0k,891
-bk_resource/utils/cache.py,sha256=g_d8iD9AWX_kOe_zVSaUVSJG9hgQclp_-gjtqDc5hME,10609
+bk_resource/utils/cache.py,sha256=QNaXdEaAJDPhMvJmNdMB3vVA34bs4cPdkQJ5SZMA0Xk,10600
 bk_resource/utils/common_utils.py,sha256=uJ2O_64At_LhPexC1ZifMFNauG9oh73v9EdnUB3prUo,13205
 bk_resource/utils/factory.py,sha256=FtGnGqhi_ubUOxveEkfgrlpYFE2-m-oPFmSV9347UD8,5104
 bk_resource/utils/generators.py,sha256=qhs0msHJdmVm8z6phfkC-GjibhxJckq6xgM4IM8w5bU,2080
 bk_resource/utils/inspectors.py,sha256=xxuB2iHInCGjl9A4QRz9gCw-iD5GFkXlhp_nCsnnJPw,1176
 bk_resource/utils/local.py,sha256=qPxDc5lYA_7ffmpUfGqYVsUG-WxBQ0jGCvc6Ti0WoCw,3337
 bk_resource/utils/logger.py,sha256=VPp5nGsKawMtH5pKctLmdDpZpfYtjCr3DUYHhEsuXBU,950
-bk_resource/utils/request.py,sha256=NrEEyBnOVPH9jojkd6uMjdnWsLK14SC83xiGnurmVUo,1593
+bk_resource/utils/request.py,sha256=5Lfv_LCvE0I3yp3-jxGve8PU8TF4rR0vGTNBYGxzvIA,1593
 bk_resource/utils/request_log.py,sha256=VMSFu0c8e53e7TUFJtdKXpkM0_pl-mk1UaFFdrGYzPo,3317
 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.11.dist-info/LICENSE.txt,sha256=dnlkOMrlbRgRXlBt-a_QF6cs1MFG6WYmcotYbI6_gpo,859
-bk_resource-0.4.11.dist-info/METADATA,sha256=T_I1fTL1JrNsAAyxbD9bAl8JWp0TKl1kQSuADsf_m80,5497
-bk_resource-0.4.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-bk_resource-0.4.11.dist-info/top_level.txt,sha256=UJxO1tbrqlmnvSTYCLoqg39_gvBesvjp3CcGEPjzXY4,12
-bk_resource-0.4.11.dist-info/RECORD,,
+bk_resource-0.4.12.dist-info/LICENSE.txt,sha256=dnlkOMrlbRgRXlBt-a_QF6cs1MFG6WYmcotYbI6_gpo,859
+bk_resource-0.4.12.dist-info/METADATA,sha256=wKkceKDIj65xMUI_yY8HkXdgFydRkG1mG35rsqNYS04,5501
+bk_resource-0.4.12.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+bk_resource-0.4.12.dist-info/top_level.txt,sha256=UJxO1tbrqlmnvSTYCLoqg39_gvBesvjp3CcGEPjzXY4,12
+bk_resource-0.4.12.dist-info/RECORD,,

{bk_resource-0.4.11.dist-info → bk_resource-0.4.12.dist-info}/WHEEL

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