Add commit suggestions

app/datasources/db/models.py

@@ -1,7 +1,7 @@
 from datetime import datetime, timezone
-from typing import AsyncGenerator, AsyncIterator, cast
+from typing import AsyncIterator, Self, cast
 
-from sqlalchemy import DateTime, Row
+from sqlalchemy import DateTime
 from sqlmodel import (
     JSON,
     Column,
@@ -80,7 +80,7 @@ async def get_or_create(
         :param name: The name to check or create.
         :param url: The URL to check or create.
         :return: A tuple containing the AbiSource object and a boolean indicating
-                 whether it was created (True) or already exists (False).
+                 whether it was created `True` or already exists `False`.
         """
         query = select(cls).where(cls.name == name, cls.url == url)
         results = await session.exec(query)
@@ -168,7 +168,7 @@ async def get_or_create_abi(
         :param relevance:
         :param source_id:
         :return: A tuple containing the Abi object and a boolean indicating
-                 whether it was created (True) or already exists (False).
+                 whether it was created `True` or already exists `False`.
         """
         if abi := await cls.get_abi(session, abi_json):
             return abi, False
@@ -218,7 +218,7 @@ def get_contracts_query(
         Return a statement to get contracts for the provided address and chain_id
 
         :param address:
-        :param chain_ids: list of chain_ids, None for all chains
+        :param chain_ids: list of chain_ids, `None` for all chains
         :return:
         """
         query = select(cls).where(cls.address == address)
@@ -286,7 +286,7 @@ async def get_abi_by_contract_address(
     @classmethod
     async def get_contracts_without_abi(
         cls, session: AsyncSession, max_retries: int = 0
-    ) -> AsyncGenerator["Contract", None]:
+    ) -> AsyncIterator[Self]:
         """
         Fetches contracts without an ABI and fewer retries than max_retries,
         streaming results in batches to reduce memory usage for large datasets.
@@ -299,24 +299,22 @@ async def get_contracts_without_abi(
         """
         query = (
             select(cls)
-            .where(cls.abi_id == None)  # noqa: E711
+            .where(cls.abi_id.isnot(None))  # type: ignore
             .where(cls.fetch_retries <= max_retries)
         )
         result = await session.stream(query)
         async for (contract,) in result:
             yield contract
 
     @classmethod
-    async def get_proxy_contracts(
-        cls, session: AsyncSession
-    ) -> AsyncGenerator["Contract", None]:
+    async def get_proxy_contracts(cls, session: AsyncSession) -> AsyncIterator[Self]:
         """
         Return all the contracts with implementation address, so proxy contracts.
 
         :param session:
         :return:
         """
-        query = select(cls).where(cls.implementation != None)  # noqa: E711
+        query = select(cls).where(cls.implementation.isnot(None))  # type: ignore
         result = await session.stream(query)
         async for (contract,) in result:
             yield contract

app/tests/datasources/db/test_model.py

@@ -8,8 +8,8 @@
 from app.datasources.db.database import database_session
 from app.datasources.db.models import Abi, AbiSource, Contract, Project
 from app.services.contract_metadata_service import (
-    ClientSource,
     ContractMetadataService,
+    ContractSource,
     EnhancedContractMetadata,
 )
 
@@ -184,7 +184,7 @@ async def test_get_proxy_contracts(self, session: AsyncSession):
         enhanced_contract_metadata = EnhancedContractMetadata(
             address=random_address,
             metadata=etherscan_proxy_metadata_mock,
-            source=ClientSource.ETHERSCAN,
+            source=ContractSource.ETHERSCAN,
             chain_id=1,
         )
         result = await ContractMetadataService.process_contract_metadata(