opengradient 0.5.0__py3-none-any.whl → 0.5.0a1__py3-none-any.whl

opengradient/__init__.py

@@ -34,7 +34,6 @@ def new_client(
     rpc_url=DEFAULT_RPC_URL,
     api_url=DEFAULT_API_URL,
     contract_address=DEFAULT_INFERENCE_CONTRACT_ADDRESS,
-    **kwargs,
 ) -> Client:
     """
     Creates a unique OpenGradient client instance with the given authentication and network settings.
@@ -47,7 +46,7 @@ def new_client(
         contract_address: Optional inference contract address
     """
 
-    return Client(email=email, password=password, private_key=private_key, rpc_url=rpc_url, api_url=api_url, contract_address=contract_address, **kwargs)
+    return Client(email=email, password=password, private_key=private_key, rpc_url=rpc_url, api_url=api_url, contract_address=contract_address)
 
 
 def init(email: str, password: str, private_key: str, rpc_url=DEFAULT_RPC_URL, api_url=DEFAULT_API_URL, contract_address=DEFAULT_INFERENCE_CONTRACT_ADDRESS):

opengradient/client.py

@@ -14,9 +14,6 @@ from web3 import Web3
 from web3.exceptions import ContractLogicError
 from web3.logs import DISCARD
 import urllib.parse
-import asyncio
-from x402.clients.httpx import x402HttpxClient
-from x402.clients.base import decode_x_payment_response, x402Client
 
 from .exceptions import OpenGradientError
 from .proto import infer_pb2, infer_pb2_grpc
@@ -33,12 +30,7 @@ from .types import (
     ModelRepository,
     FileUploadResult,
 )
