cleanup

Author: balogh.adam@icloud.com

src/opengradient/client/client.py

@@ -60,8 +60,8 @@ def __init__(
         twins_api_key: Optional[str] = None,
         rpc_url: str = DEFAULT_RPC_URL,
         api_url: str = DEFAULT_API_URL,
-        contract_address: str = DEFAULT_INFERENCE_CONTRACT_ADDRESS,
-        og_llm_server_url: Optional[str] = None,
+        inference_contract_address: str = DEFAULT_INFERENCE_CONTRACT_ADDRESS,
+        llm_server_url: Optional[str] = None,
         tee_registry_address: str = DEFAULT_TEE_REGISTRY_ADDRESS,
     ):
         """
@@ -76,54 +76,51 @@ def __init__(
         By default the LLM server endpoint and its TLS certificate are fetched from
         the on-chain TEE Registry, which stores certificates that were verified during
         enclave attestation.  You can override the endpoint by passing
-        ``og_llm_server_url`` explicitly (the system CA bundle is used for that URL).
+        ``llm_server_url`` explicitly (the system CA bundle is used for that URL).
 
         Args:
             private_key: Private key whose wallet holds **Base Sepolia OPG tokens**
                 for x402 LLM payments.
             alpha_private_key: Private key whose wallet holds **OpenGradient testnet
                 gas tokens** for on-chain inference. Optional -- falls back to
                 ``private_key`` for backward compatibility.
-            email: Email for Model Hub authentication. Optional.
-            password: Password for Model Hub authentication. Optional.
+            email: Email for Model Hub authentication. Must be provided together
+                with ``password``.
+            password: Password for Model Hub authentication. Must be provided
+                together with ``email``.
             twins_api_key: API key for digital twins chat (twin.fun). Optional.
             rpc_url: RPC URL for the OpenGradient Alpha Testnet.
             api_url: API URL for the OpenGradient API.
-            contract_address: Inference contract address.
-            og_llm_server_url: Override the LLM server URL instead of using the
+            inference_contract_address: Inference contract address on the
+                OpenGradient Alpha Testnet.
+            llm_server_url: Override the LLM server URL instead of using the
                 registry-discovered endpoint. When set, the TLS certificate is
                 validated against the system CA bundle rather than the registry.
             tee_registry_address: Address of the TEERegistry contract used to
                 discover active LLM proxy endpoints and their verified TLS certs.
         """
-        blockchain = Web3(Web3.HTTPProvider(rpc_url))
-        wallet_account = blockchain.eth.account.from_key(private_key)
+        if (email is None) != (password is None):
+            raise ValueError("Both 'email' and 'password' must be provided together for Model Hub authentication.")
 
-        # Use a separate account for Alpha Testnet when provided
-        if alpha_private_key is not None:
-            alpha_wallet_account = blockchain.eth.account.from_key(alpha_private_key)
-        else:
-            alpha_wallet_account = wallet_account
+        w3 = Web3(Web3.HTTPProvider(rpc_url))
+        account = w3.eth.account.from_key(private_key)
 
-        hub_user = None
-        if email is not None:
-            hub_user = ModelHub._login_to_hub(email, password)
+        # Use a separate account for Alpha Testnet when provided
+        alpha_account = w3.eth.account.from_key(alpha_private_key) if alpha_private_key is not None else account
 
-        # Create namespaces
-        self.model_hub = ModelHub(hub_user=hub_user)
-        self.wallet_address = wallet_account.address
+        self.model_hub = ModelHub(email=email, password=password)
 
         self.llm = LLM(
-            wallet_account=wallet_account,
-            og_llm_server_url=og_llm_server_url,
+            wallet_account=account,
+            llm_server_url=llm_server_url,
             rpc_url=rpc_url,
             tee_registry_address=tee_registry_address,
         )
 
         self.alpha = Alpha(
-            blockchain=blockchain,
-            wallet_account=alpha_wallet_account,
-            inference_hub_contract_address=contract_address,
+            blockchain=w3,
+            wallet_account=alpha_account,
+            inference_hub_contract_address=inference_contract_address,
             api_url=api_url,
         )
 

src/opengradient/client/llm.py

@@ -71,12 +71,12 @@ def __init__(
         wallet_account: LocalAccount,
         rpc_url: Optional[str] = None,
         tee_registry_address: Optional[str] = None,
-        og_llm_server_url: Optional[str] = None,
+        llm_server_url: Optional[str] = None,
     ):
         self._wallet_account = wallet_account
 
         endpoint, tls_cert_der, tee_id, tee_payment_address = self._resolve_tee(
-            og_llm_server_url,
+            llm_server_url,
             rpc_url,
             tee_registry_address,
         )
