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

Revert "Add pyoxigraph type annotations for model module"

Browse Source 
This reverts commit 41d79d734c.
pull/221/head
Edmond 3 years ago
parent 6bc714d923
commit cec55b22de
2 changed files with 7 additions and 249 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. 242
      python/pyoxigraph/models.py
  2. 14
      python/src/model.rs

242
python/pyoxigraph/models.py
Unescape View File

@ -1,242 +0,0 @@
from typing import Union
from .pyoxigraph import NamedNode as PyNamedNode
from .pyoxigraph import BlankNode as PyBlankNode
from .pyoxigraph import Literal as PyLiteral
from .pyoxigraph import Triple as PyTriple
from .pyoxigraph import Quad as PyQuad
from .pyoxigraph import DefaultGraph as PyDefaultGraph
class NamedNode(PyNamedNode):
"""An RDF `node identified by an IRI <https://www.w3.org/TR/rdf11-concepts/#dfn-iri>`_.
:param value: the IRI as a string.
:raises ValueError: if the IRI is not valid according to `RFC 3987 <https://tools.ietf.org/rfc/rfc3987>`_.
The :py:func:`str` function provides a serialization compatible with N-Triples, Turtle, and SPARQL:
>>> str(NamedNode('http://example.com'))
'<http://example.com>'
"""
def __init__(self, value: str) -> None:
...
@property
def value(self) -> str:
"""the named node IRI.
>>> NamedNode("http://example.com").value
'http://example.com'
"""
return super().value
class BlankNode(PyBlankNode):
"""An RDF `blank node <https://www.w3.org/TR/rdf11-concepts/#dfn-blank-node>`_.
:param value: the `blank node ID <https://www.w3.org/TR/rdf11-concepts/#dfn-blank-node-identifier>`_ (if not present, a random blank node ID is automatically generated).
:raises ValueError: if the blank node ID is invalid according to NTriples, Turtle, and SPARQL grammars.
The :py:func:`str` function provides a serialization compatible with NTriples, Turtle, and SPARQL:
>>> str(BlankNode('ex'))
'_:ex'
"""
def __init__(self, value: Union[str, None] = None) -> None:
...
@property
def value(self) -> str:
"""the `blank node ID <https://www.w3.org/TR/rdf11-concepts/#dfn-blank-node-identifier>`_.
>>> BlankNode("ex").value
'ex'"""
return super().value
class Literal(PyLiteral):
"""An RDF `literal <https://www.w3.org/TR/rdf11-concepts/#dfn-literal>`_.
:param value: the literal value or `lexical form <https://www.w3.org/TR/rdf11-concepts/#dfn-lexical-form>`_.
:param datatype: the literal `datatype IRI <https://www.w3.org/TR/rdf11-concepts/#dfn-datatype-iri>`_.
:param language: the literal `language tag <https://www.w3.org/TR/rdf11-concepts/#dfn-language-tag>`_.
:raises ValueError: if the language tag is not valid according to `RFC 5646 <https://tools.ietf.org/rfc/rfc5646>`_ (`BCP 47 <https://tools.ietf.org/rfc/bcp/bcp47>`_).
The :py:func:`str` function provides a serialization compatible with NTriples, Turtle, and SPARQL:
>>> str(Literal('example'))
'"example"'
>>> str(Literal('example', language='en'))
'"example"@en'
>>> str(Literal('11', datatype=NamedNode('http://www.w3.org/2001/XMLSchema#integer')))
'"11"^^<http://www.w3.org/2001/XMLSchema#integer>'
"""
def __init__(
self,
value: str,
datatype: Union[NamedNode, None] = None,
language: Union[str, None] = None,
) -> None:
...
@property
def datatype(self) -> NamedNode:
"""the literal `datatype IRI <https://www.w3.org/TR/rdf11-concepts/#dfn-datatype-iri>`_.
>>> Literal('11', datatype=NamedNode('http://www.w3.org/2001/XMLSchema#integer')).datatype
<NamedNode value=http://www.w3.org/2001/XMLSchema#integer>
>>> Literal('example').datatype
<NamedNode value=http://www.w3.org/2001/XMLSchema#string>
>>> Literal('example', language='en').datatype
<NamedNode value=http://www.w3.org/1999/02/22-rdf-syntax-ns#langString>
"""
return super().datatype
@property
def language(self) -> Union[str, None]:
"""the literal `language tag <https://www.w3.org/TR/rdf11-concepts/#dfn-language-tag>`_.
>>> Literal('example', language='en').language
'en'
>>> Literal('example').language
"""
return super().language
@property
def value(self) -> str:
"""the literal value or `lexical form <https://www.w3.org/TR/rdf11-concepts/#dfn-lexical-form>`_.
>>> Literal("example").value
'example'
"""
return super().value
class Triple(PyTriple):
"""An RDF `triple <https://www.w3.org/TR/rdf11-concepts/#dfn-rdf-triple>`_.
:param subject: the triple subject.
:param predicate: the triple predicate.
:param object: the triple object.
The :py:func:`str` function provides a serialization compatible with NTriples, Turtle, and SPARQL:
>>> str(Triple(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1')))
'<http://example.com> <http://example.com/p> "1"'
A triple could also be easily destructed into its components:
>>> (s, p, o) = Triple(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'))
"""
def __init__(
self,
subject: Union[NamedNode, BlankNode, "Triple"],
predicate: NamedNode,
object: Union[NamedNode, BlankNode, Literal, "Triple"],
) -> None:
...
@property
def subject(self) -> Union[NamedNode, BlankNode, "Triple"]:
"""the triple subject.
>>> Triple(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1')).subject
<NamedNode value=http://example.com>
"""
return super().subject
@property
def predicate(self) -> NamedNode:
"""the triple predicate.
>>> Triple(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1')).predicate
<NamedNode value=http://example.com/p>
"""
return super().predicate
@property
def object(self) -> Union[NamedNode, BlankNode, Literal, "Triple"]:
"""the triple object.
>>> Triple(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1')).object
<Literal value=1 datatype=<NamedNode value=http://www.w3.org/2001/XMLSchema#string>>
"""
return super().object
class Quad(PyQuad):
"""
An RDF `triple <https://www.w3.org/TR/rdf11-concepts/#dfn-rdf-triple>`_.
in a `RDF dataset <https://www.w3.org/TR/rdf11-concepts/#dfn-rdf-dataset>`_.
:param subject: the quad subject.
:param predicate: the quad predicate.
:param object: the quad object.
:param graph: the quad graph name. If not present, the default graph is assumed.
The :py:func:`str` function provides a serialization compatible with NTriples, Turtle, and SPARQL:
>>> str(Quad(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'), NamedNode('http://example.com/g')))
'<http://example.com> <http://example.com/p> "1" <http://example.com/g>'
>>> str(Quad(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'), DefaultGraph()))
'<http://example.com> <http://example.com/p> "1"'
A quad could also be easily destructed into its components:
>>> (s, p, o, g) = Quad(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'), NamedNode('http://example.com/g'))
"""
def __init__(
self,
subject: Union[NamedNode, BlankNode, Triple],
predicate: NamedNode,
object: Union[NamedNode, BlankNode, Literal, Triple],
graph: Union[NamedNode, BlankNode, "DefaultGraph", None] = None,
) -> None:
...
@property
def subject(self) -> Union[NamedNode, BlankNode, Triple]:
"""the quad subject.
>>> Quad(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'), NamedNode('http://example.com/g')).subject
<NamedNode value=http://example.com>
"""
return super().subject
@property
def predicate(self) -> NamedNode:
"""the quad predicate.
>>> Quad(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'), NamedNode('http://example.com/g')).predicate
<NamedNode value=http://example.com/p>
"""
return super().predicate
@property
def object(self) -> Union[NamedNode, BlankNode, Literal, Triple]:
"""the quad object.
>>> Quad(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'), NamedNode('http://example.com/g')).object
<Literal value=1 datatype=<NamedNode value=http://www.w3.org/2001/XMLSchema#string>>
"""
return super().object
@property
def graph_name(self) -> Union[NamedNode, BlankNode, "DefaultGraph"]:
"""the quad graph name.
>>> Quad(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'), NamedNode('http://example.com/g')).graph_name
<NamedNode value=http://example.com/g>
"""
return super().graph_name
class DefaultGraph(PyDefaultGraph):
"""The RDF `default graph name <https://www.w3.org/TR/rdf11-concepts/#dfn-default-graph>`_."""

