Skip to content

Commit c55099f

Browse files
feat: implement row and cell model classes (#753)
1 parent 71b0312 commit c55099f

File tree

9 files changed

+1120
-145
lines changed

9 files changed

+1120
-145
lines changed

google/cloud/bigtable/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
from google.cloud.bigtable.client import Table
2323

2424
from google.cloud.bigtable.read_rows_query import ReadRowsQuery
25+
from google.cloud.bigtable.row import Row
26+
from google.cloud.bigtable.row import Cell
2527
from google.cloud.bigtable.read_rows_query import RowRange
26-
from google.cloud.bigtable.row_response import RowResponse
27-
from google.cloud.bigtable.row_response import CellResponse
2828

2929
from google.cloud.bigtable.mutations_batcher import MutationsBatcher
3030
from google.cloud.bigtable.mutations import Mutation
@@ -52,6 +52,6 @@
5252
"DeleteRangeFromColumn",
5353
"DeleteAllFromFamily",
5454
"DeleteAllFromRow",
55-
"RowResponse",
56-
"CellResponse",
55+
"Row",
56+
"Cell",
5757
)

google/cloud/bigtable/client.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
if TYPE_CHECKING:
2626
from google.cloud.bigtable.mutations import Mutation, BulkMutationsEntry
2727
from google.cloud.bigtable.mutations_batcher import MutationsBatcher
28-
from google.cloud.bigtable.row_response import RowResponse
28+
from google.cloud.bigtable.row import Row
2929
from google.cloud.bigtable.read_rows_query import ReadRowsQuery
3030
from google.cloud.bigtable import RowKeySamples
3131
from google.cloud.bigtable.row_filters import RowFilter
@@ -109,7 +109,7 @@ async def read_rows_stream(
109109
idle_timeout: int | float | None = 300,
110110
per_request_timeout: int | float | None = None,
111111
metadata: list[tuple[str, str]] | None = None,
112-
) -> AsyncIterable[RowResponse]:
112+
) -> AsyncIterable[Row]:
113113
"""
114114
Returns a generator to asynchronously stream back row data.
115115
@@ -166,7 +166,7 @@ async def read_rows(
166166
per_row_timeout: int | float | None = 10,
167167
per_request_timeout: int | float | None = None,
168168
metadata: list[tuple[str, str]] | None = None,
169-
) -> list[RowResponse]:
169+
) -> list[Row]:
170170
"""
171171
Helper function that returns a full list instead of a generator
172172
@@ -184,7 +184,7 @@ async def read_row(
184184
operation_timeout: int | float | None = 60,
185185
per_request_timeout: int | float | None = None,
186186
metadata: list[tuple[str, str]] | None = None,
187-
) -> RowResponse:
187+
) -> Row:
188188
"""
189189
Helper function to return a single row
190190
@@ -206,7 +206,7 @@ async def read_rows_sharded(
206206
idle_timeout: int | float | None = 300,
207207
per_request_timeout: int | float | None = None,
208208
metadata: list[tuple[str, str]] | None = None,
209-
) -> AsyncIterable[RowResponse]:
209+
) -> AsyncIterable[Row]:
210210
"""
211211
Runs a sharded query in parallel
212212
@@ -410,7 +410,7 @@ async def read_modify_write_row(
410410
*,
411411
operation_timeout: int | float | None = 60,
412412
metadata: list[tuple[str, str]] | None = None,
413-
) -> RowResponse:
413+
) -> Row:
414414
"""
415415
Reads and modifies a row atomically according to input ReadModifyWriteRules,
416416
and returns the contents of all modified cells
@@ -429,7 +429,7 @@ async def read_modify_write_row(
429429
Failed requests will not be retried.
430430
- metadata: Strings which should be sent along with the request as metadata headers.
431431
Returns:
432-
- RowResponse: containing cell data that was modified as part of the
432+
- Row: containing cell data that was modified as part of the
433433
operation
434434
Raises:
435435
- GoogleAPIError exceptions from grpc call

google/cloud/bigtable/mutations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from __future__ import annotations
1616

1717
from dataclasses import dataclass
18-
from google.cloud.bigtable.row_response import family_id, qualifier, row_key
18+
from google.cloud.bigtable.row import family_id, qualifier, row_key
1919

2020

2121
class Mutation:

google/cloud/bigtable/mutations_batcher.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from typing import TYPE_CHECKING
1919

2020
from google.cloud.bigtable.mutations import Mutation
21-
from google.cloud.bigtable.row_response import row_key
21+
from google.cloud.bigtable.row import row_key
2222
from google.cloud.bigtable.row_filters import RowFilter
2323

2424
if TYPE_CHECKING:

google/cloud/bigtable/read_modify_write_rules.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
from dataclasses import dataclass
1818

19-
from google.cloud.bigtable.row_response import family_id, qualifier
19+
from google.cloud.bigtable.row import family_id, qualifier
2020

2121

2222
class ReadModifyWriteRule:

google/cloud/bigtable/read_rows_query.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
from __future__ import annotations
1616
from typing import TYPE_CHECKING, Any
17-
from .row_response import row_key
17+
from .row import row_key
1818
from dataclasses import dataclass
1919
from google.cloud.bigtable.row_filters import RowFilter
2020

0 commit comments

Comments
 (0)