Bump version to 0.10.7

Author: cursor12345

drfexts/exceptions.py

@@ -4,13 +4,9 @@
 import traceback
 
 from django.conf import settings
-from django.core.exceptions import PermissionDenied as _PermissionDenied, PermissionDenied
-from django.http import Http404
-from rest_framework import exceptions, status
 from rest_framework.response import Response
-from rest_framework.status import HTTP_200_OK, HTTP_500_INTERNAL_SERVER_ERROR
-from rest_framework.utils.serializer_helpers import ReturnList
-from rest_framework.views import set_rollback
+from rest_framework.status import HTTP_500_INTERNAL_SERVER_ERROR
+from rest_framework.views import set_rollback, exception_handler
 
 
 def _get_detail(detail):
@@ -22,85 +18,17 @@ def _get_detail(detail):
     return result
 
 
-class BaseError(Exception):
-    code = HTTP_500_INTERNAL_SERVER_ERROR
-    params = None
-    message = 'internal error'
-
-    def __init__(self, message=None, detail=None, data=None):
-        self.message = message or self.message
-        super().__init__(self.message, self.code, self.params)
-
-
-def exception_handler(exc, context):
-    """
-    Returns the response that should be used for any given exception.
-
-    By default we handle the REST framework `APIException`, and also
-    Django's built-in `Http404` and `PermissionDenied` exceptions.
-
-    Any unhandled exceptions may return `None`, which will cause a 500 error
-    to be raised.
-    """
-    if isinstance(exc, Http404):
-        exc = exceptions.NotFound()
-    elif isinstance(exc, _PermissionDenied):
-        exc = exceptions.PermissionDenied()
-
-    headers = {}
-    if isinstance(exc, exceptions.ValidationError):
-        data = {"code": exc.status_code, 'message': exc.default_code, 'data': exc.detail}
-    elif isinstance(exc, exceptions.APIException):
-        # DRF异常处理
-        code = exc.status_code
-        if getattr(exc, 'auth_header', None):
-            headers['WWW-Authenticate'] = exc.auth_header
-        if getattr(exc, 'wait', None):
-            headers['Retry-After'] = '%d' % exc.wait
-        data = {"code": code, 'message': str(exc.detail), 'data': exc.detail}
-    elif isinstance(exc, BaseError):
-        # 自定义异常处理
-        data = {"code": exc.code, "message": exc.message}
-    else:
-        data = {"code": HTTP_500_INTERNAL_SERVER_ERROR, "message": "Internal Error", "data": getattr(exc, 'message', repr(exc))}
-
-    set_rollback()
-    if settings.DEBUG:
-        traceback.print_exc()
-        data.update(traceback=traceback.format_exc())
-    return Response(data, status=HTTP_200_OK, headers=headers)
-
-
-def exception_handler(exc, context):
-    """
-    Returns the response that should be used for any given exception.
-
-    By default we handle the REST framework `APIException`, and also
-    Django's built-in `Http404` and `PermissionDenied` exceptions.
-
-    Any unhandled exceptions may return `None`, which will cause a 500 error
-    to be raised.
-    """
-    if isinstance(exc, Http404):
-        exc = exceptions.NotFound()
-    elif isinstance(exc, PermissionDenied):
-        exc = exceptions.PermissionDenied()
-
-    if isinstance(exc, exceptions.APIException):
-        headers = {}
-        if getattr(exc, 'auth_header', None):
-            headers['WWW-Authenticate'] = exc.auth_header
-        if getattr(exc, 'wait', None):
-            headers['Retry-After'] = '%d' % exc.wait
-
-        if isinstance(exc.detail, (list, dict)):
-            data = exc.detail
-        else:
-            data = {'detail': exc.detail}
+def custom_exception_handler(exc, context):
+    # Call REST framework's default exception handler first,
+    # to get the standard error response.
+    response = exception_handler(exc, context)
 
+    # Catch other exceptions.
+    if response is None:
+        response = Response({"detail": str(exc)}, status=HTTP_500_INTERNAL_SERVER_ERROR)
         set_rollback()
-        resp = Response(data, status=status.HTTP_200_OK, headers=headers)
-        resp.error_code = exc.status_code
-        return resp
+        if settings.DEBUG:
+            traceback.print_exc()
+            response.data.update(traceback=traceback.format_exc())
 
-    return None
+    return response

drfexts/models.py

@@ -11,7 +11,8 @@
     StatusField,
     DefaultCodeField,
     AuditStatusField,
-    CreatedByField, UpdatedByField,
+    CreatedByField,
+    UpdatedByField,
 )
 
 User = get_user_model()
@@ -30,12 +31,16 @@ class NotNull(Func):
 
 
 class StatusQueryset(models.QuerySet):
+
     def editable(self):
         return self.exclude(status__in=[CommonStatus.DELETED, CommonStatus.INVALID])
 
-    def valid(self):
+    def active(self):
         return self.filter(status__in=[CommonStatus.VALID, CommonStatus.PAUSED, CommonStatus.TO_INVALID])
 
+    def valid(self):
+        return self.filter(status__in=CommonStatus.VALID)
+
 
 class BaseModel(models.Model):
     """
@@ -46,7 +51,7 @@ class BaseModel(models.Model):
     updated_at = UpdatedAtField()  # 修改时间
     created_at = CreatedAtField()  # 创建时间
 
-    objects = models.Manager()
+    objects = StatusQueryset.as_manager()
 
     class Meta:
         abstract = True
@@ -63,7 +68,7 @@ class BaseCodeModel(models.Model):
     updated_at = UpdatedAtField()  # 修改时间
     created_at = CreatedAtField()  # 创建时间
 
-    objects = models.Manager()
+    objects = StatusQueryset.as_manager()
 
     class Meta:
         abstract = True
@@ -82,6 +87,8 @@ class BaseCreatorModel(models.Model):
     updated_at = UpdatedAtField()  # 修改时间
     created_at = CreatedAtField()  # 创建时间
 
+    objects = StatusQueryset.as_manager()
+
     class Meta:
         abstract = True
 
@@ -113,6 +120,8 @@ class AuditModel(models.Model):
     updated_at = UpdatedAtField()  # 修改时间
     created_at = CreatedAtField()  # 创建时间
 
+    objects = StatusQueryset.as_manager()
+
     class Meta:
         abstract = True
         verbose_name = '审核模型'

drfexts/renderers.py

@@ -101,7 +101,7 @@ def render(
                     payload["msg"] = data["detail"]
                     payload.pop("data", None)
                 except KeyError:
-                    payload["msg"] = "error"
+                    payload["msg"] = "Invalid input."
 
             response.status_code = status.HTTP_200_OK  # Set all response status to HTTP 200
         elif data is None:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "drfexts"
-version = "0.10.4"
+version = "0.10.7"
 readme = "README.md"
 description = "Django Restframework Utils"
 authors = ["aiden <allaher@icloud.com>"]