cco/py-scopes
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

util, core: improve keyword definitions and handling

Browse source
This commit is contained in:
Helmut Merz 2026-10-24 09:36:17 +02:00
parent 9ee4dd73aa
commit 334df9afbd
4 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scopes/core/core.py
View file

@ -13,14 +13,12 @@ from scopes.core.message import Message
from scopes import util from scopes import util
from scopes.util import keywords as k, Symbol, Symbols from scopes.util import keywords as k, Symbol, Symbols
# keywords (domains, actions, categories, stages): # keywords (domains, actions, categories, stages, data keys):
k('csys', 'env', k('csys env',
'connect', 'create', 'created', 'data', 'default', 'value', 'connect create created data default value',
'c00', 'e00', 's00', 'c00 e00 s00',
'initial', 'active', 'retired') 'initial active retired',
'address pred succ')
dom = util.Symbols('dom')('csys', 'env')
cat = util.Symbols('cat')('c00', 'e00', 's00')
type Mailbox = asyncio.Queue type Mailbox = asyncio.Queue
type Categ = tuple[Symbol, Symbol] type Categ = tuple[Symbol, Symbol]
@ -61,7 +59,7 @@ def notify() -> Handler:
def gen_proc(actions: Actions, default: Handlers = notify(), def gen_proc(actions: Actions, default: Handlers = notify(),
prepare: Handlers = None, finalize: Handlers = None) -> Proc: prepare: Handlers = None, finalize: Handlers = None) -> Proc:
async def proc(msg: Message, scope: Scope) -> Scope: async def proc(msg: Message, scope: Scope) -> Scope:
acts = actions.get(msg.head.action, actions.get(k.default, default)) acts = actions.get(msg.action, actions.get(k.default, default))
acts = util.flatten(prepare, acts, finalize, ignore_none=True) acts = util.flatten(prepare, acts, finalize, ignore_none=True)
for act in acts: for act in acts:
msg = await act(msg, scope) msg = await act(msg, scope)
@ -87,7 +85,7 @@ def gen_program(spec: ProgramSpec, default: Proc = gen_proc({})) -> Program:
class Scope: class Scope:
value: Any = 0 value: Any = 0
categ: Categ = (k.csys, cat.c00) categ: Categ = (k.csys, k.c00)
stage: Symbol = k.initial stage: Symbol = k.initial
proc: Proc = field(init=False) proc: Proc = field(init=False)
program: Program = gen_program({}) program: Program = gen_program({})
@ -101,7 +99,7 @@ class Scope:
self.proc = self.program(self) self.proc = self.program(self)
return self return self
def create_scope(env: Mailbox, cat: Categ = (k.csys, cat.c00), **kw) -> Scope: def create_scope(env: Mailbox, cat: Categ = (k.csys, k.c00), **kw) -> Scope:
return Scope(environ=env, categ=cat, **kw) return Scope(environ=env, categ=cat, **kw)
def clone_scope(scope: Scope, **kw) -> Scope: def clone_scope(scope: Scope, **kw) -> Scope:
@ -109,7 +107,7 @@ def clone_scope(scope: Scope, **kw) -> Scope:
categ = kw.get('categ', scope.categ) categ = kw.get('categ', scope.categ)
stage = kw.get('stage', k.initial) stage = kw.get('stage', k.initial)
return Scope(environ=scope.environ, value=value, categ=categ, stage=stage, return Scope(environ=scope.environ, value=value, categ=categ, stage=stage,
program=scope.program, syns=[], **kw) program=scope.program, syns=[])
async def create_zero(env: Mailbox) -> Mailbox: async def create_zero(env: Mailbox) -> Mailbox:
scope = create_scope(env, program=gen_program({}, default=std_proc())) scope = create_scope(env, program=gen_program({}, default=std_proc()))
@ -155,6 +153,6 @@ def std_proc(actions: Actions | None = None, finalize: Handler = forward(),
# helpers # helpers
async def notify_created(msg: Message, new: Mailbox, scope: Scope) -> None: async def notify_created(msg: Message, new: Mailbox, scope: Scope) -> None:
msg = Message(msg.head.domain, k.created, data=msg.data | {k.new: new}) msg = Message(msg.domain, k.created, data=msg.data | {k.new: new})
await scope.environ.put(msg) await scope.environ.put(msg)

14
scopes/util.py
View file

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

4
tests/test_core.py
View file

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

9
tests/test_util.py
View file

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