Simulation (Sourcery refactored) #5

sourcery-ai · 2023-03-30T22:24:57Z

Pull Request #4 refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

NOTE: As code is pushed to the original Pull Request, Sourcery will
re-run and update (force-push) this Pull Request with new refactorings as
necessary. If Sourcery finds no refactorings at any point, this Pull Request
will be closed automatically.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the simulation branch, then run:

git fetch origin sourcery/simulation
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai · 2023-04-12T20:33:14Z

src/quart_sqlalchemy/sim/repo_adapter.py

-        results = self._adapted.select(
+        yield from self._adapted.select(
            session,
            conditions=filters,
-            options=[sa.orm.selectinload(getattr(self.model, attr)) for attr in join_list],
+            options=[
+                sa.orm.selectinload(getattr(self.model, attr))
+                for attr in join_list
+            ],
            include_inactive=allow_inactive,
            yield_by_chunk=chunk_size,
        )
-        for result in results:
-            yield result


Function RepositoryLegacyAdapter.yield_by_chunk refactored with the following changes:

Inline variable that is immediately yielded (inline-immediately-yielded-variable)

Replace yield inside for loop with yield from (yield-from)

sourcery-ai · 2023-04-12T20:33:14Z

src/quart_sqlalchemy/sim/repo_adapter.py

-        if sqla_model:
-            return result
-        return self.model_schema.from_orm(result)
+        return result if sqla_model else self.model_schema.from_orm(result)


Function insert refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-04-12T20:33:14Z

src/quart_sqlalchemy/sim/repo_adapter.py

-        if sqla_model:
-            return existing
-        return self.model_schema.from_orm(existing)
+        return existing if sqla_model else self.model_schema.from_orm(existing)


Function update refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-04-12T20:33:14Z

src/quart_sqlalchemy/sim/repo_adapter.py

-        if sqla_model:
-            return row
-        return self.model_schema.from_orm(row)
+        return row if sqla_model else self.model_schema.from_orm(row)


Function get refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-04-12T20:33:14Z

src/quart_sqlalchemy/sim/schema.py

-        if error_code:
-            return "failed"
-        return "ok"
+        return "failed" if (error_code := values.get("error_code")) else "ok"


Function ResponseWrapper.set_status_by_error_code refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-04-12T20:33:15Z

src/quart_sqlalchemy/sim/util.py


    def __hash__(self):
-        return hash(tuple([self._encoded_id, self._decoded_id]))
+        return hash((self._encoded_id, self._decoded_id))


Function ObjectID.__hash__ refactored with the following changes:

Unwrap a constant iterable constructor (unwrap-iterable-construction)

sourcery-ai · 2023-04-12T20:33:15Z

src/quart_sqlalchemy/sim/util.py

-            return value
-        else:
-            return self.hashids.decode(value)[0]
+        return value if isinstance(value, int) else self.hashids.decode(value)[0]


Function ObjectID._decode refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-04-12T20:33:15Z

tests/base.py

-        db = QuartSQLAlchemy(app=app)
-
-        yield db
+        yield QuartSQLAlchemy(app=app)


Function SimpleTestBase.db refactored with the following changes:

Inline variable that is immediately yielded (inline-immediately-yielded-variable)

sourcery-ai · 2023-04-12T20:33:15Z

tests/base.py

-        db = QuartSQLAlchemy(app=app)
-
-        yield db
+        yield QuartSQLAlchemy(app=app)


Function MixinTestBase.db refactored with the following changes:

Inline variable that is immediately yielded (inline-immediately-yielded-variable)

sourcery-ai · 2023-04-12T22:00:57Z

examples/decorators/provide_session.py

-            else:
-                bind = Bind.get_instance(bind_name)
+            bind = Bind.get_instance(bind_name)

-                with create_session(bind) as session:
-                    return func(*args, session=session, **kwargs)
+            with create_session(bind) as session:
+                return func(*args, session=session, **kwargs)


Function provide_session refactored with the following changes:

Remove unnecessary else after guard condition (remove-unnecessary-else)

sourcery-ai · 2023-04-12T22:00:57Z

examples/usrsrv/component/repository.py

-        dto = self._session.scalars(self._query.filter_by(uuid=entity_id)).one_or_none()
-        if not dto:
+        if dto := self._session.scalars(
+            self._query.filter_by(uuid=entity_id)
+        ).one_or_none():
+            return Entity(dto)
+        else:
            raise NotFound(entity_id)
-        return Entity(dto)


Function ORMRepository.get refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

Lift code into else after jump in control flow (reintroduce-else)

Swap if/else branches (swap-if-else-branches)

sourcery-ai · 2023-04-12T22:00:57Z

src/quart_sqlalchemy/config.py

-            execute_options = values["execution_options"].dict(exclude_defaults=True)
-            if execute_options:
+            if execute_options := values["execution_options"].dict(
+                exclude_defaults=True
+            ):


Function EngineConfig.scrub_execution_options refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2023-04-12T22:00:58Z

src/quart_sqlalchemy/session.py

-            [isinstance(arg, (sa.orm.Session, sa.ext.asyncio.AsyncSession)) for arg in args]
+            isinstance(arg, (sa.orm.Session, sa.ext.asyncio.AsyncSession))
+            for arg in args
        )
        session_in_kwargs = "session" in kwargs
        session_provided = session_in_args or session_in_kwargs

        if session_provided:
            return func(self, *args, **kwargs)
