# HG changeset patch
# User drewp@bigasterisk.com
# Date 2018-03-21 08:31:45
# Node ID 6fa4288da8a69e7983f749e0fdbfa7726fdceb55
# Parent  a18eb09762b756bdf382a4baa6a7834aa1ccd660

rdfdb is its own package now
Ignore-this: 6b0b51464911b955687fefe6454fb91b

diff --git a/bin/captureDevice b/bin/captureDevice
--- a/bin/captureDevice
+++ b/bin/captureDevice
@@ -17,12 +17,12 @@ from lib.cycloneerr import PrettyErrorHa
 
 from light9.namespaces import L9, RDF
 from light9 import networking, showconfig
-from light9.rdfdb.syncedgraph import SyncedGraph
+from rdfdb.syncedgraph import SyncedGraph
 from light9.paint.capture import writeCaptureDescription
 from light9.greplin_cyclone import StatsForCyclone
 from light9.effect.settings import DeviceSettings
 from light9.effect.sequencer import sendToCollector
-from light9.rdfdb.patch import Patch
+from rdfdb.patch import Patch
 
 stats = scales.collection('/webServer', scales.PmfStat('setAttr'))
 
diff --git a/bin/clientdemo b/bin/clientdemo
--- a/bin/clientdemo
+++ b/bin/clientdemo
@@ -6,8 +6,8 @@ from twisted.internet import reactor
 import cyclone.web, cyclone.httpclient, logging
 from rdflib import Namespace, Literal, URIRef
 from light9 import networking
-from light9.rdfdb.patch import Patch
-from light9.rdfdb.syncedgraph import SyncedGraph
+from rdfdb.patch import Patch
+from rdfdb.syncedgraph import SyncedGraph
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG)
diff --git a/bin/collector b/bin/collector
--- a/bin/collector
+++ b/bin/collector
@@ -25,7 +25,7 @@ from light9.collector.output import Entt
 from light9.collector.collector import Collector
 from light9.namespaces import L9
 from light9 import networking
-from light9.rdfdb.syncedgraph import SyncedGraph
+from rdfdb.syncedgraph import SyncedGraph
 from light9.greplin_cyclone import StatsForCyclone
 
 def parseJsonMessage(msg):
diff --git a/bin/curvecalc b/bin/curvecalc
--- a/bin/curvecalc
+++ b/bin/curvecalc
@@ -41,9 +41,9 @@ from light9.editchoicegtk import EditCho
 from light9.gtkpyconsole import togglePyConsole
 from light9.namespaces import L9
 from light9.observable import Observable
-from light9.rdfdb import clientsession
-from light9.rdfdb.patch import Patch
-from light9.rdfdb.syncedgraph import SyncedGraph
+from rdfdb import clientsession
+from rdfdb.patch import Patch
+from rdfdb.syncedgraph import SyncedGraph
 from light9.wavelength import wavelength
 
 class SubtermExists(ValueError):
diff --git a/bin/effecteval b/bin/effecteval
--- a/bin/effecteval
+++ b/bin/effecteval
@@ -16,8 +16,8 @@ from light9.effect.edit import getMusicS
 from light9.effecteval.effectloop import makeEffectLoop
 from light9.greplin_cyclone import StatsForCyclone
 from light9.namespaces import L9
-from light9.rdfdb.patch import Patch
-from light9.rdfdb.syncedgraph import SyncedGraph
+from rdfdb.patch import Patch
+from rdfdb.syncedgraph import SyncedGraph
 from greplin import scales
 
 from lib.cycloneerr import PrettyErrorHandler
diff --git a/bin/effectsequencer b/bin/effectsequencer
--- a/bin/effectsequencer
+++ b/bin/effectsequencer
@@ -6,14 +6,14 @@ from __future__ import division
 from run_local import log
 from twisted.internet import reactor
 from light9.greplin_cyclone import StatsForCyclone
-from light9.rdfdb.syncedgraph import SyncedGraph
+from rdfdb.syncedgraph import SyncedGraph
 from light9 import networking, showconfig
 from greplin import scales
 import optparse, sys, logging
 import cyclone.web
 from rdflib import URIRef
 from light9.effect.sequencer import Sequencer, sendToCollector
-from light9.rdfdb import clientsession
+from rdfdb import clientsession
 
 class App(object):
     def __init__(self, show, session):
