annotate service/reasoning/inputgraph.py @ 1411:21d0cd98ef7a

mock output mode Ignore-this: a7b9dd184a2f3c811cd7c1d3ca4a002c darcs-hash:af6eb3949372201ed9b414ce038849c4ce8423cf
author drewp <drewp@bigasterisk.com>
date Wed, 24 Jul 2019 00:34:41 -0700
parents ac127fdace62
children b87b6e9cedb2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1108
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
1 import logging, time, sys
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
2
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
3 from rdflib import Graph, ConjunctiveGraph
1108
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
4 from rdflib import Namespace, URIRef, Literal, RDF, RDFS
1086
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
5 from rdflib.parser import StringInputSource
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
6
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
7 from twisted.python.filepath import FilePath
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
8 from twisted.internet.defer import inlineCallbacks, gatherResults
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
9
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
10 from rdflibtrig import addTrig
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
11 from graphop import graphEqual
1197
d8acab2b01f5 mqtt has two devices now. various older cleanups.
drewp <drewp@bigasterisk.com>
parents: 1156
diff changeset
12 from greplin import scales
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
13
1374
ac127fdace62 build/import update for reasoning service
drewp <drewp@bigasterisk.com>
parents: 1266
diff changeset
14 from patchablegraph.patchsource import ReconnectingPatchSource
1108
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
15
1156
ee168d55524a reasoning & collector move into docker images
drewp <drewp@bigasterisk.com>
parents: 1119
diff changeset
16 from rdfdb.rdflibpatch import patchQuads
1108
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
17
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
18 log = logging.getLogger('fetch')
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
19
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
20 ROOM = Namespace("http://projects.bigasterisk.com/room/")
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
21 DEV = Namespace("http://projects.bigasterisk.com/device/")
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
22
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
23
1197
d8acab2b01f5 mqtt has two devices now. various older cleanups.
drewp <drewp@bigasterisk.com>
parents: 1156
diff changeset
24 STATS = scales.collection('/web',
d8acab2b01f5 mqtt has two devices now. various older cleanups.
drewp <drewp@bigasterisk.com>
parents: 1156
diff changeset
25 scales.PmfStat('combineGraph'),
d8acab2b01f5 mqtt has two devices now. various older cleanups.
drewp <drewp@bigasterisk.com>
parents: 1156
diff changeset
26 )
1086
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
27 def parseRdf(text, contentType):
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
28 g = Graph()
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
29 g.parse(StringInputSource(text), format={
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
30 'text/n3': 'n3',
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
31 }[contentType])
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
32 return g
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
33
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
34
1108
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
35 class RemoteData(object):
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
36 def __init__(self, onChange):
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
37 self.onChange = onChange
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
38 self.graph = ConjunctiveGraph()
1197
d8acab2b01f5 mqtt has two devices now. various older cleanups.
drewp <drewp@bigasterisk.com>
parents: 1156
diff changeset
39 self.patchSource = ReconnectingPatchSource(
d8acab2b01f5 mqtt has two devices now. various older cleanups.
drewp <drewp@bigasterisk.com>
parents: 1156
diff changeset
40 URIRef('http://bang:9072/graph/home'),
d8acab2b01f5 mqtt has two devices now. various older cleanups.
drewp <drewp@bigasterisk.com>
parents: 1156
diff changeset
41 #URIRef('http://frontdoor:10012/graph/events'),
1266
ee5698ef64dd add separate :matchPredicate support. some build and log edits.
drewp <drewp@bigasterisk.com>
parents: 1197
diff changeset
42 self.onPatch, reconnectSecs=10, agent='reasoning')
1108
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
43
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
44 def onPatch(self, p, fullGraph):
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
45 if fullGraph:
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
46 self.graph = ConjunctiveGraph()
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
47 patchQuads(self.graph,
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
48 deleteQuads=p.delQuads,
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
49 addQuads=p.addQuads,
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
50 perfect=True)
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
51
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
52 ignorePredicates = [
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
53 ROOM['signalStrength'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
54 # perhaps anything with a number-datatype for its
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
55 # object should be filtered out, and you have to make
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
56 # an upstream quantization (e.g. 'temp high'/'temp
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
57 # low') if you want to do reasoning on the difference
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
58 URIRef("http://bigasterisk.com/map#lastSeenAgoSec"),
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
59 URIRef("http://bigasterisk.com/map#lastSeenAgo"),
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
60 ROOM['usingPower'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
61 ROOM['idleTimeMinutes'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
62 ROOM['idleTimeMs'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
63 ROOM['graphLoadMs'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
64 ROOM['localTimeToSecond'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
65 ROOM['history'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
66 ROOM['connectedAgo'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
67 RDFS['comment'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
68 ]
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
69 ignoreContexts = [
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
70 URIRef('http://bigasterisk.com/sse_collector/'),
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
71 ]
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
72 for affected in p.addQuads + p.delQuads:
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
73 if (affected[1] not in ignorePredicates and
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
74 affected[3] not in ignoreContexts):
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
75 log.debug(" remote graph changed")
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
76 self.onChange()
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
77 break
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
78 else:
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
79 log.debug(" remote graph has no changes to trigger rules")
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
80
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
81 class InputGraph(object):
1108
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
82 def __init__(self, inputDirs, onChange):
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
83 """
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
84 this has one Graph that's made of:
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
85 - all .n3 files from inputDirs (read at startup)
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
86 - all the remote graphs, specified in the file graphs
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
87
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
88 call updateFileData or updateRemoteData to reread those
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
89 graphs. getGraph to access the combined graph.
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
90
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
91 onChange(self) is called if the contents of the full graph
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
92 change (in an interesting way) during updateFileData or
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
93 updateRemoteData. Interesting means statements other than the
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
94 ones with the predicates on the boring list. onChange(self,
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
95 oneShot=True) means: don't store the result of this change
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
96 anywhere; it needs to be processed only once
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
97 """
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
98 self.inputDirs = inputDirs
1117
d5687ba23279 fix input graph web display by dirtying combinedGraph better.
drewp <drewp@bigasterisk.com>
parents: 1108
diff changeset
99 self._onChange = onChange
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
100 self._fileGraph = Graph()
1117
d5687ba23279 fix input graph web display by dirtying combinedGraph better.
drewp <drewp@bigasterisk.com>
parents: 1108
diff changeset
101 self._remoteData = RemoteData(lambda: self.onChangeLocal())
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
102 self._combinedGraph = None
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
103 self._oneShotAdditionGraph = None
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
104
1117
d5687ba23279 fix input graph web display by dirtying combinedGraph better.
drewp <drewp@bigasterisk.com>
parents: 1108
diff changeset
105 def onChangeLocal(self, oneShot=False, oneShotGraph=None):
d5687ba23279 fix input graph web display by dirtying combinedGraph better.
drewp <drewp@bigasterisk.com>
parents: 1108
diff changeset
106 self._combinedGraph = None
d5687ba23279 fix input graph web display by dirtying combinedGraph better.
drewp <drewp@bigasterisk.com>
parents: 1108
diff changeset
107 self._onChange(self, oneShot=oneShot, oneShotGraph=oneShotGraph)
d5687ba23279 fix input graph web display by dirtying combinedGraph better.
drewp <drewp@bigasterisk.com>
parents: 1108
diff changeset
108
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
109 def updateFileData(self):
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
110 """
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
111 make sure we contain the correct data from the files in inputDirs
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
112 """
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
113 # this sample one is actually only needed for the output, but I don't
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
114 # think I want to have a separate graph for the output
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
115 # handling
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
116 log.debug("read file graphs")
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
117 for fp in FilePath("input").walk():
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
118 if fp.isdir():
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
119 continue
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
120 if fp.splitext()[1] != '.n3':
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
121 continue
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
122 log.debug("read %s", fp)
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
123 # todo: if this fails, leave the report in the graph
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
124 self._fileGraph.parse(fp.open(), format="n3")
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
125 self._combinedGraph = None
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
126
1117
d5687ba23279 fix input graph web display by dirtying combinedGraph better.
drewp <drewp@bigasterisk.com>
parents: 1108
diff changeset
127 self.onChangeLocal()
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
128
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
129 def addOneShot(self, g):
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
130 """
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
131 add this graph to the total, call onChange, and then revert
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
132 the addition of this graph
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
133 """
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
134 self._oneShotAdditionGraph = g
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
135 self._combinedGraph = None
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
136 try:
1119
98aad873874d fix oneshot
drewp <drewp@bigasterisk.com>
parents: 1117
diff changeset
137 self.onChangeLocal(oneShot=True, oneShotGraph=g)
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
138 finally:
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
139 self._oneShotAdditionGraph = None
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
140 self._combinedGraph = None
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
141
1086
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
142 def addOneShotFromString(self, body, contentType):
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
143 g = parseRdf(body, contentType)
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
144 if not len(g):
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
145 log.warn("incoming oneshot graph had no statements: %r", body)
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
146 return 0
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
147 t1 = time.time()
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
148 self.addOneShot(g)
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
149 return time.time() - t1
1197
d8acab2b01f5 mqtt has two devices now. various older cleanups.
drewp <drewp@bigasterisk.com>
parents: 1156
diff changeset
150
d8acab2b01f5 mqtt has two devices now. various older cleanups.
drewp <drewp@bigasterisk.com>
parents: 1156
diff changeset
151 @STATS.combineGraph.time()
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
152 def getGraph(self):
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
153 """rdflib Graph with the file+remote contents of the input graph"""
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
154 # this could be much faster with the combined readonly graph
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
155 # view from rdflib
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
156 if self._combinedGraph is None:
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
157 self._combinedGraph = Graph()
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
158 if self._fileGraph:
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
159 for s in self._fileGraph:
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
160 self._combinedGraph.add(s)
1108
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
161 for s in self._remoteData.graph:
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
162 self._combinedGraph.add(s)
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
163 if self._oneShotAdditionGraph:
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
164 for s in self._oneShotAdditionGraph:
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
165 self._combinedGraph.add(s)
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
166
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
167 return self._combinedGraph