light9 Changeset - b19cd005a491

Changeset - b19cd005a491

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

drewp@bigasterisk.com - 12 years ago 2012-09-29 20:59:13
drewp@bigasterisk.com

just comments
Ignore-this: 850b0da90240ab6f764430505809fd6d

5 files changed with 71 insertions and 25 deletions:

bin/rdfdb

light9/rdfdb/graphfile.py

light9/rdfdb/patch.py

light9/rdfdb/rdflibpatch.py

light9/rdfdb/syncedgraph.py

0 comments (0 inline, 0 general)

bin/rdfdb

➞

Show inline comments

 #!bin/python
 """
 other tools POST themselves to here as subscribers to the graph. They
-are providing a URL we can PUT to with graphs updates.
+are providing a URL we can PUT to with graph updates.
 we immediately PUT them back all the contents of the graph as a bunch
 of adds.
-later we PUT them back with updates (add/del lists) when there are
+later we PUT them back with patches (del/add lists) when there are
 changes.
 If we fail to reach a registered caller, we forget about it for future
-calls. We can PUT empty diffs as a heartbeat to notice disappearing
+calls. We could PUT empty diffs as a heartbeat to notice disappearing
 callers faster.
 A caller can submit add/del changes that should be persisted and
 broadcast.
 A caller can submit a patch which we'll persist and broadcast to every
 other client.
 Global data undo should probably happen within this service.
@@ @@ -45,13 +45,13 @@ shall be used for that @@
 Bnodes: this rdfdb graph might be able to track bnodes correctly, and
 they make for more compact n3 files. I'm not sure if it's going to be
 hard to keep the client bnodes in sync though. File rereads would be
 hard,if ever a bnode was used across graphs, so that probably should
+hard, if ever a bnode was used across graphs, so that probably should
 not be allowed.
 Our API:
 GET /  ui
 GET /graph    the whole graph (needed? just for ui browsing?)
+GET /graph    the whole graph, or a query from it (needed? just for ui browsing?)
 PUT /patches  clients submit changes
 GET /patches  (recent) patches from clients
 POST /graphClients clientUpdate={uri} to subscribe
@@ @@ -60,8 +60,8 @@ GET /graphClients current clients @@
 format:
 json {"adds" : [[quads]...],
       "deletes": [[quads]],
       "from" : tooluri,
       "created":tttt
       "senderUpdateUri" : tooluri,
       "created":tttt // maybe to help resolve some conflicts
+     }
 maybe use some http://json-ld.org/ in there.
@@ @@ -75,19 +75,31 @@ edit that one and see the results in the @@
 Our web ui:
 registered clients
   sections
     registered clients
 recent edits, each one says what client it came from. You can reverse
 them here. We should be able to take patches that are close in time
 and keep updating the same data (e.g. a stream of changes as the user
 drags a slider) and collapse them into a single edit for clarity.
     recent patches, each one says what client it came from. You can reverse
     them here. We should be able to take patches that are close in time
     and keep updating the same data (e.g. a stream of changes as the user
     drags a slider) and collapse them into a single edit for clarity.
         Ways to display patches, using labels and creator/subj icons
         where possible:
 Ways to display patches, using labels and creator/subj icons where possible:
           <creator> set <subj>'s <p> to <o>
           <creator> changed <subj>'s <pred> from <o1> to <o2>
           <creator> added <o> to <s> <p>
     raw messages for debugging this client
   <creator> set <subj>'s <p> to <o>
   <creator> changed <subj>'s <pred> from <o1> to <o2>
   <creator> added <o> to <s> <p>
     ctx urls take you to->
     files, who's dirty, have we seen external changes, notice big
     files that are taking a long time to save
     graph contents. plain rdf browser like an outliner or
     something. clicking any resource from the other displays takes you
     to this, focused on that resource
 """
 from twisted.internet import reactor
@@ @@ -139,6 +151,9 @@ class Client(object): @@
         return syncedgraph.sendPatch(self.updateUri, p)
 class Db(object):
     """
     the master graph, all the connected clients, all the files we're watching
     """
     def __init__(self):
         self.clients = []
         self.graph = ConjunctiveGraph()
