diff --git a/.gitignore b/.gitignore index e98d124..4a75d24 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,7 @@ secrets *.egg-info **/*.key **/*.cert +docs +ipfs-docker-data +ipfs-docker-staging +weights diff --git a/skynet/cli.py b/skynet/cli.py index 1d19ae3..d2dab73 100644 --- a/skynet/cli.py +++ b/skynet/cli.py @@ -21,7 +21,7 @@ from leap.sugar import get_container, collect_stdout from leap.hyperion import HyperionAPI from .db import open_new_database -from .ipfs import IPFSDocker +from .ipfs import open_ipfs_node from .config import * from .nodeos import open_cleos, open_nodeos from .constants import ALGOS @@ -396,6 +396,13 @@ class IPFSHTTP: ) +@run.command() +@click.option('--loglevel', '-l', default='INFO', help='logging level') +@click.option('--name', '-n', default='skynet-ipfs', help='container name') +def ipfs(loglevel, name): + with open_ipfs_node(name=name): + ... + @run.command() @click.option('--loglevel', '-l', default='INFO', help='logging level') @click.option( diff --git a/skynet/dgpu.py b/skynet/dgpu.py index ce29b27..8f5bc12 100644 --- a/skynet/dgpu.py +++ b/skynet/dgpu.py @@ -222,7 +222,8 @@ async def open_dgpu_node( 'telos.gpu', 'workbegin', [account, request_id], - f'{account}@{permission}' + f'{account}@{permission}', + retry=0 ) def cancel_work(request_id: int, reason: str): @@ -231,7 +232,8 @@ async def open_dgpu_node( 'telos.gpu', 'workcancel', [account, request_id, reason], - f'{account}@{permission}' + f'{account}@{permission}', + retry=2 ) def maybe_withdraw_all(): @@ -283,7 +285,8 @@ async def open_dgpu_node( 'telos.gpu', 'submit', [account, request_id, request_hash, result_hash, ipfs_hash], - f'{account}@{permission}' + f'{account}@{permission}', + retry=0 ) if ec != 0: diff --git a/skynet/frontend/telegram.py b/skynet/frontend/telegram.py index 320f49f..c7e8d43 100644 --- a/skynet/frontend/telegram.py +++ b/skynet/frontend/telegram.py @@ -57,7 +57,7 @@ def prepare_metainfo_caption(tguser, worker: str, reward: str, meta: dict) -> st else: user = f'{tguser.first_name} id: {tguser.id}' - meta_str = f'by {user}' + meta_str = f'by {user}\n' meta_str += f'performed by {worker}\n' meta_str += f'reward: {reward}\n'