opengradient 0.3.12__tar.gz → 0.3.14__tar.gz

opengradient-0.3.14/.gitignore

@@ -0,0 +1,162 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
+.pdm.toml
+.pdm-python
+.pdm-build/
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/

{opengradient-0.3.12/src/opengradient.egg-info → opengradient-0.3.14}/PKG-INFO

@@ -1,7 +1,8 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: opengradient
-Version: 0.3.12
+Version: 0.3.14
 Summary: Python SDK for OpenGradient decentralized model management & inference services
+Project-URL: Homepage, https://opengradient.ai
 Author-email: OpenGradient <oliver@opengradient.ai>
 License: MIT License
         
@@ -24,8 +25,6 @@ License: MIT License
         LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
         SOFTWARE.
-        
-Project-URL: Homepage, https://opengradient.ai
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -33,15 +32,13 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
-Description-Content-Type: text/markdown
-License-File: LICENSE
 Requires-Dist: aiohappyeyeballs==2.4.3
 Requires-Dist: aiohttp==3.10.8
 Requires-Dist: aiosignal==1.3.1
 Requires-Dist: annotated-types==0.7.0
 Requires-Dist: attrs==24.2.0
 Requires-Dist: bitarray==2.9.2
-Requires-Dist: CacheControl==0.14.0
+Requires-Dist: cachecontrol==0.14.0
 Requires-Dist: cachetools==5.5.0
 Requires-Dist: certifi==2024.8.30
 Requires-Dist: cffi==1.17.1
@@ -55,6 +52,7 @@ Requires-Dist: cryptography==43.0.1
 Requires-Dist: cytoolz==0.12.3
 Requires-Dist: distlib==0.3.8
 Requires-Dist: dulwich==0.21.7
+Requires-Dist: eth-abi==5.1.0
 Requires-Dist: eth-account==0.13.4
 Requires-Dist: eth-hash==0.7.0
 Requires-Dist: eth-keyfile==0.8.1
@@ -62,7 +60,6 @@ Requires-Dist: eth-keys==0.5.1
 Requires-Dist: eth-rlp==2.1.0
 Requires-Dist: eth-typing==5.0.0
 Requires-Dist: eth-utils==5.0.0
-Requires-Dist: eth_abi==5.1.0
 Requires-Dist: fastjsonschema==2.20.0
 Requires-Dist: fastparquet==2024.5.0
 Requires-Dist: filelock==3.16.1
@@ -77,11 +74,11 @@ Requires-Dist: google-cloud-storage==2.18.2
 Requires-Dist: google-crc32c==1.6.0
 Requires-Dist: google-resumable-media==2.7.2
 Requires-Dist: googleapis-common-protos==1.65.0
+Requires-Dist: grpcio-tools==1.66.2
 Requires-Dist: grpcio==1.66.2
-Requires-Dist: grpcio-status==1.66.2
 Requires-Dist: hexbytes==1.2.1
 Requires-Dist: idna==3.10
-Requires-Dist: jaraco.classes==3.4.0
+Requires-Dist: jaraco-classes==3.4.0
 Requires-Dist: jwcrypto==1.5.6
 Requires-Dist: keyring==24.3.1
 Requires-Dist: langchain==0.3.7
@@ -98,23 +95,24 @@ Requires-Dist: pkginfo==1.11.1
 Requires-Dist: platformdirs==4.3.6
 Requires-Dist: proto-plus==1.24.0
 Requires-Dist: protobuf==5.28.2
+Requires-Dist: protobuf>=4.24.0
 Requires-Dist: ptyprocess==0.7.0
 Requires-Dist: pyarrow==17.0.0
+Requires-Dist: pyasn1-modules==0.4.1
 Requires-Dist: pyasn1==0.6.1
-Requires-Dist: pyasn1_modules==0.4.1
 Requires-Dist: pycparser==2.22
 Requires-Dist: pycryptodome==3.21.0
+Requires-Dist: pydantic-core==2.23.4
 Requires-Dist: pydantic==2.9.2
-Requires-Dist: pydantic_core==2.23.4
-Requires-Dist: pyproject_hooks==1.2.0
+Requires-Dist: pyproject-hooks==1.2.0
 Requires-Dist: python-dateutil==2.9.0.post0
 Requires-Dist: python-jwt==4.1.0
 Requires-Dist: pytz==2024.2
 Requires-Dist: pyunormalize==16.0.0
-Requires-Dist: RapidFuzz==3.10.0
+Requires-Dist: rapidfuzz==3.10.0
 Requires-Dist: regex==2024.9.11