-from .defaults import (
-    DEFAULT_IMAGE_GEN_HOST, 
-    DEFAULT_IMAGE_GEN_PORT, 
-    DEFAULT_SCHEDULER_ADDRESS,
-    DEFAULT_LLM_SERVER_URL, 
-    DEFAULT_OPENGRADIENT_LLM_SERVER_URL)
+from .defaults import DEFAULT_IMAGE_GEN_HOST, DEFAULT_IMAGE_GEN_PORT, DEFAULT_SCHEDULER_ADDRESS, DEFAULT_LLM_SERVER_URL
 from .utils import convert_array_to_model_output, convert_to_model_input, convert_to_model_output
 
 _FIREBASE_CONFIG = {
@@ -61,9 +53,6 @@ DEFAULT_RETRY_DELAY_SEC = 1
 
 PRECOMPILE_CONTRACT_ADDRESS = "0x00000000000000000000000000000000000000F4"
 
-X402_PROCESSING_HASH_HEADER = "x-processing-hash"
-X402_PLACEHOLDER_API_KEY = "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"
-
 class Client:
     _inference_hub_contract_address: str
     _blockchain: Web3
@@ -84,7 +73,6 @@ class Client:
         email: Optional[str] = None, 
         password: Optional[str] = None, 
         llm_server_url: Optional[str] = DEFAULT_LLM_SERVER_URL,
-        og_llm_server_url: Optional[str] = DEFAULT_OPENGRADIENT_LLM_SERVER_URL,
         openai_api_key: Optional[str] = None,
         anthropic_api_key: Optional[str] = None,
         google_api_key: Optional[str] = None,
@@ -118,7 +106,6 @@ class Client:
             self._hub_user = None
 
         self._llm_server_url = llm_server_url
-        self._og_llm_server_url = og_llm_server_url
         
         self._external_api_keys = {}
         if openai_api_key or os.getenv("OPENAI_API_KEY"):
@@ -417,15 +404,6 @@ class Client:
 
         return run_with_retry(execute_transaction, max_retries)
 
-    def _og_payment_selector(self, accepts, network_filter=None, scheme_filter=None, max_value=None):
-        """Custom payment selector for OpenGradient network (og-devnet)."""
-        return x402Client.default_payment_requirements_selector(
-            accepts,
-            network_filter="og-devnet",
-            scheme_filter=scheme_filter,
-            max_value=max_value,
-        )
-
     def llm_completion(
         self,
         model_cid: str,  # Changed from LLM to str to accept any model
@@ -510,7 +488,7 @@ class Client:
         temperature: float = 0.0,
     ) -> TextGenerationOutput:
         """
-        Route completion request to external LLM server with x402 payments.
+        Route completion request to external LLM server.
         
         Args:
             model: Model identifier
@@ -525,96 +503,35 @@ class Client:
         Raises:
             OpenGradientError: If request fails
         """
+        url = f"{self._llm_server_url}/v1/completions"
+        
+        headers = {"Content-Type": "application/json"}
         api_key = self._get_api_key_for_model(model)
-    
         if api_key:
-            logging.debug("External LLM completions using API key")
-            url = f"{self._llm_server_url}/v1/completions"
-            
-            headers = {
-                "Content-Type": "application/json",
-                "Authorization": f"Bearer {api_key}"
-            }
+            headers["Authorization"] = f"Bearer {api_key}"
+        
+        payload = {
+            "model": model,
+            "prompt": prompt,
+            "max_tokens": max_tokens,
+            "temperature": temperature,
+        }
+        
+        if stop_sequence:
+            payload["stop"] = stop_sequence
+        
+        try:
+            response = requests.post(url, json=payload, headers=headers, timeout=60)
+            response.raise_for_status()
             
-            payload = {
-                "model": model,
-                "prompt": prompt,
-                "max_tokens": max_tokens,
-                "temperature": temperature,
-            }
+            result = response.json()
             
-            if stop_sequence:
-                payload["stop"] = stop_sequence
+            return TextGenerationOutput(
+                transaction_hash="external",  # No blockchain transaction for external
+                completion_output=result["completion"]
+            )
             
-            try:
-                response = requests.post(url, json=payload, headers=headers, timeout=60)
-                response.raise_for_status()
-                
-                result = response.json()
-                
-                return TextGenerationOutput(
-                    transaction_hash="external",
-                    completion_output=result.get("completion")
-                )
-                
-            except requests.RequestException as e:
-                error_msg = f"External LLM completion failed: {str(e)}"
-                if hasattr(e, 'response') and e.response is not None:
-                    try:
-                        error_detail = e.response.json()
-                        error_msg += f" - {error_detail}"
-                    except:
-                        error_msg += f" - {e.response.text}"
-                logging.error(error_msg)
-                raise OpenGradientError(error_msg)
-
-        async def make_request():
-            async with x402HttpxClient(
-                account=self._wallet_account,
-                base_url=self._og_llm_server_url,
-                payment_requirements_selector=self._og_payment_selector,
-            ) as client:
-                headers = {
-                    "Content-Type": "application/json",
-                    "Authorization": f"Bearer {X402_PLACEHOLDER_API_KEY}"
-                }
-                
-                payload = {
-                    "model": model,
-                    "prompt": prompt,
-                    "max_tokens": max_tokens,
-                    "temperature": temperature,
-                }
-                
-                if stop_sequence:
-                    payload["stop"] = stop_sequence
-                
-                try:
-                    response = await client.post("/v1/completions", json=payload, headers=headers, timeout=60)
-                    
-                    # Read the response content
-                    content = await response.aread()
-                    result = json.loads(content.decode())
-                    payment_hash = ""
-
-                    if X402_PROCESSING_HASH_HEADER in response.headers:
-                        payment_hash = response.headers[X402_PROCESSING_HASH_HEADER]
-                    
-                    return TextGenerationOutput(
-                        transaction_hash="external",
-                        completion_output=result.get("completion"),
-                        payment_hash=payment_hash
-                    )
-                    
-                except Exception as e:
-                    error_msg = f"External LLM completion request failed: {str(e)}"
-                    logging.error(error_msg)
-                    raise OpenGradientError(error_msg)
-        
-        try:
-            # Run the async function in a sync context
-            return asyncio.run(make_request())
-        except Exception as e:
+        except requests.RequestException as e:
             error_msg = f"External LLM completion failed: {str(e)}"
             if hasattr(e, 'response') and e.response is not None:
                 try:
@@ -746,7 +663,7 @@ class Client:
         tool_choice: Optional[str] = None,
     ) -> TextGenerationOutput:
         """
-        Route chat request to external LLM server with x402 payments.
+        Route chat request to external LLM server.
         
         Args:
             model: Model identifier
@@ -763,110 +680,40 @@ class Client:
         Raises:
             OpenGradientError: If request fails
         """
