address gemini comments

Author: daniel-sanche

packages/google-cloud-bigtable/google/cloud/bigtable/helpers.py

@@ -48,10 +48,15 @@ def __init__(self, *args, **kwargs):
         super(_MappableAttributesMixin, self).__init__(*args, **new_kwargs)
 
     def __getattr__(self, name):
+        if name == "_attribute_map":
+            raise AttributeError
         if name not in self._attribute_map:
             raise AttributeError
         return getattr(self, self._attribute_map[name])
 
     def __setattr__(self, name, value):
+        if name == "_attribute_map":
+            super(_MappableAttributesMixin, self).__setattr__(name, value)
+            return
         attribute = self._attribute_map.get(name, name)
         super(_MappableAttributesMixin, self).__setattr__(attribute, value)

packages/google-cloud-bigtable/google/cloud/bigtable/row_set.py

@@ -186,6 +186,11 @@ def get_range_kwargs(self):
         """Convert row range object to dict which can be passed to
         google.bigtable.v2.RowRange add method.
         """
-        return {
-            descriptor.name: value for descriptor, value in self._pb._pb.ListFields()
-        }
+        range_kwargs = {}
+        if self.start_key is not None:
+            key = "start_key_closed" if self.start_is_inclusive else "start_key_open"
+            range_kwargs[key] = self.start_key
+        if self.end_key is not None:
+            key = "end_key_closed" if self.end_is_inclusive else "end_key_open"
+            range_kwargs[key] = self.end_key
+        return range_kwargs

packages/google-cloud-bigtable/tests/unit/v2_client/test_row_set.py

@@ -279,6 +279,68 @@ def test_row_range_get_range_kwargs_open_closed():
     assert expected_result == actual_result
 
 
+def test_row_range_get_range_kwargs_unbounded_start():
+    from google.cloud.bigtable.row_set import RowRange
+
+    end_key = b"row_key9"
+    expected_result = {"end_key_open": end_key}
+    row_range = RowRange(None, end_key)
+    actual_result = row_range.get_range_kwargs()
+    assert expected_result == actual_result
+
+
+def test_row_range_get_range_kwargs_unbounded_end():
+    from google.cloud.bigtable.row_set import RowRange
+
+    start_key = b"row_key1"
+    expected_result = {"start_key_closed": start_key}
+    row_range = RowRange(start_key, None)
+    actual_result = row_range.get_range_kwargs()
+    assert expected_result == actual_result
+
+
+def test_mappable_attributes_mixin_guard_recursion():
+    import pytest
+
+    from google.cloud.bigtable.helpers import _MappableAttributesMixin
+
+    class Uninitialized(_MappableAttributesMixin):
+        pass
+
+    obj = Uninitialized()
+    with pytest.raises(AttributeError):
+        _ = obj._attribute_map
+    with pytest.raises(AttributeError):
+        _ = obj.non_existent_attribute
+
+    # Verify setattr on _attribute_map doesn't cause recursion
+    obj._attribute_map = {"old_attr": "new_attr"}
+    assert obj._attribute_map == {"old_attr": "new_attr"}
+
+
+def test_mappable_attributes_mixin_remap():
+    import pytest
+
+    from google.cloud.bigtable.helpers import _MappableAttributesMixin
+
+    class DummyBase:
+        def __init__(self, target_attr=None):
+            self.target_attr = target_attr
+
+    class MappedClass(_MappableAttributesMixin, DummyBase):
+        _attribute_map = {"source_attr": "target_attr"}
+
+    instance = MappedClass(source_attr="hello")
+    assert instance.target_attr == "hello"
+    assert instance.source_attr == "hello"
+
+    instance.source_attr = "world"
+    assert instance.target_attr == "world"
+
+    with pytest.raises(AttributeError):
+        _ = instance.unknown_attr
+
+
 def _ReadRowsRequestPB(*args, **kw):
     from google.cloud.bigtable_v2.types import bigtable as messages_v2_pb2