synapse 2.176.0__py311-none-any.whl → 2.177.0__py311-none-any.whl

synapse/cryotank.py

@@ -226,14 +226,19 @@ class CryoCell(s_cell.Cell):
 
         self.dmon.share('cryotank', self)
 
-        self.names = await self.hive.open(('cryo', 'names'))
+    async def initServiceStorage(self):
+
+        self.names = self.slab.getSafeKeyVal('cryo:names')
+
+        await self._bumpCellVers('cryotank', (
+            (2, self._migrateToV2),
+            (3, self._migrateToV3),
+        ), nexs=False)
 
         self.tanks = await s_base.BaseRef.anit()
         self.onfini(self.tanks.fini)
 
-        for name, node in self.names:
-
-            iden, conf = node.valu
+        for name, (iden, conf) in self.names.items():
 
             logger.info('Bringing tank [%s][%s] online', name, iden)
 
@@ -245,47 +250,52 @@ class CryoCell(s_cell.Cell):
 
             await self.auth.addAuthGate(iden, 'tank')
 
-    async def _execCellUpdates(self):
-        await self._bumpCellVers('cryotank', (
-            (2, self._migrateToV2),
-        ))
-
     async def _migrateToV2(self):
 
         logger.warning('Beginning migration to V2')
 
-        self.names = await self.hive.open(('cryo', 'names'))
+        async with await self.hive.open(('cryo', 'names')) as names:
+            for name, node in names:
 
-        for name, node in self.names:
+                iden, conf = node.valu
+                if conf is None:
+                    conf = {}
 
-            iden, conf = node.valu
-            if conf is None:
-                conf = {}
+                logger.info(f'Migrating tank {name=} {iden=}')
 
-            logger.info(f'Migrating tank {name=} {iden=}')
+                path = s_common.genpath(self.dirn, 'tanks', iden)
 
-            path = s_common.genpath(self.dirn, 'tanks', iden)
+                # remove old guid file
+                guidpath = s_common.genpath(path, 'guid')
+                if os.path.isfile(guidpath):
+                    os.unlink(guidpath)
+
+                # if its a legacy cell remove that too
+                cellpath = s_common.genpath(path, 'cell.guid')
+                if os.path.isfile(cellpath):
 
-            # remove old guid file
-            guidpath = s_common.genpath(path, 'guid')
-            if os.path.isfile(guidpath):
-                os.unlink(guidpath)
+                    os.unlink(cellpath)
 
-            # if its a legacy cell remove that too
-            cellpath = s_common.genpath(path, 'cell.guid')
-            if os.path.isfile(cellpath):
+                    cellslabpath = s_common.genpath(path, 'slabs', 'cell.lmdb')
+                    if os.path.isdir(cellslabpath):
+                        shutil.rmtree(cellslabpath, ignore_errors=True)
+
+                # drop offsets
+                slabpath = s_common.genpath(path, 'tank.lmdb')
+                async with await s_lmdbslab.Slab.anit(slabpath, **conf) as slab:
+                    offs = s_slaboffs.SlabOffs(slab, 'offsets')
+                    slab.dropdb(offs.db)
+
+        logger.warning('...migration complete')
 
-                os.unlink(cellpath)
+    async def _migrateToV3(self):
 
-                cellslabpath = s_common.genpath(path, 'slabs', 'cell.lmdb')
-                if os.path.isdir(cellslabpath):
-                    shutil.rmtree(cellslabpath, ignore_errors=True)
+        logger.warning('Beginning migration to V3')
 
-            # drop offsets
-            slabpath = s_common.genpath(path, 'tank.lmdb')
-            async with await s_lmdbslab.Slab.anit(slabpath, **conf) as slab:
-                offs = s_slaboffs.SlabOffs(slab, 'offsets')
-                slab.dropdb(offs.db)
+        async with await self.hive.open(('cryo', 'names')) as hivenames:
+            for name, node in hivenames:
+                iden, conf = node.valu
+                self.names.set(name, (iden, conf))
 
         logger.warning('...migration complete')
 
@@ -329,7 +339,7 @@ class CryoCell(s_cell.Cell):
 
         Args:
             name (str): Name of the CryoTank.
-            user (HiveUser): The Telepath user.
+            user (User): The Telepath user.
 
         Returns:
             CryoTank: A CryoTank instance.
@@ -349,8 +359,7 @@ class CryoCell(s_cell.Cell):
 
         tank = await CryoTank.anit(path, iden, conf)
 
-        node = await self.names.open((name,))
-        await node.set((iden, conf))
+        self.names.set(name, (iden, conf))
 
         self.tanks.put(name, tank)
 
@@ -367,7 +376,7 @@ class CryoCell(s_cell.Cell):
 
         Returns:
             list: A list of tufos.
