From a3b7432abe6beb997949804ed37a6301207214b3 Mon Sep 17 00:00:00 2001 From: "linji.xue" Date: Mon, 21 Nov 2022 11:17:34 +0800 Subject: [PATCH] refactor: use "record" OpenAPI to replace the "data" OpenAPI --- graviti/manager/commit.py | 8 ++++---- graviti/manager/draft.py | 10 +++++----- graviti/manager/sheets.py | 4 ++-- graviti/operation/frame.py | 16 ++++++++-------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/graviti/manager/commit.py b/graviti/manager/commit.py index 43dc603a..23b76378 100644 --- a/graviti/manager/commit.py +++ b/graviti/manager/commit.py @@ -17,7 +17,7 @@ get_commit, get_commit_sheet, get_revision, - list_commit_data, + list_commit_records, list_commit_sheets, list_commits, ) @@ -92,9 +92,9 @@ def _load(self) -> None: def _repr_head(self) -> str: return f'{self.__class__.__name__}("{self.commit_id}")' - def _list_data(self, offset: int, limit: int, sheet_name: str) -> Dict[str, Any]: + def _list_records(self, offset: int, limit: int, sheet_name: str) -> Dict[str, Any]: _workspace = self._dataset.workspace - return list_commit_data( # type: ignore[no-any-return] + return list_commit_records( # type: ignore[no-any-return] _workspace.access_key, _workspace.url, _workspace.name, @@ -103,7 +103,7 @@ def _list_data(self, offset: int, limit: int, sheet_name: str) -> Dict[str, Any] sheet=sheet_name, offset=offset, limit=limit, - )["data"] + )["records"] def _list_sheets(self) -> Dict[str, Any]: if self.commit_id is None: diff --git a/graviti/manager/draft.py b/graviti/manager/draft.py index e048c440..05448c06 100644 --- a/graviti/manager/draft.py +++ b/graviti/manager/draft.py @@ -22,7 +22,7 @@ create_draft, get_draft, get_draft_sheet, - list_draft_data, + list_draft_records, list_draft_sheets, list_drafts, update_draft, @@ -95,9 +95,9 @@ def __init__( def _repr_head(self) -> str: return f'{self.__class__.__name__}("#{self.number}: {self.title}")' - def _list_data(self, offset: int, limit: int, sheet_name: str) -> Dict[str, Any]: + def _list_records(self, offset: int, limit: int, sheet_name: str) -> Dict[str, Any]: _workspace = self._dataset.workspace - return list_draft_data( # type: ignore[no-any-return] + return list_draft_records( # type: ignore[no-any-return] _workspace.access_key, _workspace.url, _workspace.name, @@ -106,7 +106,7 @@ def _list_data(self, offset: int, limit: int, sheet_name: str) -> Dict[str, Any] sheet=sheet_name, offset=offset, limit=limit, - )["data"] + )["records"] def _list_sheets(self) -> Dict[str, Any]: _workspace = self._dataset.workspace @@ -274,7 +274,7 @@ def upload(self, jobs: int = 8, quiet: bool = False) -> None: factory = LazyLowerCaseFactory( len(df), LIMIT, - partial(self._list_data, sheet_name=name), + partial(self._list_records, sheet_name=name), pa.struct([pa.field(RECORD_KEY, pa.string()), *patype]), ) df._refresh_data_from_factory( # pylint: disable=protected-access) diff --git a/graviti/manager/sheets.py b/graviti/manager/sheets.py index 1e52e504..53263c5f 100644 --- a/graviti/manager/sheets.py +++ b/graviti/manager/sheets.py @@ -76,7 +76,7 @@ def __delitem__(self, key: str) -> None: def __iter__(self) -> Iterator[str]: return self._get_data().__iter__() - def _list_data(self, offset: int, limit: int, sheet_name: str) -> Dict[str, Any]: + def _list_records(self, offset: int, limit: int, sheet_name: str) -> Dict[str, Any]: raise NotImplementedError def _list_sheets(self) -> Dict[str, Any]: @@ -94,7 +94,7 @@ def _init_dataframe(self, sheet_name: str) -> DataFrame: factory = LazyLowerCaseFactory( sheet["record_count"], LIMIT, - partial(self._list_data, sheet_name=sheet_name), + partial(self._list_records, sheet_name=sheet_name), pa.struct([pa.field(RECORD_KEY, pa.string()), *patype]), ) df = DataFrame._from_factory( # pylint: disable=protected-access diff --git a/graviti/operation/frame.py b/graviti/operation/frame.py index 5a1ab623..ea51b306 100644 --- a/graviti/operation/frame.py +++ b/graviti/operation/frame.py @@ -13,10 +13,10 @@ from graviti.file import File, FileBase, RemoteFile from graviti.openapi import ( RECORD_KEY, - add_data, + add_records, copy_objects, - delete_data, - update_data, + delete_records, + update_records, update_schema, ) from graviti.operation.common import get_schema @@ -155,14 +155,14 @@ def execute( _upload_files(local_files, dataset.object_permission_manager, file_pbar, jobs) _workspace = dataset.workspace - add_data( + add_records( _workspace.access_key, _workspace.url, _workspace.name, dataset.name, draft_number=draft_number, sheet=sheet, - data=batch.to_pylist(_to_backend=True), + records=batch.to_pylist(_to_backend=True), ) data_pbar.update(len(batch)) @@ -266,14 +266,14 @@ def execute( _upload_files(local_files, dataset.object_permission_manager, file_pbar, jobs) _workspace = dataset.workspace - update_data( + update_records( _workspace.access_key, _workspace.url, _workspace.name, dataset.name, draft_number=draft_number, sheet=sheet, - data=batch.to_pylist(_to_backend=True), + records=batch.to_pylist(_to_backend=True), ) data_pbar.update(len(batch)) @@ -311,7 +311,7 @@ def execute( # pylint: disable=unused-argument """ _workspace = dataset.workspace - delete_data( + delete_records( _workspace.access_key, _workspace.url, _workspace.name,