[CLIENT-3188] Fix unraisable exception warnings in Python 3.13 reported by tests by chaining hidden exceptions with the ones returned to user

.github/workflows/tests.yml

@@ -362,7 +362,7 @@ jobs:
         container-name: aerospike
 
     - name: Run tests
-      run: python -m pytest ./new_tests -vv
+      run: python -m pytest ./new_tests -vv -W error::pytest.PytestUnraisableExceptionWarning
       working-directory: test
 
   test-lowest-supported-server:
@@ -413,12 +413,12 @@ jobs:
 
     - uses: actions/setup-python@v2
       with:
-        python-version: ${{ env.LOWEST_SUPPORTED_PY_VERSION }}
+        python-version: "3.13"
         architecture: 'x64'
 
     - uses: actions/download-artifact@v4
       with:
-        name: wheel-${{ env.LOWEST_SUPPORTED_PY_VERSION }}
+        name: wheel-3.13
 
     - name: Install client
       run: pip install *.whl
@@ -433,7 +433,7 @@ jobs:
         docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }}
 
     - name: Run tests
-      run: python -m pytest ./new_tests/test_{mrt_functionality,admin_*}.py
+      run: python -m pytest ./new_tests/test_{mrt_functionality,admin_*,compress}.py -W error::pytest.PytestUnraisableExceptionWarning
       working-directory: test
 
     - name: Show logs if failed

src/include/conversions.h

