synapse 2.207.0__py311-none-any.whl → 2.209.0__py311-none-any.whl

synapse/cortex.py

@@ -1581,6 +1581,9 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             for layer in self.layers.values():
                 await layer.initLayerActive()
 
+            for pkgdef in list(self.stormpkgs.values()):
+                self._runStormPkgOnload(pkgdef)
+
         self.runActiveTask(_runMigrations())
 
         await self.initStormPool()
@@ -2638,6 +2641,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
                 return
 
         self.loadStormPkg(pkgdef)
+        self._runStormPkgOnload(pkgdef)
         self.pkgdefs.set(name, pkgdef)
 
         self._clearPermDefs()
@@ -2929,9 +2933,13 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             self._initEasyPerm(gdef)
             self.pkggraphs[gdef['iden']] = gdef
 
+    def _runStormPkgOnload(self, pkgdef):
+        name = pkgdef.get('name')
         onload = pkgdef.get('onload')
+
         if onload is not None and self.isactive:
             async def _onload():
+                await self.fire('core:pkg:onload:start', pkg=name)
                 try:
                     async for mesg in self.storm(onload):
                         if mesg[0] == 'print':
@@ -2943,10 +2951,11 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
                         await asyncio.sleep(0)
                 except asyncio.CancelledError:  # pragma: no cover
                     raise
-                except Exception:  # pragma: no cover
-                    logger.warning(f'onload failed for package: {name}')
+                except Exception as exc:  # pragma: no cover
+                    logger.warning(f'onload failed for package: {name}', exc_info=exc)
                 await self.fire('core:pkg:onload:complete', pkg=name)
-            self.schedCoro(_onload())
+
+            self.runActiveTask(_onload())
 
     # N.B. This function is intentionally not async in order to prevent possible user race conditions for code
     # executing outside of the nexus lock.

synapse/lib/boss.py

@@ -10,6 +10,10 @@ class Boss(s_base.Base):
 
     '''
     An object to track "promoted" async tasks.
+
+    Promoted tasks are asyncio tasks, wrapped in a synapse task
+    (``s_task.Task``), that are visible to storm users via the task tracking
+    libs/commands such as ``ps.list`` and ``$lib.ps.list()``.
     '''
     async def __anit__(self):
         await s_base.Base.__anit__(self)
@@ -45,7 +49,7 @@ class Boss(s_base.Base):
 
     async def promotetask(self, task, name, user, info=None, taskiden=None):
 
-        synt = getattr(task, '_syn_task', None)
+        synt = s_task.syntask(task)
 
         if synt is not None:
 

synapse/lib/layer.py

@@ -1569,7 +1569,10 @@ class Layer(s_nexus.Pusher):
                 await self.initUpstreamSync(uplayr)
 
     async def initLayerPassive(self):
+        await self._stopMirror()
+        self._stopUpstream()
 
+    async def _stopMirror(self):
         if self.leadtask is not None:
             self.leadtask.cancel()
             self.leadtask = None
@@ -1578,6 +1581,7 @@ class Layer(s_nexus.Pusher):
             await self.leader.fini()
             self.leader = None
 
+    def _stopUpstream(self):
         [t.cancel() for t in self.activetasks]
         self.activetasks.clear()
 
@@ -2786,6 +2790,11 @@ class Layer(s_nexus.Pusher):
     async def setLayerInfo(self, name, valu):
         if name != 'readonly':
             self._reqNotReadOnly()
+
+        if name in ('mirror', 'upstream') and valu is not None:
+            mesg = 'Layer only supports setting "mirror" and "upstream" to None.'
+            raise s_exc.BadOptValu(mesg=mesg)
+
         return await self._push('layer:set', name, valu)
 
     @s_nexus.Pusher.onPush('layer:set')
@@ -2793,17 +2802,25 @@ class Layer(s_nexus.Pusher):
         '''
         Set a mutable layer property.
         '''
-        if name not in ('name', 'desc', 'logedits', 'readonly'):
+        if name not in ('name', 'desc', 'logedits', 'readonly', 'mirror', 'upstream'):
             mesg = f'{name} is not a valid layer info key'
             raise s_exc.BadOptValu(mesg=mesg)
 
         if name == 'logedits':
             valu = bool(valu)
             self.logedits = valu
+
         elif name == 'readonly':
             valu = bool(valu)
             self.readonly = valu
 
+        elif name == 'mirror' and valu is None:
+            await self._stopMirror()
+            self.ismirror = False
+
+        elif name == 'upstream' and valu is None:
+            self._stopUpstream()
+
         # TODO when we can set more props, we may need to parse values.
         if valu is None:
             self.layrinfo.pop(name, None)
@@ -4382,6 +4399,11 @@ class Layer(s_nexus.Pusher):
             async for verb, n2iden in self.iterNodeEdgesN1(buid):
                 edits.append((EDIT_EDGE_ADD, (verb, n2iden), ()))
 
+                if len(edits) >= 100:
+                    yield nodeedit
+                    edits = []
+                    nodeedit = (buid, form, edits)
+
             yield nodeedit
 
     async def initUpstreamSync(self, url):

synapse/lib/modelrev.py

@@ -1466,6 +1466,7 @@ class ModelMigration_0_2_31:
                 if (v2_2 := props.get('v2_2')) is not None:
                     propvalu, stortype = v2_2
                     if not s_infotech.isValidCpe22(propvalu):
+                        logger.debug(f'Queueing invalid v2_2 value for deletion iden={s_common.ehex(buid)} valu={propvalu}')
                         await self._queueEdit(
                             layer.iden,
                             (buid, 'it:sec:cpe', (
@@ -1622,10 +1623,25 @@ class ModelMigration_0_2_31:
                     if propvalu is not None:
                         break
 
-                newvalu, _ = form.type.norm(propvalu)
-                await self.moveNode(buid, newvalu)
+                if propvalu is None: # pragma: no cover
+                    # We didn't find a v2_2 value so remove this node
+                    await self.removeNode(buid)
+                    removed += 1
+
+                else:
+                    # We did find a v2_2 value so try to norm it and use that new value to move the node. If this fails,
+                    # remove the node.
+                    try:
+                        newvalu, _ = form.type.norm(propvalu)
 
-                migrated += 1
+                    except s_exc.BadTypeValu: # pragma: no cover
+                        logger.debug('Unexpectedly encountered invalid v2_2 prop: iden=%s valu=%s', s_common.ehex(buid), propvalu)
+                        await self.removeNode(buid)
+                        removed += 1
+
+                    else:
+                        await self.moveNode(buid, newvalu)
+                        migrated += 1
 
             elif action == 'remove':
                 newvalu = None
@@ -1636,10 +1652,17 @@ class ModelMigration_0_2_31:
                     if propvalu is None:
                         continue
 
-                    newvalu, _ = form.type.norm(propvalu)
                     # This prop is going to be the new primary value so delete the secondary prop
                     await self.editPropDel(layriden, buid, 'it:sec:cpe', 'v2_2', propvalu, stortype)
 
+                    # We did find a v2_2 value so try to norm it and use that new value to move the node. If this fails,
+                    # remove the node.
+                    try:
+                        newvalu, _ = form.type.norm(propvalu)
+                    except s_exc.BadTypeValu: # pragma: no cover
+                        logger.debug('Unexpectedly encountered invalid v2_2 prop: iden=%s valu=%s', s_common.ehex(buid), propvalu)
+                        continue
+
                     # Oh yeah! Migrate the node instead of removing it
                     await self.moveNode(buid, newvalu)
 

synapse/lib/rstorm.py

@@ -168,7 +168,9 @@ class StormOutput(s_cmds_cortex.StormCmd):
         if self.ctx.pop('storm-fail', None):
             s_cmds_cortex.StormCmd._onErr(self, mesg, opts)
             return
-        raise s_exc.StormRuntimeError(mesg=mesg)
+        (errname, errinfo) = mesg[1]
+        errinfo.setdefault('_errname', errname)
+        raise s_exc.StormRuntimeError(**errinfo)
 
     async def runCmdOpts(self, opts):
 

synapse/lib/storm.lark

@@ -5,7 +5,7 @@
 %ignore CPPCOMMENT
 %ignore WS
 
-WS: /[\s]/+
+WS.-1: /[\s]/+
 
 // C comment: /* */
 // From https://stackoverflow.com/a/36328890/6518334
@@ -466,7 +466,7 @@ TRIPLEQUOTEDSTRING: /'''.*?'''/s
 DOUBLEQUOTEDSTRING: ESCAPED_STRING
 SINGLEQUOTEDSTRING: /'[^']*'(?!')/
 
-FORMATTEXT: /[^`{].*?(?<!\\)(\\\\)*?(?=[`{])/s
+FORMATTEXT.-1: /((?<!\\)(\\\\)*\\[`{]|[^`{])+/s
 _formatexpr: "{" expror "}"
 formatstring: "`" (_formatexpr | FORMATTEXT)* "`"
 

synapse/lib/storm.py

@@ -507,7 +507,7 @@ stormcmds = (
                         if ( $defv = $lib.null ) {
                             $defv = $lib.false
                         }
-                        $text = `{$lib.str.join('.', $permdef.perm).ljust(32)} : {$permdef.desc} ( default: {$defv} )`
+                        $text = `{('.').join($permdef.perm).ljust(32)} : {$permdef.desc} ( default: {$defv} )`
                         $lib.print($text)
                     }
                 } else {
@@ -594,7 +594,7 @@ stormcmds = (
                 $ssl = $lib.true
                 if $cmdopts.ssl_noverify { $ssl = $lib.false }
 
-                $headers = ({'X-Synapse-Version': $lib.str.join('.', $lib.version.synapse())})
+                $headers = ({'X-Synapse-Version': ('.').join($lib.version.synapse())})
 
                 $resp = $lib.inet.http.get($cmdopts.url, ssl_verify=$ssl, headers=$headers)
 
@@ -629,7 +629,7 @@ stormcmds = (
             $synv = $lib.version.synapse()
 
             if $synv {
-                $synv = $lib.str.join('.', $synv)
+                $synv = ('.').join($synv)
             }
 
             if $comm {
@@ -1078,8 +1078,8 @@ stormcmds = (
                     $lib.print('entries:         incunit    incval required')
 
                     for $rec in $job.recs {
-                        $incunit = $lib.str.format('{incunit}', incunit=$rec.incunit).ljust(10)
-                        $incval = $lib.str.format('{incval}', incval=$rec.incval).ljust(6)
+                        $incunit = (`{$rec.incunit}`).ljust(10)
+                        $incval = (`{$rec.incval}`).ljust(6)
 
                         $lib.print('                 {incunit} {incval} {reqdict}',
                                    incunit=$incunit, incval=$incval, reqdict=$rec.reqdict)

synapse/lib/stormlib/auth.py

@@ -589,7 +589,7 @@ stormcmds = (
         'storm': '''
 
             for $pdef in $lib.auth.getPermDefs() {
-                $perm = $lib.str.join(".", $pdef.perm)
+                $perm = ('.').join($pdef.perm)
 
                 if $cmdopts.find {
                     $find = $cmdopts.find.lower()

synapse/lib/stormlib/cortex.py

@@ -107,7 +107,7 @@ stormcmds = [
         if $perms {
             $lib.print('The following user permissions are required to run this HTTP API endpoint:')
             for $pdef in $perms {
-                $perm = $lib.str.join(".", $pdef.perm)
+                $perm = ('.').join($pdef.perm)
                 $lib.print($perm)
                 $lib.print(`    default: {$pdef.default}`)
             }

synapse/lib/stormlib/vault.py

@@ -272,7 +272,7 @@ stormcmds = (
                         $levels.append($key)
                     }
 
-                    $levels = $lib.str.join(", ", $levels)
+                    $levels = (', ').join($levels)
 
                     $lib.exit(`Invalid level specified: {$cmdopts.level}. Level must be one of: {$levels}.`)
                 }

synapse/lib/stormsvc.py

@@ -68,7 +68,7 @@ stormcmds = (
                 if $sname {} else { $sname = 'Unknown' }
                 $svers = $sdef.svcvers
                 if $svers {
-                    $svers = $lib.str.join('.', $svers)
+                    $svers = ('.').join($svers)
                 } else {
                     $svers = 'Unknown'
                 }

synapse/lib/stormtypes.py

@@ -1308,7 +1308,7 @@ class LibBase(Lib):
                     storm> if $lib.false { $lib.print('Is True') } else { $lib.print('Is False') }
                     Is False''',
          'type': 'boolean', },
-        {'name': 'text', 'desc': 'Get a Storm Text object. This is deprecated; please use a list to append strings to, and then use ``$lib.str.join()`` to join them on demand.',
+        {'name': 'text', 'desc': "Get a Storm Text object. This is deprecated; please use a list to append strings to, and then use ``('.').join($listOfStr)`` to join them on demand.",
          'deprecated': {'eolvers': '3.0.0'},
          'type': {'type': 'function', '_funcname': '_text',
                   'args': (
@@ -1691,7 +1691,7 @@ class LibBase(Lib):
         s_common.deprecated('$lib.text()', curv='2.194.0')
         runt = s_scope.get('runt')
         if runt:
-            await runt.snap.warnonce('$lib.text() is deprecated. Please use a list to append strings to, and then use ``$lib.str.join()`` to join them on demand.')
+            await runt.snap.warnonce("$lib.text() is deprecated. Please use a list to append strings to, and then use ``('').join($listOfStr)`` to join them on demand.")
         valu = ''.join(args)
         return Text(valu)
 
@@ -2023,15 +2023,8 @@ class LibStr(Lib):
     A Storm Library for interacting with strings.
     '''
     _storm_locals = (
-        {'name': 'join', 'desc': '''
-            Join items into a string using a separator.
-
-            Examples:
-                Join together a list of strings with a dot separator::
-
-                    storm> $foo=$lib.str.join('.', ('rep', 'vtx', 'tag')) $lib.print($foo)
-
-                    rep.vtx.tag''',
+        {'name': 'join', 'desc': 'Join items into a string using a separator.',
+         # 'deprecated': {'eolvers': 'v3.0.0', 'mesg': 'Use ``('').join($foo, $bar, $baz, ....)`` instead.'},
          'type': {'type': 'function', '_funcname': 'join',
                   'args': (
                       {'name': 'sepr', 'type': 'str', 'desc': 'The separator used to join strings with.', },
@@ -2039,22 +2032,14 @@ class LibStr(Lib):
                   ),
                   'returns': {'type': 'str', 'desc': 'The joined string.', }}},
         {'name': 'concat', 'desc': 'Concatenate a set of strings together.',
+         # 'deprecated': {'eolvers': 'v3.0.0', 'mesg': "Use ``('').join($foo, $bar, $baz, ....)`` instead."},
          'type': {'type': 'function', '_funcname': 'concat',
                   'args': (
                       {'name': '*args', 'type': 'any', 'desc': 'Items to join together.', },
                   ),
                   'returns': {'type': 'str', 'desc': 'The joined string.', }}},
-        {'name': 'format', 'desc': '''
-            Format a text string.
-
-            Examples:
-                Format a string with a fixed argument and a variable::
-
-                    storm> $list=(1,2,3,4)
-                         $str=$lib.str.format('Hello {name}, your list is {list}!', name='Reader', list=$list)
-                         $lib.print($str)
-
-                    Hello Reader, your list is ['1', '2', '3', '4']!''',
+        {'name': 'format', 'desc': 'Format a text string.',
+         # 'deprecated': {'eolvers': 'v3.0.0', 'mesg': 'Use ``$mystr.format(foo=$bar)`` instead.'},
          'type': {'type': 'function', '_funcname': 'format',
                   'args': (
                       {'name': 'text', 'type': 'str', 'desc': 'The base text string.', },
@@ -2065,6 +2050,10 @@ class LibStr(Lib):
     )
     _storm_lib_path = ('str',)
 
+    # _lib_str_join_depr_mesg = '$lib.str.join(), use "$sepr.join($items)" instead.'
+    # _lib_str_concat_depr_mesg = "$lib.str.concat(), use ('').join($foo, $bar, $baz, ....) instead."
+    # _lib_str_format_depr_mesg = '$lib.str.format(), use "$mystr.format(foo=$bar)" instead.'
+
     def getObjLocals(self):
         return {
             'join': self.join,
@@ -2074,17 +2063,29 @@ class LibStr(Lib):
 
     @stormfunc(readonly=True)
     async def concat(self, *args):
+        # s_common.deprecated(self._lib_str_concat_depr_mesg)
+        # runt = s_scope.get('runt')
+        # if runt:
+        #     await runt.snap.warnonce(self._lib_str_concat_depr_mesg)
         strs = [await tostr(a) for a in args]
         return ''.join(strs)
 
     @stormfunc(readonly=True)
     async def format(self, text, **kwargs):
+        # s_common.deprecated(self._lib_str_format_depr_mesg)
+        # runt = s_scope.get('runt')
+        # if runt:
+        #     await runt.snap.warnonce(self._lib_str_format_depr_mesg)
         text = await kwarg_format(text, **kwargs)
 
         return text
 
     @stormfunc(readonly=True)
     async def join(self, sepr, items):
+        # s_common.deprecated(self._lib_str_join_depr_mesg)
+        # runt = s_scope.get('runt')
+        # if runt:
+        #     await runt.snap.warnonce(self._lib_str_join_depr_mesg)
         strs = [await tostr(item) async for item in toiter(items)]
         return sepr.join(strs)
 
@@ -7668,10 +7669,18 @@ class Layer(Prim):
                 valu = None
             else:
                 valu = await tostr(await toprim(valu), noneok=True)
+
         elif name == 'logedits':
             valu = await tobool(valu)
+
         elif name == 'readonly':
             valu = await tobool(valu)
+
+        elif name in ('mirror', 'upstream'):
+            if (valu := await toprim(valu)) is not None:
+                mesg = 'Layer only supports setting "mirror" and "upstream" to null.'
+                raise s_exc.BadOptValu(mesg=mesg)
+
         else:
             mesg = f'Layer does not support setting: {name}'
             raise s_exc.BadOptValu(mesg=mesg)

synapse/lib/task.py

@@ -132,12 +132,18 @@ def loop():
     except Exception:
         return None
 
+def syntask(task):
+    '''
+    Return the synapse task associated with the provided asyncio task.
+    '''
+    return getattr(task, '_syn_task', None)
+
 def current():
     '''
     Return the current synapse task.
     '''
     task = asyncio.current_task()
-    return getattr(task, '_syn_task', None)
+    return syntask(task)
 
 def user():
     '''

synapse/lib/time.py

@@ -312,5 +312,11 @@ def toUTC(tick, fromzone):
         mesg = f'Unknown timezone: {fromzone}'
         raise s_exc.BadArg(mesg=mesg) from e
 
-    base = datetime.datetime(1970, 1, 1, tzinfo=tz) + datetime.timedelta(milliseconds=tick)
-    return int(base.astimezone(pytz.UTC).timestamp() * 1000)
+    base = datetime.datetime(1970, 1, 1) + datetime.timedelta(milliseconds=tick)
+    try:
+        localized = tz.localize(base, is_dst=None)
+    except pytz.exceptions.AmbiguousTimeError as e:
+        mesg = f'Ambiguous time: {base} {fromzone}'
+        raise s_exc.BadArg(mesg=mesg) from e
+
+    return int(localized.astimezone(pytz.UTC).timestamp() * 1000)

synapse/lib/version.py

@@ -223,6 +223,6 @@ def reqVersion(valu, reqver,
 ##############################################################################
 # The following are touched during the release process by bumpversion.
 # Do not modify these directly.
-version = (2, 207, 0)
+version = (2, 209, 0)
 verstring = '.'.join([str(x) for x in version])
-commit = 'b5307edb2fd8ba01d47f5f38bcd6033237deda7e'
+commit = '0e5089f5b2e5da0d93c93a99943ebbd5fdb6cb4c'

synapse/lib/view.py

@@ -8,6 +8,7 @@ import synapse.common as s_common
 
 import synapse.lib.cell as s_cell
 import synapse.lib.snap as s_snap
+import synapse.lib.task as s_task
 import synapse.lib.layer as s_layer
 import synapse.lib.nexus as s_nexus
 import synapse.lib.scope as s_scope
@@ -411,7 +412,7 @@ class View(s_nexus.Pusher):  # type: ignore
 
                     nodeedits.append(nodeedit)
 
-                    if len(nodeedits) == 10:
+                    if len(nodeedits) == 5:
                         yield nodeedits
                         nodeedits.clear()
 
@@ -431,7 +432,7 @@ class View(s_nexus.Pusher):  # type: ignore
 
                     meta['time'] = s_common.now()
 
-                    await snap.saveNodeEdits(edits, meta)
+                    await snap._applyNodeEdits(edits, meta)
                     await asyncio.sleep(0)
 
                     count += len(edits)
@@ -1000,7 +1001,11 @@ class View(s_nexus.Pusher):  # type: ignore
         keepalive = opts.get('keepalive')
         if keepalive is not None and keepalive <= 0:
             raise s_exc.BadArg(mesg=f'keepalive must be > 0; got {keepalive}')
-        synt = await self.core.boss.promote('storm', user=user, info=taskinfo, taskiden=taskiden)
+
+        if (synt := s_task.current()) is None:
+            # we only want to promote if we aren't already a syntask because we're probably a worker task that shouldn't
+            # show up in the main task list
+            synt = await self.core.boss.promote('storm', user=user, info=taskinfo, taskiden=taskiden)
 
         show = opts.get('show', set())
 
@@ -1462,8 +1467,6 @@ class View(s_nexus.Pusher):  # type: ignore
         Merge this view into its parent.  All changes made to this view will be applied to the parent.  Parent's
         triggers will be run.
         '''
-        fromlayr = self.layers[0]
-
         if useriden is None:
             user = await self.core.auth.getUserByName('root')
         else:
@@ -1476,10 +1479,25 @@ class View(s_nexus.Pusher):  # type: ignore
 
         async with await self.parent.snap(user=user) as snap:
 
+            async def chunked():
+                nodeedits = []
+
+                async for nodeedit in self.layers[0].iterLayerNodeEdits():
+
+                    nodeedits.append(nodeedit)
+
+                    if len(nodeedits) == 5:
+                        yield nodeedits
+                        nodeedits.clear()
+
+                if nodeedits:
+                    yield nodeedits
+
             meta = await snap.getSnapMeta()
-            async for nodeedits in fromlayr.iterLayerNodeEdits():
+            async for edits in chunked():
                 meta['time'] = s_common.now()
-                await snap.saveNodeEdits([nodeedits], meta)
+                await snap._applyNodeEdits(edits, meta)
+                await asyncio.sleep(0)
 
     async def swapLayer(self):
         oldlayr = self.layers[0]

synapse/tests/test_cortex.py

@@ -1240,7 +1240,7 @@ class CortexTest(s_t_utils.SynTest):
                     $ddef = $lib.dmon.add(${
                         $lib.print(hi)
                         $lib.warn(omg)
-                        $s = $lib.str.format('Running {t} {i}', t=$auto.type, i=$auto.iden)
+                        $s = `Running {$auto.type} {$auto.iden}`
                         $lib.log.info($s, ({"iden": $auto.iden}))
                         $que = $lib.queue.get(foo)
                         $que.put(done)
@@ -5224,7 +5224,7 @@ class CortexBasicTest(s_t_utils.SynTest):
             self.len(1, nodes)
             self.nn(nodes[0].getTag('bar'))
 
-            q = '[test:str=yop +#$lib.str.format("{first}.{last}", first=foo, last=bar)]'
+            q = '$t="{first}.{last}" [test:str=yop +#$t.format(first=foo, last=bar)]'
             nodes = await core.nodes(q)
             self.len(1, nodes)
             self.nn(nodes[0].getTag('foo.bar'))
@@ -5695,7 +5695,7 @@ class CortexBasicTest(s_t_utils.SynTest):
             self.len(1, nodes)
 
     async def test_storm_order(self):
-        q = '''[test:str=foo :hehe=bar] $tvar=() $tvar.append(1) $tvar.append(:hehe) $lib.print($lib.str.join('', $tvar)) '''
+        q = '''[test:str=foo :hehe=bar] $tvar=() $tvar.append(1) $tvar.append(:hehe) $lib.print(('').join($tvar)) '''
         async with self.getTestCore() as core:
             mesgs = await core.stormlist(q)
             self.stormIsInPrint('1bar', mesgs)
@@ -7731,7 +7731,7 @@ class CortexBasicTest(s_t_utils.SynTest):
                     $ddef = $lib.dmon.add(${
                         $lib.print(hi)
                         $lib.warn(omg)
-                        $s = $lib.str.format('Running {t} {i}', t=$auto.type, i=$auto.iden)
+                        $s = `Running {$auto.type} {$auto.iden}`
                         $lib.log.info($s, ({"iden": $auto.iden}))
                     })
                 ''')

synapse/tests/test_datamodel.py

@@ -299,7 +299,7 @@ class DataModelTest(s_t_utils.SynTest):
             syn:type:subof=comp $opts=:opts
             -> syn:form:type $valu=$node.value()
             for ($name, $thing) in $opts.fields {
-                $v=$lib.str.format('{v}:{t}', v=$valu, t=$name)  syn:prop=$v
+                $v=`{$valu}:{$name}`  syn:prop=$v
             }
             +syn:prop
             -:ro=1

synapse/tests/test_lib_ast.py

@@ -74,9 +74,9 @@ foo_stormpkg = {
             }
 
             function outer(arg1, add) {
-                $strbase = $lib.str.format("(Run: {c}) we got back ", c=$counter)
+                $strbase = `(Run: {$counter}) we got back `
                 $reti = $inner($arg1, $add)
-                $mesg = $lib.str.concat($strbase, $reti)
+                $mesg = `{$strbase}{$reti}`
                 $counter = $( $counter + $add )
                 $lib.print("foobar is {foobar}", foobar=$foobar)
                 return ($mesg)
@@ -296,7 +296,7 @@ class AstTest(s_test.SynTest):
                 $newvar=:hehe
                 -.created
                 $s.append("yar {x}", x=$newvar)
-                $lib.print($lib.str.join('', $s))
+                $lib.print(('').join($s))
             '''
             mesgs = await core.stormlist(q)
             prints = [m[1]['mesg'] for m in mesgs if m[0] == 'print']
@@ -2029,7 +2029,7 @@ class AstTest(s_test.SynTest):
             q = '$val=$lib.base64.decode("dmlzaQ==") function x(parm1=$val) { return($parm1) }'
             self.len(0, await core.nodes(q))
 
-            self.eq('foo', await core.callStorm('return($lib.str.format("{func}", func=foo))'))
+            self.eq('foo', await core.callStorm('$template="{func}" return($template.format(func=foo))'))
 
             msgs = await core.stormlist('$lib.null()')
             erfo = [m for m in msgs if m[0] == 'err'][0]
@@ -3580,7 +3580,7 @@ class AstTest(s_test.SynTest):
 
             q = '''
             init { $foo = bar }
-            init { $baz = $lib.str.format('foo={foo}', foo=$foo) }
+            init { $baz = `foo={$foo}` }
             $lib.print($baz)
             '''
             msgs = await core.stormlist(q)

synapse/tests/test_lib_boss.py

@@ -56,8 +56,8 @@ class BossTest(s_test.SynTest):
                 iden = s_common.guid()
 
                 async def double_promote():
-                    await boss.promote(f'double', root, taskiden=iden)
-                    await boss.promote(f'double', root, taskiden=iden + iden)
+                    await boss.promote('double', root, taskiden=iden)
+                    await boss.promote('double', root, taskiden=iden + iden)
 
                 coro = boss.schedCoro(double_promote())
                 self.true(await stream.wait(timeout=6))