add aleph program logs

src/aleph_client/commands/instance/__init__.py

@@ -50,7 +50,6 @@
     fetch_crn_info,
     fetch_vm_info,
     find_crn_of_vm,
-    sanitize_url,
 )
 from aleph_client.commands.instance.superfluid import FlowUpdate, update_flow
 from aleph_client.commands.node import NodeInfo, _fetch_nodes
@@ -67,7 +66,7 @@
     wait_for_processed_instance,
 )
 from aleph_client.models import CRNInfo
-from aleph_client.utils import AsyncTyper
+from aleph_client.utils import AsyncTyper, sanitize_url
 
 logger = logging.getLogger(__name__)
 app = AsyncTyper(no_args_is_help=True)

src/aleph_client/commands/instance/network.py

@@ -4,7 +4,6 @@
 from ipaddress import IPv6Interface
 from json import JSONDecodeError
 from typing import Optional
-from urllib.parse import ParseResult, urlparse
 
 import aiohttp
 from aleph.sdk import AlephHttpClient
@@ -18,52 +17,15 @@
 from aleph_client.commands.node import NodeInfo, _fetch_nodes
 from aleph_client.commands.utils import safe_getattr
 from aleph_client.models import MachineUsage
-from aleph_client.utils import fetch_json
+from aleph_client.utils import AsyncTyper, fetch_json, sanitize_url
 
 logger = logging.getLogger(__name__)
 
-# Some users had fun adding URLs that are obviously not CRNs.
-# If you work for one of these companies, please send a large check to the Aleph team,
-# and we may consider removing your domain from the blacklist. Or just use a subdomain.
-FORBIDDEN_HOSTS = [
-    "amazon.com",
-    "apple.com",
-    "facebook.com",
-    "google.com",
-    "google.es",
-    "microsoft.com",
-    "openai.com",
-    "twitter.com",
-    "x.com",
-    "youtube.com",
-]
 
 PATH_STATUS_CONFIG = "/status/config"
 PATH_ABOUT_USAGE_SYSTEM = "/about/usage/system"
 
 
