cardo-python-utils 0.5.dev13__tar.gz → 0.5.dev15__tar.gz

{cardo_python_utils-0.5.dev13/cardo_python_utils.egg-info → cardo_python_utils-0.5.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cardo-python-utils
-Version: 0.5.dev13
+Version: 0.5.dev15
 Summary: Python library enhanced with a wide range of functions for different scenarios.
 Author-email: CardoAI <hello@cardoai.com>
 License: MIT

{cardo_python_utils-0.5.dev13 → cardo_python_utils-0.5.dev15/cardo_python_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cardo-python-utils
-Version: 0.5.dev13
+Version: 0.5.dev15
 Summary: Python library enhanced with a wide range of functions for different scenarios.
 Author-email: CardoAI <hello@cardoai.com>
 License: MIT

{cardo_python_utils-0.5.dev13 → cardo_python_utils-0.5.dev15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cardo-python-utils"
-version = "0.5.dev13"
+version = "0.5.dev15"
 description = "Python library enhanced with a wide range of functions for different scenarios."
 readme = "README.rst"
 requires-python = ">=3.8"

{cardo_python_utils-0.5.dev13 → cardo_python_utils-0.5.dev15}/python_utils/choices.py

@@ -9,6 +9,7 @@ It adds some useful methods to the Enum class, such as:
 
 from abc import ABC, abstractmethod
 from enum import EnumMeta, Enum
+from typing import Union
 
 
 class IChoice(ABC):
@@ -41,7 +42,7 @@ class ChoiceEnumMeta(EnumMeta, IChoice, ABC):
 
         return new_cls
 
-    def __contains__(cls, item: int | str) -> bool:
+    def __contains__(cls, item: Union[int, str]) -> bool:
         if isinstance(item, int):
             member_values = [v.value[0] for v in cls.__members__.values()]
         elif isinstance(item, str):
@@ -75,12 +76,12 @@ class ChoiceEnum(Enum, metaclass=ChoiceEnumMeta):
         return {elm.value[0]: elm.value[1] for elm in cls}
 
     @classmethod
-    def get_by_value(cls, value: str | int):
+    def get_by_value(cls, value: Union[str, int]):
         value_index = 0 if isinstance(value, int) else 1
         return next((v for v in cls.__members__.values() if v.value[value_index] == value), None)
 
     @classmethod
-    def list_as(cls, item_type) -> list[int | str]:
+    def list_as(cls, item_type) -> list[Union[int, str]]:
         if item_type not in [int, str]:
             raise TypeError('Invalid item type')
         return list(map(item_type, cls))

{cardo_python_utils-0.5.dev13 → cardo_python_utils-0.5.dev15}/python_utils/django/keycloak/api/drf.py

@@ -42,18 +42,32 @@ class HasScope(BasePermission):
         allowed_scopes = ["jobs"]
         ...
 
+    It is possible to define different scopes per HTTP method 
+    by setting `allowed_scopes` as a dict:
+    
+    class MyApiView(APIView):
+        permission_classes = [IsAuthenticated, HasScope]
+        allowed_scopes = {
+            "get": ["jobs"],
+            "post": ["jobs_admin"],
+        }
+        ...
+
     If no particular scope is required, you can set `allowed_scopes = "*"`
         to allow access without scope checks.
     """
 
     def has_permission(self, request, view):
-        allowed_scopes = getattr(view, "allowed_scopes", [])
+        allowed_scopes = getattr(view, "allowed_scopes", None)
 
         if not allowed_scopes:
             raise Exception(
                 f"No allowed_scopes defined on the view '{view.__class__.__name__}'. "
                 "Define allowed_scopes or set it to '*' to allow any scope."
             )
+        
+        if isinstance(allowed_scopes, dict):
+            allowed_scopes = allowed_scopes.get(request.method.lower(), [])
 
         if allowed_scopes == "*":
             return True

{cardo_python_utils-0.5.dev13 → cardo_python_utils-0.5.dev15}/python_utils/django/keycloak/api/ninja.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Literal, Optional
+from typing import Literal, Optional, Union
 
 from jwt.exceptions import InvalidTokenError
 
@@ -93,7 +93,7 @@ class AuthBearer(HttpBearer):
 
         if scopes is None:
             raise Exception(
-                f"No allowed_scopes defined on the view {view_function.__name__}."
+                f"No allowed_scopes defined on the view {view_function.__name__}. "
                 "Add the decorator @allowed_scopes([...]) or @allowed_scopes('*') to the view."
             )
 
@@ -138,7 +138,7 @@ class AuthBearerAsync(AuthBearer):
         return payload
 
 
-def allowed_scopes(scopes: list[str] | Literal["*"]):
+def allowed_scopes(scopes: Union[list[str], Literal["*"]]):
     """
     A decorator that attaches a list of required scopes to a view function
     in the attribute `_allowed_scopes`.

{cardo_python_utils-0.5.dev13 → cardo_python_utils-0.5.dev15}/python_utils/django/keycloak/api/utils.py

@@ -1,4 +1,4 @@
-from typing import TypedDict
+from typing import TypedDict, Union
 
 from django.conf import settings
 from django.contrib.auth import get_user_model
@@ -13,7 +13,7 @@ class TokenPayload(TypedDict, total=False):
     iat: int
     jti: str
     iss: str
-    aud: str | list[str]
+    aud: Union[str, list[str]]
     typ: str
     azp: str
     sid: str