panther 1.3.1__tar.gz → 1.4.0__tar.gz

{panther-1.3.1 → panther-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: panther
-Version: 1.3.1
+Version: 1.4.0
 Summary: Fast &  Friendly, Web Framework For Building Async APIs
 Home-page: https://github.com/alirn76/panther
 Author: Ali RajabNezhad
@@ -93,14 +93,10 @@ with [https://github.com/nakabonne/ali](https://github.com/nakabonne/ali) and he
     ```
 
 - #### Run Project
-  Panther needs Uvicorn as ASGI (Asynchronous Server Gateway Interface)
-  ```console
-  $ pip install uvicorn[standard]
-  ```
-  Then
-  ```console
-  $ panther run 
-  ```
+    Panther Uses [Uvicorn](https://github.com/encode/uvicorn) as ASGI (Asynchronous Server Gateway Interface)
+    ```console
+    $ panther run 
+    ```
 
 - #### Monitoring Requests
 
@@ -109,7 +105,7 @@ with [https://github.com/nakabonne/ali](https://github.com/nakabonne/ali) and he
     ```
 
 - #### Python Shell
- 
+    Panther Uses [bpython](https://bpython-interpreter.org) for shell
     ```console
     $ panther shell 
     ```
@@ -154,7 +150,7 @@ with [https://github.com/nakabonne/ali](https://github.com/nakabonne/ali) and he
     **app/apis.py**:
     
     ```python
-    from datetime import timedelta, datetime
+    from datetime import datetime
 
     from panther.app import API
     from panther.configs import config
@@ -168,15 +164,13 @@ with [https://github.com/nakabonne/ali](https://github.com/nakabonne/ali) and he
         return {'detail': 'Hello World'}
     
     
-    @API(cache=True, cache_exp_time=timedelta(minutes=2))
+    @API(cache=True)
     async def info(request: Request):
         data = {
             'version': version(),
             'datetime_now': datetime.now().isoformat(),
             'user_agent': request.headers.user_agent,
-            'middlewares': config['middlewares'],
             'db_engine': config['db_engine'],
-            'urls': config['urls'],
         }
         return Response(data=data, status_code=status.HTTP_202_ACCEPTED)
     ```

{panther-1.3.1 → panther-1.4.0}/README.md

@@ -77,14 +77,10 @@ with [https://github.com/nakabonne/ali](https://github.com/nakabonne/ali) and he
     ```
 
 - #### Run Project
-  Panther needs Uvicorn as ASGI (Asynchronous Server Gateway Interface)
-  ```console
-  $ pip install uvicorn[standard]
-  ```
-  Then
-  ```console
-  $ panther run 
-  ```
+    Panther Uses [Uvicorn](https://github.com/encode/uvicorn) as ASGI (Asynchronous Server Gateway Interface)
+    ```console
+    $ panther run 
+    ```
 
 - #### Monitoring Requests
 
@@ -93,7 +89,7 @@ with [https://github.com/nakabonne/ali](https://github.com/nakabonne/ali) and he
     ```
 
 - #### Python Shell
- 
+    Panther Uses [bpython](https://bpython-interpreter.org) for shell
     ```console
     $ panther shell 
     ```
@@ -138,7 +134,7 @@ with [https://github.com/nakabonne/ali](https://github.com/nakabonne/ali) and he
     **app/apis.py**:
     
     ```python
-    from datetime import timedelta, datetime
+    from datetime import datetime
 
     from panther.app import API
     from panther.configs import config
@@ -152,15 +148,13 @@ with [https://github.com/nakabonne/ali](https://github.com/nakabonne/ali) and he
         return {'detail': 'Hello World'}
     
     
-    @API(cache=True, cache_exp_time=timedelta(minutes=2))
+    @API(cache=True)
     async def info(request: Request):
         data = {
             'version': version(),
             'datetime_now': datetime.now().isoformat(),
             'user_agent': request.headers.user_agent,
-            'middlewares': config['middlewares'],
             'db_engine': config['db_engine'],
-            'urls': config['urls'],
         }
         return Response(data=data, status_code=status.HTTP_202_ACCEPTED)
     ```

{panther-1.3.1 → panther-1.4.0}/panther/__init__.py

@@ -1,6 +1,6 @@
 from .main import Panther
 
-__version__ = '1.3.1'
+__version__ = '1.4.0'
 
 
 def version():

{panther-1.3.1 → panther-1.4.0}/panther/authentications.py

@@ -49,10 +49,11 @@ class JWTAuthentication:
         if user_id := payload.get('user_id') is None:
             raise AuthenticationException
         user_model = config['user_model'] or cls.model
-        user = user_model.get_one(id=user_id)
-        if user is None:
-            raise AuthenticationException
-        return user
+
+        if user := user_model.get_one(id=user_id):
+            return user
+
+        raise AuthenticationException
 
     @staticmethod
     def encode_jwt(user_id: int) -> str:

{panther-1.3.1 → panther-1.4.0}/panther/cli/template.py

@@ -65,6 +65,8 @@ USER_MODEL = 'panther.db.models.User'
 
 MONITORING = True
 
+LOG_QUERIES = True
+
 URLs = 'core/urls.py'
 """ % datetime.now().date().isoformat()
 

{panther-1.3.1 → panther-1.4.0}/panther/configs.py

@@ -15,6 +15,7 @@ class JWTConfig:
 class Config(TypedDict):
     base_dir: Path
     monitoring: bool
+    log_queries: bool
     urls: dict
     middlewares: list
     reversed_middlewares: list
@@ -28,7 +29,8 @@ class Config(TypedDict):
 
 config: Config = {
     'base_dir': Path(),
-    'monitoring': True,
+    'monitoring': False,
+    'log_queries': False,
     'secret_key': None,
     'urls': {},
     'middlewares': [],

{panther-1.3.1 → panther-1.4.0}/panther/db/queries/mongodb_queries.py

@@ -3,7 +3,7 @@ from typing import TypeVar
 import bson
 
 from panther.db.connection import db  # NOQA: F401
-from panther.db.utils import clean_object_id_in_dicts, merge_dicts, query_logger
+from panther.db.utils import clean_object_id_in_dicts, merge_dicts, log_query
 
 # TODO: Not sure about this bounding
 T = TypeVar('T', bound='BaseMongoDBQuery')
@@ -12,7 +12,6 @@ T = TypeVar('T', bound='BaseMongoDBQuery')
 class BaseMongoDBQuery:
 
     @classmethod
-    @query_logger
     def get_one(cls: type[T], _data: dict = None, /, **kwargs) -> T:
         clean_object_id_in_dicts(_data, kwargs)
         _query = merge_dicts(_data, kwargs)
@@ -20,14 +19,12 @@ class BaseMongoDBQuery:
         return cls(**obj) if obj else None
 
     @classmethod
-    @query_logger
     def count(cls, _data: dict = None, /, **kwargs) -> int:
         clean_object_id_in_dicts(_data, kwargs)
         _query = merge_dicts(_data, kwargs)
         return eval(f'db.session.{cls.__name__}.count_documents(_query)')
 
     @classmethod
-    @query_logger
     def list(cls, _data: dict = None, /, **kwargs):
         clean_object_id_in_dicts(_data, kwargs)
         _query = merge_dicts(_data, kwargs)
@@ -35,32 +32,27 @@ class BaseMongoDBQuery:
         return [cls(**obj) for obj in result]
 
     @classmethod
-    @query_logger
     def create(cls, _data: dict = None, **kwargs) -> bson.objectid.ObjectId:
         _query = merge_dicts(_data, kwargs)
         return eval(f'db.session.{cls.__name__}.insert_one(_query)').inserted_id
 
-    @query_logger
     def delete(self) -> bool:
         _filter = {'_id': self._id}
         result = eval(f'db.session.{self.__class__.__name__}.delete_one(_filter)')
         return bool(result.deleted_count)
 
     @classmethod
-    @query_logger
     def delete_one(cls, **kwargs) -> bool:
         clean_object_id_in_dicts(kwargs)
         result = eval(f'db.session.{cls.__name__}.delete_one(kwargs)')
         return bool(result.deleted_count)
 
     @classmethod
-    @query_logger
     def delete_many(cls, **kwargs) -> int:
         clean_object_id_in_dicts(kwargs)
         result = eval(f'db.session.{cls.__name__}.delete_many(kwargs)')
         return result.deleted_count
 
-    @query_logger
     def update(self, _data: dict = None, **kwargs) -> dict:
         for field, value in (_data or kwargs).items():
             if hasattr(self, field):
@@ -70,7 +62,6 @@ class BaseMongoDBQuery:
         return eval(f'db.session.{self.__class__.__name__}.update_one(_filter, _update)')
 
     @classmethod
-    @query_logger
     def update_one(cls, _filter, _data: dict = None, /, **kwargs) -> dict:
         clean_object_id_in_dicts(_filter)
 
@@ -81,19 +72,16 @@ class BaseMongoDBQuery:
         return eval(f'db.session.{cls.__name__}.update_one(_filter, _data | _update)')
 
     @classmethod
-    @query_logger
     def update_many(cls, _filter, **kwargs) -> dict:
         _update = {'$set': kwargs}
         return eval(f'db.session.{cls.__name__}.update_many(_filter, _update)')
 
     @classmethod
-    @query_logger
     def increment(cls, _filter, **kwargs):
         _update = {'$inc': kwargs}
         return eval(f'db.session.{cls.__name__}.update_many({_filter}, {_update})')
 
     @classmethod
-    @query_logger
     def get_or_create(cls, **kwargs) -> tuple[bool, any]:
         obj = cls.get_one(**kwargs)
         if obj:

{panther-1.3.1 → panther-1.4.0}/panther/db/queries/pantherdb_queries.py

@@ -1,9 +1,8 @@
-import operator
-from functools import reduce
 from typing import Self
 from pydantic import ValidationError
 
 from panther.db.connection import db
+from panther.db.utils import merge_dicts
 from panther.exceptions import DBException
 
 
@@ -32,7 +31,7 @@ class BasePantherDBQuery:
     @classmethod
     def _merge(cls, *args) -> dict:
         # TODO: Convert "id" to "_id"
-        return reduce(operator.ior, filter(None, args), {})
+        return merge_dicts(*args)
 
     # # # # # Find # # # # #
     @classmethod

{panther-1.3.1 → panther-1.4.0}/panther/db/queries/queries.py

@@ -1,8 +1,9 @@
 from typing import Self
 
+from panther.configs import config
+from panther.db.utils import log_query
 from panther.db.queries.mongodb_queries import BaseMongoDBQuery
 from panther.db.queries.pantherdb_queries import BasePantherDBQuery
-from panther.configs import config
 
 if config['db_engine'] == 'pantherdb':
     BaseQuery = BasePantherDBQuery
@@ -18,6 +19,7 @@ class Query(BaseQuery):
 
     # # # # # Find # # # # #
     @classmethod
+    @log_query
     def find_one(cls, _data: dict = None, /, **kwargs) -> Self | None:
         """
         example:
@@ -27,6 +29,7 @@ class Query(BaseQuery):
         return super().find_one(_data, **kwargs)
 
     @classmethod
+    @log_query
     def find(cls, _data: dict = None, /, **kwargs) -> list[Self]:
         """
         example:
@@ -37,6 +40,7 @@ class Query(BaseQuery):
 
     # # # # # Insert # # # # #
     @classmethod
+    @log_query
     def insert_one(cls, _data: dict = None, /, **kwargs) -> Self:
         """
         example:
@@ -46,10 +50,12 @@ class Query(BaseQuery):
         return super().insert_one(_data, **kwargs)
 
     @classmethod
+    @log_query
     def insert_many(cls, _data: dict = None, **kwargs):
         return super().insert_many(_data, **kwargs)
 
     # # # # # Delete # # # # #
+    @log_query
     def delete(self) -> None:
         """
         example:
@@ -60,6 +66,7 @@ class Query(BaseQuery):
         return super().delete()
 
     @classmethod
+    @log_query
     def delete_one(cls, **kwargs) -> bool:
         """
         example:
@@ -69,6 +76,7 @@ class Query(BaseQuery):
         return super().delete_one(**kwargs)
 
     @classmethod
+    @log_query
     def delete_many(cls, **kwargs) -> int:
         """
         example:
@@ -78,6 +86,7 @@ class Query(BaseQuery):
         return super().delete_many(**kwargs)
 
     # # # # # Update # # # # #
+    @log_query
     def update(self, **kwargs) -> None:
         """
         example:
@@ -88,6 +97,7 @@ class Query(BaseQuery):
         return super().update(**kwargs)
 
     @classmethod
+    @log_query
     def update_one(cls, _filter, _data: dict = None, /, **kwargs) -> bool:
         """
         example:
@@ -98,6 +108,7 @@ class Query(BaseQuery):
         return super().update_one(_filter, _data, **kwargs)
 
     @classmethod
+    @log_query
     def update_many(cls, _filter, **kwargs) -> int:
         """
         example:
@@ -108,6 +119,7 @@ class Query(BaseQuery):
 
     # # # # # Other # # # # #
     @classmethod
+    @log_query
     def first(cls, _data: dict = None, /, **kwargs) -> Self | None:
         """
         It works same as find_one()
@@ -118,6 +130,7 @@ class Query(BaseQuery):
         return super().first(_data, **kwargs)
 
     @classmethod
+    @log_query
     def last(cls, _data: dict = None, /, **kwargs) -> Self | None:
         """
         example:
@@ -127,6 +140,7 @@ class Query(BaseQuery):
         return super().last(_data, **kwargs)
 
     @classmethod
+    @log_query
     def count(cls, _data: dict = None, /, **kwargs) -> int:
         """
         example:

{panther-1.3.1 → panther-1.4.0}/panther/db/utils.py

@@ -4,18 +4,18 @@ from functools import reduce
 from time import perf_counter
 
 from panther.configs import config
-from panther.logger import logger
+from panther.logger import query_logger
 
 
-def query_logger(func):
+def log_query(func):
     def log(*args, **kwargs):
-        if config['monitoring'] is False:
+        if config['log_queries'] is False:
             return func(*args, **kwargs)
         start = perf_counter()
         response = func(*args, **kwargs)
         end = perf_counter()
         class_name = args[0].__name__ if hasattr(args[0], '__name__') else args[0].__class__.__name__
-        logger.info(f'\033[1mQuery -->\033[0m  {class_name}.{func.__name__}() --> {(end - start) * 1_000:.2} ms')
+        query_logger.info(f'\033[1mQuery -->\033[0m  {class_name}.{func.__name__}() --> {(end - start) * 1_000:.2} ms')
         return response
     return log
 

{panther-1.3.1 → panther-1.4.0}/panther/logger.py

@@ -1,14 +1,6 @@
 import os
 import logging
 from pydantic import BaseModel
-from panther.cli.utils import error
-
-try:
-    import uvicorn
-    del uvicorn
-except ImportError:
-    error('No module named "uvicorn"\n\nHint: Try to install with "pip install uvicorn[standard]"')
-    exit()
 
 from logging.config import dictConfig
 from panther.configs import config
@@ -26,6 +18,7 @@ class LogConfig(BaseModel):
     DEFAULT_LOG_FORMAT: str = '%(levelprefix)s | %(asctime)s | %(message)s'
     FILE_LOG_FORMAT: str = '%(asctime)s | %(message)s'
     LOG_LEVEL: str = 'DEBUG'
+    MAX_FILE_SIZE: int = 1024 * 1024 * 100  # 100 MB
 
     version = 1
     disable_existing_loggers = False
@@ -47,15 +40,21 @@ class LogConfig(BaseModel):
             'formatter': 'file_formatter',
             'filename': LOGS_DIR / 'monitoring.log',
             'class': 'logging.handlers.RotatingFileHandler',
-            'maxBytes': 1024 * 1024 * 100,  # 100 MB,
+            'maxBytes': MAX_FILE_SIZE,  # 100 MB,
+            'backupCount': 3,
+        },
+        'query_file': {
+            'formatter': 'file_formatter',
+            'filename': LOGS_DIR / 'query.log',
+            'class': 'logging.handlers.RotatingFileHandler',
+            'maxBytes': MAX_FILE_SIZE,  # 100 MB,
             'backupCount': 3,
         },
         'file': {
             'formatter': 'file_formatter',
-            # TODO: Don't know but base_dir.name will return '.' here :\
-            'filename': LOGS_DIR / f'{config["base_dir"].name}.log',
+            'filename': LOGS_DIR / f'main.log',
             'class': 'logging.handlers.RotatingFileHandler',
-            'maxBytes': 1024 * 1024 * 100,  # 100 MB,
+            'maxBytes': MAX_FILE_SIZE,  # 100 MB,
             'backupCount': 3,
         },
         'default': {
@@ -73,13 +72,14 @@ class LogConfig(BaseModel):
             'handlers': ['monitoring_file'],
             'level': LOG_LEVEL,
         },
+        'query': {
+            'handlers': ['default', 'query_file'],
+            'level': LOG_LEVEL,
+        },
     }
 
 
 dictConfig(LogConfig().dict())
 logger = logging.getLogger('panther')
-monitoring = logging.getLogger('monitoring')
-
-"""
-[debug, info, warning, error, critical]
-"""
+query_logger = logging.getLogger('query')
+monitoring_logger = logging.getLogger('monitoring')

{panther-1.3.1 → panther-1.4.0}/panther/main.py

@@ -117,6 +117,7 @@ class Panther:
 
         # Put Variables In "config"
         config['monitoring'] = self.settings.get('MONITORING', config['monitoring'])
+        config['log_queries'] = self.settings.get('LOG_QUERIES', config['log_queries'])
         config['default_cache_exp'] = self.settings.get('DEFAULT_CACHE_EXP', config['default_cache_exp'])
         config['secret_key'] = self._get_secret_key()
 

{panther-1.3.1 → panther-1.4.0}/panther/middlewares/monitoring.py

@@ -1,8 +1,8 @@
 from time import perf_counter
 
-from panther.logger import monitoring
-from panther.middlewares.base import BaseMiddleware
 from panther.request import Request
+from panther.logger import monitoring_logger
+from panther.middlewares.base import BaseMiddleware
 
 
 class Middleware(BaseMiddleware):
@@ -21,4 +21,4 @@ class Middleware(BaseMiddleware):
         but we should put in middlewares chain later ...
         """
         response_time = (perf_counter() - self.start_time) * 1_000
-        monitoring.info(f'{self.log} | {response_time: .3} ms | {status_code}')
+        monitoring_logger.info(f'{self.log} | {response_time: .3} ms | {status_code}')

{panther-1.3.1 → panther-1.4.0}/panther.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: panther
-Version: 1.3.1
+Version: 1.4.0
 Summary: Fast &  Friendly, Web Framework For Building Async APIs
 Home-page: https://github.com/alirn76/panther
 Author: Ali RajabNezhad
@@ -93,14 +93,10 @@ with [https://github.com/nakabonne/ali](https://github.com/nakabonne/ali) and he
     ```
 
 - #### Run Project
-  Panther needs Uvicorn as ASGI (Asynchronous Server Gateway Interface)
-  ```console
-  $ pip install uvicorn[standard]
-  ```
-  Then
-  ```console
-  $ panther run 
-  ```
+    Panther Uses [Uvicorn](https://github.com/encode/uvicorn) as ASGI (Asynchronous Server Gateway Interface)
+    ```console
+    $ panther run 
+    ```
 
 - #### Monitoring Requests
 
@@ -109,7 +105,7 @@ with [https://github.com/nakabonne/ali](https://github.com/nakabonne/ali) and he
     ```
 
 - #### Python Shell
- 
+    Panther Uses [bpython](https://bpython-interpreter.org) for shell
     ```console
     $ panther shell 
     ```
@@ -154,7 +150,7 @@ with [https://github.com/nakabonne/ali](https://github.com/nakabonne/ali) and he
     **app/apis.py**:
     
     ```python
-    from datetime import timedelta, datetime
+    from datetime import datetime
 
     from panther.app import API
     from panther.configs import config
@@ -168,15 +164,13 @@ with [https://github.com/nakabonne/ali](https://github.com/nakabonne/ali) and he
         return {'detail': 'Hello World'}
     
     
-    @API(cache=True, cache_exp_time=timedelta(minutes=2))
+    @API(cache=True)
     async def info(request: Request):
         data = {
             'version': version(),
             'datetime_now': datetime.now().isoformat(),
             'user_agent': request.headers.user_agent,
-            'middlewares': config['middlewares'],
             'db_engine': config['db_engine'],
-            'urls': config['urls'],
         }
         return Response(data=data, status_code=status.HTTP_202_ACCEPTED)
     ```

{panther-1.3.1 → panther-1.4.0}/panther.egg-info/requires.txt

@@ -1,6 +1,6 @@
 pantherdb>=1.2.0
 pydantic>=1.10.5
-watchfiles>=0.18.1
+uvicorn==0.20.0
 bpython>=0.24
 bson>=0.5.10
 redis>=4.0.2

{panther-1.3.1 → panther-1.4.0}/setup.py

@@ -45,7 +45,7 @@ setup(
     install_requires=[
         'pantherdb>=1.2.0',
         'pydantic>=1.10.5',
-        'watchfiles>=0.18.1',
+        'uvicorn==0.20.0',
         'bpython>=0.24',
         'bson>=0.5.10',
         'redis>=4.0.2',