chore(enhancement): fix Python Client CI / build job

Author: binarycat0

client/python/.gitignore

@@ -64,6 +64,3 @@ target/
 
 #Ipython Notebook
 .ipynb_checkpoints
-
-# OpenAPI spec
-spec/

client/python/apache_polaris/__init__.py

@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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.
-#
-

client/python/apache_polaris/sdk/__init__.py

@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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.
-#
-

client/python/integration_tests/conftest.py

@@ -381,31 +381,31 @@ def format_namespace(namespace: List[str]) -> str:
 def _patch_generated_models() -> None:
     """
     The OpenAPI generator creates an `api_client` that dynamically looks up
-    model classes from the `polaris.catalog.models` module using `getattr()`.
+    model classes from the `apache_polaris.sdk.catalog.models` module using `getattr()`.
     For example, when a response for a `create_policy` call is received, the
     deserializer tries to find the `LoadPolicyResponse` class by looking for
-    `polaris.catalog.models.LoadPolicyResponse`.
+    `apache_polaris.sdk.catalog.models.LoadPolicyResponse`.
 
     However, the generator fails to add the necessary `import` statements
     to the `polaris/catalog/models/__init__.py` file. This means that even
     though the model files exist (e.g., `load_policy_response.py`), the classes
-    are not part of the `polaris.catalog.models` namespace.
+    are not part of the `apache_polaris.sdk.catalog.models` namespace.
 
     This fixture works around the bug in the generated code without modifying
     the source files. It runs once per test session, before any tests, and
     manually injects the missing response-side model classes into the
-    `polaris.catalog.models` namespace, allowing the deserializer to find them.
+    `apache_polaris.sdk.catalog.models` namespace, allowing the deserializer to find them.
     """
