panther 4.3.4__py3-none-any.whl → 4.3.6__py3-none-any.whl

panther/__init__.py

@@ -1,6 +1,6 @@
 from panther.main import Panther  # noqa: F401
 
-__version__ = '4.3.4'
+__version__ = '4.3.6'
 
 
 def version():

panther/_load_configs.py

@@ -154,22 +154,26 @@ def load_middlewares(_configs: dict, /) -> None:
     # Collect Middlewares
     for middleware in _configs.get('MIDDLEWARES') or []:
         if not isinstance(middleware, list | tuple):
-            raise _exception_handler(field='MIDDLEWARES', error=f'{middleware} should have 2 part: (path, kwargs)')
+            path_or_type = middleware
+            data = {}
 
-        if len(middleware) == 1:
-            path = middleware[0]
+        elif len(middleware) == 1:
+            path_or_type = middleware[0]
             data = {}
 
         elif len(middleware) > 2:
             raise _exception_handler(field='MIDDLEWARES', error=f'{middleware} too many arguments')
 
         else:
-            path, data = middleware
+            path_or_type, data = middleware
 
-        try:
-            middleware_class = import_class(path)
-        except (AttributeError, ModuleNotFoundError):
-            raise _exception_handler(field='MIDDLEWARES', error=f'{path} is not a valid middleware path')
+        if callable(path_or_type):
+            middleware_class = path_or_type
+        else:
+            try:
+                middleware_class = import_class(path_or_type)
+            except (AttributeError, ModuleNotFoundError):
+                raise _exception_handler(field='MIDDLEWARES', error=f'{path_or_type} is not a valid middleware path')
 
         if issubclass(middleware_class, BaseMiddleware) is False:
             raise _exception_handler(field='MIDDLEWARES', error='is not a sub class of BaseMiddleware')

panther/_utils.py

@@ -78,15 +78,9 @@ def is_function_async(func: Callable) -> bool:
     return bool(func.__code__.co_flags & (1 << 7))
 
 
-def clean_traceback_message(exception: Exception) -> str:
-    """We are ignoring packages traceback message"""
+def traceback_message(exception: Exception) -> str:
     tb = TracebackException(type(exception), exception, exception.__traceback__)
-    stack = tb.stack.copy()
-    for t in stack:
-        if t.filename.find('site-packages/panther') != -1 or t.filename.find('site-packages\\panther') != -1:
-            tb.stack.remove(t)
-    _traceback = list(tb.format(chain=False))
-    return exception if len(_traceback) == 1 else f'{exception}\n' + ''.join(_traceback)
+    return ''.join(tb.format(chain=False))
 
 
 def reformat_code(base_dir):

panther/app.py

@@ -34,16 +34,16 @@ logger = logging.getLogger('panther')
 
 class API:
     def __init__(
-            self,
-            *,
-            input_model: type[ModelSerializer] | type[BaseModel] | None = None,
-            output_model: type[ModelSerializer] | type[BaseModel] | None = None,
-            auth: bool = False,
-            permissions: list | None = None,
-            throttling: Throttling | None = None,
-            cache: bool = False,
-            cache_exp_time: timedelta | int | None = None,
-            methods: list[Literal['GET', 'POST', 'PUT', 'PATCH', 'DELETE']] | None = None,
+        self,
+        *,
+        input_model: type[ModelSerializer] | type[BaseModel] | None = None,
+        output_model: type[ModelSerializer] | type[BaseModel] | None = None,
+        auth: bool = False,
+        permissions: list | None = None,
+        throttling: Throttling | None = None,
+        cache: bool = False,
+        cache_exp_time: timedelta | int | None = None,
+        methods: list[Literal['GET', 'POST', 'PUT', 'PATCH', 'DELETE']] | None = None,
     ):
         self.input_model = input_model
         self.output_model = output_model
@@ -51,7 +51,7 @@ class API:
         self.permissions = permissions or []
         self.throttling = throttling
         self.cache = cache
-        self.cache_exp_time = cache_exp_time
+        self.cache_exp_time = cache_exp_time # or config.DEFAULT_CACHE_EXP
         self.methods = methods
         self.request: Request | None = None
 
