Tortoise 1.0 update

Author: droserasprout

pyproject.toml

@@ -79,14 +79,14 @@ dependencies = [
     "strict-rfc3339~=0.7",
     "survey~=5.4",
     "tabulate~=0.9",
-    "tortoise-orm==0.25.3", # pinned
+    "tortoise-orm==1.0.0", # pinned
     "uvloop~=0.20",
     "web3~=7.2",
 ]
 
 [project.optional-dependencies]
 migrations = [
-    "aerich~=0.9.0",
+    "aerich",
 ]
 
 [project.urls]
@@ -163,7 +163,6 @@ build-backend = "uv_build"
 [dependency-groups]
 lint = [
     "mypy",
-    "types-pytz",
     "types-tabulate",
 ]
 test = [

requirements.txt

@@ -730,7 +730,7 @@ async def schema(ctx: click.Context) -> None:
             Run `dipdup schema init` or `dipdup run` to the run the indexer and it'll be initialized automatically."""
         )
 
-    from aerich import Command as AerichCommand
+    from aerich import Command as AerichCommand  # type: ignore[import-untyped]
 
     from dipdup.database import get_tortoise_config
 
@@ -761,13 +761,13 @@ def wrapper(ctx: click.Context, /, *args: Any, **kwargs: Any) -> None:
 # NOTE: Saving 0.45s on imports and hiding from reference
 if 'schema' in sys.argv:
     try:
-        from aerich.cli import cli as aerich_cli
+        from aerich.cli import cli as aerich_cli  # type: ignore[import-untyped]
 
-        schema.add_command(aerich_cli.commands['history'])  # type: ignore
-        schema.add_command(aerich_cli.commands['heads'])  # type: ignore
-        schema.add_command(aerich_cli.commands['migrate'])  # type: ignore
-        schema.add_command(_approve_schema_after(aerich_cli.commands['upgrade']))  # type: ignore
-        schema.add_command(_approve_schema_after(aerich_cli.commands['downgrade']))  # type: ignore
+        schema.add_command(aerich_cli.commands['history'])
+        schema.add_command(aerich_cli.commands['heads'])
+        schema.add_command(aerich_cli.commands['migrate'])
+        schema.add_command(_approve_schema_after(aerich_cli.commands['upgrade']))
+        schema.add_command(_approve_schema_after(aerich_cli.commands['downgrade']))
     except ImportError:
         _logger.debug('aerich is not installed, skipping database migration commands')
 

src/dipdup/cli.py

@@ -1036,7 +1036,7 @@ async def _initialize_migrations(self) -> None:
 
         migrations_dir = self._ctx.package.migrations
         try:
-            from aerich import Command as AerichCommand
+            from aerich import Command as AerichCommand  # type: ignore[import-untyped]
 
             tortoise_config = get_tortoise_config(self._config.database.connection_string, self._config.package)
             aerich_command = AerichCommand(

src/dipdup/dipdup.py

@@ -98,7 +98,10 @@ async def run_postgres_container() -> PostgresDatabaseConfig:
     )
     atexit.register(postgres_container.stop)
     postgres_container.reload()
-    postgres_ip = postgres_container.attrs['NetworkSettings']['IPAddress']
+    try:
+        postgres_ip = postgres_container.attrs['NetworkSettings']['IPAddress']
+    except KeyError:
+        postgres_ip = postgres_container.attrs['NetworkSettings']['Networks']['bridge']['IPAddress']
 
     while not postgres_container.exec_run('pg_isready').exit_code == 0:
         await asyncio.sleep(0.1)
@@ -126,7 +129,10 @@ async def run_hasura_container(postgres_ip: str) -> HasuraConfig:
     )
     atexit.register(hasura_container.stop)
     hasura_container.reload()
-    hasura_ip = hasura_container.attrs['NetworkSettings']['IPAddress']
+    try:
+        hasura_ip = hasura_container.attrs['NetworkSettings']['IPAddress']
+    except KeyError:
+        hasura_ip = hasura_container.attrs['NetworkSettings']['Networks']['bridge']['IPAddress']
 
     return HasuraConfig(
         url=f'http://{hasura_ip}:8080',

src/dipdup/test.py

@@ -1,9 +1,8 @@
 from contextlib import AsyncExitStack
-from datetime import datetime
+from datetime import UTC, datetime
 from pathlib import Path
 
 import pytest
-from pytz import UTC
 
 from dipdup.config import DipDupConfig
 from dipdup.config import SqliteDatabaseConfig

tests/test_dipdup.py

@@ -23,7 +23,7 @@ class SomeException(Exception): ...
 
 async def test_in_global_transaction() -> None:
     transactions = TransactionManager()
-    async with tortoise_wrapper('sqlite://:memory:'):
+    async with tortoise_wrapper('sqlite://:memory:', models='demo_tezos_token.models'):
         await Tortoise.generate_schemas()
 
         # 1. Success query without transaction