diff --git a/bin/gtk_dnd_demo.py b/bin/gtk_dnd_demo.py
--- a/bin/gtk_dnd_demo.py
+++ b/bin/gtk_dnd_demo.py
@@ -7,7 +7,7 @@ from rdflib import URIRef
 from light9 import networking
 from light9.editchoicegtk import EditChoice, Local
 from light9.observable import Observable
-from light9.rdfdb.syncedgraph import SyncedGraph
+from rdfdb.syncedgraph import SyncedGraph
 
 win = gtk.Window()
 
diff --git a/bin/homepageConfig b/bin/homepageConfig
--- a/bin/homepageConfig
+++ b/bin/homepageConfig
@@ -6,7 +6,7 @@ from light9.namespaces import L9
 from urlparse import urlparse
 from urllib import splitport
 
-from light9.rdfdb.syncedgraph import SyncedGraph
+from rdfdb.syncedgraph import SyncedGraph
 from twisted.internet import reactor
 
 graph = showconfig.getGraph()
diff --git a/bin/inputdemo b/bin/inputdemo
--- a/bin/inputdemo
+++ b/bin/inputdemo
@@ -9,8 +9,8 @@ import optparse, logging, urllib, time
 from gi.repository import Gtk
 from run_local import log
 from light9 import showconfig, networking
-from light9.rdfdb import clientsession
-from light9.rdfdb.syncedgraph import SyncedGraph
+from rdfdb import clientsession
+from rdfdb.syncedgraph import SyncedGraph
 import cyclone.httpclient
 from light9.curvecalc.client import sendLiveInputPoint
 
diff --git a/bin/inputquneo b/bin/inputquneo
--- a/bin/inputquneo
+++ b/bin/inputquneo
@@ -10,7 +10,7 @@ from rdflib import URIRef
 from twisted.internet import reactor, task
 from light9.curvecalc.client import sendLiveInputPoint
 from light9.namespaces import L9, RDF, RDFS
-from light9.rdfdb.syncedgraph import SyncedGraph
+from rdfdb.syncedgraph import SyncedGraph
 from light9 import networking
 
 import sys
diff --git a/bin/keyboardcomposer b/bin/keyboardcomposer
--- a/bin/keyboardcomposer
+++ b/bin/keyboardcomposer
@@ -17,12 +17,12 @@ from light9 import showconfig, networkin
 from light9.uihelpers import toplevelat
 from light9.namespaces import L9, RDF, RDFS
 from light9.tkdnd import initTkdnd, dragSourceRegister, dropTargetRegister
-from light9.rdfdb import clientsession
-from light9.rdfdb.syncedgraph import SyncedGraph
+from rdfdb import clientsession
+from rdfdb.syncedgraph import SyncedGraph
 from light9.effect.sequencer import CodeWatcher
 import light9.effect.effecteval
 from light9.effect.settings import DeviceSettings
-from light9.rdfdb.patch import Patch
+from rdfdb.patch import Patch
 
 from bcf2000 import BCF2000
 
diff --git a/bin/listsongs b/bin/listsongs
--- a/bin/listsongs
+++ b/bin/listsongs
@@ -13,7 +13,7 @@ from twisted.internet import reactor
 from rdflib import RDF
 from light9 import networking
 from light9.namespaces import L9
-from light9.rdfdb.syncedgraph import SyncedGraph
+from rdfdb.syncedgraph import SyncedGraph
 
 graph = SyncedGraph(networking.rdfdb.url, "listsongs")
 
diff --git a/bin/paintserver b/bin/paintserver
--- a/bin/paintserver
+++ b/bin/paintserver
@@ -5,13 +5,13 @@ from run_local import log
 import json
 from twisted.internet import reactor
 from light9.greplin_cyclone import StatsForCyclone
-from light9.rdfdb.syncedgraph import SyncedGraph
+from rdfdb.syncedgraph import SyncedGraph
 from light9 import networking, showconfig
 from greplin import scales
 import optparse, sys, logging
 import cyclone.web
 from rdflib import URIRef
-from light9.rdfdb import clientsession
+from rdfdb import clientsession
 import light9.paint.solve
 from lib.cycloneerr import PrettyErrorHandler
 from light9.namespaces import RDF, L9, DEV
diff --git a/bin/rdfdb b/bin/rdfdb
--- a/bin/rdfdb
+++ b/bin/rdfdb
@@ -117,12 +117,12 @@ import cyclone.web, cyclone.httpclient, 
 sys.path.append(".")
 from light9 import networking, showconfig, prof
 from rdflib import ConjunctiveGraph, URIRef, Graph