-        else:
-            session = session_proxy()
+        session = session_proxy()

-            return func(self, session, *args, **kwargs)
+        return func(self, session, *args, **kwargs)


Function provide_global_contextual_session refactored with the following changes:

Replace unneeded comprehension with generator (comprehension-to-generator)

Remove unnecessary else after guard condition (remove-unnecessary-else)

sourcery-ai · 2023-04-12T22:00:58Z

src/quart_sqlalchemy/framework/extension.py

        app: t.Optional[Quart] = None,
    ):
-        initialize = False if config is None else True
+        initialize = config is not None


Function QuartSQLAlchemy.__init__ refactored with the following changes:

Simplify boolean if expression (boolean-if-exp-identity)

Remove unnecessary casts to int, str, float or bool (remove-unnecessary-cast)

sourcery-ai · 2023-04-12T22:01:00Z

src/quart_sqlalchemy/sim/logic.py

-                "User duplication for email: {} (client_id: {})".format(
-                    email,
-                    client_id,
-                ),
+                f"User duplication for email: {email} (client_id: {client_id})"


Function AuthUser.add_by_email_and_client_id refactored with the following changes:

Replace call to format with f-string [×2] (use-fstring-for-formatting)

sourcery-ai · 2023-04-12T22:01:00Z

src/quart_sqlalchemy/sim/logic.py

-            "New auth user (id: {}) created by (client_id: {})".format(row.id, client_id),
+            f"New auth user (id: {row.id}) created by (client_id: {client_id})"


Function AuthUser.add_by_client_id refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-04-12T22:01:01Z

src/quart_sqlalchemy/sim/logic.py

