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

cli/aitbc_cli.py

@@ -37,12 +37,11 @@ import requests
 from typing import Optional, Dict, Any, List
 
 # Import shared modules
-from aitbc.constants import KEYSTORE_DIR, BLOCKCHAIN_RPC_PORT, DATA_DIR
+from aitbc import (
-from aitbc.http_client import AITBCHTTPClient
+    KEYSTORE_DIR, BLOCKCHAIN_RPC_PORT, DATA_DIR,
-from aitbc.exceptions import NetworkError, ValidationError, ConfigurationError
+    AITBCHTTPClient, NetworkError, ValidationError, ConfigurationError,
-from aitbc.aitbc_logging import get_logger
+    get_logger, get_keystore_path, ensure_dir, validate_address, validate_url
-from aitbc.paths import get_keystore_path, ensure_dir
+)
-from aitbc.validation import validate_address, validate_url
 
 # Initialize logger
 logger = get_logger(__name__)

cli/aitbc_cli/commands/cross_chain.py

@@ -8,9 +8,7 @@ from ..config import get_config
 from ..utils import success, error, output
 
 # Import shared modules
-from aitbc.aitbc_logging import get_logger
+from aitbc import get_logger, AITBCHTTPClient, NetworkError
-from aitbc.http_client import AITBCHTTPClient
-from aitbc.exceptions import NetworkError
 
 # Initialize logger
 logger = get_logger(__name__)

cli/aitbc_cli/commands/exchange.py

@@ -10,9 +10,7 @@ from ..utils import output, error, success, warning
 from ..config import get_config
 
 # Import shared modules
-from aitbc.aitbc_logging import get_logger
+from aitbc import get_logger, AITBCHTTPClient, NetworkError
-from aitbc.http_client import AITBCHTTPClient
-from aitbc.exceptions import NetworkError
 
 # Initialize logger
 logger = get_logger(__name__)

cli/aitbc_cli/commands/exchange_island.py

@@ -18,9 +18,7 @@ from ..utils.island_credentials import (
 )
 
 # Import shared modules
-from aitbc.aitbc_logging import get_logger
+from aitbc import get_logger, AITBCHTTPClient, NetworkError
-from aitbc.http_client import AITBCHTTPClient
-from aitbc.exceptions import NetworkError
 
 # Initialize logger
 logger = get_logger(__name__)
@@ -313,49 +311,6 @@ def orderbook(ctx, pair: str, limit: int):
             raise click.Abort()
     except Exception as e:
         error(f"Error fetching order book: {str(e)}")
-        raise click.Abort()
-                                "Amount": f"{order.get('amount', 0):.4f} AIT",
-                                "Total": f"{order.get('min_price', 0) * order.get('amount', 0):.8f} {pair.split('/')[1]}",
-                                "User": order.get('user_id', '')[:16] + "...",
-                                "Order": order.get('order_id', '')[:16] + "..."
-                            })
-                        
-                        output(asks_data, ctx.obj.get('output_format', 'table'), title=f"Sell Orders (Asks) - {pair}")
-                    
-                    # Display buy orders (bids)
-                    if buy_orders:
-                        bids_data = []
-                        for order in buy_orders[:limit]:
-                            bids_data.append({
-                                "Price": f"{order.get('max_price', 0):.8f}",
-                                "Amount": f"{order.get('amount', 0):.4f} AIT",
-                                "Total": f"{order.get('max_price', 0) * order.get('amount', 0):.8f} {pair.split('/')[1]}",
-                                "User": order.get('user_id', '')[:16] + "...",
-                                "Order": order.get('order_id', '')[:16] + "..."
-                            })
-                        
-                        output(bids_data, ctx.obj.get('output_format', 'table'), title=f"Buy Orders (Bids) - {pair}")
-                    
-                    # Calculate spread if both exist
-                    if sell_orders and buy_orders:
-                        best_ask = sell_orders[0].get('min_price', 0)
-                        best_bid = buy_orders[0].get('max_price', 0)
-                        spread = best_ask - best_bid
-                        if best_bid > 0:
-                            spread_pct = (spread / best_bid) * 100
-                            info(f"Spread: {spread:.8f} ({spread_pct:.4f}%)")
-                            info(f"Best Bid: {best_bid:.8f} {pair.split('/')[1]}/AIT")
-                            info(f"Best Ask: {best_ask:.8f} {pair.split('/')[1]}/AIT")
-                        
-                else:
-                    error(f"Failed to query blockchain: {response.status_code}")
-                    raise click.Abort()
-        except Exception as e:
-            error(f"Network error querying blockchain: {e}")
-            raise click.Abort()
-
-    except Exception as e:
-        error(f"Error viewing order book: {str(e)}")
         raise click.Abort()
 
 
