Revert send_body() to accept protocol_version as parameter

Instead of setting msg.protocol_version externally and having send_body()
access it as an instance variable, revert to the more explicit pattern
of passing protocol_version as a parameter to send_body(). This makes
the dependency more explicit and easier to understand.

Changes:
- Updated all send_body(self, f) methods to send_body(self, f, protocol_version)
- Updated _write_query_params to accept and use protocol_version parameter
- Updated encode_message to pass protocol_version to send_body instead of setting it on message
- Updated all test files to pass protocol_version parameter to send_body
- Rebuilt C extensions to reflect the changes

Author: mykaul

.github/instructions/python.instructions.md

@@ -0,0 +1,56 @@
+---
+description: 'Python coding conventions and guidelines'
+applyTo: '**/*.py'
+---
+
+# Python Coding Conventions
+
+## Python Instructions
+
+- Write clear and concise comments for each function.
+- Ensure functions have descriptive names and include type hints.
+- Provide docstrings following PEP 257 conventions.
+- Use the `typing` module for type annotations (e.g., `List[str]`, `Dict[str, int]`).
+- Break down complex functions into smaller, more manageable functions.
+
+## General Instructions
+
+- Always prioritize readability and clarity.
+- For algorithm-related code, include explanations of the approach used.
+- Write code with good maintainability practices, including comments on why certain design decisions were made.
+- Handle edge cases and write clear exception handling.
+- For libraries or external dependencies, mention their usage and purpose in comments.
+- Use consistent naming conventions and follow language-specific best practices.
+- Write concise, efficient, and idiomatic code that is also easily understandable.
+
+## Code Style and Formatting
+
+- Follow the **PEP 8** style guide for Python.
+- Maintain proper indentation (use 4 spaces for each level of indentation).
+- Ensure lines do not exceed 79 characters.
+- Place function and class docstrings immediately after the `def` or `class` keyword.
+- Use blank lines to separate functions, classes, and code blocks where appropriate.
+
+## Edge Cases and Testing
+
+- Always include test cases for critical paths of the application.
+- Account for common edge cases like empty inputs, invalid data types, and large datasets.
+- Include comments for edge cases and the expected behavior in those cases.
+- Write unit tests for functions and document them with docstrings explaining the test cases.
+
+## Example of Proper Documentation
+
+```python
+def calculate_area(radius: float) -> float:
+    """
+    Calculate the area of a circle given the radius.
+    
+    Parameters:
+    radius (float): The radius of the circle.
+    
+    Returns:
+    float: The area of the circle, calculated as π * radius^2.
+    """
+    import math
+    return math.pi * radius ** 2
+```

cassandra/protocol.py

@@ -414,7 +414,7 @@ def __init__(self, cqlversion, options):
         self.cqlversion = cqlversion
         self.options = options
 
-    def send_body(self, f):
+    def send_body(self, f, protocol_version):
         optmap = self.options.copy()
         optmap['CQL_VERSION'] = self.cqlversion
         write_stringmap(f, optmap)
@@ -449,8 +449,8 @@ class CredentialsMessage(_MessageType):
     def __init__(self, creds):
         self.creds = creds
 
