Remove requests #1175
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,13 @@ | ||
| import logging | ||
| from urllib.request import urlopen, Request | ||
| from urllib.parse import urlencode | ||
| from urllib.error import HTTPError, URLError | ||
| import base64 | ||
|
|
||
| from io import BytesIO | ||
|
|
||
| from rdflib.query import Result | ||
| from rdflib import BNode | ||
|
|
||
| log = logging.getLogger(__name__) | ||
|
|
||
|
|
@@ -26,7 +27,6 @@ class SPARQLConnectorException(Exception): | |
|
|
||
|
|
||
| class SPARQLConnector(object): | ||
| """ | ||
| this class deals with nitty gritty details of talking to a SPARQL server | ||
| """ | ||
|
|
@@ -37,29 +37,26 @@ def __init__( | |
| update_endpoint=None, | ||
| returnFormat="xml", | ||
| method="GET", | ||
| auth=None, | ||
| **kwargs | ||
| ): | ||
| """ | ||
| auth, if present, must be a tuple of (username, password) used for Basic Authentication | ||
|
|
||
| Any additional keyword arguments will be passed to to the request, and can be used to setup timesouts etc. | ||
| """ | ||
|
|
||
| self.returnFormat = returnFormat | ||
| self.query_endpoint = query_endpoint | ||
| self.update_endpoint = update_endpoint | ||
| self.kwargs = kwargs | ||
| self.method = method | ||
| if auth is not None: | ||
| assert type(auth) == tuple, "auth must be a tuple" | ||
| assert len(auth) == 2, "auth must be a tuple (user, password)" | ||
| base64string = base64.b64encode(bytes('%s:%s' % auth, 'ascii')) | ||
| self.kwargs.setdefault("headers", {}) | ||
| self.kwargs["headers"].update({"Authorization": "Basic %s" % base64string.decode('utf-8')}) | ||
|
|
||
| @property | ||
| def method(self): | ||
|
|
@@ -72,19 +69,18 @@ def method(self, method): | |
|
|
||
| self._method = method | ||
|
|
||
| def query(self, query, default_graph: str = None, named_graph: str = None): | ||
| if not self.query_endpoint: | ||
| raise SPARQLConnectorException("Query endpoint not set!") | ||
|
|
||
| params = {"query": query} | ||
| # this test ensures we don't have a useless (BNode) default graph URI, which calls to Graph().query() will add | ||
| if default_graph is not None and type(default_graph) != BNode: | ||
| params["default-graph-uri"] = default_graph | ||
|
|
||
| headers = {"Accept": _response_mime_types[self.returnFormat]} | ||
|
|
||
| args = dict(self.kwargs) | ||
|
|
||
| # merge params/headers dicts | ||
| args.setdefault("params", {}) | ||
|
|
@@ -94,47 +90,46 @@ def query(self, query, default_graph=None): | |
|
|
||
| if self.method == "GET": | ||
| args["params"].update(params) | ||
| qsa = "?" + urlencode(args["params"]) | ||
| try: | ||
| res = urlopen(Request(self.query_endpoint + qsa, headers=args["headers"])) | ||
| except Exception as e: | ||
| raise ValueError("You did something wrong formulating either the URI or your SPARQL query") | ||
| elif self.method == "POST": | ||
| args["headers"].update({"Content-Type": "application/sparql-query"}) | ||
|
There was a problem hiding this comment. Why don't we need There was a problem hiding this comment. The only There was a problem hiding this comment. We still need to submit Also I think we should support both There was a problem hiding this comment. The If you consider the following: Load some context aware quad store (e.g. the QuitStore) with the following data: graph <http://example.org/> {
<http://example.org/ExampleInstance> a <http://example.org/Example>
}
graph <http://othergraph.org/> {
<http://example.org/OtherInstance> a <http://example.org/Example>
}The query endpoint is assumed to be available at class SPARQLStoreQuitStoreTestCase(unittest.TestCase):
store_name = "SPARQLStore"
path = "http://localhost:5000/sparql"
create = False
def setUp(self):
store = SPARQLStore(query_endpoint=self.path, method="POST")
self.conjunctivegraph = ConjunctiveGraph(store=store)
def tearDown(self):
self.conjunctivegraph.close()
def test_Query(self):
query = "select distinct ?inst where {?inst a <http://example.org/Example>}"
graph = self.conjunctivegraph.get_context(URIRef("http://example.org/"))
res = graph.query(query, initNs={})
assert len(res) == 1, len(res)
for i in res:
assert type(i[0]) == URIRef, i[0].n3()
assert i[0] == URIRef("http://example.org/ExampleInstance"), i[0].n3()The query is executed as POST request but does not convey the information about the default graph. This issue is a combination of removing this line and sending the wrong Content-Type. |
||
| try: | ||
| res = urlopen(Request(self.query_endpoint, data=query.encode(), headers=args["headers"])) | ||
white-gecko marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| except HTTPError as e: | ||
| return e.code, str(e), None | ||
| else: | ||
| raise SPARQLConnectorException("Unknown method %s" % self.method) | ||
| return Result.parse( | ||
| BytesIO(res.read()), content_type=res.headers["Content-Type"].split(";")[0] | ||
| ) | ||
|
|
||
| def update(self, query, default_graph: str = None, named_graph: str = None): | ||
| if not self.update_endpoint: | ||
| raise SPARQLConnectorException("Query endpoint not set!") | ||
|
|
||
| params = {} | ||
|
|
||
| if default_graph is not None: | ||
| params["using-graph-uri"] = default_graph | ||
|
|
||
| if named_graph is not None: | ||
| params["using-named-graph-uri"] = default_graph | ||
|
|
||
| headers = { | ||
| "Accept": _response_mime_types[self.returnFormat], | ||
| "Content-Type": "application/sparql-update", | ||
| } | ||
|
|
||
| args = dict(self.kwargs) # other QSAs | ||
|
|
||
| args.setdefault("params", {}) | ||
| args["params"].update(params) | ||
| args.setdefault("headers", {}) | ||
| args["headers"].update(headers) | ||
|
|
||
|
There was a problem hiding this comment. Why do we remove There was a problem hiding this comment. Because the Store is actually stateless with each operation and there's nothing to close. I originally dropped |
||
| qsa = "?" + urlencode(args["params"]) | ||
| res = urlopen(Request(self.update_endpoint + qsa, data=query.encode(), headers=args["headers"])) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In my eyes it is no good practice to have
assertin production code, so it should not be in a library.The Python reference states:
So I think it should be replaced by if and raise and exception.