light9 Changeset - ffae830fda12

Changeset - ffae830fda12

Parent rev.

Child rev.

[Not reviewed]

default

0 12 0

drewp@bigasterisk.com - 20 months ago 2023-05-20 23:32:16
drewp@bigasterisk.com

reformat

10 files changed with 49 insertions and 58 deletions:

light9/effect/effecteval.py

light9/effect/scale.py

light9/effect/sequencer/eval_faders_test.py

light9/effect/sequencer/note.py

light9/effect/sequencer/note_test.py

light9/effect/sequencer/service.py

light9/effect/sequencer/service_test.py

light9/effect/settings.py

light9/effect/settings_test.py

light9/newtypes.py

0 comments (0 inline, 0 general)

light9/effect/effecteval.py

➞

Show inline comments

 from dataclasses import dataclass
 import logging
 import math
 import random
 from colorsys import hsv_to_rgb
 from typing import Any, Dict, Tuple
 from light9.effect.simple_outputs import SimpleOutputs
 from light9.newtypes import DeviceAttr, DeviceUri, EffectAttr, EffectClass, VTUnion
 from dataclasses import dataclass
 from typing import Dict, Tuple
 from noise import pnoise1
 from PIL import Image
 from rdflib import Literal, Namespace, URIRef
 from rdfdb.syncedgraph.syncedgraph import SyncedGraph
 from rdflib import Literal, Namespace
 from webcolors import hex_to_rgb, rgb_to_hex
 from light9.effect.scale import scale
 from light9.effect.settings import BareEffectSettings, DeviceSettings, EffectSettings
 from light9.effect.settings import BareEffectSettings, EffectSettings
 from light9.effect.simple_outputs import SimpleOutputs
 from light9.namespaces import DEV, L9
-from rdfdb.syncedgraph.syncedgraph import SyncedGraph
+from light9.newtypes import (DeviceAttr, DeviceUri, EffectAttr, EffectClass, VTUnion)
 SKY = Namespace('http://light9.bigasterisk.com/theater/skyline/device/')
 random.seed(0)
 log = logging.getLogger('effecteval')

light9/effect/scale.py

➞

Show inline comments

 from decimal import Decimal
 from rdflib import Literal
 from decimal import Decimal
 from webcolors import rgb_to_hex, hex_to_rgb
 from webcolors import hex_to_rgb, rgb_to_hex
 def scale(value, strength):
     if isinstance(value, Literal):
         value = value.toPython()
@@ @@ -18,11 +19,11 @@ def scale(value, strength): @@
             if isinstance(strength, Literal):
                 strength = strength.toPython()
             if isinstance(strength, str):
                 sr, sg, sb = [v / 255 for v in hex_to_rgb(strength)]
             else:
                 sr = sg = sb = strength
-            return rgb_to_hex([int(r * sr), int(g * sg), int(b * sb)])
+            return rgb_to_hex((int(r * sr), int(g * sg), int(b * sb)))
     elif isinstance(value, (int, float)):
         return value * strength
     raise NotImplementedError("%r,%r" % (value, strength))

light9/effect/sequencer/eval_faders_test.py

➞

Show inline comments

 from unittest import mock
 from light9.effect.sequencer.eval_faders import FaderEval
 from light9.effect.settings import DeviceSettings
 from light9.mock_syncedgraph import MockSyncedGraph
 from light9.namespaces import L9
 PREFIXES = '''
 @prefix : <http://light9.bigasterisk.com/> .
 @prefix effect: <http://light9.bigasterisk.com/effect/> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix show: <http://light9.bigasterisk.com/show/dance2023/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@@ @@ -34,13 +34,13 @@ NOTE_GRAPH = PREFIXES + ''' @@
             :light1
                 a :SimpleDimmer;
                 :dmxUniverse dmxA:;
                 :dmxBase 178 .
             effect:effect1
-                a :EffectClass;
+                a :Effect;
                 :setting effect:effect1_set1 .
             effect:effect1_set1
                 :device :light1;
                 :deviceAttr :brightness;
                 :scaledValue 0.5 .
             :fade1
@@ @@ -48,13 +48,15 @@ NOTE_GRAPH = PREFIXES + ''' @@
                 :effectClass effect:effect1;
                 :effectAttr :strength;
                 :value 0.6 .
         '''
 class TestFaderEval:
     def test_faderValueScalesEffectSettings(self):
         g = MockSyncedGraph(NOTE_GRAPH)
         sender = mock.MagicMock()
         f = FaderEval(g, sender)
         devSettings = f.computeOutput()

light9/effect/sequencer/note.py

➞