-        new_row = self._repository.add(
+        return self._repository.add(


Function AuthWallet.add refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2023-04-12T22:01:01Z

src/quart_sqlalchemy/sim/logic.py

-        if not row:
-            return None
-
-        return one(row)
+        return one(row) if row else None


Function AuthWallet.get_by_public_address refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

Swap if/else branches of if expression to remove negation (swap-if-expression)

sourcery-ai · 2023-04-12T22:01:01Z

src/quart_sqlalchemy/sim/logic.py

-        if not rows:
-            return []
-
-        return rows
+        return rows or []


Function AuthWallet.get_by_auth_user_id refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

Swap if/else branches of if expression to remove negation (swap-if-expression)

Simplify if expression by using or (or-if-exp-identity)

sourcery-ai · 2023-04-12T22:01:05Z

src/quart_sqlalchemy/sim/repo_adapter.py

-        else:
-            order_by_clause = ()
-
+        order_by_clause = (order_by_clause, ) if order_by_clause is not None else ()


Function RepositoryLegacyAdapter.get_by refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-04-12T22:01:05Z

src/quart_sqlalchemy/sim/repo_adapter.py

-        for group in group_by:
-            selectables.append(group.expression)
-
+        selectables.extend(group.expression for group in group_by)


Function RepositoryLegacyAdapter.count_by refactored with the following changes:

Replace a for append loop with list extend (for-append-to-extend)

sourcery-ai · 2023-04-12T22:01:05Z

src/quart_sqlalchemy/sim/repo_adapter.py

-        results = self._adapted.select(
+        yield from self._adapted.select(
            session,
            conditions=filters,
-            options=[sa.orm.selectinload(getattr(self.model, attr)) for attr in join_list],
+            options=[
+                sa.orm.selectinload(getattr(self.model, attr))
+                for attr in join_list
+            ],
            include_inactive=allow_inactive,
            yield_by_chunk=chunk_size,
        )
-        for result in results:
-            yield result


Function RepositoryLegacyAdapter.yield_by_chunk refactored with the following changes:

Inline variable that is immediately yielded (inline-immediately-yielded-variable)

Replace yield inside for loop with yield from (yield-from)

sourcery-ai · 2023-04-12T22:01:05Z

src/quart_sqlalchemy/sim/repo_adapter.py

-        if sqla_model:
-            return result
-        return self.model_schema.from_orm(result)
+        return result if sqla_model else self.model_schema.from_orm(result)


Function insert refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-04-12T22:01:05Z

src/quart_sqlalchemy/sim/repo_adapter.py

-        if sqla_model:
-            return existing
-        return self.model_schema.from_orm(existing)
+        return existing if sqla_model else self.model_schema.from_orm(existing)


Function update refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-04-12T22:01:06Z

src/quart_sqlalchemy/sim/schema.py

-        if error_code:
-            return "failed"
-        return "ok"
+        return "failed" if (error_code := values.get("error_code")) else "ok"


Function ResponseWrapper.set_status_by_error_code refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-04-12T22:01:06Z

src/quart_sqlalchemy/sim/util.py


    def __hash__(self):
-        return hash(tuple([self._encoded_id, self._decoded_id]))
+        return hash((self._encoded_id, self._decoded_id))


Function ObjectID.__hash__ refactored with the following changes:

Unwrap a constant iterable constructor (unwrap-iterable-construction)

sourcery-ai · 2023-04-12T22:01:06Z

src/quart_sqlalchemy/sim/util.py

-            return value
-        else:
-            return self.hashids.decode(value)[0]
+        return value if isinstance(value, int) else self.hashids.decode(value)[0]


Function ObjectID._decode refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-04-12T22:01:06Z

tests/base.py

-        db = QuartSQLAlchemy(app=app)
-
-        yield db
+        yield QuartSQLAlchemy(app=app)


Function SimpleTestBase.db refactored with the following changes:

Inline variable that is immediately yielded (inline-immediately-yielded-variable)

sourcery-ai · 2023-04-12T22:01:07Z

tests/base.py

-        db = QuartSQLAlchemy(app=app)
-
-        yield db
+        yield QuartSQLAlchemy(app=app)


Function MixinTestBase.db refactored with the following changes:

Inline variable that is immediately yielded (inline-immediately-yielded-variable)

sourcery-ai bot requested a review from joeblackwaslike March 30, 2023 22:24

sourcery-ai bot force-pushed the sourcery/simulation branch 5 times, most recently from 60cd7e0 to eb61e24 Compare March 31, 2023 23:15

sourcery-ai bot force-pushed the sourcery/simulation branch from eb61e24 to 01244a8 Compare April 12, 2023 20:32

sourcery-ai bot commented Apr 12, 2023

View reviewed changes

'Refactored by Sourcery'

c05116a

sourcery-ai bot force-pushed the sourcery/simulation branch from 01244a8 to c05116a Compare April 12, 2023 22:00

sourcery-ai bot commented Apr 12, 2023

View reviewed changes

		"New auth user (id: {}) created by (client_id: {})".format(row.id, client_id),
		f"New auth user (id: {row.id}) created by (client_id: {client_id})"

Uh oh!

Simulation (Sourcery refactored) #5

Are you sure you want to change the base?

Simulation (Sourcery refactored) #5

Uh oh!

Conversation

sourcery-ai bot commented Mar 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

sourcery-ai bot commented Mar 30, 2023 •

edited

Loading