work in progress: core package: add Scope class, rearrange tests, add type annotations

apidemo/__init__.py

@@ -0,0 +1 @@
+# py-scopes: apidemo

demo/__init__.py

@@ -0,0 +1,2 @@
+# py-scopes: demo
+

scopes/core/__init__.py

@@ -1 +1,4 @@
 """package scopes.core"""
+
+from .core import *
+

scopes/core/actor.py

@@ -14,7 +14,7 @@ async def loop(q, bhv):
 def create(bhv, group=None):
     q = asyncio.Queue()
     if group is None:
-        return q, asyncio.create_task(loop(q, bhv))
+        asyncio.create_task(loop(q, bhv))
     else:
         group.create_task(loop(q, bhv))
     return q

scopes/core/core.py

@@ -0,0 +1,22 @@
+# scopes.core.core
+
+"""The scopes.core package"""
+
+import asyncio
+from dataclasses import dataclass
+from types import CoroutineType, FunctionType
+from typing import Any
+
+from scopes.util import keywords as k, Symbol
+
+@dataclass
+class Scope:
+
+    value: Any = 0
+    categ: tuple[Symbol, Symbol] = (k.csys, k.c00)
+    stage: Symbol = k.initial
+    proc: CoroutineType | None = None
+    program: dict[tuple[Symbol, Symbol], CoroutineType] = {}
+    syns: list[FunctionType] = []
+    environ: asyncio.Queue | None = None
+

scopes/shape.py

@@ -6,8 +6,8 @@ from scopes.util import keywords as k
 
 class Record:
 
-    headFields = ()     # to be defined by subclass
+    headFields: tuple = ()     # to be defined by subclass
-    headFieldsAsKeywords = set()
+    headFieldsAsKeywords: set[str] = set()
     defaultHeadValue = ''
 
     def __init__(self, *headValues, data=None, **kw):

scopes/testing.py

@@ -1,6 +1,7 @@
 # scopes.testing
 
 """Common stuff (config, fixtures, ...) for testing"""
+
 import os, sys
 sys.path = [os.path.dirname(__file__)] + sys.path
 

tests/test_core.py

@@ -1,10 +1,11 @@
-# py-scopes: tests.test_actor
+# py-scopes: tests.test_core
 
-""" Tests for scopes.core.actor"""
+""" Tests for scopes.core modules, including e.g. actor, message"""
 
 import asyncio
 import pytest
 
+from scopes import core
 from scopes.core import actor, message
 from scopes.util import keywords as k
 
@@ -13,6 +14,7 @@ collector = []
 def show(msg):
     collector.append(msg)
 
+
 async def handle_basic(msg):
     match msg:
         case k.show: show(msg)
@@ -38,8 +40,20 @@ async def test_actor():
         await q2.put(k.show)
         await q1.put(k.quit)
         await q2.put(k.quit)
-        #await asyncio.wait([t1, t2])
+    #print(collector)
-    print(collector)
     assert len(collector) == 6
     assert collector[-1] == 'actor 1: Goodbye'
 
+
+def test_message():
+    msg = message.Message(k.test, k.data, 'person', '4711', 
+                  data=dict(firstName='Bob', lastName='Miller'))
+    assert msg.head['class'] is k.person
+    assert msg.addr() == (k.test, k.person, '4711')
+    assert msg.categ() == (k.test, k.person)
+
+
+def test_core():
+    sc = core.Scope()
+    assert sc.value == 0
+

tests/test_message.py

@@ -1,16 +0,0 @@
-# py-scopes: tests.test_message
-
-"""Tests for messages and related stuff"""
-
-import pytest
-
-from scopes.util import keywords as k
-
-def test_message():
-    from scopes.core.message import Message
-    msg = Message(k.test, k.data, 'person', '4711', 
-                  data=dict(firstName='Bob', lastName='Miller'))
-    assert msg.head['class'] is k.person
-    assert msg.addr() == (k.test, k.person, '4711')
-    assert msg.categ() == (k.test, k.person)
-