Type clone.py node functions

pyshacl/constraints/core/shape_based_constraints.py

@@ -2,7 +2,6 @@
 """
 https://www.w3.org/TR/shacl/#core-components-shape
 """
-from dataclasses import dataclass
 from textwrap import indent
 from typing import Dict, List
 from warnings import warn
@@ -77,14 +76,13 @@ def evaluate(
     ):
         """
         Entrypoint for constraint evaluation.
-        :type executor: dataclass
+        :type executor: SHACLExecutor
         :type target_graph: rdflib.Graph
         :type focus_value_nodes: dict
         :type _evaluation_path: list
         """
         reports: List[Dict] = []
         non_conformant = False
-        shape = self.shape
 
         # Shortcut, when there are no value nodes, don't check for recursion, don't validate and exit early
         value_node_count = 0
@@ -178,7 +176,6 @@ def evaluate(
         """
         reports: List[Dict] = []
         non_conformant = False
-        shape = self.shape
 
         # Shortcut, when there are no value nodes, don't check for recursion, don't validate and exit early
         value_node_count = 0
@@ -344,7 +341,6 @@ def evaluate(
         """
         reports: List[Dict] = []
         non_conformant = False
-        shape = self.shape
 
         # Shortcut, when there are no value nodes, don't check for recursion, don't validate and exit early
         value_node_count = 0

pyshacl/rdfutil/clone.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 #
-from typing import Optional, Union
+from typing import Optional, Union, overload
 
 import rdflib
 from rdflib.collection import Collection
 from rdflib.graph import DATASET_DEFAULT_GRAPH_ID
 from rdflib.namespace import NamespaceManager
 
-from .consts import OWL, RDF_first
+from .consts import OWL, RDF_first, RDFNode
 from .pytypes import ConjunctiveLike, GraphLike
 
 OWLsameAs = OWL.sameAs
@@ -237,6 +237,28 @@ def mix_graphs(base_graph: GraphLike, extra_graph: GraphLike, target_graph: Opti
     return g
 
 
+@overload
+def clone_list(
+    graph: rdflib.Graph,
+    lnode: rdflib.BNode,
+    target_graph: rdflib.Graph,
+    keepid: bool = ...,
+    recursion: int = ...,
+    deep_clone: bool = ...,
+) -> rdflib.BNode: ...
+
+
+@overload
+def clone_list(
+    graph: rdflib.Graph,
+    lnode: rdflib.URIRef,
+    target_graph: rdflib.Graph,
+    keepid: bool = ...,
+    recursion: int = ...,
+    deep_clone: bool = ...,
+) -> rdflib.URIRef: ...
+
+
 def clone_list(graph, lnode, target_graph, keepid=False, recursion=0, deep_clone=False):
     # If deep_clone, copy all the contents (subjects, predicates) of a named member item
     if isinstance(lnode, rdflib.BNode):
@@ -254,7 +276,9 @@ def clone_list(graph, lnode, target_graph, keepid=False, recursion=0, deep_clone
     return cloned_node
 
 
-def clone_blank_node(graph, bnode, target_graph, keepid=False, recursion=0):
+def clone_blank_node(
+    graph: rdflib.Graph, bnode: rdflib.BNode, target_graph: rdflib.Graph, keepid: bool = False, recursion: int = 0
+) -> rdflib.BNode:
     if not isinstance(graph, rdflib.Graph):
         raise RuntimeError("clone_blank_node must take an rdflib.Graph as first parameter")
     if not isinstance(bnode, rdflib.BNode):
@@ -287,16 +311,19 @@ def clone_blank_node(graph, bnode, target_graph, keepid=False, recursion=0):
     return cloned_bnode
 
 
-def clone_literal(graph, node, target_graph):
+def clone_literal(graph: rdflib.Graph, node: rdflib.Literal, target_graph: rdflib.Graph) -> rdflib.Literal:
     lex_val_string = str(node)
     lang = node.language
     datatype = node.datatype
     new_literal = rdflib.Literal(lex_val_string, lang, datatype)
     return new_literal
 
 
-def clone_node(graph, node, target_graph, recursion=0, deep_clone=False):
+def clone_node(
+    graph: rdflib.Graph, node: RDFNode, target_graph: rdflib.Graph, recursion: int = 0, deep_clone: bool = False
+) -> RDFNode:
     # If deepclone, when the type is URIRef, it clones _all_ node content (properties, objects)
+    new_node: RDFNode
     if isinstance(node, rdflib.Literal):
         new_node = clone_literal(graph, node, target_graph)
     elif isinstance(node, rdflib.BNode):

pyshacl/rdfutil/load.py

@@ -8,7 +8,7 @@
 from io import BufferedIOBase, BytesIO, TextIOBase, UnsupportedOperation
 from logging import WARNING, Logger, getLogger
 from pathlib import Path
-from typing import IO, List, Optional, Union, cast
+from typing import IO, BinaryIO, List, Optional, Union, cast
 from urllib import request
 from urllib.error import HTTPError
 
@@ -113,7 +113,7 @@ def get_rdf_from_web(url: Union[rdflib.URIRef, str]):
 
 
 def load_from_source(
-    source: Union[GraphLike, BufferedIOBase, TextIOBase, str, bytes],
+    source: Union[GraphLike, BufferedIOBase, TextIOBase, BinaryIO, str, bytes],
     g: Optional[GraphLike] = None,
     rdf_format: Optional[str] = None,
     multigraph: bool = False,
@@ -139,7 +139,7 @@ def load_from_source(
     :return:
     """
     source_is_graph = False
-    open_source: Optional[BufferedIOBase] = None
+    open_source: Optional[Union[BufferedIOBase, BinaryIO]] = None
     source_was_open: bool = False
     source_as_file: Optional[BufferedIOBase] = None
     source_as_filename: Optional[str] = None