Show inline comments

 import bisect
 from dataclasses import dataclass
 import logging
 import time
 from dataclasses import dataclass
 from decimal import Decimal
 from typing import Any, Dict, List, Optional, Tuple, Union, cast
 from light9.effect.effecteval import EffectEval
 from light9.effect.settings import BareEffectSettings, DeviceSettings, EffectSettings
 from light9.effect.simple_outputs import SimpleOutputs
 from rdfdb.syncedgraph.syncedgraph import SyncedGraph
-from rdflib import Literal, URIRef
 from rdflib import Literal
 from light9.effect.settings import BareEffectSettings
 from light9.namespaces import L9
-from light9.newtypes import Curve, DeviceAttr, EffectAttr, EffectClass, NoteUri, VTUnion, typedValue
+from light9.newtypes import (Curve, EffectAttr, EffectClass, NoteUri, VTUnion, typedValue)
 log = logging.getLogger('sequencer')
 def pyType(n):
     ret = n.toPython()

light9/effect/sequencer/note_test.py

➞

Show inline comments

@@ @@ -65,13 +65,12 @@ NOTE_GRAPH = PREFIXES + ''' @@
                 :scaledValue 0.5 .
             :fade1
                 a :Fader;
                 :effectClass effect:effect1;
                 :effectAttr :strength;
                 :value 0.6 .
         '''
 class TestTimedNote:
     @pytest.mark.skip()

light9/effect/sequencer/service.py

➞

Show inline comments

@@ @@ -42,29 +42,34 @@ async def changes(): @@
             yield json.dumps(state)
 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)
 async def _forever(faders):
     while True:
         await _send_one(faders)
         await asyncio.sleep(0.1)
 def send_updates_forever(faders):
     asyncio.create_task(_forever(faders))
 ####################################################################
 def main():
     session = 'effectSequencer'
     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)

light9/effect/sequencer/service_test.py

➞

Show inline comments

 import asyncio
 import asyncio
 from light9.run_local import log
 def test_import():
     async def go():

light9/effect/settings.py

➞

Show inline comments

@@ @@ -7,22 +7,22 @@ BareSettings means (attr,value), no devi @@
 """
 from __future__ import annotations
 import decimal
 import logging
 from dataclasses import dataclass
 from typing import Any, Dict, Iterable, List, Sequence, Set, Tuple, Union, cast
 from light9.localsyncedgraph import LocalSyncedGraph
 from typing import Any, Dict, Iterable, List, Sequence, Set, Tuple, cast
 import numpy
 from rdfdb.syncedgraph.syncedgraph import SyncedGraph
 from rdflib import Literal, URIRef
 from light9.collector.device import resolve
 from light9.localsyncedgraph import LocalSyncedGraph
 from light9.namespaces import L9, RDF
 from light9.newtypes import DeviceAttr, DeviceUri, EffectAttr, HexColor, VTUnion
 from rdfdb.syncedgraph.syncedgraph import SyncedGraph
 from light9.newtypes import (DeviceAttr, DeviceUri, EffectAttr, HexColor, VTUnion)
 log = logging.getLogger('settings')
 def parseHex(h):
     if h[0] != '#':

light9/effect/settings_test.py

➞

Show inline comments

 import unittest
 from typing import cast
 import unittest
 from light9.newtypes import DeviceAttr, DeviceUri, HexColor, VTUnion
 from rdfdb.patch import Patch
 from rdflib import Literal
 from rdfdb.patch import Patch
 from light9.effect.settings import DeviceSettings
 from light9.localsyncedgraph import LocalSyncedGraph
 from light9.namespaces import L9, DEV
 from light9.effect.settings import DeviceSettings
 from light9.namespaces import DEV, L9
 from light9.newtypes import DeviceAttr, DeviceUri, HexColor, VTUnion
 class TestDeviceSettings(unittest.TestCase):
     def setUp(self):
         self.graph = LocalSyncedGraph(
             files=['test/cam/lightConfig.n3', 'test/cam/bg.n3'])
         self.graph = LocalSyncedGraph(files=['test/cam/lightConfig.n3', 'test/cam/bg.n3'])
     def testToVectorZero(self):
         ds = DeviceSettings(self.graph, [])
         self.assertEqual([0] * 30, ds.toVector())
     def testEq(self):
@@ @@ -28,20 +29,18 @@ class TestDeviceSettings(unittest.TestCa @@
             (L9['light1'], L9['attr1'], 0.5),
         ])
         self.assertTrue(s1 == s2)
         self.assertFalse(s1 != s2)
     def testMissingFieldsEqZero(self):
         self.assertEqual(
             DeviceSettings(self.graph, [
         self.assertEqual(DeviceSettings(self.graph, [
                 (L9['aura1'], L9['rx'], 0),
             ]), DeviceSettings(self.graph, []))
     def testFalseIfZero(self):
         self.assertTrue(
             DeviceSettings(self.graph, [(L9['aura1'], L9['rx'], 0.1)]))
         self.assertTrue(DeviceSettings(self.graph, [(L9['aura1'], L9['rx'], 0.1)]))
         self.assertFalse(DeviceSettings(self.graph, []))
     def testFromResource(self):
         ctx = L9['']
         self.graph.patch(
             Patch(addQuads=[
@@ @@ -53,33 +52,26 @@ class TestDeviceSettings(unittest.TestCa @@
                 (L9['foo_set1'], L9['device'], L9['light1'], ctx),
                 (L9['foo_set1'], L9['deviceAttr'], L9['speed'], ctx),
                 (L9['foo_set1'], L9['scaledValue'], Literal(0.2), ctx),
             ]))
         s = DeviceSettings.fromResource(self.graph, DeviceUri(L9['foo']))
         self.assertEqual(
             DeviceSettings(self.graph, [
         self.assertEqual(DeviceSettings(self.graph, [
                 (L9['light1'], L9['brightness'], 0.1),
                 (L9['light1'], L9['speed'], 0.2),
             ]), s)
     def testToVector(self):
         v = DeviceSettings(self.graph, [
             (DeviceUri(DEV['aura1']), DeviceAttr(L9['rx']), 0.5),
             (DeviceUri(DEV['aura1']), DeviceAttr(L9['color']), HexColor('#00ff00')),
         ]).toVector()
         self.assertEqual([
 , 1, 0, 0.5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 , 0, 0, 0, 0, 0, 0, 0
         ], v)
         self.assertEqual([0, 1, 0, 0.5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], v)
     def testFromVector(self):
         s = DeviceSettings.fromVector(self.graph, [
 , 1, 0, 0.5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 , 0, 0, 0, 0, 0, 0, 0
         ])
         s = DeviceSettings.fromVector(self.graph, [0, 1, 0, 0.5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
         self.assertEqual(
             DeviceSettings(self.graph, [
                 (DeviceUri(DEV['aura1']), DeviceAttr(L9['rx']), 0.5),
                 (DeviceUri(DEV['aura1']), DeviceAttr(L9['color']), HexColor('#00ff00')),
             ]), s)
@@ @@ -129,28 +121,21 @@ L1 = L9['light1'] @@
 ZOOM = L9['zoom']
 class TestFromBlend(unittest.TestCase):
     def setUp(self):
         self.graph = LocalSyncedGraph(
             files=['test/cam/lightConfig.n3', 'test/cam/bg.n3'])
         self.graph = LocalSyncedGraph(files=['test/cam/lightConfig.n3', 'test/cam/bg.n3'])
     def testSingle(self):
         self.assertEqual(
             DeviceSettings(self.graph, [(L1, ZOOM, 0.5)]),
             DeviceSettings.fromBlend(
                 self.graph,
                 [(1, DeviceSettings(self.graph, [(L1, ZOOM, 0.5)]))]))
         self.assertEqual(DeviceSettings(self.graph, [(L1, ZOOM, 0.5)]),
                          DeviceSettings.fromBlend(self.graph, [(1, DeviceSettings(self.graph, [(L1, ZOOM, 0.5)]))]))
     def testScale(self):
         self.assertEqual(
             DeviceSettings(self.graph, [(L1, ZOOM, 0.1)]),
             DeviceSettings.fromBlend(
                 self.graph,
                 [(.2, DeviceSettings(self.graph, [(L1, ZOOM, 0.5)]))]))
         self.assertEqual(DeviceSettings(self.graph, [(L1, ZOOM, 0.1)]),
                          DeviceSettings.fromBlend(self.graph, [(.2, DeviceSettings(self.graph, [(L1, ZOOM, 0.5)]))]))
     def testMixFloats(self):
         self.assertEqual(
             DeviceSettings(self.graph, [(L1, ZOOM, 0.4)]),
             DeviceSettings.fromBlend(self.graph, [
                 (.2, DeviceSettings(self.graph, [(L1, ZOOM, 0.5)])),

light9/newtypes.py

➞

Show inline comments

 import decimal
 from typing import Tuple, NewType, Type, TypeVar, Union, cast
 from typing import NewType, Tuple, Type, TypeVar, Union, cast
 from rdflib import URIRef
 from rdflib.term import Node
 ClientType = NewType('ClientType', str)
 ClientSessionType = NewType('ClientSessionType', str)
 Curve = NewType('Curve', URIRef)

0 comments (0 inline, 0 general)