ruff

Author: eric-maynard

client/python/cli/command/catalogs.py

@@ -16,18 +16,18 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-from dataclasses import dataclass, field
-from typing import Dict, Optional, List
+from dataclasses import dataclass
+from typing import Dict, List
 
 from pydantic import StrictStr, SecretStr
 
 from cli.command import Command
 from cli.constants import StorageType, CatalogType, CatalogConnectionType, Subcommands, Arguments, AuthenticationType, \
     ServiceIdentityType
 from cli.options.option_tree import Argument
-from polaris.management import PolarisDefaultApi, Catalog, CreateCatalogRequest, UpdateCatalogRequest, \
+from polaris.management import PolarisDefaultApi, CreateCatalogRequest, UpdateCatalogRequest, \
     StorageConfigInfo, ExternalCatalog, AwsStorageConfigInfo, AzureStorageConfigInfo, GcpStorageConfigInfo, \
-    PolarisCatalog, CatalogProperties, AuthenticationParameters, BearerAuthenticationParameters, \
+    PolarisCatalog, CatalogProperties, BearerAuthenticationParameters, \
     OAuthClientCredentialsParameters, SigV4AuthenticationParameters, HadoopConnectionConfigInfo, \
     IcebergRestConnectionConfigInfo, AwsIamServiceIdentityInfo
 

client/python/cli/command/namespaces.py

@@ -27,7 +27,6 @@
 from cli.constants import Subcommands, Arguments, UNIT_SEPARATOR
 from cli.options.option_tree import Argument
 from polaris.catalog import IcebergCatalogAPI, CreateNamespaceRequest, ApiClient, Configuration
-from polaris.catalog.exceptions import NotFoundException
 from polaris.management import PolarisDefaultApi
 
 

client/python/cli/command/principal_roles.py

@@ -25,7 +25,7 @@
 from cli.constants import Subcommands, Arguments
 from cli.options.option_tree import Argument
 from polaris.management import PolarisDefaultApi, CreatePrincipalRoleRequest, PrincipalRole, UpdatePrincipalRoleRequest, \
-    GrantCatalogRoleRequest, CatalogRole, GrantPrincipalRoleRequest
+    GrantPrincipalRoleRequest
 
 
 @dataclass

client/python/cli/command/profiles.py

@@ -22,7 +22,6 @@
 from dataclasses import dataclass
 from typing import Dict, Optional, List
 
-from pydantic import StrictStr
 
 from cli.command import Command
 from cli.constants import Subcommands, DEFAULT_HOSTNAME, DEFAULT_PORT, CONFIG_DIR, CONFIG_FILE

client/python/cli/options/parser.py

@@ -68,7 +68,7 @@ def add_arguments(parser, args: List[Argument]):
                 if arg.default:
                     kwargs['default'] = arg.default
 
-                if arg.type == bool:
+                if arg.type is bool:
                     del kwargs['type']
                     parser.add_argument(arg.get_flag_name(), **kwargs, action='store_true')
                 elif arg.allow_repeats:
@@ -128,7 +128,7 @@ def parse_args(self, args=None, namespace=None):
             tree_str = self._get_tree_str(args[:help_index])
             if tree_str:
                 print(f'input: polaris {" ".join(args)}')
-                print(f'options:')
+                print('options:')
                 print(tree_str)
                 print('\n')
                 self.print_usage()
@@ -187,7 +187,7 @@ def _get_command_path(self, args: List[str], options: List[Option]) -> List[str]
                     parser = parser._subparsers._group_actions[0].choices.get(arg)
                     if not parser:
                         break
-                except Exception as e:
+                except Exception:
                     break
                 options = list(filter(lambda o: o.name == arg, options))[0].children
                 if options is None:

client/python/cli/polaris_cli.py

@@ -133,7 +133,7 @@ def _get_client_builder(options):
             if options.host is not None or options.port is not None:
                 raise Exception(f'Please provide either {Argument.to_flag_name(Arguments.BASE_URL)} or'
                                 f' {Argument.to_flag_name(Arguments.HOST)} &'
-                                f' {Argument.to_flag_name(Arguments.PORT)}, but not both');
+                                f' {Argument.to_flag_name(Arguments.PORT)}, but not both')
 
             polaris_management_url = f'{options.base_url}/api/management/v1'
             polaris_catalog_url = f'{options.base_url}/api/catalog/v1'

