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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. bk_resource/contrib/model.py +2 -2
  2. bk_resource/routers.py +4 -2
  3. bk_resource/utils/request.py +1 -1
  4. {bk_resource-0.4.11.dist-info → bk_resource-0.4.12b0.dist-info}/METADATA +2 -2
  5. {bk_resource-0.4.11.dist-info → bk_resource-0.4.12b0.dist-info}/RECORD +8 -8
  6. {bk_resource-0.4.11.dist-info → bk_resource-0.4.12b0.dist-info}/LICENSE.txt +0 -0
  7. {bk_resource-0.4.11.dist-info → bk_resource-0.4.12b0.dist-info}/WHEEL +0 -0
  8. {bk_resource-0.4.11.dist-info → bk_resource-0.4.12b0.dist-info}/top_level.txt +0 -0
bk_resource/contrib/model.py CHANGED
@@ -26,7 +26,7 @@ from rest_framework.generics import GenericAPIView
26
26
  from rest_framework.viewsets import ModelViewSet
27
27
 
28
28
  from bk_resource import Resource
29
- from bk_resource.utils.request import get_moke_request
29
+ from bk_resource.utils.request import get_mock_request
30
30
 
31
31
 
32
32
  class Empty:
@@ -63,7 +63,7 @@ class ViewMixin(GenericAPIView):
63
63
 
64
64
  def build_request(self, *, method: str, params: dict) -> WSGIRequest:
65
65
  # 构造虚拟请求对象
66
- request = get_moke_request(REQUEST_METHOD=method)
66
+ request = get_mock_request(REQUEST_METHOD=method)
67
67
  # 为对应的方法添加请求体
68
68
  if request.method.lower() in ["get"]:
69
69
  setattr(request, "query_params", params)
bk_resource/routers.py CHANGED
@@ -48,8 +48,10 @@ class ResourceRouter(DefaultRouter):
48
48
  # 全小写的属性不是类，忽略
49
49
  if attr.startswith("_") or attr[0].islower():
50
50
  continue
51
-
52
- if isinstance(viewset, type) and issubclass(viewset, GenericViewSet):
51
+ # viewset is not ResourceViewSet：
52
+ # 1. 在 DRF >= 3.15.0 版本，重复注册会抛出 ImproperlyConfigured 异常
53
+ # 2. 对于用户导入的 ResourceViewSet 类不需要注册
54
+ if isinstance(viewset, type) and issubclass(viewset, GenericViewSet) and viewset is not ResourceViewSet:
53
55
  module_prefix = self.get_default_basename(viewset)
54
56
  if prefix:
55
57
  module_prefix = f"{prefix}/{module_prefix}" if module_prefix else prefix
bk_resource/utils/request.py CHANGED
@@ -42,5 +42,5 @@ def set_local_username(username):
42
42
  local.username = username
43
43
 
44
44
 
