tests are running

Author: jryannel

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "python.testing.pytestEnabled": true,
+    "python.testing.cwd": ".",
+    "python.analysis.logLevel": "Information",
+    "python.testing.nosetestsEnabled": false,
+    "python.testing.unittestEnabled": false,    
+}

olink/clientnode.py

@@ -5,7 +5,7 @@
 from olink.core.protocol import Protocol
 
 
-class InvokeReplyArg(ProtocolType):
+class InvokeReplyArg:
     def __init__(self, name: str, value: Any):
         self.name = name
         self.value = value
@@ -33,6 +33,9 @@ def olink_on_release(self) -> None:
 class SinkToClientEntry:
     sink: IObjectSink = None
     node: "ClientNode" = None
+    def __init__(self, sink=None):
+        self.sink = sink
+        self.node = None
 
 
 class ClientRegistry(Base):
@@ -46,12 +49,7 @@ def detach_client_node(self, node: "ClientNode"):
                 entry.node = None
 
     def link_client_node(self, name: str, node: "ClientNode"):
-        resource = Name.resource_from_name(name)
-        self.init_entry(resource)
-        if not self.entries[resource].node:
-            self.entries[resource].node = node
-        else:
-            self.emit_log(LogLevel.DEBUG, f"link node failed, sink has already a node: {resource}")
+        self.entry(name).node = node
 
     def unlink_client_node(self, name: str, node: "ClientNode"):
         resource = Name.resource_from_name(name)
@@ -62,55 +60,30 @@ def unlink_client_node(self, name: str, node: "ClientNode"):
                 self.emit_log(LogLevel.DEBUG, f"unlink node failed, not the same node: {resource}")
 
     def add_object_sink(self, sink: IObjectSink) -> "ClientNode":
-        resource = Name.resource_from_name(sink.olink_object_name())
-        self.init_entry(resource)
-        if not self.entries[resource].sink:
-            self.entries[resource].sink = sink
-        else:
-            self.emit_log(LogLevel.DEBUG, f"add object sink failed: sink already added: {resource}")
-        return self.entries[resource].node
+        name = sink.olink_object_name()
+        self.entry(name).sink = sink
 
     def remove_object_sink(self, sink: IObjectSink):
-        resource = Name.resource_from_name(sink.olink_object_name())
-        if self.entries[resource].sink:
-            del self.entries[resource]
-        else:
-            self.emit_log(LogLevel.DEBUG, f"remove object sink failed: no sink to remove {resource}")
+        name = sink.olink_object_name()
+        self.remove_entry(name)
 
     def get_object_sink(self, name: str) -> Optional[IObjectSink]:
-        resource = Name.resource_from_name(name)
-        if resource in self.entries:
-            sink = self.entries[resource].sink
-            if not sink:
-                self.emit_log(LogLevel.DEBUG, f"no sink attached {resource}")
-            return sink
-        else:
-            self.emit_log(LogLevel.DEBUG, f"no resource: {resource}")
-        return None
+        return self.entry(name).sink
 
     def get_client_node(self, name: str) -> Optional["ClientNode"]:
-        resource = Name.resource_from_name(name)
-        if resource in self.entries:
-            node = self.entries[resource].node
-            if not node:
-                self.emit_log(LogLevel.DEBUG, f"no node attached {resource}")
-            return node
-        else:
-            self.emit_log(LogLevel.DEBUG, f"no resource: {resource}")
-        return None
+        return self.entry(name).node
 
     def entry(self, name: str) -> SinkToClientEntry:
         resource = Name.resource_from_name(name)
+        if not resource in self.entries:
+            self.emit_log(LogLevel.DEBUG, f"add new resource: {resource}")
+            self.entries[resource] = SinkToClientEntry()
         return self.entries[resource]
 
-    def has_entry(self, name: str) -> bool:
+    def remove_entry(self, name: str) -> None:
         resource = Name.resource_from_name(name)
-        return resource in self.entries
+        del self.entries[resource]
 
-    def init_entry(self, name: str):
-        resource = Name.resource_from_name(name)
-        if resource not in self.entries:
-            self.entries[resource] = SinkToClientEntry()
 
 
 

olink/core/protocol.py

@@ -3,31 +3,31 @@
 from .types import Base, LogLevel, MsgType
 
 class IProtocolListener(ProptocolType):
-    def handle_link(name: str) -> None:
+    def handle_link(self, name: str) -> None:
         raise NotImplementedError()
 
-    def handle_unlink(name: str) -> None:
+    def handle_unlink(self, name: str) -> None:
         raise NotImplementedError()
 
-    def handle_init(name: str, props: object) -> None:
+    def handle_init(self, name: str, props: object) -> None:
         raise NotImplementedError()
 
-    def handle_set_property(name: str, value: Any) -> None:
+    def handle_set_property(self, name: str, value: Any) -> None:
         raise NotImplementedError()
 
-    def handle_property_change(name: str, value: Any) -> None:
+    def handle_property_change(self, name: str, value: Any) -> None:
         raise NotImplementedError()
 
-    def handle_invoke(id: int, name: str, args: list[Any]) -> None:
+    def handle_invoke(self, id: int, name: str, args: list[Any]) -> None:
         raise NotImplementedError()
 
-    def handle_invoke_reply(id: int, name: str, value: Any) -> None:
+    def handle_invoke_reply(self, id: int, name: str, value: Any) -> None:
         raise NotImplementedError()
 
-    def handle_signal(name: str, args: Any) -> None:
+    def handle_signal(self, name: str, args: Any) -> None:
         raise NotImplementedError()
 
-    def handle_error(msgType: int, id: int, error: str) -> None:
+    def handle_error(self, msgType: int, id: int, error: str) -> None:
         raise NotImplementedError()
 
 class Protocol(Base):

olink/core/types.py

@@ -1,9 +1,9 @@
-from enum import Enum
+from enum import IntEnum
 from typing import Any, Callable
 from typing import Protocol as ProptocolType
 import json
 
-class MsgType(Enum):
+class MsgType(IntEnum):
     LINK = 10,
     INIT = 11,
     UNLINK = 12,
@@ -14,7 +14,7 @@ class MsgType(Enum):
     SIGNAL = 40,
     ERROR = 90,
 
-class MessageFormat(Enum):
+class MessageFormat(IntEnum):
     JSON = 1,
     BSON = 2,
     MSGPACK = 3,
@@ -26,7 +26,7 @@ def resource_from_name(name: str) -> str:
         return name.split('/')[0]
     @staticmethod
     def path_from_name(name: str) -> str:
-        return name.split('/')[:-1]
+        return name.split('/')[-1]
     @staticmethod
     def has_path(name: str) -> bool:
         return '/' in name
@@ -39,9 +39,9 @@ class MessageConverter:
     format: MessageFormat = MessageFormat.JSON
     def __init__(self, format: MessageFormat):
         self.format = format
-    def from_string(message: str) -> list[Any]:
+    def from_string(self, message: str) -> list[Any]:
         return json.loads(message)
-    def to_string(data: list[Any]) -> str:
+    def to_string(self, data: list[Any]) -> str:
         return json.dumps(data)
 
 WriteMessageFunc = Callable[[str], None]
@@ -64,7 +64,7 @@ def log(level: LogLevel, msg: str) -> None:
 class Base:
     log_func: WriteLogFunc = None
 
-    def onLog(self, func: WriteLogFunc):
+    def on_log(self, func: WriteLogFunc):
         self.log_func = func
 
     def emit_log(self, level: LogLevel, msg: str):

olink/mocks/mocksink.py

@@ -14,7 +14,7 @@ def __init__(self, name: str):
     def invoke(self, name: str, args: list[Any]):
         if self.node:
             def func(arg: InvokeReplyArg):
-                self.events.append({'type': 'invoke', 'name': arg.name, 'value': arg.value})
+                self.events.append({'type': 'invoke-reply', 'name': arg.name, 'value': arg.value})
             self.node.invoke_remote(name, args, func)
 
     def olink_object_name(self) -> str:
@@ -23,8 +23,8 @@ def olink_object_name(self) -> str:
     def olink_on_signal(self, name: str, args: list[Any]) -> None:
         self.events.append({'type': 'signal', 'name': name, 'args': args})
 
-    def olink_property_change(self, name: str, value: Any) -> None:
-        path = Name.pathFromName(name)
+    def olink_on_property_changed(self, name: str, value: Any) -> None:
+        path = Name.path_from_name(name)
         self.events.append({ 'type': 'property_change', 'name': name, 'value': value})
         self.properties[path] = value
 

olink/mocks/mocksource.py

@@ -9,8 +9,8 @@ class MockSource(IObjectSource):
     node: RemoteNode = None
 
     def __init__(self, name: str):
-        super().__init__(self)
         self.name = name
+        RemoteNode.add_object_source(self)
 
     def set_property(self, name: str, value: Any):
         if self.node:
@@ -30,10 +30,17 @@ def olink_invoke(self, name: str, args: list[Any]):
     def olink_set_property(self, name: str, value: Any):
         path = Name.path_from_name(name)
         self.events.append({'type': 'set_property', 'name': name, 'value': value})
-        if self.properties[path] != value:
+        if not path in self.properties:
+            # assign new value
             self.properties[path] = value
             if self.node:
                 self.node.notify_property_change(name, value)
+        else:
+            # update existing value
+            if not self.properties[path] == value:
+                self.properties[path] = value
+                if self.node:
+                    self.node.notify_property_change(name, value)
 
     def olink_linked(self, name: str, node: RemoteNode):
         self.events.append({'type': 'linked', 'name': name})

olink/remotenode.py

@@ -2,7 +2,7 @@
 from olink.core.types import Base, LogLevel, Name
 from olink.core.node import BaseNode
 
-from typing import Any, Callable, Optional, Protocol as ProtocolType
+from typing import Any, Protocol as ProtocolType
 
 class IObjectSource(ProtocolType):
     def olink_object_name() -> str:
@@ -25,80 +25,79 @@ class SourceToNodeEntry:
     source: IObjectSource = None
     nodes: set["RemoteNode"] = set()
 
