Organizing imports in the quicksight module.

Author: igorborgest

awswrangler/quicksight/__init__.py

@@ -1,9 +1,43 @@
 """Amazon QuickSight Module."""
 
-from awswrangler.quicksight._cancel import *  # noqa
-from awswrangler.quicksight._create import *  # noqa
-from awswrangler.quicksight._delete import *  # noqa
-from awswrangler.quicksight._describe import *  # noqa
-from awswrangler.quicksight._get import *  # noqa
-from awswrangler.quicksight._list import *  # noqa
-from awswrangler.quicksight._utils import list_ingestions  # noqa
+from awswrangler.quicksight._cancel import cancel_ingestion  # noqa
+from awswrangler.quicksight._create import create_athena_data_source, create_athena_dataset, create_ingestion  # noqa
+from awswrangler.quicksight._delete import (  # noqa
+    delete_all_dashboards,
+    delete_all_data_sources,
+    delete_all_datasets,
+    delete_all_templates,
+    delete_dashboard,
+    delete_data_source,
+    delete_dataset,
+    delete_template,
+)
+from awswrangler.quicksight._describe import (  # noqa
+    describe_dashboard,
+    describe_data_source,
+    describe_data_source_permissions,
+    describe_dataset,
+    describe_ingestion,
+)
+from awswrangler.quicksight._get_list import (  # noqa
+    get_dashboard_id,
+    get_dashboard_ids,
+    get_data_source_arn,
+    get_data_source_arns,
+    get_data_source_id,
+    get_data_source_ids,
+    get_dataset_id,
+    get_dataset_ids,
+    get_template_id,
+    get_template_ids,
+    list_dashboards,
+    list_data_sources,
+    list_datasets,
+    list_group_memberships,
+    list_groups,
+    list_iam_policy_assignments,
+    list_iam_policy_assignments_for_user,
+    list_ingestions,
+    list_templates,
+    list_users,
+)

awswrangler/quicksight/_cancel.py

@@ -6,7 +6,7 @@
 import boto3  # type: ignore
 
 from awswrangler import _utils, exceptions
-from awswrangler.quicksight import _get
+from awswrangler.quicksight._get_list import get_dataset_id
 
 _logger: logging.Logger = logging.getLogger(__name__)
 
