Mercurial > code > home > repos > light9
annotate bin/effecteval @ 2086:fe807af851c8
partial port of editchoice
| author | drewp@bigasterisk.com |
|---|---|
| date | Sun, 29 May 2022 01:43:11 -0700 |
| parents | 9aa046cc9b33 |
| children |
| 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 |
|
1556
61f3f378cc62
move code for adding effect to current song to its own (testable) module
Drew Perttula <drewp@bigasterisk.com>
parents:
1548
diff
changeset
|
10 from light9 import networking, showconfig |
|
1079
fce46850ed8c
consolidate the curve load/save rdf code more
Drew Perttula <drewp@bigasterisk.com>
parents:
1076
diff
changeset
|
11 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
|
12 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
|
13 from light9.effecteval.effectloop import makeEffectLoop |
|
2046
9aa046cc9b33
replace greplin with prometheus throughout (untested)
drewp@bigasterisk.com
parents:
1975
diff
changeset
|
14 from light9.metrics import metrics, metricsRoute |
|
1556
61f3f378cc62
move code for adding effect to current song to its own (testable) module
Drew Perttula <drewp@bigasterisk.com>
parents:
1548
diff
changeset
|
15 from light9.namespaces import L9 |
| 1692 | 16 from rdfdb.patch import Patch |
| 17 from rdfdb.syncedgraph import SyncedGraph | |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
18 |
| 1861 | 19 from cycloneerr import PrettyErrorHandler |
|
1866
3c523c71da29
pyflakes cleanups and some refactors
Drew Perttula <drewp@bigasterisk.com>
parents:
1861
diff
changeset
|
20 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
|
21 |
| 1858 | 22 |
| 1975 | 23 |
|
1054
4595a82f5a90
effecteval has a delete button on effect rows
Drew Perttula <drewp@bigasterisk.com>
parents:
1053
diff
changeset
|
24 class EffectEdit(PrettyErrorHandler, cyclone.web.RequestHandler): |
| 1858 | 25 |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
26 def get(self): |
| 1858 | 27 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
|
28 self.write(open("light9/effecteval/effect.html").read()) |
| 1858 | 29 |
|
1054
4595a82f5a90
effecteval has a delete button on effect rows
Drew Perttula <drewp@bigasterisk.com>
parents:
1053
diff
changeset
|
30 def delete(self): |
|
4595a82f5a90
effecteval has a delete button on effect rows
Drew Perttula <drewp@bigasterisk.com>
parents:
1053
diff
changeset
|
31 graph = self.settings.graph |
|
4595a82f5a90
effecteval has a delete button on effect rows
Drew Perttula <drewp@bigasterisk.com>
parents:
1053
diff
changeset
|
32 uri = URIRef(self.get_argument('uri')) |
|
4595a82f5a90
effecteval has a delete button on effect rows
Drew Perttula <drewp@bigasterisk.com>
parents:
1053
diff
changeset
|
33 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
|
34 song = ctx = list(g.subjects(L9['effect'], uri))[0] |
| 1858 | 35 self.settings.graph.patch( |
| 36 Patch(delQuads=[ | |
| 37 (song, L9['effect'], uri, ctx), | |
|
1054
4595a82f5a90
effecteval has a delete button on effect rows
Drew Perttula <drewp@bigasterisk.com>
parents:
1053
diff
changeset
|
38 ])) |
| 1858 | 39 |
| 40 | |
|
1181
c677bf37a1b4
effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents:
1180
diff
changeset
|
41 @inlineCallbacks |
|
c677bf37a1b4
effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents:
1180
diff
changeset
|
42 def currentSong(): |
|
c677bf37a1b4
effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents:
1180
diff
changeset
|
43 s = (yield getMusicStatus())['song'] |
|
c677bf37a1b4
effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents:
1180
diff
changeset
|
44 if s is None: |
|
c677bf37a1b4
effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents:
1180
diff
changeset
|
45 raise ValueError("no current song") |
|
c677bf37a1b4
effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents:
1180
diff
changeset
|
46 returnValue(URIRef(s)) |
|
1187
102a456be7db
refactor EE moving towards the ability to re-bump existing curves
drewp@bigasterisk.com
parents:
1181
diff
changeset
|
47 |
| 1858 | 48 |
|
1044
a2081b9adfe4
effecteval now takes dropped subs and makes new effects out of them
Drew Perttula <drewp@bigasterisk.com>
parents:
1043
diff
changeset
|
49 class SongEffects(PrettyErrorHandler, cyclone.web.RequestHandler): |
| 1858 | 50 |
|
1181
c677bf37a1b4
effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents:
1180
diff
changeset
|
51 def wideOpenCors(self): |
|
c677bf37a1b4
effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents:
1180
diff
changeset
|
52 self.set_header('Access-Control-Allow-Origin', '*') |
| 1858 | 53 self.set_header('Access-Control-Allow-Methods', |
| 54 '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
|
55 self.set_header('Access-Control-Max-Age', '1000') |
| 1858 | 56 self.set_header('Access-Control-Allow-Headers', |
| 57 'Content-Type, Authorization, X-Requested-With') | |
| 58 | |
|
1181
c677bf37a1b4
effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents:
1180
diff
changeset
|
59 def options(self): |
|
c677bf37a1b4
effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents:
1180
diff
changeset
|
60 self.wideOpenCors() |
|
c677bf37a1b4
effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents:
1180
diff
changeset
|
61 self.write('') |
|
c677bf37a1b4
effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents:
1180
diff
changeset
|
62 |
|
1180
6c4981f61bf8
subserver inserts effects with envelope curves
Drew Perttula <drewp@bigasterisk.com>
parents:
1141
diff
changeset
|
63 @inlineCallbacks |
|
1044
a2081b9adfe4
effecteval now takes dropped subs and makes new effects out of them
Drew Perttula <drewp@bigasterisk.com>
parents:
1043
diff
changeset
|
64 def post(self): |
|
1181
c677bf37a1b4
effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents:
1180
diff
changeset
|
65 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
|
66 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
|
67 |
|
c677bf37a1b4
effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents:
1180
diff
changeset
|
68 try: |
|
c677bf37a1b4
effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents:
1180
diff
changeset
|
69 song = URIRef(self.get_argument('uri')) |
| 1858 | 70 except Exception: # which? |
|
1181
c677bf37a1b4
effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents:
1180
diff
changeset
|
71 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
|
72 |
|
1558
7eb3676b8fd6
more of the fixed add-to-song service
Drew Perttula <drewp@bigasterisk.com>
parents:
1557
diff
changeset
|
73 event = self.get_argument('event', default='default') |
| 1858 | 74 |
|
1566
13e3cbe9071a
momentary-add button support
Drew Perttula <drewp@bigasterisk.com>
parents:
1560
diff
changeset
|
75 note = self.get_argument('note', default=None) |
|
13e3cbe9071a
momentary-add button support
Drew Perttula <drewp@bigasterisk.com>
parents:
1560
diff
changeset
|
76 if note is not None: |
|
13e3cbe9071a
momentary-add button support
Drew Perttula <drewp@bigasterisk.com>
parents:
1560
diff
changeset
|
77 note = URIRef(note) |
|
13e3cbe9071a
momentary-add button support
Drew Perttula <drewp@bigasterisk.com>
parents:
1560
diff
changeset
|
78 |
|
1181
c677bf37a1b4
effect list has button to add to current song
Drew Perttula <drewp@bigasterisk.com>
parents:
1180
diff
changeset
|
79 log.info("adding to %s", song) |
| 1858 | 80 note, p = yield songNotePatch(self.settings.graph, |
| 81 dropped, | |
| 82 song, | |
| 83 event, | |
| 84 ctx=song, | |
| 85 note=note) | |
| 86 | |
|
1557
104ff4606565
cleanup. internal names in edit.py
Drew Perttula <drewp@bigasterisk.com>
parents:
1556
diff
changeset
|
87 self.settings.graph.patch(p) |
|
1581
30c79f1dc4f8
fix suggestPrefixes to send suggestions to rdfdb
Drew Perttula <drewp@bigasterisk.com>
parents:
1570
diff
changeset
|
88 self.settings.graph.suggestPrefixes(song, {'song': URIRef(song + '/')}) |
|
1566
13e3cbe9071a
momentary-add button support
Drew Perttula <drewp@bigasterisk.com>
parents:
1560
diff
changeset
|
89 self.write(json.dumps({'note': note})) |
| 1858 | 90 |
| 91 | |
|
1043
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
92 class SongEffectsUpdates(cyclone.websocket.WebSocketHandler): |
| 1858 | 93 |
|
1043
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
94 def connectionMade(self, *args, **kwargs): |
|
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
95 self.graph = self.settings.graph |
|
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
96 self.graph.addHandler(self.updateClient) |
| 1858 | 97 |
|
1043
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
98 def updateClient(self): |
|
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
99 # todo: abort if client is gone |
|
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
100 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
|
101 songs = list(self.graph.items(playlist)) |
|
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
102 out = [] |
|
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
103 for s in songs: |
|
1933
c81f86f3d65a
effecteval is mostly obsolete, but now it can at least show a list of effects used in a song (which seq can too)
Drew Perttula <drewp@bigasterisk.com>
parents:
1926
diff
changeset
|
104 out.append({'uri': s, 'label': self.graph.label(s), 'effects': []}) |
|
c81f86f3d65a
effecteval is mostly obsolete, but now it can at least show a list of effects used in a song (which seq can too)
Drew Perttula <drewp@bigasterisk.com>
parents:
1926
diff
changeset
|
105 seen = set() |
|
c81f86f3d65a
effecteval is mostly obsolete, but now it can at least show a list of effects used in a song (which seq can too)
Drew Perttula <drewp@bigasterisk.com>
parents:
1926
diff
changeset
|
106 for n in self.graph.objects(s, L9['note']): |
|
c81f86f3d65a
effecteval is mostly obsolete, but now it can at least show a list of effects used in a song (which seq can too)
Drew Perttula <drewp@bigasterisk.com>
parents:
1926
diff
changeset
|
107 for uri in self.graph.objects(n, L9['effectClass']): |
|
c81f86f3d65a
effecteval is mostly obsolete, but now it can at least show a list of effects used in a song (which seq can too)
Drew Perttula <drewp@bigasterisk.com>
parents:
1926
diff
changeset
|
108 if uri in seen: |
|
c81f86f3d65a
effecteval is mostly obsolete, but now it can at least show a list of effects used in a song (which seq can too)
Drew Perttula <drewp@bigasterisk.com>
parents:
1926
diff
changeset
|
109 continue |
|
c81f86f3d65a
effecteval is mostly obsolete, but now it can at least show a list of effects used in a song (which seq can too)
Drew Perttula <drewp@bigasterisk.com>
parents:
1926
diff
changeset
|
110 seen.add(uri) |
|
c81f86f3d65a
effecteval is mostly obsolete, but now it can at least show a list of effects used in a song (which seq can too)
Drew Perttula <drewp@bigasterisk.com>
parents:
1926
diff
changeset
|
111 out[-1]['effects'].append({ |
|
c81f86f3d65a
effecteval is mostly obsolete, but now it can at least show a list of effects used in a song (which seq can too)
Drew Perttula <drewp@bigasterisk.com>
parents:
1926
diff
changeset
|
112 'uri': uri, |
|
c81f86f3d65a
effecteval is mostly obsolete, but now it can at least show a list of effects used in a song (which seq can too)
Drew Perttula <drewp@bigasterisk.com>
parents:
1926
diff
changeset
|
113 'label': self.graph.label(uri) |
|
c81f86f3d65a
effecteval is mostly obsolete, but now it can at least show a list of effects used in a song (which seq can too)
Drew Perttula <drewp@bigasterisk.com>
parents:
1926
diff
changeset
|
114 }) |
|
c81f86f3d65a
effecteval is mostly obsolete, but now it can at least show a list of effects used in a song (which seq can too)
Drew Perttula <drewp@bigasterisk.com>
parents:
1926
diff
changeset
|
115 out[-1]['effects'].sort(key=lambda e: e['uri']) |
|
1937
f29e26811206
pmfstats now update at 1hz. some ui improvements to stats lines.
Drew Perttula <drewp@bigasterisk.com>
parents:
1933
diff
changeset
|
116 |
|
1043
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
117 self.sendMessage({'songs': out}) |
| 1858 | 118 |
| 119 | |
|
1043
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
120 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
|
121 """ |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
122 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
|
123 """ |
| 1858 | 124 |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
125 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
|
126 log.info("websocket opened") |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
127 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
|
128 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
|
129 |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
130 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
|
131 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
|
132 |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
133 def updateClient(self): |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
134 # 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
|
135 # graph updates |
|
1108
4b542d321c8f
effectnode runs multiple lines of code in dependency order
Drew Perttula <drewp@bigasterisk.com>
parents:
1107
diff
changeset
|
136 |
|
4b542d321c8f
effectnode runs multiple lines of code in dependency order
Drew Perttula <drewp@bigasterisk.com>
parents:
1107
diff
changeset
|
137 # 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
|
138 # 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
|
139 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
|
140 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
|
141 self.sendMessage({'codeLines': codeLines}) |
| 1858 | 142 |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
143 def connectionLost(self, reason): |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
144 log.info("websocket closed") |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
145 |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
146 def messageReceived(self, message): |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
147 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
|
148 # 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
|
149 |
| 1858 | 150 |
|
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
|
151 def replaceObjects(graph, c, s, p, newObjs): |
| 1858 | 152 patch = graph.getObjectPatch(context=c, |
| 153 subject=s, | |
| 154 predicate=p, | |
| 155 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
|
156 |
|
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 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
|
158 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
|
159 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
|
160 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
|
161 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
|
162 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
|
163 |
| 1858 | 164 |
|
1101
3074f635ee23
effect page can write code edits back
Drew Perttula <drewp@bigasterisk.com>
parents:
1100
diff
changeset
|
165 class Code(PrettyErrorHandler, cyclone.web.RequestHandler): |
| 1858 | 166 |
|
1101
3074f635ee23
effect page can write code edits back
Drew Perttula <drewp@bigasterisk.com>
parents:
1100
diff
changeset
|
167 def put(self): |
|
3074f635ee23
effect page can write code edits back
Drew Perttula <drewp@bigasterisk.com>
parents:
1100
diff
changeset
|
168 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
|
169 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
|
170 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
|
171 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
|
172 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
|
173 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
|
174 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
|
175 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
|
176 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
|
177 if not codeLines: |
| 1111 | 178 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
|
179 return |
| 1858 | 180 with self.settings.graph.currentState(tripleFilter=(None, L9['effect'], |
| 181 effect)) as g: | |
|
1859
f066d6e874db
2to3 with these fixers: all idioms set_literal
drewp@bigasterisk.com
parents:
1858
diff
changeset
|
182 song = next(g.subjects(L9['effect'], effect)) |
| 1858 | 183 |
|
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
|
184 replaceObjects(self.settings.graph, song, effect, L9['code'], codeLines) |
| 1858 | 185 |
|
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
|
186 # 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
|
187 self.send_error(202) |
| 1858 | 188 |
| 189 | |
| 1019 | 190 class EffectEval(PrettyErrorHandler, cyclone.web.RequestHandler): |
| 1858 | 191 |
|
1027
a38414bd3929
hacking on effecteval
Drew Perttula <drewp@bigasterisk.com>
parents:
1019
diff
changeset
|
192 @inlineCallbacks |
| 1019 | 193 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
|
194 # return dmx list for that effect |
| 1019 | 195 uri = URIRef(self.get_argument('uri')) |
|
1027
a38414bd3929
hacking on effecteval
Drew Perttula <drewp@bigasterisk.com>
parents:
1019
diff
changeset
|
196 response = yield cyclone.httpclient.fetch( |
|
a38414bd3929
hacking on effecteval
Drew Perttula <drewp@bigasterisk.com>
parents:
1019
diff
changeset
|
197 networking.musicPlayer.path('time')) |
|
a38414bd3929
hacking on effecteval
Drew Perttula <drewp@bigasterisk.com>
parents:
1019
diff
changeset
|
198 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
|
199 |
|
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 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
|
201 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
|
202 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
|
203 |
|
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
|
204 |
|
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
|
205 # 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
|
206 # go. Another process could own it, and get this request repeatedly: |
| 1019 | 207 class SongEffectsEval(PrettyErrorHandler, cyclone.web.RequestHandler): |
| 1858 | 208 |
| 1019 | 209 def get(self): |
| 210 song = URIRef(self.get_argument('song')) | |
| 1877 | 211 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
|
212 raise NotImplementedError |
| 1877 | 213 self.write(maxDict(effectDmxDict(e) for e in effects)) # noqa |
| 1019 | 214 # 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
|
215 |
| 1858 | 216 |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
217 class App(object): |
| 1858 | 218 |
|
1114
a38955ba6f40
rdfdb port is now in the config
Drew Perttula <drewp@bigasterisk.com>
parents:
1111
diff
changeset
|
219 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
|
220 self.show = show |
|
1114
a38955ba6f40
rdfdb port is now in the config
Drew Perttula <drewp@bigasterisk.com>
parents:
1111
diff
changeset
|
221 self.outputWhere = outputWhere |
|
a38955ba6f40
rdfdb port is now in the config
Drew Perttula <drewp@bigasterisk.com>
parents:
1111
diff
changeset
|
222 self.graph = SyncedGraph(networking.rdfdb.url, "effectEval") |
| 1858 | 223 self.graph.initiallySynced.addCallback(self.launch).addErrback( |
| 224 log.error) | |
|
1043
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
225 |
|
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
226 def launch(self, *args): |
|
1535
04f2e93f04e3
effecteval log startup error
Drew Perttula <drewp@bigasterisk.com>
parents:
1237
diff
changeset
|
227 log.info('launch') |
|
1548
5d8009daea51
effecteval ok to run with no output (?)
Drew Perttula <drewp@bigasterisk.com>
parents:
1535
diff
changeset
|
228 if self.outputWhere: |
|
2046
9aa046cc9b33
replace greplin with prometheus throughout (untested)
drewp@bigasterisk.com
parents:
1975
diff
changeset
|
229 self.loop = makeEffectLoop(self.graph, self.outputWhere) |
|
1548
5d8009daea51
effecteval ok to run with no output (?)
Drew Perttula <drewp@bigasterisk.com>
parents:
1535
diff
changeset
|
230 self.loop.startLoop() |
| 1858 | 231 |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
232 SFH = cyclone.web.StaticFileHandler |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
233 self.cycloneApp = cyclone.web.Application(handlers=[ |
| 1858 | 234 (r'/()', SFH, { |
| 235 'path': 'light9/effecteval', | |
| 236 'default_filename': 'index.html' | |
| 237 }), | |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
238 (r'/effect', EffectEdit), |
| 1858 | 239 (r'/effect\.js', StaticCoffee, { |
| 240 'src': 'light9/effecteval/effect.coffee' | |
| 241 }), | |
| 242 (r'/(effect-components\.html)', SFH, { | |
| 243 'path': 'light9/effecteval' | |
| 244 }), | |
|
1041
a4632a7b2e17
upgrade knockout and jquery, simplify the static/ dirs for all web services
Drew Perttula <drewp@bigasterisk.com>
parents:
1033
diff
changeset
|
245 (r'/effectUpdates', EffectUpdates), |
|
1101
3074f635ee23
effect page can write code edits back
Drew Perttula <drewp@bigasterisk.com>
parents:
1100
diff
changeset
|
246 (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
|
247 (r'/songEffectsUpdates', SongEffectsUpdates), |
| 1019 | 248 (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
|
249 (r'/songEffects', SongEffects), |
| 1019 | 250 (r'/songEffects/eval', SongEffectsEval), |
|
2046
9aa046cc9b33
replace greplin with prometheus throughout (untested)
drewp@bigasterisk.com
parents:
1975
diff
changeset
|
251 metricsRoute(), |
|
1180
6c4981f61bf8
subserver inserts effects with envelope curves
Drew Perttula <drewp@bigasterisk.com>
parents:
1141
diff
changeset
|
252 ], |
|
6c4981f61bf8
subserver inserts effects with envelope curves
Drew Perttula <drewp@bigasterisk.com>
parents:
1141
diff
changeset
|
253 debug=True, |
|
2046
9aa046cc9b33
replace greplin with prometheus throughout (untested)
drewp@bigasterisk.com
parents:
1975
diff
changeset
|
254 graph=self.graph) |
|
1043
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
255 reactor.listenTCP(networking.effectEval.port, self.cycloneApp) |
|
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
256 log.info("listening on %s" % networking.effectEval.port) |
| 1858 | 257 |
| 258 | |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
259 if __name__ == "__main__": |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
260 parser = optparse.OptionParser() |
| 1858 | 261 parser.add_option( |
| 262 '--show', | |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
263 help='show URI, like http://light9.bigasterisk.com/show/dance2008', |
| 1858 | 264 default=showconfig.showUri()) |
| 265 parser.add_option("-v", | |
| 266 "--verbose", | |
| 267 action="store_true", | |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
268 help="logging.DEBUG") |
| 1858 | 269 parser.add_option("--twistedlog", |
| 270 action="store_true", | |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
271 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
|
272 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
|
273 (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
|
274 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
|
275 |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
276 if not options.show: |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
277 raise ValueError("missing --show http://...") |
| 1858 | 278 |
|
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
|
279 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
|
280 if options.twistedlog: |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
281 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
|
282 twlog.startLogging(sys.stderr) |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
283 reactor.run() |