synapse 2.196.0__py311-none-any.whl → 2.197.0__py311-none-any.whl

synapse/models/doc.py

@@ -77,6 +77,30 @@ class DocModule(s_module.CoreModule):
                         'documents': 'standards',
                         'type': 'doc:standard:type:taxonomy'},
                     'doc': 'A group of requirements which define how to implement a policy or goal.'}),
+
+                ('doc:requirement:type:taxonomy', ('taxonomy', {}), {
+                    'interfaces': ('meta:taxonomy',),
+                    'doc': 'A taxonomy of requirement types.'}),
+
+                ('doc:requirement', ('guid', {}), {
+                    'interfaces': ('doc:document',),
+                    'template': {
+                        'document': 'requirement',
+                        'documents': 'requirements',
+                        'type': 'doc:requirement:type:taxonomy'},
+                    'doc': 'A single requirement, often defined by a standard.'}),
+
+                ('doc:resume:type:taxonomy', ('taxonomy', {}), {
+                    'interfaces': ('meta:taxonomy',),
+                    'doc': 'A taxonomy of resume types.'}),
+
+                ('doc:resume', ('guid', {}), {
+                    'interfaces': ('doc:document',),
+                    'template': {
+                        'document': 'resume',
+                        'documents': 'resumes',
+                        'type': 'doc:resume:type:taxonomy'},
+                    'doc': 'A CV/resume document.'}),
             ),
             'forms': (
 
@@ -88,6 +112,44 @@ class DocModule(s_module.CoreModule):
                     ('policy', ('doc:policy', {}), {
                         'doc': 'The policy which was used to derive the standard.'}),
                 )),
+
+                ('doc:requirement:type:taxonomy', {}, ()),
+                ('doc:requirement', {}, (
+
+                    ('summary', ('str', {}), {
+                        'disp': {'hint': 'text'},
+                        'doc': 'A summary of the requirement definition.'}),
+
+                    ('optional', ('bool', {}), {
+                        'doc': 'Set to true if the requirement is optional as defined by the standard.'}),
+
+                    ('priority', ('meta:priority', {}), {
+                        'doc': 'The priority of the requirement as defined by the standard.'}),
+
+                    ('standard', ('doc:standard', {}), {
+                        'doc': 'The standard which defined the requirement.'}),
+                )),
+
+                ('doc:resume:type:taxonomy', {}, ()),
+                ('doc:resume', {}, (
+
+                    ('contact', ('ps:contact', {}), {
+                        'doc': 'Contact information for subject of the resume.'}),
+
+                    ('summary', ('str', {}), {
+                        'disp': {'hint': 'text'},
+                        'doc': 'The summary of qualifications from the resume.'}),
+
+                    ('workhist', ('array', {'type': 'ps:workhist', 'sorted': True, 'uniq': True}), {
+                        'doc': 'Work history described in the resume.'}),
+
+                    ('education', ('array', {'type': 'ps:education', 'sorted': True, 'uniq': True}), {
+                        'doc': 'Education experience described in the resume.'}),
+
+                    ('achievements', ('array', {'type': 'ps:achievement', 'sorted': True, 'uniq': True}), {
+                        'doc': 'Achievements described in the resume.'}),
+
+                )),
             ),
             'edges': (),
         }),)

synapse/models/orgs.py

@@ -93,9 +93,10 @@ class OuModule(s_module.CoreModule):
                 ('ou:industryname', ('str', {'lower': True, 'onespace': True}), {
                     'doc': 'The name of an industry.',
                 }),
-                ('ou:alias', ('str', {'lower': True, 'regex': r'^[0-9a-z_]+$'}), {
-                    'doc': 'An alias for the org GUID.',
+                ('ou:alias', ('str', {'lower': True, 'regex': r'^[\w0-9_]+$'}), {
+                    'deprecated': True,
                     'ex': 'vertexproject',
+                    'doc': 'Deprecated. Please use ou:name.',
                 }),
                 ('ou:hasalias', ('comp', {'fields': (('org', 'ou:org'), ('alias', 'ou:alias'))}), {
                     'deprecated': True,
@@ -762,7 +763,8 @@ class OuModule(s_module.CoreModule):
                        'doc': 'A list of alternate names for the organization.',
                     }),
                     ('alias', ('ou:alias', {}), {
-                        'doc': 'The default alias for an organization.'
+                        'deprecated': True,
+                        'doc': 'Deprecated. Please use ou:org:names.',
                     }),
                     ('phone', ('tel:phone', {}), {
                         'doc': 'The primary phone number for the organization.',
@@ -1373,7 +1375,7 @@ class OuModule(s_module.CoreModule):
                     ('org', ('ou:org', {}), {
                         'doc': 'The organization which is enacting the document.'}),
 
-                    ('doc', ('ndef', {'forms': ('doc:policy', 'doc:standard')}), {
+                    ('doc', ('ndef', {'forms': ('doc:policy', 'doc:standard', 'doc:requirement')}), {
                         'doc': 'The document enacted by the organization.'}),
 
                     ('scope', ('ndef', {}), {

synapse/tests/test_datamodel.py

@@ -2,6 +2,7 @@ import synapse.exc as s_exc
 import synapse.datamodel as s_datamodel
 
 import synapse.lib.module as s_module
+import synapse.lib.schemas as s_schemas
 
 import synapse.cortex as s_cortex
 
@@ -342,3 +343,9 @@ class DataModelTest(s_t_utils.SynTest):
             nodes = await core.nodes('[ it:prod:softver=* :semver=3.1.0 ]')
             self.none(nodes[0].get('semver:major'))
             self.eq(1, nodes[0].get('semver:minor'))
+
+    def test_datamodel_schema_basetypes(self):
+        # N.B. This test is to keep synapse.lib.schemas.datamodel_basetypes const
+        # in sync with the default s_datamodel.Datamodel().types
+        basetypes = list(s_datamodel.Model().types)
+        self.eq(s_schemas.datamodel_basetypes, basetypes)

synapse/tests/test_lib_aha.py

@@ -1434,46 +1434,6 @@ class AhaTest(s_test.SynTest):
             self.len(nexsindx, items)
             self.true(all(item[1][0] for item in items))
 
-            # test some of the gather API implementations...
-            purl00 = await aha.addAhaSvcProv('0.cell')
-            purl01 = await aha.addAhaSvcProv('1.cell', provinfo={'mirror': '0.cell'})
-
-            cell00 = await aha.enter_context(self.getTestCell(conf={'aha:provision': purl00}))
-            cell01 = await aha.enter_context(self.getTestCell(conf={'aha:provision': purl01}))
-
-            await cell01.sync()
-
-            async def sleep99(cell):
-                await cell.boss.promote('sleep99', cell.auth.rootuser)
-                await cell00.fire('sleep99')
-                await asyncio.sleep(99)
-
-            async with cell00.waiter(2, 'sleep99', timeout=2):
-                task00 = cell00.schedCoro(sleep99(cell00))
-                task01 = cell01.schedCoro(sleep99(cell01))
-
-            proxy = await aha.enter_context(aha.getLocalProxy())
-            tasks = [task async for task in cell00.getTasks(timeout=3)]
-            self.len(2, tasks)
-            self.eq(tasks[0]['service'], '0.cell.synapse')
-            self.eq(tasks[1]['service'], '1.cell.synapse')
-
-            self.eq(tasks[0], await cell00.getTask(tasks[0].get('iden')))
-            self.eq(tasks[1], await cell00.getTask(tasks[1].get('iden')))
-            self.none(await cell00.getTask(tasks[1].get('iden'), peers=False))
-
-            self.true(await cell00.killTask(tasks[0].get('iden')))
-
-            task01 = tasks[1].get('iden')
-            self.false(await cell00.killTask(task01, peers=False))
-
-            self.true(await cell00.killTask(task01))
-
-            self.none(await cell00.getTask(task01))
-            self.false(await cell00.killTask(task01))
-
-            self.none(await cell00.getAhaProxy(feats=(('newp', 9),)))
-
     async def test_lib_aha_peer_api(self):
 
         async with self.getTestAha() as aha:

synapse/tests/test_lib_boss.py

@@ -3,13 +3,21 @@ import asyncio
 import synapse.exc as s_exc
 import synapse.common as s_common
 import synapse.lib.boss as s_boss
+import synapse.lib.cell as s_cell
 import synapse.tests.utils as s_test
 
+class BossCell(s_cell.Cell):
+    async def initServiceRuntime(self):
+        self.cboss = await s_boss.Boss.anit()
+        self.onfini(self.cboss)
+
 class BossTest(s_test.SynTest):
 
     async def test_boss_base(self):
 
-        async with await s_boss.Boss.anit() as boss:
+        async with self.getTestCell(BossCell) as bcell:
+            boss = bcell.cboss
+            root = await bcell.auth.getUserByName('root')
 
             evnt = asyncio.Event()
 
@@ -20,18 +28,19 @@ class BossTest(s_test.SynTest):
 
             self.len(0, boss.ps())
 
-            synt = await boss.promote('test', None, info={'hehe': 'haha'})
+            synt = await boss.promote('test', root, info={'hehe': 'haha'})
 
             self.len(1, boss.ps())
 
             self.eq('test', synt.name)
             self.eq('haha', synt.info.get('hehe'))
+            self.eq(root.iden, synt.user.iden)
 
-            synt0 = await boss.execute(testloop(), 'testloop', None, info={'foo': 'bar'})
+            synt0 = await boss.execute(testloop(), 'testloop', root, info={'foo': 'bar'})
             iden = synt0.iden
 
             with self.raises(s_exc.BadArg):
-                _ = await boss.execute(asyncio.sleep(1), 'testsleep', None, iden=iden)
+                _ = await boss.execute(asyncio.sleep(1), 'testsleep', root, iden=iden)
 
             await evnt.wait()
 
@@ -47,8 +56,8 @@ class BossTest(s_test.SynTest):
                 iden = s_common.guid()
 
                 async def double_promote():
-                    await boss.promote(f'double', None, taskiden=iden)
-                    await boss.promote(f'double', None, taskiden=iden + iden)
+                    await boss.promote(f'double', root, taskiden=iden)
+                    await boss.promote(f'double', root, taskiden=iden + iden)
 
                 coro = boss.schedCoro(double_promote())
                 self.true(await stream.wait(timeout=6))

synapse/tests/test_lib_cell.py

@@ -3417,3 +3417,46 @@ class CellTest(s_t_utils.SynTest):
                 pass
             async for item in cell.callPeerGenr(todo):
                 pass
+
+    async def test_cell_task_apis(self):
+        async with self.getTestAha() as aha:
+
+            # test some of the gather API implementations...
+            purl00 = await aha.addAhaSvcProv('00.cell')
+            purl01 = await aha.addAhaSvcProv('01.cell', provinfo={'mirror': 'cell'})
+
+            cell00 = await aha.enter_context(self.getTestCell(conf={'aha:provision': purl00}))
+            cell01 = await aha.enter_context(self.getTestCell(conf={'aha:provision': purl01}))
+
+            await cell01.sync()
+
+            async def sleep99(cell):
+                await cell.boss.promote('sleep99', cell.auth.rootuser)
+                await cell00.fire('sleep99')
+                await asyncio.sleep(99)
+
+            async with cell00.waiter(2, 'sleep99', timeout=6):
+                task00 = cell00.schedCoro(sleep99(cell00))
+                task01 = cell01.schedCoro(sleep99(cell01))
+
+            tasks = [task async for task in cell00.getTasks(timeout=6)]
+
+            self.len(2, tasks)
+            self.eq(tasks[0]['service'], '00.cell.synapse')
+            self.eq(tasks[1]['service'], '01.cell.synapse')
+            self.eq(('sleep99', 'sleep99'), [task.get('name') for task in tasks])
+            self.eq(('root', 'root'), [task.get('username') for task in tasks])
+
+            self.eq(tasks[0], await cell00.getTask(tasks[0].get('iden')))
+            self.eq(tasks[1], await cell00.getTask(tasks[1].get('iden')))
+            self.none(await cell00.getTask(tasks[1].get('iden'), peers=False))
+
+            self.true(await cell00.killTask(tasks[0].get('iden')))
+
+            task01 = tasks[1].get('iden')
+            self.false(await cell00.killTask(task01, peers=False))
+
+            self.true(await cell00.killTask(task01))
+
+            self.none(await cell00.getTask(task01))
+            self.false(await cell00.killTask(task01))

synapse/tests/test_lib_stormlib_index.py

@@ -0,0 +1,39 @@
+import synapse.tests.utils as s_test
+
+count_prop_00 = '''
+ Count        | Layer Iden                       | Layer Name
+==============|==================================|============
+ 16           | 5cc56afbb22fad9b96c51110812af8f7 |
+ 16           | 2371390b1fd0162ba6820f85a863e7b2 | default
+Total: 32
+'''
+
+count_prop_01 = '''
+ Count        | Layer Iden                       | Layer Name
+==============|==================================|============
+ 16           | 9782c920718d3059b8806fddaf917bd8 |
+ 0            | 511122a9b2d576c5be2cdfcaef541bb9 | default
+Total: 16
+'''
+
+class StormIndexTest(s_test.SynTest):
+
+    async def test_lib_stormlib_index(self):
+
+        async with self.getTestCore() as core:
+            viewiden = await core.callStorm('return($lib.view.get().fork().iden)')
+            viewopts = {'view': viewiden}
+            await core.nodes('[ inet:ipv4=1.2.3.0/28 :asn=19 ]')
+            await core.nodes('[ inet:ipv4=1.2.4.0/28 :asn=42 ]', opts=viewopts)
+
+            msgs = await core.stormlist('index.count.prop inet:ipv4', opts=viewopts)
+            self.stormIsInPrint(count_prop_00, msgs, deguid=True, whitespace=False)
+
+            msgs = await core.stormlist('index.count.prop inet:ipv4:asn', opts=viewopts)
+            self.stormIsInPrint(count_prop_00, msgs, deguid=True, whitespace=False)
+
+            msgs = await core.stormlist('index.count.prop inet:ipv4:asn --value 42', opts=viewopts)
+            self.stormIsInPrint(count_prop_01, msgs, deguid=True, whitespace=False)
+
+            msgs = await core.stormlist('index.count.prop inet:ipv4:newp', opts=viewopts)
+            self.stormIsInErr('No property named inet:ipv4:newp', msgs)

synapse/tests/test_lib_task.py

@@ -2,12 +2,14 @@ import asyncio
 
 import synapse.exc as s_exc
 import synapse.lib.boss as s_boss
+import synapse.lib.cell as s_cell
 import synapse.lib.task as s_task
 import synapse.tests.utils as s_test
 
-class FakeUser:
-    def __init__(self, name):
-        self.name = name
+class BossCell(s_cell.Cell):
+    async def initServiceRuntime(self):
+        self.cboss = await s_boss.Boss.anit()
+        self.onfini(self.cboss)
 
 class TaskTest(s_test.SynTest):
 
@@ -19,15 +21,27 @@ class TaskTest(s_test.SynTest):
 
     async def test_task_module(self):
 
-        async with await s_boss.Boss.anit() as boss:
+        async with self.getTestCell(BossCell) as bcell:
+            boss = bcell.cboss
+            root = await bcell.auth.getUserByName('root')
 
-            user = FakeUser('visi')
+            synt = await boss.promote('test', root, info={'hehe': 'haha'})
 
-            synt = await boss.promote('test', user, info={'hehe': 'haha'})
-
-            self.eq(s_task.user(), user)
+            self.eq(s_task.user(), root)
             self.eq(s_task.current(), synt)
-            self.eq(s_task.username(), 'visi')
+            self.eq(s_task.username(), 'root')
+
+            ret = synt.pack()
+            self.nn(ret.pop('iden'))
+            self.nn(ret.pop('tick'))
+            self.eq(ret, {'name': 'test', 'info': {'hehe': 'haha'},
+                          'user': 'root', 'kids': {}})
+
+            ret = synt.packv2()
+            self.nn(ret.pop('iden'))
+            self.nn(ret.pop('tick'))
+            self.eq(ret, {'name': 'test', 'info': {'hehe': 'haha'},
+                          'user': root.iden, 'username': 'root', 'kids': {}})
 
     async def test_taskvars(self):
         s_task.varset('test', 'foo')
@@ -51,7 +65,11 @@ class TaskTest(s_test.SynTest):
         self.eq(s_task.varget('test'), 'foo')
 
     async def test_task_iden(self):
-        with self.raises(s_exc.BadArg):
-            await s_task.Task.anit(None, asyncio.current_task(), None, None, iden=10)
-        with self.raises(s_exc.BadArg):
-            await s_task.Task.anit(None, asyncio.current_task(), None, None, iden='woot')
+        async with self.getTestCell(BossCell) as bcell:
+            root = await bcell.auth.getUserByName('root')
+            boss = bcell.cboss
+
+            with self.raises(s_exc.BadArg):
+                await s_task.Task.anit(boss, asyncio.current_task(), None, root, iden=10)
+            with self.raises(s_exc.BadArg):
+                await s_task.Task.anit(boss, asyncio.current_task(), None, root, iden='woot')

synapse/tests/test_model_doc.py

@@ -49,3 +49,41 @@ class DocModelTest(s_tests.SynTest):
             self.eq('V-99', nodes[0].get('id'))
             self.nn(nodes[0].get('policy'))
             self.len(1, await core.nodes('doc:standard -> doc:policy'))
+
+            nodes = await core.nodes('''
+                [ doc:requirement=*
+                    :id=V-99
+                    :priority=low
+                    :optional=(false)
+                    :summary="Some requirement text."
+                    :standard={doc:standard}
+                ]
+            ''')
+            self.eq('V-99', nodes[0].get('id'))
+            self.eq('Some requirement text.', nodes[0].get('summary'))
+            self.eq(20, nodes[0].get('priority'))
+            self.false(nodes[0].get('optional'))
+            self.nn(nodes[0].get('standard'))
+            self.len(1, await core.nodes('doc:requirement -> doc:standard'))
+
+            nodes = await core.nodes('''
+                [ doc:resume=*
+                    :id=V-99
+                    :contact={[ ps:contact=* :name=visi ]}
+                    :summary="Thought leader seeks..."
+                    :workhist={[ ps:workhist=* ]}
+                    :education={[ ps:education=* ]}
+                    :achievements={[ ps:achievement=* ]}
+                ]
+            ''')
+            self.eq('V-99', nodes[0].get('id'))
+            self.eq('Thought leader seeks...', nodes[0].get('summary'))
+            self.nn(nodes[0].get('contact'))
+            self.len(1, nodes[0].get('workhist'))
+            self.len(1, nodes[0].get('education'))
+            self.len(1, nodes[0].get('achievements'))
+
+            self.len(1, await core.nodes('doc:resume :contact -> ps:contact'))
+            self.len(1, await core.nodes('doc:resume :workhist -> ps:workhist'))
+            self.len(1, await core.nodes('doc:resume :education -> ps:education'))
+            self.len(1, await core.nodes('doc:resume :achievements -> ps:achievement'))

synapse/tests/test_model_orgs.py

@@ -183,6 +183,13 @@ class OuModelTest(s_t_utils.SynTest):
             self.eq(t.norm('HAHA1')[0], 'haha1')
             self.eq(t.norm('GOV_MFA')[0], 'gov_mfa')
 
+            # ou:org:alias (unicode test)
+            nodes = await core.nodes('''
+                [ ou:org=* :alias="ÅÆØåæø" ]
+            ''')
+            self.len(1, nodes)
+            self.eq(t.norm('ÅÆØåæø')[0], 'åæøåæø')
+
             # ou:position / ou:org:subs
             orgiden = s_common.guid()
             contact = s_common.guid()

synapse/tools/genpkg.py

@@ -12,10 +12,10 @@ import synapse.exc as s_exc
 import synapse.common as s_common
 import synapse.telepath as s_telepath
 
-import synapse.lib.storm as s_storm
 import synapse.lib.output as s_output
 import synapse.lib.certdir as s_certdir
 import synapse.lib.dyndeps as s_dyndeps
+import synapse.lib.schemas as s_schemas
 
 logger = logging.getLogger(__name__)
 
@@ -221,7 +221,7 @@ def loadPkgProto(path, opticdir=None, no_docs=False, readonly=False):
         pkgdef['optic'].setdefault('files', {})
         loadOpticFiles(pkgdef, opticdir)
 
-    s_storm.reqValidPkgdef(pkgdef)
+    s_schemas.reqValidPkgdef(pkgdef)
 
     # Ensure the package is json safe and tuplify it.
     s_common.reqJsonSafeStrict(pkgdef)

{synapse-2.196.0.dist-info → synapse-2.197.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: synapse
-Version: 2.196.0
+Version: 2.197.0
 Summary: Synapse Intelligence Analysis Framework
 Author-email: The Vertex Project LLC <root@vertex.link>
 License: Apache License 2.0