@@ -84,7 +84,7 @@ class API:
             # 6. Get Cached Response
             if self.cache and self.request.method == 'GET':
                 if cached := await get_response_from_cache(request=self.request, cache_exp_time=self.cache_exp_time):
-                    return Response(data=cached.data, status_code=cached.status_code)
+                    return Response(data=cached.data, headers=cached.headers, status_code=cached.status_code)
 
             # 7. Put PathVariables and Request(If User Wants It) In kwargs
             kwargs = self.request.clean_parameters(func)
@@ -105,11 +105,7 @@ class API:
 
             # 10. Set New Response To Cache
             if self.cache and self.request.method == 'GET':
-                await set_response_in_cache(
-                    request=self.request,
-                    response=response,
-                    cache_exp_time=self.cache_exp_time
-                )
+                await set_response_in_cache(request=self.request, response=response, cache_exp_time=self.cache_exp_time)
 
             # 11. Warning CacheExpTime
             if self.cache_exp_time and self.cache is False:

panther/caching.py

@@ -8,14 +8,14 @@ import orjson as json
 from panther.configs import config
 from panther.db.connections import redis
 from panther.request import Request
-from panther.response import Response, ResponseDataTypes
+from panther.response import Response
 from panther.throttling import throttling_storage
 from panther.utils import generate_hash_value_from_string, round_datetime
 
 logger = logging.getLogger('panther')
 
 caches = {}
-CachedResponse = namedtuple('CachedResponse', ['data', 'status_code'])
+CachedResponse = namedtuple('CachedResponse', ['data', 'headers', 'status_code'])
 
 
 def api_cache_key(request: Request, cache_exp_time: timedelta | None = None) -> str:
@@ -46,13 +46,16 @@ async def get_response_from_cache(*, request: Request, cache_exp_time: timedelta
     if redis.is_connected:
         key = api_cache_key(request=request)
         data = (await redis.get(key) or b'{}').decode()
-        if cached_value := json.loads(data):
-            return CachedResponse(*cached_value)
-
+        if value := json.loads(data):
+            return CachedResponse(
+                data=value[0].encode(),
+                headers=value[1],
+                status_code=value[2]
+            )
     else:
         key = api_cache_key(request=request, cache_exp_time=cache_exp_time)
-        if cached_value := caches.get(key):
-            return CachedResponse(*cached_value)
+        if value := caches.get(key):
+            return CachedResponse(*value)
 
 
 async def set_response_in_cache(*, request: Request, response: Response, cache_exp_time: timedelta | int) -> None:
@@ -63,16 +66,14 @@ async def set_response_in_cache(*, request: Request, response: Response, cache_e
         Cache The Data In Memory
     """
 
-    cache_data: tuple[ResponseDataTypes, int] = (response.data, response.status_code)
-
     if redis.is_connected:
         key = api_cache_key(request=request)
-
+        cache_data: tuple[str, str, int] = (response.body.decode(), response.headers, response.status_code)
         cache_exp_time = cache_exp_time or config.DEFAULT_CACHE_EXP
         cache_data: bytes = json.dumps(cache_data)
 
         if not isinstance(cache_exp_time, timedelta | int | NoneType):
-            msg = '"cache_exp_time" should be instance of "datetime.timedelta" or "int" or "None"'
+            msg = '`cache_exp_time` should be instance of `datetime.timedelta`, `int` or `None`'
             raise TypeError(msg)
 
         if cache_exp_time is None:
@@ -86,6 +87,8 @@ async def set_response_in_cache(*, request: Request, response: Response, cache_e
 
     else:
         key = api_cache_key(request=request, cache_exp_time=cache_exp_time)
+        cache_data: tuple[bytes, str, int] = (response.body, response.headers, response.status_code)
+
         caches[key] = cache_data
 
         if cache_exp_time:

panther/cli/monitor_command.py

@@ -19,7 +19,7 @@ from panther.configs import config
 with contextlib.suppress(ImportError):
     from watchfiles import watch
 
-loggerr = logging.getLogger('panther')
+logger = logging.getLogger('panther')
 
 
 class Monitoring:
@@ -30,7 +30,7 @@ class Monitoring:
     def monitor(self) -> None:
         if error := self.initialize():
             # Don't continue if initialize() has error
-            loggerr.error(error)
+            logger.error(error)
             return
 
         with (
@@ -51,7 +51,10 @@ class Monitoring:
 
             for _ in watching:
                 for line in f.readlines():
-                    self.rows.append(line.split('|'))
+                    # line = date_time | method | path | ip:port | response_time(seconds) | status
+                    columns = line.split('|')
+                    columns[4] = self._clean_response_time(float(columns[4]))
+                    self.rows.append(columns)
                     live.update(self.generate_table())
 
     def initialize(self) -> str:
@@ -100,5 +103,19 @@ class Monitoring:
         lines = (os.get_terminal_size()[1] - 6) // 2
         self.rows = deque(self.rows, maxlen=lines)
 
+    @classmethod
+    def _clean_response_time(cls, response_time: int) -> str:
+        time_unit = ' s'
+
+        if response_time < 0.01:
+            response_time = response_time * 1_000
+            time_unit = 'ms'
+
+        elif response_time >= 10:
+            response_time = response_time / 60
+            time_unit = ' m'
+
+        return f'{round(response_time, 4)} {time_unit}'
+
 
 monitor = Monitoring().monitor

panther/main.py

@@ -1,4 +1,3 @@
-import asyncio
 import contextlib
 import logging
 import sys
@@ -12,7 +11,7 @@ import orjson as json
 import panther.logging
 from panther import status
 from panther._load_configs import *
-from panther._utils import clean_traceback_message, reformat_code, check_class_type_endpoint, check_function_type_endpoint
+from panther._utils import traceback_message, reformat_code
 from panther.cli.utils import print_info
 from panther.configs import config
 from panther.events import Event
@@ -38,7 +37,7 @@ class Panther:
             if config.AUTO_REFORMAT:
                 reformat_code(base_dir=config.BASE_DIR)
         except Exception as e:  # noqa: BLE001
-            logger.error(e.args[0] if isinstance(e, PantherError) else clean_traceback_message(e))
+            logger.error(e.args[0] if isinstance(e, PantherError) else traceback_message(exception=e))
             sys.exit()
 
         # Print Info
@@ -191,8 +190,8 @@ class Panther:
 
         except Exception as e:  # noqa: BLE001
             # All unhandled exceptions are caught here
-            exception = clean_traceback_message(exception=e)
-            logger.critical(exception)
+            exception = traceback_message(exception=e)
+            logger.error(exception)
             return await self._raise(send, monitoring=monitoring)
 
         # Call Middlewares .after()
@@ -226,4 +225,3 @@ class Panther:
         await monitoring.after(status_code)
         await send({'type': 'http.response.start', 'status': status_code, 'headers': headers})
         await send({'type': 'http.response.body', 'body': body, 'more_body': False})
-

panther/monitoring.py

@@ -11,7 +11,7 @@ logger = logging.getLogger('monitoring')
 class Monitoring:
     """
     Create Log Message Like Below:
-    date time | method | path | ip:port | response_time [ms, s] | status
+    date_time | method | path | ip:port | response_time(seconds) | status
     """
     def __init__(self, is_ws: bool = False):
         self.is_ws = is_ws
@@ -30,15 +30,5 @@ class Monitoring:
 
     async def after(self, status: int | Literal['Accepted', 'Rejected', 'Closed'], /):
         if config.MONITORING:
-            response_time = perf_counter() - self.start_time
-            time_unit = ' s'
-
-            if response_time < 0.01:
-                response_time = response_time * 1_000
-                time_unit = 'ms'
-
-            elif response_time >= 10:
-                response_time = response_time / 60
-                time_unit = ' m'
-
-            logger.info(f'{self.log} | {round(response_time, 4)} {time_unit} | {status}')
+            response_time = perf_counter() - self.start_time  # Seconds
+            logger.info(f'{self.log} | {response_time} | {status}')

panther/response.py

@@ -13,7 +13,6 @@ else:
 
 import orjson as json
 from pydantic import BaseModel
-from jinja2 import Environment, FileSystemLoader
 
 from panther import status
 from panther.configs import config
@@ -43,7 +42,7 @@ class Response:
         :param headers: should be dict of headers
         :param status_code: should be int
         :param pagination: instance of Pagination or None
-            Its template() method will be used
+            The `pagination.template()` method will be used
         """
         self.headers = headers or {}
         self.pagination: Pagination | None = pagination
@@ -236,7 +235,6 @@ class TemplateResponse(HTMLResponse):
         context: dict | NoneType = None,
         headers: dict | NoneType = None,
         status_code: int = status.HTTP_200_OK,
-        pagination: Pagination | NoneType = None,
     ):
         """
         :param source: should be a string
@@ -244,8 +242,13 @@ class TemplateResponse(HTMLResponse):
         :param context: should be dict of items
         :param headers: should be dict of headers
         :param status_code: should be int
-        :param pagination: instance of Pagination or None
-            Its template() method will be used
         """
-        template = config.JINJA_ENVIRONMENT.get_template(path) if path is not None else config.JINJA_ENVIRONMENT.from_string(source)
-        super().__init__(template.render(context or {}), headers, status_code, pagination=pagination)
+        if path:
+            template = config.JINJA_ENVIRONMENT.get_template(name=path)
+        else:
+            template = config.JINJA_ENVIRONMENT.from_string(source=source)
+        super().__init__(
+            data=template.render(context or {}),
+            headers=headers,
+            status_code=status_code,
+        )

{panther-4.3.4.dist-info → panther-4.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: panther
-Version: 4.3.4
+Version: 4.3.6
 Summary: Fast & Friendly, Web Framework For Building Async APIs
 Home-page: https://github.com/alirn76/panther
 Author: Ali RajabNezhad
@@ -14,16 +14,13 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pantherdb~=2.1.0
+Requires-Dist: pantherdb~=2.1.1
 Requires-Dist: pydantic~=2.8.2
 Requires-Dist: rich~=13.7.1
 Requires-Dist: uvicorn~=0.27.1
 Requires-Dist: pytz~=2024.1
 Requires-Dist: Jinja2~=3.1
 Requires-Dist: httptools~=0.6.1
-Provides-Extra: dev
-Requires-Dist: ruff~=0.1.9; extra == "dev"
-Requires-Dist: pytest~=8.3.3; extra == "dev"
 Provides-Extra: full
 Requires-Dist: redis==5.0.1; extra == "full"
 Requires-Dist: motor~=3.5.0; extra == "full"
@@ -33,6 +30,9 @@ Requires-Dist: ruff~=0.1.9; extra == "full"
 Requires-Dist: websockets~=12.0; extra == "full"
 Requires-Dist: cryptography~=42.0.8; extra == "full"
 Requires-Dist: watchfiles~=0.21.0; extra == "full"
+Provides-Extra: dev
+Requires-Dist: ruff~=0.1.9; extra == "dev"
+Requires-Dist: pytest~=8.3.3; extra == "dev"
 
 
 [![PyPI](https://img.shields.io/pypi/v/panther?label=PyPI)](https://pypi.org/project/panther/) [![PyVersion](https://img.shields.io/pypi/pyversions/panther.svg)](https://pypi.org/project/panther/) [![codecov](https://codecov.io/github/AliRn76/panther/graph/badge.svg?token=YWFQA43GSP)](https://codecov.io/github/AliRn76/panther) [![Downloads](https://static.pepy.tech/badge/panther/month)](https://pepy.tech/project/panther) [![license](https://img.shields.io/github/license/alirn76/panther.svg)](https://github.com/alirn76/panther/blob/main/LICENSE)

{panther-4.3.4.dist-info → panther-4.3.6.dist-info}/RECORD

@@ -1,24 +1,24 @@
-panther/__init__.py,sha256=pi--vX1J1xQHzhNFeCOc2PFlgcN6A952z5Na058Avng,110
-panther/_load_configs.py,sha256=tVzUB8WqwkOcsRbs1T4vhaKICPbDlXelr5h7LVdVupU,10079
-panther/_utils.py,sha256=R1tsUde1zA5iJtk-ZvWe8hp6JaNhKgNoH2rxpdiQDMc,4449
-panther/app.py,sha256=e2eb4sXIaBje5vpcm4pbvvEO_sj83pLfBHCIZJFFX38,8222
+panther/__init__.py,sha256=a3xRGlPVogHnbjt1Se22KYGrRsBLPl7Ko7i9hL_QH1o,110
+panther/_load_configs.py,sha256=NMQxKMMjkV6J3rxH5tfCTaZ6Rie7xzx-knEByXEtCUQ,10166
+panther/_utils.py,sha256=uufhLXT_TdiQacrcCV-Jr12ET7uqaiX2E3Y9AzbVfDQ,4109
+panther/app.py,sha256=aVVoUihLMo7rofKetw95HPq2B92a-AI9KooxFpbuTec,8158
 panther/authentications.py,sha256=gf7BVyQ8vXKhiumJAtD0aAK7uIHWx_snbOKYAKrYuVw,5677
 panther/background_tasks.py,sha256=HBYubDIiO_673cl_5fqCUP9zzimzRgRkDSkag9Msnbs,7656
 panther/base_request.py,sha256=XD2v1gLWcCKHePowRxT6_fYnS4tdKFxTLINMX0HQu8M,3880
 panther/base_websocket.py,sha256=L0tiQQjg7E3462cd91PMf_SoVMMK4YiwW45yTFdTLhY,10973
-panther/caching.py,sha256=ltuJYdjNiAaKIs3jpO5EBpL8Y6CF1vAIQqh8J_Np10g,4098
+panther/caching.py,sha256=0UWg2xlTkyTKcf6rMjf-oZIE_kJWpPfpKKaDOCZxazg,4299
 panther/configs.py,sha256=0VmXWFnktMGUI8X8o2xoC92872OS1G9ohAzRcvQSD2U,3329
 panther/events.py,sha256=bxDqrfiNNBlvD03vEk2LDK4xbMzTMFVcgAjx2ein7mI,1158
 panther/exceptions.py,sha256=7rHdJIES2__kqOStIqbHl3Uxask2lzKgLQlkZvvDwFA,1591
 panther/file_handler.py,sha256=I94tpbtTVniBnnUMkFr3Eis6kPDt8sLzS5u8TzFrR5I,1323
 panther/generics.py,sha256=D2ia7M4ML15kMZiuCIMpL7ZfQhMmKpqE4wCmuRE-q4Y,7233
 panther/logging.py,sha256=SGgF9faQM1QmbmMPVc6m1DY-TbV329kTD8BuzGLx3I0,2073
-panther/main.py,sha256=SnDN_aqpg5qG7jqwrb9JEiBs9bSmUUDursGuXs3FJbQ,9159
-panther/monitoring.py,sha256=y1F3c8FJlnmooM-m1nSyOTa9eWq0v1nHnmw9zz-4Kls,1314
+panther/main.py,sha256=UgzsXKC1zhtBfVIDELa9axDkWPCtVVU3aAWJpYkxTOs,9075
+panther/monitoring.py,sha256=C0tYBKGci6QR33CN-MixMzCP24ka0a6V0AU2H1sS4HU,1026
 panther/pagination.py,sha256=ANJrEF0q1nVAfD33I4nZfUUxFcETzJb01gIhbZX3HEw,1639
 panther/permissions.py,sha256=9-J5vzvEKa_PITwEVQbZZv8PG2FOu05YBlD5yMrKcfc,348
 panther/request.py,sha256=F9ZiAWSse7_6moAzqdoFInUN4zTKlzijh9AdU9w3Jfw,1673
-panther/response.py,sha256=vcKyhpjdKNNw8iksTfGSeDO3VJ6_TgvwzIOfmHAdGIc,8794
+panther/response.py,sha256=iauz2akIq6O3k_XheH6uS38fYdS6X3GTWakGBsYCTp4,8697
 panther/routings.py,sha256=1eqbjubLnUUEQRlz8mIF464ImvCMjyasiekHBtxEQoQ,6218
 panther/serializer.py,sha256=5O5dypP9ys0qTKrjwaXONmOqCfDHoXY1q5ajsirFjM8,9083
 panther/status.py,sha256=Gc_PnYrHfInTsZpGbqiCfDB-py1C7Rh8KMdb6Lq9Exs,3346
@@ -29,7 +29,7 @@ panther/websocket.py,sha256=YRWgc_FUrv94-dnM2nm41EDgCsqZHxQ1N53Gma7c9s0,1452
 panther/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 panther/cli/create_command.py,sha256=mT5GFzsTYZbzqShNHlw_UIkMcWLw9btm2mTwcg7TlfI,10292
 panther/cli/main.py,sha256=pCqnOTazgMhTvFHTugutIsiFXueU5kx2VmGngwAl54Q,1679
-panther/cli/monitor_command.py,sha256=sbnxQOSy0Q6GB-ELrfyoY6S-ZwgbI7eZyKx7YkvrEas,3383
+panther/cli/monitor_command.py,sha256=KQUGu3L_PDmM0b5Ygy_eeKQmGPM3r8-WkLxUdmS9cBE,3982
 panther/cli/run_command.py,sha256=yWcDoWC-c4ph4M5EDj0jvR9xSjh-apG5r6-NpDdArUo,2195
 panther/cli/template.py,sha256=hVkY1A3HZDVGEZzRkMtYte6FagKGTAxoFeG0wot7Zn4,5320
 panther/cli/utils.py,sha256=g_Xkvh_GCFrc3Remgp02lVi3YkmCAvcNKuAY_QvBTLI,5290
@@ -49,9 +49,9 @@ panther/panel/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 panther/panel/apis.py,sha256=COsbwKZyTgyHvHYbpDfusifAH9ojMS3z1KhZCt9M-Ms,2428
 panther/panel/urls.py,sha256=JiV-H4dWE-m_bfaTTVxzOxTvJmOWhyLOvcbM7xU3Bn4,240
 panther/panel/utils.py,sha256=0Rv79oR5IEqalqwpRKQHMn1p5duVY5mxMqDKiA5mWx4,437
-panther-4.3.4.dist-info/LICENSE,sha256=2aF1hL2aC0zRPjzUkSxJUzZbn2_uLoOkn7DHjzZni-I,1524
-panther-4.3.4.dist-info/METADATA,sha256=1qZpoxF1s8VPGSwg14Mq24lTKFpg4Txjl0lNHogW93o,6695
-panther-4.3.4.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-panther-4.3.4.dist-info/entry_points.txt,sha256=6GPxYFGuzVfNB4YpHFJvYex6iWah5_tLnirAHwj2Qsg,51
-panther-4.3.4.dist-info/top_level.txt,sha256=VbBs02JGXTIoHMzsX-eLOk2MCbBZzQbLhWiYpI7xI2g,8
-panther-4.3.4.dist-info/RECORD,,
+panther-4.3.6.dist-info/LICENSE,sha256=2aF1hL2aC0zRPjzUkSxJUzZbn2_uLoOkn7DHjzZni-I,1524
+panther-4.3.6.dist-info/METADATA,sha256=5Qf1rcXy9pvYF72LlzjLYrNapDyKJwdzQF8hOOGgsRk,6695
+panther-4.3.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+panther-4.3.6.dist-info/entry_points.txt,sha256=6GPxYFGuzVfNB4YpHFJvYex6iWah5_tLnirAHwj2Qsg,51
+panther-4.3.6.dist-info/top_level.txt,sha256=VbBs02JGXTIoHMzsX-eLOk2MCbBZzQbLhWiYpI7xI2g,8
+panther-4.3.6.dist-info/RECORD,,

{panther-4.3.4.dist-info → panther-4.3.6.dist-info}/WHEEL

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