+        url = f"{self._llm_server_url}/v1/chat/completions"
+        
+        headers = {"Content-Type": "application/json"}
         api_key = self._get_api_key_for_model(model)
-    
         if api_key:
-            logging.debug("External LLM completion using API key")
-            url = f"{self._llm_server_url}/v1/chat/completions"
-            
-            headers = {
-                "Content-Type": "application/json",
-                "Authorization": f"Bearer {api_key}"
-            }
-            
-            payload = {
-                "model": model,
-                "messages": messages,
-                "max_tokens": max_tokens,
-                "temperature": temperature,
-            }
+            headers["Authorization"] = f"Bearer {api_key}"
+        
+        payload = {
+            "model": model,
+            "messages": messages,
+            "max_tokens": max_tokens,
+            "temperature": temperature,
+        }
+        
+        if stop_sequence:
+            payload["stop"] = stop_sequence
+        
+        if tools:
+            payload["tools"] = tools
+            payload["tool_choice"] = tool_choice or "auto"
+        
+        try:
+            response = requests.post(url, json=payload, headers=headers, timeout=60)
+            response.raise_for_status()
             
-            if stop_sequence:
-                payload["stop"] = stop_sequence
+            result = response.json()
             
-            if tools:
-                payload["tools"] = tools
-                payload["tool_choice"] = tool_choice or "auto"
+            return TextGenerationOutput(
+                transaction_hash="external",  # No blockchain transaction for external
+                finish_reason=result["finish_reason"],
+                chat_output=result["message"]
+            )
             
-            try:
-                response = requests.post(url, json=payload, headers=headers, timeout=60)
-                response.raise_for_status()
-                
-                result = response.json()
-                
-                return TextGenerationOutput(
-                    transaction_hash="external",
-                    finish_reason=result.get("finish_reason"),
-                    chat_output=result.get("message")
-                )
-                
-            except requests.RequestException as e:
-                error_msg = f"External LLM chat failed: {str(e)}"
-                if hasattr(e, 'response') and e.response is not None:
-                    try:
-                        error_detail = e.response.json()
-                        error_msg += f" - {error_detail}"
-                    except:
-                        error_msg += f" - {e.response.text}"
-                logging.error(error_msg)
-                raise OpenGradientError(error_msg)
-
-        async def make_request():
-            async with x402HttpxClient(
-                account=self._wallet_account,
-                base_url=self._og_llm_server_url,
-                payment_requirements_selector=self._og_payment_selector,
-            ) as client:
-                headers = {
-                    "Content-Type": "application/json",
-                    "Authorization": f"Bearer {X402_PLACEHOLDER_API_KEY}"
-                }
-                
-                payload = {
-                    "model": model,
-                    "messages": messages,
-                    "max_tokens": max_tokens,
-                    "temperature": temperature,
-                }
-                
-                if stop_sequence:
-                    payload["stop"] = stop_sequence
-                
-                if tools:
-                    payload["tools"] = tools
-                    payload["tool_choice"] = tool_choice or "auto"
-                
-                try:
-                    response = await client.post("/v1/chat/completions", json=payload, headers=headers, timeout=60)
-                    
-                    # Read the response content
-                    content = await response.aread()
-                    result = json.loads(content.decode())
-
-                    payment_hash = ""
-                    if X402_PROCESSING_HASH_HEADER in response.headers:
-                        payment_hash = response.headers[X402_PROCESSING_HASH_HEADER]
-                    
-                    choices = result.get("choices")
-                    if not choices:
-                        raise OpenGradientError(f"Invalid response: 'choices' missing or empty in {result}")
-                    
-                    return TextGenerationOutput(
-                        transaction_hash="external",
-                        finish_reason=choices[0].get("finish_reason"),
-                        chat_output=choices[0].get("message"),
-                        payment_hash=payment_hash
-                    )
-                    
-                except Exception as e:
-                    error_msg = f"External LLM chat request failed: {str(e)}"
-                    logging.error(error_msg)
-                    raise OpenGradientError(error_msg)
-        
-        try:
-            # Run the async function in a sync context
-            return asyncio.run(make_request())
-        except Exception as e:
+        except requests.RequestException as e:
             error_msg = f"External LLM chat failed: {str(e)}"
             if hasattr(e, 'response') and e.response is not None:
                 try:

opengradient/defaults.py