-Requires-Dist: requests==2.32.3
 Requires-Dist: requests-toolbelt==1.0.0
+Requires-Dist: requests==2.32.3
 Requires-Dist: rlp==4.0.1
 Requires-Dist: rsa==4.9
 Requires-Dist: shellingham==1.5.4
@@ -123,13 +121,14 @@ Requires-Dist: tomlkit==0.13.2
 Requires-Dist: toolz==0.12.1
 Requires-Dist: trove-classifiers==2024.9.12
 Requires-Dist: types-requests==2.32.0.20240914
-Requires-Dist: typing_extensions==4.12.2
+Requires-Dist: typing-extensions==4.12.2
 Requires-Dist: tzdata==2024.2
 Requires-Dist: urllib3==2.2.3
 Requires-Dist: web3==7.3.0
 Requires-Dist: websockets==13.1
 Requires-Dist: xattr==1.1.0
 Requires-Dist: yarl==1.13.1
+Description-Content-Type: text/markdown
 
 # OpenGradient Python SDK
 Python SDK for the OpenGradient platform provides decentralized model management & inference services. Python SDK allows programmatic access to our model repository and decentralized AI infrastructure. 
@@ -228,4 +227,4 @@ opengradient infer QmbUqS93oc4JTLMHwpVxsE39mhNxy6hpf6Py3r9oANr8aZ VANILLA --inpu
 opengradient llm --model "meta-llama/Meta-Llama-3-8B-Instruct" --prompt "Translate to French: Hello, how are you?" --max-tokens 50 --temperature 0.7
 ```
 
-For more information read the OpenGradient [documentation](https://docs.opengradient.ai/).
+For more information read the OpenGradient [documentation](https://docs.opengradient.ai/).

{opengradient-0.3.12 → opengradient-0.3.14}/pyproject.toml

@@ -1,10 +1,10 @@
 [build-system]
-requires = ["setuptools>=61.0", "wheel"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
 [project]
 name = "opengradient"
-version = "0.3.12"
+version = "0.3.14"
 description = "Python SDK for OpenGradient decentralized model management & inference services"
 authors = [{name = "OpenGradient", email = "oliver@opengradient.ai"}]
 license = {file = "LICENSE"}
@@ -62,7 +62,8 @@ dependencies = [
     "google-resumable-media==2.7.2",
     "googleapis-common-protos==1.65.0",
     "grpcio==1.66.2",
-    "grpcio-status==1.66.2",
+    "grpcio-tools==1.66.2",
+    "protobuf>=4.24.0",
     "hexbytes==1.2.1",
     "idna==3.10",
     "jaraco.classes==3.4.0",
@@ -145,3 +146,13 @@ ignore = []
 
 [tool.ruff.mccabe]
 max-complexity = 10
+
+[tool.hatch.build]
+include = [
+    "src/opengradient/**/*.py",
+    "src/opengradient/proto/*.proto",
+    "src/opengradient/abi/*.abi"
+]
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/opengradient"]

{opengradient-0.3.12 → opengradient-0.3.14}/src/opengradient/__init__.py

@@ -5,7 +5,7 @@ from .defaults import DEFAULT_INFERENCE_CONTRACT_ADDRESS, DEFAULT_RPC_URL
 from .types import InferenceMode, LLM
 from . import llm
 
-__version__ = "0.3.12"
+__version__ = "0.3.14"
 
 _client = None
 
@@ -74,3 +74,24 @@ def list_files(model_name: str, version: str) -> List[Dict]:
     if _client is None:
         raise RuntimeError("OpenGradient client not initialized. Call og.init() first.")
     return _client.list_files(model_name, version)
+
+def generate_image(model: str, prompt: str, height: Optional[int] = None, width: Optional[int] = None) -> bytes:
+    """
+    Generate an image using the specified model and prompt.
+
+    Args:
+        model (str): The model identifier (e.g. "stabilityai/stable-diffusion-xl-base-1.0")
+        prompt (str): The text prompt to generate the image from
+        height (Optional[int]): Height of the generated image. Default is None.
+        width (Optional[int]): Width of the generated image. Default is None.
+
+    Returns:
+        bytes: The raw image data bytes
+
+    Raises:
+        RuntimeError: If the client is not initialized
+        OpenGradientError: If the image generation fails
+    """
+    if _client is None:
+        raise RuntimeError("OpenGradient client not initialized. Call og.init() first.")
+    return _client.generate_image(model, prompt, height=height, width=width)

opengradient-0.3.14/src/opengradient/abi/inference.abi

@@ -0,0 +1 @@
+[{"anonymous":false,"inputs":[{"components":[{"components":[{"internalType":"string","name":"name","type":"string"},{"components":[{"internalType":"int128","name":"value","type":"int128"},{"internalType":"int128","name":"decimals","type":"int128"}],"internalType":"struct TensorLib.Number[]","name":"values","type":"tuple[]"},{"internalType":"uint32[]","name":"shape","type":"uint32[]"}],"internalType":"struct TensorLib.MultiDimensionalNumberTensor[]","name":"numbers","type":"tuple[]"},{"components":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string[]","name":"values","type":"string[]"}],"internalType":"struct TensorLib.StringTensor[]","name":"strings","type":"tuple[]"},{"components":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"value","type":"string"}],"internalType":"struct TensorLib.JsonScalar[]","name":"jsons","type":"tuple[]"},{"internalType":"bool","name":"is_simulation_result","type":"bool"}],"indexed":false,"internalType":"struct ModelOutput","name":"output","type":"tuple"}],"name":"InferenceResult","type":"event"},{"anonymous":false,"inputs":[{"components":[{"internalType":"string","name":"finish_reason","type":"string"},{"components":[{"internalType":"string","name":"role","type":"string"},{"internalType":"string","name":"content","type":"string"},{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"tool_call_id","type":"string"},{"components":[{"internalType":"string","name":"id","type":"string"},{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"arguments","type":"string"}],"internalType":"struct ToolCall[]","name":"tool_calls","type":"tuple[]"}],"internalType":"struct ChatMessage","name":"message","type":"tuple"}],"indexed":false,"internalType":"struct LLMChatResponse","name":"response","type":"tuple"}],"name":"LLMChatResult","type":"event"},{"anonymous":false,"inputs":[{"components":[{"internalType":"string","name":"answer","type":"string"}],"indexed":false,"internalType":"struct LLMCompletionResponse","name":"response","type":"tuple"}],"name":"LLMCompletionResult","type":"event"},{"inputs":[{"internalType":"string","name":"modelId","type":"string"},{"internalType":"enum ModelInferenceMode","name":"inferenceMode","type":"uint8"},{"components":[{"components":[{"internalType":"string","name":"name","type":"string"},{"components":[{"internalType":"int128","name":"value","type":"int128"},{"internalType":"int128","name":"decimals","type":"int128"}],"internalType":"struct TensorLib.Number[]","name":"values","type":"tuple[]"},{"internalType":"uint32[]","name":"shape","type":"uint32[]"}],"internalType":"struct TensorLib.MultiDimensionalNumberTensor[]","name":"numbers","type":"tuple[]"},{"components":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string[]","name":"values","type":"string[]"}],"internalType":"struct TensorLib.StringTensor[]","name":"strings","type":"tuple[]"}],"internalType":"struct ModelInput","name":"modelInput","type":"tuple"}],"name":"run","outputs":[{"components":[{"components":[{"internalType":"string","name":"name","type":"string"},{"components":[{"internalType":"int128","name":"value","type":"int128"},{"internalType":"int128","name":"decimals","type":"int128"}],"internalType":"struct TensorLib.Number[]","name":"values","type":"tuple[]"},{"internalType":"uint32[]","name":"shape","type":"uint32[]"}],"internalType":"struct TensorLib.MultiDimensionalNumberTensor[]","name":"numbers","type":"tuple[]"},{"components":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string[]","name":"values","type":"string[]"}],"internalType":"struct TensorLib.StringTensor[]","name":"strings","type":"tuple[]"},{"components":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"value","type":"string"}],"internalType":"struct TensorLib.JsonScalar[]","name":"jsons","type":"tuple[]"},{"internalType":"bool","name":"is_simulation_result","type":"bool"}],"internalType":"struct ModelOutput","name":"","type":"tuple"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"components":[{"internalType":"enum LLMInferenceMode","name":"mode","type":"uint8"},{"internalType":"string","name":"modelCID","type":"string"},{"components":[{"internalType":"string","name":"role","type":"string"},{"internalType":"string","name":"content","type":"string"},{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"tool_call_id","type":"string"},{"components":[{"internalType":"string","name":"id","type":"string"},{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"arguments","type":"string"}],"internalType":"struct ToolCall[]","name":"tool_calls","type":"tuple[]"}],"internalType":"struct ChatMessage[]","name":"messages","type":"tuple[]"},{"components":[{"internalType":"string","name":"description","type":"string"},{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"parameters","type":"string"}],"internalType":"struct ToolDefinition[]","name":"tools","type":"tuple[]"},{"internalType":"string","name":"tool_choice","type":"string"},{"internalType":"uint32","name":"max_tokens","type":"uint32"},{"internalType":"string[]","name":"stop_sequence","type":"string[]"},{"internalType":"uint32","name":"temperature","type":"uint32"}],"internalType":"struct LLMChatRequest","name":"request","type":"tuple"}],"name":"runLLMChat","outputs":[{"components":[{"internalType":"string","name":"finish_reason","type":"string"},{"components":[{"internalType":"string","name":"role","type":"string"},{"internalType":"string","name":"content","type":"string"},{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"tool_call_id","type":"string"},{"components":[{"internalType":"string","name":"id","type":"string"},{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"arguments","type":"string"}],"internalType":"struct ToolCall[]","name":"tool_calls","type":"tuple[]"}],"internalType":"struct ChatMessage","name":"message","type":"tuple"}],"internalType":"struct LLMChatResponse","name":"","type":"tuple"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"components":[{"internalType":"enum LLMInferenceMode","name":"mode","type":"uint8"},{"internalType":"string","name":"modelCID","type":"string"},{"internalType":"string","name":"prompt","type":"string"},{"internalType":"uint32","name":"max_tokens","type":"uint32"},{"internalType":"string[]","name":"stop_sequence","type":"string[]"},{"internalType":"uint32","name":"temperature","type":"uint32"}],"internalType":"struct LLMCompletionRequest","name":"request","type":"tuple"}],"name":"runLLMCompletion","outputs":[{"components":[{"internalType":"string","name":"answer","type":"string"}],"internalType":"struct LLMCompletionResponse","name":"","type":"tuple"}],"stateMutability":"nonpayable","type":"function"}]

{opengradient-0.3.12 → opengradient-0.3.14}/src/opengradient/cli.py

@@ -604,6 +604,44 @@ def list_files(client: Client, repo_name: str, version: str):
         click.echo(f"Error listing files: {str(e)}")
 
 
+@cli.command()
+@click.option('--model', '-m', required=True, help='Model identifier for image generation')
+@click.option('--prompt', '-p', required=True, help='Text prompt for generating the image')
+@click.option('--output-path', '-o', required=True, type=click.Path(path_type=Path), 
+              help='Output file path for the generated image')
+@click.option('--width', type=int, default=1024, help='Output image width')
+@click.option('--height', type=int, default=1024, help='Output image height')
+@click.pass_context
+def generate_image(ctx, model: str, prompt: str, output_path: Path, width: int, height: int):
+    """
+    Generate an image using a diffusion model.
+
+    Example usage:
+    opengradient generate-image --model stabilityai/stable-diffusion-xl-base-1.0 
+        --prompt "A beautiful sunset over mountains" --output-path sunset.png
+    """
+    client: Client = ctx.obj['client']
+    try:
+        click.echo(f"Generating image with model \"{model}\"")
+        image_data = client.generate_image(
+            model_cid=model,
+            prompt=prompt,
+            width=width,
+            height=height
+        )
+
+        # Save the image
+        with open(output_path, 'wb') as f:
+            f.write(image_data)
+
+        click.echo()  # Add a newline for better spacing
+        click.secho("✅ Image generation successful", fg="green", bold=True)
+        click.echo(f"Image saved to: {output_path}")
+
+    except Exception as e:
+        click.echo(f"Error generating image: {str(e)}")
+
+
 if __name__ == '__main__':
     logging.getLogger().setLevel(logging.WARN)
     cli()

{opengradient-0.3.12 → opengradient-0.3.14}/src/opengradient/client.py

@@ -14,6 +14,14 @@ from opengradient import utils
 from opengradient.exceptions import OpenGradientError
 from opengradient.types import InferenceMode, LLM
 
+import grpc
+import time
+import uuid
+from google.protobuf import timestamp_pb2
+
+from opengradient.proto import infer_pb2
+from opengradient.proto import infer_pb2_grpc
+from .defaults import DEFAULT_IMAGE_GEN_HOST, DEFAULT_IMAGE_GEN_PORT
 
 class Client:
     FIREBASE_CONFIG = {
@@ -319,6 +327,7 @@ class Client:
         Raises:
             OpenGradientError: If the inference fails.
         """
+        # TODO (Kyle): Add input support for JSON tensors
         try:
             logging.debug("Entering infer method")
             self._initialize_web3()
@@ -705,4 +714,129 @@ class Client:
                                     status_code=e.response.status_code if hasattr(e, 'response') else None)
         except Exception as e:
             logging.error(f"Unexpected error during file listing: {str(e)}", exc_info=True)
-            raise OpenGradientError(f"Unexpected error during file listing: {str(e)}")
+            raise OpenGradientError(f"Unexpected error during file listing: {str(e)}")
+
+    def generate_image(
+            self,
+            model_cid: str,
+            prompt: str,
+            host: str = DEFAULT_IMAGE_GEN_HOST,
+            port: int = DEFAULT_IMAGE_GEN_PORT,
+            width: int = 1024,
+            height: int = 1024,
+            timeout: int = 300,  # 5 minute timeout
+            max_retries: int = 3
+        ) -> bytes:
+        """
+        Generate an image using a diffusion model through gRPC.
+
+        Args:
+            model_cid (str): The model identifier (e.g. "stabilityai/stable-diffusion-xl-base-1.0")
+            prompt (str): The text prompt to generate the image from
+            host (str, optional): gRPC host address. Defaults to DEFAULT_IMAGE_GEN_HOST.
+            port (int, optional): gRPC port number. Defaults to DEFAULT_IMAGE_GEN_PORT.
+            width (int, optional): Output image width. Defaults to 1024.
+            height (int, optional): Output image height. Defaults to 1024.
+            timeout (int, optional): Maximum time to wait for generation in seconds. Defaults to 300.
+            max_retries (int, optional): Maximum number of retry attempts. Defaults to 3.
+
+        Returns:
+            bytes: The raw image data bytes
+
+        Raises:
+            OpenGradientError: If the image generation fails
+            TimeoutError: If the generation exceeds the timeout period
+        """
+        def exponential_backoff(attempt: int, max_delay: float = 30.0) -> None:
+            """Calculate and sleep for exponential backoff duration"""
+            delay = min(0.1 * (2 ** attempt), max_delay)
+            time.sleep(delay)
+
+        channel = None
+        start_time = time.time()
+        retry_count = 0
+
+        try:
+            while retry_count < max_retries:
+                try:
+                    # Initialize gRPC channel and stub
+                    channel = grpc.insecure_channel(f'{host}:{port}')
+                    stub = infer_pb2_grpc.InferenceServiceStub(channel)
+
+                    # Create image generation request
+                    image_request = infer_pb2.ImageGenerationRequest(
+                        model=model_cid,
+                        prompt=prompt,
+                        height=height,
+                        width=width
+                    )
+
+                    # Create inference request with random transaction ID
+                    tx_id = str(uuid.uuid4())
+                    request = infer_pb2.InferenceRequest(
+                        tx=tx_id,
+                        image_generation=image_request
+                    )
+
+                    # Send request with timeout
+                    response_id = stub.RunInferenceAsync(
+                        request,
+                        timeout=min(30, timeout)  # Initial request timeout
+                    )
+
+                    # Poll for completion
+                    attempt = 0
+                    while True:
+                        # Check timeout
+                        if time.time() - start_time > timeout:
+                            raise TimeoutError(f"Image generation timed out after {timeout} seconds")
+
+                        status_request = infer_pb2.InferenceTxId(id=response_id.id)
+                        try:
+                            status = stub.GetInferenceStatus(
+                                status_request,
+                                timeout=min(5, timeout)  # Status check timeout
+                            ).status
+                        except grpc.RpcError as e:
+                            logging.warning(f"Status check failed (attempt {attempt}): {str(e)}")
+                            exponential_backoff(attempt)
+                            attempt += 1
+                            continue
+
+                        if status == infer_pb2.InferenceStatus.STATUS_COMPLETED:
+                            break
+                        elif status == infer_pb2.InferenceStatus.STATUS_ERROR:
+                            raise OpenGradientError("Image generation failed on server")
+                        elif status != infer_pb2.InferenceStatus.STATUS_IN_PROGRESS:
+                            raise OpenGradientError(f"Unexpected status: {status}")
+
+                        exponential_backoff(attempt)
+                        attempt += 1
+
+                    # Get result
+                    result = stub.GetInferenceResult(
+                        response_id,
+                        timeout=min(30, timeout)  # Result fetch timeout
+                    )
+                    return result.image_generation_result.image_data
+
+                except (grpc.RpcError, TimeoutError) as e:
+                    retry_count += 1
+                    if retry_count >= max_retries:
+                        raise OpenGradientError(f"Image generation failed after {max_retries} retries: {str(e)}")
+                    
+                    logging.warning(f"Attempt {retry_count} failed: {str(e)}. Retrying...")
+                    exponential_backoff(retry_count)
+
+        except grpc.RpcError as e:
+            logging.error(f"gRPC error: {str(e)}")
+            raise OpenGradientError(f"Image generation failed: {str(e)}")
+        except TimeoutError as e:
+            logging.error(f"Timeout error: {str(e)}")
+            raise
+        except Exception as e:
+            logging.error(f"Error in generate image method: {str(e)}", exc_info=True)
+            raise OpenGradientError(f"Image generation failed: {str(e)}")
+        finally:
+            if channel:
+                channel.close()       

{opengradient-0.3.12 → opengradient-0.3.14}/src/opengradient/defaults.py

@@ -1,7 +1,8 @@
-
 # Default variables
 DEFAULT_RPC_URL="http://18.218.115.248:8545"
 DEFAULT_OG_FAUCET_URL="http://18.218.115.248:8080/?address="
 DEFAULT_HUB_SIGNUP_URL="https://hub.opengradient.ai/signup"
-DEFAULT_INFERENCE_CONTRACT_ADDRESS="0xF78F7d5a7e9f484f0924Cc21347029715bD3B8f4"
+DEFAULT_INFERENCE_CONTRACT_ADDRESS="0x3fDCb0394CF4919ff4361f4EbA0750cEc2e3bBc7"
 DEFAULT_BLOCKCHAIN_EXPLORER="http://3.145.62.2/tx/"
+DEFAULT_IMAGE_GEN_HOST="18.217.25.69"
+DEFAULT_IMAGE_GEN_PORT=5125

{opengradient-0.3.12 → opengradient-0.3.14}/src/opengradient/llm/chat.py

@@ -10,6 +10,9 @@ from langchain.schema import (
     ChatResult,
     ChatGeneration,
 )
+from langchain_core.messages.tool import (
+    ToolMessage
+)
 from langchain_core.callbacks.manager import CallbackManagerForLLMRun
 from langchain_core.tools import BaseTool
 from langchain_core.messages import ToolCall
@@ -70,24 +73,36 @@ class OpenGradientChatModel(BaseChatModel):
         run_manager: Optional[CallbackManagerForLLMRun] = None,
         **kwargs: Any,
     ) -> ChatResult:
-        chat_messages = []
+
+        sdk_messages = []
         for message in messages:
             if isinstance(message, SystemMessage):
-                chat_messages.append({"role": "system", "content": message.content})
+                sdk_messages.append({"role": "system", "content": message.content})
             elif isinstance(message, HumanMessage):
-                chat_messages.append({"role": "user", "content": message.content})
+                sdk_messages.append({"role": "user", "content": message.content})
             elif isinstance(message, AIMessage):
-                chat_messages.append({"role": "assistant", "content": message.content})
+                sdk_messages.append({
+                    "role": "assistant", 
+                    "content": message.content, 
+                    "tool_calls": [{
+                        "id": call["id"],
+                        "name": call["name"],
+                        "arguments": json.dumps(call["args"])
+                    } for call in message.tool_calls]})
+            elif isinstance(message, ToolMessage):
+                sdk_messages.append({"role": "tool", "content": message.content, "tool_call_id": message.tool_call_id})
+            else:
+                raise ValueError(f"Unexpected message type: {message}")
 
-        tx_hash, finish_reason, chat_response = self.client.llm_chat(
+        _, finish_reason, chat_response = self.client.llm_chat(
             model_cid=self.model_cid,
-            messages=chat_messages,
+            messages=sdk_messages,
             stop_sequence=stop,
             max_tokens=self.max_tokens,
             tools=self.tools
         )
 
-        if "tool_calls" in chat_response:
+        if "tool_calls" in chat_response and chat_response["tool_calls"]:
             tool_calls = []
             for tool_call in chat_response["tool_calls"]:
                 tool_calls.append(
@@ -104,7 +119,7 @@ class OpenGradientChatModel(BaseChatModel):
             )
         else:
             message = AIMessage(content=chat_response["content"])
-        
+
         return ChatResult(
             generations=[ChatGeneration(
                 message=message,

opengradient-0.3.14/src/opengradient/proto/__init__.py

@@ -0,0 +1,2 @@
+from .infer_pb2 import *
+from .infer_pb2_grpc import *