synapse 2.176.0__tar.gz → 2.178.0__tar.gz

{synapse-2.176.0/synapse.egg-info → synapse-2.178.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: synapse
-Version: 2.176.0
+Version: 2.178.0
 Summary: Synapse Intelligence Analysis Framework
 Author-email: The Vertex Project LLC <root@vertex.link>
 License: Apache License 2.0
@@ -27,9 +27,9 @@ Requires-Dist: lmdb<1.5.0,>=1.2.1
 Requires-Dist: tornado<7.0.0,>=6.2.0
 Requires-Dist: regex>=2022.9.11
 Requires-Dist: PyYAML<6.1.0,>=5.4
-Requires-Dist: aiohttp<4.0,>=3.8.1
-Requires-Dist: aiohttp-socks<0.9.0,>=0.8.0
-Requires-Dist: aioimaplib<1.1.0,>=1.0.1
+Requires-Dist: aiohttp<4.0,>=3.10.0
+Requires-Dist: aiohttp-socks<0.10.0,>=0.9.0
+Requires-Dist: aioimaplib<1.2.0,>=1.1.0
 Requires-Dist: aiosmtplib<3.1.0,>=3.0.0
 Requires-Dist: prompt-toolkit<3.1.0,>=3.0.4
 Requires-Dist: lark==1.1.9

{synapse-2.176.0 → synapse-2.178.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'synapse'
-version = '2.176.0'
+version = '2.178.0'
 authors = [
     { name = 'The Vertex Project LLC', email = 'root@vertex.link'},
 ]
@@ -31,9 +31,9 @@ dependencies = [
     'tornado>=6.2.0,<7.0.0',
     'regex>=2022.9.11',
     'PyYAML>=5.4,<6.1.0',
-    'aiohttp>=3.8.1,<4.0',
-    'aiohttp-socks>=0.8.0,<0.9.0',
-    'aioimaplib>=1.0.1,<1.1.0',
+    'aiohttp>=3.10.0,<4.0',
+    'aiohttp-socks>=0.9.0,<0.10.0',
+    'aioimaplib>=1.1.0,<1.2.0',
     'aiosmtplib>=3.0.0,<3.1.0',
     'prompt-toolkit>=3.0.4,<3.1.0',
     'lark==1.1.9',

{synapse-2.176.0 → synapse-2.178.0}/synapse/axon.py

@@ -792,10 +792,15 @@ class Axon(s_cell.Cell):
         self.axonhist = s_lmdbslab.Hist(self.axonslab, 'history')
         self.axonseqn = s_slabseqn.SlabSeqn(self.axonslab, 'axonseqn')
 
-        node = await self.hive.open(('axon', 'metrics'))
-        self.axonmetrics = await node.dict()
-        self.axonmetrics.setdefault('size:bytes', 0)
-        self.axonmetrics.setdefault('file:count', 0)
+        self.axonmetrics = await self.axonslab.getHotCount('metrics')
+
+        if self.inaugural:
+            self.axonmetrics.set('size:bytes', 0)
+            self.axonmetrics.set('file:count', 0)
+
+        await self._bumpCellVers('axon:metrics', (
+            (1, self._migrateAxonMetrics),
+        ), nexs=False)
 
         self.maxbytes = self.conf.get('max:bytes')
         self.maxcount = self.conf.get('max:count')
@@ -856,6 +861,16 @@ class Axon(s_cell.Cell):
     async def _axonHealth(self, health):
         health.update('axon', 'nominal', '', data=await self.metrics())
 
+    async def _migrateAxonMetrics(self):
+        logger.warning('migrating Axon metrics data out of hive')
+
+        async with await self.hive.open(('axon', 'metrics')) as hivenode:
+            axonmetrics = await hivenode.dict()
+            self.axonmetrics.set('size:bytes', axonmetrics.get('size:bytes', 0))
+            self.axonmetrics.set('file:count', axonmetrics.get('file:count', 0))
+
+        logger.warning('...Axon metrics migration complete!')
+
     async def _initBlobStor(self):
 
         self.byterange = True
@@ -1151,7 +1166,7 @@ class Axon(s_cell.Cell):
         Returns:
             dict: A dictionary of runtime data about the Axon.
         '''
-        return dict(self.axonmetrics.items())
+        return self.axonmetrics.pack()
 
     async def save(self, sha256, genr, size):
         '''
@@ -1200,8 +1215,8 @@ class Axon(s_cell.Cell):
         tick = info.get('tick')
         self._addSyncItem((sha256, size), tick=tick)
 
-        await self.axonmetrics.set('file:count', self.axonmetrics.get('file:count') + 1)
-        await self.axonmetrics.set('size:bytes', self.axonmetrics.get('size:bytes') + size)
+        self.axonmetrics.inc('file:count')
+        self.axonmetrics.inc('size:bytes', valu=size)
 
         self.axonslab.put(sha256, size.to_bytes(8, 'big'), db=self.sizes)
         return True
@@ -1312,8 +1327,8 @@ class Axon(s_cell.Cell):
             logger.debug(f'Deleting blob [{fhash}].', extra=await self.getLogExtra(sha256=fhash))
 
             size = int.from_bytes(byts, 'big')
-            await self.axonmetrics.set('file:count', self.axonmetrics.get('file:count') - 1)
-            await self.axonmetrics.set('size:bytes', self.axonmetrics.get('size:bytes') - size)
+            self.axonmetrics.inc('file:count', valu=-1)
+            self.axonmetrics.inc('size:bytes', valu=-size)
 
             await self._delBlobByts(sha256)
             return True