panther 4.1.0__py3-none-any.whl → 4.1.2__py3-none-any.whl

panther/__init__.py

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

panther/_utils.py

@@ -82,7 +82,7 @@ def clean_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:
+        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)

panther/app.py

@@ -96,6 +96,8 @@ class API:
                 response = Response(data=response)
             if self.output_model and response.data:
                 response.data = await response.apply_output_model(output_model=self.output_model)
+            if response.pagination:
+                response.data = await response.pagination.template(response.data)
 
             # 10. Set New Response To Cache
             if self.cache and self.request.method == 'GET':

panther/base_websocket.py

@@ -52,8 +52,11 @@ class WebsocketConnections(Singleton):
             queue = self.pubsub.subscribe()
             logger.info("Subscribed to 'websocket_connections' queue")
             while True:
-                received_message = queue.get()
-                await self._handle_received_message(received_message=received_message)
+                try:
+                    received_message = queue.get()
+                    await self._handle_received_message(received_message=received_message)
+                except InterruptedError:
+                    break
         else:
             # We have a redis connection, so use it for pubsub
             self.pubsub = self.pubsub_connection.pubsub()

panther/cli/monitor_command.py

@@ -57,7 +57,7 @@ class Monitoring:
 
         # Check log file
         if not self.monitoring_log_file.exists():
-            return f'`{self.monitoring_log_file}` file not found. (Make sure `MONITORING` is `True` in `configs`'
+            return f'`{self.monitoring_log_file}` file not found. (Make sure `MONITORING` is `True` in `configs` and you have at least one record)'
 
         # Initialize Deque
         self.update_rows()

panther/cli/run_command.py

@@ -1,3 +1,4 @@
+import contextlib
 import os
 
 import uvicorn
@@ -75,6 +76,7 @@ def run(args: list[str]) -> None:
     command.update(_handle_commands(args))
     command.update(args)
     try:
-        uvicorn.run('main:app', **command)
+        with contextlib.suppress(KeyboardInterrupt):
+            uvicorn.run('main:app', **command)
     except TypeError as e:
         cli_error(e)

panther/db/connections.py

@@ -122,7 +122,13 @@ class RedisConnection(Singleton, _Redis):
     def sync_ping(self):
         from redis import Redis
 
-        Redis(host=self.host, port=self.port, **self.kwargs).ping()
+        Redis(host=self.host, port=self.port, socket_timeout=3, **self.kwargs).ping()
+
+    async def execute_command(self, *args, **options):
+        if self.is_connected:
+            return await super().execute_command(*args, **options)
+        msg = '`REDIS` is not found in `configs`'
+        raise ValueError(msg)
 
     def create_connection_for_websocket(self) -> _Redis:
         if not hasattr(self, 'websocket_connection'):

panther/db/models.py

@@ -58,7 +58,7 @@ class BaseUser(Model):
 
     async def login(self) -> dict:
         """Return dict of access and refresh token"""
-        return config.AUTHENTICATION.login(self.id)
+        return config.AUTHENTICATION.login(str(self.id))
 
     async def logout(self) -> dict:
         return await config.AUTHENTICATION.logout(self._auth_token)

panther/generics.py

@@ -65,10 +65,10 @@ class ListAPI(GenericAPI, CursorRequired):
     pagination: type[Pagination]
 
     async def get(self, request: Request, **kwargs):
-        cursor = await self.prepare_cursor(request=request, **kwargs)
-        return Response(data=cursor, status_code=status.HTTP_200_OK)
+        cursor, pagination = await self.prepare_cursor(request=request, **kwargs)
+        return Response(data=cursor, pagination=pagination, status_code=status.HTTP_200_OK)
 
-    async def prepare_cursor(self, request: Request, **kwargs):
+    async def prepare_cursor(self, request: Request, **kwargs) -> tuple[Cursor | PantherDBCursor, Pagination | None]:
         cursor = await self.cursor(request=request, **kwargs)
         self._check_cursor(cursor)
 
