Some updates and improvements

mahenzon · mahenzon · commit 6ad258944518 · 2022-07-25T23:47:40.000+03:00
diff --git a/README.md b/README.md
@@ -11,4 +11,4 @@
 export PYTHOPATH="${PYTHONPATH}:./" 
 python examples/api_for_tortoise_orm/main.py
 ```
-http://0.0.0.0:8080/docs
+http://0.0.0.0:8080/docs
diff --git a/examples/api_for_tortoise_orm/models/pydantic/user.py b/examples/api_for_tortoise_orm/models/pydantic/user.py
@@ -14,36 +14,33 @@
 class UserBaseSchema(BaseModel):
     """User base schema."""
 
-    class Config(object):
+    class Config:
         """Pydantic schema config."""
 
         orm_mode = True
 
-    class Enum(object):
+    class Enum:
         """Device enums."""
 
         status = UserStatusEnum
 
-
-class UserPatchSchema(UserBaseSchema):
-    """User PATCH schema."""
     first_name: Optional[str] = None
     last_name: Optional[str] = None
     status: UserStatusEnum = Field(default=UserStatusEnum.active)
 
 
+class UserPatchSchema(UserBaseSchema):
+    """User PATCH schema."""
+
+
 class UserInSchema(UserBaseSchema):
     """User input schema."""
 
-    first_name: Optional[str] = None
-    last_name: Optional[str] = None
-    status: UserStatusEnum = Field(default=UserStatusEnum.active)
-
 
 class UserSchema(UserInSchema):
     """User item schema."""
 
-    class Config(object):
+    class Config:
         """Pydantic model config."""
 
         orm_mode = True
@@ -52,6 +49,3 @@ class Config(object):
     id: int
     created_at: datetime = Field(description="Время создания данных")
     modified_at: datetime = Field(description="Время изменения данных")
-    first_name: Optional[str] = None
-    last_name: Optional[str] = None
-    status: UserStatusEnum = Field(default=UserStatusEnum.active)
diff --git a/examples/api_for_tortoise_orm/models/tortoise/user.py b/examples/api_for_tortoise_orm/models/tortoise/user.py
@@ -1,4 +1,4 @@
-"""Device model."""
+"""User model."""
 
 
 from tortoise import (
@@ -15,7 +15,7 @@
 class User(models.Model):
     """The device model."""
 
-    class Enum(object):
+    class Enum:
         status = UserStatusEnum
 
     id: int = fields.IntField(pk=True)
@@ -25,5 +25,5 @@ class Enum(object):
     created_at = fields.DatetimeField(null=True, auto_now_add=True)
     modified_at = fields.DatetimeField(null=True, auto_now=True)
 
-    class Meta(object):
+    class Meta:
         table = "users"
diff --git a/fastapi_rest_jsonapi/data_layers/filter/filters_cacher.py b/fastapi_rest_jsonapi/data_layers/filter/filters_cacher.py
@@ -11,7 +11,7 @@
 )
 
 
-class FiltersCacher(object):
+class FiltersCacher:
     """Filter cacher."""
 
     def __init__(
diff --git a/fastapi_rest_jsonapi/data_layers/filter/preparing.py b/fastapi_rest_jsonapi/data_layers/filter/preparing.py
@@ -37,7 +37,8 @@ def prepare_filter_event(field: Type[ModelField], field_name: str, type_op: str,
     """
     if field.type_ == int and type_op not in set(IntSchema.__fields__["operation"].default):
         raise InvalidFilters(
-            'Operation "{type_op}" is not permitted for type "INT"'.format(type_op=type_op), parameter=field_name
+            'Operation "{type_op}" is not permitted for type "INT"'.format(type_op=type_op),
+            parameter=field_name,
         )
     if field.type_ == float and type_op not in set(FloatSchema.__fields__["operation"].default):
         raise InvalidFilters(
diff --git a/fastapi_rest_jsonapi/openapi.py b/fastapi_rest_jsonapi/openapi.py
@@ -23,9 +23,10 @@ def openapi() -> Dict[Any, Any]:
             description="",
             routes=app.routes,
         )
-        openapi_schema["info"]["x-logo"] = {
-            "url": "https://static.ssl.mts.ru/mts_rf/static/20201102.1/Styles/Promo/i/header/logo.svg"
-        }
+        # картинка по адресу недоступна
+        # openapi_schema["info"]["x-logo"] = {
+        #     "url": "https://static.ssl.mts.ru/mts_rf/static/20201102.1/Styles/Promo/i/header/logo.svg",
+        # }
         app.openapi_schema = openapi_schema
         return app.openapi_schema
 
diff --git a/fastapi_rest_jsonapi/querystring.py b/fastapi_rest_jsonapi/querystring.py
@@ -266,6 +266,7 @@ def include(self) -> List[str]:
         include_param: str = self.qs.get("include", "")
 
         if self.MAX_INCLUDE_DEPTH is not None:
+            # TODO: does this really work? needs tests!
             for include_path in include_param:
                 if len(include_path.split(SPLIT_REL)) > self.MAX_INCLUDE_DEPTH:
                     raise InvalidInclude(
diff --git a/fastapi_rest_jsonapi/splitter.py b/fastapi_rest_jsonapi/splitter.py

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`)`
`12`	`12`
`13`	`13`
`14`		`-class FiltersCacher(object):`
	`14`	`+class FiltersCacher:`
`15`	`15`	`"""Filter cacher."""`
`16`	`16`
`17`	`17`	`def __init__(`