Lee-W commented on code in PR #50178: URL: https://github.com/apache/airflow/pull/50178#discussion_r2110642244
########## providers/alibaba/src/airflow/providers/alibaba/cloud/hooks/maxcompute.py: ########## @@ -0,0 +1,248 @@ +# 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. +from __future__ import annotations + +import functools +from typing import TYPE_CHECKING, Any, Callable, TypeVar + +from odps import ODPS + +from airflow.providers.alibaba.cloud.exceptions import MaxComputeConfigurationException +from airflow.providers.alibaba.cloud.hooks.base_alibaba import AlibabaBaseHook + +if TYPE_CHECKING: + from odps.models import Instance + +RT = TypeVar("RT") + + +def fallback_to_default_project_endpoint(func: Callable[..., RT]) -> Callable[..., RT]: + """ + Provide fallback for MaxCompute project and endpoint to be used as a decorator. + + If the project or endpoint is None it will be replaced with the project from the + connection extra definition. + + :param func: function to wrap + :return: result of the function call + """ + + @functools.wraps(func) + def inner_wrapper(self, **kwargs) -> RT: + kwargs["project"] = kwargs.get("project", self.project) + kwargs["endpoint"] = kwargs.get("endpoint", self.endpoint) + + if not kwargs["project"]: + raise MaxComputeConfigurationException( + "The project must be passed either as " + "keyword parameter or as extra " + "in MaxCompute connection definition. Both are not set!" + ) + + if not kwargs["endpoint"]: + raise MaxComputeConfigurationException( + "The endpoint must be passed either as " + "keyword parameter or as extra " + "in MaxCompute connection definition. Both are not set!" + ) + return func(self, **kwargs) + + return inner_wrapper + + +class MaxComputeHook(AlibabaBaseHook): + """ + Interact with Alibaba MaxCompute (previously known as ODPS). + + :param maxcompute_conn_id: The connection ID to use when fetching connection info. + """ + + conn_name_attr = "maxcompute_conn_id" + default_conn_name = "maxcompute_default" + conn_type = "maxcompute" + hook_name = "MaxCompute" + + def __init__(self, maxcompute_conn_id="maxcompute_default", **kwargs) -> None: Review Comment: ```suggestion def __init__(self, maxcompute_conn_id: str="maxcompute_default", **kwargs) -> None: ``` ########## providers/alibaba/tests/unit/alibaba/cloud/hooks/test_maxcompute.py: ########## @@ -0,0 +1,117 @@ +# +# 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. +from __future__ import annotations + +from unittest import mock + +from airflow.providers.alibaba.cloud.hooks.maxcompute import MaxComputeHook + +MAXCOMPUTE_HOOK_MODULE = "airflow.providers.alibaba.cloud.hooks.maxcompute.{}" +MOCK_MAXCOMPUTE_CONN_ID = "mock_id" +MOCK_MAXCOMPUTE_PROJECT = "mock_project" +MOCK_MAXCOMPUTE_ENDPOINT = "mock_endpoint" + + +class TestMaxComputeHook: + def setup_method(self): + with mock.patch( + MAXCOMPUTE_HOOK_MODULE.format("MaxComputeHook.get_connection"), Review Comment: We probably could move `MaxComputeHook` to `MAXCOMPUTE_HOOK_MODULE` ########## providers/alibaba/src/airflow/providers/alibaba/cloud/hooks/maxcompute.py: ########## @@ -0,0 +1,248 @@ +# 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. +from __future__ import annotations + +import functools +from typing import TYPE_CHECKING, Any, Callable, TypeVar + +from odps import ODPS + +from airflow.providers.alibaba.cloud.exceptions import MaxComputeConfigurationException +from airflow.providers.alibaba.cloud.hooks.base_alibaba import AlibabaBaseHook + +if TYPE_CHECKING: + from odps.models import Instance + +RT = TypeVar("RT") + + +def fallback_to_default_project_endpoint(func: Callable[..., RT]) -> Callable[..., RT]: + """ + Provide fallback for MaxCompute project and endpoint to be used as a decorator. + + If the project or endpoint is None it will be replaced with the project from the + connection extra definition. + + :param func: function to wrap + :return: result of the function call + """ + + @functools.wraps(func) + def inner_wrapper(self, **kwargs) -> RT: + kwargs["project"] = kwargs.get("project", self.project) + kwargs["endpoint"] = kwargs.get("endpoint", self.endpoint) + + if not kwargs["project"]: + raise MaxComputeConfigurationException( + "The project must be passed either as " + "keyword parameter or as extra " + "in MaxCompute connection definition. Both are not set!" + ) + + if not kwargs["endpoint"]: + raise MaxComputeConfigurationException( + "The endpoint must be passed either as " + "keyword parameter or as extra " + "in MaxCompute connection definition. Both are not set!" + ) Review Comment: ```suggestion required_args = ("project", "endpoint") for arg_name in required_args: kwargs[arg_name] = kwargs.get(arg_name, getattr(self, arg_name)): if not kwargs[arg_name]: raise MaxComputeConfigurationException( f'"{arg_name}" must be passed either as ' "keyword parameter or as extra " "in the MaxCompute connection definition. Both are not set!" ) ``` -- 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: commits-unsubscr...@airflow.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
