# HG changeset patch
# User drewp@bigasterisk.com
# Date 1557126324 25200
# Node ID 53a2664f450a7d7f16db2330076bf6cc2531b23f
# Parent f424dd6d221f50a58d622847ddab63f7d6acaac5
build/import update for reasoning service
Ignore-this: 5e2a8d717e7273bf4a84dd467cccab17
diff -r f424dd6d221f -r 53a2664f450a service/reasoning/Dockerfile
--- a/service/reasoning/Dockerfile Mon May 06 00:03:35 2019 -0700
+++ b/service/reasoning/Dockerfile Mon May 06 00:05:24 2019 -0700
@@ -3,9 +3,8 @@
WORKDIR /opt
COPY requirements.txt ./
-RUN pip install -r requirements.txt
+RUN pip install --index-url https://projects.bigasterisk.com/ --extra-index-url https://pypi.org/simple -r requirements.txt
-COPY twisted_sse_demo ./twisted_sse_demo
COPY *.n3 *.py *.html req* ./
COPY input ./input
diff -r f424dd6d221f -r 53a2664f450a service/reasoning/input/startup.n3
--- a/service/reasoning/input/startup.n3 Mon May 06 00:03:35 2019 -0700
+++ b/service/reasoning/input/startup.n3 Mon May 06 00:05:24 2019 -0700
@@ -1,5 +1,6 @@
@prefix : .
@prefix rdfs: .
+@prefix fr: .
# Note that turning off a source in here doesn't stop incoming oneshot
# requests (but it could, if we got continuous graphs such that
@@ -48,5 +49,35 @@
:cardText "UVOLLTJJEDBZTYBRPCRSFHJMEJGOQAIG"; :owner .
:cardText "XXGDUPSVAVJJLMZD" ; :owner .
- :cardText "JMQHDQZXENVZRYXUGQPYZCPJFJKIZWAS"; :owner .
+ :cardText "JMQHDQZXENVZRYXUGQPYZCPJFJKIZWAS"; :owner , :mj .
:cardText "UOHQPTMTGSHLETGLYOMPMNJXDYINHHIF"; :owner .
+
+ :cardText "1*LBKBQDYKFAZRHM"; rdfs:label "gray keychain id 10"; :owner .
+ :cardText "1*BHJWCUGQWPWSKT"; rdfs:label "gray keychain id 11"; :owner .
+ :cardText "1*HDMYMUHHTVGLKY"; rdfs:label "gray keychain id 12"; :owner , :kelsi .
+ :cardText "1*NUIRKGJCOZHFOH"; rdfs:label "gray keychain id 13"; :owner .
+ :cardText "1*RMTMEEXYVIHRUM"; rdfs:label "gray keychain id 14"; :owner , :dv .
+
+ :cardText "1*TXRXJXBZPXSKGZ"; rdfs:label "blue keychain id 20" .
+ :cardText "1*IKLSYRIVCNFTTM"; rdfs:label "blue keychain id 21" .
+ :cardText "1*WAGLJFYAYDJCNE"; rdfs:label "white card id 22" .
+ :cardText "1*WTKUGJOQXUNGUS"; rdfs:label "white card id 23" .
+ :cardText "1*WFMZKVPQIZIMCF"; rdfs:label "white card id 24" .
+ :cardText "1*BPNHEXJJCWQSFJ"; rdfs:label "white card id 25" .
+ :cardText "1*ECDFYGDLKZEGLD"; rdfs:label "white card id 26" .
+ :cardText "1*UEFBUDDVFRFSUU"; rdfs:label "white card id 27" .
+ :cardText "1*WKAPIEMNHOHMOK"; rdfs:label "gray keychain id 28" .
+ :cardText "1*ZNBUEMOFPSIURI"; rdfs:label "gray keychain id 29" .
+ :cardText "1*PYJEJIBSETLHXW"; rdfs:label "gray keychain id 30" .
+ :cardText "1*ZXHYTKKWMCMDKV"; rdfs:label "blue keychain id 31" .
+ :cardText "1*QIPGMRPVRPZAQJ"; rdfs:label "blue keychain id 32" .
+ :cardText "1*CZGXULDJLHFJCB"; rdfs:label "blue keychain id 33" .
+ :cardText "1*RIHIHTWVIEZPZP"; rdfs:label "blue keychain id 34" .
+ :cardText "1*BKWNUZNWNWKBLY"; rdfs:label "blue keychain id 35"; :owner fr:ada .
+
+
+
+
+
+
+
diff -r f424dd6d221f -r 53a2664f450a service/reasoning/inputgraph.py
--- a/service/reasoning/inputgraph.py Mon May 06 00:03:35 2019 -0700
+++ b/service/reasoning/inputgraph.py Mon May 06 00:05:24 2019 -0700
@@ -11,9 +11,8 @@
from graphop import graphEqual
from greplin import scales
-from patchsource import ReconnectingPatchSource
+from patchablegraph.patchsource import ReconnectingPatchSource
-sys.path.append("/my/proj/rdfdb")
from rdfdb.rdflibpatch import patchQuads
log = logging.getLogger('fetch')
diff -r f424dd6d221f -r 53a2664f450a service/reasoning/makefile
--- a/service/reasoning/makefile Mon May 06 00:03:35 2019 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-JOB=reasoning
-PORT=9071
-
-TAG=bang6:5000/${JOB}_x86:latest
-
-build_image:
- rm -rf tmp_ctx
- mkdir -p tmp_ctx
- cp -a Dockerfile ../../lib/*.py ../../lib/twisted_sse_demo *.py *.n3 *.html input req* tmp_ctx
- rsync -a input tmp_ctx/
- docker build --network=host -t ${TAG} tmp_ctx
- docker push ${TAG}
- rm -r tmp_ctx
-
-shell:
- docker run --rm -it --cap-add SYS_PTRACE --net=host ${TAG} /bin/bash
-
-local_run: build_image
- docker run --rm -it -p ${PORT}:${PORT} \
- -v `pwd`:/mnt \
- --net=host \
- ${TAG} \
- python /mnt/${JOB}.py -iro
-
-redeploy: build_image
- supervisorctl restart $(JOB)_$(PORT)
-
diff -r f424dd6d221f -r 53a2664f450a service/reasoning/reasoning.py
--- a/service/reasoning/reasoning.py Mon May 06 00:03:35 2019 -0700
+++ b/service/reasoning/reasoning.py Mon May 06 00:05:24 2019 -0700
@@ -36,7 +36,7 @@
from inputgraph import InputGraph
from escapeoutputstatements import unquoteOutputStatements
-from logsetup import log
+from standardservice.logsetup import log
ROOM = Namespace("http://projects.bigasterisk.com/room/")
diff -r f424dd6d221f -r 53a2664f450a service/reasoning/requirements.txt
--- a/service/reasoning/requirements.txt Mon May 06 00:03:35 2019 -0700
+++ b/service/reasoning/requirements.txt Mon May 06 00:05:24 2019 -0700
@@ -10,4 +10,9 @@
rdflib_jsonld==0.4.0
git+http://github.com/drewp/FuXi.git@003fb48984e9813808a23ba152798c125718f0e7#egg=FuXi
git+http://github.com/drewp/scales.git@448d59fb491b7631877528e7695a93553bfaaa93#egg=scales
-https://projects.bigasterisk.com/rdfdb/rdfdb-0.7.0.tar.gz
+
+cycloneerr
+export_to_influxdb==0.1.0
+patchablegraph==0.6.0
+rdfdb==0.8.0
+standardservice==0.4.0
diff -r f424dd6d221f -r 53a2664f450a service/reasoning/tasks.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/service/reasoning/tasks.py Mon May 06 00:05:24 2019 -0700
@@ -0,0 +1,26 @@
+from invoke import task
+
+JOB='reasoning'
+PORT=9071
+
+TAG=f'bang6:5000/{JOB}_x86:latest'
+
+@task
+def build_image(ctx):
+ ctx.run(f'docker build --network=host -t {TAG} .')
+
+@task(pre=[build_image])
+def push_image(ctx):
+ ctx.run(f'docker push {TAG}')
+
+@task
+def shell(ctx):
+ ctx.run(f'docker run --rm -it --cap-add SYS_PTRACE --net=host {TAG} /bin/bash')
+
+@task(pre=[build_image])
+def local_run(ctx):
+ ctx.run(f'docker run --rm -it -p {PORT}:{PORT} -v `pwd`:/mnt --net=host {TAG} python /mnt/{JOB}.py -iro', pty=True)
+
+@task(pre=[build_image])
+def redeploy(ctx):
+ ctx.run(f'supervisorctl -s http://bang:9001/ restart {JOB}_{PORT}')