@@ -8,5 +8,4 @@ DEFAULT_SCHEDULER_ADDRESS = "0x7179724De4e7FF9271FA40C0337c7f90C0508eF6"
 DEFAULT_BLOCKCHAIN_EXPLORER = "https://explorer.opengradient.ai/tx/"
 DEFAULT_IMAGE_GEN_HOST = "18.217.25.69"
 DEFAULT_IMAGE_GEN_PORT = 5125
-DEFAULT_LLM_SERVER_URL = "http://35.225.197.84:8000"
-DEFAULT_OPENGRADIENT_LLM_SERVER_URL = "https://llm.opengradient.ai"
+DEFAULT_LLM_SERVER_URL = "http://35.225.197.84:8000"

opengradient/llm/og_langchain.py

@@ -3,15 +3,13 @@ from typing import Any, Dict, List, Optional, Sequence, Union, Callable
 from typing_extensions import override
 
 from langchain.chat_models.base import BaseChatModel
-from langchain_core.messages import (
+from langchain.schema import (
     AIMessage,
     BaseMessage,
-    HumanMessage,
-    SystemMessage,
-)
-from langchain_core.outputs import (
     ChatGeneration,
     ChatResult,
+    HumanMessage,
+    SystemMessage,
 )
 from langchain_core.callbacks.manager import CallbackManagerForLLMRun
 from langchain_core.messages import ToolCall

opengradient/types.py

@@ -151,9 +151,6 @@ class TextGenerationOutput:
     completion_output: Optional[str] = None
     """Raw text output from completion-style generation. Empty string if not applicable."""
 
-    payment_hash: Optional[str] = None
-    """Payment hash for x402 transaction"""
-
 
 @dataclass
 class AbiFunction:

{opengradient-0.5.0.dist-info → opengradient-0.5.0a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opengradient
-Version: 0.5.0
+Version: 0.5.0a1
 Summary: Python SDK for OpenGradient decentralized model management & inference services
 Author-email: OpenGradient <kyle@vannalabs.ai>
 License-Expression: MIT
@@ -23,7 +23,6 @@ Requires-Dist: requests>=2.32.3
 Requires-Dist: langchain>=0.3.7
 Requires-Dist: openai>=1.58.1
 Requires-Dist: pydantic>=2.9.2
-Requires-Dist: og-test-x402==0.0.1
 Dynamic: license-file
 
 # OpenGradient Python SDK

{opengradient-0.5.0.dist-info → opengradient-0.5.0a1.dist-info}/RECORD

@@ -1,10 +1,10 @@
-opengradient/__init__.py,sha256=wVg0KTFNBl7RnZF9huR5-m_q1E7tO-YyQwY7AD9JFoc,12635
+opengradient/__init__.py,sha256=hFvN9sCEIQGWjT4Qnel6oQjadgAhDXMti72tdrP3sIo,12611
 opengradient/account.py,sha256=5wrYpws_1lozjOFjLCTHtxgoxK-LmObDAaVy9eDcJY4,1145
 opengradient/cli.py,sha256=QzjH_KS6TF8gm_L1otFWA-oHkJ5SSfizFoRn0xR0b70,29162
-opengradient/client.py,sha256=0SykYpfDqfbef1Y1ThvmZnWM9ezUy8egLltWZTeSXa8,61822
-opengradient/defaults.py,sha256=w8-dr5ciF2TGnqbm_ib0Yz4U0YL5ikpNqkcPVpmXzP8,673
+opengradient/client.py,sha256=mcI4xC8XnOFQdROexSJojvTlEu6HiWzVJVquOOXcDms,55278
+opengradient/defaults.py,sha256=TuaFLZ-sb9v0YOE9oKmPUCYHuXG7FbUZXxdGUIaaZ4w,605
 opengradient/exceptions.py,sha256=88tfegboGtlehQcwhxsl6ZzhLJWZWlkf_bkHTiCtXpo,3391
-opengradient/types.py,sha256=b7vdrC7R4mZYNWOChFzhkBzTSBlMXZxQ13mztlITDbE,5799
+opengradient/types.py,sha256=JH8hjpcq4H7gQki74cuJpH4PcyQpwivLiqn9iq0evrI,5715
 opengradient/utils.py,sha256=ZUq4OBIml2vsC0tRqus4Zwb_e3g4woo00apByrafuVw,8058
 opengradient/abi/InferencePrecompile.abi,sha256=reepTHg6Q01UrFP0Gexc-JayplsvOLPfG7jrEZ-cV28,10197
 opengradient/abi/PriceHistoryInference.abi,sha256=ZB3fZdx1kaFlp2wt1vTbTZZG1k8HPvmNtkG5Q8Bnajw,5098
@@ -16,7 +16,7 @@ opengradient/alphasense/run_model_tool.py,sha256=wlDqXVHa1xpqQy_hmht_wWegxtqdYgY
 opengradient/alphasense/types.py,sha256=uxk4JQKbaS2cM3ZiKpdHQb234OJ5ylprNR5vi01QFzA,220
 opengradient/bin/PriceHistoryInference.bin,sha256=nU2FZpGHIKBZ7NSK9Sr-p9lr-nXja_40ISPN9yckDq8,41276
 opengradient/llm/__init__.py,sha256=eYFBrOf1GZr0VGbIw-gSFr8hM3Rbw74ye8l-pnBPNuA,1104
-opengradient/llm/og_langchain.py,sha256=inJmu28aWA1RAWJx8G0h8w4FGXSKMCzJVOBGUwiKqnI,4904
+opengradient/llm/og_langchain.py,sha256=8qWYvF0Wr9BheTn8ErbCJKXnCRwYrzEI5pf9DnDjNIM,4858
 opengradient/llm/og_openai.py,sha256=26W_NDnLaICIaWbi9aou40v5ZJXLlmLdztDrdFoDGAU,3789
 opengradient/proto/__init__.py,sha256=AhaSmrqV0TXGzCKaoPV8-XUvqs2fGAJBM2aOmDpkNbE,55
 opengradient/proto/infer.proto,sha256=13eaEMcppxkBF8yChptsX9HooWFwJKze7oLZNl-LEb8,1217
@@ -27,9 +27,9 @@ opengradient/workflow_models/constants.py,sha256=viIkb_LGcfVprqQNaA80gBTj6cfYam0
 opengradient/workflow_models/types.py,sha256=Z22hF6c8Y4D2GlzVEIBODGwsqSjSrQvUcpZ7R-mIJdI,409
 opengradient/workflow_models/utils.py,sha256=ySfpuiOBqLTlfto6ZxZf2vc7K6RGIja0l4eaVm5AOzY,1503
 opengradient/workflow_models/workflow_models.py,sha256=d4C_gs39DAfy4cdY9Ee6GMXpPfzwvKFpmxzK1A7LNgU,3900
-opengradient-0.5.0.dist-info/licenses/LICENSE,sha256=xEcvQ3AxZOtDkrqkys2Mm6Y9diEnaSeQRKvxi-JGnNA,1069
-opengradient-0.5.0.dist-info/METADATA,sha256=yMPCfWUMK3yEsvPeHmhcnr6BKma6_tHZIXDXnVg6H88,3992
-opengradient-0.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-opengradient-0.5.0.dist-info/entry_points.txt,sha256=yUKTaJx8RXnybkob0J62wVBiCp_1agVbgw9uzsmaeJc,54
-opengradient-0.5.0.dist-info/top_level.txt,sha256=oC1zimVLa2Yi1LQz8c7x-0IQm92milb5ax8gHBHwDqU,13
-opengradient-0.5.0.dist-info/RECORD,,
+opengradient-0.5.0a1.dist-info/licenses/LICENSE,sha256=xEcvQ3AxZOtDkrqkys2Mm6Y9diEnaSeQRKvxi-JGnNA,1069
+opengradient-0.5.0a1.dist-info/METADATA,sha256=EnQ7ZzcjIeci9WUgxbtCCmHxR7VyAKfLG44kr3BHTsw,3959
+opengradient-0.5.0a1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+opengradient-0.5.0a1.dist-info/entry_points.txt,sha256=yUKTaJx8RXnybkob0J62wVBiCp_1agVbgw9uzsmaeJc,54
+opengradient-0.5.0a1.dist-info/top_level.txt,sha256=oC1zimVLa2Yi1LQz8c7x-0IQm92milb5ax8gHBHwDqU,13
+opengradient-0.5.0a1.dist-info/RECORD,,