45
- def get_moke_request(**kwargs):
45
+ def get_mock_request(**kwargs):
46
46
  return RequestFactory().request(**kwargs)
{bk_resource-0.4.11.dist-info → bk_resource-0.4.12b0.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: bk_resource
3
- Version: 0.4.11
3
+ Version: 0.4.12b0
4
4
  Summary: Bk Resource
5
5
  Home-page: https://bk.tencent.com
6
6
  Author: blueking
@@ -19,7 +19,7 @@ Requires-Dist: celery >=5
19
19
  ![logo.png](assests/logo.png)
20
20
 
21
21
  [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)](https://github.com/TencentBlueKing/bk-resource/blob/main/LICENSE.txt)
22
- [![Release Version](https://img.shields.io/badge/release-0.4.11-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
22
+ [![Release Version](https://img.shields.io/badge/release-0.4.12b0-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
23
23
  [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/pulls)
24
24
  [![codecov](https://codecov.io/gh/TencentBlueKing/bk-resource/branch/main/graph/badge.svg)](https://codecov.io/gh/TencentBlueKing/bk-resource)
25
25
  [![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.12b0.dist-info}/RECORD RENAMED
@@ -2,7 +2,7 @@ bk_resource/__init__.py,sha256=tg0Iia2kgKtdZyJdpxtmtTnjpbGogRjZAeP7NUAMwgM,2058
2
2
  bk_resource/apps.py,sha256=b25uBl-7a4agVSB29BiqBblctoVrM1-d6WY4s8JfEnc,1132
3
3
  bk_resource/base.py,sha256=ABs1QI0isexmIP7LQJrQ5ZkzmbqRkVVhgsQfxV45nJA,14062
4
4
  bk_resource/exceptions.py,sha256=lrO1pHGzy8P0AvdCYMk1SR-qKCy-bbPNapZcINBw9c0,3883
5
- bk_resource/routers.py,sha256=IrMurTJXlxyo8IIjMx9w0iOvagB6rORmZlZFtAwFxr8,2516
5
+ bk_resource/routers.py,sha256=tF1n15vj64v3Y-8IopOnLi8PDR6Z2p7pZRQAmtHXlzk,2766
6
6
  bk_resource/serializers.py,sha256=Az_2Qsp_5gUrhU_0iZS45komm5upU5u1UpNE-ArSX4s,2690
7
7
  bk_resource/settings.py,sha256=QCGKeetjdDIWHHu1_93MKPeJ_VpGlQXvW7gpln1pGlU,3827
8
8
  bk_resource/tasks.py,sha256=OeBy41GfSDNL_0adGeKBG6LlVRqNUfP7KzXe7pxpr3I,4090
@@ -22,7 +22,7 @@ bk_resource/contrib/__init__.py,sha256=bP18WkBTSVynqrmGO6UDjhTdOCO0w18myXynyHMg6
22
22
  bk_resource/contrib/api.py,sha256=DFcjJsuwU9pKwvQE-nZhN2wApqkaC0feBIh4Es5mUxc,8658
23
23
  bk_resource/contrib/bk_api.py,sha256=HJW5GWM0tT-oR6AnYHjcU9JaymyKPrrx_0aCnZD1BaM,6304
24
24
  bk_resource/contrib/cache.py,sha256=Gp91ajqDUelXKDu2WTC_QXoTJiO--iWEMsNjl_hxAlg,2969
25
- bk_resource/contrib/model.py,sha256=l5Sx_fPQhor4wcauX_Q-YPn4YP8Se0nDastdah9ghKQ,5941
25
+ bk_resource/contrib/model.py,sha256=ashkD_NzIR4WSEEQHPWPCp66wvKWwiaL1AHfQgWfyAY,5941
26
26
  bk_resource/locale/en/LC_MESSAGES/django.mo,sha256=2Pf2WZXzYQeGcnnNWo78xZ58vuOr7Tj5sc9v675SwSk,2943
27
27
  bk_resource/locale/en/LC_MESSAGES/django.po,sha256=VIssUCnLPT1BUKjTB93yR7uyc0IvHdgGS93wpV18cCg,4322
28
28
  bk_resource/locale/zh_CN/LC_MESSAGES/django.mo,sha256=3GCXKryGcXqFnoIDIDaz97SBpl5C99nbSzjSkM6bBkg,3022
@@ -43,13 +43,13 @@ bk_resource/utils/generators.py,sha256=qhs0msHJdmVm8z6phfkC-GjibhxJckq6xgM4IM8w5
43
43
  bk_resource/utils/inspectors.py,sha256=xxuB2iHInCGjl9A4QRz9gCw-iD5GFkXlhp_nCsnnJPw,1176
44
44
  bk_resource/utils/local.py,sha256=qPxDc5lYA_7ffmpUfGqYVsUG-WxBQ0jGCvc6Ti0WoCw,3337
45
45
  bk_resource/utils/logger.py,sha256=VPp5nGsKawMtH5pKctLmdDpZpfYtjCr3DUYHhEsuXBU,950
46
- bk_resource/utils/request.py,sha256=NrEEyBnOVPH9jojkd6uMjdnWsLK14SC83xiGnurmVUo,1593
46
+ bk_resource/utils/request.py,sha256=5Lfv_LCvE0I3yp3-jxGve8PU8TF4rR0vGTNBYGxzvIA,1593
47
47
  bk_resource/utils/request_log.py,sha256=VMSFu0c8e53e7TUFJtdKXpkM0_pl-mk1UaFFdrGYzPo,3317
48
48
  bk_resource/utils/text.py,sha256=exu7gEFANcU6apQOut_1VSzoddOvcKR3CXEF1Z19M4Y,3313
49
49
  bk_resource/utils/thread_backend.py,sha256=AdMWzXreFARinPdDaMiRJwwxSWL1EB4MUSz1Q7kYz90,5017
50
50
  bk_resource/utils/time_tools.py,sha256=y-eP-6Gu5ur3ET0bOp2ML8Z0HtrguvTPlbsSA1dNhWU,10967
51
- bk_resource-0.4.11.dist-info/LICENSE.txt,sha256=dnlkOMrlbRgRXlBt-a_QF6cs1MFG6WYmcotYbI6_gpo,859
52
- bk_resource-0.4.11.dist-info/METADATA,sha256=T_I1fTL1JrNsAAyxbD9bAl8JWp0TKl1kQSuADsf_m80,5497
53
- bk_resource-0.4.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
54
- bk_resource-0.4.11.dist-info/top_level.txt,sha256=UJxO1tbrqlmnvSTYCLoqg39_gvBesvjp3CcGEPjzXY4,12
55
- bk_resource-0.4.11.dist-info/RECORD,,
51
+ bk_resource-0.4.12b0.dist-info/LICENSE.txt,sha256=dnlkOMrlbRgRXlBt-a_QF6cs1MFG6WYmcotYbI6_gpo,859
52
+ bk_resource-0.4.12b0.dist-info/METADATA,sha256=w11I_AfW-LozH5LyRbyaVoDZnLNQS3pmVSB_ndtX4Fo,5501
53
+ bk_resource-0.4.12b0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
54
+ bk_resource-0.4.12b0.dist-info/top_level.txt,sha256=UJxO1tbrqlmnvSTYCLoqg39_gvBesvjp3CcGEPjzXY4,12
55
+ bk_resource-0.4.12b0.dist-info/RECORD,,