From 791918039979d0743fd2ea4b9a5e74593ff96fd0 Mon Sep 17 00:00:00 2001
From: Matthias Baumgartner <dev@igsor.net>
Date: Mon, 19 Dec 2022 13:32:34 +0100
Subject: query ast file structures and essential interfaces

---
 bsfs/graph/graph.py | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'bsfs/graph/graph.py')

diff --git a/bsfs/graph/graph.py b/bsfs/graph/graph.py
index b7b9f1c..10e5904 100644
--- a/bsfs/graph/graph.py
+++ b/bsfs/graph/graph.py
@@ -9,6 +9,7 @@ import os
 import typing
 
 # bsfs imports
+from bsfs.query import ast
 from bsfs.schema import Schema
 from bsfs.triple_store import TripleStoreBase
 from bsfs.utils import URI, typename
@@ -110,4 +111,8 @@ class Graph():
         type_ = self.schema.node(node_type)
         return _nodes.Nodes(self._backend, self._user, type_, {guid})
 
+    def get(self, node_type: URI, subject: ast.filter.FilterExpression) -> Nodes:
+        """Return a `Nodes` instance over all nodes of type *node_type* that match the *subject* query."""
+        raise NotImplementedError()
+
 ## EOF ##
-- 
cgit v1.2.3


From a0f2308adcb226d28de3355bc7115a6d9b669462 Mon Sep 17 00:00:00 2001
From: Matthias Baumgartner <dev@igsor.net>
Date: Mon, 19 Dec 2022 13:40:02 +0100
Subject: import fixes

---
 bsfs/graph/graph.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bsfs/graph/graph.py')

diff --git a/bsfs/graph/graph.py b/bsfs/graph/graph.py
index 10e5904..51fe75d 100644
--- a/bsfs/graph/graph.py
+++ b/bsfs/graph/graph.py
@@ -111,7 +111,7 @@ class Graph():
         type_ = self.schema.node(node_type)
         return _nodes.Nodes(self._backend, self._user, type_, {guid})
 
-    def get(self, node_type: URI, subject: ast.filter.FilterExpression) -> Nodes:
+    def get(self, node_type: URI, subject: ast.filter.FilterExpression) -> _nodes.Nodes:
         """Return a `Nodes` instance over all nodes of type *node_type* that match the *subject* query."""
         raise NotImplementedError()
 
-- 
cgit v1.2.3


From ca7ee6c59d2eb3f4ec4d16e392d12d946cd85e4d Mon Sep 17 00:00:00 2001
From: Matthias Baumgartner <dev@igsor.net>
Date: Thu, 22 Dec 2022 20:33:00 +0100
Subject: filter-ast based get interface in graph.

* Graph interface: Graph.get added
* Node instance resolver so that Nodes can be used in a filter ast
* AC interface: filter_read added to interface
* upstream test adjustments of previous sparql store changes
---
 bsfs/graph/graph.py | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

(limited to 'bsfs/graph/graph.py')

diff --git a/bsfs/graph/graph.py b/bsfs/graph/graph.py
index 51fe75d..f030fed 100644
--- a/bsfs/graph/graph.py
+++ b/bsfs/graph/graph.py
@@ -9,13 +9,15 @@ import os
 import typing
 
 # bsfs imports
-from bsfs.query import ast
+from bsfs.query import ast, validate
 from bsfs.schema import Schema
 from bsfs.triple_store import TripleStoreBase
 from bsfs.utils import URI, typename
 
 # inner-module imports
+from . import ac
 from . import nodes as _nodes
+from . import resolve
 
 # exports
 __all__: typing.Sequence[str] = (
@@ -44,6 +46,9 @@ class Graph():
     def __init__(self, backend: TripleStoreBase, user: URI):
         self._backend = backend
         self._user = user
+        self._resolver = resolve.Filter(self._backend.schema)
+        self._validate = validate.Filter(self._backend.schema)
+        self._ac = ac.NullAC(self._backend, self._user)
         # ensure Graph schema requirements
         self.migrate(self._backend.schema)
 
@@ -85,6 +90,9 @@ class Graph():
         # migrate schema in backend
         # FIXME: consult access controls!
         self._backend.schema = schema
+        # re-initialize members
+        self._resolver.schema = self.schema
+        self._validate.schema = self.schema
         # return self
         return self
 
@@ -108,11 +116,21 @@ class Graph():
         *node_type*) once some data is assigned to them.
 
         """
-        type_ = self.schema.node(node_type)
-        return _nodes.Nodes(self._backend, self._user, type_, {guid})
+        return self.nodes(node_type, {guid})
 
-    def get(self, node_type: URI, subject: ast.filter.FilterExpression) -> _nodes.Nodes:
+    def get(self, node_type: URI, query: ast.filter.FilterExpression) -> _nodes.Nodes: # FIXME: How about empty query?
         """Return a `Nodes` instance over all nodes of type *node_type* that match the *subject* query."""
-        raise NotImplementedError()
+        # get node type
+        type_ = self.schema.node(node_type)
+        # resolve Nodes instances
+        query = self._resolver(type_, query)
+        # add access controls to query
+        query = self._ac.filter_read(type_, query)
+        # validate query
+        self._validate(type_, query)
+        # query the backend
+        guids = self._backend.get(type_, query) # no need to materialize
+        # return Nodes instance
+        return _nodes.Nodes(self._backend, self._user, type_, guids)
 
 ## EOF ##
-- 
cgit v1.2.3