Mercurial > code > home > repos > light9

annotate bin/effecteval @ 1926:1a7e5b07bf17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use my greplin fork's stats/ code instead of an old local one Ignore-this: f0935bd61f0b982e544c1991e14fb51e
author Drew Perttula <drewp@bigasterisk.com>
date Sun, 02 Jun 2019 00:05:12 +0000
parents d01e21621975
children c81f86f3d65a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
1 #!bin/python
1593
6059de6659c3 move effects/ page into web/. fix homepage list. rm old subserver code.
Drew Perttula <drewp@bigasterisk.com>
parents: 1581
diff changeset
2
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
3 from run_local import log
1053
9937e2e3d17b effecteval faster loop, stats page
Drew Perttula <drewp@bigasterisk.com>
parents: 1052
diff changeset
4 from twisted.internet import reactor
9937e2e3d17b effecteval faster loop, stats page
Drew Perttula <drewp@bigasterisk.com>
parents: 1052
diff changeset
5 from twisted.internet.defer import inlineCallbacks, returnValue
1027
a38414bd3929 hacking on effecteval
Drew Perttula <drewp@bigasterisk.com>
parents: 1019
diff changeset
6 import cyclone.web, cyclone.websocket, cyclone.httpclient
1866
3c523c71da29 pyflakes cleanups and some refactors
Drew Perttula <drewp@bigasterisk.com>
parents: 1861
diff changeset
7 import sys, optparse, logging, json, itertools
1051
be016cd5e5c5 effecteval names its new curve after the sub you drop on it
Drew Perttula <drewp@bigasterisk.com>
parents: 1044
diff changeset
8 from rdflib import URIRef, Literal
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
9
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
10 sys.path.append('/usr/lib/pymodules/python2.7/') # for numpy, on rpi
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
11 sys.path.append('/usr/lib/python2.7/dist-packages') # For numpy
1556
61f3f378cc62 move code for adding effect to current song to its own (testable) module
Drew Perttula <drewp@bigasterisk.com>
parents: 1548
diff changeset
12 from light9 import networking, showconfig
1079
fce46850ed8c consolidate the curve load/save rdf code more
Drew Perttula <drewp@bigasterisk.com>
parents: 1076
diff changeset
13 from light9.effecteval.effect import EffectNode
1560
e993c5e1df1a fix effecteval to drop notes into new-style timeline
Drew Perttula <drewp@bigasterisk.com>
parents: 1559
diff changeset
14 from light9.effect.edit import getMusicStatus, songNotePatch
1115
818275850003 effecteval screens for only the kinds of outputs that it can send, so i can run a second instance just for LEDs
Drew Perttula <drewp@bigasterisk.com>
parents: 1114
diff changeset
15 from light9.effecteval.effectloop import makeEffectLoop
1926
1a7e5b07bf17 use my greplin fork's stats/ code instead of an old local one
Drew Perttula <drewp@bigasterisk.com>
parents: 1877
diff changeset
16 from greplin.scales.cyclonehandler import StatsHandler
1556
61f3f378cc62 move code for adding effect to current song to its own (testable) module
Drew Perttula <drewp@bigasterisk.com>
parents: 1548
diff changeset
17 from light9.namespaces import L9
1692
6fa4288da8a6 rdfdb is its own package now
drewp@bigasterisk.com
parents: 1593
diff changeset
18 from rdfdb.patch import Patch
6fa4288da8a6 rdfdb is its own package now
drewp@bigasterisk.com
parents: 1593
diff changeset
19 from rdfdb.syncedgraph import SyncedGraph
1053
9937e2e3d17b effecteval faster loop, stats page
Drew Perttula <drewp@bigasterisk.com>
parents: 1052
diff changeset
20 from greplin import scales
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
21
1861
40cc863d2b63 start py3 and other dep fixes
drewp@bigasterisk.com
parents: 1860
diff changeset
22 from cycloneerr import PrettyErrorHandler
1866
3c523c71da29 pyflakes cleanups and some refactors
Drew Perttula <drewp@bigasterisk.com>
parents: 1861
diff changeset
23 from light9.coffee import StaticCoffee
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
24
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
25
1054
4595a82f5a90 effecteval has a delete button on effect rows
Drew Perttula <drewp@bigasterisk.com>
parents: 1053
diff changeset
26 class EffectEdit(PrettyErrorHandler, cyclone.web.RequestHandler):
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
27
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
28 def get(self):
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
29 self.set_header('Content-Type', 'text/html')
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
30 self.write(open("light9/effecteval/effect.html").read())
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
31
1054
4595a82f5a90 effecteval has a delete button on effect rows
Drew Perttula <drewp@bigasterisk.com>
parents: 1053
diff changeset
32 def delete(self):
4595a82f5a90 effecteval has a delete button on effect rows
Drew Perttula <drewp@bigasterisk.com>
parents: 1053
diff changeset
33 graph = self.settings.graph
4595a82f5a90 effecteval has a delete button on effect rows
Drew Perttula <drewp@bigasterisk.com>
parents: 1053
diff changeset
34 uri = URIRef(self.get_argument('uri'))
4595a82f5a90 effecteval has a delete button on effect rows
Drew Perttula <drewp@bigasterisk.com>
parents: 1053
diff changeset
35 with graph.currentState(tripleFilter=(None, L9['effect'], uri)) as g:
4595a82f5a90 effecteval has a delete button on effect rows
Drew Perttula <drewp@bigasterisk.com>
parents: 1053
diff changeset
36 song = ctx = list(g.subjects(L9['effect'], uri))[0]
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
37 self.settings.graph.patch(
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
38 Patch(delQuads=[
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
39 (song, L9['effect'], uri, ctx),
1054
4595a82f5a90 effecteval has a delete button on effect rows
Drew Perttula <drewp@bigasterisk.com>
parents: 1053
diff changeset
40 ]))
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
41
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
42
1181
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
43 @inlineCallbacks
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
44 def currentSong():
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
45 s = (yield getMusicStatus())['song']
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
46 if s is None:
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
47 raise ValueError("no current song")
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
48 returnValue(URIRef(s))
1187
102a456be7db refactor EE moving towards the ability to re-bump existing curves
drewp@bigasterisk.com
parents: 1181
diff changeset
49
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
50
1044
a2081b9adfe4 effecteval now takes dropped subs and makes new effects out of them
Drew Perttula <drewp@bigasterisk.com>
parents: 1043
diff changeset
51 class SongEffects(PrettyErrorHandler, cyclone.web.RequestHandler):
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
52
1181
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
53 def wideOpenCors(self):
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
54 self.set_header('Access-Control-Allow-Origin', '*')
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
55 self.set_header('Access-Control-Allow-Methods',
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
56 'GET, PUT, POST, DELETE, OPTIONS')
1181
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
57 self.set_header('Access-Control-Max-Age', '1000')
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
58 self.set_header('Access-Control-Allow-Headers',
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
59 'Content-Type, Authorization, X-Requested-With')
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
60
1181
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
61 def options(self):
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
62 self.wideOpenCors()
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
63 self.write('')
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
64
1180
6c4981f61bf8 subserver inserts effects with envelope curves
Drew Perttula <drewp@bigasterisk.com>
parents: 1141
diff changeset
65 @inlineCallbacks
1044
a2081b9adfe4 effecteval now takes dropped subs and makes new effects out of them
Drew Perttula <drewp@bigasterisk.com>
parents: 1043
diff changeset
66 def post(self):
1181
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
67 self.wideOpenCors()
1076
dc474426845d effecteval better logging. everyone put their curve files in the right place.
Drew Perttula <drewp@bigasterisk.com>
parents: 1064
diff changeset
68 dropped = URIRef(self.get_argument('drop'))
1181
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
69
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
70 try:
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
71 song = URIRef(self.get_argument('uri'))
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
72 except Exception: # which?
1181
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
73 song = yield currentSong()
1556
61f3f378cc62 move code for adding effect to current song to its own (testable) module
Drew Perttula <drewp@bigasterisk.com>
parents: 1548
diff changeset
74
1558
7eb3676b8fd6 more of the fixed add-to-song service
Drew Perttula <drewp@bigasterisk.com>
parents: 1557
diff changeset
75 event = self.get_argument('event', default='default')
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
76
1566
13e3cbe9071a momentary-add button support
Drew Perttula <drewp@bigasterisk.com>
parents: 1560
diff changeset
77 note = self.get_argument('note', default=None)
13e3cbe9071a momentary-add button support
Drew Perttula <drewp@bigasterisk.com>
parents: 1560
diff changeset
78 if note is not None:
13e3cbe9071a momentary-add button support
Drew Perttula <drewp@bigasterisk.com>
parents: 1560
diff changeset
79 note = URIRef(note)
13e3cbe9071a momentary-add button support
Drew Perttula <drewp@bigasterisk.com>
parents: 1560
diff changeset
80
1181
c677bf37a1b4 effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents: 1180
diff changeset
81 log.info("adding to %s", song)
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
82 note, p = yield songNotePatch(self.settings.graph,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
83 dropped,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
84 song,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
85 event,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
86 ctx=song,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
87 note=note)
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
88
1557
104ff4606565 cleanup. internal names in edit.py
Drew Perttula <drewp@bigasterisk.com>
parents: 1556
diff changeset
89 self.settings.graph.patch(p)
1581
30c79f1dc4f8 fix suggestPrefixes to send suggestions to rdfdb
Drew Perttula <drewp@bigasterisk.com>
parents: 1570
diff changeset
90 self.settings.graph.suggestPrefixes(song, {'song': URIRef(song + '/')})
1566
13e3cbe9071a momentary-add button support
Drew Perttula <drewp@bigasterisk.com>
parents: 1560
diff changeset
91 self.write(json.dumps({'note': note}))
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
92
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
93
1043
aa45e5379c5a effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents: 1041
diff changeset
94 class SongEffectsUpdates(cyclone.websocket.WebSocketHandler):
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
95
1043
aa45e5379c5a effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents: 1041
diff changeset
96 def connectionMade(self, *args, **kwargs):
aa45e5379c5a effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents: 1041
diff changeset
97 self.graph = self.settings.graph
aa45e5379c5a effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents: 1041
diff changeset
98 self.graph.addHandler(self.updateClient)
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
99
1043
aa45e5379c5a effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents: 1041
diff changeset
100 def updateClient(self):
aa45e5379c5a effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents: 1041
diff changeset
101 # todo: abort if client is gone
aa45e5379c5a effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents: 1041
diff changeset
102 playlist = self.graph.value(showconfig.showUri(), L9['playList'])
aa45e5379c5a effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents: 1041
diff changeset
103 songs = list(self.graph.items(playlist))
aa45e5379c5a effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents: 1041
diff changeset
104 out = []
aa45e5379c5a effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents: 1041
diff changeset
105 for s in songs:
aa45e5379c5a effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents: 1041
diff changeset
106 out.append({'uri': s, 'label': self.graph.label(s)})
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
107 out[-1]['effects'] = [{
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
108 'uri': uri,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
109 'label': self.graph.label(uri)
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
110 } for uri in sorted(self.graph.objects(s, L9['effect']))]
1043
aa45e5379c5a effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents: 1041
diff changeset
111 self.sendMessage({'songs': out})
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
112
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
113
1043
aa45e5379c5a effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents: 1041
diff changeset
114 class EffectUpdates(cyclone.websocket.WebSocketHandler):
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
115 """
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
116 stays alive for the life of the effect page
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
117 """
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
118
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
119 def connectionMade(self, *args, **kwargs):
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
120 log.info("websocket opened")
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
121 self.uri = URIRef(self.get_argument('uri'))
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
122 self.sendMessage({'hello': repr(self)})
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
123
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
124 self.graph = self.settings.graph
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
125 self.graph.addHandler(self.updateClient)
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
126
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
127 def updateClient(self):
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
128 # todo: if client has dropped, abort and don't get any more
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
129 # graph updates
1108
4b542d321c8f effectnode runs multiple lines of code in dependency order
Drew Perttula <drewp@bigasterisk.com>
parents: 1107
diff changeset
130
4b542d321c8f effectnode runs multiple lines of code in dependency order
Drew Perttula <drewp@bigasterisk.com>
parents: 1107
diff changeset
131 # EffectNode knows how to put them in order. Somehow this is
4b542d321c8f effectnode runs multiple lines of code in dependency order
Drew Perttula <drewp@bigasterisk.com>
parents: 1107
diff changeset
132 # not triggering an update when the order changes.
4b542d321c8f effectnode runs multiple lines of code in dependency order
Drew Perttula <drewp@bigasterisk.com>
parents: 1107
diff changeset
133 en = EffectNode(self.graph, self.uri)
4b542d321c8f effectnode runs multiple lines of code in dependency order
Drew Perttula <drewp@bigasterisk.com>
parents: 1107
diff changeset
134 codeLines = [c.code for c in en.codes]
4b542d321c8f effectnode runs multiple lines of code in dependency order
Drew Perttula <drewp@bigasterisk.com>
parents: 1107
diff changeset
135 self.sendMessage({'codeLines': codeLines})
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
136
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
137 def connectionLost(self, reason):
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
138 log.info("websocket closed")
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
139
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
140 def messageReceived(self, message):
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
141 log.info("got message %s" % message)
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
142 # write a patch back to the graph
1101
3074f635ee23 effect page can write code edits back
Drew Perttula <drewp@bigasterisk.com>
parents: 1100
diff changeset
143
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
144
1107
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
145 def replaceObjects(graph, c, s, p, newObjs):
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
146 patch = graph.getObjectPatch(context=c,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
147 subject=s,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
148 predicate=p,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
149 newObject=newObjs[0])
1107
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
150
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
151 moreAdds = []
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
152 for line in newObjs[1:]:
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
153 moreAdds.append((s, p, line, c))
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
154 fullPatch = Patch(delQuads=patch.delQuads,
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
155 addQuads=patch.addQuads + moreAdds)
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
156 graph.patch(fullPatch)
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
157
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
158
1101
3074f635ee23 effect page can write code edits back
Drew Perttula <drewp@bigasterisk.com>
parents: 1100
diff changeset
159 class Code(PrettyErrorHandler, cyclone.web.RequestHandler):
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
160
1101
3074f635ee23 effect page can write code edits back
Drew Perttula <drewp@bigasterisk.com>
parents: 1100
diff changeset
161 def put(self):
3074f635ee23 effect page can write code edits back
Drew Perttula <drewp@bigasterisk.com>
parents: 1100
diff changeset
162 effect = URIRef(self.get_argument('uri'))
1107
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
163 codeLines = []
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
164 for i in itertools.count(0):
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
165 k = 'codeLines[%s][text]' % i
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
166 v = self.get_argument(k, None)
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
167 if v is not None:
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
168 codeLines.append(Literal(v))
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
169 else:
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
170 break
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
171 if not codeLines:
1111
8842f0c7a641 refactor effectloop
Drew Perttula <drewp@bigasterisk.com>
parents: 1108
diff changeset
172 log.info("no codelines received on PUT /code")
1107
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
173 return
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
174 with self.settings.graph.currentState(tripleFilter=(None, L9['effect'],
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
175 effect)) as g:
1859
f066d6e874db 2to3 with these fixers: all idioms set_literal
drewp@bigasterisk.com
parents: 1858
diff changeset
176 song = next(g.subjects(L9['effect'], effect))
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
177
1107
512381de45bd effectclasss in subserver. multiline code suppport (except for evaulation). add some old effect funcs to the new evaluator
Drew Perttula <drewp@bigasterisk.com>
parents: 1103
diff changeset
178 replaceObjects(self.settings.graph, song, effect, L9['code'], codeLines)
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
179
1103
771f50f19b4b single-line effect code now evals by changing <uri> into a suitable python object
Drew Perttula <drewp@bigasterisk.com>
parents: 1101
diff changeset
180 # right here we could tell if the code has a python error and return it
1101
3074f635ee23 effect page can write code edits back
Drew Perttula <drewp@bigasterisk.com>
parents: 1100
diff changeset
181 self.send_error(202)
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
182
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
183
1019
5939fce98fad notes for next step
drewp@bigasterisk.com
parents: 1018
diff changeset
184 class EffectEval(PrettyErrorHandler, cyclone.web.RequestHandler):
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
185
1027
a38414bd3929 hacking on effecteval
Drew Perttula <drewp@bigasterisk.com>
parents: 1019
diff changeset
186 @inlineCallbacks
1019
5939fce98fad notes for next step
drewp@bigasterisk.com
parents: 1018
diff changeset
187 def get(self):
1033
b5ee7aa9341a effecteval now runs effects in the background, following the current song, and sends dmx output
Drew Perttula <drewp@bigasterisk.com>
parents: 1027
diff changeset
188 # return dmx list for that effect
1019
5939fce98fad notes for next step
drewp@bigasterisk.com
parents: 1018
diff changeset
189 uri = URIRef(self.get_argument('uri'))
1027
a38414bd3929 hacking on effecteval
Drew Perttula <drewp@bigasterisk.com>
parents: 1019
diff changeset
190 response = yield cyclone.httpclient.fetch(
a38414bd3929 hacking on effecteval
Drew Perttula <drewp@bigasterisk.com>
parents: 1019
diff changeset
191 networking.musicPlayer.path('time'))
a38414bd3929 hacking on effecteval
Drew Perttula <drewp@bigasterisk.com>
parents: 1019
diff changeset
192 songTime = json.loads(response.body)['t']
1033
b5ee7aa9341a effecteval now runs effects in the background, following the current song, and sends dmx output
Drew Perttula <drewp@bigasterisk.com>
parents: 1027
diff changeset
193
b5ee7aa9341a effecteval now runs effects in the background, following the current song, and sends dmx output
Drew Perttula <drewp@bigasterisk.com>
parents: 1027
diff changeset
194 node = EffectNode(self.settings.graph, uri)
b5ee7aa9341a effecteval now runs effects in the background, following the current song, and sends dmx output
Drew Perttula <drewp@bigasterisk.com>
parents: 1027
diff changeset
195 outSub = node.eval(songTime)
b5ee7aa9341a effecteval now runs effects in the background, following the current song, and sends dmx output
Drew Perttula <drewp@bigasterisk.com>
parents: 1027
diff changeset
196 self.write(json.dumps(outSub.get_dmx_list()))
b5ee7aa9341a effecteval now runs effects in the background, following the current song, and sends dmx output
Drew Perttula <drewp@bigasterisk.com>
parents: 1027
diff changeset
197
b5ee7aa9341a effecteval now runs effects in the background, following the current song, and sends dmx output
Drew Perttula <drewp@bigasterisk.com>
parents: 1027
diff changeset
198
b5ee7aa9341a effecteval now runs effects in the background, following the current song, and sends dmx output
Drew Perttula <drewp@bigasterisk.com>
parents: 1027
diff changeset
199 # Completely not sure where the effect background loop should
b5ee7aa9341a effecteval now runs effects in the background, following the current song, and sends dmx output
Drew Perttula <drewp@bigasterisk.com>
parents: 1027
diff changeset
200 # go. Another process could own it, and get this request repeatedly:
1019
5939fce98fad notes for next step
drewp@bigasterisk.com
parents: 1018
diff changeset
201 class SongEffectsEval(PrettyErrorHandler, cyclone.web.RequestHandler):
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
202
1019
5939fce98fad notes for next step
drewp@bigasterisk.com
parents: 1018
diff changeset
203 def get(self):
5939fce98fad notes for next step
drewp@bigasterisk.com
parents: 1018
diff changeset
204 song = URIRef(self.get_argument('song'))
1877
d01e21621975 reformat
Drew Perttula <drewp@bigasterisk.com>
parents: 1866
diff changeset
205 effects = effectsForSong(self.settings.graph, song) # noqa
1033
b5ee7aa9341a effecteval now runs effects in the background, following the current song, and sends dmx output
Drew Perttula <drewp@bigasterisk.com>
parents: 1027
diff changeset
206 raise NotImplementedError
1877
d01e21621975 reformat
Drew Perttula <drewp@bigasterisk.com>
parents: 1866
diff changeset
207 self.write(maxDict(effectDmxDict(e) for e in effects)) # noqa
1019
5939fce98fad notes for next step
drewp@bigasterisk.com
parents: 1018
diff changeset
208 # return dmx dict for all effects in the song, already combined
1033
b5ee7aa9341a effecteval now runs effects in the background, following the current song, and sends dmx output
Drew Perttula <drewp@bigasterisk.com>
parents: 1027
diff changeset
209
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
210
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
211 class App(object):
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
212
1114
a38955ba6f40 rdfdb port is now in the config
Drew Perttula <drewp@bigasterisk.com>
parents: 1111
diff changeset
213 def __init__(self, show, outputWhere):
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
214 self.show = show
1114
a38955ba6f40 rdfdb port is now in the config
Drew Perttula <drewp@bigasterisk.com>
parents: 1111
diff changeset
215 self.outputWhere = outputWhere
a38955ba6f40 rdfdb port is now in the config
Drew Perttula <drewp@bigasterisk.com>
parents: 1111
diff changeset
216 self.graph = SyncedGraph(networking.rdfdb.url, "effectEval")
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
217 self.graph.initiallySynced.addCallback(self.launch).addErrback(
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
218 log.error)
1043
aa45e5379c5a effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents: 1041
diff changeset
219
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
220 self.stats = scales.collection(
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
221 '/',
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
222 scales.PmfStat('sendLevels'),
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
223 scales.PmfStat('getMusic'),
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
224 scales.PmfStat('evals'),
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
225 scales.PmfStat('sendOutput'),
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
226 scales.IntStat('errors'),
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
227 )
1053
9937e2e3d17b effecteval faster loop, stats page
Drew Perttula <drewp@bigasterisk.com>
parents: 1052
diff changeset
228
1043
aa45e5379c5a effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents: 1041
diff changeset
229 def launch(self, *args):
1535
04f2e93f04e3 effecteval log startup error
Drew Perttula <drewp@bigasterisk.com>
parents: 1237
diff changeset
230 log.info('launch')
1548
5d8009daea51 effecteval ok to run with no output (?)
Drew Perttula <drewp@bigasterisk.com>
parents: 1535
diff changeset
231 if self.outputWhere:
5d8009daea51 effecteval ok to run with no output (?)
Drew Perttula <drewp@bigasterisk.com>
parents: 1535
diff changeset
232 self.loop = makeEffectLoop(self.graph, self.stats, self.outputWhere)
5d8009daea51 effecteval ok to run with no output (?)
Drew Perttula <drewp@bigasterisk.com>
parents: 1535
diff changeset
233 self.loop.startLoop()
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
234
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
235 SFH = cyclone.web.StaticFileHandler
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
236 self.cycloneApp = cyclone.web.Application(handlers=[
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
237 (r'/()', SFH, {
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
238 'path': 'light9/effecteval',
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
239 'default_filename': 'index.html'
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
240 }),
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
241 (r'/effect', EffectEdit),
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
242 (r'/effect\.js', StaticCoffee, {
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
243 'src': 'light9/effecteval/effect.coffee'
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
244 }),
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
245 (r'/(effect-components\.html)', SFH, {
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
246 'path': 'light9/effecteval'
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
247 }),
1041
a4632a7b2e17 upgrade knockout and jquery, simplify the static/ dirs for all web services
Drew Perttula <drewp@bigasterisk.com>
parents: 1033
diff changeset
248 (r'/effectUpdates', EffectUpdates),
1101
3074f635ee23 effect page can write code edits back
Drew Perttula <drewp@bigasterisk.com>
parents: 1100
diff changeset
249 (r'/code', Code),
1041
a4632a7b2e17 upgrade knockout and jquery, simplify the static/ dirs for all web services
Drew Perttula <drewp@bigasterisk.com>
parents: 1033
diff changeset
250 (r'/songEffectsUpdates', SongEffectsUpdates),
1019
5939fce98fad notes for next step
drewp@bigasterisk.com
parents: 1018
diff changeset
251 (r'/effect/eval', EffectEval),
1044
a2081b9adfe4 effecteval now takes dropped subs and makes new effects out of them
Drew Perttula <drewp@bigasterisk.com>
parents: 1043
diff changeset
252 (r'/songEffects', SongEffects),
1019
5939fce98fad notes for next step
drewp@bigasterisk.com
parents: 1018
diff changeset
253 (r'/songEffects/eval', SongEffectsEval),
1926
1a7e5b07bf17 use my greplin fork's stats/ code instead of an old local one
Drew Perttula <drewp@bigasterisk.com>
parents: 1877
diff changeset
254 (r'/stats/(.*)', StatsHandler, {
1a7e5b07bf17 use my greplin fork's stats/ code instead of an old local one
Drew Perttula <drewp@bigasterisk.com>
parents: 1877
diff changeset
255 'serverName': 'effecteval'
1a7e5b07bf17 use my greplin fork's stats/ code instead of an old local one
Drew Perttula <drewp@bigasterisk.com>
parents: 1877
diff changeset
256 }),
1180
6c4981f61bf8 subserver inserts effects with envelope curves
Drew Perttula <drewp@bigasterisk.com>
parents: 1141
diff changeset
257 ],
6c4981f61bf8 subserver inserts effects with envelope curves
Drew Perttula <drewp@bigasterisk.com>
parents: 1141
diff changeset
258 debug=True,
6c4981f61bf8 subserver inserts effects with envelope curves
Drew Perttula <drewp@bigasterisk.com>
parents: 1141
diff changeset
259 graph=self.graph,
6c4981f61bf8 subserver inserts effects with envelope curves
Drew Perttula <drewp@bigasterisk.com>
parents: 1141
diff changeset
260 stats=self.stats)
1043
aa45e5379c5a effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents: 1041
diff changeset
261 reactor.listenTCP(networking.effectEval.port, self.cycloneApp)
aa45e5379c5a effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents: 1041
diff changeset
262 log.info("listening on %s" % networking.effectEval.port)
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
263
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
264
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
265 if __name__ == "__main__":
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
266 parser = optparse.OptionParser()
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
267 parser.add_option(
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
268 '--show',
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
269 help='show URI, like http://light9.bigasterisk.com/show/dance2008',
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
270 default=showconfig.showUri())
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
271 parser.add_option("-v",
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
272 "--verbose",
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
273 action="store_true",
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
274 help="logging.DEBUG")
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
275 parser.add_option("--twistedlog",
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
276 action="store_true",
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
277 help="twisted logging")
1115
818275850003 effecteval screens for only the kinds of outputs that it can send, so i can run a second instance just for LEDs
Drew Perttula <drewp@bigasterisk.com>
parents: 1114
diff changeset
278 parser.add_option("--output", metavar="WHERE", help="dmx or leds")
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
279 (options, args) = parser.parse_args()
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
280 log.setLevel(logging.DEBUG if options.verbose else logging.INFO)
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
281
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
282 if not options.show:
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
283 raise ValueError("missing --show http://...")
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1692
diff changeset
284
1115
818275850003 effecteval screens for only the kinds of outputs that it can send, so i can run a second instance just for LEDs
Drew Perttula <drewp@bigasterisk.com>
parents: 1114
diff changeset
285 app = App(URIRef(options.show), options.output)
1018
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
286 if options.twistedlog:
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
287 from twisted.python import log as twlog
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
288 twlog.startLogging(sys.stderr)
e28a443bd153 initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff changeset
289 reactor.run()