-            user (HiveUser): The Telepath user.
+            user (User): The Telepath user.
         '''
 
         infos = []
@@ -387,7 +396,7 @@ class CryoCell(s_cell.Cell):
         if tank is None:
             return False
 
-        iden, _ = await self.names.pop((name,))
+        iden, _ = self.names.pop(name)
         await tank.fini()
         shutil.rmtree(tank.dirn, ignore_errors=True)
 

synapse/datamodel.py

@@ -467,8 +467,8 @@ class Model:
         self.arraysbytype = collections.defaultdict(dict)
         self.ifaceprops = collections.defaultdict(list)
         self.formsbyiface = collections.defaultdict(list)
-        self.edgesbyn1 = collections.defaultdict(list)
-        self.edgesbyn2 = collections.defaultdict(list)
+        self.edgesbyn1 = collections.defaultdict(set)
+        self.edgesbyn2 = collections.defaultdict(set)
 
         self.formprefixcache = s_cache.LruDict(PREFIX_CACHE_SIZE)
 
@@ -820,8 +820,18 @@ class Model:
         edge = Edge(self, edgetype, edgeinfo)
 
         self.edges[edgetype] = edge
-        self.edgesbyn1[n1form].append(edge)
-        self.edgesbyn2[n2form].append(edge)
+        self.edgesbyn1[n1form].add(edge)
+        self.edgesbyn2[n2form].add(edge)
+
+    def delEdge(self, edgetype):
+        if self.edges.get(edgetype) is None:
+            return
+
+        n1form, verb, n2form = edgetype
+
+        self.edges.pop(edgetype, None)
+        self.edgesbyn1[n1form].discard(edgetype)
+        self.edgesbyn2[n2form].discard(edgetype)
 
     def _reqFormName(self, name):
         form = self.forms.get(name)
@@ -1109,3 +1119,6 @@ class Model:
 
     def tagprop(self, name):
         return self.tagprops.get(name)
+
+    def edge(self, edgetype):
+        return self.edges.get(edgetype)

synapse/exc.py

@@ -105,6 +105,7 @@ class BadFormDef(SynErr): pass
 class BadHivePath(SynErr): pass
 class BadLiftValu(SynErr): pass
 class BadPropDef(SynErr): pass
+class BadEdgeDef(SynErr): pass
 class BadTypeDef(SynErr): pass
 class BadTypeValu(SynErr): pass
 class BadJsonText(SynErr): pass
@@ -189,6 +190,15 @@ class DupTagPropName(SynErr): pass
 class DupUserName(SynErr): pass
 class DupStormSvc(SynErr): pass
 
+class DupEdgeType(SynErr):
+
+    @classmethod
+    def init(cls, edge, mesg=None):
+        if mesg is None:
+            (n1form, verb, n2form) = edge
+            mesg = f'Edge already exists: {n1form} -({verb})> {n2form}.'
+        return DupEdgeType(mesg=mesg, n1form=n1form, verb=verb, n2form=n2form)
+
 class FileExists(SynErr): pass
 
 class InconsistentStorage(SynErr):
@@ -240,6 +250,15 @@ class NoSuchProp(SynErr):
             mesg = f'No property named {name}.'
         return NoSuchProp(mesg=mesg, name=name)
 
+class NoSuchEdge(SynErr):
+
+    @classmethod
+    def init(cls, edge, mesg=None):
+        if mesg is None:
+            (n1form, verb, n2form) = edge
+            mesg = f'No edge defined for {n1form} -({verb})> {n2form}.'
+        return NoSuchEdge(mesg=mesg, n1form=n1form, verb=verb, n2form=n2form)
+
 class NoSuchAbrv(SynErr): pass
 class NoSuchAct(SynErr): pass
 class NoSuchAuthGate(SynErr): pass

synapse/lib/agenda.py

@@ -430,9 +430,8 @@ class _Appt:
         await self.save()
 
     async def save(self):
-        full = self.stor._hivenode.full + (self.iden,)
         stordict = self.pack()
-        await self.stor.core.hive.set(full, stordict)
+        self.stor.apptdefs.set(self.iden, stordict)
 
 class Agenda(s_base.Base):
     '''
@@ -452,7 +451,7 @@ class Agenda(s_base.Base):
         self._wake_event = s_coro.Event()  # Causes the scheduler loop to wake up
         self.onfini(self._wake_event.set)
 
-        self._hivenode = await self.core.hive.open(('agenda', 'appts'))  # Persistent storage
+        self.apptdefs = self.core.cortexdata.getSubKeyVal('agenda:appt:')
 
         await self._load_all()
 
@@ -465,10 +464,9 @@ class Agenda(s_base.Base):
         self.appts = {}
 
         to_delete = []
-        for iden, node in iter(self._hivenode):
-            val = node.valu
+        for iden, info in self.apptdefs.items():
             try:
-                appt = _Appt.unpack(self, val)
+                appt = _Appt.unpack(self, info)
                 if appt.iden != iden:
                     raise s_exc.InconsistentStorage(mesg='iden inconsistency')
                 self._addappt(iden, appt)
@@ -480,9 +478,7 @@ class Agenda(s_base.Base):
                 continue
 
         for iden in to_delete:
-            node = self._hivenode.get(iden)
-            if node is not None:
-                await node.hive.pop(node.full)
+            self.apptdefs.pop(iden)
 
         # Make sure we don't assign the same index to 2 appointments
         if self.appts:
@@ -699,9 +695,7 @@ class Agenda(s_base.Base):
                 heapq.heapify(self.apptheap)
 
         del self.appts[iden]
-        node = self._hivenode.get(iden)
-        if node is not None:
-            await node.hive.pop(node.full)
+        self.apptdefs.delete(iden)
 
     def _getNowTick(self):
         return time.time() + self.tickoff
@@ -752,7 +746,7 @@ class Agenda(s_base.Base):
 
                 if appt.isrunning:  # pragma: no cover
                     mesg = f'Appointment {appt.iden} {appt.name} is still running from previous time when scheduled' \
-                           f' to run. Skipping.',
+                           f' to run. Skipping.'
                     logger.warning(mesg,
                                    extra={'synapse': {'iden': appt.iden, 'name': appt.name}})
                 else: