diff --git a/templates/stores/falkordb.jsonnet b/templates/stores/falkordb.jsonnet index 1c7924a9..78509a43 100644 --- a/templates/stores/falkordb.jsonnet +++ b/templates/stores/falkordb.jsonnet @@ -15,7 +15,7 @@ local images = import "values/images.jsonnet"; .with_limits("1.0", "768M") .with_reservations("0.5", "768M") .with_port(6379, 6379, "api") - .with_port(3000, 3000, "ui") + .with_port(3010, 3000, "ui") .with_volume_mount(vol, "/data"); local containerSet = engine.containers( @@ -25,7 +25,7 @@ local images = import "values/images.jsonnet"; local service = engine.service(containerSet) .with_port(6379, 6379, "api") - .with_port(3000, 3000, "ui"); + .with_port(3010, 3010, "ui"); engine.resources([ vol, diff --git a/templates/values/images.jsonnet b/templates/values/images.jsonnet index 7a4ddba7..7fdf4f4a 100644 --- a/templates/values/images.jsonnet +++ b/templates/values/images.jsonnet @@ -13,5 +13,5 @@ local version = import "version.jsonnet"; qdrant: "docker.io/qdrant/qdrant:v1.11.1", memgraph_mage: "docker.io/memgraph/memgraph-mage:1.22-memgraph-2.22", memgraph_lab: "docker.io/memgraph/lab:2.19.1", - falkordb: "falkordb/falkordb:latest" + falkordb: "docker.io/falkordb/falkordb:latest" } diff --git a/trustgraph-flow/trustgraph/query/triples/falkordb/service.py b/trustgraph-flow/trustgraph/query/triples/falkordb/service.py index 43083832..1d77bb15 100755 --- a/trustgraph-flow/trustgraph/query/triples/falkordb/service.py +++ b/trustgraph-flow/trustgraph/query/triples/falkordb/service.py @@ -76,8 +76,11 @@ class Processor(ConsumerProducer): records = self.io.query( "MATCH (src:Node {uri: $src})-[rel:Rel {uri: $rel}]->(dest:Literal {value: $value}) " "RETURN $src as src", - src=v.s.value, rel=v.p.value, value=v.o.value, - database_=self.db, + params={ + "src": v.s.value, + "rel": v.p.value, + "value": v.o.value, + }, ).result_set for rec in records: @@ -86,8 +89,11 @@ class Processor(ConsumerProducer): records = self.io.query( "MATCH (src:Node {uri: $src})-[rel:Rel {uri: $rel}]->(dest:Node {uri: $uri}) " "RETURN $src as src", - src=v.s.value, rel=v.p.value, uri=v.o.value, - database_=self.db, + params={ + "src": v.s.value, + "rel": v.p.value, + "uri": v.o.value, + }, ).result_set for rec in records: @@ -100,24 +106,26 @@ class Processor(ConsumerProducer): records = self.io.query( "MATCH (src:Node {uri: $src})-[rel:Rel {uri: $rel}]->(dest:Literal) " "RETURN dest.value as dest", - src=v.s.value, rel=v.p.value, - database_=self.db, + params={ + "src": v.s.value, + "rel": v.p.value, + }, ).result_set for rec in records: - data = rec.data() - triples.append((v.s.value, v.p.value, data["dest"])) + triples.append((v.s.value, v.p.value, rec[0])) records = self.io.query( "MATCH (src:Node {uri: $src})-[rel:Rel {uri: $rel}]->(dest:Node) " "RETURN dest.uri as dest", - src=v.s.value, rel=v.p.value, - database_=self.db, + params={ + "src": v.s.value, + "rel": v.p.value, + }, ).result_set for rec in records: - data = rec.data() - triples.append((v.s.value, v.p.value, data["dest"])) + triples.append((v.s.value, v.p.value, rec[0])) else: @@ -128,50 +136,52 @@ class Processor(ConsumerProducer): records = self.io.query( "MATCH (src:Node {uri: $src})-[rel:Rel]->(dest:Literal {value: $value}) " "RETURN rel.uri as rel", - src=v.s.value, value=v.o.value, - database_=self.db, + params={ + "src": v.s.value, + "value": v.o.value, + }, ).result_set for rec in records: - data = rec.data() - triples.append((v.s.value, data["rel"], v.o.value)) + triples.append((v.s.value, rec[0], v.o.value)) records = self.io.query( "MATCH (src:Node {uri: $src})-[rel:Rel]->(dest:Node {uri: $uri}) " "RETURN rel.uri as rel", - src=v.s.value, uri=v.o.value, - database_=self.db, + params={ + "src": v.s.value, + "uri": v.o.value, + }, ).result_set for rec in records: - data = rec.data() - triples.append((v.s.value, data["rel"], v.o.value)) + triples.append((v.s.value, rec[0], v.o.value)) else: - # S + # s records = self.io.query( - "MATCH (src:Node {uri: $src})-[rel:Rel]->(dest:Literal) " - "RETURN rel.uri as rel, dest.value as dest", - src=v.s.value, - database_=self.db, + "match (src:node {uri: $src})-[rel:rel]->(dest:literal) " + "return rel.uri as rel, dest.value as dest", + params={ + "src": v.s.value, + }, ).result_set for rec in records: - data = rec.data() - triples.append((v.s.value, data["rel"], data["dest"])) + triples.append((v.s.value, rec[0], rec[1])) records = self.io.query( "MATCH (src:Node {uri: $src})-[rel:Rel]->(dest:Node) " "RETURN rel.uri as rel, dest.uri as dest", - src=v.s.value, - database_=self.db, + params={ + "src": v.s.value, + }, ).result_set for rec in records: - data = rec.data() - triples.append((v.s.value, data["rel"], data["dest"])) + triples.append((v.s.value, rec[0], rec[1])) else: @@ -185,24 +195,26 @@ class Processor(ConsumerProducer): records = self.io.query( "MATCH (src:Node)-[rel:Rel {uri: $uri}]->(dest:Literal {value: $value}) " "RETURN src.uri as src", - uri=v.p.value, value=v.o.value, - database_=self.db, + params={ + "uri": v.p.value, + "value": v.o.value, + }, ).result_set for rec in records: - data = rec.data() - triples.append((data["src"], v.p.value, v.o.value)) + triples.append((rec[0], v.p.value, v.o.value)) records = self.io.query( "MATCH (src:Node)-[rel:Rel {uri: $uri}]->(dest:Node {uri: $uri}) " "RETURN src.uri as src", - uri=v.p.value, dest=v.o.value, - database_=self.db, + params={ + "uri": v.p.value, + "dest": v.o.value, + }, ).result_set for rec in records: - data = rec.data() - triples.append((data["src"], v.p.value, v.o.value)) + triples.append((rec[0], v.p.value, v.o.value)) else: @@ -211,24 +223,24 @@ class Processor(ConsumerProducer): records = self.io.query( "MATCH (src:Node)-[rel:Rel {uri: $uri}]->(dest:Literal) " "RETURN src.uri as src, dest.value as dest", - uri=v.p.value, - database_=self.db, + params={ + "uri": v.p.value, + }, ).result_set for rec in records: - data = rec.data() - triples.append((data["src"], v.p.value, data["dest"])) + triples.append((rec[0], v.p.value, rec[1])) records = self.io.query( "MATCH (src:Node)-[rel:Rel {uri: $uri}]->(dest:Node) " "RETURN src.uri as src, dest.uri as dest", - uri=v.p.value, - database_=self.db, + params={ + "uri": v.p.value, + }, ).result_set for rec in records: - data = rec.data() - triples.append((data["src"], v.p.value, data["dest"])) + triples.append((rec[0], v.p.value, rec[1])) else: @@ -239,24 +251,24 @@ class Processor(ConsumerProducer): records = self.io.query( "MATCH (src:Node)-[rel:Rel]->(dest:Literal {value: $value}) " "RETURN src.uri as src, rel.uri as rel", - value=v.o.value, - database_=self.db, + params={ + "value": v.o.value, + }, ).result_set for rec in records: - data = rec.data() - triples.append((data["src"], data["rel"], v.o.value)) + triples.append((rec[0], rec[1], v.o.value)) records = self.io.query( "MATCH (src:Node)-[rel:Rel]->(dest:Node {uri: $uri}) " "RETURN src.uri as src, rel.uri as rel", - uri=v.o.value, - database_=self.db, + params={ + "uri": v.o.value, + }, ).result_set for rec in records: - data = rec.data() - triples.append((data["src"], data["rel"], v.o.value)) + triples.append((rec[0], rec[1], v.o.value)) else: @@ -265,22 +277,18 @@ class Processor(ConsumerProducer): records = self.io.query( "MATCH (src:Node)-[rel:Rel]->(dest:Literal) " "RETURN src.uri as src, rel.uri as rel, dest.value as dest", - database_=self.db, ).result_set for rec in records: - data = rec.data() - triples.append((data["src"], data["rel"], data["dest"])) + triples.append((rec[0], rec[1], rec[2])) records = self.io.query( "MATCH (src:Node)-[rel:Rel]->(dest:Node) " "RETURN src.uri as src, rel.uri as rel, dest.uri as dest", - database_=self.db, ).result_set for rec in records: - data = rec.data() - triples.append((data["src"], data["rel"], data["dest"])) + triples.append((rec[0], rec[1], rec[2])) triples = [ Triple( diff --git a/trustgraph-flow/trustgraph/storage/triples/falkordb/write.py b/trustgraph-flow/trustgraph/storage/triples/falkordb/write.py index 9fb1e0ff..3c7d1660 100755 --- a/trustgraph-flow/trustgraph/storage/triples/falkordb/write.py +++ b/trustgraph-flow/trustgraph/storage/triples/falkordb/write.py @@ -52,8 +52,9 @@ class Processor(Consumer): res = self.io.query( "MERGE (n:Node {uri: $uri})", - uri=uri, - database_=self.db, + params={ + "uri": uri, + }, ) print("Created {nodes_created} nodes in {time} ms.".format( @@ -67,8 +68,9 @@ class Processor(Consumer): res = self.io.query( "MERGE (n:Literal {value: $value})", - value=value, - database_=self.db, + params={ + "value": value, + }, ) print("Created {nodes_created} nodes in {time} ms.".format( @@ -84,8 +86,11 @@ class Processor(Consumer): "MATCH (src:Node {uri: $src}) " "MATCH (dest:Node {uri: $dest}) " "MERGE (src)-[:Rel {uri: $uri}]->(dest)", - src=src, dest=dest, uri=uri, - database_=self.db, + params={ + "src": src, + "dest": dest, + "uri": uri, + }, ) print("Created {nodes_created} nodes in {time} ms.".format( @@ -101,8 +106,11 @@ class Processor(Consumer): "MATCH (src:Node {uri: $src}) " "MATCH (dest:Literal {value: $dest}) " "MERGE (src)-[:Rel {uri: $uri}]->(dest)", - src=src, dest=dest, uri=uri, - database_=self.db, + params={ + "src": src, + "dest": dest, + "uri": uri, + }, ) print("Created {nodes_created} nodes in {time} ms.".format(