kaxil commented on code in PR #51873:
URL: https://github.com/apache/airflow/pull/51873#discussion_r2174938342
##########
providers/alibaba/src/airflow/providers/alibaba/cloud/hooks/analyticdb_spark.py:
##########
@@ -34,7 +34,11 @@
from alibabacloud_tea_openapi.models import Config
from airflow.exceptions import AirflowException
-from airflow.hooks.base import BaseHook
+
+try:
+ from airflow.sdk import BaseHook
+except ImportError:
+ from airflow.hooks.base import BaseHook # type: ignore
Review Comment:
```suggestion
from airflow.hooks.base import BaseHook # type: ignore[no-redef]
```
##########
airflow-core/src/airflow/cli/commands/connection_command.py:
##########
@@ -375,7 +375,8 @@ def connections_test(args) -> None:
raise SystemExit(1)
print("\nTesting...")
- status, message = conn.test_connection()
+ # TODO: Revisit this
+ status, message = conn.test_connection() # type: ignore
Review Comment:
Will this work or fail currently -- with this change?
##########
providers/amazon/src/airflow/providers/amazon/aws/hooks/athena_sql.py:
##########
@@ -127,7 +127,10 @@ def conn_config(self) -> AwsConnectionWrapper:
)
return AwsConnectionWrapper(
- conn=connection, region_name=self._region_name,
botocore_config=self._config, verify=self._verify
+ conn=connection, # type: ignore[arg-type]
Review Comment:
same here
##########
providers/alibaba/src/airflow/providers/alibaba/cloud/hooks/oss.py:
##########
@@ -93,7 +97,7 @@ def __init__(self, region: str | None = None,
oss_conn_id="oss_default", *args,
def get_conn(self) -> Connection:
"""Return connection for the hook."""
- return self.oss_conn
+ return self.oss_conn # type: ignore[return-value]
Review Comment:
This can/should be fixed -- if you change L37 to be Connection from SDK
##########
providers/amazon/src/airflow/providers/amazon/aws/hooks/base_aws.py:
##########
@@ -57,12 +57,16 @@
AirflowNotFoundException,
AirflowProviderDeprecationWarning,
)
-from airflow.hooks.base import BaseHook
from airflow.providers.amazon.aws.utils.connection_wrapper import
AwsConnectionWrapper
from airflow.providers.amazon.aws.utils.identifiers import generate_uuid
from airflow.providers.amazon.aws.utils.suppress import return_on_error
from airflow.providers.common.compat.version_compat import AIRFLOW_V_3_0_PLUS
from airflow.providers_manager import ProvidersManager
+
+try:
+ from airflow.sdk import BaseHook
+except ImportError:
+ from airflow.hooks.base import BaseHook # type: ignore
Review Comment:
Worth moving to version_compat.py -- same as
https://github.com/apache/airflow/pull/52528
##########
providers/alibaba/src/airflow/providers/alibaba/cloud/hooks/oss.py:
##########
@@ -27,7 +27,11 @@
from oss2.exceptions import ClientError
from airflow.exceptions import AirflowException
-from airflow.hooks.base import BaseHook
+
+try:
+ from airflow.sdk import BaseHook
+except ImportError:
+ from airflow.hooks.base import BaseHook # type: ignore
Review Comment:
Maybe worth putting it under (including moving `BaseOperator` there):
providers/alibaba/src/airflow/providers/alibaba/version_compat.py
##########
providers/airbyte/src/airflow/providers/airbyte/hooks/airbyte.py:
##########
@@ -26,7 +26,11 @@
from requests import Session
from airflow.exceptions import AirflowException
-from airflow.hooks.base import BaseHook
+
+try:
+ from airflow.sdk import BaseHook
+except ImportError:
+ from airflow.hooks.base import BaseHook # type: ignore
Review Comment:
This should be stricter:
```suggestion
from airflow.hooks.base import BaseHook # type: ignore[no-redef]
```
##########
providers/amazon/src/airflow/providers/amazon/aws/hooks/chime.py:
##########
@@ -69,7 +69,7 @@ def _get_webhook_endpoint(self, conn_id: str) -> str:
token = conn.password
if token is None:
raise AirflowException("Webhook token field is missing and is
required.")
- url = conn.schema + "://" + conn.host
+ url = cast("str", conn.schema) + "://" + cast("str", conn.host)
Review Comment:
You can add an error above, since you expect `conn.schema` and `conn.host`
to be non-None -- similar to `token` field above
##########
providers/alibaba/src/airflow/providers/alibaba/cloud/hooks/oss.py:
##########
@@ -27,7 +27,11 @@
from oss2.exceptions import ClientError
from airflow.exceptions import AirflowException
-from airflow.hooks.base import BaseHook
+
+try:
+ from airflow.sdk import BaseHook
+except ImportError:
+ from airflow.hooks.base import BaseHook # type: ignore
Review Comment:
so it can be reused
##########
providers/alibaba/src/airflow/providers/alibaba/cloud/hooks/oss.py:
##########
@@ -27,7 +27,11 @@
from oss2.exceptions import ClientError
from airflow.exceptions import AirflowException
-from airflow.hooks.base import BaseHook
+
+try:
+ from airflow.sdk import BaseHook
+except ImportError:
+ from airflow.hooks.base import BaseHook # type: ignore
Review Comment:
```suggestion
try:
from airflow.sdk import BaseHook
except ImportError:
from airflow.hooks.base import BaseHook # type: ignore[no-redef]
```
##########
providers/alibaba/src/airflow/providers/alibaba/cloud/hooks/base_alibaba.py:
##########
@@ -18,7 +18,10 @@
from typing import Any, NamedTuple
-from airflow.hooks.base import BaseHook
+try:
+ from airflow.sdk import BaseHook
+except ImportError:
+ from airflow.hooks.base import BaseHook # type: ignore
Review Comment:
```suggestion
from airflow.hooks.base import BaseHook # type: ignore[no-redef]
```
##########
airflow-core/src/airflow/cli/commands/connection_command.py:
##########
@@ -33,9 +33,9 @@
from airflow.cli.utils import is_stdout, print_export_output
from airflow.configuration import conf
from airflow.exceptions import AirflowNotFoundException
-from airflow.hooks.base import BaseHook
from airflow.models import Connection
from airflow.providers_manager import ProvidersManager
+from airflow.sdk import BaseHook
Review Comment:
Should we just move the import as well to L69 in `connections_get`?
##########
providers/amazon/src/airflow/providers/amazon/aws/hooks/sagemaker_unified_studio.py:
##########
@@ -25,9 +25,13 @@
from sagemaker_studio.sagemaker_studio_api import SageMakerStudioAPI
from airflow.exceptions import AirflowException
-from airflow.hooks.base import BaseHook
from airflow.providers.amazon.aws.utils.sagemaker_unified_studio import
is_local_runner
+try:
+ from airflow.sdk import BaseHook
+except ImportError:
+ from airflow.hooks.base import BaseHook # type: ignore
Review Comment:
Strictier typer ignore please for all
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