getting-started/spark/notebooks/SparkPolaris.ipynb

@@ -102,7 +102,7 @@
     "  try:\n",
     "    api.create_catalog_role(catalog_name=catalog.name, create_catalog_role_request=CreateCatalogRoleRequest(catalog_role=catalog_role))\n",
     "    return api.get_catalog_role(catalog_name=catalog.name, catalog_role_name=role_name)\n",
-    "  except ApiException as e:\n",
+    "  except ApiException:\n",
     "    return api.get_catalog_role(catalog_name=catalog.name, catalog_role_name=role_name)\n",
     "  else:\n",
     "    raise e\n",
@@ -113,7 +113,7 @@
     "  try:\n",
     "    api.create_principal_role(CreatePrincipalRoleRequest(principal_role=principal_role))\n",
     "    return api.get_principal_role(principal_role_name=role_name)\n",
-    "  except ApiException as e:\n",
+    "  except ApiException:\n",
     "    return api.get_principal_role(principal_role_name=role_name)\n"
    ]
   },
@@ -445,7 +445,6 @@
    "outputs": [],
    "source": [
     "import codecs\n",
-    "import json\n",
     "from IPython.display import display, JSON\n",
     "\n",
     "def format_namespace(namespace):\n",

plugins/spark/v3.5/getting-started/notebooks/SparkPolaris.ipynb

@@ -16,7 +16,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from polaris.catalog.api.iceberg_catalog_api import IcebergCatalogAPI\n",
     "from polaris.catalog.api.iceberg_o_auth2_api import IcebergOAuth2API\n",
     "from polaris.catalog.api_client import ApiClient as CatalogApiClient\n",
     "from polaris.catalog.api_client import Configuration as CatalogApiClientConfiguration\n",
@@ -113,7 +112,7 @@
     "  try:\n",
     "    api.create_catalog_role(catalog_name=catalog.name, create_catalog_role_request=CreateCatalogRoleRequest(catalog_role=catalog_role))\n",
     "    return api.get_catalog_role(catalog_name=catalog.name, catalog_role_name=role_name)\n",
-    "  except ApiException as e:\n",
+    "  except ApiException:\n",
     "    return api.get_catalog_role(catalog_name=catalog.name, catalog_role_name=role_name)\n",
     "  else:\n",
     "    raise e\n",
@@ -124,7 +123,7 @@
     "  try:\n",
     "    api.create_principal_role(CreatePrincipalRoleRequest(principal_role=principal_role))\n",
     "    return api.get_principal_role(principal_role_name=role_name)\n",
-    "  except ApiException as e:\n",
+    "  except ApiException:\n",
     "    return api.get_principal_role(principal_role_name=role_name)\n"
    ]
   },

regtests/t_cli/src/test_cli.py

@@ -16,8 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-import contextlib
-import io
 import json
 import os
 import random
@@ -157,7 +155,7 @@ def test_quickstart_flow():
             f'test_cli_catalog_{SALT}',
             '--catalog-role',
             f'test_cli_c_role_{SALT}',
-            f'CATALOG_MANAGE_CONTENT'
+            'CATALOG_MANAGE_CONTENT'
         ), checker=lambda s: s == '')
 
         # User now has catalog access:
@@ -835,7 +833,7 @@ def test_list_privileges():
             f'test_cli_catalog_{SALT}',
             '--catalog-role',
             f'test_cli_c_role_{SALT}',
-            f'TABLE_READ_DATA'
+            'TABLE_READ_DATA'
         ), checker=lambda s: s == '')
         check_output(root_cli(
             'privileges',
@@ -847,7 +845,7 @@ def test_list_privileges():
             f'test_cli_c_role_{SALT}',
             '--namespace',
             f'a_{SALT}',
-            f'TABLE_WRITE_DATA'
+            'TABLE_WRITE_DATA'
         ), checker=lambda s: s == '')
         check_output(root_cli(
             'privileges',
@@ -859,7 +857,7 @@ def test_list_privileges():
             f'test_cli_c_role_{SALT}',
             '--namespace',
             f'a_{SALT}',
-            f'TABLE_LIST'
+            'TABLE_LIST'
         ), checker=lambda s: s == '')
 
         # List privileges:

regtests/t_oauth/test_oauth2_tokens.py

@@ -22,7 +22,6 @@
 """
 import argparse
 import requests
-import urllib
 
 
 def main(base_uri, client_id, client_secret):