Merge branch 'main' into 1yam-credits-system

Author: 1yam

.github/workflows/build-wheels.yml

@@ -41,8 +41,7 @@ jobs:
         if: startsWith(matrix.os, 'macos-')
         run: |
           brew update
-          brew tap cuber/homebrew-libsecp256k1
-          brew install libsecp256k1
+          brew install secp256k1
 
       - name: Install required system packages only for Ubuntu Linux
         if: startsWith(matrix.os, 'ubuntu-')

README.md

@@ -21,8 +21,7 @@ Using some chains may also require installing `libgmp3-dev`.
 ### macOs
 This project does not support Python 3.12 on macOS. Please use Python 3.11 instead.
 ```shell
-$ brew tap cuber/homebrew-libsecp256k1
-$ brew install libsecp256k1
+$ brew install secp256k1
 ```
 
 ## Installation

pyproject.toml

@@ -30,7 +30,7 @@ dynamic = [ "version" ]
 dependencies = [
   "aiohttp>=3.8.3",
   "aioresponses>=0.7.6",
-  "aleph-message>=1.0.3",
+  "aleph-message>=1.0.4",
   "aleph-superfluid>=0.3",
   "base58==2.1.1",                         # Needed now as default with _load_account changement
   "coincurve; python_version>='3.9'",

src/aleph/sdk/client/http.py

@@ -573,7 +573,7 @@ async def get_stored_content(
             message, status = await self.get_message(
                 item_hash=ItemHash(item_hash), with_status=True
             )
-            if status != MessageStatus.PROCESSED:
+            if status not in [MessageStatus.PROCESSED, MessageStatus.REMOVING]:
                 resp = f"Invalid message status: {status}"
             elif message.type != MessageType.store:
                 resp = f"Invalid message type: {message.type}"

src/aleph/sdk/client/services/instance.py

@@ -115,6 +115,8 @@ async def _fetch(
             if isinstance(alloc, InstanceManual):
                 crn_url = sanitize_url(alloc.crn_url)
             else:
+                if not alloc.allocations:
+                    return str(item_hash), None
                 crn_url = sanitize_url(alloc.allocations.node.url)
 
             if not crn_url:

src/aleph/sdk/client/services/pricing.py

@@ -43,6 +43,7 @@ class Price(BaseModel):
     credit: Optional[Decimal] = None
 
 
+
 class ComputeUnit(BaseModel):
     vcpus: int
     memory_mib: int

src/aleph/sdk/client/services/scheduler.py

@@ -1,6 +1,7 @@
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Optional
 
 import aiohttp
+from aiohttp import ClientResponseError
 from aleph_message.models import ItemHash
 
 from aleph.sdk.conf import settings
@@ -39,15 +40,18 @@ async def get_nodes(self) -> SchedulerNodes:
 
                 return SchedulerNodes.model_validate(raw)
 
-    async def get_allocation(self, vm_hash: ItemHash) -> AllocationItem:
+    async def get_allocation(self, vm_hash: ItemHash) -> Optional[AllocationItem]:
         """
         Fetch allocation information for a given VM hash.
         """
         url = f"{sanitize_url(settings.SCHEDULER_URL)}/api/v0/allocation/{vm_hash}"
-
-        async with aiohttp.ClientSession() as session:
-            async with session.get(url) as resp:
-                resp.raise_for_status()
-                payload = await resp.json()
-
-        return AllocationItem.model_validate(payload)
+        try:
+            async with aiohttp.ClientSession() as session:
+                async with session.get(url) as resp:
+                    resp.raise_for_status()
+                    payload = await resp.json()
+            return AllocationItem.model_validate(payload)
+        except ClientResponseError as e:
+            if e.status == 404:  # Allocation can't be find on scheduler
+                return None
+            raise e

src/aleph/sdk/conf.py

@@ -86,7 +86,7 @@ class Settings(BaseSettings):
 
     DNS_API: ClassVar[str] = "https://api.dns.public.aleph.sh/instances/list"
     CRN_URL_UPDATE: ClassVar[str] = "{crn_url}/control/machine/{vm_hash}/update"
-    CRN_LIST_URL: ClassVar[str] = "https://crns-list.aleph.sh/crns.json"
+    CRN_LIST_URL: str = "https://crns-list.aleph.sh/crns.json"
     CRN_VERSION_URL: ClassVar[str] = (
         "https://api.github.com/repos/aleph-im/aleph-vm/releases/latest"
     )

src/aleph/sdk/types.py

@@ -192,7 +192,9 @@ class AllocationItem(BaseModel):
 
 class InstanceWithScheduler(BaseModel):
     source: Literal["scheduler"]
-    allocations: AllocationItem  # Case Scheduler
+    allocations: Optional[
+        AllocationItem
+    ]  # Case Scheduler (None == allocation can't be find on scheduler)
 
 
 class InstanceManual(BaseModel):

tests/unit/services/pricing_aggregate.json

@@ -13,7 +13,7 @@
             "payg": "0.011",
             "holding": "200",
             "credit": "0.011"
-          }
+          },
         },
         "tiers": [
           {
@@ -66,7 +66,7 @@
             "payg": "0.055",
             "holding": "1000",
             "credit": "0.055"
-          }
+          },
         },
         "tiers": [
           {
@@ -119,7 +119,7 @@
             "payg": "0.055",
             "holding": "1000",
             "credit": "0.055"
-          }
+          },
         },
         "tiers": [
           {
@@ -162,6 +162,7 @@
           "compute_unit": {
             "payg": "0.56",
             "credit": "0.56"
+            "payg": "0.000000977"
           }
         },
         "tiers": [
@@ -238,6 +239,7 @@
           "compute_unit": {
             "payg": "0.28",
             "credit": "0.28"
+            "payg": "0.000000977"
           }
         },
         "tiers": [