panther 3.8.2__py3-none-any.whl → 3.9.0__py3-none-any.whl

panther/__init__.py

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

panther/cli/template.py

@@ -99,6 +99,7 @@ requirements = """panther==%s
 
 TEMPLATE = {
     'app': {
+        '__init__.py': '',
         'apis.py': apis_py,
         'models.py': models_py,
         'serializers.py': serializers_py,
@@ -106,6 +107,7 @@ TEMPLATE = {
         'urls.py': app_urls_py,
     },
     'core': {
+        '__init__.py': '',
         'configs.py': configs_py,
         'urls.py': urls_py,
     },

panther/serializer.py

@@ -1,47 +1,122 @@
-from pydantic import create_model
+import typing
+
+from pydantic import create_model, BaseModel
+from pydantic.fields import FieldInfo
 from pydantic_core._pydantic_core import PydanticUndefined
 
+from panther.db import Model
+
+
+class MetaModelSerializer:
+    KNOWN_CONFIGS = ['model', 'fields', 'required_fields']
+
+    def __new__(
+            cls,
+            cls_name: str,
+            bases: tuple[type[typing.Any], ...],
+            namespace: dict[str, typing.Any],
+            **kwargs
+    ):
+        if cls_name == 'ModelSerializer':
+            cls.model_serializer = type(cls_name, (), namespace)
+            return super().__new__(cls)
+
+        # 1. Initial Check
+        cls.check_config(cls_name=cls_name, namespace=namespace)
+        config = namespace.pop('Config')
+
+        # 2. Collect `Fields`
+        field_definitions = cls.collect_fields(config=config, namespace=namespace)
+
+        # 3. Collect `pydantic.model_config`
+        model_config = cls.collect_model_config(config=config, namespace=namespace)
+        namespace |= {'model_config': model_config}
+
+        # 4. Create a serializer
+        return create_model(
+            __model_name=cls_name,
+            __module__=namespace['__module__'],
+            __validators__=namespace,
+            __base__=(cls.model_serializer, BaseModel),
+            __doc__=namespace.get('__doc__'),
+            model=(typing.ClassVar, config.model),
+            **field_definitions
+        )
 
-class ModelSerializer:
-    def __new__(cls, *args, model=None, **kwargs):
-        # Check `metaclass`
-        if len(args) == 0:
-            address = f'{cls.__module__}.{cls.__name__}'
-            msg = f"you should not inherit the 'ModelSerializer', you should use it as 'metaclass' -> {address}"
-            raise TypeError(msg)
+    @classmethod
+    def check_config(cls, cls_name: str, namespace: dict) -> None:
+        module = namespace['__module__']
+        address = f'{module}.{cls_name}'
 
-        model_name = args[0]
-        data = args[2]
-        address = f'{data["__module__"]}.{model_name}'
+        # Check `Config`
+        if (config := namespace.get('Config')) is None:
+            msg = f'`class Config` is required in {address}.'
+            raise AttributeError(msg) from None
 
         # Check `model`
-        if model is None:
-            msg = f"'model' required while using 'ModelSerializer' metaclass -> {address}"
-            raise AttributeError(msg)
-        # Check `fields`
-        if 'fields' not in data:
-            msg = f"'fields' required while using 'ModelSerializer' metaclass. -> {address}"
+        if (model := getattr(config, 'model', None)) is None:
+            msg = f'`{cls_name}.Config.model` is required.'
             raise AttributeError(msg) from None
 
-        model_fields = model.model_fields
-        field_definitions = {}
+        # Check `model` type
+        try:
+            if not issubclass(model, Model):
+                msg = f'`{cls_name}.Config.model` is not subclass of `panther.db.Model`.'
+                raise AttributeError(msg) from None
+        except TypeError:
+            msg = f'`{cls_name}.Config.model` is not subclass of `panther.db.Model`.'
+            raise AttributeError(msg) from None
 
-        # Collect `fields`
-        for field_name in data['fields']:
-            if field_name not in model_fields:
-                msg = f"'{field_name}' is not in '{model.__name__}' -> {address}"
+        # Check `fields`
+        if (fields := getattr(config, 'fields', None)) is None:
+            msg = f'`{cls_name}.Config.fields` is required.'
+            raise AttributeError(msg) from None
+
+        for field_name in fields:
+            if field_name not in model.model_fields:
+                msg = f'`{cls_name}.Config.fields.{field_name}` is not valid.'
                 raise AttributeError(msg) from None
-            field_definitions[field_name] = (model_fields[field_name].annotation, model_fields[field_name])
 
-        # Change `required_fields
-        for required in data.get('required_fields', []):
-            if required not in field_definitions:
-                msg = f"'{required}' is in 'required_fields' but not in 'fields' -> {address}"
+        # Check `required_fields`
+        if not hasattr(config, 'required_fields'):
+            config.required_fields = []
+
+        for required in config.required_fields:
+            if required not in config.fields:
+                msg = f'`{cls_name}.Config.required_fields.{required}` should be in `Config.fields` too.'
                 raise AttributeError(msg) from None
+
+    @classmethod
+    def collect_fields(cls, config: typing.Callable, namespace: dict) -> dict:
+        field_definitions = {}
+
+        # Define `fields`
+        for field_name in config.fields:
+            field_definitions[field_name] = (
+                config.model.model_fields[field_name].annotation,
+                config.model.model_fields[field_name]
+            )
+
+        # Apply `required_fields`
+        for required in config.required_fields:
             field_definitions[required][1].default = PydanticUndefined
 
-        # Create Model
-        return create_model(
-            __model_name=model_name,
-            **field_definitions
-        )
+        # Collect and Override `Class Fields`
+        for key, value in namespace.pop('__annotations__', {}).items():
+            field_info = namespace.pop(key, FieldInfo(required=True))
+            field_info.annotation = value
+            field_definitions[key] = (value, field_info)
+
+        return field_definitions
+
+    @classmethod
+    def collect_model_config(cls, config: typing.Callable, namespace: dict) -> dict:
+        return {
+            attr: getattr(config, attr) for attr in dir(config)
+            if not attr.startswith('__') and attr not in cls.KNOWN_CONFIGS
+        } | namespace.pop('model_config', {})
+
+
+class ModelSerializer(metaclass=MetaModelSerializer):
+    def create(self) -> type[Model]:
+        return self.model.insert_one(self.model_dump())

{panther-3.8.2.dist-info → panther-3.9.0.dist-info}/METADATA

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

{panther-3.8.2.dist-info → panther-3.9.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-panther/__init__.py,sha256=BxHPfeiPa9IiyVmruTkfZevBJk7kM_UBuyJDO4YE6J4,110
+panther/__init__.py,sha256=BAEuHfAfaSKM6MIIjkjOTg21nA8Wm0UEidxR02NxD-8,110
 panther/_load_configs.py,sha256=jlDO5rK040z3LLmMFMJ6jUL9oTKaDKCWebwmdYJPDjw,9567
 panther/_utils.py,sha256=BHAOdpESn3dt90FtpPKxEZdnkXnDC7MFcncJYburEaQ,4846
 panther/app.py,sha256=3Qf0b-OtczqU5xs7AT7_hFr3t1eFMqzaThQOFu-RoqE,8060
@@ -17,7 +17,7 @@ panther/permissions.py,sha256=Q-l25369yQaP-tY11tFQm-v9PPh8iVImbfUpY3pnQUk,355
 panther/request.py,sha256=u_-pyttspRimlSwpSwyVIV0U87hHDIthsFU9Qr8LDvI,1762
 panther/response.py,sha256=5t9-HwgwRo3egqzs1uFNhIq5i5wZW-TRrVX8YEdFrgA,3724
 panther/routings.py,sha256=GfwBZL7bt3yVOnpdjOZ-49kiGVrRoF0i8VwS1qkF_oI,5273
-panther/serializer.py,sha256=ZvLWwHV2KQdl49ZFRshz4HWXVmFNQtUClggSWkH9pa8,1839
+panther/serializer.py,sha256=yyWLNJRXiAKXHb9QXMYPH__159O7jUPfivOnOJZ-G4s,4463
 panther/status.py,sha256=Gc_PnYrHfInTsZpGbqiCfDB-py1C7Rh8KMdb6Lq9Exs,3346
 panther/test.py,sha256=Se0cF51JRAmABpB_QTIJeTDRKDcyOMlibEN6rrr4Sd8,6152
 panther/throttling.py,sha256=mVa_mGv6w_Ad7LLtV4eG5QpDwwNsk4QjFFi0mIHQBnE,231
@@ -28,7 +28,7 @@ panther/cli/create_command.py,sha256=AshVxzhSpX-L_63OLP7ZgQ5a45NINGomTbvJkCaadks
 panther/cli/main.py,sha256=pCqnOTazgMhTvFHTugutIsiFXueU5kx2VmGngwAl54Q,1679
 panther/cli/monitor_command.py,sha256=cZ7wOxeQ8jKXgRLP28SgFI9pbIEp4RK6VmVf74WKT6c,2447
 panther/cli/run_command.py,sha256=X_T9jP_Z8X_fm9S4LSoR6ARsPp4rCTMi1E5c7QWREjM,2120
-panther/cli/template.py,sha256=i4YUgsdVjYhWGoCpoCNQOBo2rKSVk0yx-o_GBmG4yx8,4941
+panther/cli/template.py,sha256=pyAA0nTBbcwcg91DRyFdH8X3PmlxQsH33gZ_CcX8E2c,4995
 panther/cli/utils.py,sha256=nhtdr9nhYAbCm2S-17vTc3_unjQJ450uxT0ZVyZueIw,4838
 panther/db/__init__.py,sha256=w9lEL0vRqb18Qx_iUJipUR_fi5GQ5uVX0DWycx14x08,50
 panther/db/connection.py,sha256=9lXzMinGNgQraeu4Sjy92AueR7_AGRsDb0EE0_K4VP4,3039
@@ -46,9 +46,9 @@ panther/panel/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 panther/panel/apis.py,sha256=HUf9Km81wWtO3pbgW0Oi5MDbLvX5LIWdiFRy05UsitE,1773
 panther/panel/urls.py,sha256=BQkWqSJBPP3VEQYeorKSHIRx-PUl21Y7Z6NFylmhs1I,192
 panther/panel/utils.py,sha256=0Rv79oR5IEqalqwpRKQHMn1p5duVY5mxMqDKiA5mWx4,437
-panther-3.8.2.dist-info/LICENSE,sha256=2aF1hL2aC0zRPjzUkSxJUzZbn2_uLoOkn7DHjzZni-I,1524
-panther-3.8.2.dist-info/METADATA,sha256=1bNtyftxbZetjdusrShmCiWOxAAJFkZZJBrQzt-86ww,6023
-panther-3.8.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-panther-3.8.2.dist-info/entry_points.txt,sha256=6GPxYFGuzVfNB4YpHFJvYex6iWah5_tLnirAHwj2Qsg,51
-panther-3.8.2.dist-info/top_level.txt,sha256=VbBs02JGXTIoHMzsX-eLOk2MCbBZzQbLhWiYpI7xI2g,8
-panther-3.8.2.dist-info/RECORD,,
+panther-3.9.0.dist-info/LICENSE,sha256=2aF1hL2aC0zRPjzUkSxJUzZbn2_uLoOkn7DHjzZni-I,1524
+panther-3.9.0.dist-info/METADATA,sha256=HRcpMdvX_ZowvddAhQjCyTElTU1O7I9BpvcypW67UJo,6023
+panther-3.9.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+panther-3.9.0.dist-info/entry_points.txt,sha256=6GPxYFGuzVfNB4YpHFJvYex6iWah5_tLnirAHwj2Qsg,51
+panther-3.9.0.dist-info/top_level.txt,sha256=VbBs02JGXTIoHMzsX-eLOk2MCbBZzQbLhWiYpI7xI2g,8
+panther-3.9.0.dist-info/RECORD,,