panther 4.3.0__tar.gz → 4.3.2__tar.gz

{panther-4.3.0 → panther-4.3.2}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: panther
-Version: 4.3.0
-Summary: Fast &  Friendly, Web Framework For Building Async APIs
+Version: 4.3.2
+Summary: Fast & Friendly, Web Framework For Building Async APIs
 Home-page: https://github.com/alirn76/panther
 Author: Ali RajabNezhad
 Author-email: alirn76@yahoo.com
@@ -10,16 +10,17 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: httptools~=0.6.1
 Requires-Dist: pantherdb~=2.1.0
-Requires-Dist: pydantic~=2.7.4
+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: full
 Requires-Dist: redis==5.0.1; extra == "full"
 Requires-Dist: motor~=3.5.0; extra == "full"

{panther-4.3.0 → panther-4.3.2}/panther/__init__.py

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

{panther-4.3.0 → panther-4.3.2}/panther/_load_configs.py

@@ -1,9 +1,10 @@
 import logging
 import sys
+import types
 from importlib import import_module
 from multiprocessing import Manager
 
-from panther._utils import import_class
+from panther._utils import import_class, check_function_type_endpoint, check_class_type_endpoint
 from panther.background_tasks import background_tasks
 from panther.base_websocket import WebsocketConnections
 from panther.cli.utils import import_error
@@ -36,6 +37,7 @@ __all__ = (
     'load_authentication_class',
     'load_urls',
     'load_websocket_connections',
+    'check_endpoints_inheritance',
 )
 
 logger = logging.getLogger('panther')
@@ -265,5 +267,14 @@ def load_websocket_connections():
         config.WEBSOCKET_CONNECTIONS = WebsocketConnections(pubsub_connection=pubsub_connection)
 
 
+def check_endpoints_inheritance():
+    """Should be after `load_urls()`"""
+    for _, endpoint in config.FLAT_URLS.items():
+        if isinstance(endpoint, types.FunctionType):
+            check_function_type_endpoint(endpoint=endpoint)
+        else:
+            check_class_type_endpoint(endpoint=endpoint)
+
+
 def _exception_handler(field: str, error: str | Exception) -> PantherError:
     return PantherError(f"Invalid '{field}': {error}")

{panther-4.3.0 → panther-4.3.2}/panther/_utils.py

@@ -4,12 +4,13 @@ import logging
 import re
 import subprocess
 import types
-from typing import Any, Generator, Iterator, AsyncGenerator
 from collections.abc import Callable
 from traceback import TracebackException
+from typing import Any, Generator, Iterator, AsyncGenerator
 
 from panther.exceptions import PantherError
 from panther.file_handler import File
+from panther.websocket import GenericWebsocket
 
 logger = logging.getLogger('panther')
 
@@ -99,19 +100,18 @@ def reformat_code(base_dir):
 def check_function_type_endpoint(endpoint: types.FunctionType) -> Callable:
     # Function Doesn't Have @API Decorator
     if not hasattr(endpoint, '__wrapped__'):
-        logger.critical(f'You may have forgotten to use @API() on the {endpoint.__name__}()')
-        raise TypeError
-    return endpoint
+        raise PantherError(
+            f'You may have forgotten to use `@API()` on the `{endpoint.__module__}.{endpoint.__name__}()`')
 
 
 def check_class_type_endpoint(endpoint: Callable) -> Callable:
     from panther.app import GenericAPI
 
-    if not issubclass(endpoint, GenericAPI):
-        logger.critical(f'You may have forgotten to inherit from GenericAPI on the {endpoint.__name__}()')
-        raise TypeError
-
-    return endpoint().call_method
+    if not issubclass(endpoint, (GenericAPI, GenericWebsocket)):
+        raise PantherError(
+            f'You may have forgotten to inherit from `panther.app.GenericAPI` or `panther.app.GenericWebsocket` '
+            f'on the `{endpoint.__module__}.{endpoint.__name__}()`'
+        )
 
 
 def async_next(iterator: Iterator):

{panther-4.3.0 → panther-4.3.2}/panther/db/queries/base_queries.py

@@ -28,7 +28,7 @@ class BaseQuery:
     def _clean_error_message(cls, validation_error: ValidationError, is_updating: bool = False) -> str:
         error = ', '.join(
             '{field}="{error}"'.format(
-                field='.'.join(loc for loc in e['loc']),
+                field='.'.join(str(loc) for loc in e['loc']),
                 error=e['msg']
             )
             for e in validation_error.errors()

{panther-4.3.0 → panther-4.3.2}/panther/main.py

@@ -67,6 +67,8 @@ class Panther:
         load_urls(self._configs_module, urls=self._urls)
         load_websocket_connections()
 
+        check_endpoints_inheritance()
+
     async def __call__(self, scope: dict, receive: Callable, send: Callable) -> None:
         if scope['type'] == 'lifespan':
             message = await receive()
@@ -160,19 +162,10 @@ class Panther:
         await request.read_body()
 
         # Find Endpoint
-        _endpoint, found_path = find_endpoint(path=request.path)
-        if _endpoint is None:
+        endpoint, found_path = find_endpoint(path=request.path)
+        if endpoint is None:
             return await self._raise(send, monitoring=monitoring, status_code=status.HTTP_404_NOT_FOUND)
 
-        # Check Endpoint Type
-        try:
-            if isinstance(_endpoint, types.FunctionType):
-                endpoint = check_function_type_endpoint(endpoint=_endpoint)
-            else:
-                endpoint = check_class_type_endpoint(endpoint=_endpoint)
-        except TypeError:
-            return await self._raise(send, monitoring=monitoring, status_code=status.HTTP_501_NOT_IMPLEMENTED)
-
         # Collect Path Variables
         request.collect_path_variables(found_path=found_path)
 
@@ -186,6 +179,10 @@ class Panther:
                         f'Make sure to return the `request` at the end of `{middleware.__class__.__name__}.before()`')
                     return await self._raise(send, monitoring=monitoring)
 
+            # Prepare the method
+            if not isinstance(endpoint, types.FunctionType):
+                endpoint = endpoint().call_method
+
             # Call Endpoint
             response = await endpoint(request=request)
 

{panther-4.3.0 → panther-4.3.2}/panther/serializer.py

