opengradient 0.5.0a3__py3-none-any.whl → 0.5.2__py3-none-any.whl

opengradient/client.py

@@ -61,6 +61,9 @@ 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
@@ -456,9 +459,13 @@ class Client:
             OpenGradientError: If the inference fails.
         """
         # Check if this is a local model or external
-        if not local_model and not self._is_local_model(model_cid):
+        # TODO (Kyle): separate TEE and Vanilla completion requests
+        if inference_mode == LlmInferenceMode.TEE:
+            if model_cid not in TEE_LLM:
+                return OpenGradientError("That model CID is not supported yet for TEE inference")
+
             return self._external_llm_completion(
-                model=model_cid,
+                model=model_cid.split('/')[1],
                 prompt=prompt,
                 max_tokens=max_tokens,
                 stop_sequence=stop_sequence,
@@ -467,17 +474,21 @@ class Client:
         
         # Original local model logic
         def execute_transaction():
-            if inference_mode != LlmInferenceMode.VANILLA and inference_mode != LlmInferenceMode.TEE:
+            if inference_mode != LlmInferenceMode.VANILLA:
                 raise OpenGradientError("Invalid inference mode %s: Inference mode must be VANILLA or TEE" % inference_mode)
 
-            if inference_mode == LlmInferenceMode.TEE and model_cid not in [llm.value for llm in TEE_LLM]:
-                raise OpenGradientError("That model CID is not supported yet supported for TEE inference")
+            if model_cid not in [llm.value for llm in LLM]:
+                raise OpenGradientError("That model CID is not yet supported for inference")
+            
+            model_name = model_cid
+            if model_cid in [llm.value for llm in TEE_LLM]:
+                model_name = model_cid.split('/')[1]
 
             contract = self._blockchain.eth.contract(address=self._inference_hub_contract_address, abi=self._inference_abi)
 
             llm_request = {
                 "mode": inference_mode.value,
-                "modelCID": model_cid,
+                "modelCID": model_name,
                 "prompt": prompt,
                 "max_tokens": max_tokens,
                 "stop_sequence": stop_sequence or [],
@@ -525,7 +536,7 @@ class Client:
         api_key = self._get_api_key_for_model(model)
     
         if api_key:
-            print("External LLM completion using API key")
+            logging.debug("External LLM completions using API key")
             url = f"{self._llm_server_url}/v1/completions"
             
             headers = {
@@ -573,8 +584,7 @@ class Client:
             ) as client:
                 headers = {
                     "Content-Type": "application/json",
-                    # "Authorization": "Bearer special-key"
-                    "Authorization": "Bearer 0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"
+                    "Authorization": f"Bearer {X402_PLACEHOLDER_API_KEY}"
                 }
                 
                 payload = {
@@ -595,15 +605,11 @@ class Client:
                     result = json.loads(content.decode())
                     payment_hash = ""
 
-                    print("Payment response headers: ", response.headers)
-                    print("Payment response content: ", result)
-
-                    if "X-Payment-Response" in response.headers:
-                        payment_response = decode_x_payment_response(response.headers["X-Payment-Response"])
-                        payment_hash = payment_response["transaction"]
+                    if X402_PROCESSING_HASH_HEADER in response.headers:
+                        payment_hash = response.headers[X402_PROCESSING_HASH_HEADER]
                     
                     return TextGenerationOutput(
-                        transaction_hash="external",  # No blockchain transaction for external
+                        transaction_hash="external",
                         completion_output=result.get("completion"),
                         payment_hash=payment_hash
                     )
@@ -629,7 +635,7 @@ class Client:
 
     def llm_chat(
         self,
-        model_cid: str,  # Changed from LLM to str
+        model_cid: str,
         messages: List[Dict],
         inference_mode: LlmInferenceMode = LlmInferenceMode.VANILLA,
         max_tokens: int = 100,
@@ -662,9 +668,13 @@ class Client:
             OpenGradientError: If the inference fails.
         """
         # Check if this is a local model or external