-from light9.rdfdb.graphfile import GraphFile
-from light9.rdfdb.patch import Patch, ALLSTMTS
-from light9.rdfdb.rdflibpatch import patchQuads
-from light9.rdfdb.file_vs_uri import correctToTopdirPrefix, fileForUri, uriFromFile
-from light9.rdfdb.patchsender import sendPatch
-from light9.rdfdb.patchreceiver import makePatchEndpointPutMethod
+from rdfdb.graphfile import GraphFile
+from rdfdb.patch import Patch, ALLSTMTS
+from rdfdb.rdflibpatch import patchQuads
+from rdfdb.file_vs_uri import correctToTopdirPrefix, fileForUri, uriFromFile
+from rdfdb.patchsender import sendPatch
+from rdfdb.patchreceiver import makePatchEndpointPutMethod
 
 from twisted.internet.inotify import INotify
 from run_local import log
diff --git a/bin/subcomposer b/bin/subcomposer
--- a/bin/subcomposer
+++ b/bin/subcomposer
@@ -32,11 +32,11 @@ from light9 import dmxclient, Submaster,
 
 from light9.Patch import get_channel_name
 from light9.uihelpers import toplevelat
-from light9.rdfdb.syncedgraph import SyncedGraph
-from light9.rdfdb import clientsession
+from rdfdb.syncedgraph import SyncedGraph
+from rdfdb import clientsession
 from light9.tkdnd import initTkdnd
 from light9.namespaces import L9
-from light9.rdfdb.patch import Patch
+from rdfdb.patch import Patch
 from light9.observable import Observable
 from light9.editchoice import EditChoice, Local
 from light9.subcomposer import subcomposerweb
diff --git a/bin/subserver b/bin/subserver
--- a/bin/subserver
+++ b/bin/subserver
@@ -10,8 +10,8 @@ from twisted.internet import reactor, de
 import cyclone.web, cyclone.httpclient, cyclone.websocket
 from rdflib import RDF, URIRef, Literal
 import pyjade.utils
-from light9.rdfdb.syncedgraph import SyncedGraph
-from light9.rdfdb.patch import Patch
+from rdfdb.syncedgraph import SyncedGraph
+from rdfdb.patch import Patch
 from light9.namespaces import L9, DCTERMS
 from light9 import networking, showconfig
 
diff --git a/bin/vidref b/bin/vidref
--- a/bin/vidref
+++ b/bin/vidref
@@ -13,7 +13,7 @@ import cyclone.web, cyclone.httpclient, 
 from light9 import networking, showconfig
 from light9.vidref.main import Gui
 from light9.vidref.replay import snapshotDir
-from light9.rdfdb.syncedgraph import SyncedGraph
+from rdfdb.syncedgraph import SyncedGraph
 
  # find replay dirs correctly. show multiple
  # replays. trash. reorder/pin. dump takes that are too short; they're
diff --git a/bin/vidrefsetup b/bin/vidrefsetup
--- a/bin/vidrefsetup
+++ b/bin/vidrefsetup
@@ -9,8 +9,8 @@ from twisted.internet import reactor, de
 import cyclone.web, cyclone.httpclient, cyclone.websocket
 from rdflib import RDF, URIRef, Literal
 import pyjade.utils
-from light9.rdfdb.syncedgraph import SyncedGraph
-from light9.rdfdb.patch import Patch
+from rdfdb.syncedgraph import SyncedGraph
+from rdfdb.patch import Patch
 from light9.namespaces import L9, DCTERMS
 from light9 import networking, showconfig
 
diff --git a/light9/Submaster.py b/light9/Submaster.py
--- a/light9/Submaster.py
+++ b/light9/Submaster.py
@@ -7,7 +7,7 @@ from light9.TLUtility import dict_scale,
 from light9 import showconfig
 from light9.Patch import resolve_name, get_dmx_channel, get_channel_uri, reload_data
 from louie import dispatcher
-from light9.rdfdb.patch import Patch
+from rdfdb.patch import Patch
 log = logging.getLogger('submaster')
 
 class Submaster(object):
diff --git a/light9/collector/collector_test.py b/light9/collector/collector_test.py
--- a/light9/collector/collector_test.py
+++ b/light9/collector/collector_test.py
@@ -5,7 +5,7 @@ from rdflib import Namespace, URIRef
 
 from light9.namespaces import L9, DEV
 from light9.collector.collector import Collector, outputMap
