light9 Changeset - feafbe49ca0b

Changeset - feafbe49ca0b

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Drew Perttula - 6 years ago 2019-06-01 23:45:25
drewp@bigasterisk.com

type fixes
Ignore-this: 7f9003a6097a2b56c6767ded3360d8ec

2 files changed with 15 insertions and 14 deletions:

light9/collector/collector_client.py

light9/effect/sequencer.py

0 comments (0 inline, 0 general)

light9/collector/collector_client.py

➞

Show inline comments

@@ @@ -38,16 +38,16 @@ def toCollectorJson(client, session, set @@
 def sendToCollectorZmq(msg):
     global _zmqClient
     if _zmqClient is None:
         _zmqClient = TwistedZmqClient(networking.collectorZmq)
     _zmqClient.send(msg)
     return defer.succeed(0)
+    return defer.succeed(0.0)
 def sendToCollector(client, session, settings: DeviceSettings, useZmq=False):
+def sendToCollector(client, session, settings: DeviceSettings, useZmq=False) -> defer.Deferred:
     """deferred to the time in seconds it took to get a response from collector"""
     sendTime = time.time()
     msg = toCollectorJson(client, session, settings).encode('utf8')
     if useZmq:
         d = sendToCollectorZmq(msg)

light9/effect/sequencer.py

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ from twisted.internet import reactor @@
 from twisted.internet import defer
 from twisted.internet.inotify import INotify
 from twisted.python.filepath import FilePath
 import cyclone.sse
 import logging, bisect, time
 import traceback
 from typing import Any, Callable, Dict, List, Tuple, cast
+from typing import Any, Callable, Dict, List, Tuple, cast, Union
 from light9.namespaces import L9, RDF
 from light9.newtypes import DeviceUri, DeviceAttr, NoteUri, Curve, Song
 from light9.vidref.musictime import MusicTime
 from light9.effect import effecteval
 from light9.effect.settings import DeviceSettings
@@ @@ -106,17 +106,22 @@ class Note(object): @@
         list of (device, attr, value), and a report for web
         """
         report = {
             'note': str(self.uri),
             'effectClass': self.effectEval.effect,
+        }
         effectSettings = self.baseEffectSettings.copy()
         effectSettings: Dict[DeviceAttr, Union[float, str]] = dict(
             (DeviceAttr(da), v.toPython()) for da, v in self.baseEffectSettings.items())
         effectSettings[L9['strength']] = self.evalCurve(t)
         def prettyFormat(x: Union[float, str]):
             if isinstance(x, float):
                 return round(x, 4)
             return x
         report['effectSettings'] = dict(
             (str(k), str(round(v, 4))) for k, v in sorted(effectSettings.items()))
         report['nonZero'] = effectSettings[L9['strength']] > 0
             (str(k), prettyFormat(v)) for k, v in sorted(effectSettings.items()))
         report['nonZero'] = cast(float, effectSettings[L9['strength']]) > 0
         out, evalReport = self.effectEval.outputFromEffect(
             list(effectSettings.items()),
             songTime=t,
             # note: not using origin here since it's going away
             noteTime=t - self.points[0][0])
         report['devicesAffected'] = len(out.devices())
@@ @@ -146,39 +151,36 @@ class CodeWatcher(object): @@
 class Sequencer(object):
     def __init__(self,
                  graph: SyncedGraph,
-                 sendToCollector: Callable[[DeviceSettings], None],
+                 sendToCollector: Callable[[DeviceSettings], defer.Deferred[float]],
                  fps=40):
         self.graph = graph
         self.fps = fps
         updateStats.goalFps = self.fps
         updateStats.updateLoopLatencyGoal = 1 / self.fps
         self.sendToCollector = sendToCollector
         self.music = MusicTime(period=.2, pollCurvecalc=False)
         self.recentUpdateTimes: List[float] = []
         self.lastStatLog = 0.0
         self._compileGraphCall = None
-        self.notes: Dict[URIRef, List[Note]] = {}  # song: [notes]
+        self.notes: Dict[Song, List[Note]] = {}  # song: [notes]
         self.simpleOutputs = SimpleOutputs(self.graph)
         self.graph.addHandler(self.compileGraph)
         self.updateLoop()
         self.codeWatcher = CodeWatcher(
             onChange=lambda: self.graph.addHandler(self.compileGraph))
     @compileStats.graph.time()
     def compileGraph(self) -> None:
         """rebuild our data from the graph"""
         t1 = time.time()
         g = self.graph
         for song in g.subjects(RDF.type, L9['Song']):
         for song in self.graph.subjects(RDF.type, L9['Song']):
             def compileSong(song: Song = cast(Song, song)) -> None:
                 self.compileSong(song)
             self.graph.addHandler(compileSong)
     @compileStats.song.time()
     def compileSong(self, song: Song) -> None:
@@ @@ -207,14 +209,13 @@ class Sequencer(object): @@
             updateStats.sendPhase = time.time() - sendStarted
             reactor.callLater(delay, self.updateLoop)
         def err(e):
             log.warn('updateLoop: %r', e)
             reactor.callLater(2, self.updateLoop)
         d = self.update()
         d.addCallbacks(done, err)
     @updateStats.updateFps.rate()
     def update(self) -> defer.Deferred:
         try:
             with updateStats.s0_getMusic.time():

0 comments (0 inline, 0 general)