changeset 2095:ce8b66e68cd5

type fixes
author drewp@bigasterisk.com
date Tue, 31 May 2022 00:12:51 -0700
parents ddbd0fca89ff
children 0e7d8349087c
files light9/effect/sequencer/sequencer.py light9/effect/sequencer/service.py light9/effect/sequencer/web/vite.config.ts
diffstat 3 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/light9/effect/sequencer/sequencer.py	Mon May 30 23:46:07 2022 -0700
+++ b/light9/effect/sequencer/sequencer.py	Tue May 31 00:12:51 2022 -0700
@@ -21,7 +21,7 @@
 from light9.effect.simple_outputs import SimpleOutputs
 from light9.namespaces import L9, RDF
 from light9.newtypes import DeviceUri, DeviceAttr, NoteUri, Curve, Song
-from rdfdb.syncedgraph import SyncedGraph
+from rdfdb.syncedgraph.syncedgraph import SyncedGraph
 from light9.metrics import metrics
 
 import imp
@@ -102,7 +102,7 @@
         }
         effectSettings: Dict[DeviceAttr, Union[float, str]] = dict(
             (DeviceAttr(da), v) for da, v in self.baseEffectSettings.items())
-        effectSettings[L9['strength']] = self.evalCurve(t)
+        effectSettings[cast(DeviceAttr, L9['strength'])] = self.evalCurve(t)
 
         def prettyFormat(x: Union[float, str]):
             if isinstance(x, float):
@@ -112,7 +112,7 @@
         report['effectSettings'] = dict(
             (str(k), prettyFormat(v))
             for k, v in sorted(effectSettings.items()))
-        report['nonZero'] = cast(float, effectSettings[L9['strength']]) > 0
+        report['nonZero'] = cast(float, effectSettings[cast(DeviceAttr, L9['strength'])]) > 0
         out, evalReport = self.effectEval.outputFromEffect(
             list(effectSettings.items()),
             songTime=t,
@@ -189,7 +189,7 @@
         self.notes[song] = []
         for note in self.graph.objects(song, L9['note']):
             try:
-                n = Note(self.graph, NoteUri(note), effecteval,
+                n = Note(self.graph, NoteUri(cast(NoteUri, note)), effecteval,
                          self.simpleOutputs)
             except Exception:
                 log.warn(f"failed to build Note {note} - skipping")
--- a/light9/effect/sequencer/service.py	Mon May 30 23:46:07 2022 -0700
+++ b/light9/effect/sequencer/service.py	Tue May 31 00:12:51 2022 -0700
@@ -2,15 +2,16 @@
 plays back effect notes from the timeline
 """
 
-from run_local import log
+import functools
+from light9.run_local import log
 from twisted.internet import reactor
 from light9.metrics import metrics, metricsRoute
-from rdfdb.syncedgraph import SyncedGraph
+from rdfdb.syncedgraph.syncedgraph import SyncedGraph
 from light9 import networking, showconfig
 import optparse, sys, logging
 import cyclone.web
 from rdflib import URIRef
-from light9.effect.sequencer.sequencer import Sequencer, Updates
+from light9.effect.sequencer.sequencer import Sequencer
 from light9.collector.collector_client import sendToCollector
 
 from light9 import clientsession
--- a/light9/effect/sequencer/web/vite.config.ts	Mon May 30 23:46:07 2022 -0700
+++ b/light9/effect/sequencer/web/vite.config.ts	Tue May 31 00:12:51 2022 -0700
@@ -2,7 +2,7 @@
 
 const servicePort = 8213;
 export default defineConfig({
-  base: "/effectSeequencer/",
+  base: "/effectSequencer/",
   root: "./light9/effect/sequencer/web",
   publicDir: "../web",
   server: {