-from light9.rdfdb.mock_syncedgraph import MockSyncedGraph
+from rdfdb.mock_syncedgraph import MockSyncedGraph
 
 UDMX = Namespace('http://light9.bigasterisk.com/output/udmx/')
 DMX0 = Namespace('http://light9.bigasterisk.com/output/dmx0/')
diff --git a/light9/curvecalc/curve.py b/light9/curvecalc/curve.py
--- a/light9/curvecalc/curve.py
+++ b/light9/curvecalc/curve.py
@@ -6,7 +6,7 @@ from twisted.internet import reactor
 from rdflib import Literal
 from light9 import showconfig
 from light9.namespaces import L9, RDF, RDFS
-from light9.rdfdb.patch import Patch
+from rdfdb.patch import Patch
 
 log = logging.getLogger()
 # todo: move to config, consolidate with ascoltami, musicPad, etc
diff --git a/light9/curvecalc/subterm.py b/light9/curvecalc/subterm.py
--- a/light9/curvecalc/subterm.py
+++ b/light9/curvecalc/subterm.py
@@ -4,7 +4,7 @@ from louie import dispatcher
 import light9.Effects
 from light9 import Submaster, showconfig, prof
 from light9.Patch import get_dmx_channel
-from light9.rdfdb.patch import Patch
+from rdfdb.patch import Patch
 from light9.namespaces import L9
 log = logging.getLogger()
 
diff --git a/light9/effect/edit.py b/light9/effect/edit.py
--- a/light9/effect/edit.py
+++ b/light9/effect/edit.py
@@ -5,7 +5,7 @@ from rdflib import URIRef, Literal
 
 from light9 import networking
 from light9.namespaces import L9, RDF, RDFS
-from light9.rdfdb.patch import Patch
+from rdfdb.patch import Patch
 from light9.curvecalc.curve import CurveResource
 
 def clamp(x, lo, hi):
diff --git a/light9/effect/settings.py b/light9/effect/settings.py
--- a/light9/effect/settings.py
+++ b/light9/effect/settings.py
@@ -8,7 +8,7 @@ import decimal
 import numpy
 from rdflib import URIRef, Literal
 from light9.namespaces import RDF, L9, DEV
-from light9.rdfdb.patch import Patch
+from rdfdb.patch import Patch
 import logging
 log = logging.getLogger('settings')
 from light9.collector.device import resolve
diff --git a/light9/effect/settings_test.py b/light9/effect/settings_test.py
--- a/light9/effect/settings_test.py
+++ b/light9/effect/settings_test.py
@@ -1,7 +1,7 @@
 import unittest
 from rdflib import Literal
-from light9.rdfdb.patch import Patch
-from light9.rdfdb.localsyncedgraph import LocalSyncedGraph
+from rdfdb.patch import Patch
+from rdfdb.localsyncedgraph import LocalSyncedGraph
 from light9.namespaces import RDF, L9, DEV
 from light9.effect.settings import DeviceSettings
              
diff --git a/light9/paint/capture.py b/light9/paint/capture.py
--- a/light9/paint/capture.py
+++ b/light9/paint/capture.py
@@ -1,7 +1,7 @@
 import os
 from rdflib import URIRef
 from light9 import showconfig
-from light9.rdfdb.patch import Patch
+from rdfdb.patch import Patch
 from light9.namespaces import L9, RDF
 from light9.paint.solve import loadNumpy
 
diff --git a/light9/paint/solve_test.py b/light9/paint/solve_test.py
--- a/light9/paint/solve_test.py
+++ b/light9/paint/solve_test.py
@@ -3,7 +3,7 @@ import numpy.testing
 import solve
 from rdflib import Namespace
 from light9.namespaces import RDF, L9, DEV
-from light9.rdfdb.localsyncedgraph import LocalSyncedGraph
+from rdfdb.localsyncedgraph import LocalSyncedGraph
 from light9.effect.settings import DeviceSettings
 
 class TestSolve(unittest.TestCase):
diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt
+++ b/requirements.txt
@@ -33,3 +33,4 @@ typing==3.6.1
 watchdog==0.8.3
 web.py==0.38
 webcolors==1.7
+https://projects.bigasterisk.com/rdfdb/rdfdb-0.3.0.tar.gz