opengradient 0.4.5__py3-none-any.whl → 0.4.6__py3-none-any.whl

opengradient/cli.py

@@ -375,7 +375,7 @@ def completion(ctx, model_cid: str, inference_mode: str, prompt: str, max_tokens
     client: Client = ctx.obj["client"]
     try:
         click.echo(f'Running LLM completion inference for model "{model_cid}"\n')
-        tx_hash, llm_output = client.llm_completion(
+        completion_output = client.llm_completion(
             model_cid=model_cid,
             inference_mode=LlmInferenceModes[inference_mode],
             prompt=prompt,
@@ -384,7 +384,7 @@ def completion(ctx, model_cid: str, inference_mode: str, prompt: str, max_tokens
             temperature=temperature,
         )
 
-        print_llm_completion_result(model_cid, tx_hash, llm_output)
+        print_llm_completion_result(model_cid, completion_output.transaction_hash, completion_output.completion_output)
     except Exception as e:
         click.echo(f"Error running LLM completion: {str(e)}")
 
@@ -517,7 +517,7 @@ def chat(
         if not tools and not tools_file:
             parsed_tools = None
 
-        tx_hash, finish_reason, llm_chat_output = client.llm_chat(
+        completion_output = client.llm_chat(
             model_cid=model_cid,
             inference_mode=LlmInferenceModes[inference_mode],
             messages=messages,
@@ -528,7 +528,7 @@ def chat(
             tool_choice=tool_choice,
         )
 
-        print_llm_chat_result(model_cid, tx_hash, finish_reason, llm_chat_output)
+        print_llm_chat_result(model_cid, completion_output.transaction_hash, completion_output.finish_reason, completion_output.chat_output)
     except Exception as e:
         click.echo(f"Error running LLM chat inference: {str(e)}")
 

opengradient/client.py

@@ -18,7 +18,7 @@ from web3.logs import DISCARD
 from . import utils
 from .exceptions import OpenGradientError
 from .proto import infer_pb2, infer_pb2_grpc
-from .types import LLM, TEE_LLM, HistoricalInputQuery, InferenceMode, LlmInferenceMode, ModelOutput, SchedulerParams
+from .types import LLM, TEE_LLM, HistoricalInputQuery, InferenceMode, LlmInferenceMode, ModelOutput, TextGenerationOutput, SchedulerParams
 from .defaults import DEFAULT_IMAGE_GEN_HOST, DEFAULT_IMAGE_GEN_PORT
 
 _FIREBASE_CONFIG = {
@@ -350,7 +350,7 @@ class Client:
         stop_sequence: Optional[List[str]] = None,
         temperature: float = 0.0,
         max_retries: Optional[int] = None,
-    ) -> Tuple[str, str]:
+    ) -> TextGenerationOutput:
         """
         Perform inference on an LLM model using completions.
 
@@ -363,7 +363,9 @@ class Client:
             temperature (float): Temperature for LLM inference, between 0 and 1. Default is 0.0.
 
         Returns:
-            Tuple[str, str]: The transaction hash and the LLM completion output.
+            TextGenerationOutput: Generated text results including:
+                - Transaction hash
+                - String of completion output
 
         Raises:
             OpenGradientError: If the inference fails.
@@ -418,7 +420,11 @@ class Client:
                 raise OpenGradientError("LLM completion result event not found in transaction logs")
 
             llm_answer = parsed_logs[0]["args"]["response"]["answer"]
-            return tx_hash.hex(), llm_answer
+            
+            return TextGenerationOutput(
+                transaction_hash=tx_hash.hex(),
+                completion_output=llm_answer
+            )
 
         return run_with_retry(execute_transaction, max_retries)
 
@@ -433,7 +439,7 @@ class Client:
         tools: Optional[List[Dict]] = [],
         tool_choice: Optional[str] = None,
         max_retries: Optional[int] = None,
-    ) -> Tuple[str, str]:
+    ) -> TextGenerationOutput:
         """
         Perform inference on an LLM model using chat.
 
@@ -485,7 +491,10 @@ class Client:
             tool_choice (str, optional): Sets a specific tool to choose. Default value is "auto".
 
         Returns:
-            Tuple[str, str, dict]: The transaction hash, finish reason, and a dictionary struct of LLM chat messages.
+            TextGenerationOutput: Generated text results including:
+                - Transaction hash
+                - Finish reason (tool_call, stop, etc.)
+                - Dictionary of chat message output (role, content, tool_call, etc.)
 
         Raises:
             OpenGradientError: If the inference fails.
@@ -570,7 +579,11 @@ class Client:
             if (tool_calls := message.get("tool_calls")) is not None:
                 message["tool_calls"] = [dict(tool_call) for tool_call in tool_calls]
 
-            return tx_hash.hex(), llm_result["finish_reason"], message
+            return TextGenerationOutput(
+                transaction_hash=tx_hash.hex(),
+                finish_reason=llm_result["finish_reason"],
+                chat_output=message,
+            )
 
         return run_with_retry(execute_transaction, max_retries)
 

opengradient/llm/og_langchain.py

@@ -91,7 +91,7 @@ class OpenGradientChatModel(BaseChatModel):
             else:
                 raise ValueError(f"Unexpected message type: {message}")
 
-        _, finish_reason, chat_response = self.client.llm_chat(
+        chat_output = self.client.llm_chat(
             model_cid=self.model_cid,
             messages=sdk_messages,
             stop_sequence=stop,
@@ -99,6 +99,8 @@ class OpenGradientChatModel(BaseChatModel):
             tools=self.tools,
             inference_mode=LlmInferenceMode.VANILLA,
         )
+        finish_reason = chat_output.finish_reason
+        chat_response = chat_output.chat_output
 
         if "tool_calls" in chat_response and chat_response["tool_calls"]:
             tool_calls = []

opengradient/llm/og_openai.py

@@ -26,7 +26,7 @@ class OGCompletions(object):
         # convert OpenAI message format so it's compatible with the SDK
         sdk_messages = OGCompletions.convert_to_abi_compatible(messages)
 
-        _, finish_reason, chat_completion = self.client.llm_chat(
+        chat_output = self.client.llm_chat(
             model_cid=model,
             messages=sdk_messages,
             max_tokens=200,
@@ -35,6 +35,8 @@ class OGCompletions(object):
             temperature=0.25,
             inference_mode=og.LlmInferenceMode.VANILLA,
         )
+        finish_reason = chat_output.finish_reason
+        chat_completion = chat_output.chat_output
 
         choice = {
             "index": 0,  # Add missing index field

opengradient/types.py

@@ -1,7 +1,7 @@
 import time
 from dataclasses import dataclass
 from enum import Enum, IntEnum
-from typing import Dict, List, Optional, Tuple, Union
+from typing import Dict, List, Optional, Tuple, Union, DefaultDict
 import numpy as np
 
 
@@ -98,6 +98,23 @@ class ModelOutput:
     jsons: Dict[str, np.ndarray]  # Converts to JSON dictionary
     is_simulation_result: bool
 
+@dataclass
+class TextGenerationOutput:
+    """
+    Output structure for text generation requests.
+    """
+    transaction_hash: str
+    """Blockchain hash for the transaction."""
+
+    finish_reason: str | None = ""
+    """Reason for completion (e.g., 'tool_call', 'stop', 'error'). Empty string if not applicable."""
+    
+    chat_output: Dict | None = DefaultDict
+    """Dictionary of chat response containing role, message content, tool call parameters, etc.. Empty dict if not applicable."""
+
+    completion_output: str | None = ""
+    """Raw text output from completion-style generation. Empty string if not applicable."""
+
 
 @dataclass
 class AbiFunction:

{opengradient-0.4.5.dist-info → opengradient-0.4.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: opengradient
-Version: 0.4.5
+Version: 0.4.6
 Summary: Python SDK for OpenGradient decentralized model management & inference services
 Author-email: OpenGradient <oliver@opengradient.ai>
 License: MIT License

{opengradient-0.4.5.dist-info → opengradient-0.4.6.dist-info}/RECORD

@@ -1,10 +1,10 @@
 opengradient/__init__.py,sha256=RMjHgZ_Ef_l2cjN5a-81XYYx0LtWGKNZCg90-1zl3k0,12893
 opengradient/account.py,sha256=5wrYpws_1lozjOFjLCTHtxgoxK-LmObDAaVy9eDcJY4,1145
-opengradient/cli.py,sha256=5PNwcVwmkJb8A8Apj_JjkG9vDDyNEq0j51omzzQWHIo,25237
-opengradient/client.py,sha256=tPqeRT5e5zwB2xF-57z3ZcsdMYEGHvlhdBQTKL4QPP4,41811
+opengradient/cli.py,sha256=D89ysgoWbsbQ_ZbG0cRCHWcSE1gSwwv_It6611oo1Uo,25324
+opengradient/client.py,sha256=r0Ev2VyqplXj0NSGtlecc4-UIw4NeMJ-w2DMC_2dR40,42281
 opengradient/defaults.py,sha256=_WzWawpJ5j2V7sbTYGA3L_gqdftslLLqlRPQ2LBsCHY,417
 opengradient/exceptions.py,sha256=88tfegboGtlehQcwhxsl6ZzhLJWZWlkf_bkHTiCtXpo,3391
-opengradient/types.py,sha256=OeQsS95p3FdSF6O04xX2pEvnyemHonyNs_QxevDAdS8,4268
+opengradient/types.py,sha256=rnGTXWfF88Jqc9n0TbeX2YlR9hHoPaPoL66SjkBW9KA,4909
 opengradient/utils.py,sha256=PIECAkk0lvj8TfBItugv01Hi_cJai09jGW34zhzsJ7E,8321
 opengradient/abi/ModelExecutorHistorical.abi,sha256=AEceI9y-VyeaAvHna6AaCH8XOgF8nzSLGEHWCr89Ddw,2625
 opengradient/abi/inference.abi,sha256=MR5u9npZ-Yx2EqRW17_M-UnGgFF3mMEMepOwaZ-Bkgc,7040
@@ -13,15 +13,15 @@ opengradient/alphasense/read_workflow_tool.py,sha256=p7lMFVgu4wZvvkjqlajBbLOhaUm
 opengradient/alphasense/run_model_tool.py,sha256=UamcotxZcKfSGhFFmRTz6VRMvQdrL96yI3dCfKYsgo4,4971
 opengradient/alphasense/types.py,sha256=uxk4JQKbaS2cM3ZiKpdHQb234OJ5ylprNR5vi01QFzA,220
 opengradient/llm/__init__.py,sha256=b_msjZstmTRD20LOaZbBxxigtnL7vxh7CziiyVlqpAo,1104
-opengradient/llm/og_langchain.py,sha256=F9gdrwqMFPjLUakUfSjc4Obx8qIvf7HIphe6eM3ObZo,4322
-opengradient/llm/og_openai.py,sha256=9MA3HDotjcJbbcGJ7DYZUA990QHQLdWpxAYhJSsTiz0,3708
+opengradient/llm/og_langchain.py,sha256=TEQu_8k1eyPI1DLq0FcLJyKHRJ-RrbPMscmAuWlPiHs,4400
+opengradient/llm/og_openai.py,sha256=EcAWlYFpVJFl1noWBQPhkyDvTdj549GESq-VxcqjJaQ,3786
 opengradient/proto/__init__.py,sha256=AhaSmrqV0TXGzCKaoPV8-XUvqs2fGAJBM2aOmDpkNbE,55
 opengradient/proto/infer.proto,sha256=13eaEMcppxkBF8yChptsX9HooWFwJKze7oLZNl-LEb8,1217
 opengradient/proto/infer_pb2.py,sha256=sGWDDVumYhXoCJTG9rLyvKu4XyaEjPE_b038kbNlj7w,3484
 opengradient/proto/infer_pb2_grpc.py,sha256=q42_eZ7OZCMTXdWocYA4Ka3B0c3B74dOhfqdaIOO5AU,6700
-opengradient-0.4.5.dist-info/LICENSE,sha256=xEcvQ3AxZOtDkrqkys2Mm6Y9diEnaSeQRKvxi-JGnNA,1069
-opengradient-0.4.5.dist-info/METADATA,sha256=yc7mqP1VaPx6IeBVJ4cSoGrepN_0cJz1XBhvF02UAmA,5832
-opengradient-0.4.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-opengradient-0.4.5.dist-info/entry_points.txt,sha256=yUKTaJx8RXnybkob0J62wVBiCp_1agVbgw9uzsmaeJc,54
-opengradient-0.4.5.dist-info/top_level.txt,sha256=oC1zimVLa2Yi1LQz8c7x-0IQm92milb5ax8gHBHwDqU,13
-opengradient-0.4.5.dist-info/RECORD,,
+opengradient-0.4.6.dist-info/LICENSE,sha256=xEcvQ3AxZOtDkrqkys2Mm6Y9diEnaSeQRKvxi-JGnNA,1069
+opengradient-0.4.6.dist-info/METADATA,sha256=YFtaUXOqLLf_LRpzBlpqbhHnkNfcbDG4_FQQG8JdocQ,5832
+opengradient-0.4.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+opengradient-0.4.6.dist-info/entry_points.txt,sha256=yUKTaJx8RXnybkob0J62wVBiCp_1agVbgw9uzsmaeJc,54
+opengradient-0.4.6.dist-info/top_level.txt,sha256=oC1zimVLa2Yi1LQz8c7x-0IQm92milb5ax8gHBHwDqU,13
+opengradient-0.4.6.dist-info/RECORD,,