@@ -371,7 +326,6 @@ def rates(ctx):
 
         # Query blockchain for exchange orders to calculate rates
         try:
-            import httpx
             rates_data = []
             
             for pair in SUPPORTED_PAIRS:
@@ -383,15 +337,8 @@ def rates(ctx):
                     'limit': 100
                 }
 
-                with httpx.Client() as client:
+                http_client = AITBCHTTPClient(base_url=rpc_endpoint, timeout=10)
-                    response = client.get(
+                orders = http_client.get("/transactions", params=params)
-                        f"{rpc_endpoint}/transactions",
-                        params=params,
-                        timeout=10
-                    )
-                    
-                    if response.status_code == 200:
-                        orders = response.json()
                 
                 # Calculate rates from order book
                 buy_orders = [o for o in orders if o.get('side') == 'buy']
@@ -412,15 +359,6 @@ def rates(ctx):
                     "Buy Orders": len(buy_orders),
                     "Sell Orders": len(sell_orders)
                 })
-                    else:
-                        rates_data.append({
-                            "Pair": pair,
-                            "Best Bid": "Error",
-                            "Best Ask": "Error",
-                            "Mid Price": "Error",
-                            "Buy Orders": 0,
-                            "Sell Orders": 0
-                        })
             
             output(rates_data, ctx.obj.get('output_format', 'table'), title="Exchange Rates")
 
@@ -448,7 +386,6 @@ def orders(ctx, user: Optional[str], status: Optional[str], pair: Optional[str])
 
         # Query blockchain for exchange orders
         try:
-            import httpx
             params = {
                 'transaction_type': 'exchange',
                 'island_id': island_id
@@ -460,15 +397,8 @@ def orders(ctx, user: Optional[str], status: Optional[str], pair: Optional[str])
             if pair:
                 params['pair'] = pair
 
-            with httpx.Client() as client:
+            http_client = AITBCHTTPClient(base_url=rpc_endpoint, timeout=10)
-                response = client.get(
+            orders = http_client.get("/transactions", params=params)
-                    f"{rpc_endpoint}/transactions",
-                    params=params,
-                    timeout=10
-                )
-                
-                if response.status_code == 200:
-                    orders = response.json()
             
             if not orders:
                 info("No exchange orders found")
@@ -489,10 +419,7 @@ def orders(ctx, user: Optional[str], status: Optional[str], pair: Optional[str])
                 })
             
             output(orders_data, ctx.obj.get('output_format', 'table'), title=f"Exchange Orders ({island_id[:16]}...)")
-                else:
+        except NetworkError as e:
-                    error(f"Failed to query blockchain: {response.status_code}")
-                    raise click.Abort()
-        except Exception as e:
             error(f"Network error querying blockchain: {e}")
             raise click.Abort()
 
@@ -544,22 +471,10 @@ def cancel(ctx, order_id: str):
 
         # Submit transaction to blockchain
         try:
-            import httpx
+            http_client = AITBCHTTPClient(base_url=rpc_endpoint, timeout=10)
-            with httpx.Client() as client:
+            result = http_client.post("/transaction", json=cancel_data)
-                response = client.post(
-                    f"{rpc_endpoint}/transaction",
-                    json=cancel_data,
-                    timeout=10
-                )
-                
-                if response.status_code == 200:
             success(f"Order {order_id} cancelled successfully!")
-                else:
+        except NetworkError as e:
-                    error(f"Failed to cancel order: {response.status_code}")
-                    if response.text:
-                        error(f"Error details: {response.text}")
-                    raise click.Abort()
-        except Exception as e:
             error(f"Network error submitting transaction: {e}")
             raise click.Abort()
 

