Update requirements.txt (aioipfs)

Do many attempts when loading DIDs from the graph
pinnaculum · Sep 3, 2020 · 08abed8 · 08abed8
1 parent fb91cca
commit 08abed8
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 23 deletions.
diff --git a/galacteek/core/ctx.py b/galacteek/core/ctx.py
@@ -245,6 +245,7 @@ def __init__(self, ctx):
         self.evStopWatcher = asyncio.Event()
         self._byPeerId = collections.OrderedDict()
         self._byHandle = collections.OrderedDict()
+        self._didGraphLoadAtt = {}
         self._pgScanCount = 0
 
         self.peerAuthenticated.connectTo(self.onPeerAuthenticated)
@@ -321,8 +322,11 @@ async def scanNetworkGraph(self, ipfsop):
                         log.debug(f'DID {did}: already in model')
                         continue
 
-                    ensure(self.loadDidFromGraph(
-                        ipfsop, peerId, did, sHandle))
+                    if did not in self._didGraphLoadAtt:
+                        self._didGraphLoadAtt[did] = ensure(
+                            self.loadDidFromGraph(
+                                ipfsop, peerId, did, sHandle))
+
                     await ipfsop.sleep(0.1)
 
                 await ipfsop.sleep()
@@ -331,16 +335,24 @@ async def scanNetworkGraph(self, ipfsop):
 
     async def loadDidFromGraph(self, ipfsop, peerId: str, did: str,
                                sHandle: str):
-        ipid = await self.app.ipidManager.load(
-            did,
-            track=True,
-            timeout=10,
-            localIdentifier=(peerId == ipfsop.ctx.node.id)
-        )
+        for attempt in range(0, 8):
+            ipid = await self.app.ipidManager.load(
+                did,
+                track=True,
+                timeout=10,
+                localIdentifier=(peerId == ipfsop.ctx.node.id)
+            )
+
+            if not ipid:
+                log.debug(f'Cannot load IPID: {did}, attempt {attempt}')
+                await ipfsop.sleep(60)
+                continue
+            else:
+                break
 
         if not ipid:
-            log.debug(f'Cannot load IPID: {did}')
-            return
+            log.debug(f'Cannot load IPID: {did}, bailing out')
+            return False
 
         piCtx = PeerIdentityCtx(
             self.ctx,
@@ -368,6 +380,8 @@ async def loadDidFromGraph(self, ipfsop, peerId: str, did: str,
 
         log.debug(f'Loaded IPID from graph: {did}')
 
+        return True
+
     @ipfsOp
     async def registerFromIdent(self, ipfsop, iMsg):
         profile = ipfsop.ctx.currentProfile

diff --git a/galacteek/ui/pin.py b/galacteek/ui/pin.py
@@ -171,21 +171,24 @@ def updatePinStatus(self, path, status, progress):
         if not idx:
             return
 
-        itemPath = self.model.itemFromIndex(idx)
-        if itemPath and time.time() - itemPath.lastProgressUpdate < 5:
-            return
+        try:
+            itemPath = self.model.itemFromIndex(idx)
+            if itemPath and time.time() - itemPath.lastProgressUpdate < 5:
+                return
 
-        itemProgress = self.model.itemFromIndex(
-            self.model.index(idx.row(), self.COL_PROGRESS, idx.parent())
-        )
+            itemProgress = self.model.itemFromIndex(
+                self.model.index(idx.row(), self.COL_PROGRESS, idx.parent())
+            )
 
-        itemStatus = self.model.itemFromIndex(
-            self.model.index(idx.row(), self.COL_STATUS, idx.parent())
-        )
+            itemStatus = self.model.itemFromIndex(
+                self.model.index(idx.row(), self.COL_STATUS, idx.parent())
+            )
 
-        itemStatus.setText(status)
-        itemProgress.setText(progress)
-        itemPath.lastProgressUpdate = time.time()
+            itemStatus.setText(status)
+            itemProgress.setText(progress)
+            itemPath.lastProgressUpdate = time.time()
+        except:
+            pass
 
     def onPinFinished(self, path):
         items = self.findPinItems(path)

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 aiodns>=2.0.0
 aiofiles>=0.4.0
 aiohttp>=3.4.4
-aioipfs>=0.4.9
+aioipfs>=0.4.10
 aiojobs>=0.2.2
 aiopubsub>=2.1.5
 aiorwlock>=0.6.0