light9 Changeset - 9b6f4b3c329c

Changeset - 9b6f4b3c329c

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

drewp@bigasterisk.com - 20 months ago 2023-05-24 06:42:33
drewp@bigasterisk.com

correct some output loop rates; clean up

3 files changed with 13 insertions and 32 deletions:

light9/collector/output.py

light9/effect/sequencer/eval_faders.py

light9/effect/sequencer/service.py

0 comments (0 inline, 0 general)

light9/collector/output.py

➞

Show inline comments

@@ @@ -83,14 +83,16 @@ class BackgroundLoopOutput(Output): @@
         self._currentBuffer = b''
         self._task = asyncio.create_task(self._loop())
     async def _loop(self):
         while True:
             t1 = time.time()
             self._loop_one()
             await asyncio.sleep(.1)
             remain = max(0, 1 / self.rate - (time.time() - t1))
             await asyncio.sleep(remain)
     def _loop_one(self):
         start = time.time()
         sendingBuffer = self._currentBuffer
         #tenacity retry
         self._write(sendingBuffer)

light9/effect/sequencer/eval_faders.py

➞

Show inline comments

@@ @@ -35,17 +35,14 @@ class Fader: @@
 class FaderEval:
     """peer to Sequencer, but this one takes the current :Fader settings -> sendToCollector
     """
     def __init__(self,
                  graph: SyncedGraph,
                  sendToCollector: Callable[[DeviceSettings], Coroutine[None ,None,None]],
                  ):
         self.graph = graph
         self.sendToCollector = sendToCollector
         self.faders: List[Fader] = []
         # self.simpleOutputs = SimpleOutputs(self.graph)
         log.info('fader adds handler')
         self.graph.addHandler(self._compile)
         self.lastLoopSucceeded = False
@@ @@ -82,27 +79,18 @@ class FaderEval: @@
         now = UnixTime(time.time())
         for f in self.faders:
             if f.value is None:
                 raise TypeError('f.value should be set by now')
             effectSettings = EffectSettings(self.graph, [(f.effect, f.setEffectAttr, f.value)])
             print(f'{effectSettings=}')
             notesSettings.append(f.ee.compute(effectSettings))
             # ee = effecteval.EffectEval(self.graph, f.effectClass, self.simpleOutputs)
             # deviceSettings, report = ee.outputFromEffect(
             #     effectSettings,
             #     songTime=now, # probably wrong
             #     noteTime=now, # wrong
             #     )
             # log.info(f'  𝅘𝅥𝅮  {uriTail(f.uri)}: {effectSettings=} -> {deviceSettings=}')
             # if deviceSettings:
             #     notesSettings.append(deviceSettings)
         return DeviceSettings.merge(self.graph, notesSettings)
     # @metrics('update_call_fader').time()
     # async def update(self):
     #     log.info(f'update {len(self.notes)=}')
     #     devSettings = self.computeOutput()
     #     with metrics('update_s3_send_fader').time():  # our measurement
     #         sendSecs = await self.sendToCollector(devSettings)

light9/effect/sequencer/service.py

➞

Show inline comments

@@ @@ -4,29 +4,29 @@ plays back effect notes from the timelin @@
 import asyncio
 import json
 import logging
 import time
 import aiohttp
 from louie import dispatcher
 from rdfdb.syncedgraph.syncedgraph import SyncedGraph
 from sse_starlette.sse import EventSourceResponse
 from starlette.applications import Starlette
 from starlette.routing import Route
 from starlette_exporter import PrometheusMiddleware, handle_metrics
 from lib.background_loop import loop_forever
 from light9 import networking
 from light9.collector.collector_client_asyncio import sendToCollector
 from light9.effect.sequencer.eval_faders import FaderEval
 from light9.effect.sequencer.sequencer import Sequencer, StateUpdate
 from light9.effect.settings import DeviceSettings
 from light9.metrics import metrics
 from light9.run_local import log
 from lib.background_loop import loop_forever
 RATE = 30
 async def changes():
     state = {}
     q = asyncio.Queue()
     def onBroadcast(update):
@@ @@ -45,36 +45,27 @@ async def changes(): @@
 async def send_page_updates(request):
     return EventSourceResponse(changes())
 ###################################################################
 async def _send_one(faders: FaderEval):
     ds = faders.computeOutput()
     await sendToCollector('effectSequencer', session='0', settings=ds)
 ####################################################################
 def main():
     graph = SyncedGraph(networking.rdfdb.url, "effectSequencer")
     logging.getLogger('autodepgraphapi').setLevel(logging.INFO)
     logging.getLogger('syncedgraph').setLevel(logging.INFO)
     logging.getLogger('sse_starlette.sse').setLevel(logging.INFO)
     # seq = Sequencer(graph, send)  # per-song timed notes
-    faders = FaderEval(graph)  # bin/fade's untimed notes
+    faders = FaderEval(graph)  # bin/fade's untimed effects
     async def so(first_run):
         await _send_one(faders)
     faders_loop = loop_forever(so, metric_prefix='faders', sleep_period=.05, log_fps=True)
     #@metrics('computeAndSend').time() # needs rework with async
     async def update(first_run):
         ds = faders.computeOutput()
         await sendToCollector('effectSequencer', session='0', settings=ds)
     faders_loop = loop_forever(update, metric_prefix='faders', sleep_period=1 / RATE)
     app = Starlette(
         debug=True,
         routes=[
             Route('/updates', endpoint=send_page_updates),
         ],

0 comments (0 inline, 0 general)