panther 3.1.4__py3-none-any.whl → 3.1.5__py3-none-any.whl

panther/__init__.py

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

panther/_load_configs.py

@@ -1,5 +1,4 @@
 import ast
-import os
 import platform
 import sys
 from datetime import timedelta
@@ -11,7 +10,6 @@ from pydantic._internal._model_construction import ModelMetaclass
 from panther._utils import import_class
 from panther.configs import JWTConfig, config
 from panther.exceptions import PantherException
-from panther.middlewares import BaseMiddleware
 from panther.routings import finalize_urls, flatten_urls
 from panther.throttling import Throttling
 
@@ -73,6 +71,8 @@ def load_default_cache_exp(configs: dict, /) -> timedelta | None:
 
 def load_middlewares(configs: dict, /) -> list:
     """Collect The Middlewares & Set db_engine If One Of Middlewares Was For DB"""
+    from panther.middlewares import BaseMiddleware
+
     middlewares = []
 
     for path, data in configs.get('MIDDLEWARES', []):
@@ -113,46 +113,64 @@ def collect_all_models() -> list[dict]:
     """Collecting all models for panel APIs"""
     from panther.db.models import Model
 
-    collected_models = []
-
-    for root, _, files in os.walk(config['base_dir']):
-        # Traverse through each directory
-        for f in files:
-            # Traverse through each file of directory
-            if f == 'models.py':
-                slash = '\\' if platform.system() == 'Windows' else '/'
-
-                # If the file was "models.py" read it
-                file_path = f'{root}{slash}models.py'
-                with Path(file_path).open() as file:
-                    # Parse the file with ast
-                    node = ast.parse(file.read())
-                    for n in node.body:
-                        # Find classes in each element of files' body
-                        if type(n) is ast.ClassDef and n.bases:
-                            class_path = (
-                                file_path.removesuffix(f'{slash}models.py')
-                                .removeprefix(f'{config["base_dir"]}{slash}')
-                                .replace(slash, '.')
-                            )
-                            # We don't need to import the package classes
-                            if class_path.find('site-packages') == -1:
-                                # Import the class to check his parents and siblings
-                                klass = import_class(f'{class_path}.models.{n.name}')
-
-                                collected_models.extend(
-                                    [
-                                        {
-                                            'name': n.name,
-                                            'path': file_path,
-                                            'class': klass,
-                                            'app': class_path.split('.'),
-                                        }
-                                        for parent in klass.__mro__
-                                        if parent is Model
-                                    ]
-                                )
-    return collected_models
+    # Just load all the python files from 'base_dir',
+    #   so Model.__subclasses__ can find all the subclasses
+    slash = '\\' if platform.system() == 'Windows' else '/'
+    python_files = [
+        f for f in config['base_dir'].rglob('*.py')
+        if not f.name.startswith('_') and 'site-packages' not in f.parents._parts
+    ]
+    for file in python_files:
+        # Analyse the file
+        with Path(file).open() as f:
+            node = ast.parse(f.read())
+
+        model_imported = False
+        panther_imported = False
+        panther_called = False
+        for n in node.body:
+            match n:
+
+                # from panther.db import Model
+                case ast.ImportFrom(module='panther.db', names=[ast.alias(name='Model')]):
+                    model_imported = True
+
+                # from panther.db.models import ..., Model, ...
+                case ast.ImportFrom(module='panther.db.models', names=[*names]):
+                    try:
+                        next(v for v in names if v.name == 'Model')
+                        model_imported = True
+                    except StopIteration:
+                        pass
+
+                # from panther import Panther, ...
+                case ast.ImportFrom(module='panther', names=[ast.alias(name='Panther'), *_]):
+                    panther_imported = True
+
+                # from panther import ..., Panther
+                case ast.ImportFrom(module='panther', names=[*_, ast.alias(name='Panther')]):
+                    panther_imported = True
+
+                # ... = Panther(...)
+                case ast.Assign(value=ast.Call(func=ast.Name(id='Panther'))):
+                    panther_called = True
+
+        # Panther() should not be called in the file and Model() should be imported,
+        #   We check the import of the Panther to make sure he is calling the panther.Panther and not any Panther
+        if panther_imported and panther_called or not model_imported:
+            continue
+
+        # Load the module
+        dotted_f = str(file).removeprefix(f'{config["base_dir"]}{slash}').removesuffix('.py').replace(slash, '.')
+        import_module(dotted_f)
+
+    return [
+        {
+            'name': m.__name__,
+            'module': m.__module__,
+            'class': m
+        } for m in Model.__subclasses__() if m.__module__ != 'panther.db.models'
+    ]
 
 
 def load_urls(configs: dict, /, urls: dict | None) -> tuple[dict, dict]:

panther/_utils.py

