Refactor AlephClient classes

examples/httpgateway.py

@@ -7,7 +7,7 @@
 
 from aleph.sdk.chains.common import get_fallback_private_key
 from aleph.sdk.chains.ethereum import ETHAccount
-from aleph.sdk.client import AuthenticatedAlephClient
+from aleph.sdk.client import AuthenticatedAlephHttpClient
 
 app = web.Application()
 routes = web.RouteTableDef()
@@ -32,7 +32,7 @@ async def source_post(request):
             return web.json_response(
                 {"status": "error", "message": "unauthorized secret"}
             )
-    async with AuthenticatedAlephClient(
+    async with AuthenticatedAlephHttpClient(
         account=app["account"], api_server="https://api2.aleph.im"
     ) as session:
         message, _status = await session.create_post(

examples/metrics.py

@@ -1,7 +1,6 @@
 """ Server metrics upload.
 """
-# -*- coding: utf-8 -*-
-
+import asyncio
 import os
 import platform
 import time
@@ -12,9 +11,11 @@
 from aleph_message.status import MessageStatus
 
 from aleph.sdk.chains.ethereum import get_fallback_account
-from aleph.sdk.client import AuthenticatedAlephClient, AuthenticatedUserSessionSync
+from aleph.sdk.client import AuthenticatedAlephHttpClient
 from aleph.sdk.conf import settings
 
+# -*- coding: utf-8 -*-
+
 
 def get_sysinfo():
     uptime = int(time.time() - psutil.boot_time())
@@ -53,10 +54,12 @@ def get_cpu_cores():
     return [c._asdict() for c in psutil.cpu_times_percent(0, percpu=True)]
 
 
-def send_metrics(
-    session: AuthenticatedUserSessionSync, metrics
+async def send_metrics(
+    session: AuthenticatedAlephHttpClient, metrics
 ) -> Tuple[AlephMessage, MessageStatus]:
-    return session.create_aggregate(key="metrics", content=metrics, channel="SYSINFO")
+    return await session.create_aggregate(
+        key="metrics", content=metrics, channel="SYSINFO"
+    )
 
 
 def collect_metrics():
@@ -68,17 +71,17 @@ def collect_metrics():
     }
 
 
-def main():
+async def main():
     account = get_fallback_account()
-    with AuthenticatedAlephClient(
+    async with AuthenticatedAlephHttpClient(
         account=account, api_server=settings.API_HOST
     ) as session:
         while True:
             metrics = collect_metrics()
-            message, status = send_metrics(session, metrics)
+            message, status = await send_metrics(session, metrics)
             print("sent", message.item_hash)
             time.sleep(10)
 
 
 if __name__ == "__main__":
-    main()
+    asyncio.run(main())

examples/mqtt.py

@@ -10,7 +10,7 @@
 
 from aleph.sdk.chains.common import get_fallback_private_key
 from aleph.sdk.chains.ethereum import ETHAccount
-from aleph.sdk.client import AuthenticatedAlephClient
+from aleph.sdk.client import AuthenticatedAlephHttpClient
 from aleph.sdk.conf import settings
 
 
@@ -26,8 +26,8 @@ def get_input_data(value):
         return value.decode("utf-8")
 
 
-def send_metrics(account, metrics):
-    with AuthenticatedAlephClient(
+async def send_metrics(account, metrics):
+    async with AuthenticatedAlephHttpClient(
         account=account, api_server=settings.API_HOST
     ) as session:
         return session.create_aggregate(
@@ -100,7 +100,7 @@ async def gateway(
         if not userdata["received"]:
             await client.reconnect()
 
-        async with AuthenticatedAlephClient(
+        async with AuthenticatedAlephHttpClient(
             account=account, api_server=settings.API_HOST
         ) as session:
             for key, value in state.items():

examples/store.py

@@ -6,7 +6,7 @@
 
 from aleph.sdk.chains.common import get_fallback_private_key
 from aleph.sdk.chains.ethereum import ETHAccount
-from aleph.sdk.client import AuthenticatedAlephClient
+from aleph.sdk.client import AuthenticatedAlephHttpClient
 from aleph.sdk.conf import settings
 
 DEFAULT_SERVER = "https://api2.aleph.im"
@@ -23,7 +23,7 @@ async def print_output_hash(message: StoreMessage, status: MessageStatus):
 
 
 async def do_upload(account, engine, channel, filename=None, file_hash=None):
-    async with AuthenticatedAlephClient(
+    async with AuthenticatedAlephHttpClient(
         account=account, api_server=settings.API_HOST
     ) as session:
         print(filename, account.get_address())

src/aleph/sdk/__init__.py

@@ -1,6 +1,6 @@
 from pkg_resources import DistributionNotFound, get_distribution
 
-from aleph.sdk.client import AlephClient, AuthenticatedAlephClient
+from aleph.sdk.client import AlephHttpClient, AuthenticatedAlephHttpClient
 
 try:
     # Change here if project is renamed and does not equal the package name
@@ -11,4 +11,4 @@
 finally:
     del get_distribution, DistributionNotFound
 
-__all__ = ["AlephClient", "AuthenticatedAlephClient"]
+__all__ = ["AlephHttpClient", "AuthenticatedAlephHttpClient"]