rebase + update deprecations

Author: aliel

setup.cfg

@@ -31,7 +31,7 @@ package_dir =
 setup_requires = pyscaffold>=3.2a0,<3.3a0
 # Add here dependencies of your project (semicolon/line-separated), e.g.
 install_requires =
-    aleph-sdk-python@git+https://github.com/aleph-im/aleph-sdk-python.git@863e1e2acc55b23885908adb2cb33cce0fa12773
+    aleph-sdk-python@git+https://github.com/aleph-im/aleph-sdk-python.git@main
     aleph-message==0.4.0
     coincurve
     aiohttp>=3.8.3

src/aleph_client/commands/domain.py

@@ -4,10 +4,17 @@
 
 import typer
 from aleph.sdk.account import _load_account
-from aleph.sdk.client import AlephClient, AuthenticatedAlephClient
+from aleph.sdk.client import AlephHttpClient, AuthenticatedAlephHttpClient
 from aleph.sdk.conf import settings as sdk_settings
-from aleph.sdk.domain import DomainValidator, Hostname, TargetType, hostname_from_url
+from aleph.sdk.domain import (
+    DomainValidator,
+    Hostname,
+    TargetType,
+    get_target_type,
+    hostname_from_url,
+)
 from aleph.sdk.exceptions import DomainConfigurationError
+from aleph.sdk.query.filters import MessageFilter
 from aleph.sdk.types import AccountFromPrivateKey
 from aleph_client.commands import help_strings
 from aleph_client.commands.utils import coro
@@ -20,12 +27,14 @@
 
 
 async def get_aggregate_domain_info(account, fqdn):
-    async with AlephClient(api_server=sdk_settings.API_HOST) as client:
+    async with AlephHttpClient(api_server=sdk_settings.API_HOST) as client:
         aggregates = await client.get_messages(
-            addresses=[str(account.get_address())],
-            message_type=MessageType.aggregate,
+            message_filter=MessageFilter(
+                message_types=[MessageType.aggregate],
+                addresses=[str(account.get_address())],
+            ),
             page=1,
-            pagination=1000
+            page_size=1000
         )
 
         for message in aggregates.messages:
@@ -59,20 +68,18 @@ async def detach_resource(account: AccountFromPrivateKey, fqdn: Hostname):
     table.add_column("New resource", justify="right", style="green", no_wrap=True)
     table.add_column("Resource type", style="magenta")
 
-    domain_validator = DomainValidator()
-
     if domain_info is not None and domain_info.get("info"):
         current_resource = domain_info["info"]["message_id"]
 
-    resource_type = await domain_validator.get_target_type(fqdn)
+    resource_type = await get_target_type(fqdn)
     table.add_row(f"{current_resource[:16]}...{current_resource[-16:]}", "", resource_type)
 
     console.print(table)
 
     if Confirm.ask("Continue"):
         """Update aggregate message"""
 
-        async with AuthenticatedAlephClient(
+        async with AuthenticatedAlephHttpClient(
                 account=account, api_server=sdk_settings.API_HOST
         ) as client:
             aggregate_content = {
@@ -102,12 +109,11 @@ async def attach_resource(account: AccountFromPrivateKey, fqdn: Hostname, item_h
     table.add_column("Resource type", style="magenta")
 
     current_resource = "null"
-    domain_validator = DomainValidator()
 
     """
     Detect target type on the fly to be able to switch to another type
     """
-    resource_type = await domain_validator.get_target_type(fqdn)
+    resource_type = await get_target_type(fqdn)
 
     if domain_info is not None and domain_info.get("info"):
         current_resource = domain_info["info"]["message_id"]
@@ -119,7 +125,7 @@ async def attach_resource(account: AccountFromPrivateKey, fqdn: Hostname, item_h
     if Confirm.ask("Continue"):
         """Create aggregate message"""
 
-        async with AuthenticatedAlephClient(
+        async with AuthenticatedAlephHttpClient(
                 account=account, api_server=sdk_settings.API_HOST
         ) as client:
             aggregate_content = {
@@ -177,7 +183,7 @@ async def add(
     owner = account.get_address()
     dns_rules = domain_validator.get_required_dns_rules(fqdn, target, owner)
     for rule_id, rule in enumerate(dns_rules):
-        table.add_row(str(rule_id), rule["dns"]["type"], rule["dns"]["name"], rule["dns"]["value"])
+        table.add_row(str(rule_id), rule.dns.get("type"), rule.dns.get("name"), rule.dns.get("value"))
 
     console.print(table)
 
@@ -191,7 +197,7 @@ async def add(
             checks = await check_domain_records(fqdn, target, owner)
             completed_rules = []
             for index, rule in enumerate(dns_rules):
-                if checks[rule["rule_name"]] is True:
+                if checks[rule.name] is True:
                     """Pass configured rules"""
                     completed_rules.append(rule)
                     console.log(f"record: {index} [bold green] OK")
@@ -202,8 +208,8 @@ async def add(
 
             if dns_rules:
                 rule = dns_rules[0]
-                console.log(f"[green]{rule['info']}")
-                status.update(f"{msg_status} [bold red]{rule['on_error']}")
+                console.log(f"[green]{rule.info}")
+                status.update(f"{msg_status} [bold red]{rule.on_error}")
 
                 max_retries -= 1
                 sleep(10)