@@ -45,7 +45,7 @@ async def http_response(
     elif status_code == status.HTTP_204_NO_CONTENT or body == b'null':
         body = None
 
-    await monitoring.after(status_code=status_code)
+    await monitoring.after(status_code)
 
     await _http_response_start(send, headers=headers, status_code=status_code)
     await _http_response_body(send, body=body)

panther/main.py

@@ -127,16 +127,20 @@ class Panther:
 
     async def handle_ws(self, scope: dict, receive: Callable, send: Callable) -> None:
         from panther.websocket import GenericWebsocket, Websocket
+        monitoring = Monitoring(is_active=config['monitoring'], is_ws=True)
 
         temp_connection = Websocket(scope=scope, receive=receive, send=send)
+        await monitoring.before(request=temp_connection)
 
         endpoint, found_path = find_endpoint(path=temp_connection.path)
         if endpoint is None:
+            await monitoring.after('Rejected')
             return await temp_connection.close(status.WS_1000_NORMAL_CLOSURE)
         path_variables: dict = collect_path_variables(request_path=temp_connection.path, found_path=found_path)
 
         if not issubclass(endpoint, GenericWebsocket):
             logger.critical(f'You may have forgotten to inherit from GenericWebsocket on the {endpoint.__name__}()')
+            await monitoring.after('Rejected')
             return await temp_connection.close(status.WS_1014_BAD_GATEWAY)
 
         del temp_connection
@@ -152,12 +156,15 @@ class Panther:
                 break
         else:
             await self.websocket_connections.new_connection(connection=connection)
+            await monitoring.after('Accepted')
             await connection.listen()
 
         # Call 'After' Middleware
         for middleware in config['reversed_middlewares']:
             with contextlib.suppress(APIException):
                 await middleware.after(response=connection)
+
+        await monitoring.after('Closed')
         return None
 
     async def handle_http(self, scope: dict, receive: Callable, send: Callable) -> None:

panther/monitoring.py

@@ -1,7 +1,8 @@
 import logging
 from time import perf_counter
+from typing import Literal
 
-from panther.request import Request
+from panther.base_request import BaseRequest
 
 
 logger = logging.getLogger('monitoring')
@@ -10,18 +11,31 @@ logger = logging.getLogger('monitoring')
 class Monitoring:
     """
     Create Log Message Like Below:
-    [method] path | ip:port | response_time ms | status_code
+    date time | method | path | ip:port | response_time [ms, s] | status
     """
-    def __init__(self, is_active: bool):
+    def __init__(self, is_active: bool, is_ws: bool = False):
         self.is_active = is_active
+        self.is_ws = is_ws
 
-    async def before(self, request: Request):
+    async def before(self, request: BaseRequest):
         if self.is_active:
             ip, port = request.client
-            self.log = f'{request.method} | {request.path} | {ip}:{port}'
+
+            if self.is_ws:
+                method = 'WS'
+            else:
+                method = request.scope['method']
+
+            self.log = f'{method} | {request.path} | {ip}:{port}'
             self.start_time = perf_counter()
 
-    async def after(self, status_code: int):
+    async def after(self, status: int | Literal['Accepted', 'Rejected', 'Closed'], /):
         if self.is_active:
-            response_time = (perf_counter() - self.start_time) * 1_000
-            logger.info(f'{self.log} | {response_time: .3} ms | {status_code}')
+            response_time = perf_counter() - self.start_time
+            time_unit = ' s'
+
+            if response_time < 0.01:
+                response_time = response_time * 1_000
+                time_unit = 'ms'
+
+            logger.info(f'{self.log} | {round(response_time, 4)} {time_unit} | {status}')

panther/panel/apis.py

@@ -8,16 +8,11 @@ from panther.response import Response
 
 @API()
 async def models_api():
-    result = []
-    for i, m in enumerate(config['models']):
-        data = {
-            'name': m['name'],
-            'app': '.'.join(a for a in m['app']),
-            'path': m['path'],
-            'index': i
-        }
-        result.append(data)
-    return result
+    return [{
+        'name': m['name'],
+        'module': m['module'],
+        'index': i
+    } for i, m in enumerate(config['models'])]
 
 
 @API()

{panther-3.1.4.dist-info → panther-3.1.5.dist-info}/METADATA

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

{panther-3.1.4.dist-info → panther-3.1.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
-panther/__init__.py,sha256=LFvWeZTInMxk2FOKc0DiIGiqvu2sPsp7wQRb00FAvho,110
-panther/_load_configs.py,sha256=ZkeKEIDzdGN7zDK4mklpkC1uK9w_fyVVmscvKILEc9E,7126
-panther/_utils.py,sha256=72VdkiAjFJt0zz-c7eb8cWvhCoz3Hswov4nuTrLgi80,4358
+panther/__init__.py,sha256=6LwXZVmGyh5YmGDfYREWyRqoMsv9NiCxNibakKFUzJo,110
+panther/_load_configs.py,sha256=S5zN5ErktjXCIi7cgg8HZwRCez51qiYxa1Ppu2No9Xw,7476
+panther/_utils.py,sha256=H0VIv9VPt7mIDZo-N7x5ZaMMes1jo60wp1TtxkNvFnQ,4346
 panther/app.py,sha256=8-W1XsOfVjNcP1RxV8X9TgQzshP9Qk9E0LBcXBf25aM,7961
 panther/authentications.py,sha256=Fh7Z7rpysSJXN9xEKJqH94oYf2L3jJQxr6fPhRz3UFg,4149
 panther/background_tasks.py,sha256=J6JrjiEzyGohYsaFZHnZtXeP52piP84RlGFLsKOFa-Y,7225
@@ -11,8 +11,8 @@ panther/configs.py,sha256=lvmPDT_W8gnXNv214zLQedYFZhM78E-3XGa7KyWQbo4,1920
 panther/exceptions.py,sha256=DB6nGfU5LxrglEN_I-HInMqdIA3ZmN8rRv0ynEuQyGA,1332
 panther/file_handler.py,sha256=b-paQykGfjlvslfEkM23V50v8bosjRLq1S1HmsmlXEc,855
 panther/logging.py,sha256=DZVf3nxzLodT-hD4820J1jEAffU8zIxXRPKs2lbP8ho,2074
-panther/main.py,sha256=VoNVXEO1usr08EfZ6fdISS-DL8j5J1IF8j9DKt5hS1c,9985
-panther/monitoring.py,sha256=FlrgkapOs5_iDMPcM32L_SH7U68WOOnyYeeLa1oi6Zg,788
+panther/main.py,sha256=F8yGaVN97JMD0FKWvTPuGZ43g1BGdEEtDzjWSelG4mg,10301
+panther/monitoring.py,sha256=krmcoTUcV12pHwCFVAHywgsp1-US9cyiMlgsrMJdUQ0,1203
 panther/permissions.py,sha256=Q-l25369yQaP-tY11tFQm-v9PPh8iVImbfUpY3pnQUk,355
 panther/request.py,sha256=W3L_udvIxgjqVxxc8aaKDIQBVjdc7TTrFyoOJQ8M8FA,1773
 panther/response.py,sha256=HcL8nuXpZX_vhT9QUw0dnbtP75T_LbvKAWGT48_LPuU,3382
@@ -42,12 +42,12 @@ panther/middlewares/base.py,sha256=kBJp0U6982pfwDRSzDfMRfdUra9oVoL9Ms52EavW0r4,2
 panther/middlewares/db.py,sha256=Dotc7LPKEZ26w3yK0SY_PhO47JEKJtYpVZPO9SLA2Lg,638
 panther/middlewares/redis.py,sha256=Wa_uvTe2yGw9LYO1CehrUYYXc6hdyNMOJc7X5lDJ5LU,1374
 panther/panel/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-panther/panel/apis.py,sha256=9sKeAbVeRJV-FSTgz88waeLcTFWzcP4iYm5tmBgPrJk,1834
+panther/panel/apis.py,sha256=f4eWTi212ZnnPYcxuU4SdJ-7yYQxZFImaXgTTnXw_fc,1703
 panther/panel/urls.py,sha256=BQkWqSJBPP3VEQYeorKSHIRx-PUl21Y7Z6NFylmhs1I,192
 panther/panel/utils.py,sha256=0Rv79oR5IEqalqwpRKQHMn1p5duVY5mxMqDKiA5mWx4,437
-panther-3.1.4.dist-info/LICENSE,sha256=2aF1hL2aC0zRPjzUkSxJUzZbn2_uLoOkn7DHjzZni-I,1524
-panther-3.1.4.dist-info/METADATA,sha256=-ZvktMPOa3he8rECzC_N5-kTkjjkOZGqAnoIq27iyfc,6076
-panther-3.1.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-panther-3.1.4.dist-info/entry_points.txt,sha256=6GPxYFGuzVfNB4YpHFJvYex6iWah5_tLnirAHwj2Qsg,51
-panther-3.1.4.dist-info/top_level.txt,sha256=VbBs02JGXTIoHMzsX-eLOk2MCbBZzQbLhWiYpI7xI2g,8
-panther-3.1.4.dist-info/RECORD,,
+panther-3.1.5.dist-info/LICENSE,sha256=2aF1hL2aC0zRPjzUkSxJUzZbn2_uLoOkn7DHjzZni-I,1524
+panther-3.1.5.dist-info/METADATA,sha256=YmW-daTXDu085RPgfX1YbQYKkq6SewmDkw4QR50E-eY,6076
+panther-3.1.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+panther-3.1.5.dist-info/entry_points.txt,sha256=6GPxYFGuzVfNB4YpHFJvYex6iWah5_tLnirAHwj2Qsg,51
+panther-3.1.5.dist-info/top_level.txt,sha256=VbBs02JGXTIoHMzsX-eLOk2MCbBZzQbLhWiYpI7xI2g,8
+panther-3.1.5.dist-info/RECORD,,