moved classic client into its own subdirectory

Author: daniel-sanche

google/cloud/bigtable/__init__.py

@@ -1,25 +1,58 @@
-# Copyright 2015 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+import importlib
+import sys
+import warnings
 
-"""Google Cloud Bigtable API package."""
 
-from google.cloud.bigtable.client import Client
+_LEGACY_MODULE_NAMES = {
+     "app_profile",
+    "backup",
+    "batcher",
+    "client",
+    "cluster",
+    "column_family",
+    "encryption_info",
+    "enums",
+    "error",
+    "helpers",
+    "instance",
+    "policy",
+    "row_data",
+    "row_filters",
+    "row_merger",
+    "row_set",
+    "row",
+    "table",
+}
 
-from google.cloud.bigtable import gapic_version as package_version
+# Eagerly create aliases in sys.modules for full backward compatibility.
+# This is more robust than the lazy __getattr__ approach because it handles
+# direct submodule imports (e.g., `import google.cloud.bigtable.row_data`).
+for module_name in _LEGACY_MODULE_NAMES:
+    # Define the old and new module paths
+    old_path = f"google.cloud.bigtable.{module_name}"
+    new_path = f".classic.{module_name}"
 
-__version__: str
+    # Import the module from its new location
+    module = importlib.import_module(new_path, __name__)
 
-__version__ = package_version.__version__
+    # Inject the loaded module into sys.modules under its old path.
+    # This makes Python's import machinery find it automatically.
+    sys.modules[old_path] = module
 
-__all__ = ["__version__", "Client"]
+    # Attach the module as an attribute to the current package
+    setattr(sys.modules[__name__], module_name, module)
+
+# You can also issue a single, general warning that some modules were moved.
+warnings.warn(
+    (
+        "Several modules have been moved to the `google.cloud.bigtable.classic` "
+        "subpackage. The top-level aliases will be removed in a future version."
+    ),
+    DeprecationWarning,
+    stacklevel=2,
+)
+
+# previously exported classes
+from google.cloud.bigtable.classic.client import Client
+from . import gapic_version
+__version__ = gapic_version.__version__

google/cloud/bigtable/classic/__init__.py

@@ -0,0 +1,25 @@
+# Copyright 2015 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Google Cloud Bigtable API package."""
+
+from .client import Client
+
+from google.cloud.bigtable import gapic_version as package_version
+
+__version__: str
+
+__version__ = package_version.__version__
+
+__all__ = ["__version__", "Client"]

google/cloud/bigtable/app_profile.py …le/cloud/bigtable/classic/app_profile.pygoogle/cloud/bigtable/app_profile.py renamed to google/cloud/bigtable/classic/app_profile.py google/cloud/bigtable/app_profile.py renamed to google/cloud/bigtable/classic/app_profile.py

@@ -17,7 +17,7 @@
 
 import re
 
-from google.cloud.bigtable.enums import RoutingPolicyType
+from .enums import RoutingPolicyType
 from google.cloud.bigtable_admin_v2.types import instance
 from google.protobuf import field_mask_pb2
 from google.api_core.exceptions import NotFound

google/cloud/bigtable/backup.py google/cloud/bigtable/classic/backup.pygoogle/cloud/bigtable/backup.py renamed to google/cloud/bigtable/classic/backup.py

@@ -19,8 +19,8 @@
 from google.cloud._helpers import _datetime_to_pb_timestamp  # type: ignore
 from google.cloud.bigtable_admin_v2 import BigtableTableAdminClient
 from google.cloud.bigtable_admin_v2.types import table
-from google.cloud.bigtable.encryption_info import EncryptionInfo
-from google.cloud.bigtable.policy import Policy
+from .encryption_info import EncryptionInfo
+from .policy import Policy
 from google.cloud.exceptions import NotFound  # type: ignore
 from google.protobuf import field_mask_pb2
 

google/cloud/bigtable/batcher.py google/cloud/bigtable/classic/batcher.pygoogle/cloud/bigtable/batcher.py renamed to google/cloud/bigtable/classic/batcher.py

@@ -45,13 +45,13 @@
 )
 
 from google.cloud import bigtable
-from google.cloud.bigtable.instance import Instance
-from google.cloud.bigtable.cluster import Cluster
+from .instance import Instance
+from .cluster import Cluster
 
 from google.cloud.client import ClientWithProject  # type: ignore
 
 from google.cloud.bigtable_admin_v2.types import instance
-from google.cloud.bigtable.cluster import _CLUSTER_NAME_RE
+from .cluster import _CLUSTER_NAME_RE
 from google.cloud.environment_vars import BIGTABLE_EMULATOR  # type: ignore
 
 

google/cloud/bigtable/client.py google/cloud/bigtable/classic/client.pygoogle/cloud/bigtable/client.py renamed to google/cloud/bigtable/classic/client.py

@@ -14,7 +14,7 @@
 
 """Class for encryption info for tables and backups."""
 
-from google.cloud.bigtable.error import Status
+from .error import Status
 
 
 class EncryptionInfo: