remove contexts and correct lint

Author: nidhiii-27

packages/google-cloud-storage/google/cloud/storage/_grpc_conversions.py

@@ -44,16 +44,14 @@ def blob_to_proto(blob):
         if value is not None:
             resource_params[proto_field] = value
 
-    # custom_time (field 26): google.protobuf.Timestamp
     custom_time = getattr(blob, "custom_time", None)
     if custom_time is not None:
         custom_time_proto = timestamp_pb2.Timestamp()
         custom_time_proto.FromDatetime(custom_time)
         resource_params["custom_time"] = custom_time_proto
 
-    # acl (field 10): repeated ObjectAccessControl
     acl = getattr(blob, "acl", None)
-    if acl is not None and getattr(acl, "loaded", False):
+    if acl:
         acl_entries = []
         for entry in acl:
             acl_entries.append(
@@ -65,23 +63,6 @@ def blob_to_proto(blob):
         if acl_entries:
             resource_params["acl"] = acl_entries
 
-    # contexts (field 38): ObjectContexts
-    contexts = getattr(blob, "contexts", None)
-    if contexts is not None:
-        custom_map = {}
-        # contexts is expected to be a dict of key-value pairs
-        if isinstance(contexts, dict):
-            for k, v in contexts.items():
-                if isinstance(v, str):
-                    payload = _storage_v2.ObjectCustomContextPayload(value=v)
-                else:
-                    payload = v
-                custom_map[k] = payload
-
-        if custom_map:
-            resource_params["contexts"] = _storage_v2.ObjectContexts(custom=custom_map)
-
-    # retention (field 30): Object.Retention
     retention = getattr(blob, "retention", None)
     if retention:
         mode_str = retention.get("mode")

packages/google-cloud-storage/tests/unit/asyncio/test_async_write_object_stream.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import datetime
 import unittest.mock as mock
 from unittest.mock import AsyncMock, MagicMock
 
@@ -170,17 +171,33 @@ async def test_open_new_object_with_blob_sync_attrs(
         mock_blob.bucket = mock_bucket
         mock_blob.content_type = "text/plain"
         mock_blob.metadata = {"test-key": "test-value"}
-        mock_blob.kms_key_name = None
-        mock_blob.cache_control = None
-        mock_blob.content_disposition = None
-        mock_blob.content_encoding = None
-        mock_blob.content_language = None
-        mock_blob.temporary_hold = None
-        mock_blob.event_based_hold = None
-        mock_blob.custom_time = None
-        mock_blob.acl = None
-        mock_blob.retention = None
-        mock_blob.contexts = None
+        mock_blob.kms_key_name = "kms-key-name"
+        mock_blob.cache_control = "cache-control"
+        mock_blob.content_disposition = "content-disposition"
+        mock_blob.content_encoding = "content-encoding"
+        mock_blob.content_language = "content-language"
+        mock_blob.temporary_hold = True
+        mock_blob.event_based_hold = True
+
+        custom_time = datetime.datetime(
+            2025, 1, 1, 12, 0, 0, tzinfo=datetime.timezone.utc
+        )
+        mock_blob.custom_time = custom_time
+
+        acl_mock = MagicMock()
+        acl_mock.loaded = True
+        acl_mock.__iter__.return_value = iter(
+            [{"role": "READER", "entity": "allUsers"}]
+        )
+        mock_blob.acl = acl_mock
+
+        retain_until_time = datetime.datetime(
+            2026, 1, 1, 12, 0, 0, tzinfo=datetime.timezone.utc
+        )
+        mock_blob.retention = {
+            "mode": "Locked",
+            "retain_until_time": retain_until_time,
+        }
 
         stream = _AsyncWriteObjectStream(mock_client, BUCKET, OBJECT, blob=mock_blob)
         await stream.open()
@@ -191,6 +208,24 @@ async def test_open_new_object_with_blob_sync_attrs(
 
         assert resource.content_type == "text/plain"
         assert resource.metadata == {"test-key": "test-value"}
+        assert resource.kms_key == "kms-key-name"
+        assert resource.cache_control == "cache-control"
+        assert resource.content_disposition == "content-disposition"
+        assert resource.content_encoding == "content-encoding"
+        assert resource.content_language == "content-language"
+        assert resource.temporary_hold is True
+        assert resource.event_based_hold is True
+
+        assert int(resource.custom_time.timestamp()) == int(custom_time.timestamp())
+
+        assert len(resource.acl) == 1
+        assert resource.acl[0].role == "READER"
+        assert resource.acl[0].entity == "allUsers"
+
+        assert resource.retention.mode == _storage_v2.Object.Retention.Mode.LOCKED
+        assert int(resource.retention.retain_until_time.timestamp()) == int(
+            retain_until_time.timestamp()
+        )
 
     @pytest.mark.asyncio
     async def test_open_already_open_raises(self, mock_client):

packages/google-cloud-storage/tests/unit/test__grpc_conversions.py

@@ -21,7 +21,24 @@
 
 
 def test_blob_to_proto_simple_fields():
-    blob = mock.Mock(spec=["name", "bucket", "content_type", "metadata", "kms_key_name", "cache_control", "content_disposition", "content_encoding", "content_language", "temporary_hold", "event_based_hold", "custom_time", "acl", "retention", "contexts"])
+    blob = mock.Mock(
+        spec=[
+            "name",
+            "bucket",
+            "content_type",
+            "metadata",
+            "kms_key_name",
+            "cache_control",
+            "content_disposition",
+            "content_encoding",
+            "content_language",
+            "temporary_hold",
+            "event_based_hold",
+            "custom_time",
+            "acl",
+            "retention",
+        ]
+    )
     blob.name = "blob-name"
     blob.bucket.name = "bucket-name"
     blob.content_type = "text/plain"
@@ -36,7 +53,6 @@ def test_blob_to_proto_simple_fields():
     blob.custom_time = None
     blob.acl = None
     blob.retention = None
-    blob.contexts = None
 
     proto = _grpc_conversions.blob_to_proto(blob)
 
@@ -54,13 +70,14 @@ def test_blob_to_proto_simple_fields():
 
 
 def test_blob_to_proto_custom_time():
-    blob = mock.Mock(spec=["name", "bucket", "custom_time", "acl", "retention", "contexts"])
+    blob = mock.Mock(spec=["name", "bucket", "custom_time", "acl", "retention"])
     blob.name = "blob-name"
     blob.bucket.name = "bucket-name"
-    blob.custom_time = datetime.datetime(2025, 1, 1, 12, 0, 0, tzinfo=datetime.timezone.utc)
+    blob.custom_time = datetime.datetime(
+        2025, 1, 1, 12, 0, 0, tzinfo=datetime.timezone.utc
+    )
     blob.acl = None
     blob.retention = None
-    blob.contexts = None
     # ensure other fields don't cause issues if missing
     for attr in _grpc_conversions._BLOB_ATTR_TO_PROTO_FIELD:
         setattr(blob, attr, None)
@@ -71,21 +88,22 @@ def test_blob_to_proto_custom_time():
 
 
 def test_blob_to_proto_acl():
-    blob = mock.Mock(spec=["name", "bucket", "acl", "custom_time", "retention", "contexts"])
+    blob = mock.Mock(spec=["name", "bucket", "acl", "custom_time", "retention"])
     blob.name = "blob-name"
     blob.bucket.name = "bucket-name"
 
     acl_mock = mock.MagicMock()
     acl_mock.loaded = True
-    acl_mock.__iter__.return_value = iter([
-        {"role": "READER", "entity": "allUsers"},
-        {"role": "OWNER", "entity": "user-123"},
-    ])
+    acl_mock.__iter__.return_value = iter(
+        [
+            {"role": "READER", "entity": "allUsers"},
+            {"role": "OWNER", "entity": "user-123"},
+        ]
+    )
     blob.acl = acl_mock
 
     blob.custom_time = None
     blob.retention = None
-    blob.contexts = None
     for attr in _grpc_conversions._BLOB_ATTR_TO_PROTO_FIELD:
         setattr(blob, attr, None)
 
@@ -98,42 +116,22 @@ def test_blob_to_proto_acl():
     assert proto.acl[1].entity == "user-123"
 
 
-def test_blob_to_proto_contexts():
-    blob = mock.Mock(spec=["name", "bucket", "contexts", "custom_time", "acl", "retention"])
-    blob.name = "blob-name"
-    blob.bucket.name = "bucket-name"
-    blob.contexts = {"c1": "v1", "c2": "v2"}
-    blob.custom_time = None
-    blob.acl = None
-    blob.retention = None
-    for attr in _grpc_conversions._BLOB_ATTR_TO_PROTO_FIELD:
-        setattr(blob, attr, None)
-
-    proto = _grpc_conversions.blob_to_proto(blob)
-
-    assert len(proto.contexts.custom) == 2
-    contexts_dict = {k: v.value for k, v in proto.contexts.custom.items()}
-    assert contexts_dict == {"c1": "v1", "c2": "v2"}
-
-
 def test_blob_to_proto_retention():
-    blob = mock.Mock(spec=["name", "bucket", "retention", "custom_time", "acl", "contexts"])
+    blob = mock.Mock(spec=["name", "bucket", "retention", "custom_time", "acl"])
     blob.name = "blob-name"
     blob.bucket.name = "bucket-name"
 
     retain_until_time = datetime.datetime(2026, 1, 1, tzinfo=datetime.timezone.utc)
-    blob.retention = {
-        "mode": "Locked",
-        "retain_until_time": retain_until_time
-    }
+    blob.retention = {"mode": "Locked", "retain_until_time": retain_until_time}
 
     blob.custom_time = None
     blob.acl = None
-    blob.contexts = None
     for attr in _grpc_conversions._BLOB_ATTR_TO_PROTO_FIELD:
         setattr(blob, attr, None)
 
     proto = _grpc_conversions.blob_to_proto(blob)
 
     assert proto.retention.mode == _storage_v2.Object.Retention.Mode.LOCKED
-    assert int(proto.retention.retain_until_time.timestamp()) == int(retain_until_time.timestamp())
+    assert int(proto.retention.retain_until_time.timestamp()) == int(
+        retain_until_time.timestamp()
+    )