scopes/core/core.py

@@ -13,12 +13,14 @@ from scopes.core.message import Message
 from scopes import util
 from scopes.util import keywords as k, Symbol, Symbols
 
-# keywords (domains, actions, classes, stages, data keys):
-k('csys ctl env',
-  'connect create created data default query set value',
-  'c00 e00 s00 rcvr op',
-  'initial active retired',
-  'address pred succ')
+# keywords (domains, actions, categories, stages):
+k('csys', 'env',
+  'connect', 'create', 'created', 'data', 'default', 'value',
+  'c00', 'e00', 's00',
+  'initial', 'active', 'retired')
+
+dom = util.Symbols('dom')('csys', 'env')
+cat = util.Symbols('cat')('c00', 'e00', 's00')
 
 type Mailbox = asyncio.Queue
 type Categ = tuple[Symbol, Symbol]
@@ -52,14 +54,14 @@ def synapse(rcvr: Mailbox, op: SynOp = lambda x: x) -> Syn:
 env_dummy: Mailbox = asyncio.Queue()
 
 def notify() -> Handler:
-    async def handle(msg: Message, scope: Scope) -> None:
+    async def handle(msg, scope) -> None:
         await scope.environ.put(msg)
     return handle
 
 def gen_proc(actions: Actions, default: Handlers = notify(),
              prepare: Handlers = None, finalize: Handlers = None) -> Proc:
     async def proc(msg: Message, scope: Scope) -> Scope:
-        acts = actions.get(msg.action, actions.get(k.default, default))
+        acts = actions.get(msg.head.action, actions.get(k.default, default))
         acts = util.flatten(prepare, acts, finalize, ignore_none=True)
         for act in acts:
             msg = await act(msg, scope)
@@ -85,7 +87,7 @@ def gen_program(spec: ProgramSpec, default: Proc = gen_proc({})) -> Program:
 class Scope:
 
     value: Any = 0
-    categ: Categ = (k.csys, k.c00)
+    categ: Categ = (k.csys, cat.c00)
     stage: Symbol = k.initial
     proc: Proc = field(init=False)
     program: Program = gen_program({})
@@ -99,7 +101,7 @@ class Scope:
         self.proc = self.program(self)
         return self
 
-def create_scope(env: Mailbox, cat: Categ = (k.csys, k.c00), **kw) -> Scope:
+def create_scope(env: Mailbox, cat: Categ = (k.csys, cat.c00), **kw) -> Scope:
     return Scope(environ=env, categ=cat, **kw)
 
 def clone_scope(scope: Scope, **kw) -> Scope:
@@ -107,7 +109,7 @@ def clone_scope(scope: Scope, **kw) -> Scope:
     categ = kw.get('categ', scope.categ)
     stage = kw.get('stage', k.initial)
     return Scope(environ=scope.environ, value=value, categ=categ, stage=stage, 
-                 program=scope.program, syns=[])
+                 program=scope.program, syns=[], **kw)
 
 async def create_zero(env: Mailbox) -> Mailbox:
     scope = create_scope(env, program=gen_program({}, default=std_proc()))
@@ -118,33 +120,27 @@ async def create_zero(env: Mailbox) -> Mailbox:
 # predefined action handlers and Action sets
 
 def forward() -> Handler:
-    async def handle(msg: Message, scope: Scope) -> None:
+    async def handle(msg, scope) -> None:
         for syn in scope.syns:
             await syn(msg)
     return handle
 
 def value_add() -> Handler:
-    async def handle(msg: Message, scope: Scope) -> tuple[Message, Scope]:
+    async def handle(msg, scope) -> tuple[Message, Scope]:
         return msg, scope
     return handle
 
 def create() -> Handler:
-    async def handle(msg: Message, scope: Scope) -> None:
+    async def handle(msg, scope) -> None:
         new = neuron(clone_scope(scope, **msg.data))
         await notify_created(msg, new, scope)
-        conn = msg.data.get(k.connect)
-    return handle
-
-def connect() -> Handler:
-    async def handle(msg: Message, scope: Scope) -> None:
         return None
     return handle
 
 def basic_actions() -> Actions:
     acts: Actions = {
         k.value: value_add(),
-        k.create: create(),
-        k.connect: connect()
+        k.create: create()
     }
     return acts
 