-    import polaris.catalog.models
-    from polaris.catalog.models.applicable_policy import ApplicablePolicy
-    from polaris.catalog.models.get_applicable_policies_response import (
+    import apache_polaris.sdk.catalog.models
+    from apache_polaris.sdk.catalog.models.applicable_policy import ApplicablePolicy
+    from apache_polaris.sdk.catalog.models.get_applicable_policies_response import (
         GetApplicablePoliciesResponse,
     )
-    from polaris.catalog.models.list_policies_response import ListPoliciesResponse
-    from polaris.catalog.models.load_policy_response import LoadPolicyResponse
-    from polaris.catalog.models.policy import Policy
-    from polaris.catalog.models.policy_attachment_target import PolicyAttachmentTarget
-    from polaris.catalog.models.policy_identifier import PolicyIdentifier
+    from apache_polaris.sdk.catalog.models.list_policies_response import ListPoliciesResponse
+    from apache_polaris.sdk.catalog.models.load_policy_response import LoadPolicyResponse
+    from apache_polaris.sdk.catalog.models.policy import Policy
+    from apache_polaris.sdk.catalog.models.policy_attachment_target import PolicyAttachmentTarget
+    from apache_polaris.sdk.catalog.models.policy_identifier import PolicyIdentifier
 
     models_to_patch = {
         "ApplicablePolicy": ApplicablePolicy,
@@ -418,4 +418,4 @@ def _patch_generated_models() -> None:
     }
 
     for name, model_class in models_to_patch.items():
-        setattr(polaris.catalog.models, name, model_class)
+        setattr(apache_polaris.sdk.catalog.models, name, model_class)

regtests/.dockerignore

@@ -21,4 +21,4 @@
 .pytest_cache
 t_pyspark/src/spark-warehouse
 t_pyspark/src/.pytest_cache
-polaris/polaris.management.egg-info
+polaris/apache_polaris.sdk.management.egg-info

regtests/README.md

@@ -193,14 +193,14 @@ docker run --rm \
   -v ${PWD}:/local openapitools/openapi-generator-cli generate \
   -i /local/spec/polaris-management-service.yml \
   -g python \
-  -o /local/client/python --additional-properties=packageName=polaris.management --additional-properties=apiNamePrefix=polaris
+  -o /local/client/python --additional-properties=packageName=apache_polaris.sdk.management --additional-properties=apiNamePrefix=polaris
 
 # generate the iceberg rest client
 docker run --rm \
   -v ${PWD}:/local openapitools/openapi-generator-cli generate \
   -i /local/spec/polaris-catalog-service.yaml \
   -g python \
-  -o /local/client/python --additional-properties=packageName=polaris.catalog --additional-properties=apiNameSuffix="" --additional-properties=apiNamePrefix=Iceberg
+  -o /local/client/python --additional-properties=packageName=apache_polaris.sdk.catalog --additional-properties=apiNameSuffix="" --additional-properties=apiNamePrefix=Iceberg
 ```
 
 Tests rely on Python 3.9 or higher. `pyenv` can be used to install a current version and mapped to the local directory

regtests/t_pyspark/src/conftest.py

@@ -24,9 +24,9 @@
 
 import pytest
 
-from polaris.catalog.api.iceberg_catalog_api import IcebergCatalogAPI
-from polaris.catalog.api_client import ApiClient as CatalogApiClient
-from polaris.management import Catalog, AwsStorageConfigInfo, ApiClient, PolarisDefaultApi, Configuration, \
+from apache_polaris.sdk.catalog.api.iceberg_catalog_api import IcebergCatalogAPI
+from apache_polaris.sdk.catalog.api_client import ApiClient as CatalogApiClient
+from apache_polaris.sdk.management import Catalog, AwsStorageConfigInfo, ApiClient, PolarisDefaultApi, Configuration, \
   CreateCatalogRequest, GrantCatalogRoleRequest, CatalogRole, ApiException, AddGrantRequest, CatalogGrant, \
   CatalogPrivilege, CreateCatalogRoleRequest, CatalogProperties
 
@@ -192,7 +192,7 @@ def _create_catalog_with_storage(root_client, catalog_client, catalog_name, stor
     storage_config_info: Storage configuration (S3 or FILE)
     base_location: Base location for the catalog
   """
-  from polaris.management import AwsStorageConfigInfo
+  from apache_polaris.sdk.management import AwsStorageConfigInfo
 
   # Build properties dict
   catalog_properties = {
@@ -256,7 +256,7 @@ def file_catalog(root_client, catalog_client):
   Catalog that always uses FILE storage for local testing.
   This fixture runs in any environment without external dependencies.
   """
-  from polaris.management import FileStorageConfigInfo
+  from apache_polaris.sdk.management import FileStorageConfigInfo
 
   catalog_name = f'file_catalog_{str(uuid.uuid4())[-10:]}'
   storage_config = FileStorageConfigInfo(storage_type="FILE", allowed_locations=["file:///tmp"])
@@ -273,7 +273,7 @@ def s3_catalog(root_client, catalog_client, test_bucket, aws_role_arn, aws_bucke
     Catalog that always uses S3 storage for AWS testing.
     Tests using this fixture should include @pytest.mark.skipif for AWS_TEST_ENABLED.
     """
-    from polaris.management import AwsStorageConfigInfo
+    from apache_polaris.sdk.management import AwsStorageConfigInfo
 
     catalog_name = f's3_catalog_{str(uuid.uuid4())[-10:]}'
     storage_config = AwsStorageConfigInfo(

regtests/t_pyspark/src/test_spark_sql_fine_grained_authz.py

@@ -31,7 +31,7 @@
 from py4j.protocol import Py4JJavaError
 
 from iceberg_spark import IcebergSparkSession
-from polaris.management import PrincipalRole, CatalogRole, CatalogGrant, CatalogPrivilege, \
+from apache_polaris.sdk.management import PrincipalRole, CatalogRole, CatalogGrant, CatalogPrivilege, \
     AddGrantRequest, GrantCatalogRoleRequest, GrantPrincipalRoleRequest
 
 # Import existing helper functions instead of copying them
@@ -45,7 +45,7 @@ def fine_grained_authz_test_catalog(root_client, catalog_client):
     Catalog specifically for fine-grained authorization testing.
     Does NOT assign catalog_admin to service_admin to avoid privilege inheritance issues.
     """
-    from polaris.management import FileStorageConfigInfo, Catalog, CatalogProperties, CreateCatalogRequest
+    from apache_polaris.sdk.management import FileStorageConfigInfo, Catalog, CatalogProperties, CreateCatalogRequest
     from conftest import create_catalog_role
 
     catalog_name = f'fine_grained_authz_test_catalog_{str(uuid.uuid4())[-10:]}'

regtests/t_pyspark/src/test_spark_sql_s3_with_privileges.py

@@ -30,13 +30,13 @@
 
 
 from iceberg_spark import IcebergSparkSession
-from polaris.catalog import CreateNamespaceRequest, CreateTableRequest, ModelSchema
-from polaris.catalog.api.iceberg_catalog_api import IcebergCatalogAPI
-from polaris.catalog.api.iceberg_o_auth2_api import IcebergOAuth2API
-from polaris.catalog.api_client import ApiClient as CatalogApiClient
-from polaris.catalog.configuration import Configuration
-from polaris.management import ApiClient as ManagementApiClient
-from polaris.management import PolarisDefaultApi, Principal, PrincipalRole, CatalogRole, \
+from apache_polaris.sdk.catalog import CreateNamespaceRequest, CreateTableRequest, ModelSchema
+from apache_polaris.sdk.catalog.api.iceberg_catalog_api import IcebergCatalogAPI
+from apache_polaris.sdk.catalog.api.iceberg_o_auth2_api import IcebergOAuth2API
+from apache_polaris.sdk.catalog.api_client import ApiClient as CatalogApiClient
+from apache_polaris.sdk.catalog.configuration import Configuration
+from apache_polaris.sdk.management import ApiClient as ManagementApiClient
+from apache_polaris.sdk.management import PolarisDefaultApi, Principal, PrincipalRole, CatalogRole, \
   CatalogGrant, CatalogPrivilege, ApiException, CreateCatalogRoleRequest, CreatePrincipalRoleRequest, \
   CreatePrincipalRequest, AddGrantRequest, GrantCatalogRoleRequest, GrantPrincipalRoleRequest, UpdateCatalogRequest