@@ -83,9 +83,9 @@ class ListAPI(GenericAPI, CursorRequired):
             cursor = cursor.sort(sort)
 
         if pagination := self.process_pagination(query_params=request.query_params, cursor=cursor):
-            cursor = await pagination.paginate()
+            cursor = pagination.paginate()
 
-        return cursor
+        return cursor, pagination
 
     def process_filters(self, query_params: dict, cursor: Cursor | PantherDBCursor) -> dict:
         _filter = {}

panther/logging.py

@@ -66,8 +66,8 @@ LOGGING = {
         },
         'uvicorn.error': {
             'handlers': ['default'],
-            'level': 'WARNING',
+            'level': 'INFO',
             'propagate': False,
         },
     }
-}
+}

panther/pagination.py

@@ -36,7 +36,10 @@ class Pagination:
         previous_skip = max(self.skip - self.limit, 0)
         return f'?limit={self.limit}&skip={previous_skip}'
 
-    async def paginate(self):
+    def paginate(self):
+        return self.cursor.skip(skip=self.skip).limit(limit=self.limit)
+
+    async def template(self, response: list):
         count = await self.cursor.cls.count(self.cursor.filter)
         has_next = not bool(self.limit + self.skip >= count)
 
@@ -44,5 +47,5 @@ class Pagination:
             'count': count,
             'next': self.build_next_params() if has_next else None,
             'previous': self.build_previous_params() if self.skip else None,
-            'results': self.cursor.skip(skip=self.skip).limit(limit=self.limit)
+            'results': response
         }

panther/response.py

@@ -10,6 +10,7 @@ from panther._utils import to_async_generator
 from panther.db.cursor import Cursor
 from pantherdb import Cursor as PantherDBCursor
 from panther.monitoring import Monitoring
+from panther.pagination import Pagination
 
 ResponseDataTypes = list | tuple | set | Cursor | PantherDBCursor | dict | int | float | str | bool | bytes | NoneType | Type[BaseModel]
 IterableDataTypes = list | tuple | set | Cursor | PantherDBCursor
@@ -24,13 +25,19 @@ class Response:
         data: ResponseDataTypes = None,
         headers: dict | None = None,
         status_code: int = status.HTTP_200_OK,
+        pagination: Pagination | None = None,
     ):
         """
         :param data: should be an instance of ResponseDataTypes
         :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
         """
         self.headers = headers or {}
+        self.pagination: Pagination | None = pagination
+        if isinstance(data, Cursor):
+            data = list(data)
         self.initial_data = data
         self.data = self.prepare_data(data=data)
         self.status_code = self.check_status_code(status_code=status_code)
@@ -60,7 +67,7 @@ class Response:
     def headers(self, headers: dict):
         self._headers = headers
 
-    def prepare_data(self, data: any):
+    def prepare_data(self, data: Any):
         """Make sure the response data is only ResponseDataTypes or Iterable of ResponseDataTypes"""
         if isinstance(data, (int | float | str | bool | bytes | NoneType)):
             return data

