panther 4.3.5__tar.gz → 4.3.7__tar.gz

{panther-4.3.5 → panther-4.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: panther
-Version: 4.3.5
+Version: 4.3.7
 Summary: Fast & Friendly, Web Framework For Building Async APIs
 Home-page: https://github.com/alirn76/panther
 Author: Ali RajabNezhad
@@ -14,7 +14,7 @@ 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
@@ -33,6 +33,18 @@ 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"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 
 [![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.5 → panther-4.3.7}/panther/__init__.py

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

{panther-4.3.5 → panther-4.3.7}/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-4.3.5 → panther-4.3.7}/panther/_utils.py

@@ -49,7 +49,7 @@ def read_multipart_form_data(boundary: str, body: bytes) -> dict:
         if row in (b'', b'--'):
             continue
 
-        if match := re.match(pattern=field_pattern, string=row):
+        if match := re.match(pattern=field_pattern, string=row, flags=re.DOTALL):
             _, field_name, _, value = match.groups()
             data[field_name.decode('utf-8')] = value.decode('utf-8')
 

{panther-4.3.5 → panther-4.3.7}/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-4.3.5 → panther-4.3.7}/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-4.3.5 → panther-4.3.7}/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

{panther-4.3.5 → panther-4.3.7}/panther.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: panther
-Version: 4.3.5
+Version: 4.3.7
 Summary: Fast & Friendly, Web Framework For Building Async APIs
 Home-page: https://github.com/alirn76/panther
 Author: Ali RajabNezhad
@@ -14,7 +14,7 @@ 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
@@ -33,6 +33,18 @@ 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"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 
 [![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.5 → panther-4.3.7}/panther.egg-info/requires.txt

@@ -1,4 +1,4 @@
-pantherdb~=2.1.0
+pantherdb~=2.1.1
 pydantic~=2.8.2
 rich~=13.7.1
 uvicorn~=0.27.1

{panther-4.3.5 → panther-4.3.7}/setup.py

@@ -14,7 +14,7 @@ with open('README.md', encoding='utf-8') as file:
     DESCRIPTION = file.read()
 
 INSTALL_REQUIRES = [
-    'pantherdb~=2.1.0',
+    'pantherdb~=2.1.1',
     'pydantic~=2.8.2',
     'rich~=13.7.1',
     'uvicorn~=0.27.1',

{panther-4.3.5 → panther-4.3.7}/tests/test_multipart.py

@@ -53,17 +53,23 @@ async def complex_multipart_api(request: Request):
         }
     }
 
+@API()
+async def multipart_api(request: Request):
+    return request.data
+
 
 urls = {
     'flat_multipart': flat_multipart_api,
     'single_file_multipart': single_file_multipart_api,
     'several_file_multipart': several_file_multipart_api,
     'complex_multipart': complex_multipart_api,
+    'multiline_multipart': multipart_api,
 }
 
 
 class TestMultipart(IsolatedAsyncioTestCase):
-    CONTENT_TYPE = 'multipart/form-data; boundary=--------------------------201301649688174364392792'
+    CONTENT_TYPE_1 = 'multipart/form-data; boundary=--------------------------201301649688174364392792'
+    CONTENT_TYPE_2 = 'multipart/form-data; boundary=----geckoformboundaryc30219e1237602175b34337f41ace019'
     FLAT_PAYLOAD = (
             b'----------------------------201301649688174364392792\r\n'
             b'Content-Disposition: form-data; name="name"\r\n\r\n'
@@ -108,6 +114,18 @@ class TestMultipart(IsolatedAsyncioTestCase):
             b'25\r\n'
             b'----------------------------201301649688174364392792--\r\n'
         )
+    MULTI_LINE_PAYLOAD = (
+            b'------geckoformboundaryc30219e1237602175b34337f41ace019\r\n'
+            b'Content-Disposition: form-data; name="team"\r\n\r\n'
+            b'SRE\r\n'
+            b'------geckoformboundaryc30219e1237602175b34337f41ace019\r\n'
+            b'Content-Disposition: form-data; name="phone"\r\n\r\n'
+            b'09033333333\r\n'
+            b'------geckoformboundaryc30219e1237602175b34337f41ace019\r\n'
+            b'Content-Disposition: form-data; name="message"\r\n\r\n'
+            b'My\r\nName\r\nIs\r\nAli\r\n\r\n'
+            b'------geckoformboundaryc30219e1237602175b34337f41ace019--\r\n'
+        )
 
     @classmethod
     def setUpClass(cls) -> None:
@@ -117,7 +135,7 @@ class TestMultipart(IsolatedAsyncioTestCase):
     async def test_flat_multipart(self):
         res = await self.client.post(
             'flat_multipart',
-            content_type=self.CONTENT_TYPE,
+            content_type=self.CONTENT_TYPE_1,
             payload=self.FLAT_PAYLOAD,
         )
         assert res.status_code == 200
@@ -126,7 +144,7 @@ class TestMultipart(IsolatedAsyncioTestCase):
     async def test_single_file_multipart(self):
         res = await self.client.post(
             'single_file_multipart',
-            content_type=self.CONTENT_TYPE,
+            content_type=self.CONTENT_TYPE_1,
             payload=self.SINGLE_FILE_PAYLOAD,
         )
 
@@ -140,7 +158,7 @@ class TestMultipart(IsolatedAsyncioTestCase):
     async def test_several_file_multipart(self):
         res = await self.client.post(
             'several_file_multipart',
-            content_type=self.CONTENT_TYPE,
+            content_type=self.CONTENT_TYPE_1,
             payload=self.SEVERAL_FILE_PAYLOAD,
         )
 
@@ -161,7 +179,7 @@ class TestMultipart(IsolatedAsyncioTestCase):
     async def test_complex_multipart(self):
         res = await self.client.post(
             'complex_multipart',
-            content_type=self.CONTENT_TYPE,
+            content_type=self.CONTENT_TYPE_1,
             payload=self.COMPLEX_PAYLOAD,
         )
 
@@ -180,3 +198,11 @@ class TestMultipart(IsolatedAsyncioTestCase):
                 'file': 'Hello World2\n',
             }
         }
+
+    async def test_multiline_multipart(self):
+        res = await self.client.post(
+            'multiline_multipart',
+            content_type=self.CONTENT_TYPE_2,
+            payload=self.MULTI_LINE_PAYLOAD,
+        )
+        assert res.data == {'team': 'SRE', 'phone': '09033333333', 'message': 'My\r\nName\r\nIs\r\nAli\r\n'}

{panther-4.3.5 → panther-4.3.7}/tests/test_utils.py

@@ -295,7 +295,7 @@ class TestLoadConfigs(TestCase):
                 MIDDLEWARES = []
 
         assert len(captured.records) == 1
-        assert captured.records[0].getMessage() == "Invalid 'MIDDLEWARES': fake.module should have 2 part: (path, kwargs)"
+        assert captured.records[0].getMessage() == "Invalid 'MIDDLEWARES': fake.module is not a valid middleware path"
 
     def test_middlewares_too_many_args(self):
         global MIDDLEWARES