-    def send_body(self, f):
-        if self.protocol_version > 1:
+    def send_body(self, f, protocol_version):
+        if protocol_version > 1:
             raise UnsupportedOperation(
                 "Credentials-based authentication is not supported with "
                 "protocol version 2 or higher.  Use the SASL authentication "
@@ -480,7 +480,7 @@ class AuthResponseMessage(_MessageType):
     def __init__(self, response):
         self.response = response
 
-    def send_body(self, f):
+    def send_body(self, f, protocol_version):
         write_longstring(f, self.response)
 
 
@@ -500,7 +500,7 @@ class OptionsMessage(_MessageType):
     opcode = 0x05
     name = 'OPTIONS'
 
-    def send_body(self, f):
+    def send_body(self, f, protocol_version):
         pass
 
 
@@ -548,7 +548,7 @@ def __init__(self, query_params, consistency_level,
         self.skip_meta = skip_meta
         self.keyspace = keyspace
 
-    def _write_query_params(self, f):
+    def _write_query_params(self, f, protocol_version):
         write_consistency_level(f, self.consistency_level)
         flags = 0x00
         if self.query_params is not None:
@@ -567,14 +567,14 @@ def _write_query_params(self, f):
             flags |= _PROTOCOL_TIMESTAMP_FLAG
 
         if self.keyspace is not None:
-            if ProtocolVersion.uses_keyspace_flag(self.protocol_version):
+            if ProtocolVersion.uses_keyspace_flag(protocol_version):
                 flags |= _WITH_KEYSPACE_FLAG
             else:
                 raise UnsupportedOperation(
                     "Keyspaces may only be set on queries with protocol version "
                     "5 or DSE_V2 or higher. Consider setting Cluster.protocol_version.")
 
-        if ProtocolVersion.uses_int_query_flags(self.protocol_version):
+        if ProtocolVersion.uses_int_query_flags(protocol_version):
             write_uint(f, flags)
         else:
             write_byte(f, flags)
@@ -609,9 +609,9 @@ def __init__(self, query, consistency_level, serial_consistency_level=None,
         super(QueryMessage, self).__init__(None, consistency_level, serial_consistency_level, fetch_size,
                                            paging_state, timestamp, False, continuous_paging_options, keyspace)
 
-    def send_body(self, f):
+    def send_body(self, f, protocol_version):
         write_longstring(f, self.query)
-        self._write_query_params(f)
+        self._write_query_params(f, protocol_version)
 
 
 class ExecuteMessage(_QueryMessage):
@@ -627,14 +627,14 @@ def __init__(self, query_id, query_params, consistency_level,
         super(ExecuteMessage, self).__init__(query_params, consistency_level, serial_consistency_level, fetch_size,
                                              paging_state, timestamp, skip_meta, continuous_paging_options)
 
-    def _write_query_params(self, f):
-        super(ExecuteMessage, self)._write_query_params(f)
+    def _write_query_params(self, f, protocol_version):
+        super(ExecuteMessage, self)._write_query_params(f, protocol_version)
 
-    def send_body(self, f):
+    def send_body(self, f, protocol_version):
         write_string(f, self.query_id)
-        if ProtocolVersion.uses_prepared_metadata(self.protocol_version):
+        if ProtocolVersion.uses_prepared_metadata(protocol_version):
             write_string(f, self.result_metadata_id)
-        self._write_query_params(f)
+        self._write_query_params(f, protocol_version)
 
 
 CUSTOM_TYPE = object()
@@ -860,20 +860,20 @@ def __init__(self, query, keyspace=None):
         self.query = query
         self.keyspace = keyspace
 
-    def send_body(self, f):
+    def send_body(self, f, protocol_version):
         write_longstring(f, self.query)
 
         flags = 0x00
 
         if self.keyspace is not None:
-            if ProtocolVersion.uses_keyspace_flag(self.protocol_version):
+            if ProtocolVersion.uses_keyspace_flag(protocol_version):
                 flags |= _PREPARED_WITH_KEYSPACE_FLAG
             else:
                 raise UnsupportedOperation(
                     "Keyspaces may only be set on queries with protocol version "
                     "5 or DSE_V2 or higher. Consider setting Cluster.protocol_version.")
 
-        if ProtocolVersion.uses_prepare_flags(self.protocol_version):
+        if ProtocolVersion.uses_prepare_flags(protocol_version):
             write_uint(f, flags)
         else:
             # checks above should prevent this, but just to be safe...
@@ -883,9 +883,9 @@ def send_body(self, f):
                     "protocol version {pv}, which doesn't support flags"
                     "in prepared statements."
                     "Consider setting Cluster.protocol_version to 5 or DSE_V2."
-                    "".format(flags=flags, pv=self.protocol_version))
+                    "".format(flags=flags, pv=protocol_version))
 
-        if ProtocolVersion.uses_keyspace_flag(self.protocol_version):
+        if ProtocolVersion.uses_keyspace_flag(protocol_version):
             if self.keyspace:
                 write_string(f, self.keyspace)
 
@@ -904,7 +904,7 @@ def __init__(self, batch_type, queries, consistency_level,
         self.timestamp = timestamp
         self.keyspace = keyspace
 
-    def send_body(self, f):
+    def send_body(self, f, protocol_version):
         write_byte(f, self.batch_type.value)
         write_short(f, len(self.queries))
         for prepared, string_or_query_id, params in self.queries:
@@ -926,13 +926,13 @@ def send_body(self, f):
         if self.timestamp is not None:
             flags |= _PROTOCOL_TIMESTAMP_FLAG
         if self.keyspace:
-            if ProtocolVersion.uses_keyspace_flag(self.protocol_version):
+            if ProtocolVersion.uses_keyspace_flag(protocol_version):
                 flags |= _WITH_KEYSPACE_FLAG
             else:
                 raise UnsupportedOperation(
                     "Keyspaces may only be set on queries with protocol version "
                     "5 or higher. Consider setting Cluster.protocol_version to 5.")
-        if ProtocolVersion.uses_int_query_flags(self.protocol_version):
+        if ProtocolVersion.uses_int_query_flags(protocol_version):
             write_int(f, flags)
         else:
             write_byte(f, flags)
@@ -942,7 +942,7 @@ def send_body(self, f):
         if self.timestamp is not None:
             write_long(f, self.timestamp)
 
-        if ProtocolVersion.uses_keyspace_flag(self.protocol_version):
+        if ProtocolVersion.uses_keyspace_flag(protocol_version):
             if self.keyspace is not None:
                 write_string(f, self.keyspace)
 
@@ -962,7 +962,7 @@ class RegisterMessage(_MessageType):
     def __init__(self, event_list):
         self.event_list = event_list
 
-    def send_body(self, f):
+    def send_body(self, f, protocol_version):
         write_stringlist(f, self.event_list)
 
 
@@ -1038,7 +1038,7 @@ def __init__(self, op_type, op_id, next_pages=0):
         self.op_id = op_id
         self.next_pages = next_pages
 
-    def send_body(self, f):
+    def send_body(self, f, protocol_version):
         write_int(f, self.op_type)
         write_int(f, self.op_id)
         if self.op_type == ReviseRequestMessage.RevisionType.PAGING_BACKPRESSURE:
@@ -1087,8 +1087,7 @@ def encode_message(cls, msg, stream_id, protocol_version, compressor, allow_beta
                 raise UnsupportedOperation("Custom key/value payloads can only be used with protocol version 4 or higher")
             flags |= CUSTOM_PAYLOAD_FLAG
             write_bytesmap(body, msg.custom_payload)
-        msg.protocol_version = protocol_version
-        msg.send_body(body)
+        msg.send_body(body, protocol_version)
         body = body.getvalue()
 
         # With checksumming, the compression is done at the segment frame encoding

test_output.log

@@ -0,0 +1,63 @@
+/usr/lib/python3.14/site-packages/pytest_asyncio/plugin.py:211: PytestDeprecationWarning: The configuration option "asyncio_default_fixture_loop_scope" is unset.
+The event loop scope for asynchronous fixtures will default to the fixture caching scope. Future versions of pytest-asyncio will default the loop scope for asynchronous fixtures to function scope. Set the default fixture loop scope explicitly in order to avoid unexpected behavior in the future. Valid fixture loop scopes are: "function", "class", "module", "package", "session"
+
+  warnings.warn(PytestDeprecationWarning(_DEFAULT_FIXTURE_LOOP_SCOPE_UNSET))
+============================= test session starts ==============================
+platform linux -- Python 3.14.2, pytest-8.3.5, pluggy-1.6.0
+rootdir: /home/ykaul/github/python-driver
+configfile: pyproject.toml
+plugins: asyncio-1.1.0, anyio-4.11.0
+asyncio: mode=Mode.STRICT, asyncio_default_fixture_loop_scope=None, asyncio_default_test_loop_scope=function
+collected 646 items
+
+tests/unit/advanced/test_execution_profile.py ..                         [  0%]
+tests/unit/advanced/test_geometry.py .......ssss                         [  2%]
+tests/unit/advanced/test_graph.py .......................                [  5%]
+tests/unit/advanced/test_insights.py ................                    [  8%]
+tests/unit/advanced/test_metadata.py ............                        [  9%]
+tests/unit/advanced/test_policies.py ......                              [ 10%]
+tests/unit/column_encryption/test_policies.py sssssssssssssss            [ 13%]
+tests/unit/cqlengine/test_columns.py ..                                  [ 13%]
+tests/unit/cqlengine/test_connection.py ...                              [ 13%]
+tests/unit/cqlengine/test_udt.py .                                       [ 14%]
+tests/unit/cython/test_bytesio.py ss                                     [ 14%]
+tests/unit/cython/test_types.py ss                                       [ 14%]
+tests/unit/cython/test_utils.py s                                        [ 14%]
+tests/unit/io/test_asyncioreactor.py ss                                  [ 15%]
+tests/unit/io/test_asyncorereactor.py ssssssssssssssss                   [ 17%]
+tests/unit/io/test_eventletreactor.py ss                                 [ 17%]
+tests/unit/io/test_geventreactor.py ss                                   [ 18%]
+tests/unit/io/test_libevreactor.py sssssssssssssssss                     [ 20%]
+tests/unit/io/test_twistedreactor.py ssssssssss                          [ 22%]
+tests/unit/test_auth.py .                                                [ 22%]
+tests/unit/test_cluster.py ..........ss.sssssssssssssssss                [ 27%]
+tests/unit/test_concurrent.py .........                                  [ 28%]
+tests/unit/test_connection.py .........................                  [ 32%]
+tests/unit/test_control_connection.py ......................             [ 35%]
+tests/unit/test_endpoints.py ...                                         [ 36%]
+tests/unit/test_exception.py ..                                          [ 36%]
+tests/unit/test_host_connection_pool.py ..
+
+=============================== warnings summary ===============================
+tests/unit/advanced/test_insights.py::TestConfigAsDict::test_graph_options
+  /home/ykaul/github/python-driver/cassandra/datastax/graph/query.py:80: UserWarning: Unknown keyword argument received for GraphOptions: graph_invalid_option
+    warn("Unknown keyword argument received for GraphOptions: {0}".format(attr))
+
+tests/unit/advanced/test_policies.py::DSELoadBalancingPolicyTest::test_no_target
+tests/unit/advanced/test_policies.py::DSELoadBalancingPolicyTest::test_status_updates
+tests/unit/advanced/test_policies.py::DSELoadBalancingPolicyTest::test_target_host_down
+tests/unit/advanced/test_policies.py::DSELoadBalancingPolicyTest::test_target_host_nominal
+tests/unit/advanced/test_policies.py::DSELoadBalancingPolicyTest::test_target_no_host
+  /home/ykaul/github/python-driver/cassandra/policies.py:1377: DeprecationWarning: DSELoadBalancingPolicy will be removed in 4.0. Consider using DefaultLoadBalancingPolicy.
+    warnings.warn("DSELoadBalancingPolicy will be removed in 4.0. Consider using "
+
+tests/unit/test_concurrent.py: 815 warnings
+tests/unit/test_connection.py: 1 warning
+  /home/ykaul/github/python-driver/tests/unit/test_concurrent.py:105: DeprecationWarning: isSet() is deprecated, use is_set() instead
+    return self._stopper.isSet()
+
+-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! KeyboardInterrupt !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+/home/ykaul/github/python-driver/tests/unit/test_host_connection_pool.py:277: KeyboardInterrupt
+(to show a full traceback on KeyboardInterrupt use --full-trace)
+================ 147 passed, 92 skipped, 822 warnings in 16.98s ================

test_output_final.log

@@ -0,0 +1,62 @@
+/usr/lib/python3.14/site-packages/pytest_asyncio/plugin.py:211: PytestDeprecationWarning: The configuration option "asyncio_default_fixture_loop_scope" is unset.
+The event loop scope for asynchronous fixtures will default to the fixture caching scope. Future versions of pytest-asyncio will default the loop scope for asynchronous fixtures to function scope. Set the default fixture loop scope explicitly in order to avoid unexpected behavior in the future. Valid fixture loop scopes are: "function", "class", "module", "package", "session"
+
+  warnings.warn(PytestDeprecationWarning(_DEFAULT_FIXTURE_LOOP_SCOPE_UNSET))
+============================= test session starts ==============================
+platform linux -- Python 3.14.2, pytest-8.3.5, pluggy-1.6.0
+rootdir: /home/ykaul/github/python-driver
+configfile: pyproject.toml
+plugins: asyncio-1.1.0, anyio-4.11.0
+asyncio: mode=Mode.STRICT, asyncio_default_fixture_loop_scope=None, asyncio_default_test_loop_scope=function
+collected 646 items
+
+tests/unit/advanced/test_execution_profile.py ..                         [  0%]
+tests/unit/advanced/test_geometry.py .......ssss                         [  2%]
+tests/unit/advanced/test_graph.py .......................                [  5%]
+tests/unit/advanced/test_insights.py ................                    [  8%]
+tests/unit/advanced/test_metadata.py ............                        [  9%]
+tests/unit/advanced/test_policies.py ......                              [ 10%]
+tests/unit/column_encryption/test_policies.py sssssssssssssss            [ 13%]
+tests/unit/cqlengine/test_columns.py ..                                  [ 13%]
+tests/unit/cqlengine/test_connection.py ...                              [ 13%]
+tests/unit/cqlengine/test_udt.py .                                       [ 14%]
+tests/unit/cython/test_bytesio.py ss                                     [ 14%]
+tests/unit/cython/test_types.py ss                                       [ 14%]
+tests/unit/cython/test_utils.py s                                        [ 14%]
+tests/unit/io/test_asyncioreactor.py ss                                  [ 15%]
+tests/unit/io/test_asyncorereactor.py ssssssssssssssss                   [ 17%]
+tests/unit/io/test_eventletreactor.py ss                                 [ 17%]
+tests/unit/io/test_geventreactor.py ss                                   [ 18%]
+tests/unit/io/test_libevreactor.py sssssssssssssssss                     [ 20%]
+tests/unit/io/test_twistedreactor.py ssssssssss                          [ 22%]
+tests/unit/test_auth.py .                                                [ 22%]
+tests/unit/test_cluster.py ..........ss.sssssssssssssssss                [ 27%]
+tests/unit/test_concurrent.py .........                                  [ 28%]
+tests/unit/test_connection.py .........................                  [ 32%]
+tests/unit/test_control_connection.py ......................             [ 35%]
+tests/unit/test_endpoints.py ...                                         [ 36%]
+tests/unit/test_exception.py ..                                          [ 36%]
+tests/unit/test_host_connection_pool.py ..
+
+=============================== warnings summary ===============================
+tests/unit/advanced/test_insights.py::TestConfigAsDict::test_graph_options
+  /home/ykaul/github/python-driver/cassandra/datastax/graph/query.py:80: UserWarning: Unknown keyword argument received for GraphOptions: graph_invalid_option
+    warn("Unknown keyword argument received for GraphOptions: {0}".format(attr))
+
+tests/unit/advanced/test_policies.py::DSELoadBalancingPolicyTest::test_no_target
+tests/unit/advanced/test_policies.py::DSELoadBalancingPolicyTest::test_status_updates
+tests/unit/advanced/test_policies.py::DSELoadBalancingPolicyTest::test_target_host_down
+tests/unit/advanced/test_policies.py::DSELoadBalancingPolicyTest::test_target_host_nominal
+tests/unit/advanced/test_policies.py::DSELoadBalancingPolicyTest::test_target_no_host
+  /home/ykaul/github/python-driver/cassandra/policies.py:1377: DeprecationWarning: DSELoadBalancingPolicy will be removed in 4.0. Consider using DefaultLoadBalancingPolicy.
+    warnings.warn("DSELoadBalancingPolicy will be removed in 4.0. Consider using "
+
+tests/unit/test_concurrent.py: 816 warnings
+  /home/ykaul/github/python-driver/tests/unit/test_concurrent.py:105: DeprecationWarning: isSet() is deprecated, use is_set() instead
+    return self._stopper.isSet()
+
+-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! KeyboardInterrupt !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+/home/ykaul/github/python-driver/tests/unit/test_host_connection_pool.py:279: KeyboardInterrupt
+(to show a full traceback on KeyboardInterrupt use --full-trace)
+================ 147 passed, 92 skipped, 822 warnings in 11.34s ================