{panther-4.1.0.dist-info → panther-4.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: panther
-Version: 4.1.0
+Version: 4.1.2
 Summary: Fast &  Friendly, Web Framework For Building Async APIs
 Home-page: https://github.com/alirn76/panther
 Author: Ali RajabNezhad

{panther-4.1.0.dist-info → panther-4.1.2.dist-info}/RECORD

@@ -1,24 +1,24 @@
-panther/__init__.py,sha256=y4niTNbN1Jwrm8eXNSrzLlVOGoajNgm3E6I1fs2i7QA,110
+panther/__init__.py,sha256=jygFzW2zuio44KfIpTdDG3C8iAGBD_vxBn8GVGODSDk,110
 panther/_load_configs.py,sha256=AVkoixkUFkBQiTmrLrwCmg0eiPW2U_Uw2EGNEGQRfnI,9281
-panther/_utils.py,sha256=xeVR0yHvczhXv2XXrpoa6SHpGTDTFxNxiemXTdbsqjM,4279
-panther/app.py,sha256=a0QLpxM5fwLyWDHZjVaYrLw0_Rfx3p2NnZWcfyCzwf4,7267
+panther/_utils.py,sha256=j0rwIxTf0rtcZAAD-1nGE-_bWpvinyKtnwt3uO0hMmY,4330
+panther/app.py,sha256=vb4j8CKidFHD5HIfK1t96fr8URMYxkroW8dQH9SVj14,7385
 panther/authentications.py,sha256=gf7BVyQ8vXKhiumJAtD0aAK7uIHWx_snbOKYAKrYuVw,5677
 panther/background_tasks.py,sha256=HBYubDIiO_673cl_5fqCUP9zzimzRgRkDSkag9Msnbs,7656
 panther/base_request.py,sha256=Fwwpm-9bjAZdpzSdakmSas5BD3gh1nrc6iGcBxwa_94,4001
-panther/base_websocket.py,sha256=hJN_ItUGLpk0QMWrExlDHQahiu7hYgc_jVvHWxqqpq4,10547
+panther/base_websocket.py,sha256=iJUIbrfnh3ZLXlmKxTswMw158eNvtBFi8RZ-aBBmc8w,10643
 panther/caching.py,sha256=ltuJYdjNiAaKIs3jpO5EBpL8Y6CF1vAIQqh8J_Np10g,4098
 panther/configs.py,sha256=EaLApT6nYcguBoNXBG_8n6DU6HTNxsulI2943j8UAkE,3174
 panther/events.py,sha256=bxDqrfiNNBlvD03vEk2LDK4xbMzTMFVcgAjx2ein7mI,1158
 panther/exceptions.py,sha256=7rHdJIES2__kqOStIqbHl3Uxask2lzKgLQlkZvvDwFA,1591
 panther/file_handler.py,sha256=XnomEigCUYOaXjkH4kD1kzpUbL2i9lLnR5kerruF6BA,846
-panther/generics.py,sha256=HGbCGvHEpbWaY4MrtI_Wphkm9YEGR8PV_X9uERSRGVI,6576
-panther/logging.py,sha256=t0nQXsSIwIxShqFnjRGp6lhO4Ybf1SnwJraDSTqMHFM,2211
+panther/generics.py,sha256=SIK1Wqpfb_jKKt4xJPbYIhMY0QhtbhOXS68dIW4Y0bU,6671
+panther/logging.py,sha256=k__vzvSrPpr1IsA4OLrBt1JHuRUBXr7ekPlBW0-9rbM,2209
 panther/main.py,sha256=UbIxwaojvY_vH9nYfBpkulRBqVEj4Lbl81Er4XW_KCY,9334
 panther/monitoring.py,sha256=y1F3c8FJlnmooM-m1nSyOTa9eWq0v1nHnmw9zz-4Kls,1314
-panther/pagination.py,sha256=efpsWMgLBaTWXhnhMAf6fyIrGTmVOFbmHpX03GgEJh0,1574
+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=G0Ychc3Tp5UANtmst7o4npOrmdca6kKC_HYYoeYWLUQ,7266
+panther/response.py,sha256=Njp4zJozNic8J4ucG8Sgh-xeBZOgtoz2cfdDkJlGOWU,7582
 panther/routings.py,sha256=1eqbjubLnUUEQRlz8mIF464ImvCMjyasiekHBtxEQoQ,6218
 panther/serializer.py,sha256=MBT43UG8YBjp-UGaqe5-SPqQHIcDEjLAdBjHAVKyMJo,9059
 panther/status.py,sha256=Gc_PnYrHfInTsZpGbqiCfDB-py1C7Rh8KMdb6Lq9Exs,3346
@@ -29,14 +29,14 @@ panther/websocket.py,sha256=5WLw--Oa-6kGYbeRvO79hjbd0ARFcTTF40-hO_bdjmQ,1206
 panther/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 panther/cli/create_command.py,sha256=cVhz0VQOvEbpufFsevH9T1rYZ8T_Wsa89cpTiIVKTC0,10294
 panther/cli/main.py,sha256=pCqnOTazgMhTvFHTugutIsiFXueU5kx2VmGngwAl54Q,1679
-panther/cli/monitor_command.py,sha256=aK70JyQz7-NXBYR4Ed4YQwtR55ypks9vaTK_h7Ck5kE,3105
-panther/cli/run_command.py,sha256=X_T9jP_Z8X_fm9S4LSoR6ARsPp4rCTMi1E5c7QWREjM,2120
+panther/cli/monitor_command.py,sha256=7N1-4W0Lu7yl5maehJowe04WH4nxZ1DumGDRATh82SQ,3139
+panther/cli/run_command.py,sha256=yWcDoWC-c4ph4M5EDj0jvR9xSjh-apG5r6-NpDdArUo,2195
 panther/cli/template.py,sha256=rsyKOQ0l2v3kdwmLiZxt5ecIhDzmFprCCv0uVAv7eQI,5319
 panther/cli/utils.py,sha256=Jd4YQ9H6lapVktl7ZmiORt30WVmKI85xcwsY-fMRq3c,5289
 panther/db/__init__.py,sha256=w9lEL0vRqb18Qx_iUJipUR_fi5GQ5uVX0DWycx14x08,50
-panther/db/connections.py,sha256=P2mNO_WHJmQxwCL3VgZ-5AN97yx_cMHF2MevZyxlZDc,3959
+panther/db/connections.py,sha256=rps48Ic2r3SV2HD3df1OU7C4Pv8j98PVXU1O_FqF9Ak,4210
 panther/db/cursor.py,sha256=jJ6bhz_Zljt3-AoeVdi563e2q3MSDJPP33WVbQk-goE,1287
-panther/db/models.py,sha256=BjBOdTyByDWs3S2V0leERd_47ZhoTbH306TIp-0Wgo8,2570
+panther/db/models.py,sha256=4g6Jm2TBTViC2ttpENzuRJyvPbvXYzEqHIZLiWekRUk,2575
 panther/db/utils.py,sha256=Uxh7UebkBv4thMCfooYW1pkuorFgocsbnBZJi-hHtdY,1582
 panther/db/queries/__init__.py,sha256=uF4gvBjLBJ-Yl3WLqoZEVNtHCVhFRKW3_Vi44pJxDNI,45
 panther/db/queries/base_queries.py,sha256=8HhdlsSW-lgz3-IrZYfOtHNC3TBWbCNErDR4XE718AY,3764
@@ -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.1.0.dist-info/LICENSE,sha256=2aF1hL2aC0zRPjzUkSxJUzZbn2_uLoOkn7DHjzZni-I,1524
-panther-4.1.0.dist-info/METADATA,sha256=oxZtMCsV7y5Hdhejw9V3NTrXaOof5nz0jLlvHDeE2pA,6376
-panther-4.1.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-panther-4.1.0.dist-info/entry_points.txt,sha256=6GPxYFGuzVfNB4YpHFJvYex6iWah5_tLnirAHwj2Qsg,51
-panther-4.1.0.dist-info/top_level.txt,sha256=VbBs02JGXTIoHMzsX-eLOk2MCbBZzQbLhWiYpI7xI2g,8
-panther-4.1.0.dist-info/RECORD,,
+panther-4.1.2.dist-info/LICENSE,sha256=2aF1hL2aC0zRPjzUkSxJUzZbn2_uLoOkn7DHjzZni-I,1524
+panther-4.1.2.dist-info/METADATA,sha256=c0gW17fnBtGxqL-u4mM6gVckd4r3nrZRsbEKeh7MAOY,6376
+panther-4.1.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+panther-4.1.2.dist-info/entry_points.txt,sha256=6GPxYFGuzVfNB4YpHFJvYex6iWah5_tLnirAHwj2Qsg,51
+panther-4.1.2.dist-info/top_level.txt,sha256=VbBs02JGXTIoHMzsX-eLOk2MCbBZzQbLhWiYpI7xI2g,8
+panther-4.1.2.dist-info/RECORD,,