14
python/src/model.rs
Unescape View File

@ -19,7 +19,7 @@ use std::vec::IntoIter;
/// ///
/// >>> str(NamedNode('http://example.com')) /// >>> str(NamedNode('http://example.com'))
/// '<http://example.com>' /// '<http://example.com>'
#[pyclass(name = "NamedNode", module = "oxigraph", subclass)] #[pyclass(name = "NamedNode", module = "oxigraph")]
#[pyo3(text_signature = "(value)")] #[pyo3(text_signature = "(value)")]
#[derive(Eq, PartialEq, Ord, PartialOrd, Debug, Clone, Hash)] #[derive(Eq, PartialEq, Ord, PartialOrd, Debug, Clone, Hash)]
pub struct PyNamedNode { pub struct PyNamedNode {
@ -121,7 +121,7 @@ impl PyNamedNode {
/// ///
/// >>> str(BlankNode('ex')) /// >>> str(BlankNode('ex'))
/// '_:ex' /// '_:ex'
#[pyclass(name = "BlankNode", module = "oxigraph", subclass)] #[pyclass(name = "BlankNode", module = "oxigraph")]
#[pyo3(text_signature = "(value)")] #[pyo3(text_signature = "(value)")]
#[derive(Eq, PartialEq, Debug, Clone, Hash)] #[derive(Eq, PartialEq, Debug, Clone, Hash)]
pub struct PyBlankNode { pub struct PyBlankNode {
@ -234,7 +234,7 @@ impl PyBlankNode {
/// '"example"@en' /// '"example"@en'
/// >>> str(Literal('11', datatype=NamedNode('http://www.w3.org/2001/XMLSchema#integer'))) /// >>> str(Literal('11', datatype=NamedNode('http://www.w3.org/2001/XMLSchema#integer')))
/// '"11"^^<http://www.w3.org/2001/XMLSchema#integer>' /// '"11"^^<http://www.w3.org/2001/XMLSchema#integer>'
#[pyclass(name = "Literal", module = "oxigraph", subclass)] #[pyclass(name = "Literal", module = "oxigraph")]
#[pyo3(text_signature = "(value, *, datatype = None, language = None)")] #[pyo3(text_signature = "(value, *, datatype = None, language = None)")]
#[derive(Eq, PartialEq, Debug, Clone, Hash)] #[derive(Eq, PartialEq, Debug, Clone, Hash)]
pub struct PyLiteral { pub struct PyLiteral {
@ -353,7 +353,7 @@ impl PyLiteral {
} }
/// The RDF `default graph name <https://www.w3.org/TR/rdf11-concepts/#dfn-default-graph>`_. /// The RDF `default graph name <https://www.w3.org/TR/rdf11-concepts/#dfn-default-graph>`_.
#[pyclass(name = "DefaultGraph", module = "oxigraph", subclass)] #[pyclass(name = "DefaultGraph", module = "oxigraph")]
#[derive(Eq, PartialEq, Debug, Clone, Copy, Hash)] #[derive(Eq, PartialEq, Debug, Clone, Copy, Hash)]
pub struct PyDefaultGraph {} pub struct PyDefaultGraph {}
@ -531,7 +531,7 @@ impl IntoPy<PyObject> for PyTerm {
/// A triple could also be easily destructed into its components: /// A triple could also be easily destructed into its components:
/// ///
/// >>> (s, p, o) = Triple(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1')) /// >>> (s, p, o) = Triple(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'))
#[pyclass(name = "Triple", module = "oxigraph", subclass)] #[pyclass(name = "Triple", module = "oxigraph")]
#[derive(Eq, PartialEq, Debug, Clone, Hash)] #[derive(Eq, PartialEq, Debug, Clone, Hash)]
#[pyo3(text_signature = "(subject, predicate, object)")] #[pyo3(text_signature = "(subject, predicate, object)")]
pub struct PyTriple { pub struct PyTriple {
@ -708,7 +708,7 @@ impl IntoPy<PyObject> for PyGraphName {
/// A quad could also be easily destructed into its components: /// A quad could also be easily destructed into its components:
/// ///
/// >>> (s, p, o, g) = Quad(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'), NamedNode('http://example.com/g')) /// >>> (s, p, o, g) = Quad(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'), NamedNode('http://example.com/g'))
#[pyclass(name = "Quad", module = "oxigraph", subclass)] #[pyclass(name = "Quad", module = "oxigraph")]
#[pyo3(text_signature = "(subject, predicate, object, graph_name = None)")] #[pyo3(text_signature = "(subject, predicate, object, graph_name = None)")]
#[derive(Eq, PartialEq, Debug, Clone, Hash)] #[derive(Eq, PartialEq, Debug, Clone, Hash)]
pub struct PyQuad { pub struct PyQuad {
@ -870,7 +870,7 @@ impl PyQuad {
/// ///
/// >>> str(Variable('foo')) /// >>> str(Variable('foo'))
/// '?foo' /// '?foo'
#[pyclass(name = "Variable", module = "oxigraph", subclass)] #[pyclass(name = "Variable", module = "oxigraph")]
#[pyo3(text_signature = "(value)")] #[pyo3(text_signature = "(value)")]
#[derive(Eq, PartialEq, Debug, Clone, Hash)] #[derive(Eq, PartialEq, Debug, Clone, Hash)]
pub struct PyVariable { pub struct PyVariable {

Write Preview
Loading…
Cancel
Save