@@ -53,6 +53,6 @@ def cancel_ingestion(
     if account_id is None:
         account_id = _utils.get_account_id(boto3_session=session)
     if (dataset_id is None) and (dataset_name is not None):
-        dataset_id = _get.get_dataset_id(name=dataset_name, account_id=account_id, boto3_session=session)
+        dataset_id = get_dataset_id(name=dataset_name, account_id=account_id, boto3_session=session)
     client: boto3.client = _utils.client(service_name="quicksight", session=session)
     client.cancel_ingestion(IngestionId=ingestion_id, AwsAccountId=account_id, DataSetId=dataset_id)

awswrangler/quicksight/_create.py

@@ -7,8 +7,8 @@
 import boto3  # type: ignore
 
 from awswrangler import _utils, exceptions
-from awswrangler.quicksight import _get
-from awswrangler.quicksight import _utils as _qs_utils
+from awswrangler.quicksight._get_list import get_data_source_arn, get_dataset_id
+from awswrangler.quicksight._utils import extract_athena_query_columns, extract_athena_table_columns
 
 _logger: logging.Logger = logging.getLogger(__name__)
 
@@ -279,14 +279,14 @@ def create_athena_dataset(
     if account_id is None:
         account_id = _utils.get_account_id(boto3_session=session)
     if (data_source_arn is None) and (data_source_name is not None):
-        data_source_arn = _get.get_data_source_arn(name=data_source_name, account_id=account_id, boto3_session=session)
+        data_source_arn = get_data_source_arn(name=data_source_name, account_id=account_id, boto3_session=session)
     if sql is not None:
         physical_table: Dict[str, Dict[str, Any]] = {
             "CustomSql": {
                 "DataSourceArn": data_source_arn,
                 "Name": sql_name,
                 "SqlQuery": sql,
-                "Columns": _qs_utils.extract_athena_query_columns(
+                "Columns": extract_athena_query_columns(
                     sql=sql,
                     data_source_arn=data_source_arn,  # type: ignore
                     account_id=account_id,
@@ -300,7 +300,7 @@ def create_athena_dataset(
                 "DataSourceArn": data_source_arn,
                 "Schema": database,
                 "Name": table,
-                "InputColumns": _qs_utils.extract_athena_table_columns(
+                "InputColumns": extract_athena_table_columns(
                     database=database,  # type: ignore
                     table=table,  # type: ignore
                     boto3_session=session,
@@ -378,7 +378,7 @@ def create_ingestion(
     if (dataset_name is None) and (dataset_id is None):
         raise exceptions.InvalidArgument("You must pass a not None dataset_name or dataset_id argument.")
     if (dataset_id is None) and (dataset_name is not None):
-        dataset_id = _get.get_dataset_id(name=dataset_name, account_id=account_id, boto3_session=session)
+        dataset_id = get_dataset_id(name=dataset_name, account_id=account_id, boto3_session=session)
     if ingestion_id is None:
         ingestion_id = uuid.uuid4().hex
     client: boto3.client = _utils.client(service_name="quicksight", session=session)

awswrangler/quicksight/_delete.py

@@ -6,7 +6,16 @@
 import boto3  # type: ignore
 
 from awswrangler import _utils, exceptions
-from awswrangler.quicksight import _get, _list
+from awswrangler.quicksight._get_list import (
+    get_dashboard_id,
+    get_data_source_id,
+    get_dataset_id,
+    get_template_id,
+    list_dashboards,
+    list_data_sources,
+    list_datasets,
+    list_templates,
+)
 
 _logger: logging.Logger = logging.getLogger(__name__)
 
@@ -63,7 +72,7 @@ def delete_dashboard(
         raise exceptions.InvalidArgument("You must pass a not None name or dashboard_id argument.")
     session: boto3.Session = _utils.ensure_session(session=boto3_session)
     if (dashboard_id is None) and (name is not None):
-        dashboard_id = _get.get_dashboard_id(name=name, account_id=account_id, boto3_session=session)
+        dashboard_id = get_dashboard_id(name=name, account_id=account_id, boto3_session=session)
     args: Dict[str, Any] = {
         "func_name": "delete_dashboard",
         "account_id": account_id,
@@ -112,7 +121,7 @@ def delete_dataset(
         raise exceptions.InvalidArgument("You must pass a not None name or dataset_id argument.")
     session: boto3.Session = _utils.ensure_session(session=boto3_session)
     if (dataset_id is None) and (name is not None):
-        dataset_id = _get.get_dataset_id(name=name, account_id=account_id, boto3_session=session)
+        dataset_id = get_dataset_id(name=name, account_id=account_id, boto3_session=session)
     args: Dict[str, Any] = {
         "func_name": "delete_data_set",
         "account_id": account_id,
@@ -159,7 +168,7 @@ def delete_data_source(
         raise exceptions.InvalidArgument("You must pass a not None name or data_source_id argument.")
     session: boto3.Session = _utils.ensure_session(session=boto3_session)
     if (data_source_id is None) and (name is not None):
-        data_source_id = _get.get_data_source_id(name=name, account_id=account_id, boto3_session=session)
+        data_source_id = get_data_source_id(name=name, account_id=account_id, boto3_session=session)
     args: Dict[str, Any] = {
         "func_name": "delete_data_source",
         "account_id": account_id,
@@ -210,7 +219,7 @@ def delete_template(
         raise exceptions.InvalidArgument("You must pass a not None name or template_id argument.")
     session: boto3.Session = _utils.ensure_session(session=boto3_session)
     if (template_id is None) and (name is not None):
-        template_id = _get.get_template_id(name=name, account_id=account_id, boto3_session=session)
+        template_id = get_template_id(name=name, account_id=account_id, boto3_session=session)
     args: Dict[str, Any] = {
         "func_name": "delete_template",
         "account_id": account_id,
@@ -245,7 +254,7 @@ def delete_all_dashboards(account_id: Optional[str] = None, boto3_session: Optio
     session: boto3.Session = _utils.ensure_session(session=boto3_session)
     if account_id is None:
         account_id = _utils.get_account_id(boto3_session=session)
-    for dashboard in _list.list_dashboards(account_id=account_id, boto3_session=session):
+    for dashboard in list_dashboards(account_id=account_id, boto3_session=session):
         delete_dashboard(dashboard_id=dashboard["DashboardId"], account_id=account_id, boto3_session=session)
 
 
@@ -272,7 +281,7 @@ def delete_all_datasets(account_id: Optional[str] = None, boto3_session: Optiona
     session: boto3.Session = _utils.ensure_session(session=boto3_session)
     if account_id is None:
         account_id = _utils.get_account_id(boto3_session=session)
-    for dataset in _list.list_datasets(account_id=account_id, boto3_session=session):
+    for dataset in list_datasets(account_id=account_id, boto3_session=session):
         delete_dataset(dataset_id=dataset["DataSetId"], account_id=account_id, boto3_session=session)
 
 
@@ -299,7 +308,7 @@ def delete_all_data_sources(account_id: Optional[str] = None, boto3_session: Opt
     session: boto3.Session = _utils.ensure_session(session=boto3_session)
     if account_id is None:
         account_id = _utils.get_account_id(boto3_session=session)
-    for data_source in _list.list_data_sources(account_id=account_id, boto3_session=session):
+    for data_source in list_data_sources(account_id=account_id, boto3_session=session):
         delete_data_source(data_source_id=data_source["DataSourceId"], account_id=account_id, boto3_session=session)
 
 
@@ -326,5 +335,5 @@ def delete_all_templates(account_id: Optional[str] = None, boto3_session: Option
     session: boto3.Session = _utils.ensure_session(session=boto3_session)
     if account_id is None:
         account_id = _utils.get_account_id(boto3_session=session)
-    for template in _list.list_templates(account_id=account_id, boto3_session=session):
+    for template in list_templates(account_id=account_id, boto3_session=session):
         delete_template(template_id=template["TemplateId"], account_id=account_id, boto3_session=session)

awswrangler/quicksight/_describe.py

@@ -6,7 +6,7 @@
 import boto3  # type: ignore
 
 from awswrangler import _utils, exceptions
-from awswrangler.quicksight import _get
+from awswrangler.quicksight._get_list import get_dashboard_id, get_data_source_id, get_dataset_id
 
 _logger: logging.Logger = logging.getLogger(__name__)
 
@@ -50,7 +50,7 @@ def describe_dashboard(
     if account_id is None:
         account_id = _utils.get_account_id(boto3_session=session)
     if (dashboard_id is None) and (name is not None):
-        dashboard_id = _get.get_dashboard_id(name=name, account_id=account_id, boto3_session=session)
+        dashboard_id = get_dashboard_id(name=name, account_id=account_id, boto3_session=session)
     client: boto3.client = _utils.client(service_name="quicksight", session=session)
     return client.describe_dashboard(AwsAccountId=account_id, DashboardId=dashboard_id)["Dashboard"]
 
@@ -94,7 +94,7 @@ def describe_data_source(
     if account_id is None:
         account_id = _utils.get_account_id(boto3_session=session)
     if (data_source_id is None) and (name is not None):
-        data_source_id = _get.get_data_source_id(name=name, account_id=account_id, boto3_session=session)
+        data_source_id = get_data_source_id(name=name, account_id=account_id, boto3_session=session)
     client: boto3.client = _utils.client(service_name="quicksight", session=session)
     return client.describe_data_source(AwsAccountId=account_id, DataSourceId=data_source_id)["DataSource"]
 
@@ -138,7 +138,7 @@ def describe_data_source_permissions(
     if account_id is None:
         account_id = _utils.get_account_id(boto3_session=session)
     if (data_source_id is None) and (name is not None):
-        data_source_id = _get.get_data_source_id(name=name, account_id=account_id, boto3_session=session)
+        data_source_id = get_data_source_id(name=name, account_id=account_id, boto3_session=session)
     client: boto3.client = _utils.client(service_name="quicksight", session=session)
     return client.describe_data_source_permissions(AwsAccountId=account_id, DataSourceId=data_source_id)["Permissions"]
 
@@ -182,7 +182,7 @@ def describe_dataset(
     if account_id is None:
         account_id = _utils.get_account_id(boto3_session=session)
     if (dataset_id is None) and (name is not None):
-        dataset_id = _get.get_dataset_id(name=name, account_id=account_id, boto3_session=session)
+        dataset_id = get_dataset_id(name=name, account_id=account_id, boto3_session=session)
     client: boto3.client = _utils.client(service_name="quicksight", session=session)
     return client.describe_data_set(AwsAccountId=account_id, DataSetId=dataset_id)["DataSet"]
 
@@ -229,7 +229,7 @@ def describe_ingestion(
     if account_id is None:
         account_id = _utils.get_account_id(boto3_session=session)
     if (dataset_id is None) and (dataset_name is not None):
-        dataset_id = _get.get_dataset_id(name=dataset_name, account_id=account_id, boto3_session=session)
+        dataset_id = get_dataset_id(name=dataset_name, account_id=account_id, boto3_session=session)
     client: boto3.client = _utils.client(service_name="quicksight", session=session)
     return client.describe_ingestion(IngestionId=ingestion_id, AwsAccountId=account_id, DataSetId=dataset_id)[
         "Ingestion"