diff --git a/ormar/models/model.py b/ormar/models/model.py index f215ffc..5141604 100644 --- a/ormar/models/model.py +++ b/ormar/models/model.py @@ -42,13 +42,13 @@ class Model(NewBaseModel): @classmethod def from_row( # noqa CCR001 - cls: Type[T], - row: sqlalchemy.engine.ResultProxy, - select_related: List = None, - related_models: Any = None, - previous_table: str = None, - fields: Optional[Union[Dict, Set]] = None, - exclude_fields: Optional[Union[Dict, Set]] = None, + cls: Type[T], + row: sqlalchemy.engine.ResultProxy, + select_related: List = None, + related_models: Any = None, + previous_table: str = None, + fields: Optional[Union[Dict, Set]] = None, + exclude_fields: Optional[Union[Dict, Set]] = None, ) -> Optional[T]: item: Dict[str, Any] = {} @@ -58,9 +58,9 @@ class Model(NewBaseModel): related_models = group_related_list(select_related) if ( - previous_table - and previous_table in cls.Meta.model_fields - and issubclass(cls.Meta.model_fields[previous_table], ManyToManyField) + previous_table + and previous_table in cls.Meta.model_fields + and issubclass(cls.Meta.model_fields[previous_table], ManyToManyField) ): previous_table = cls.Meta.model_fields[ previous_table @@ -90,8 +90,9 @@ class Model(NewBaseModel): exclude_fields=exclude_fields, ) + instance: Optional[T] = None if item.get(cls.Meta.pkname, None) is not None: - instance: Optional[T] = cls(**item) + instance = cls(**item) instance.set_save_status(True) else: instance = None @@ -100,13 +101,13 @@ class Model(NewBaseModel): @classmethod def populate_nested_models_from_row( # noqa: CFQ002 - cls, - item: dict, - row: sqlalchemy.engine.ResultProxy, - related_models: Any, - previous_table: sqlalchemy.Table, - fields: Optional[Union[Dict, Set]] = None, - exclude_fields: Optional[Union[Dict, Set]] = None, + cls, + item: dict, + row: sqlalchemy.engine.ResultProxy, + related_models: Any, + previous_table: sqlalchemy.Table, + fields: Optional[Union[Dict, Set]] = None, + exclude_fields: Optional[Union[Dict, Set]] = None, ) -> dict: for related in related_models: if isinstance(related_models, dict) and related_models[related]: @@ -140,12 +141,12 @@ class Model(NewBaseModel): @classmethod def extract_prefixed_table_columns( # noqa CCR001 - cls, - item: dict, - row: sqlalchemy.engine.result.ResultProxy, - table_prefix: str, - fields: Optional[Union[Dict, Set]] = None, - exclude_fields: Optional[Union[Dict, Set]] = None, + cls, + item: dict, + row: sqlalchemy.engine.result.ResultProxy, + table_prefix: str, + fields: Optional[Union[Dict, Set]] = None, + exclude_fields: Optional[Union[Dict, Set]] = None, ) -> dict: # databases does not keep aliases in Record for postgres, change to raw row diff --git a/ormar/models/newbasemodel.py b/ormar/models/newbasemodel.py index 7e3daa7..971bba4 100644 --- a/ormar/models/newbasemodel.py +++ b/ormar/models/newbasemodel.py @@ -144,12 +144,12 @@ class NewBaseModel( def __getattribute__(self, item: str) -> Any: if item in ( - "_orm_id", - "_orm_saved", - "_orm", - "__fields__", - "_related_names", - "_props", + "_orm_id", + "_orm_saved", + "_orm", + "__fields__", + "_related_names", + "_props", ): return object.__getattribute__(self, item) if item == "pk": @@ -163,7 +163,7 @@ class NewBaseModel( return super().__getattribute__(item) def _extract_related_model_instead_of_field( - self, item: str + self, item: str ) -> Optional[Union["T", Sequence["T"]]]: # alias = self.get_column_alias(item) if item in self._orm: @@ -177,9 +177,9 @@ class NewBaseModel( def __same__(self, other: "NewBaseModel") -> bool: return ( - self._orm_id == other._orm_id - or self.dict() == other.dict() - or (self.pk == other.pk and self.pk is not None) + self._orm_id == other._orm_id + or self.dict() == other.dict() + or (self.pk == other.pk and self.pk is not None) ) @classmethod @@ -209,9 +209,9 @@ class NewBaseModel( @classmethod def get_properties( - cls, - include: Union["AbstractSetIntStr", "MappingIntStrAny"] = None, - exclude: Union["AbstractSetIntStr", "MappingIntStrAny"] = None, + cls, + include: Union["AbstractSetIntStr", "MappingIntStrAny"] = None, + exclude: Union["AbstractSetIntStr", "MappingIntStrAny"] = None, ) -> List[str]: if isinstance(cls._props, list): props = cls._props @@ -220,7 +220,7 @@ class NewBaseModel( prop for prop in dir(cls) if isinstance(getattr(cls, prop), property) - and prop not in ("__values__", "__fields__", "fields", "pk_column") + and prop not in ("__values__", "__fields__", "fields", "pk_column") ] cls._props = props if include: @@ -230,16 +230,16 @@ class NewBaseModel( return props def dict( # noqa A003 - self, - *, - include: Union["AbstractSetIntStr", "MappingIntStrAny"] = None, - exclude: Union["AbstractSetIntStr", "MappingIntStrAny"] = None, - by_alias: bool = False, - skip_defaults: bool = None, - exclude_unset: bool = False, - exclude_defaults: bool = False, - exclude_none: bool = False, - nested: bool = False + self, + *, + include: Union["AbstractSetIntStr", "MappingIntStrAny"] = None, + exclude: Union["AbstractSetIntStr", "MappingIntStrAny"] = None, + by_alias: bool = False, + skip_defaults: bool = None, + exclude_unset: bool = False, + exclude_defaults: bool = False, + exclude_none: bool = False, + nested: bool = False ) -> "DictStrAny": # noqa: A003' dict_instance = super().dict( include=include, diff --git a/ormar/queryset/queryset.py b/ormar/queryset/queryset.py index a77a9a8..b8b4aa3 100644 --- a/ormar/queryset/queryset.py +++ b/ormar/queryset/queryset.py @@ -358,8 +358,11 @@ class QuerySet: instance.pk = pk # refresh server side defaults - if any(field.server_default is not None - for name, field in self.model.Meta.model_fields.items() if name not in kwargs): + if any( + field.server_default is not None + for name, field in self.model.Meta.model_fields.items() + if name not in kwargs + ): instance = await instance.load() instance.set_save_status(True) return instance @@ -377,7 +380,7 @@ class QuerySet: for objt in objects: objt.set_save_status(True) - async def bulk_update( + async def bulk_update( # noqa: CCR001 self, objects: List["Model"], columns: List[str] = None ) -> None: ready_objects = []