@@ @@ -163,6 +178,12 @@ class Db(object): @@
     def patch(self, p):
         """
         apply this patch to the master graph then notify everyone about it
         dueToFileChange if this is a patch describing an edit we read
         *from* the file (such that we shouldn't write it back to the file)
         if p has a senderUpdateUri attribute, we won't send this patch
         back to the sender with that updateUri
         """
         log.info("patching graph -%d +%d" % (len(p.delQuads), len(p.addQuads)))
@@ @@ -191,6 +212,13 @@ class Db(object): @@
                      (c.identifier, len(self.getSubgraph(c.identifier))))
     def getSubgraph(self, uri):
         """
         this is meant to return a live view of the given subgraph, but
         if i'm still working around an rdflib bug, it might return a
         copy
         and it's returning triples, but I think quads would be better
         """
         # this is returning an empty Graph :(
         #return self.graph.get_context(uri)
@@ @@ -253,12 +281,12 @@ def sendToLiveClients(d=None, asJson=Non @@
 class Live(cyclone.websocket.WebSocketHandler):
     def connectionMade(self, *args, **kwargs):
-        log.info("ws opened")
+        log.info("websocket opened")
         liveClients.add(self)
         self.settings.db.sendClientsToAllLivePages()
     def connectionLost(self, reason):
-        log.info("ws closed")
+        log.info("websocket closed")
         liveClients.remove(self)
     def messageReceived(self, message):

light9/rdfdb/graphfile.py

➞

Show inline comments

@@ @@ -11,6 +11,9 @@ class GraphFile(object): @@
     one rdf file that we read from, write to, and notice external changes to
     """
     def __init__(self, notifier, path, uri, patch, getSubgraph):
         """
         this does not include an initial reread() call
         """
         self.path, self.uri = path, uri
         self.patch, self.getSubgraph = patch, getSubgraph

light9/rdfdb/patch.py

➞

Show inline comments

@@ @@ -12,6 +12,11 @@ class Patch(object): @@
     """
     def __init__(self, jsonRepr=None, addQuads=None, delQuads=None,
                  addGraph=None, delGraph=None):
         """
         addQuads/delQuads can be lists or sets, but if we make them internally,
         they'll be lists
         """
         self._jsonRepr = jsonRepr
         self._addQuads, self._delQuads = addQuads, delQuads
         self._addGraph, self._delGraph = addGraph, delGraph

light9/rdfdb/rdflibpatch.py

➞

Show inline comments

@@ @@ -7,9 +7,10 @@ from rdflib import ConjunctiveGraph, URI @@
 def patchQuads(graph, deleteQuads, addQuads, perfect=False):
     """
     Delete the sequence of given quads. Then add the given quads just
     like addN would. If perfect is True, we'll error and not touch the
     graph if any of the deletes isn't in the graph or if any of the
     adds was already in the graph.
     like addN would. If perfect is True, we'll error before the
     deletes or before the adds (not a real transaction) if any of the
     deletes isn't in the graph or if any of the adds was already in
     the graph.
     """
     toDelete = []
     for s, p, o, c in deleteQuads:

light9/rdfdb/syncedgraph.py

➞

Show inline comments

@@ @@ -151,10 +151,14 @@ class PatchSender(object): @@
 class SyncedGraph(object):
     """
     graph for clients to use. Changes are synced with the master graph
     in the rdfdb process.
     in the rdfdb process.
     This api is like rdflib.Graph but it can also call you back when
     there are graph changes to the parts you previously read.
     If we get out of sync, we abandon our local graph (even any
     pending local changes) and get the data again from the
     server.
     """
     def __init__(self, label):
         """
@@ @@ -205,6 +209,11 @@ class SyncedGraph(object): @@
     def patch(self, p):
         """send this patch to the server and apply it to our local
         graph and run handlers"""
         # these could fail if we're out of sync. One approach:
         # Rerequest the full state from the server, try the patch
         # again after that, then give up.
         patchQuads(self._graph, p.delQuads, p.addQuads, perfect=True)
         self.updateOnPatch(p)
         self._sender.sendPatch(p)

0 comments (0 inline, 0 general)