Merge branch 'main' into refactor_refresh

Author: daniel-sanche

google/cloud/bigtable/data/mutations.py

@@ -123,6 +123,14 @@ def _from_dict(cls, input_dict: dict[str, Any]) -> Mutation:
                 instance = DeleteAllFromFamily(details["family_name"])
             elif "delete_from_row" in input_dict:
                 instance = DeleteAllFromRow()
+            elif "add_to_cell" in input_dict:
+                details = input_dict["add_to_cell"]
+                instance = AddToCell(
+                    details["family_name"],
+                    details["column_qualifier"]["raw_value"],
+                    details["input"]["int_value"],
+                    details["timestamp"]["raw_timestamp_micros"],
+                )
         except KeyError as e:
             raise ValueError("Invalid mutation dictionary") from e
         if instance is None:
@@ -276,6 +284,75 @@ def _to_dict(self) -> dict[str, Any]:
         }
 
 
+@dataclass
+class AddToCell(Mutation):
+    """
+    Adds an int64 value to an aggregate cell. The column family must be an
+    aggregate family and have an "int64" input type or this mutation will be
+    rejected.
+
+    Note: The timestamp values are in microseconds but must match the
+    granularity of the table (defaults to `MILLIS`). Therefore, the given value
+    must be a multiple of 1000 (millisecond granularity). For example:
+    `1571902339435000`.
+
+    Args:
+        family: The name of the column family to which the cell belongs.
+        qualifier: The column qualifier of the cell.
+        value: The value to be accumulated into the cell.
+        timestamp_micros: The timestamp of the cell. Must be provided for
+          cell aggregation to work correctly.
+
+
+    Raises:
+        TypeError: If `qualifier` is not `bytes` or `str`.
+        TypeError: If `value` is not `int`.
+        TypeError: If `timestamp_micros` is not `int`.
+        ValueError: If `value` is out of bounds for a 64-bit signed int.
+        ValueError: If `timestamp_micros` is less than 0.
+    """
+
+    def __init__(
+        self,
+        family: str,
+        qualifier: bytes | str,
+        value: int,
+        timestamp_micros: int,
+    ):
+        qualifier = qualifier.encode() if isinstance(qualifier, str) else qualifier
+        if not isinstance(qualifier, bytes):
+            raise TypeError("qualifier must be bytes or str")
+        if not isinstance(value, int):
+            raise TypeError("value must be int")
+        if not isinstance(timestamp_micros, int):
+            raise TypeError("timestamp_micros must be int")
+        if abs(value) > _MAX_INCREMENT_VALUE:
+            raise ValueError(
+                "int values must be between -2**63 and 2**63 (64-bit signed int)"
+            )
+
+        if timestamp_micros < 0:
+            raise ValueError("timestamp must be non-negative")
+
+        self.family = family
+        self.qualifier = qualifier
+        self.value = value
+        self.timestamp = timestamp_micros
+
+    def _to_dict(self) -> dict[str, Any]:
+        return {
+            "add_to_cell": {
+                "family_name": self.family,
+                "column_qualifier": {"raw_value": self.qualifier},
+                "timestamp": {"raw_timestamp_micros": self.timestamp},
+                "input": {"int_value": self.value},
+            }
+        }
+
+    def is_idempotent(self) -> bool:
+        return False
+
+
 class RowMutationEntry:
     """
     A single entry in a `MutateRows` request.

google/cloud/bigtable_admin/__init__.py

@@ -177,6 +177,12 @@
 from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import (
     CreateBackupRequest,
 )
+from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import (
+    CreateSchemaBundleMetadata,
+)
+from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import (
+    CreateSchemaBundleRequest,
+)
 from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import (
     CreateTableFromSnapshotMetadata,
 )
@@ -193,6 +199,9 @@
 from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import (
     DeleteBackupRequest,
 )
+from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import (
+    DeleteSchemaBundleRequest,
+)
 from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import (
     DeleteSnapshotRequest,
 )
@@ -210,6 +219,9 @@
     GetAuthorizedViewRequest,
 )
 from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import GetBackupRequest
+from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import (
+    GetSchemaBundleRequest,
+)
 from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import GetSnapshotRequest
 from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import GetTableRequest
 from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import (
@@ -222,6 +234,12 @@
 from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import (
     ListBackupsResponse,
 )
+from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import (
+    ListSchemaBundlesRequest,
+)
+from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import (
+    ListSchemaBundlesResponse,
+)
 from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import (
     ListSnapshotsRequest,
 )
@@ -266,6 +284,12 @@
 from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import (
     UpdateBackupRequest,
 )
+from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import (
+    UpdateSchemaBundleMetadata,
+)
+from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import (
+    UpdateSchemaBundleRequest,
+)
 from google.cloud.bigtable_admin_v2.types.bigtable_table_admin import (
     UpdateTableMetadata,
 )
@@ -287,7 +311,9 @@
 from google.cloud.bigtable_admin_v2.types.table import ColumnFamily
 from google.cloud.bigtable_admin_v2.types.table import EncryptionInfo
 from google.cloud.bigtable_admin_v2.types.table import GcRule
+from google.cloud.bigtable_admin_v2.types.table import ProtoSchema
 from google.cloud.bigtable_admin_v2.types.table import RestoreInfo
+from google.cloud.bigtable_admin_v2.types.table import SchemaBundle
 from google.cloud.bigtable_admin_v2.types.table import Snapshot
 from google.cloud.bigtable_admin_v2.types.table import Table
 from google.cloud.bigtable_admin_v2.types.table import RestoreSourceType
@@ -348,25 +374,31 @@
     "CreateAuthorizedViewRequest",
     "CreateBackupMetadata",
     "CreateBackupRequest",
+    "CreateSchemaBundleMetadata",
+    "CreateSchemaBundleRequest",
     "CreateTableFromSnapshotMetadata",
     "CreateTableFromSnapshotRequest",
     "CreateTableRequest",
     "DataBoostReadLocalWrites",
     "DeleteAuthorizedViewRequest",
     "DeleteBackupRequest",
+    "DeleteSchemaBundleRequest",
     "DeleteSnapshotRequest",
     "DeleteTableRequest",
     "DropRowRangeRequest",
     "GenerateConsistencyTokenRequest",
     "GenerateConsistencyTokenResponse",
     "GetAuthorizedViewRequest",
     "GetBackupRequest",
+    "GetSchemaBundleRequest",
     "GetSnapshotRequest",
     "GetTableRequest",
     "ListAuthorizedViewsRequest",
     "ListAuthorizedViewsResponse",
     "ListBackupsRequest",
     "ListBackupsResponse",
+    "ListSchemaBundlesRequest",
+    "ListSchemaBundlesResponse",
     "ListSnapshotsRequest",
     "ListSnapshotsResponse",
     "ListTablesRequest",
@@ -383,6 +415,8 @@
     "UpdateAuthorizedViewMetadata",
     "UpdateAuthorizedViewRequest",
     "UpdateBackupRequest",
+    "UpdateSchemaBundleMetadata",
+    "UpdateSchemaBundleRequest",
     "UpdateTableMetadata",
     "UpdateTableRequest",
     "OperationProgress",
@@ -402,7 +436,9 @@
     "ColumnFamily",
     "EncryptionInfo",
     "GcRule",
+    "ProtoSchema",
     "RestoreInfo",
+    "SchemaBundle",
     "Snapshot",
     "Table",
     "RestoreSourceType",

google/cloud/bigtable_admin_v2/__init__.py

@@ -73,25 +73,31 @@
 from .types.bigtable_table_admin import CreateAuthorizedViewRequest
 from .types.bigtable_table_admin import CreateBackupMetadata
 from .types.bigtable_table_admin import CreateBackupRequest
+from .types.bigtable_table_admin import CreateSchemaBundleMetadata
+from .types.bigtable_table_admin import CreateSchemaBundleRequest
 from .types.bigtable_table_admin import CreateTableFromSnapshotMetadata
 from .types.bigtable_table_admin import CreateTableFromSnapshotRequest
 from .types.bigtable_table_admin import CreateTableRequest
 from .types.bigtable_table_admin import DataBoostReadLocalWrites
 from .types.bigtable_table_admin import DeleteAuthorizedViewRequest
 from .types.bigtable_table_admin import DeleteBackupRequest
+from .types.bigtable_table_admin import DeleteSchemaBundleRequest
 from .types.bigtable_table_admin import DeleteSnapshotRequest
 from .types.bigtable_table_admin import DeleteTableRequest
 from .types.bigtable_table_admin import DropRowRangeRequest
 from .types.bigtable_table_admin import GenerateConsistencyTokenRequest
 from .types.bigtable_table_admin import GenerateConsistencyTokenResponse
 from .types.bigtable_table_admin import GetAuthorizedViewRequest
 from .types.bigtable_table_admin import GetBackupRequest
+from .types.bigtable_table_admin import GetSchemaBundleRequest
 from .types.bigtable_table_admin import GetSnapshotRequest
 from .types.bigtable_table_admin import GetTableRequest
 from .types.bigtable_table_admin import ListAuthorizedViewsRequest
 from .types.bigtable_table_admin import ListAuthorizedViewsResponse
 from .types.bigtable_table_admin import ListBackupsRequest
 from .types.bigtable_table_admin import ListBackupsResponse
+from .types.bigtable_table_admin import ListSchemaBundlesRequest
+from .types.bigtable_table_admin import ListSchemaBundlesResponse
 from .types.bigtable_table_admin import ListSnapshotsRequest
 from .types.bigtable_table_admin import ListSnapshotsResponse
 from .types.bigtable_table_admin import ListTablesRequest
@@ -108,6 +114,8 @@
 from .types.bigtable_table_admin import UpdateAuthorizedViewMetadata
 from .types.bigtable_table_admin import UpdateAuthorizedViewRequest
 from .types.bigtable_table_admin import UpdateBackupRequest
+from .types.bigtable_table_admin import UpdateSchemaBundleMetadata
+from .types.bigtable_table_admin import UpdateSchemaBundleRequest
 from .types.bigtable_table_admin import UpdateTableMetadata
 from .types.bigtable_table_admin import UpdateTableRequest
 from .types.common import OperationProgress
@@ -127,7 +135,9 @@
 from .types.table import ColumnFamily
 from .types.table import EncryptionInfo
 from .types.table import GcRule
+from .types.table import ProtoSchema
 from .types.table import RestoreInfo
+from .types.table import SchemaBundle
 from .types.table import Snapshot
 from .types.table import Table
 from .types.table import RestoreSourceType
@@ -164,6 +174,8 @@
     "CreateLogicalViewRequest",
     "CreateMaterializedViewMetadata",
     "CreateMaterializedViewRequest",
+    "CreateSchemaBundleMetadata",
+    "CreateSchemaBundleRequest",
     "CreateTableFromSnapshotMetadata",
     "CreateTableFromSnapshotRequest",
     "CreateTableRequest",
@@ -175,6 +187,7 @@
     "DeleteInstanceRequest",
     "DeleteLogicalViewRequest",
     "DeleteMaterializedViewRequest",
+    "DeleteSchemaBundleRequest",
     "DeleteSnapshotRequest",
     "DeleteTableRequest",
     "DropRowRangeRequest",
@@ -189,6 +202,7 @@
     "GetInstanceRequest",
     "GetLogicalViewRequest",
     "GetMaterializedViewRequest",
+    "GetSchemaBundleRequest",
     "GetSnapshotRequest",
     "GetTableRequest",
     "HotTablet",
@@ -209,6 +223,8 @@
     "ListLogicalViewsResponse",
     "ListMaterializedViewsRequest",
     "ListMaterializedViewsResponse",
+    "ListSchemaBundlesRequest",
+    "ListSchemaBundlesResponse",
     "ListSnapshotsRequest",
     "ListSnapshotsResponse",
     "ListTablesRequest",
@@ -221,10 +237,12 @@
     "PartialUpdateClusterMetadata",
     "PartialUpdateClusterRequest",
     "PartialUpdateInstanceRequest",
+    "ProtoSchema",
     "RestoreInfo",
     "RestoreSourceType",
     "RestoreTableMetadata",
     "RestoreTableRequest",
+    "SchemaBundle",
     "Snapshot",
     "SnapshotTableMetadata",
     "SnapshotTableRequest",
@@ -245,6 +263,8 @@
     "UpdateLogicalViewRequest",
     "UpdateMaterializedViewMetadata",
     "UpdateMaterializedViewRequest",
+    "UpdateSchemaBundleMetadata",
+    "UpdateSchemaBundleRequest",
     "UpdateTableMetadata",
     "UpdateTableRequest",
 )