-        if not local_model and not self._is_local_model(model_cid):
+        # TODO (Kyle): separate TEE and Vanilla completion requests
+        if inference_mode == LlmInferenceMode.TEE:
+            if model_cid not in TEE_LLM:
+                return OpenGradientError("That model CID is not supported yet for TEE inference")
+
             return self._external_llm_chat(
-                model=model_cid,
+                model=model_cid.split('/')[1],
                 messages=messages,
                 max_tokens=max_tokens,
                 stop_sequence=stop_sequence,
@@ -675,11 +685,15 @@ class Client:
         
         # Original local model logic
         def execute_transaction():
-            if inference_mode != LlmInferenceMode.VANILLA and inference_mode != LlmInferenceMode.TEE:
+            if inference_mode != LlmInferenceMode.VANILLA:
                 raise OpenGradientError("Invalid inference mode %s: Inference mode must be VANILLA or TEE" % inference_mode)
-
-            if inference_mode == LlmInferenceMode.TEE and model_cid not in TEE_LLM:
-                raise OpenGradientError("That model CID is not supported yet supported for TEE inference")
+            
+            if model_cid not in [llm.value for llm in LLM]:
+                raise OpenGradientError("That model CID is not yet supported for inference")
+            
+            model_name = model_cid
+            if model_cid in [llm.value for llm in TEE_LLM]:
+                model_name = model_cid.split('/')[1]
 
             contract = self._blockchain.eth.contract(address=self._inference_hub_contract_address, abi=self._inference_abi)
 
@@ -707,7 +721,7 @@ class Client:
 
             llm_request = {
                 "mode": inference_mode.value,
-                "modelCID": model_cid,
+                "modelCID": model_name,
                 "messages": messages,
                 "max_tokens": max_tokens,
                 "stop_sequence": stop_sequence or [],
@@ -768,7 +782,7 @@ class Client:
         api_key = self._get_api_key_for_model(model)
     
         if api_key:
-            print("External LLM completion using API key")
+            logging.debug("External LLM completion using API key")
             url = f"{self._llm_server_url}/v1/chat/completions"
             
             headers = {
@@ -821,7 +835,7 @@ class Client:
             ) as client:
                 headers = {
                     "Content-Type": "application/json",
-                    "Authorization": "Bearer special-key"
+                    "Authorization": f"Bearer {X402_PLACEHOLDER_API_KEY}"
                 }
                 
                 payload = {
@@ -846,16 +860,17 @@ class Client:
                     result = json.loads(content.decode())
 
                     payment_hash = ""
-                    print("Payment response headers: ", response.headers)
-                    print("Payment response content: ", result)
-                    if "X-Payment-Response" in response.headers:
-                        payment_response = decode_x_payment_response(response.headers["X-Payment-Response"])
-                        payment_hash = payment_response["transaction"]
+                    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=result["choices"][0].get("finish_reason"),
-                        chat_output=result["choices"][0].get("message"),
+                        finish_reason=choices[0].get("finish_reason"),
+                        chat_output=choices[0].get("message"),
                         payment_hash=payment_hash
                     )
                     

opengradient/types.py

@@ -193,18 +193,65 @@ class Abi:
 class LLM(str, Enum):
     """Enum for available LLM models"""
 
+    # Existing open-source OG hosted models
     META_LLAMA_3_8B_INSTRUCT = "meta-llama/Meta-Llama-3-8B-Instruct"
     LLAMA_3_2_3B_INSTRUCT = "meta-llama/Llama-3.2-3B-Instruct"
     QWEN_2_5_72B_INSTRUCT = "Qwen/Qwen2.5-72B-Instruct"
     META_LLAMA_3_1_70B_INSTRUCT = "meta-llama/Llama-3.1-70B-Instruct"
     DOBBY_UNHINGED_3_1_8B = "SentientAGI/Dobby-Mini-Unhinged-Llama-3.1-8B"
     DOBBY_LEASHED_3_1_8B = "SentientAGI/Dobby-Mini-Leashed-Llama-3.1-8B"
-
+    
+    # OpenAI models via TEE
+    GPT_4_1_2025_04_14 = "OpenAI/gpt-4.1-2025-04-14"
+    GPT_4O = "OpenAI/gpt-4o"
+    O4_MINI = "OpenAI/o4-mini"
+    
+    # Anthropic models via TEE
+    CLAUDE_3_7_SONNET = "Anthropic/claude-3.7-sonnet"
+    CLAUDE_3_5_HAIKU = "Anthropic/claude-3.5-haiku"
+    CLAUDE_4_0_SONNET = "Anthropic/claude-4.0-sonnet"
+    
+    # Google models via TEE
+    GEMINI_2_5_FLASH = "Google/gemini-2.5-flash"
+    GEMINI_2_5_PRO = "Google/gemini-2.5-pro"
+    GEMINI_2_0_FLASH = "Google/gemini-2.0-flash"
+    
+    # xAI Grok models via TEE
+    GROK_3_MINI_BETA = "xAI/grok-3-mini-beta"
+    GROK_3_BETA = "xAI/grok-3-beta"
+    GROK_2_1212 = "grok-2-1212"
+    GROK_2_VISION_LATEST = "xAI/grok-2-vision-latest"
+    GROK_4_1_FAST = "xAI/grok-4.1-fast"
+    GROK_4_1_FAST_NON_REASONING = "xAI/grok-4-1-fast-non-reasoning"
 
 class TEE_LLM(str, Enum):
     """Enum for LLM models available for TEE execution"""
-
-    META_LLAMA_3_1_70B_INSTRUCT = "meta-llama/Llama-3.1-70B-Instruct"
+    
+    # Existing (Currently turned off)
+    # META_LLAMA_3_1_70B_INSTRUCT = "meta-llama/Llama-3.1-70B-Instruct"
+    
+    # OpenAI models via TEE
+    GPT_4_1_2025_04_14 = "OpenAI/gpt-4.1-2025-04-14"
+    GPT_4O = "OpenAI/gpt-4o"
+    O4_MINI = "OpenAI/o4-mini"
+    
+    # Anthropic models via TEE
+    CLAUDE_3_7_SONNET = "Anthropic/claude-3.7-sonnet"
+    CLAUDE_3_5_HAIKU = "Anthropic/claude-3.5-haiku"
+    CLAUDE_4_0_SONNET = "Anthropic/claude-4.0-sonnet"
+    
+    # Google models via TEE
+    GEMINI_2_5_FLASH = "Google/gemini-2.5-flash"
+    GEMINI_2_5_PRO = "Google/gemini-2.5-pro"
+    GEMINI_2_0_FLASH = "Google/gemini-2.0-flash"
+    
+    # xAI Grok models via TEE
+    GROK_3_MINI_BETA = "xAI/grok-3-mini-beta"
+    GROK_3_BETA = "xAI/grok-3-beta"
+    GROK_2_1212 = "xAI/grok-2-1212"
+    GROK_2_VISION_LATEST = "xAI/grok-2-vision-latest"
+    GROK_4_1_FAST = "xAI/grok-4.1-fast"
+    GROK_4_1_FAST_NON_REASONING = "xAI/grok-4-1-fast-non-reasoning"
 
 
 @dataclass

{opengradient-0.5.0a3.dist-info → opengradient-0.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opengradient
-Version: 0.5.0a3
+Version: 0.5.2
 Summary: Python SDK for OpenGradient decentralized model management & inference services
 Author-email: OpenGradient <kyle@vannalabs.ai>
 License-Expression: MIT

{opengradient-0.5.0a3.dist-info → opengradient-0.5.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 opengradient/__init__.py,sha256=wVg0KTFNBl7RnZF9huR5-m_q1E7tO-YyQwY7AD9JFoc,12635
 opengradient/account.py,sha256=5wrYpws_1lozjOFjLCTHtxgoxK-LmObDAaVy9eDcJY4,1145
 opengradient/cli.py,sha256=QzjH_KS6TF8gm_L1otFWA-oHkJ5SSfizFoRn0xR0b70,29162
-opengradient/client.py,sha256=ksznhErnKgmMvlSl41CDAllAVxM34Aj-gQC_I32YMPM,62038
+opengradient/client.py,sha256=Seid3raffwAcrc3qVIINu259iO-BdaGXGT5O2VaT6ac,62356
 opengradient/defaults.py,sha256=w8-dr5ciF2TGnqbm_ib0Yz4U0YL5ikpNqkcPVpmXzP8,673
 opengradient/exceptions.py,sha256=88tfegboGtlehQcwhxsl6ZzhLJWZWlkf_bkHTiCtXpo,3391
-opengradient/types.py,sha256=b7vdrC7R4mZYNWOChFzhkBzTSBlMXZxQ13mztlITDbE,5799
+opengradient/types.py,sha256=ygnQXoGJPv9i3daS0oduUsmUNoPGx6Oozkt-Yy7Nn6s,7548
 opengradient/utils.py,sha256=ZUq4OBIml2vsC0tRqus4Zwb_e3g4woo00apByrafuVw,8058
 opengradient/abi/InferencePrecompile.abi,sha256=reepTHg6Q01UrFP0Gexc-JayplsvOLPfG7jrEZ-cV28,10197
 opengradient/abi/PriceHistoryInference.abi,sha256=ZB3fZdx1kaFlp2wt1vTbTZZG1k8HPvmNtkG5Q8Bnajw,5098
@@ -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.0a3.dist-info/licenses/LICENSE,sha256=xEcvQ3AxZOtDkrqkys2Mm6Y9diEnaSeQRKvxi-JGnNA,1069
-opengradient-0.5.0a3.dist-info/METADATA,sha256=FTiavPWahfWi8JRjeLw2_YEqtXjrHZEE_gcPke-Gs1k,3994
-opengradient-0.5.0a3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-opengradient-0.5.0a3.dist-info/entry_points.txt,sha256=yUKTaJx8RXnybkob0J62wVBiCp_1agVbgw9uzsmaeJc,54
-opengradient-0.5.0a3.dist-info/top_level.txt,sha256=oC1zimVLa2Yi1LQz8c7x-0IQm92milb5ax8gHBHwDqU,13
-opengradient-0.5.0a3.dist-info/RECORD,,
+opengradient-0.5.2.dist-info/licenses/LICENSE,sha256=xEcvQ3AxZOtDkrqkys2Mm6Y9diEnaSeQRKvxi-JGnNA,1069
+opengradient-0.5.2.dist-info/METADATA,sha256=vKpBpoNs4RhhXcz275SIoYrIpL550Z7ykk_9zS0-CdA,3992
+opengradient-0.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+opengradient-0.5.2.dist-info/entry_points.txt,sha256=yUKTaJx8RXnybkob0J62wVBiCp_1agVbgw9uzsmaeJc,54
+opengradient-0.5.2.dist-info/top_level.txt,sha256=oC1zimVLa2Yi1LQz8c7x-0IQm92milb5ax8gHBHwDqU,13
+opengradient-0.5.2.dist-info/RECORD,,