Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: better error messages for non-existent attributes #773

Merged
merged 2 commits into from
May 11, 2024
Merged

refactor: better error messages for non-existent attributes #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48c3de7
refactor: better error messages for non-existent attributes
szhorvat May 10, 2024
9800444
chore: update changelog
szhorvat May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# igraph Python interface changelog

### Changed

- Error messages issued when an attribute is not found now mention the name and type of that attribute.

## [0.11.5] - 2024-05-07

### Added
Expand Down
44 changes: 28 additions & 16 deletions src/_igraph/attributes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1683,12 +1683,13 @@ igraph_error_t igraphmodule_i_attribute_get_type(const igraph_t *graph,
int is_numeric, is_string, is_boolean;
Py_ssize_t i, j;
PyObject *o, *dict;
const char *attr_type_name;

switch (elemtype) {
case IGRAPH_ATTRIBUTE_GRAPH: attrnum = ATTRHASH_IDX_GRAPH; break;
case IGRAPH_ATTRIBUTE_VERTEX: attrnum = ATTRHASH_IDX_VERTEX; break;
case IGRAPH_ATTRIBUTE_EDGE: attrnum = ATTRHASH_IDX_EDGE; break;
default: IGRAPH_ERROR("No such attribute type", IGRAPH_EINVAL); break;
case IGRAPH_ATTRIBUTE_GRAPH: attrnum = ATTRHASH_IDX_GRAPH; attr_type_name = "graph"; break;
case IGRAPH_ATTRIBUTE_VERTEX: attrnum = ATTRHASH_IDX_VERTEX; attr_type_name = "vertex"; break;
case IGRAPH_ATTRIBUTE_EDGE: attrnum = ATTRHASH_IDX_EDGE; attr_type_name = "edge"; break;
default: IGRAPH_ERROR("No such attribute type.", IGRAPH_EINVAL); break;
}

/* Get the attribute dict */
Expand All @@ -1697,12 +1698,12 @@ igraph_error_t igraphmodule_i_attribute_get_type(const igraph_t *graph,
/* Check whether the attribute exists */
o = PyDict_GetItemString(dict, name);
if (o == 0) {
IGRAPH_ERROR("No such attribute", IGRAPH_EINVAL);
IGRAPH_ERRORF("No %s attribute named \"%s\" exists.", IGRAPH_EINVAL, attr_type_name, name);
}

/* Basic type check */
if (attrnum != ATTRHASH_IDX_GRAPH && !PyList_Check(o)) {
IGRAPH_ERROR("attribute hash type mismatch", IGRAPH_EINVAL);
IGRAPH_ERROR("Attribute hash type mismatch.", IGRAPH_EINVAL);
}

j = PyList_Size(o);
Expand Down Expand Up @@ -1765,7 +1766,7 @@ igraph_error_t igraphmodule_i_get_boolean_graph_attr(const igraph_t *graph,
attribute handler calls... hopefully :) Same applies for the other handlers. */
o = PyDict_GetItemString(dict, name);
if (!o) {
IGRAPH_ERROR("No such attribute", IGRAPH_EINVAL);
IGRAPH_ERRORF("No boolean graph attribute named \"%s\" exists.", IGRAPH_EINVAL, name);
}
IGRAPH_CHECK(igraph_vector_bool_resize(value, 1));
VECTOR(*value)[0] = PyObject_IsTrue(o);
Expand All @@ -1781,7 +1782,7 @@ igraph_error_t igraphmodule_i_get_numeric_graph_attr(const igraph_t *graph,
attribute handler calls... hopefully :) Same applies for the other handlers. */
o = PyDict_GetItemString(dict, name);
if (!o) {
IGRAPH_ERROR("No such attribute", IGRAPH_EINVAL);
IGRAPH_ERRORF("No numeric graph attribute named \"%s\" exists.", IGRAPH_EINVAL, name);
}
IGRAPH_CHECK(igraph_vector_resize(value, 1));
if (o == Py_None) {
Expand All @@ -1806,7 +1807,7 @@ igraph_error_t igraphmodule_i_get_string_graph_attr(const igraph_t *graph,
dict = ATTR_STRUCT_DICT(graph)[ATTRHASH_IDX_GRAPH];
o = PyDict_GetItemString(dict, name);
if (!o) {
IGRAPH_ERROR("No such attribute", IGRAPH_EINVAL);
IGRAPH_ERRORF("No string graph attribute named \"%s\" exists.", IGRAPH_EINVAL, name);
}
IGRAPH_CHECK(igraph_strvector_resize(value, 1));

Expand Down Expand Up @@ -1853,7 +1854,9 @@ igraph_error_t igraphmodule_i_get_numeric_vertex_attr(const igraph_t *graph,

dict = ATTR_STRUCT_DICT(graph)[ATTRHASH_IDX_VERTEX];
list = PyDict_GetItemString(dict, name);
if (!list) IGRAPH_ERROR("No such attribute", IGRAPH_EINVAL);
if (!list) {
IGRAPH_ERRORF("No numeric vertex attribute named \"%s\" exists.", IGRAPH_EINVAL, name);
}

if (igraph_vs_is_all(&vs)) {
if (igraphmodule_PyObject_float_to_vector_t(list, &newvalue))
Expand Down Expand Up @@ -1895,8 +1898,9 @@ igraph_error_t igraphmodule_i_get_string_vertex_attr(const igraph_t *graph,

dict = ATTR_STRUCT_DICT(graph)[ATTRHASH_IDX_VERTEX];
list = PyDict_GetItemString(dict, name);
if (!list)
IGRAPH_ERROR("No such attribute", IGRAPH_EINVAL);
if (!list) {
IGRAPH_ERRORF("No string vertex attribute named \"%s\" exists.", IGRAPH_EINVAL, name);
}

if (igraph_vs_is_all(&vs)) {
if (igraphmodule_PyList_to_strvector_t(list, &newvalue))
Expand Down Expand Up @@ -1949,7 +1953,9 @@ igraph_error_t igraphmodule_i_get_boolean_vertex_attr(const igraph_t *graph,

dict = ATTR_STRUCT_DICT(graph)[ATTRHASH_IDX_VERTEX];
list = PyDict_GetItemString(dict, name);
if (!list) IGRAPH_ERROR("No such attribute", IGRAPH_EINVAL);
if (!list) {
IGRAPH_ERRORF("No boolean vertex attribute named \"%s\" exists.", IGRAPH_EINVAL, name);
}

if (igraph_vs_is_all(&vs)) {
if (igraphmodule_PyObject_to_vector_bool_t(list, &newvalue))
Expand Down Expand Up @@ -1985,7 +1991,9 @@ igraph_error_t igraphmodule_i_get_numeric_edge_attr(const igraph_t *graph,

dict = ATTR_STRUCT_DICT(graph)[ATTRHASH_IDX_EDGE];
list = PyDict_GetItemString(dict, name);
if (!list) IGRAPH_ERROR("No such attribute", IGRAPH_EINVAL);
if (!list) {
IGRAPH_ERRORF("No numeric edge attribute named \"%s\" exists.", IGRAPH_EINVAL, name);
}

if (igraph_es_is_all(&es)) {
if (igraphmodule_PyObject_float_to_vector_t(list, &newvalue))
Expand Down Expand Up @@ -2025,7 +2033,9 @@ igraph_error_t igraphmodule_i_get_string_edge_attr(const igraph_t *graph,

dict = ATTR_STRUCT_DICT(graph)[ATTRHASH_IDX_EDGE];
list = PyDict_GetItemString(dict, name);
if (!list) IGRAPH_ERROR("No such attribute", IGRAPH_EINVAL);
if (!list) {
IGRAPH_ERRORF("No string edge attribute named \"%s\" exists.", IGRAPH_EINVAL, name);
}

if (igraph_es_is_all(&es)) {
if (igraphmodule_PyList_to_strvector_t(list, &newvalue))
Expand Down Expand Up @@ -2077,7 +2087,9 @@ igraph_error_t igraphmodule_i_get_boolean_edge_attr(const igraph_t *graph,

dict = ATTR_STRUCT_DICT(graph)[ATTRHASH_IDX_EDGE];
list = PyDict_GetItemString(dict, name);
if (!list) IGRAPH_ERROR("No such attribute", IGRAPH_EINVAL);
if (!list) {
IGRAPH_ERRORF("No boolean edge attribute named \"%s\" exists.", IGRAPH_EINVAL, name);
}

if (igraph_es_is_all(&es)) {
if (igraphmodule_PyObject_to_vector_bool_t(list, &newvalue))
Expand Down
Loading