cli/aitbc_cli/commands/gpu_marketplace.py

@@ -18,6 +18,12 @@ from ..utils.island_credentials import (
     get_island_id, get_island_name
 )
 
+# Import shared modules
+from aitbc import get_logger, AITBCHTTPClient, NetworkError
+
+# Initialize logger
+logger = get_logger(__name__)
+
 
 @click.group()
 def gpu():
@@ -100,16 +106,8 @@ def offer(ctx, gpu_count: int, price_per_gpu: float, duration_hours: int, specs:
 
         # Submit transaction to blockchain
         try:
-            import httpx
+            http_client = AITBCHTTPClient(base_url=rpc_endpoint, timeout=10)
-            with httpx.Client() as client:
+            result = http_client.post("/transaction", json=offer_data)
-                response = client.post(
-                    f"{rpc_endpoint}/transaction",
-                    json=offer_data,
-                    timeout=10
-                )
-                
-                if response.status_code == 200:
-                    result = response.json()
             success(f"GPU offer created successfully!")
             success(f"Offer ID: {offer_id}")
             success(f"Total Price: {total_price:.2f} AIT")
@@ -126,12 +124,7 @@ def offer(ctx, gpu_count: int, price_per_gpu: float, duration_hours: int, specs:
             }
             
             output(offer_info, ctx.obj.get('output_format', 'table'))
-                else:
+        except NetworkError as e:
-                    error(f"Failed to submit transaction: {response.status_code}")
-                    if response.text:
-                        error(f"Error details: {response.text}")
-                    raise click.Abort()
-        except Exception as e:
             error(f"Network error submitting transaction: {e}")
             raise click.Abort()
 
@@ -213,16 +206,8 @@ def bid(ctx, gpu_count: int, max_price: float, duration_hours: int, specs: Optio
 
         # Submit transaction to blockchain
         try:
-            import httpx
+            http_client = AITBCHTTPClient(base_url=rpc_endpoint, timeout=10)
-            with httpx.Client() as client:
+            result = http_client.post("/v1/transactions", json=bid_data)
-                response = client.post(
-                    f"{rpc_endpoint}/v1/transactions",
-                    json=bid_data,
-                    timeout=10
-                )
-                
-                if response.status_code == 200:
-                    result = response.json()
             success(f"GPU bid created successfully!")
             success(f"Bid ID: {bid_id}")
             success(f"Max Total Price: {max_total_price:.2f} AIT")
@@ -239,12 +224,7 @@ def bid(ctx, gpu_count: int, max_price: float, duration_hours: int, specs: Optio
             }
             
             output(bid_info, ctx.obj.get('output_format', 'table'))
-                else:
+        except NetworkError as e:
-                    error(f"Failed to submit transaction: {response.status_code}")
-                    if response.text:
-                        error(f"Error details: {response.text}")
-                    raise click.Abort()
-        except Exception as e:
             error(f"Network error submitting transaction: {e}")
             raise click.Abort()
 
@@ -268,7 +248,6 @@ def list(ctx, provider: Optional[str], status: Optional[str], type: str):
 
         # Query blockchain for GPU marketplace transactions
         try:
-            import httpx
             params = {
                 'transaction_type': 'gpu_marketplace',
                 'island_id': island_id
@@ -280,15 +259,8 @@ def list(ctx, provider: Optional[str], status: Optional[str], type: str):
             if type != 'all':
                 params['action'] = type
 
-            with httpx.Client() as client:
+            http_client = AITBCHTTPClient(base_url=rpc_endpoint, timeout=10)
-                response = client.get(
+            transactions = http_client.get("/transactions", params=params)
-                    f"{rpc_endpoint}/transactions",
-                    params=params,
-                    timeout=10
-                )
-                
-                if response.status_code == 200:
-                    transactions = response.json()
             
             if not transactions:
                 info("No GPU marketplace transactions found")
@@ -324,10 +296,7 @@ def list(ctx, provider: Optional[str], status: Optional[str], type: str):
                     })
             
             output(market_data, ctx.obj.get('output_format', 'table'), title=f"GPU Marketplace ({island_id[:16]}...)")
-                else:
+        except NetworkError as e:
-                    error(f"Failed to query blockchain: {response.status_code}")
-                    raise click.Abort()
-        except Exception as e:
             error(f"Network error querying blockchain: {e}")
             raise click.Abort()
 
@@ -390,22 +359,10 @@ def cancel(ctx, order_id: str):
 
         # Submit transaction to blockchain
         try:
-            import httpx
+            http_client = AITBCHTTPClient(base_url=rpc_endpoint, timeout=10)
-            with httpx.Client() as client:
+            result = http_client.post("/transaction", json=cancel_data)
-                response = client.post(
-                    f"{rpc_endpoint}/transaction",
-                    json=cancel_data,
-                    timeout=10
-                )
-                
-                if response.status_code == 200:
             success(f"Order {order_id} cancelled successfully!")
-                else:
+        except NetworkError as e:
-                    error(f"Failed to cancel order: {response.status_code}")
-                    if response.text:
-                        error(f"Error details: {response.text}")
-                    raise click.Abort()
-        except Exception as e:
             error(f"Network error submitting transaction: {e}")
             raise click.Abort()
 
@@ -463,22 +420,10 @@ def accept(ctx, bid_id: str):
 
         # Submit transaction to blockchain
         try:
-            import httpx
+            http_client = AITBCHTTPClient(base_url=rpc_endpoint, timeout=10)
-            with httpx.Client() as client:
+            result = http_client.post("/transaction", json=accept_data)
-                response = client.post(
-                    f"{rpc_endpoint}/transaction",
-                    json=accept_data,
-                    timeout=10
-                )
-                
-                if response.status_code == 200:
             success(f"Bid {bid_id} accepted successfully!")
-                else:
+        except NetworkError as e:
-                    error(f"Failed to accept bid: {response.status_code}")
-                    if response.text:
-                        error(f"Error details: {response.text}")
-                    raise click.Abort()
-        except Exception as e:
             error(f"Network error submitting transaction: {e}")
             raise click.Abort()
 
@@ -500,22 +445,14 @@ def status(ctx, order_id: str):
 
         # Query blockchain for the order
         try:
-            import httpx
             params = {
                 'transaction_type': 'gpu_marketplace',
                 'island_id': island_id,
                 'order_id': order_id
             }
 
-            with httpx.Client() as client:
+            http_client = AITBCHTTPClient(base_url=rpc_endpoint, timeout=10)
-                response = client.get(
+            transactions = http_client.get("/transactions", params=params)
-                    f"{rpc_endpoint}/transactions",
-                    params=params,
-                    timeout=10
-                )
-                
-                if response.status_code == 200:
-                    transactions = response.json()
             
             if not transactions:
                 error(f"Order {order_id} not found")
@@ -554,10 +491,7 @@ def status(ctx, order_id: str):
                 order_info["Cancelled"] = tx['cancelled_at']
             
             output(order_info, ctx.obj.get('output_format', 'table'), title=f"Order Status: {order_id}")
-                else:
+        except NetworkError as e:
-                    error(f"Failed to query blockchain: {response.status_code}")
-                    raise click.Abort()
-        except Exception as e:
             error(f"Network error querying blockchain: {e}")
             raise click.Abort()
 
@@ -578,22 +512,14 @@ def match(ctx):
 
         # Query blockchain for open offers and bids
         try:
-            import httpx
             params = {
                 'transaction_type': 'gpu_marketplace',
                 'island_id': island_id,
                 'status': 'active'
             }
 
-            with httpx.Client() as client:
+            http_client = AITBCHTTPClient(base_url=rpc_endpoint, timeout=10)
-                response = client.get(
+            transactions = http_client.get("/transactions", params=params)
-                    f"{rpc_endpoint}/transactions",
-                    params=params,
-                    timeout=10
-                )
-                
-                if response.status_code == 200:
-                    transactions = response.json()
             
             # Separate offers and bids
             offers = []
@@ -643,13 +569,7 @@ def match(ctx):
                                 }
                                 
                                 # Submit match transaction
