Mercurial > code > home > repos > light9
annotate bin/effecteval @ 1957:a745bee5c419
new process stats visualizers
Ignore-this: 8e47516baad0bfb9cd02a712571c5a5f
| author | Drew Perttula <drewp@bigasterisk.com> |
|---|---|
| date | Thu, 06 Jun 2019 09:31:36 +0000 |
| parents | f29e26811206 |
| children | f66dbe512025 |
| 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 |
|
1926
1a7e5b07bf17
use my greplin fork's stats/ code instead of an old local one
Drew Perttula <drewp@bigasterisk.com>
parents:
1877
diff
changeset
|
14 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
|
15 from light9.namespaces import L9 |
| 1692 | 16 from rdfdb.patch import Patch |
| 17 from rdfdb.syncedgraph import SyncedGraph | |
|
1053
9937e2e3d17b
effecteval faster loop, stats page
Drew Perttula <drewp@bigasterisk.com>
parents:
1052
diff
changeset
|
18 from greplin import scales |
|
1957
a745bee5c419
new process stats visualizers
Drew Perttula <drewp@bigasterisk.com>
parents:
1937
diff
changeset
|
19 from standardservice.scalessetup import gatherProcessStats |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
20 |
| 1861 | 21 from cycloneerr import PrettyErrorHandler |
|
1866
3c523c71da29
pyflakes cleanups and some refactors
Drew Perttula <drewp@bigasterisk.com>
parents:
1861
diff
changeset
|
22 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
|
23 |
|
1957
a745bee5c419
new process stats visualizers
Drew Perttula <drewp@bigasterisk.com>
parents:
1937
diff
changeset
|
24 gatherProcessStats() |
| 1858 | 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 | 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 | 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 | 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 | 37 self.settings.graph.patch( |
| 38 Patch(delQuads=[ | |
| 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 | 41 |
| 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 | 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 | 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 | 55 self.set_header('Access-Control-Allow-Methods', |
| 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 | 58 self.set_header('Access-Control-Allow-Headers', |
| 59 'Content-Type, Authorization, X-Requested-With') | |
| 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 | 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 | 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 | 82 note, p = yield songNotePatch(self.settings.graph, |
| 83 dropped, | |
| 84 song, | |
| 85 event, | |
| 86 ctx=song, | |
| 87 note=note) | |
| 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 | 92 |
| 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 | 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 | 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: |
|
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
|
106 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
|
107 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
|
108 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
|
109 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
|
110 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
|
111 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
|
112 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
|
113 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
|
114 '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
|
115 '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
|
116 }) |
|
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
|
117 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
|
118 |
|
1043
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
119 self.sendMessage({'songs': out}) |
| 1858 | 120 |
| 121 | |
|
1043
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
122 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
|
123 """ |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
124 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
|
125 """ |
| 1858 | 126 |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
127 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
|
128 log.info("websocket opened") |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
129 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
|
130 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
|
131 |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
132 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
|
133 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
|
134 |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
135 def updateClient(self): |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
136 # 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
|
137 # graph updates |
|
1108
4b542d321c8f
effectnode runs multiple lines of code in dependency order
Drew Perttula <drewp@bigasterisk.com>
parents:
1107
diff
changeset
|
138 |
|
4b542d321c8f
effectnode runs multiple lines of code in dependency order
Drew Perttula <drewp@bigasterisk.com>
parents:
1107
diff
changeset
|
139 # 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
|
140 # 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
|
141 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
|
142 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
|
143 self.sendMessage({'codeLines': codeLines}) |
| 1858 | 144 |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
145 def connectionLost(self, reason): |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
146 log.info("websocket closed") |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
147 |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
148 def messageReceived(self, message): |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
149 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
|
150 # 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
|
151 |
| 1858 | 152 |
|
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
|
153 def replaceObjects(graph, c, s, p, newObjs): |
| 1858 | 154 patch = graph.getObjectPatch(context=c, |
| 155 subject=s, | |
| 156 predicate=p, | |
| 157 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
|
158 |
|
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 = [] |
|
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 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
|
161 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
|
162 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
|
163 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
|
164 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
|
165 |
| 1858 | 166 |
|
1101
3074f635ee23
effect page can write code edits back
Drew Perttula <drewp@bigasterisk.com>
parents:
1100
diff
changeset
|
167 class Code(PrettyErrorHandler, cyclone.web.RequestHandler): |
| 1858 | 168 |
|
1101
3074f635ee23
effect page can write code edits back
Drew Perttula <drewp@bigasterisk.com>
parents:
1100
diff
changeset
|
169 def put(self): |
|
3074f635ee23
effect page can write code edits back
Drew Perttula <drewp@bigasterisk.com>
parents:
1100
diff
changeset
|
170 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
|
171 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
|
172 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
|
173 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
|
174 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
|
175 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
|
176 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
|
177 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
|
178 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
|
179 if not codeLines: |
| 1111 | 180 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
|
181 return |
| 1858 | 182 with self.settings.graph.currentState(tripleFilter=(None, L9['effect'], |
| 183 effect)) as g: | |
|
1859
f066d6e874db
2to3 with these fixers: all idioms set_literal
drewp@bigasterisk.com
parents:
1858
diff
changeset
|
184 song = next(g.subjects(L9['effect'], effect)) |
| 1858 | 185 |
|
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
|
186 replaceObjects(self.settings.graph, song, effect, L9['code'], codeLines) |
| 1858 | 187 |
|
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
|
188 # 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
|
189 self.send_error(202) |
| 1858 | 190 |
| 191 | |
| 1019 | 192 class EffectEval(PrettyErrorHandler, cyclone.web.RequestHandler): |
| 1858 | 193 |
|
1027
a38414bd3929
hacking on effecteval
Drew Perttula <drewp@bigasterisk.com>
parents:
1019
diff
changeset
|
194 @inlineCallbacks |
| 1019 | 195 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
|
196 # return dmx list for that effect |
| 1019 | 197 uri = URIRef(self.get_argument('uri')) |
|
1027
a38414bd3929
hacking on effecteval
Drew Perttula <drewp@bigasterisk.com>
parents:
1019
diff
changeset
|
198 response = yield cyclone.httpclient.fetch( |
|
a38414bd3929
hacking on effecteval
Drew Perttula <drewp@bigasterisk.com>
parents:
1019
diff
changeset
|
199 networking.musicPlayer.path('time')) |
|
a38414bd3929
hacking on effecteval
Drew Perttula <drewp@bigasterisk.com>
parents:
1019
diff
changeset
|
200 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
|
201 |
|
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 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
|
203 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
|
204 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
|
205 |
|
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 |
|
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
|
207 # 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
|
208 # go. Another process could own it, and get this request repeatedly: |
| 1019 | 209 class SongEffectsEval(PrettyErrorHandler, cyclone.web.RequestHandler): |
| 1858 | 210 |
| 1019 | 211 def get(self): |
| 212 song = URIRef(self.get_argument('song')) | |
| 1877 | 213 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
|
214 raise NotImplementedError |
| 1877 | 215 self.write(maxDict(effectDmxDict(e) for e in effects)) # noqa |
| 1019 | 216 # 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
|
217 |
| 1858 | 218 |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
219 class App(object): |
| 1858 | 220 |
|
1114
a38955ba6f40
rdfdb port is now in the config
Drew Perttula <drewp@bigasterisk.com>
parents:
1111
diff
changeset
|
221 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
|
222 self.show = show |
|
1114
a38955ba6f40
rdfdb port is now in the config
Drew Perttula <drewp@bigasterisk.com>
parents:
1111
diff
changeset
|
223 self.outputWhere = outputWhere |
|
a38955ba6f40
rdfdb port is now in the config
Drew Perttula <drewp@bigasterisk.com>
parents:
1111
diff
changeset
|
224 self.graph = SyncedGraph(networking.rdfdb.url, "effectEval") |
| 1858 | 225 self.graph.initiallySynced.addCallback(self.launch).addErrback( |
| 226 log.error) | |
|
1043
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
227 |
| 1858 | 228 self.stats = scales.collection( |
| 229 '/', | |
|
1937
f29e26811206
pmfstats now update at 1hz. some ui improvements to stats lines.
Drew Perttula <drewp@bigasterisk.com>
parents:
1933
diff
changeset
|
230 scales.PmfStat('sendLevels', recalcPeriod=1), |
|
f29e26811206
pmfstats now update at 1hz. some ui improvements to stats lines.
Drew Perttula <drewp@bigasterisk.com>
parents:
1933
diff
changeset
|
231 scales.PmfStat('getMusic', recalcPeriod=1), |
|
f29e26811206
pmfstats now update at 1hz. some ui improvements to stats lines.
Drew Perttula <drewp@bigasterisk.com>
parents:
1933
diff
changeset
|
232 scales.PmfStat('evals', recalcPeriod=1), |
|
f29e26811206
pmfstats now update at 1hz. some ui improvements to stats lines.
Drew Perttula <drewp@bigasterisk.com>
parents:
1933
diff
changeset
|
233 scales.PmfStat('sendOutput', recalcPeriod=1), |
| 1858 | 234 scales.IntStat('errors'), |
| 235 ) | |
|
1053
9937e2e3d17b
effecteval faster loop, stats page
Drew Perttula <drewp@bigasterisk.com>
parents:
1052
diff
changeset
|
236 |
|
1043
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
237 def launch(self, *args): |
|
1535
04f2e93f04e3
effecteval log startup error
Drew Perttula <drewp@bigasterisk.com>
parents:
1237
diff
changeset
|
238 log.info('launch') |
|
1548
5d8009daea51
effecteval ok to run with no output (?)
Drew Perttula <drewp@bigasterisk.com>
parents:
1535
diff
changeset
|
239 if self.outputWhere: |
|
5d8009daea51
effecteval ok to run with no output (?)
Drew Perttula <drewp@bigasterisk.com>
parents:
1535
diff
changeset
|
240 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
|
241 self.loop.startLoop() |
| 1858 | 242 |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
243 SFH = cyclone.web.StaticFileHandler |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
244 self.cycloneApp = cyclone.web.Application(handlers=[ |
| 1858 | 245 (r'/()', SFH, { |
| 246 'path': 'light9/effecteval', | |
| 247 'default_filename': 'index.html' | |
| 248 }), | |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
249 (r'/effect', EffectEdit), |
| 1858 | 250 (r'/effect\.js', StaticCoffee, { |
| 251 'src': 'light9/effecteval/effect.coffee' | |
| 252 }), | |
| 253 (r'/(effect-components\.html)', SFH, { | |
| 254 'path': 'light9/effecteval' | |
| 255 }), | |
|
1041
a4632a7b2e17
upgrade knockout and jquery, simplify the static/ dirs for all web services
Drew Perttula <drewp@bigasterisk.com>
parents:
1033
diff
changeset
|
256 (r'/effectUpdates', EffectUpdates), |
|
1101
3074f635ee23
effect page can write code edits back
Drew Perttula <drewp@bigasterisk.com>
parents:
1100
diff
changeset
|
257 (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
|
258 (r'/songEffectsUpdates', SongEffectsUpdates), |
| 1019 | 259 (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
|
260 (r'/songEffects', SongEffects), |
| 1019 | 261 (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
|
262 (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
|
263 '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
|
264 }), |
|
1180
6c4981f61bf8
subserver inserts effects with envelope curves
Drew Perttula <drewp@bigasterisk.com>
parents:
1141
diff
changeset
|
265 ], |
|
6c4981f61bf8
subserver inserts effects with envelope curves
Drew Perttula <drewp@bigasterisk.com>
parents:
1141
diff
changeset
|
266 debug=True, |
|
6c4981f61bf8
subserver inserts effects with envelope curves
Drew Perttula <drewp@bigasterisk.com>
parents:
1141
diff
changeset
|
267 graph=self.graph, |
|
6c4981f61bf8
subserver inserts effects with envelope curves
Drew Perttula <drewp@bigasterisk.com>
parents:
1141
diff
changeset
|
268 stats=self.stats) |
|
1043
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
269 reactor.listenTCP(networking.effectEval.port, self.cycloneApp) |
|
aa45e5379c5a
effecteval improvements. displays current song+effect tree
Drew Perttula <drewp@bigasterisk.com>
parents:
1041
diff
changeset
|
270 log.info("listening on %s" % networking.effectEval.port) |
| 1858 | 271 |
| 272 | |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
273 if __name__ == "__main__": |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
274 parser = optparse.OptionParser() |
| 1858 | 275 parser.add_option( |
| 276 '--show', | |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
277 help='show URI, like http://light9.bigasterisk.com/show/dance2008', |
| 1858 | 278 default=showconfig.showUri()) |
| 279 parser.add_option("-v", | |
| 280 "--verbose", | |
| 281 action="store_true", | |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
282 help="logging.DEBUG") |
| 1858 | 283 parser.add_option("--twistedlog", |
| 284 action="store_true", | |
|
1018
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
285 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
|
286 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
|
287 (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
|
288 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
|
289 |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
290 if not options.show: |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
291 raise ValueError("missing --show http://...") |
| 1858 | 292 |
|
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
|
293 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
|
294 if options.twistedlog: |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
295 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
|
296 twlog.startLogging(sys.stderr) |
|
e28a443bd153
initial effecteval that can propagate changes from the graph to a web page
drewp@bigasterisk.com
parents:
diff
changeset
|
297 reactor.run() |