-def sanitize_url(url: str) -> str:
-    """Ensure that the URL is valid and not obviously irrelevant.
-
-    Args:
-        url: URL to sanitize.
-    Returns:
-        Sanitized URL.
-    """
-    if not url:
-        raise aiohttp.InvalidURL("Empty URL")
-    parsed_url: ParseResult = urlparse(url)
-    if parsed_url.scheme not in ["http", "https"]:
-        raise aiohttp.InvalidURL(f"Invalid URL scheme: {parsed_url.scheme}")
-    if parsed_url.hostname in FORBIDDEN_HOSTS:
-        logger.debug(
-            f"Invalid URL {url} hostname {parsed_url.hostname} is in the forbidden host list "
-            f"({', '.join(FORBIDDEN_HOSTS)})"
-        )
-        raise aiohttp.InvalidURL("Invalid URL host")
-    return url
-
-
 async def fetch_crn_info(node_url: str) -> dict | None:
     """
     Fetches compute node usage information and version.

src/aleph_client/commands/program.py

@@ -2,21 +2,26 @@
 
 import json
 import logging
+import sys
 from base64 import b16decode, b32encode
 from collections.abc import Mapping
 from pathlib import Path
-from typing import List, Optional
+from typing import Any, List, Optional, Tuple
 from zipfile import BadZipFile
 
 import typer
+from aiohttp import ClientResponse
+from aiohttp.client import _RequestContextManager
 from aleph.sdk import AuthenticatedAlephHttpClient
 from aleph.sdk.account import _load_account
+from aleph.sdk.client.vm_client import VmClient
 from aleph.sdk.conf import settings
 from aleph.sdk.types import AccountFromPrivateKey, StorageEnum
-from aleph_message.models import ProgramMessage, StoreMessage
+from aleph_message.models import Chain, ProgramMessage, StoreMessage
 from aleph_message.models.execution.program import ProgramContent
 from aleph_message.models.item_hash import ItemHash
 from aleph_message.status import MessageStatus
+from click import echo
 
 from aleph_client.commands import help_strings
 from aleph_client.commands.utils import (
@@ -25,7 +30,7 @@
     setup_logging,
     yes_no_input,
 )
-from aleph_client.utils import AsyncTyper, create_archive
+from aleph_client.utils import AsyncTyper, create_archive, sanitize_url
 
 logger = logging.getLogger(__name__)
 app = AsyncTyper(no_args_is_help=True)
@@ -236,3 +241,56 @@
             channel=message.channel,
         )
         typer.echo(f"{message.json(indent=4)}")
+
+
+@app.command()
+async def logs(
+    item_hash: str = typer.Argument(..., help="Item hash of program"),
+    private_key: Optional[str] = settings.PRIVATE_KEY_STRING,
+    private_key_file: Optional[Path] = settings.PRIVATE_KEY_FILE,
+    domain: str = typer.Option(None, help="CRN domain on which the VM is stored or running"),
+    chain: Chain = typer.Option(None, help=help_strings.ADDRESS_CHAIN),
+    debug: bool = False,
+):
+    """Display logs for the program.
+
+    Will only show logs frp, one select CRN"""
+
+    setup_logging(debug)
+
+    account = _load_account(private_key, private_key_file, chain=chain)
+    domain = sanitize_url(domain)
+
+    async with VmClient2(account, domain) as client:
+        async with await client.operate(vm_id=item_hash, operation="logs.json", method="GET") as response:
+
+            logger.debug("Request %s %s", response.url, response.status)
+            if response.status != 200:
+                logger.debug(response)
+                logger.debug(await response.text())
+
+            if response.status == 404:
+                echo(f"Execution not found on this server")
+                return 1
+            elif response.status == 403:
+
+                echo(f"You are not the owner of this VM. Maybe try with another wallet?")
+
+                return 1
+            elif response.status != 200:
+                echo(f"Server error: {response.status}. Please try again latter")
+                return 1
+            echo("Received logs")
+            log_entries = await response.json()
+            for log in log_entries:
+                echo(f'{log["__REALTIME_TIMESTAMP"]}>  {log["MESSAGE"]}')
+
+
+class VmClient2(VmClient):
+    async def operate(self, vm_id: ItemHash, operation: str, method: str = "POST") -> _RequestContextManager:
+        if not self.pubkey_signature_header:
+            self.pubkey_signature_header = await self._generate_pubkey_signature_header()
+
+        url, header = await self._generate_header(vm_id=vm_id, operation=operation, method=method)
+
+        return self.session.request(method=method, url=url, headers=header)

src/aleph_client/utils.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import asyncio
 import inspect
 import logging
@@ -7,8 +9,10 @@
 from pathlib import Path
 from shutil import make_archive
 from typing import List, Optional, Tuple, Type, Union
+from urllib.parse import ParseResult, urlparse
 from zipfile import BadZipFile, ZipFile
 
+import aiohttp
 import typer
 from aiohttp import ClientSession
 from aleph.sdk.conf import MainConfiguration, load_main_configuration, settings
@@ -130,3 +134,42 @@ async def list_unlinked_keys() -> Tuple[List[Path], Optional[MainConfiguration]]
     unlinked_keys: List[Path] = [key_file for key_file in all_private_key_files if key_file != active_key_path]
 
     return unlinked_keys, config
+
+
+# Some users had fun adding URLs that are obviously not CRNs.
+# If you work for one of these companies, please send a large check to the Aleph team,
+# and we may consider removing your domain from the blacklist. Or just use a subdomain.
+FORBIDDEN_HOSTS = [
+    "amazon.com",
+    "apple.com",
+    "facebook.com",
+    "google.com",
+    "google.es",
+    "microsoft.com",
+    "openai.com",
+    "twitter.com",
+    "x.com",
+    "youtube.com",
+]
+
+
+def sanitize_url(url: str) -> str:
+    """Ensure that the URL is valid and not obviously irrelevant.
+
+    Args:
+        url: URL to sanitize.
+    Returns:
+        Sanitized URL.
+    """
+    if not url:
+        raise aiohttp.InvalidURL("Empty URL")
+    parsed_url: ParseResult = urlparse(url)
+    if parsed_url.scheme not in ["http", "https"]:
+        raise aiohttp.InvalidURL(f"Invalid URL scheme: {parsed_url.scheme}")
+    if parsed_url.hostname in FORBIDDEN_HOSTS:
+        logger.debug(
+            f"Invalid URL {url} hostname {parsed_url.hostname} is in the forbidden host list "
+            f"({', '.join(FORBIDDEN_HOSTS)})"
+        )
+        raise aiohttp.InvalidURL("Invalid URL host")
+    return url

tests/unit/test_instance.py

@@ -1,8 +1,6 @@
 from __future__ import annotations
 
 from datetime import datetime, timezone
-from decimal import Decimal
-from typing import cast
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
@@ -15,11 +13,7 @@
 from multidict import CIMultiDict, CIMultiDictProxy
 
 from aleph_client.commands.instance import delete
-from aleph_client.commands.instance.network import (
-    FORBIDDEN_HOSTS,
-    fetch_crn_info,
-    sanitize_url,
-)
+from aleph_client.commands.instance.network import fetch_crn_info
 from aleph_client.models import (
     CoreFrequencies,
     CpuUsage,
@@ -31,6 +25,7 @@
     MemoryUsage,
     UsagePeriod,
 )
+from aleph_client.utils import FORBIDDEN_HOSTS, sanitize_url
 
 
 def dummy_machine_info() -> MachineInfo: