bk-resource 0.4.12b0__tar.gz → 0.4.13b0__tar.gz

{bk_resource-0.4.12b0 → bk_resource-0.4.13b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bk_resource
-Version: 0.4.12b0
+Version: 0.4.13b0
 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.12b0-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
+[![Release Version](https://img.shields.io/badge/release-0.4.13b0-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.12b0 → bk_resource-0.4.13b0}/bk_resource/contrib/model.py

@@ -26,13 +26,10 @@ from rest_framework.generics import GenericAPIView
 from rest_framework.viewsets import ModelViewSet
 
 from bk_resource import Resource
+from bk_resource.base import Empty
 from bk_resource.utils.request import get_mock_request
 
 
-class Empty:
-    ...
-
-
 class ViewMixin(GenericAPIView):
     filter_fields = []
     search_fields = []

{bk_resource-0.4.12b0 → bk_resource-0.4.13b0}/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-0.4.12b0 → bk_resource-0.4.13b0}/bk_resource/utils/request.py

@@ -15,8 +15,11 @@ specific language governing permissions and limitations under the License.
 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 typing import Optional, Type
 
+from django.http import HttpRequest
 from django.test import RequestFactory
+from django.urls import Resolver404, resolve
 
 from bk_resource.utils.local import local
 
@@ -44,3 +47,32 @@ def set_local_username(username):
 
 def get_mock_request(**kwargs):
     return RequestFactory().request(**kwargs)
+
+
+def get_resource_by_request(request: HttpRequest = None) -> Optional[Type["bk_resource.Resource"]]:
+    """根据 request 对象获取具体的 Resource 类"""
+
+    from blueapps.utils.request_provider import get_local_request
+
+    request = request or get_local_request()
+    if not request:
+        return None
+
+    try:
+        match = resolve(request.path_info)
+    except Resolver404:
+        try:
+            match = resolve(f"{request.path_info}/")
+        except Resolver404:
+            return None
+
+    try:
+        from bk_resource.viewsets import RESOURCE_MAPPING
+
+        view_set_path = f"{match.func.cls.__module__}.{match.func.cls.__name__}"
+        resource_clz = RESOURCE_MAPPING.get(
+            (request.method, f"{view_set_path}.{match.func.actions.get(request.method.lower())}")
+        )
+        return resource_clz
+    except Exception:  # pylint: disable=broad-except
+        return None

{bk_resource-0.4.12b0 → bk_resource-0.4.13b0}/bk_resource/viewsets.py

@@ -35,6 +35,9 @@ from bk_resource.base import Resource
 from bk_resource.settings import bk_resource_settings
 
 
+RESOURCE_MAPPING = {}
+
+
 class ResourceRoute(object):
     """
     Resource的视图配置，应用于viewsets
@@ -124,6 +127,7 @@ class ResourceViewSet(viewsets.GenericViewSet):
 
     @classmethod
     def generate_endpoint(cls):
+
         for resource_route in cls.resource_routes:
             # 生成方法模版
             function = cls._generate_function_template(resource_route)
@@ -202,6 +206,9 @@ class ResourceViewSet(viewsets.GenericViewSet):
                     setattr(cls, cls.EMPTY_ENDPOINT_METHODS[resource_route.method], function)
                 else:
                     raise AssertionError(gettext("不支持的请求方法: %s，请确认resource_routes配置是否正确!") % resource_route.method)
+
+                resource_action = cls.EMPTY_ENDPOINT_METHODS[resource_route.method]
+
             else:
                 function = method_decorator(cache_control(max_age=0, private=True))(function)
                 function.__name__ = resource_route.endpoint
@@ -217,6 +224,12 @@ class ResourceViewSet(viewsets.GenericViewSet):
                 function = decorator_function(function)
                 setattr(cls, resource_route.endpoint, function)
 
+                resource_action = resource_route.endpoint
+
+            RESOURCE_MAPPING[
+                (resource_route.method, f"{cls.__module__}.{cls.__name__}.{resource_action}")
+            ] = resource_route.resource_class
+
     @classmethod
     def _generate_function_template(cls, resource_route: ResourceRoute):
         """

{bk_resource-0.4.12b0 → bk_resource-0.4.13b0}/bk_resource.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bk_resource
-Version: 0.4.12b0
+Version: 0.4.13b0
 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.12b0-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
+[![Release Version](https://img.shields.io/badge/release-0.4.13b0-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.12b0 → bk_resource-0.4.13b0}/bk_resource.egg-info/requires.txt

@@ -5,4 +5,4 @@ drf-yasg>=1.20.0
 pyinstrument>=3.4.2
 arrow>=1.2.0
 django-rest-framework-condition>=0.1.1
-celery>=5
+celery>=4.4.0

{bk_resource-0.4.12b0 → bk_resource-0.4.13b0}/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.12b0-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
+[![Release Version](https://img.shields.io/badge/release-0.4.13b0-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.12b0 → bk_resource-0.4.13b0}/setup.py

@@ -23,7 +23,7 @@ with open("readme.md") as f:
 
 setup(
     name="bk_resource",
-    version="0.4.12b0",
+    version="0.4.13b0",
     author="blueking",
     url="https://bk.tencent.com",
     author_email="blueking@tencent.com",
@@ -46,7 +46,7 @@ setup(
         "pyinstrument>=3.4.2",
         "arrow>=1.2.0",
         "django-rest-framework-condition>=0.1.1",
-        "celery>=5",
+        "celery>=4.4.0",
     ],
     include_package_data=True,
 )