Skip to content

Commit

Permalink
Sort imports via ruff
Browse files Browse the repository at this point in the history
  • Loading branch information
gsakkis committed Aug 23, 2023
1 parent eb51b70 commit aa2b14d
Show file tree
Hide file tree
Showing 70 changed files with 270 additions and 271 deletions.
24 changes: 12 additions & 12 deletions beanie/__init__.py
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
from beanie.migrations.controllers.free_fall import free_fall_migration
from beanie.migrations.controllers.iterative import iterative_migration
from beanie.odm.actions import (
before_event,
after_event,
After,
Before,
Delete,
Insert,
Replace,
Save,
SaveChanges,
ValidateOnSave,
Before,
After,
Delete,
Update,
ValidateOnSave,
after_event,
before_event,
)
from beanie.odm.bulk import BulkWriter
from beanie.odm.custom_types import DecimalAnnotation
from beanie.odm.documents import Document
from beanie.odm.fields import (
PydanticObjectId,
BackLink,
DeleteRules,
Indexed,
Link,
BackLink,
PydanticObjectId,
WriteRules,
DeleteRules,
)
from beanie.odm.settings.timeseries import TimeSeriesConfig, Granularity
from beanie.odm.settings.timeseries import Granularity, TimeSeriesConfig
from beanie.odm.union_doc import UnionDoc
from beanie.odm.utils.init import init_beanie
from beanie.odm.documents import Document
from beanie.odm.views import View
from beanie.odm.union_doc import UnionDoc

