NextGraph
/
oxigraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Avoids copy in Python bindings and adds better __eq__ implementations

Browse Source
pull/51/head
Tpt 4 years ago
parent 1dfc536eba
commit 68597ef35a
6 changed files with 258 additions and 108 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 23
      python/src/memory_store.rs
  2. 265
      python/src/model.rs
  3. 22
      python/src/sled_store.rs
  4. 14
      python/src/sparql.rs
  5. 30
      python/src/store_utils.rs
  6. 12
      python/tests/test_model.py

23
python/src/memory_store.rs
Unescape View File

@ -3,12 +3,15 @@ use crate::model::*;
use crate::sparql::*; use crate::sparql::*;
use crate::store_utils::*; use crate::store_utils::*;
use oxigraph::io::{DatasetFormat, GraphFormat}; use oxigraph::io::{DatasetFormat, GraphFormat};
use oxigraph::model::*;
use oxigraph::store::memory::*; use oxigraph::store::memory::*;
use pyo3::basic::CompareOp; use pyo3::basic::CompareOp;
use pyo3::exceptions::{NotImplementedError, ValueError}; use pyo3::exceptions::{NotImplementedError, ValueError};
use pyo3::prelude::*; use pyo3::prelude::{
pyclass, pymethods, pyproto, Py, PyAny, PyCell, PyObject, PyRef, PyRefMut, PyResult, Python,
ToPyObject,
};
use pyo3::{PyIterProtocol, PyObjectProtocol, PySequenceProtocol}; use pyo3::{PyIterProtocol, PyObjectProtocol, PySequenceProtocol};
use std::convert::TryFrom;
use std::io::BufReader; use std::io::BufReader;
/// In-memory store. /// In-memory store.
@ -96,10 +99,10 @@ impl PyMemoryStore {
extract_quads_pattern(subject, predicate, object, graph_name)?; extract_quads_pattern(subject, predicate, object, graph_name)?;
Ok(QuadIter { Ok(QuadIter {
inner: self.inner.quads_for_pattern( inner: self.inner.quads_for_pattern(
subject.as_ref().map(|t| t.into()), subject.as_ref().map(|p| p.into()),
predicate.as_ref().map(|t| t.into()), predicate.as_ref().map(|p| p.into()),
object.as_ref().map(|t| t.into()), object.as_ref().map(|p| p.into()),
graph_name.as_ref().map(|t| t.into()), graph_name.as_ref().map(|p| p.into()),
), ),
}) })
} }
@ -253,7 +256,7 @@ impl PyMemoryStore {
py: Python<'_>, py: Python<'_>,
) -> PyResult<()> { ) -> PyResult<()> {
let to_graph_name = if let Some(graph_name) = to_graph { let to_graph_name = if let Some(graph_name) = to_graph {
Some(extract_graph_name(graph_name)?) Some(PyGraphNameRef::try_from(graph_name)?)
} else { } else {
None None
}; };
@ -263,7 +266,7 @@ impl PyMemoryStore {
.load_graph( .load_graph(
input, input,
graph_format, graph_format,
&to_graph_name.unwrap_or(GraphName::DefaultGraph), &to_graph_name.unwrap_or(PyGraphNameRef::DefaultGraph),
base_iri, base_iri,
) )
.map_err(map_io_err) .map_err(map_io_err)
@ -322,7 +325,7 @@ impl PyMemoryStore {
py: Python<'_>, py: Python<'_>,
) -> PyResult<()> { ) -> PyResult<()> {
let from_graph_name = if let Some(graph_name) = from_graph { let from_graph_name = if let Some(graph_name) = from_graph {
Some(extract_graph_name(graph_name)?) Some(PyGraphNameRef::try_from(graph_name)?)
} else { } else {
None None
}; };
@ -332,7 +335,7 @@ impl PyMemoryStore {
.dump_graph( .dump_graph(
output, output,
graph_format, graph_format,
&from_graph_name.unwrap_or(GraphName::DefaultGraph), &from_graph_name.unwrap_or(PyGraphNameRef::DefaultGraph),
) )
.map_err(map_io_err) .map_err(map_io_err)
} else if let Some(dataset_format) = DatasetFormat::from_media_type(mime_type) { } else if let Some(dataset_format) = DatasetFormat::from_media_type(mime_type) {

265
python/src/model.rs
Unescape View File

@ -3,8 +3,9 @@ use oxigraph::sparql::Variable;
use pyo3::basic::CompareOp; use pyo3::basic::CompareOp;
use pyo3::exceptions::{IndexError, NotImplementedError, TypeError, ValueError}; use pyo3::exceptions::{IndexError, NotImplementedError, TypeError, ValueError};
use pyo3::prelude::*; use pyo3::prelude::*;
use pyo3::{PyIterProtocol, PyMappingProtocol, PyObjectProtocol}; use pyo3::{PyIterProtocol, PyMappingProtocol, PyObjectProtocol, PyTypeInfo};
use std::collections::hash_map::DefaultHasher; use std::collections::hash_map::DefaultHasher;
use std::convert::TryFrom;
use std::hash::Hash; use std::hash::Hash;
use std::hash::Hasher; use std::hash::Hasher;
use std::vec::IntoIter; use std::vec::IntoIter;
@ -92,8 +93,19 @@ impl PyObjectProtocol for PyNamedNode {
hash(&self.inner) hash(&self.inner)
} }
fn __richcmp__(&self, other: &PyCell<Self>, op: CompareOp) -> bool { fn __richcmp__(&self, other: &PyAny, op: CompareOp) -> PyResult<bool> {
eq_ord_compare(self, &other.borrow(), op) if let Ok(other) = other.downcast::<PyCell<PyNamedNode>>() {
Ok(eq_ord_compare(self, &other.borrow(), op))
} else if PyBlankNode::is_instance(other)
|| PyLiteral::is_instance(other)
|| PyDefaultGraph::is_instance(other)
{
eq_compare_other_type(op)
} else {
Err(TypeError::py_err(
"NamedNode could only be compared with RDF terms",
))
}
} }
} }
@ -182,8 +194,19 @@ impl PyObjectProtocol for PyBlankNode {
hash(&self.inner) hash(&self.inner)
} }
fn __richcmp__(&self, other: &PyCell<Self>, op: CompareOp) -> PyResult<bool> { fn __richcmp__(&self, other: &PyAny, op: CompareOp) -> PyResult<bool> {
eq_compare(self, &other.borrow(), op) if let Ok(other) = other.downcast::<PyCell<PyBlankNode>>() {
eq_compare(self, &other.borrow(), op)
} else if PyNamedNode::is_instance(other)
|| PyLiteral::is_instance(other)
|| PyDefaultGraph::is_instance(other)
{
eq_compare_other_type(op)
} else {
Err(TypeError::py_err(
"BlankNode could only be compared with RDF terms",
))
}
} }
} }
@ -310,8 +333,19 @@ impl PyObjectProtocol for PyLiteral {
hash(&self.inner) hash(&self.inner)
} }
fn __richcmp__(&self, other: &PyCell<Self>, op: CompareOp) -> PyResult<bool> { fn __richcmp__(&self, other: &PyAny, op: CompareOp) -> PyResult<bool> {
eq_compare(self, &other.borrow(), op) if let Ok(other) = other.downcast::<PyCell<PyLiteral>>() {
eq_compare(self, &other.borrow(), op)
} else if PyNamedNode::is_instance(other)
|| PyBlankNode::is_instance(other)
|| PyDefaultGraph::is_instance(other)
{
eq_compare_other_type(op)
} else {
Err(TypeError::py_err(
"Literal could only be compared with RDF terms",
))
}
} }
} }
@ -353,8 +387,19 @@ impl PyObjectProtocol for PyDefaultGraph {
0 0
} }
fn __richcmp__(&self, other: &PyCell<Self>, op: CompareOp) -> PyResult<bool> { fn __richcmp__(&self, other: &PyAny, op: CompareOp) -> PyResult<bool> {
eq_compare(self, &other.borrow(), op) if let Ok(other) = other.downcast::<PyCell<PyDefaultGraph>>() {
eq_compare(self, &other.borrow(), op)
} else if PyNamedNode::is_instance(other)
|| PyBlankNode::is_instance(other)
|| PyLiteral::is_instance(other)
{
eq_compare_other_type(op)
} else {
Err(TypeError::py_err(
"DefaultGraph could only be compared with RDF terms",
))
}
} }
} }
@ -403,11 +448,11 @@ impl<'a> From<&'a PyTriple> for TripleRef<'a> {
#[pymethods] #[pymethods]
impl PyTriple { impl PyTriple {
#[new] #[new]
fn new(subject: &PyAny, predicate: &PyAny, object: &PyAny) -> PyResult<Self> { fn new(subject: &PyAny, predicate: PyNamedNode, object: &PyAny) -> PyResult<Self> {
Ok(Triple::new( Ok(Triple::new(
extract_named_or_blank_node(subject)?, &PyNamedOrBlankNodeRef::try_from(subject)?,
extract_named_node(predicate)?, predicate,
extract_term(object)?, &PyTermRef::try_from(object)?,
) )
.into()) .into())
} }
@ -557,18 +602,18 @@ impl PyQuad {
#[new] #[new]
fn new( fn new(
subject: &PyAny, subject: &PyAny,
predicate: &PyAny, predicate: PyNamedNode,
object: &PyAny, object: &PyAny,
graph_name: Option<&PyAny>, graph_name: Option<&PyAny>,
) -> PyResult<Self> { ) -> PyResult<Self> {
Ok(Quad::new( Ok(Quad::new(
extract_named_or_blank_node(subject)?, &PyNamedOrBlankNodeRef::try_from(subject)?,
extract_named_node(predicate)?, predicate,
extract_term(object)?, &PyTermRef::try_from(object)?,
if let Some(graph_name) = graph_name { &if let Some(graph_name) = graph_name {
extract_graph_name(graph_name)? PyGraphNameRef::try_from(graph_name)?
} else { } else {
GraphName::DefaultGraph PyGraphNameRef::DefaultGraph
}, },
) )
.into()) .into())
@ -768,27 +813,63 @@ impl PyObjectProtocol for PyVariable {
} }
} }
pub fn extract_named_node(py: &PyAny) -> PyResult<NamedNode> { pub struct PyNamedNodeRef<'a>(PyRef<'a, PyNamedNode>);
if let Ok(node) = py.downcast::<PyCell<PyNamedNode>>() {
Ok(node.borrow().clone().into()) impl<'a> From<&'a PyNamedNodeRef<'a>> for NamedNodeRef<'a> {
} else { fn from(value: &'a PyNamedNodeRef<'a>) -> Self {
Err(TypeError::py_err(format!( value.0.inner.as_ref()
"{} is not an RDF named node",
py.get_type().name(),
)))
} }
} }
pub fn extract_named_or_blank_node(py: &PyAny) -> PyResult<NamedOrBlankNode> { impl<'a> TryFrom<&'a PyAny> for PyNamedNodeRef<'a> {
if let Ok(node) = py.downcast::<PyCell<PyNamedNode>>() { type Error = PyErr;
Ok(node.borrow().clone().into())
} else if let Ok(node) = py.downcast::<PyCell<PyBlankNode>>() { fn try_from(value: &'a PyAny) -> PyResult<Self> {
Ok(node.borrow().clone().into()) if let Ok(node) = value.downcast::<PyCell<PyNamedNode>>() {
} else { Ok(Self(node.borrow()))
Err(TypeError::py_err(format!( } else {
"{} is not an RDF named or blank node", Err(TypeError::py_err(format!(
py.get_type().name(), "{} is not an RDF named node",
))) value.get_type().name(),
)))
}
}
}
pub enum PyNamedOrBlankNodeRef<'a> {
NamedNode(PyRef<'a, PyNamedNode>),
BlankNode(PyRef<'a, PyBlankNode>),
}
impl<'a> From<&'a PyNamedOrBlankNodeRef<'a>> for NamedOrBlankNodeRef<'a> {
fn from(value: &'a PyNamedOrBlankNodeRef<'a>) -> Self {
match value {
PyNamedOrBlankNodeRef::NamedNode(value) => value.inner.as_ref().into(),
PyNamedOrBlankNodeRef::BlankNode(value) => value.inner.as_ref().into(),
}
}
}
impl<'a> From<&'a PyNamedOrBlankNodeRef<'a>> for NamedOrBlankNode {
fn from(value: &'a PyNamedOrBlankNodeRef<'a>) -> Self {
NamedOrBlankNodeRef::from(value).into()
}
}
impl<'a> TryFrom<&'a PyAny> for PyNamedOrBlankNodeRef<'a> {
type Error = PyErr;
fn try_from(value: &'a PyAny) -> PyResult<Self> {
if let Ok(node) = value.downcast::<PyCell<PyNamedNode>>() {
Ok(Self::NamedNode(node.borrow()))
} else if let Ok(node) = value.downcast::<PyCell<PyBlankNode>>() {
Ok(Self::BlankNode(node.borrow()))
} else {
Err(TypeError::py_err(format!(
"{} is not an RDF named or blank node",
value.get_type().name(),
)))
}
} }
} }
@ -799,18 +880,44 @@ pub fn named_or_blank_node_to_python(py: Python<'_>, node: NamedOrBlankNode) ->
} }
} }
pub fn extract_term(py: &PyAny) -> PyResult<Term> { pub enum PyTermRef<'a> {
if let Ok(node) = py.downcast::<PyCell<PyNamedNode>>() { NamedNode(PyRef<'a, PyNamedNode>),
Ok(node.borrow().clone().into()) BlankNode(PyRef<'a, PyBlankNode>),
} else if let Ok(node) = py.downcast::<PyCell<PyBlankNode>>() { Literal(PyRef<'a, PyLiteral>),
Ok(node.borrow().clone().into()) }
} else if let Ok(literal) = py.downcast::<PyCell<PyLiteral>>() {
Ok(literal.borrow().clone().into()) impl<'a> From<&'a PyTermRef<'a>> for TermRef<'a> {
} else { fn from(value: &'a PyTermRef<'a>) -> Self {
Err(TypeError::py_err(format!( match value {
"{} is not an RDF named or blank node", PyTermRef::NamedNode(value) => value.inner.as_ref().into(),
py.get_type().name(), PyTermRef::BlankNode(value) => value.inner.as_ref().into(),
))) PyTermRef::Literal(value) => value.inner.as_ref().into(),
}
}
}
impl<'a> From<&'a PyTermRef<'a>> for Term {
fn from(value: &'a PyTermRef<'a>) -> Self {
TermRef::from(value).into()
}
}
impl<'a> TryFrom<&'a PyAny> for PyTermRef<'a> {
type Error = PyErr;
fn try_from(value: &'a PyAny) -> PyResult<Self> {
if let Ok(node) = value.downcast::<PyCell<PyNamedNode>>() {
Ok(Self::NamedNode(node.borrow()))
} else if let Ok(node) = value.downcast::<PyCell<PyBlankNode>>() {
Ok(Self::BlankNode(node.borrow()))
} else if let Ok(node) = value.downcast::<PyCell<PyLiteral>>() {
Ok(Self::Literal(node.borrow()))
} else {
Err(TypeError::py_err(format!(
"{} is not an RDF term",
value.get_type().name(),
)))
}
} }
} }
@ -822,18 +929,44 @@ pub fn term_to_python(py: Python<'_>, term: Term) -> PyObject {
} }
} }
pub fn extract_graph_name(py: &PyAny) -> PyResult<GraphName> { pub enum PyGraphNameRef<'a> {
if let Ok(node) = py.downcast::<PyCell<PyNamedNode>>() { NamedNode(PyRef<'a, PyNamedNode>),
Ok(node.borrow().clone().into()) BlankNode(PyRef<'a, PyBlankNode>),
} else if let Ok(node) = py.downcast::<PyCell<PyBlankNode>>() { DefaultGraph,
Ok(node.borrow().clone().into()) }
} else if let Ok(node) = py.downcast::<PyCell<PyDefaultGraph>>() {
Ok(node.borrow().clone().into()) impl<'a> From<&'a PyGraphNameRef<'a>> for GraphNameRef<'a> {
} else { fn from(value: &'a PyGraphNameRef<'a>) -> Self {
Err(TypeError::py_err(format!( match value {
"{} is not a valid RDF graph name", PyGraphNameRef::NamedNode(value) => value.inner.as_ref().into(),
py.get_type().name(), PyGraphNameRef::BlankNode(value) => value.inner.as_ref().into(),
))) PyGraphNameRef::DefaultGraph => Self::DefaultGraph,
}
}
}
impl<'a> From<&'a PyGraphNameRef<'a>> for GraphName {
fn from(value: &'a PyGraphNameRef<'a>) -> Self {
GraphNameRef::from(value).into()
}
}
impl<'a> TryFrom<&'a PyAny> for PyGraphNameRef<'a> {
type Error = PyErr;
fn try_from(value: &'a PyAny) -> PyResult<Self> {
if let Ok(node) = value.downcast::<PyCell<PyNamedNode>>() {
Ok(Self::NamedNode(node.borrow()))
} else if let Ok(node) = value.downcast::<PyCell<PyBlankNode>>() {
Ok(Self::BlankNode(node.borrow()))
} else if value.downcast::<PyCell<PyDefaultGraph>>().is_ok() {
Ok(Self::DefaultGraph)
} else {
Err(TypeError::py_err(format!(
"{} is not an RDF graph name",
value.get_type().name(),
)))
}
} }
} }
@ -853,6 +986,14 @@ fn eq_compare<T: Eq>(a: &T, b: &T, op: CompareOp) -> PyResult<bool> {
} }
} }
fn eq_compare_other_type(op: CompareOp) -> PyResult<bool> {
match op {
CompareOp::Eq => Ok(false),
CompareOp::Ne => Ok(true),
_ => Err(NotImplementedError::py_err("Ordering is not implemented")),
}
}
fn eq_ord_compare<T: Eq + Ord>(a: &T, b: &T, op: CompareOp) -> bool { fn eq_ord_compare<T: Eq + Ord>(a: &T, b: &T, op: CompareOp) -> bool {
match op { match op {
CompareOp::Lt => a < b, CompareOp::Lt => a < b,

22
python/src/sled_store.rs
Unescape View File

@ -3,11 +3,13 @@ use crate::model::*;
use crate::sparql::*; use crate::sparql::*;
use crate::store_utils::*; use crate::store_utils::*;
use oxigraph::io::{DatasetFormat, GraphFormat}; use oxigraph::io::{DatasetFormat, GraphFormat};
use oxigraph::model::*;
use oxigraph::store::sled::*; use oxigraph::store::sled::*;
use pyo3::exceptions::ValueError; use pyo3::exceptions::ValueError;
use pyo3::prelude::*; use pyo3::prelude::{
pyclass, pymethods, pyproto, Py, PyAny, PyObject, PyRef, PyRefMut, PyResult, Python, ToPyObject,
};
use pyo3::{PyIterProtocol, PyObjectProtocol, PySequenceProtocol}; use pyo3::{PyIterProtocol, PyObjectProtocol, PySequenceProtocol};
use std::convert::TryFrom;
use std::io::BufReader; use std::io::BufReader;
/// Store based on the `Sled <https://sled.rs/>`_ key-value database. /// Store based on the `Sled <https://sled.rs/>`_ key-value database.
@ -110,10 +112,10 @@ impl PySledStore {
extract_quads_pattern(subject, predicate, object, graph_name)?; extract_quads_pattern(subject, predicate, object, graph_name)?;
Ok(QuadIter { Ok(QuadIter {
inner: self.inner.quads_for_pattern( inner: self.inner.quads_for_pattern(
subject.as_ref().map(|t| t.into()), subject.as_ref().map(|p| p.into()),
predicate.as_ref().map(|t| t.into()), predicate.as_ref().map(|p| p.into()),
object.as_ref().map(|t| t.into()), object.as_ref().map(|p| p.into()),
graph_name.as_ref().map(|t| t.into()), graph_name.as_ref().map(|p| p.into()),
), ),
}) })
} }
@ -270,7 +272,7 @@ impl PySledStore {
py: Python<'_>, py: Python<'_>,
) -> PyResult<()> { ) -> PyResult<()> {
let to_graph_name = if let Some(graph_name) = to_graph { let to_graph_name = if let Some(graph_name) = to_graph {
Some(extract_graph_name(graph_name)?) Some(PyGraphNameRef::try_from(graph_name)?)
} else { } else {
None None
}; };
@ -280,7 +282,7 @@ impl PySledStore {
.load_graph( .load_graph(
input, input,
graph_format, graph_format,
&to_graph_name.unwrap_or(GraphName::DefaultGraph), &to_graph_name.unwrap_or(PyGraphNameRef::DefaultGraph),
base_iri, base_iri,
) )
.map_err(map_io_err) .map_err(map_io_err)
@ -340,7 +342,7 @@ impl PySledStore {
py: Python<'_>, py: Python<'_>,
) -> PyResult<()> { ) -> PyResult<()> {
let from_graph_name = if let Some(graph_name) = from_graph { let from_graph_name = if let Some(graph_name) = from_graph {
Some(extract_graph_name(graph_name)?) Some(PyGraphNameRef::try_from(graph_name)?)
} else { } else {
None None
}; };
@ -350,7 +352,7 @@ impl PySledStore {
.dump_graph( .dump_graph(
output, output,
graph_format, graph_format,
&from_graph_name.unwrap_or(GraphName::DefaultGraph), &from_graph_name.unwrap_or(PyGraphNameRef::DefaultGraph),
) )
.map_err(map_io_err) .map_err(map_io_err)
} else if let Some(dataset_format) = DatasetFormat::from_media_type(mime_type) { } else if let Some(dataset_format) = DatasetFormat::from_media_type(mime_type) {

14
python/src/sparql.rs
Unescape View File

@ -2,8 +2,12 @@ use crate::model::*;
use crate::store_utils::*; use crate::store_utils::*;
use oxigraph::sparql::*; use oxigraph::sparql::*;
use pyo3::exceptions::{RuntimeError, SyntaxError, TypeError, ValueError}; use pyo3::exceptions::{RuntimeError, SyntaxError, TypeError, ValueError};
use pyo3::prelude::*; use pyo3::prelude::{
pyclass, pymethods, pyproto, FromPyObject, IntoPy, Py, PyAny, PyCell, PyErr, PyObject,
PyRefMut, PyResult, Python,
};
use pyo3::{PyIterProtocol, PyMappingProtocol, PyNativeType, PyObjectProtocol}; use pyo3::{PyIterProtocol, PyMappingProtocol, PyNativeType, PyObjectProtocol};
use std::convert::TryFrom;
pub fn build_query_options( pub fn build_query_options(
use_default_graph_as_union: bool, use_default_graph_as_union: bool,
@ -36,10 +40,10 @@ pub fn build_query_options(
)); ));
} }
for default_graph in default_graphs { for default_graph in default_graphs {
options = options.with_default_graph(extract_graph_name(default_graph?)?); options = options.with_default_graph(&PyGraphNameRef::try_from(default_graph?)?);
} }
} else if let Ok(default_graph) = extract_graph_name(default_graph) { } else if let Ok(default_graph) = PyGraphNameRef::try_from(default_graph) {
options = options.with_default_graph(default_graph); options = options.with_default_graph(&default_graph);
} else { } else {
return Err(ValueError::py_err( return Err(ValueError::py_err(
format!("The query() method default_graph argument should be a NamedNode, a BlankNode, the DefaultGraph or a not empty list of them. {} found", default_graph.get_type() format!("The query() method default_graph argument should be a NamedNode, a BlankNode, the DefaultGraph or a not empty list of them. {} found", default_graph.get_type()
@ -54,7 +58,7 @@ pub fn build_query_options(
)); ));
} }
for named_graph in named_graphs.iter()? { for named_graph in named_graphs.iter()? {
options = options.with_named_graph(extract_named_or_blank_node(named_graph?)?); options = options.with_named_graph(&PyNamedOrBlankNodeRef::try_from(named_graph?)?);
} }
} }

30
python/src/store_utils.rs
Unescape View File

@ -1,41 +1,41 @@
use crate::model::*; use crate::model::*;
use oxigraph::model::*;
use pyo3::exceptions::{IOError, SyntaxError, ValueError}; use pyo3::exceptions::{IOError, SyntaxError, ValueError};
use pyo3::prelude::*; use pyo3::{PyAny, PyErr, PyResult};
use std::convert::TryInto;
use std::io; use std::io;
pub fn extract_quads_pattern( pub fn extract_quads_pattern<'a>(
subject: &PyAny, subject: &'a PyAny,
predicate: &PyAny, predicate: &'a PyAny,
object: &PyAny, object: &'a PyAny,
graph_name: Option<&PyAny>, graph_name: Option<&'a PyAny>,
) -> PyResult<( ) -> PyResult<(
Option<NamedOrBlankNode>, Option<PyNamedOrBlankNodeRef<'a>>,
Option<NamedNode>, Option<PyNamedNodeRef<'a>>,
Option<Term>, Option<PyTermRef<'a>>,
Option<GraphName>, Option<PyGraphNameRef<'a>>,
)> { )> {
Ok(( Ok((
if subject.is_none() { if subject.is_none() {
None None
} else { } else {
Some(extract_named_or_blank_node(subject)?) Some(subject.try_into()?)
}, },
if predicate.is_none() { if predicate.is_none() {
None None
} else { } else {
Some(extract_named_node(predicate)?) Some(predicate.try_into()?)
}, },
if object.is_none() { if object.is_none() {
None None
} else { } else {
Some(extract_term(object)?) Some(object.try_into()?)
}, },
if let Some(graph_name) = graph_name { if let Some(graph_name) = graph_name {
if graph_name.is_none() { if graph_name.is_none() {
None None
} else { } else {
Some(extract_graph_name(graph_name)?) Some(graph_name.try_into()?)
} }
} else { } else {
None None

12
python/tests/test_model.py
Unescape View File

@ -29,8 +29,8 @@ class TestBlankNode(unittest.TestCase):
def test_equal(self): def test_equal(self):
self.assertEqual(BlankNode("foo"), BlankNode("foo")) self.assertEqual(BlankNode("foo"), BlankNode("foo"))
self.assertNotEqual(BlankNode("foo"), BlankNode("bar")) self.assertNotEqual(BlankNode("foo"), BlankNode("bar"))
# TODO self.assertNotEqual(BlankNode('foo'), NamedNode('http://foo')) self.assertNotEqual(BlankNode('foo'), NamedNode('http://foo'))
# TODO self.assertNotEqual(NamedNode('http://foo'), BlankNode('foo')) self.assertNotEqual(NamedNode('http://foo'), BlankNode('foo'))
class TestLiteral(unittest.TestCase): class TestLiteral(unittest.TestCase):
@ -59,10 +59,10 @@ class TestLiteral(unittest.TestCase):
Literal("foo", language="en", datatype=RDF_LANG_STRING), Literal("foo", language="en", datatype=RDF_LANG_STRING),
Literal("foo", language="en"), Literal("foo", language="en"),
) )
# TODO self.assertNotEqual(NamedNode('http://foo'), Literal('foo')) self.assertNotEqual(NamedNode('http://foo'), Literal('foo'))
# TODO self.assertNotEqual(Literal('foo'), NamedNode('http://foo')) self.assertNotEqual(Literal('foo'), NamedNode('http://foo'))
# TODO self.assertNotEqual(BlankNode('foo'), Literal('foo')) self.assertNotEqual(BlankNode('foo'), Literal('foo'))
# TODO self.assertNotEqual(Literal('foo'), BlankNode('foo')) self.assertNotEqual(Literal('foo'), BlankNode('foo'))
class TestTriple(unittest.TestCase): class TestTriple(unittest.TestCase):

Write Preview
Loading…
Cancel
Save