-    def __init__(self, source):
+    def __init__(self, source=None):
         self.source = source
+        self.nodes = set()
 
 
 
 class RemoteRegistry(Base):
     entries: dict[str, SourceToNodeEntry] = {}
 
     def add_object_source(self, source: IObjectSource):
-        resource = Name.resourceFromName(source.olink_object_name())
-        self.emit_log(LogLevel.DEBUG, f"RemoteRegistry.add_object_source: {resource}")
-        if not resource in self.entries:
-            self.entries[resource] = SourceToNodeEntry(source)
-        else:
-            self.emit_log(LogLevel.DEBUG, f"source already added: {resource}")
-    
+        name = source.olink_object_name()
+        self.emit_log(LogLevel.DEBUG, f"RemoteRegistry.add_object_source: {name}")
+        self.entry(name).source = source
+
     def remove_object_source(self, source: IObjectSource):
-        resource = Name.resourceFromName(source.olink_object_name())
-        self.emit_log(LogLevel.DEBUG, f"RemoteRegistry.remove_object_source: {resource}")
-        if resource in self.entries:
-            del self.entries[resource]
-        else:
-            self.emit_log(LogLevel.DEBUG, f'remove object source failed, no source exists: {resource}')
+        name = source.olink_object_name()
+        self.remove_entry(name)
 
     def get_object_source(self, name: str):
-        resource = Name.resourceFromName(name)
-        if resource in self.entries:
-            source = self.entries[resource].source
-            if not source:
-                self.emit_log(LogLevel.DEBUG, f"no source at: {resource}")
-            return source
-        else:
-            self.emit_log(LogLevel.DEBUG, f"no source registered at: {name}")
+        return self.entry(name).source
 
     def get_remote_nodes(self, name: str):
-        resource = Name.resourceFromName(name)
-        if resource in self.entries:
-            nodes = self.entries[resource].nodes
-            if not nodes:
-                self.emit_log(LogLevel.DEBUG, f"no nodes at: {resource}")
-            return nodes
-        else:
-            self.emit_log(LogLevel.DEBUG, f"no source registered at: {name}")
+        return self.entry(name).nodes
 
     def attach_remote_node(self, node: "RemoteNode"):
         self.emit_log(LogLevel.DEBUG, "RemoteRegistry.attach_remote_node")
 
     def detach_remote_node(self, node: "RemoteNode"):
         self.emit_log(LogLevel.DEBUG, "RemoteRegistry.detach_remote_node")
-        for entry in self.entries.items():
+        for entry in self.entries.values():
             if node in entry.nodes:
                 entry.nodes.remove(node)
 
     def link_remote_node(self, name: str, node: "RemoteNode"):
-        resource = Name.resourceFromName(name)
-        self.emit_log(LogLevel.DEBUG, f'RemoteRegistry.link_remote_node: {resource}')
-        if resource in self.entries:
-            self.entries[resource].nodes.add(node)
-        else:
-            self.emit_log(LogLevel.DEBUG, f"no source registered at: {name}")
+        self.entry(name).nodes.add(node)
 
     def unlink_remote_node(self, name: str, node: "RemoteNode"):
-        resource = Name.resourceFromName(name)
-        self.emit_log(LogLevel.DEBUG, f'RemoteRegistry.unlink_remote_node: {resource}')
+        self.entry(name).nodes.remove(node)
+
+    def entry(self, name: str) -> SourceToNodeEntry:
+        resource = Name.resource_from_name(name)
+        if not resource in self.entries:
+            self.emit_log(LogLevel.DEBUG, f"add new resource: {resource}")
+            self.entries[resource] = SourceToNodeEntry()
+        return self.entries[resource]
+
+    def remove_entry(self, name: str) -> None:
+        resource = Name.resource_from_name(name)
         if resource in self.entries:
-            self.entries[resource].nodes.remove(node)
+            del self.entries[resource]
         else:
-            self.emit_log(LogLevel.DEBUG, f"no source registered at: {name}")
+            self.emit_log(LogLevel.DEBUG, f'remove resource failed, resource not exists: {resource}')
+
+
+    def has_entry(self, name: str) -> SourceToNodeEntry:
+        resource = Name.resource_from_name(name)
+        return resource in self.entries
+
+    def init_entry(self, name: str):
+        resource = Name.resource_from_name(name)
+        if resource in self.entries:
+            self.entries[resource] = SourceToNodeEntry()
+
+
+
+    def clear(self):
+        self.entries = {}
 
 _registry = RemoteRegistry()
 
 class RemoteNode(BaseNode):
     def __init__(self):
-        super().__init__(self)
+        super().__init__()
         _registry.attach_remote_node(self)
 
     def detach(self):
@@ -131,7 +130,7 @@ def handle_unlink(self, name: str):
         if source:
             self.registry().unlink_remote_node(name, self)
 
-    def handle_set_properties(self, name: str, value: Any):
+    def handle_set_property(self, name: str, value: Any):
         source = self.get_object_source(name)
         if source:
             source.olink_set_property(name, value)