__version__ = "1.21.0"
__all__ = [
Expand Down
2 changes: 1 addition & 1 deletion beanie/executors/migrate.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

from beanie.migrations import template
from beanie.migrations.database import DBHandler
from beanie.migrations.models import RunningMode, RunningDirections
from beanie.migrations.models import RunningDirections, RunningMode
from beanie.migrations.runner import MigrationNode

logging.basicConfig(format="%(message)s", level=logging.INFO)
Expand Down
4 changes: 2 additions & 2 deletions beanie/migrations/controllers/free_fall.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from inspect import signature
from typing import Type, List
from typing import List, Type

from beanie.odm.documents import Document
from beanie.migrations.controllers.base import BaseMigrationController
from beanie.odm.documents import Document


def free_fall_migration(document_models: List[Type[Document]]):
Expand Down
9 changes: 4 additions & 5 deletions beanie/migrations/controllers/iterative.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
from inspect import signature, isclass
from typing import Type, Optional, Union, List
import asyncio
from inspect import isclass, signature
from typing import List, Optional, Type, Union

from beanie.migrations.utils import update_dict
from beanie.migrations.controllers.base import BaseMigrationController
from beanie.migrations.utils import update_dict
from beanie.odm.documents import Document
import asyncio

from beanie.odm.utils.pydantic import parse_model


Expand Down
8 changes: 4 additions & 4 deletions beanie/migrations/runner.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import logging
from importlib.machinery import SourceFileLoader
from pathlib import Path
from typing import Type, Optional
from typing import Optional, Type

from beanie.odm.documents import Document
from beanie.odm.utils.init import init_beanie
from beanie.migrations.controllers.iterative import BaseMigrationController
from beanie.migrations.database import DBHandler
from beanie.migrations.models import (
MigrationLog,
RunningMode,
RunningDirections,
RunningMode,
)
from beanie.odm.documents import Document
from beanie.odm.utils.init import init_beanie

logger = logging.getLogger(__name__)

Expand Down
10 changes: 5 additions & 5 deletions beanie/odm/actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
from enum import Enum
from functools import wraps
from typing import (
TYPE_CHECKING,
Any,
Callable,
List,
Union,
Dict,
TYPE_CHECKING,
Type,
List,
Optional,
Tuple,
Any,
Type,
Union,
)

if TYPE_CHECKING:
Expand Down
10 changes: 5 additions & 5 deletions beanie/odm/bulk.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
from typing import Dict, Any, List, Optional, Union, Type, Mapping
from typing import Any, Dict, List, Mapping, Optional, Type, Union

from pydantic import BaseModel, Field
from pymongo import (
InsertOne,
DeleteOne,
DeleteMany,
DeleteOne,
InsertOne,
ReplaceOne,
UpdateOne,
UpdateMany,
UpdateOne,
)
from pymongo.results import BulkWriteResult
from pymongo.client_session import ClientSession
from pymongo.results import BulkWriteResult


class Operation(BaseModel):
Expand Down
51 changes: 27 additions & 24 deletions beanie/odm/documents.py
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
import asyncio
from typing import ClassVar, AbstractSet
from typing import (
TYPE_CHECKING,
AbstractSet,
Any,
ClassVar,
Dict,
Optional,
List,
Type,
Union,
Mapping,
TypeVar,
Any,
Optional,
Set,
Type,
TypeVar,
Union,
)
from typing import TYPE_CHECKING
from uuid import UUID, uuid4

from bson import DBRef, ObjectId
from lazy_model import LazyModel
from pydantic import (
ValidationError,
PrivateAttr,
Field,
ConfigDict,
Field,
PrivateAttr,
ValidationError,
)
from pydantic.class_validators import root_validator
from pydantic.main import BaseModel
Expand All @@ -35,27 +36,27 @@
from beanie.exceptions import (
CollectionWasNotInitialized,
DocumentNotFound,
RevisionIdWasChanged,
DocumentWasNotSaved,
NotSupported,
ReplaceError,
RevisionIdWasChanged,
)
from beanie.odm.actions import (
ActionDirections,
EventTypes,
wrap_with_actions,
ActionDirections,
)
from beanie.odm.bulk import BulkWriter, Operation
from beanie.odm.cache import LRUCache
from beanie.odm.fields import (
PydanticObjectId,
BackLink,
DeleteRules,
ExpressionField,
Link,
LinkInfo,
LinkTypes,
PydanticObjectId,
WriteRules,
DeleteRules,
BackLink,
)
from beanie.odm.interfaces.aggregate import AggregateInterface
from beanie.odm.interfaces.detector import ModelType
Expand All @@ -64,42 +65,44 @@
from beanie.odm.interfaces.inheritance import InheritanceInterface
from beanie.odm.interfaces.setters import SettersInterface
from beanie.odm.models import (
InspectionError,
InspectionResult,
InspectionStatuses,
InspectionError,
)
from beanie.odm.operators.find.comparison import In
from beanie.odm.operators.update.general import (
CurrentDate,
Inc,
Set as SetOperator,
Unset,
SetRevisionId,
Unset,
)
from beanie.odm.operators.update.general import (
Set as SetOperator,
)
from beanie.odm.queries.update import UpdateMany, UpdateResponse
from beanie.odm.settings.document import DocumentSettings
from beanie.odm.utils.dump import get_dict, get_top_level_nones
from beanie.odm.utils.parsing import merge_models
from beanie.odm.utils.pydantic import (
parse_object_as,
IS_PYDANTIC_V2,
get_extra_field_info,
get_field_type,
get_model_dump,
get_model_fields,
get_extra_field_info,
IS_PYDANTIC_V2,
parse_model,
get_model_dump,
parse_object_as,
)
from beanie.odm.utils.self_validation import validate_self_before
from beanie.odm.utils.state import (
saved_state_needed,
previous_saved_state_needed,
save_state_after,
saved_state_needed,
swap_revision_after,
)
from beanie.odm.utils.typing import extract_id_class

if TYPE_CHECKING:
from pydantic.typing import AbstractSetIntStr, MappingIntStrAny, DictStrAny
from pydantic.typing import AbstractSetIntStr, DictStrAny, MappingIntStrAny

DocType = TypeVar("DocType", bound="Document")
DocumentProjectionType = TypeVar("DocumentProjectionType", bound=BaseModel)
Expand Down
28 changes: 12 additions & 16 deletions beanie/odm/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
from collections import OrderedDict
from enum import Enum
from typing import (
TYPE_CHECKING,
Any,
Dict,
Generic,
TypeVar,
Union,
Type,
List,
Optional,
Any,
TYPE_CHECKING,
Type,
TypeVar,
Union,
)

if sys.version_info >= (3, 8):
Expand All @@ -21,31 +21,27 @@

from typing import OrderedDict as OrderedDictType

from bson import ObjectId, DBRef
from bson import DBRef, ObjectId
from bson.errors import InvalidId
from pydantic import BaseModel

from pymongo import ASCENDING
from pymongo import ASCENDING, IndexModel

from beanie.odm.enums import SortDirection
from beanie.odm.operators.find.comparison import (
Eq,
GT,
GTE,
LT,
LTE,
NE,
Eq,
In,
)
from beanie.odm.utils.parsing import parse_obj
from pymongo import IndexModel

from beanie.odm.registry import DocsRegistry

from beanie.odm.utils.parsing import parse_obj
from beanie.odm.utils.pydantic import (
IS_PYDANTIC_V2,
get_model_fields,
get_field_type,
get_model_fields,
parse_object_as,
)

Expand All @@ -56,10 +52,10 @@
TypeAdapter,
)
from pydantic.json_schema import JsonSchemaValue
from pydantic_core import core_schema, CoreSchema
from pydantic_core import CoreSchema, core_schema
from pydantic_core.core_schema import (
simple_ser_schema,
ValidationInfo,
simple_ser_schema,
str_schema,
)
else:
Expand Down
2 changes: 1 addition & 1 deletion beanie/odm/interfaces/aggregate.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from abc import abstractmethod
from typing import TypeVar, Type, Optional, Union, Dict, Any, overload
from typing import Any, Dict, Optional, Type, TypeVar, Union, overload

from pydantic import BaseModel
from pymongo.client_session import ClientSession
Expand Down
2 changes: 1 addition & 1 deletion beanie/odm/interfaces/aggregation_methods.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from abc import abstractmethod
from typing import Any, Optional, Union, List, Dict, cast
from typing import Any, Dict, List, Optional, Union, cast

from pymongo.client_session import ClientSession

Expand Down
21 changes: 11 additions & 10 deletions beanie/odm/interfaces/find.py
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
from abc import abstractmethod
from collections.abc import Iterable
from typing import (
Optional,
TYPE_CHECKING,
Any,
ClassVar,
Dict,
List,
Mapping,
Optional,
Tuple,
Type,
TypeVar,
Union,
Tuple,
Mapping,
Any,
overload,
ClassVar,
TypeVar,
Dict,
TYPE_CHECKING,
)
from collections.abc import Iterable

from pydantic import (
BaseModel,
)
from pymongo.client_session import ClientSession

from beanie.odm.enums import SortDirection
from beanie.odm.interfaces.detector import ModelType
from beanie.odm.queries.find import FindOne, FindMany
from beanie.odm.queries.find import FindMany, FindOne
from beanie.odm.settings.base import ItemSettings

if TYPE_CHECKING:
Expand Down

0 comments on commit aa2b14d

Please sign in to comment.