From d749dc4f5738fb57b47246765a01de7eba7177cc Mon Sep 17 00:00:00 2001
From: Guillermo Rodriguez <guillermo@telos.net>
Date: Sun, 8 Oct 2023 09:54:31 -0300
Subject: [PATCH] Improve worker ipfs input data parallelizm

---
 skynet/dgpu/network.py | 52 ++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/skynet/dgpu/network.py b/skynet/dgpu/network.py
index 77f318c..121a6e1 100644
--- a/skynet/dgpu/network.py
+++ b/skynet/dgpu/network.py
@@ -12,7 +12,7 @@ import asks
 import trio
 import anyio
 
-from PIL import Image
+from PIL import Image, UnidentifiedImageError
 
 from leap.cleos import CLEOS
 from leap.sugar import Checksum256, Name, asset_from_str
@@ -263,43 +263,35 @@ class SkynetGPUConnector:
         ipfs_link = f'https://ipfs.{DEFAULT_DOMAIN}/ipfs/{ipfs_hash}'
         ipfs_link_legacy = ipfs_link + '/image.png'
 
-        async def get_and_set_results(link: str):
-            results[link] = await get_ipfs_file(link)
-
-        def get_image_from_resp(resp):
-            with Image.open(io.BytesIO(resp.raw)):
-                return resp.raw
-
         async with trio.open_nursery() as n:
+
+            async def get_and_set_results(link: str):
+                res = await get_ipfs_file(link, timeout=1)
+                logging.info(f'got response from {link}')
+                if not res or res.status_code != 200:
+                    logging.warning(f'couldn\'t get ipfs binary data at {link}!')
+
+                else:
+                    try:
+                        with Image.open(io.BytesIO(res.raw)):
+                            results[link] = res.raw
+                            n.cancel_scope.cancel()
+
+                    except UnidentifiedImageError:
+                        logging.warning(f'couldn\'t get ipfs binary data at {link}!')
+
             n.start_soon(
                 get_and_set_results, ipfs_link)
             n.start_soon(
                 get_and_set_results, ipfs_link_legacy)
 
         png_img = None
-        resp = results[ipfs_link_legacy]
-        if not resp or resp.status_code != 200:
-            logging.warning(f'couldn\'t get ipfs binary data at {ipfs_link_legacy}!')
+        if ipfs_link_legacy in results:
+            png_img = results[ipfs_link_legacy]
 
-        else:
-            try:
-                png_img = get_image_from_resp(resp)
-
-            except UnidentifiedImageError:
-                logging.warning(f'couldn\'t get ipfs binary data at {ipfs_link_legacy}!')
-
-        if not png_img:
-            resp = results[ipfs_link]
-            if not resp or resp.status_code != 200:
-                logging.warning(f'couldn\'t get ipfs binary data at {ipfs_link}!')
-
-            else:
-                try:
-                    png_img = get_image_from_resp(resp)
-
-                except UnidentifiedImageError:
-                    logging.warning(f'couldn\'t get ipfs binary data at {ipfs_link}!')
-                    ...
+        png_img = None
+        if ipfs_link in results:
+            png_img = results[ipfs_link]
 
         if not png_img:
             raise DGPUComputeError('Couldn\'t gather input data from ipfs')