@@ -113,7 +113,7 @@ def _resolve_tee(
             return tee_endpoint_override, None, None, None
 
         if og_rpc_url is None or tee_registry_address is None:
-            raise ValueError("Either og_llm_server_url or both og_rpc_url and tee_registry_address must be provided.")
+            raise ValueError("Either llm_server_url or both rpc_url and tee_registry_address must be provided.")
 
         try:
             registry = TEERegistry(rpc_url=og_rpc_url, registry_address=tee_registry_address)
@@ -122,7 +122,7 @@ def _resolve_tee(
             raise RuntimeError(f"Failed to fetch LLM TEE endpoint from registry ({tee_registry_address} on {og_rpc_url}): {e}. ") from e
 
         if tee is None:
-            raise ValueError("No active LLM proxy TEE found in the registry. Pass og_llm_server_url explicitly to override.")
+            raise ValueError("No active LLM proxy TEE found in the registry. Pass llm_server_url explicitly to override.")
 
         logger.info("Using TEE endpoint from registry: %s (teeId=%s)", tee.endpoint, tee.tee_id)
         return tee.endpoint, tee.tls_cert_der, tee.tee_id, tee.payment_address

src/opengradient/client/model_hub.py

@@ -33,11 +33,11 @@ class ModelHub:
         client.model_hub.upload("model.onnx", repo.name, repo.version)
     """
 
-    def __init__(self, hub_user: Optional[Dict] = None):
-        self._hub_user = hub_user
+    def __init__(self, email: Optional[str] = None, password: Optional[str] = None):
+        self._hub_user = self._login(email, password) if email is not None else None
 
     @staticmethod
-    def _login_to_hub(email, password):
+    def _login(email: str, password: Optional[str]):
         if not _FIREBASE_CONFIG.get("apiKey"):
             raise ValueError("Firebase API Key is missing in environment variables")
 

tests/client_test.py

@@ -13,7 +13,6 @@
     x402SettlementMode,
 )
 
-
 # --- Fixtures ---
 
 
@@ -71,7 +70,7 @@ def test_client_initialization_without_auth(self, mock_web3, mock_abi_files):
             private_key="0x" + "a" * 64,
             rpc_url="https://test.rpc.url",
             api_url="https://test.api.url",
-            contract_address="0x" + "b" * 40,
+            inference_contract_address="0x" + "b" * 40,
         )
 
         assert client.model_hub._hub_user is None
@@ -93,7 +92,7 @@ def test_client_initialization_with_auth(self, mock_web3, mock_abi_files):
                 private_key="0x" + "a" * 64,
                 rpc_url="https://test.rpc.url",
                 api_url="https://test.api.url",
-                contract_address="0x" + "b" * 40,
+                inference_contract_address="0x" + "b" * 40,
                 email="test@test.com",
                 password="test_password",
             )
@@ -109,8 +108,8 @@ def test_client_initialization_custom_llm_urls(self, mock_web3, mock_abi_files):
             private_key="0x" + "a" * 64,
             rpc_url="https://test.rpc.url",
             api_url="https://test.api.url",
-            contract_address="0x" + "b" * 40,
-            og_llm_server_url=custom_llm_url,
+            inference_contract_address="0x" + "b" * 40,
+            llm_server_url=custom_llm_url,
         )
 
         assert client.llm._tee_endpoint == custom_llm_url
@@ -137,7 +136,7 @@ def test_login_to_hub_success(self, mock_web3, mock_abi_files):
                 private_key="0x" + "a" * 64,
                 rpc_url="https://test.rpc.url",
                 api_url="https://test.api.url",
-                contract_address="0x" + "b" * 40,
+                inference_contract_address="0x" + "b" * 40,
                 email="user@test.com",
                 password="password123",
             )
@@ -160,7 +159,7 @@ def test_login_to_hub_failure(self, mock_web3, mock_abi_files):
                     private_key="0x" + "a" * 64,
                     rpc_url="https://test.rpc.url",
                     api_url="https://test.api.url",
-                    contract_address="0x" + "b" * 40,
+                    inference_contract_address="0x" + "b" * 40,
                     email="user@test.com",
                     password="wrong_password",
                 )

tests/llm_test.py

@@ -119,8 +119,8 @@ def _make_llm(
     """Build an LLM with an explicit server URL (skips registry lookup)."""
     wallet = MagicMock()
     wallet.address = "0x" + "ab" * 20
-    llm = LLM(wallet_account=wallet, og_llm_server_url=endpoint)
-    # og_llm_server_url path sets tee_id/payment_address to None; set them for assertions.
+    llm = LLM(wallet_account=wallet, llm_server_url=endpoint)
+    # llm_server_url path sets tee_id/payment_address to None; set them for assertions.
     llm._tee_id = "test-tee-id"
     llm._tee_payment_address = "0xTestPayment"
     return llm