Migrate CLI and Python packages to centralized aitbc package utilities
CLI migration: - Migrate 11 CLI files from old import pattern to centralized aitbc imports - wallet.py, exchange.py, gpu_marketplace.py, exchange_island.py, monitor.py, cross_chain.py - aitbc_cli.py, handlers (account.py, bridge.py, pool_hub.py), utils (wallet_daemon_client.py) - Replace 'from aitbc.aitbc_logging import' with 'from aitbc import get_logger' - Replace 'from aitbc.http_client import' with 'from aitbc import AITBCHTTPClient' - Replace 'from aitbc.exceptions import' with 'from aitbc import NetworkError' Packages migration: - aitbc-sdk: receipts.py - migrate from httpx to AITBCHTTPClient - aitbc-agent-sdk: 5 files - migrate logging to get_logger - agent.py, compute_provider.py, compute_consumer.py, swarm_coordinator.py, platform_builder.py
This commit is contained in:
@@ -4,7 +4,6 @@ Core Agent class for AITBC network participation
|
||||
|
||||
import asyncio
|
||||
import json
|
||||
import logging
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
from typing import Dict, List, Optional, Any
|
||||
@@ -14,7 +13,9 @@ from cryptography.hazmat.primitives.asymmetric import rsa
|
||||
from cryptography.hazmat.primitives import serialization
|
||||
from cryptography.hazmat.primitives.asymmetric import padding
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
from aitbc import get_logger
|
||||
|
||||
logger = get_logger(__name__)
|
||||
|
||||
|
||||
@dataclass
|
||||
|
||||
@@ -3,13 +3,14 @@ Compute Consumer Agent - for agents that consume computational resources
|
||||
"""
|
||||
|
||||
import asyncio
|
||||
import logging
|
||||
from typing import Dict, List, Optional, Any
|
||||
from datetime import datetime
|
||||
from dataclasses import dataclass
|
||||
from .agent import Agent, AgentCapabilities
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
from aitbc import get_logger
|
||||
|
||||
logger = get_logger(__name__)
|
||||
|
||||
|
||||
@dataclass
|
||||
|
||||
@@ -3,13 +3,14 @@ Compute Provider Agent - for agents that provide computational resources
|
||||
"""
|
||||
|
||||
import asyncio
|
||||
import logging
|
||||
from typing import Dict, List, Optional, Any
|
||||
from datetime import datetime, timedelta
|
||||
from dataclasses import dataclass
|
||||
from .agent import Agent, AgentCapabilities
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
from aitbc import get_logger
|
||||
|
||||
logger = get_logger(__name__)
|
||||
|
||||
|
||||
@dataclass
|
||||
|
||||
@@ -2,14 +2,15 @@
|
||||
Platform Builder - factory for constructing AITBC agent platform configurations
|
||||
"""
|
||||
|
||||
import logging
|
||||
from typing import Dict, List, Any, Optional
|
||||
from .agent import Agent, AgentCapabilities, AgentIdentity
|
||||
from .compute_provider import ComputeProvider
|
||||
from .compute_consumer import ComputeConsumer
|
||||
from .swarm_coordinator import SwarmCoordinator
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
from aitbc import get_logger
|
||||
|
||||
logger = get_logger(__name__)
|
||||
|
||||
|
||||
class PlatformBuilder:
|
||||
|
||||
@@ -4,13 +4,14 @@ Swarm Coordinator - for agents participating in collective intelligence
|
||||
|
||||
import asyncio
|
||||
import json
|
||||
import logging
|
||||
from typing import Dict, List, Optional, Any # noqa: F401
|
||||
from datetime import datetime
|
||||
from dataclasses import dataclass
|
||||
from .agent import Agent
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
from aitbc import get_logger
|
||||
|
||||
logger = get_logger(__name__)
|
||||
|
||||
|
||||
@dataclass
|
||||
|
||||
@@ -4,9 +4,9 @@ import time
|
||||
from dataclasses import dataclass, field
|
||||
from typing import Any, Dict, Iterable, Iterator, List, Optional, cast
|
||||
|
||||
import httpx
|
||||
import base64
|
||||
|
||||
from aitbc import AITBCHTTPClient, NetworkError
|
||||
from aitbc_crypto.signing import ReceiptVerifier
|
||||
|
||||
|
||||
@@ -83,8 +83,8 @@ class CoordinatorReceiptClient:
|
||||
self.max_retries = max_retries
|
||||
self.backoff_seconds = backoff_seconds
|
||||
|
||||
def _client(self) -> httpx.Client:
|
||||
return httpx.Client(
|
||||
def _client(self) -> AITBCHTTPClient:
|
||||
return AITBCHTTPClient(
|
||||
base_url=self.base_url,
|
||||
timeout=self.timeout,
|
||||
headers={"X-Api-Key": self.api_key},
|
||||
@@ -187,9 +187,9 @@ class CoordinatorReceiptClient:
|
||||
attempt = 0
|
||||
while True:
|
||||
try:
|
||||
with self._client() as client:
|
||||
response = client.request(method=method, url=url, params=params)
|
||||
except httpx.HTTPError:
|
||||
client = self._client()
|
||||
response = client.request(method=method, url=url, params=params)
|
||||
except NetworkError:
|
||||
if attempt >= self.max_retries:
|
||||
raise
|
||||
attempt += 1
|
||||
|
||||
Reference in New Issue
Block a user