@@ -153,13 +149,12 @@ def basic_actions() -> Actions:
 def std_proc(actions: Actions | None = None, finalize: Handler = forward(), 
              more: Actions = {}) -> Proc:
     if actions is None:
-        actions = basic_actions()
-    actions.update(more)
+        actions = basic_actions() | more
     return gen_proc(actions, finalize=finalize)
 
 # helpers
 
 async def notify_created(msg: Message, new: Mailbox, scope: Scope) -> None:
-    msg = Message(msg.domain, k.created, data=msg.data | {k.new: new})
+    msg = Message(msg.head.domain, k.created, data=msg.data | {k.new: new})
     await scope.environ.put(msg)
 

scopes/core/environ.py

@@ -7,22 +7,8 @@ from scopes.core import actor
 from scopes.core.message import Message
 from scopes.util import keywords as k
 
-def create_env(meta_env: core.Mailbox) -> core.Mailbox:
+def create(meta_env: core.Mailbox) -> core.Mailbox:
     scope = core.create_scope(meta_env, (k.env, k.c00), 
-                              program=core.gen_program({}, default=env_proc()))
+                              program=core.gen_program({}))
     return core.neuron(scope)
 
-def env_proc() -> core.Proc:
-    return core.gen_proc(env_actions(), default=None, finalize=core.notify())
-
-def handle_created() -> core.Handler:
-    async def handle(msg: Message, scope: core.Scope) -> Message:
-        return msg
-    return handle
-
-def env_actions() -> core.Actions:
-    return {
-        k.created: handle_created(),
-    }
-
-

scopes/util.py

@@ -15,14 +15,14 @@ class Symbol(str):
 
 class Symbols:
 
-    def __init__(self, ns=None):
-        self.__prefix = ns + '.' if ns else ''
+    def __init__(self, prefix=None):
+        self.__prefix = prefix
 
-    def __call__(self, *keys):
-        for segment in keys:
-            for key in segment.split():
-                if not hasattr(self, key):
-                    setattr(self, key, Symbol(self.__prefix + key))
+    def __call__(self, *ks):
+        prefix = self.__prefix + '.' if self.__prefix else ''
+        for k in ks:
+            if not hasattr(self, k):
+                setattr(self, k, Symbol(prefix + k))
         return self
 
     def __getattr__(self, k):

tests/test_core.py

@@ -67,12 +67,12 @@ async def meta_env(collector):
 
 @pytest.mark.anyio
 async def test_core(meta_env, collector):
-    env = environ.create_env(meta_env)
+    env = environ.create(meta_env)
     zero = await core.create_zero(env)
     await env.put(Message(k.env, k.hello))
     await zero.put(Message(k.csys, k.hello))
-    await zero.put(Message(k.csys, k.create,
-                           data={k.connect: k.pred, k.address: (1, 1)}))
+    await zero.put(Message(k.csys, k.create))
+                           #data={k.connect: k.pred, k.address: (1, 1)}))
     await asyncio.sleep(0.01)
     assert len(collector) == 4
     assert collector[0].action is k.created

tests/test_util.py

@@ -4,24 +4,15 @@
 
 import pytest
 
-from scopes.util import keywords as k, flatten, Symbols
-
-k('dummy other', 'cd', 'new', 'erp')
-
-dom = Symbols('dom')('crm erp sys')
+from scopes.util import keywords as k, flatten
+k('dummy', 'other', 'cd', 'new')
 
 def test_keywords():
-    assert k.dummy == 'dummy'
-    assert k.dummy is not 'dummy'
     assert k.dummy is k.dummy
     assert k.dummy is not k.other
     assert getattr(k, "abcd"[-2:]) is k.cd
     assert k['dummy'] is k.dummy
     assert k['new'] is k['new']
-    assert dom.erp == 'dom.erp'
-    assert dom.erp is not 'dom.erp'
-    assert repr(dom.erp) == '<dom.erp>'
-    assert dom.erp != k.erp
 
 def test_flatten():
     lst = (1, (None, 2), (3, (4, 5)))