light9 Changeset - b2909ecf1fb3

Changeset - b2909ecf1fb3

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

drewp@bigasterisk.com - 20 months ago 2023-05-18 18:53:32
drewp@bigasterisk.com

fix TypeError

2 files changed with 21 insertions and 11 deletions:

light9/collector/collector.py

light9/newtypes.py

0 comments (0 inline, 0 general)

light9/collector/collector.py

➞

Show inline comments

@@ @@ -7,30 +7,21 @@ from rdflib import Literal, URIRef @@
 from light9.collector.device import resolve, toOutputAttrs
 from light9.collector.output import Output as OutputInstance
 from light9.collector.weblisteners import WebListeners
 from light9.namespaces import L9, RDF
 from light9.newtypes import (ClientSessionType, ClientType, DeviceAttr, DeviceClass, DeviceUri, DmxIndex, DmxMessageIndex, OutputAttr, OutputRange, OutputUri,
                              OutputValue, UnixTime)
+                             OutputValue, UnixTime, typedValue)
 log = logging.getLogger('collector')
 def makeDmxMessageIndex(base: DmxIndex, offset: DmxIndex) -> DmxMessageIndex:
     return DmxMessageIndex(base + offset - 1)
 ObjType = TypeVar('ObjType')
 def typedValue(objType: Type[ObjType], graph, subj, pred) -> ObjType:
     obj = graph.value(subj, pred)
     if obj is None:
         raise ValueError()
     conv = obj if issubclass(objType, URIRef) else obj.toPython()
     return cast(objType, conv)
 def outputMap(graph: SyncedGraph, outputs: List[OutputInstance]) -> Dict[Tuple[DeviceUri, OutputAttr], Tuple[OutputInstance, DmxMessageIndex]]:
     """From rdf config graph, compute a map of
        (device, outputattr) : (output, index)
     that explains which output index to set for any device update.

light9/newtypes.py

➞

Show inline comments

 from typing import Tuple, NewType
+from typing import Tuple, NewType, Type, TypeVar, cast
 from rdflib import URIRef
 from rdflib.term import Node
 ClientType = NewType('ClientType', str)
 ClientSessionType = NewType('ClientSessionType', str)
 Curve = NewType('Curve', URIRef)
 OutputUri = NewType('OutputUri', URIRef)  # e.g. dmxA
 DeviceUri = NewType('DeviceUri', URIRef)  # e.g. :aura2
@@ @@ -16,6 +17,24 @@ OutputValue = NewType('OutputValue', int @@
 Song = NewType('Song', URIRef)
 UnixTime = NewType('UnixTime', float)
 # Alternate output range for a device. Instead of outputting 0.0 to
 # 1.0, you can map that range into, say, 0.2 to 0.7
 OutputRange = NewType('OutputRange', Tuple[float, float])
 _ObjType = TypeVar('_ObjType')
 def _isSubclass2(t1: Type, t2: type) -> bool:
     """same as issubclass but t1 can be a NewType"""
     if hasattr(t1, '__supertype__'):
         t1 = t1.__superType__
     return issubclass(t1, t2)
 def typedValue(objType: Type[_ObjType], graph, subj, pred) -> _ObjType:
     """graph.value(subj, pred) with a given return type. If objType is """
     obj = graph.value(subj, pred)
     if obj is None:
         raise ValueError()
     conv = obj if _isSubclass2(objType, Node) else obj.toPython()
     return cast(objType, conv)
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)