Skip to content

Commit

Permalink
Merge pull request #261 from ajnelson-nist/type_constraint_component_…
Browse files Browse the repository at this point in the history
…constraint_name

Type ConstraintComponent.constraint_name
  • Loading branch information
ashleysommer authored Oct 4, 2024
2 parents c7b14db + 281db7c commit 4633704
Show file tree
Hide file tree
Showing 16 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion pyshacl/constraints/advanced/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def constraint_parameters(cls):
return [SH_expression]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "ExpressionConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[Literal]:
Expand Down
4 changes: 2 additions & 2 deletions pyshacl/constraints/constraint_component.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def constraint_parameters(cls):

@classmethod
@abc.abstractmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
raise NotImplementedError() # pragma: no cover

@abc.abstractmethod
Expand All @@ -85,7 +85,7 @@ def evaluate(
def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[Literal]:
return []

def __str__(self):
def __str__(self) -> str:
c_name = str(self.__class__.__name__)
shape_id = str(self.shape)
return "<{} on {}>".format(c_name, shape_id)
Expand Down
4 changes: 2 additions & 2 deletions pyshacl/constraints/core/cardinality_constraints.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def constraint_parameters(cls):
return [SH_minCount]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "MinCountConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[Literal]:
Expand Down Expand Up @@ -157,7 +157,7 @@ def constraint_parameters(cls):
return [SH_maxCount]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "MaxCountConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[Literal]:
Expand Down
8 changes: 4 additions & 4 deletions pyshacl/constraints/core/logical_constraints.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def constraint_parameters(cls):
return [SH_not]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "NotConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down Expand Up @@ -155,7 +155,7 @@ def constraint_parameters(cls):
return [SH_and]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "AndConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down Expand Up @@ -251,7 +251,7 @@ def constraint_parameters(cls):
return [SH_or]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "OrConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down Expand Up @@ -347,7 +347,7 @@ def constraint_parameters(cls):
return [SH_xone]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "XoneConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down
6 changes: 3 additions & 3 deletions pyshacl/constraints/core/other_constraints.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def constraint_parameters(cls):
return [SH_in]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "InConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down Expand Up @@ -137,7 +137,7 @@ def constraint_parameters(cls):
return [SH_closed, SH_ignoredProperties]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "ClosedConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down Expand Up @@ -284,7 +284,7 @@ def constraint_parameters(cls):
return [SH_hasValue]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "HasValueConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down
8 changes: 4 additions & 4 deletions pyshacl/constraints/core/property_pair_constraints.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def constraint_parameters(cls):
return [SH_equals]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "EqualsConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down Expand Up @@ -177,7 +177,7 @@ def constraint_parameters(cls):
return [SH_disjoint]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "DisjointConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down Expand Up @@ -302,7 +302,7 @@ def constraint_parameters(cls):
return [SH_lessThan]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "LessThanConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down Expand Up @@ -453,7 +453,7 @@ def constraint_parameters(cls):
return [SH_lessThanOrEquals]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "LessThanOrEqualsConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down
6 changes: 3 additions & 3 deletions pyshacl/constraints/core/shape_based_constraints.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def constraint_parameters(cls):
return [SH_property]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "PropertyConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down Expand Up @@ -159,7 +159,7 @@ def constraint_parameters(cls):
return [SH_node]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "NodeConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down Expand Up @@ -320,7 +320,7 @@ def constraint_parameters(cls):
return [SH_qualifiedValueShape, SH_qualifiedMinCount, SH_qualifiedValueShapesDisjoint, SH_qualifiedMaxCount]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "QualifiedValueShapeConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down
12 changes: 6 additions & 6 deletions pyshacl/constraints/core/string_based_constraints.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def constraint_parameters(cls):
raise NotImplementedError()

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
raise NotImplementedError()

@classmethod
Expand Down Expand Up @@ -136,7 +136,7 @@ def constraint_parameters(cls):
return [SH_minLength]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "MinLengthConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down Expand Up @@ -216,7 +216,7 @@ def constraint_parameters(cls):
return [SH_maxLength]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "MaxLengthConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down Expand Up @@ -284,7 +284,7 @@ def constraint_parameters(cls):
return [SH_pattern]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "PatternConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down Expand Up @@ -362,7 +362,7 @@ def constraint_parameters(cls):
return [SH_languageIn]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "LanguageInConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down Expand Up @@ -456,7 +456,7 @@ def constraint_parameters(cls):
return [SH_uniqueLang]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "UniqueLangConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down
6 changes: 3 additions & 3 deletions pyshacl/constraints/core/value_constraints.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def constraint_parameters(cls):
return [SH_class]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "ClassConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[Literal]:
Expand Down Expand Up @@ -188,7 +188,7 @@ def constraint_parameters(cls):
return [SH_datatype]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "DatatypeConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[Literal]:
Expand Down Expand Up @@ -296,7 +296,7 @@ def constraint_parameters(cls):
return [SH_nodeKind]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "NodeKindConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[Literal]:
Expand Down
8 changes: 4 additions & 4 deletions pyshacl/constraints/core/value_range_constraints.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def constraint_parameters(cls):
return [SH_minExclusive]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "MinExclusiveConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down Expand Up @@ -139,7 +139,7 @@ def constraint_parameters(cls):
return [SH_minInclusive]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "MinInclusiveConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down Expand Up @@ -229,7 +229,7 @@ def constraint_parameters(cls):
return [SH_maxExclusive]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "MaxExclusiveConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down Expand Up @@ -319,7 +319,7 @@ def constraint_parameters(cls):
return [SH_maxInclusive]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "MaxInclusiveConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def constraint_parameters(cls):
return []

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "ConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[rdflib.Literal]:
Expand Down
2 changes: 1 addition & 1 deletion pyshacl/constraints/sparql/sparql_based_constraints.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def constraint_parameters(cls):
return [SH_sparql]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "SPARQLConstraintComponent"

def evaluate(
Expand Down
2 changes: 1 addition & 1 deletion pyshacl/extras/js/constraint.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def constraint_parameters(cls):
return [SH_js]

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "JSConstraint"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[Literal]:
Expand Down
2 changes: 1 addition & 1 deletion pyshacl/extras/js/constraint_component.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def constraint_parameters(cls):
return []

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "ConstraintComponent"

def make_generic_messages(self, datagraph: GraphLike, focus_node, value_node) -> List[Literal]:
Expand Down
2 changes: 1 addition & 1 deletion pyshacl/extras/js/target.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def constraint_parameters(cls):
return []

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "JSTargetType"

@classmethod
Expand Down
2 changes: 1 addition & 1 deletion pyshacl/target.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def constraint_parameters(cls):
return []

@classmethod
def constraint_name(cls):
def constraint_name(cls) -> str:
return "SPARQLTargetType"

@classmethod
Expand Down

0 comments on commit 4633704

Please sign in to comment.