@@ -232,9 +232,15 @@ PyObject *create_py_cluster_from_as_cluster(as_error *error_p,
 PyObject *create_py_node_from_as_node(as_error *error_p,
                                       struct as_node_s *node);
 
+// Checks if pyobject is an instance of a class type defined in aerospike_helpers or one of its submodules
+// If expected_submodule_name is NULL, the type is expected to be defined directly in the aerospike_helpers package
+// If is_subclass_instance is true, we expect the instance's type to directly inherit from aerospike_helpers.<expected_submodule_name>.<expected_type_name>
+// We need this method because classes defined natively in Python are heap-allocated types:
+// https://docs.python.org/3/c-api/typeobj.html#c.PyTypeObject.tp_name
 bool is_pyobj_correct_as_helpers_type(PyObject *obj,
                                       const char *expected_submodule_name,
-                                      const char *expected_type_name);
+                                      const char *expected_type_name,
+                                      bool is_subclass_instance);
 PyObject *create_class_instance_from_module(as_error *error_p,
                                             const char *module_name,
                                             const char *class_name,

src/include/exceptions.h

@@ -20,6 +20,9 @@
 
 PyObject *AerospikeException_New(void);
 void raise_exception(as_error *err);
+void raise_exception_base(as_error *err, PyObject *py_key, PyObject *py_bin,
+                          PyObject *py_module, PyObject *py_func,
+                          PyObject *py_name);
 PyObject *raise_exception_old(as_error *err);
 void remove_exception(as_error *err);
 void set_aerospike_exc_attrs_using_tuple_of_attrs(PyObject *py_exc,

src/main/client/apply.c

@@ -168,24 +168,8 @@ PyObject *AerospikeClient_Apply_Invoke(AerospikeClient *self, PyObject *py_key,
     as_val_destroy(result);
 
     if (err.code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(&err, &py_err);
-        PyObject *exception_type = raise_exception_old(&err);
-        set_aerospike_exc_attrs_using_tuple_of_attrs(exception_type, py_err);
-        if (PyObject_HasAttrString(exception_type, "key")) {
-            PyObject_SetAttrString(exception_type, "key", py_key);
-        }
-        if (PyObject_HasAttrString(exception_type, "bin")) {
-            PyObject_SetAttrString(exception_type, "bin", Py_None);
-        }
-        if (PyObject_HasAttrString(exception_type, "module")) {
-            PyObject_SetAttrString(exception_type, "module", py_module);
-        }
-        if (PyObject_HasAttrString(exception_type, "func")) {
-            PyObject_SetAttrString(exception_type, "func", py_function);
-        }
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
+        raise_exception_base(&err, py_key, Py_None, py_module, py_function,
+                             Py_None);
         return NULL;
     }
 

src/main/client/batch_write.c

@@ -166,17 +166,21 @@ static PyObject *AerospikeClient_BatchWriteInvoke(AerospikeClient *self,
         }
     }
 
-    // TODO check that py_object is an instance of class
+    if (!is_pyobj_correct_as_helpers_type(py_obj, "batch.records",
+                                          "BatchRecords", false)) {
+        as_error_update(err, AEROSPIKE_ERR_PARAM,
+                        "batch_records must be an "
+                        "aerospike_helpers.batch.records.BatchRecords "
+                        "instance");
+        goto CLEANUP4;
+    }
 
     py_batch_records = PyObject_GetAttrString(py_obj, FIELD_NAME_BATCH_RECORDS);
     if (py_batch_records == NULL || !PyList_Check(py_batch_records)) {
         as_error_update(err, AEROSPIKE_ERR_PARAM,
                         "%s must be a list of BatchRecord",
                         FIELD_NAME_BATCH_RECORDS);
-        if (py_batch_records) {
-            Py_DECREF(py_batch_records);
-        }
-        goto CLEANUP4;
+        goto CLEANUP3;
     }
 
     py_batch_records_size = PyList_Size(py_batch_records);
@@ -193,13 +197,20 @@ static PyObject *AerospikeClient_BatchWriteInvoke(AerospikeClient *self,
     for (Py_ssize_t i = 0; i < py_batch_records_size; i++) {
         garbage *garb = as_vector_get(&garbage_list, i);
         PyObject *py_batch_record = PyList_GetItem(py_batch_records, i);
-        // TODO check that this is an instance/subclass on BatchRecord
         if (py_batch_record == NULL) {
             as_error_update(
                 err, AEROSPIKE_ERR_PARAM,
                 "py_batch_record is NULL, %s must be a list of BatchRecord",
                 FIELD_NAME_BATCH_RECORDS);
-            goto CLEANUP4;
+            goto CLEANUP3;
+        }
+
+        if (is_pyobj_correct_as_helpers_type(py_batch_record, "batch.records",
+                                             "BatchRecord", true) == false) {
+            as_error_update(
+                err, AEROSPIKE_ERR_PARAM,
+                "batch_record must be a BatchRecord class instance");
+            goto CLEANUP3;
         }
 
         // extract as_batch_base_record fields

src/main/client/exists.c

@@ -136,18 +136,7 @@ extern PyObject *AerospikeClient_Exists_Invoke(AerospikeClient *self,
     }
 
     if (err.code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(&err, &py_err);
-        PyObject *exception_type = raise_exception_old(&err);
-        set_aerospike_exc_attrs_using_tuple_of_attrs(exception_type, py_err);
-        if (PyObject_HasAttrString(exception_type, "key")) {
-            PyObject_SetAttrString(exception_type, "key", py_key);
-        }
-        if (PyObject_HasAttrString(exception_type, "bin")) {
-            PyObject_SetAttrString(exception_type, "bin", Py_None);
-        }
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
+        raise_exception_base(&err, py_key, Py_None, Py_None, Py_None, Py_None);
     }
 
     return py_result;

src/main/client/get.c

@@ -133,18 +133,7 @@ PyObject *AerospikeClient_Get_Invoke(AerospikeClient *self, PyObject *py_key,
     }
 
     if (err.code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(&err, &py_err);
-        PyObject *exception_type = raise_exception_old(&err);
-        set_aerospike_exc_attrs_using_tuple_of_attrs(exception_type, py_err);
-        if (PyObject_HasAttrString(exception_type, "key")) {
-            PyObject_SetAttrString(exception_type, "key", py_key);
-        }
-        if (PyObject_HasAttrString(exception_type, "bin")) {
-            PyObject_SetAttrString(exception_type, "bin", Py_None);
-        }
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
+        raise_exception_base(&err, py_key, Py_None, Py_None, Py_None, Py_None);
         return NULL;
     }
 

src/main/client/info.c

@@ -96,22 +96,12 @@ static bool AerospikeClient_InfoAll_each(as_error *err, const as_node *node,
 
 CLEANUP:
     if (udata_ptr->error.code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(&udata_ptr->error, &py_err);
-        PyObject *exception_type = raise_exception_old(&udata_ptr->error);
-        set_aerospike_exc_attrs_using_tuple_of_attrs(exception_type, py_err);
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
+        raise_exception(&udata_ptr->error);
         PyGILState_Release(gil_state);
         return false;
     }
     if (err->code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(err, &py_err);
-        PyObject *exception_type = raise_exception_old(err);
-        set_aerospike_exc_attrs_using_tuple_of_attrs(exception_type, py_err);
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
+        raise_exception(err);
         PyGILState_Release(gil_state);
         return false;
     }
@@ -211,13 +201,7 @@ static PyObject *AerospikeClient_InfoAll_Invoke(AerospikeClient *self,
         Py_DECREF(py_ustr);
     }
     if (info_callback_udata.error.code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(&info_callback_udata.error, &py_err);
-        PyObject *exception_type =
-            raise_exception_old(&info_callback_udata.error);
-        set_aerospike_exc_attrs_using_tuple_of_attrs(exception_type, py_err);
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
+        raise_exception(&info_callback_udata.error);
         if (py_nodes) {
             Py_DECREF(py_nodes);
         }

src/main/client/operate.c

@@ -76,18 +76,7 @@ static inline bool isExprOp(int op);
 
 #define EXCEPTION_ON_ERROR()                                                   \
     if (err.code != AEROSPIKE_OK) {                                            \
-        PyObject *py_err = NULL;                                               \
-        error_to_pyobject(&err, &py_err);                                      \
-        PyObject *exception_type = raise_exception_old(&err);                  \
-        set_aerospike_exc_attrs_using_tuple_of_attrs(exception_type, py_err);  \
-        if (PyObject_HasAttrString(exception_type, "key")) {                   \
-            PyObject_SetAttrString(exception_type, "key", py_key);             \
-        }                                                                      \
-        if (PyObject_HasAttrString(exception_type, "bin")) {                   \
-            PyObject_SetAttrString(exception_type, "bin", py_bin);             \
-        }                                                                      \
-        PyErr_SetObject(exception_type, py_err);                               \
-        Py_DECREF(py_err);                                                     \
+        raise_exception_base(&err, py_key, py_bin, Py_None, Py_None, Py_None); \
         return NULL;                                                           \
     }
 
@@ -1211,15 +1200,7 @@ PyObject *AerospikeClient_OperateOrdered(AerospikeClient *self, PyObject *args,
 
 CLEANUP:
     if (err.code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(&err, &py_err);
-        PyObject *exception_type = raise_exception_old(&err);
-        set_aerospike_exc_attrs_using_tuple_of_attrs(exception_type, py_err);
-        if (PyObject_HasAttrString(exception_type, "key")) {
-            PyObject_SetAttrString(exception_type, "key", py_key);
-        }
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
+        raise_exception_base(&err, py_key, Py_None, Py_None, Py_None, Py_None);
         return NULL;
     }
     return py_result;

src/main/client/put.c

@@ -130,18 +130,7 @@ PyObject *AerospikeClient_Put_Invoke(AerospikeClient *self, PyObject *py_key,
 
     // If an error occurred, tell Python.
     if (err.code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(&err, &py_err);
-        PyObject *exception_type = raise_exception_old(&err);
-        set_aerospike_exc_attrs_using_tuple_of_attrs(exception_type, py_err);
-        if (PyObject_HasAttrString(exception_type, "key")) {
-            PyObject_SetAttrString(exception_type, "key", py_key);
-        }
-        if (PyObject_HasAttrString(exception_type, "bin")) {
-            PyObject_SetAttrString(exception_type, "bin", py_bins);
-        }
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
+        raise_exception_base(&err, py_key, py_bins, Py_None, Py_None, Py_None);
         return NULL;
     }
 

src/main/client/query.c

@@ -376,23 +376,40 @@ static PyObject *AerospikeClient_QueryApply_Invoke(
         }
 
         PyObject *py_op = PyTuple_GetItem(py_predicate, 0);
-        PyObject *py_op_data = PyTuple_GetItem(py_predicate, 1);
+        if (!py_op) {
+            as_error_update(&err, AEROSPIKE_ERR_CLIENT,
+                            "Failed to get predicate elements");
+            goto CLEANUP;
+        }
 
-        if (!py_op || !py_op_data) {
+        PyObject *py_op_data = PyTuple_GetItem(py_predicate, 1);
+        if (!py_op_data) {
             as_error_update(&err, AEROSPIKE_ERR_CLIENT,
                             "Failed to get predicate elements");
             goto CLEANUP;
         }
-        if (!PyLong_Check(py_op_data)) {
+        else if (!PyLong_Check(py_op_data)) {
             as_error_update(&err, AEROSPIKE_ERR_PARAM, "Invalid Predicate");
             goto CLEANUP;
         }
 
-        as_predicate_type op = (as_predicate_type)PyLong_AsLong(py_op);
+        long op = PyLong_AsLong(py_op);
+        if (op == -1 && PyErr_Occurred()) {
+            as_error_update(&err, AEROSPIKE_ERR_PARAM,
+                            "unknown predicate type");
+            goto CLEANUP;
+        }
+
         as_index_datatype op_data =
             (as_index_datatype)PyLong_AsLong(py_op_data);
+        if (op == -1 && PyErr_Occurred()) {
+            as_error_update(&err, AEROSPIKE_ERR_PARAM,
+                            "unknown index data type");
+            goto CLEANUP;
+        }
+
         rc = query_where_add(
-            &query_ptr, op, op_data,
+            &query_ptr, (as_predicate_type)op, op_data,
             size > 2 ? PyTuple_GetItem(py_predicate, 2) : Py_None,
             size > 3 ? PyTuple_GetItem(py_predicate, 3) : Py_None,
             size > 4 ? PyTuple_GetItem(py_predicate, 4) : Py_None,

src/main/client/remove.c

@@ -133,18 +133,7 @@ PyObject *AerospikeClient_Remove_Invoke(AerospikeClient *self, PyObject *py_key,
     }
 
     if (err.code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(&err, &py_err);
-        PyObject *exception_type = raise_exception_old(&err);
-        set_aerospike_exc_attrs_using_tuple_of_attrs(exception_type, py_err);
-        if (PyObject_HasAttrString(exception_type, "key")) {
-            PyObject_SetAttrString(exception_type, "key", py_key);
-        }
-        if (PyObject_HasAttrString(exception_type, "bin")) {
-            PyObject_SetAttrString(exception_type, "bin", Py_None);
-        }
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
+        raise_exception_base(&err, py_key, Py_None, Py_None, Py_None, Py_None);
         return NULL;
     }
 

src/main/client/remove_bin.c

@@ -160,18 +160,7 @@ AerospikeClient_RemoveBin_Invoke(AerospikeClient *self, PyObject *py_key,
     }
 
     if (err->code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(err, &py_err);
-        PyObject *exception_type = raise_exception_old(err);
-        set_aerospike_exc_attrs_using_tuple_of_attrs(exception_type, py_err);
-        if (PyObject_HasAttrString(exception_type, "key")) {
-            PyObject_SetAttrString(exception_type, "key", py_key);
-        }
-        if (PyObject_HasAttrString(exception_type, "bin")) {
-            PyObject_SetAttrString(exception_type, "bin", Py_None);
-        }
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
+        raise_exception_base(err, py_key, Py_None, Py_None, Py_None, Py_None);
         return NULL;
     }
     return PyLong_FromLong(0);
@@ -197,7 +186,6 @@ PyObject *AerospikeClient_RemoveBin(AerospikeClient *self, PyObject *args,
     PyObject *py_key = NULL;
     PyObject *py_policy = NULL;
     PyObject *py_binList = NULL;
-    PyObject *py_result = NULL;
     PyObject *py_meta = NULL;
 
     as_error err;
@@ -236,20 +224,6 @@ PyObject *AerospikeClient_RemoveBin(AerospikeClient *self, PyObject *args,
 
 CLEANUP:
 
-    if (err.code != AEROSPIKE_OK || !py_result) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(&err, &py_err);
-        PyObject *exception_type = raise_exception_old(&err);
-        set_aerospike_exc_attrs_using_tuple_of_attrs(exception_type, py_err);
-        if (PyObject_HasAttrString(exception_type, "key")) {
-            PyObject_SetAttrString(exception_type, "key", py_key);
-        }
-        if (PyObject_HasAttrString(exception_type, "bin")) {
-            PyObject_SetAttrString(exception_type, "bin", Py_None);
-        }
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
-        return NULL;
-    }
+    raise_exception_base(&err, py_key, Py_None, Py_None, Py_None, Py_None);
     return NULL;
 }