-                                        match_response = client.post(
+                                match_result = http_client.post("/transaction", json=match_data)
-                                            f"{rpc_endpoint}/transaction",
-                                            json=match_data,
-                                            timeout=10
-                                        )
-                                        
-                                        if match_response.status_code == 200:
                                 matches.append({
                                     "Bid ID": bid.get('bid_id')[:16] + "...",
                                     "Offer ID": offer.get('offer_id')[:16] + "...",
@@ -664,10 +584,7 @@ def match(ctx):
                 output(matches, ctx.obj.get('output_format', 'table'), title="GPU Order Matches")
             else:
                 info("No matching orders found")
-                else:
+        except NetworkError as e:
-                    error(f"Failed to query blockchain: {response.status_code}")
-                    raise click.Abort()
-        except Exception as e:
             error(f"Network error querying blockchain: {e}")
             raise click.Abort()
 

cli/aitbc_cli/commands/monitor.py

@@ -9,9 +9,7 @@ from datetime import datetime, timedelta
 from ..utils import output, error, success, console
 
 # Import shared modules
-from aitbc.aitbc_logging import get_logger
+from aitbc import get_logger, AITBCHTTPClient, NetworkError
-from aitbc.http_client import AITBCHTTPClient
-from aitbc.exceptions import NetworkError
 
 # Initialize logger
 logger = get_logger(__name__)

cli/aitbc_cli/commands/wallet.py

@@ -12,10 +12,7 @@ from ..utils import output, error, success
 import getpass
 
 # Import shared modules
-from aitbc.aitbc_logging import get_logger
+from aitbc import get_logger, AITBCHTTPClient, NetworkError, KEYSTORE_DIR
-from aitbc.http_client import AITBCHTTPClient
-from aitbc.exceptions import NetworkError
-from aitbc.constants import KEYSTORE_DIR
 
 # Initialize logger
 logger = get_logger(__name__)

cli/handlers/account.py

@@ -3,8 +3,7 @@
 import json
 import sys
 
-from aitbc.http_client import AITBCHTTPClient
+from aitbc import AITBCHTTPClient, NetworkError
-from aitbc.exceptions import NetworkError
 
 
 def handle_account_get(args, default_rpc_url, output_format):

cli/handlers/bridge.py

@@ -2,8 +2,7 @@
 
 import subprocess
 
-from aitbc.http_client import AITBCHTTPClient
+from aitbc import AITBCHTTPClient, NetworkError
-from aitbc.exceptions import NetworkError
 
 
 def handle_bridge_health(args):

cli/handlers/pool_hub.py

@@ -1,7 +1,6 @@
 """Pool hub SLA and capacity management handlers."""
 
-from aitbc.http_client import AITBCHTTPClient
+from aitbc import AITBCHTTPClient, NetworkError
-from aitbc.exceptions import NetworkError
 
 
 def handle_pool_hub_sla_metrics(args):

cli/utils/wallet_daemon_client.py

@@ -10,8 +10,7 @@ from typing import Dict, Any, Optional, List
 from pathlib import Path
 from dataclasses import dataclass
 
-from aitbc.http_client import AITBCHTTPClient
+from aitbc import AITBCHTTPClient, NetworkError
-from aitbc.exceptions import NetworkError
 
 from utils import error, success
 from config import Config

packages/py/aitbc-agent-sdk/src/aitbc_agent/agent.py

@@ -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

packages/py/aitbc-agent-sdk/src/aitbc_agent/compute_consumer.py

@@ -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

packages/py/aitbc-agent-sdk/src/aitbc_agent/compute_provider.py

@@ -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

packages/py/aitbc-agent-sdk/src/aitbc_agent/platform_builder.py

@@ -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:

packages/py/aitbc-agent-sdk/src/aitbc_agent/swarm_coordinator.py

@@ -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

packages/py/aitbc-sdk/src/aitbc_sdk/receipts.py

@@ -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:
+    def _client(self) -> AITBCHTTPClient:
-        return httpx.Client(
+        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:
+                client = self._client()
                 response = client.request(method=method, url=url, params=params)
-            except httpx.HTTPError:
+            except NetworkError:
                 if attempt >= self.max_retries:
                     raise
                 attempt += 1