@@ -39,7 +39,7 @@ class MetaModelSerializer:
 
         # 4. Create a serializer
         return create_model(
-            __model_name=cls_name,
+            cls_name,
             __module__=namespace['__module__'],
             __validators__=namespace,
             __base__=(cls.model_serializer, BaseModel),

{panther-4.3.0 → panther-4.3.2}/panther.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: panther
-Version: 4.3.0
-Summary: Fast &  Friendly, Web Framework For Building Async APIs
+Version: 4.3.2
+Summary: Fast & Friendly, Web Framework For Building Async APIs
 Home-page: https://github.com/alirn76/panther
 Author: Ali RajabNezhad
 Author-email: alirn76@yahoo.com
@@ -10,16 +10,17 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: httptools~=0.6.1
 Requires-Dist: pantherdb~=2.1.0
-Requires-Dist: pydantic~=2.7.4
+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: full
 Requires-Dist: redis==5.0.1; extra == "full"
 Requires-Dist: motor~=3.5.0; extra == "full"

{panther-4.3.0 → panther-4.3.2}/panther.egg-info/requires.txt

@@ -1,10 +1,10 @@
-httptools~=0.6.1
 pantherdb~=2.1.0
-pydantic~=2.7.4
+pydantic~=2.8.2
 rich~=13.7.1
 uvicorn~=0.27.1
 pytz~=2024.1
 Jinja2~=3.1
+httptools~=0.6.1
 
 [full]
 redis==5.0.1

{panther-4.3.0 → panther-4.3.2}/setup.py

@@ -1,4 +1,5 @@
 import re
+import sys
 
 from setuptools import setup
 
@@ -12,6 +13,17 @@ VERSION = panther_version()
 with open('README.md', encoding='utf-8') as file:
     DESCRIPTION = file.read()
 
+INSTALL_REQUIRES = [
+    'pantherdb~=2.1.0',
+    'pydantic~=2.8.2',
+    'rich~=13.7.1',
+    'uvicorn~=0.27.1',
+    'pytz~=2024.1',
+    'Jinja2~=3.1',
+]
+if sys.version_info <= (3, 12):
+    INSTALL_REQUIRES.append('httptools~=0.6.1')
+
 EXTRAS_REQUIRE = {
     'full': [
         'redis==5.0.1',
@@ -32,7 +44,7 @@ setup(
     author='Ali RajabNezhad',
     author_email='alirn76@yahoo.com',
     url='https://github.com/alirn76/panther',
-    description='Fast &  Friendly, Web Framework For Building Async APIs',
+    description='Fast & Friendly, Web Framework For Building Async APIs',
     long_description=DESCRIPTION,
     long_description_content_type='text/markdown',
     include_package_data=True,
@@ -42,6 +54,7 @@ setup(
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
     ],
     entry_points={
         'console_scripts': ['panther=panther.cli.main:start'],
@@ -49,14 +62,6 @@ setup(
     package_data={
         'panther': ['cli/*'],
     },
-    install_requires=[
-        'httptools~=0.6.1',
-        'pantherdb~=2.1.0',
-        'pydantic~=2.7.4',
-        'rich~=13.7.1',
-        'uvicorn~=0.27.1',
-        'pytz~=2024.1',
-        'Jinja2~=3.1',
-    ],
+    install_requires=INSTALL_REQUIRES,
     extras_require=EXTRAS_REQUIRE,
 )

{panther-4.3.0 → panther-4.3.2}/tests/test_utils.py

@@ -379,6 +379,60 @@ class TestLoadConfigs(TestCase):
                 AUTHENTICATION = None
                 SECRET_KEY = None
 
+    def test_check_function_endpoint_decorator(self):
+        with self.assertLogs(level='ERROR') as captured:
+            try:
+                Panther(name=__name__, configs=__name__, urls={'/': invalid_api})
+            except SystemExit:
+                assert True
+            else:
+                assert False
+
+        assert len(captured.records) == 1
+        assert captured.records[0].getMessage() == 'You may have forgotten to use `@API()` on the `tests.test_utils.invalid_api()`'
+
+    def test_check_class_endpoint_inheritance(self):
+        with self.assertLogs(level='ERROR') as captured:
+            try:
+                Panther(name=__name__, configs=__name__, urls={'/': InvalidAPI})
+            except SystemExit:
+                assert True
+            else:
+                assert False
+
+        assert len(captured.records) == 1
+        assert captured.records[0].getMessage() == (
+            f'You may have forgotten to inherit from `panther.app.GenericAPI` or `panther.app.GenericWebsocket` '
+            f'on the `tests.test_utils.InvalidAPI()`'
+        )
+
+    def test_check_websocket_inheritance(self):
+        with self.assertLogs(level='ERROR') as captured:
+            try:
+                Panther(name=__name__, configs=__name__, urls={'/': InvalidWebsocket})
+            except SystemExit:
+                assert True
+            else:
+                assert False
+
+        assert len(captured.records) == 1
+        assert captured.records[0].getMessage() == (
+            f'You may have forgotten to inherit from `panther.app.GenericAPI` or `panther.app.GenericWebsocket` '
+            f'on the `tests.test_utils.InvalidWebsocket()`'
+        )
+
+
+def invalid_api():
+    pass
+
+
+class InvalidAPI:
+    pass
+
+
+class InvalidWebsocket:
+    pass
+
 
 class CorrectTestMiddleware(BaseMiddleware):
     pass