You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "kgw7401 (via GitHub)" <gi...@apache.org> on 2025/07/07 14:46:43 UTC

[PR] fix: Change DataprocAsyncHook parent class to GoogleBaseAsyncHook [airflow]

kgw7401 opened a new pull request, #52981:
URL: https://github.com/apache/airflow/pull/52981

   <!--
    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.
    -->
   
   <!--
   Thank you for contributing! Please make sure that your code changes
   are covered with tests. And in case of new features or big changes
   remember to adjust the documentation.
   
   Feel free to ping committers for the review!
   
   In case of an existing issue, reference it using one of the following:
   
   closes: #ISSUE
   related: #ISSUE
   
   How to write a good git commit message:
   http://chris.beams.io/posts/git-commit/
   -->
   
   
   
   <!-- Please keep an empty line above the dashes. -->
   
   Hi I'm making some feature on dataproc trigger but i got an error related to async when i set `deferrable=True`
   Here is error that i encountered.
   
   ```python
   Traceback (most recent call last):
   
     File "/opt/airflow/airflow-core/src/airflow/jobs/triggerer_job_runner.py", line 923, in cleanup_finished_triggers
       result = details["task"].result()
                ^^^^^^^^^^^^^^^^^^^^^^^^
   
     File "/opt/airflow/airflow-core/src/airflow/jobs/triggerer_job_runner.py", line 1032, in run_trigger
       async for event in trigger.run():
   
     File "/opt/airflow/providers/google/src/airflow/providers/google/cloud/triggers/dataproc.py", line 187, in run
       job = await self.get_async_hook().get_job(
                   ^^^^^^^^^^^^^^^^^^^^^
   
     File "/opt/airflow/providers/google/src/airflow/providers/google/cloud/triggers/dataproc.py", line 71, in get_async_hook
       return DataprocAsyncHook(
              ^^^^^^^^^^^^^^^^^^
   
     File "/opt/airflow/providers/google/src/airflow/providers/google/cloud/hooks/dataproc.py", line 1286, in __init__
       super().__init__(gcp_conn_id=gcp_conn_id, impersonation_chain=impersonation_chain, **kwargs)
   
     File "/opt/airflow/providers/google/src/airflow/providers/google/common/hooks/base_google.py", line 280, in __init__
       self.extras: dict = self.get_connection(self.gcp_conn_id).extra_dejson
                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   
     File "/opt/airflow/airflow-core/src/airflow/hooks/base.py", line 64, in get_connection
       conn = Connection.get_connection_from_secrets(conn_id)
              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   
     File "/opt/airflow/airflow-core/src/airflow/models/connection.py", line 481, in get_connection_from_secrets
       conn = TaskSDKConnection.get(conn_id=conn_id)
              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   
     File "/opt/airflow/task-sdk/src/airflow/sdk/definitions/connection.py", line 152, in get
       return _get_connection(conn_id)
              ^^^^^^^^^^^^^^^^^^^^^^^^
   
     File "/opt/airflow/task-sdk/src/airflow/sdk/execution_time/context.py", line 155, in _get_connection
       msg = SUPERVISOR_COMMS.send(GetConnection(conn_id=conn_id))
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   
     File "/opt/airflow/airflow-core/src/airflow/jobs/triggerer_job_runner.py", line 708, in send
       return async_to_sync(self.asend)(msg)
              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   
     File "/usr/local/lib/python3.11/site-packages/asgiref/sync.py", line 186, in __call__
       raise RuntimeError(
   
   RuntimeError: You cannot use AsyncToSync in the same thread as an async event loop - just await the async function directly.
   ```
   
   I think main reason is that even if i use get_async_hook, inside of DataprocAsyncHook inherit GoogleBaseHook that is not for async. so i change the DataprocAsyncHook's parent class into GoogleBaseAsyncHook.
   
   ---
   **^ Add meaningful description above**
   Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#pull-request-guidelines)** for more information.
   In case of fundamental code changes, an Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals)) is needed.
   In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
   In case of backwards incompatible changes please leave a note in a newsfragment file, named `{pr_number}.significant.rst` or `{issue_number}.significant.rst`, in [airflow-core/newsfragments](https://github.com/apache/airflow/tree/main/airflow-core/newsfragments).
   


-- 
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-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix: Change DataprocAsyncHook parent class to GoogleBaseAsyncHook [airflow]

Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk merged PR #52981:
URL: https://github.com/apache/airflow/pull/52981


-- 
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-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix: Change DataprocAsyncHook parent class to GoogleBaseAsyncHook [airflow]

Posted by "kgw7401 (via GitHub)" <gi...@apache.org>.
kgw7401 commented on code in PR #52981:
URL: https://github.com/apache/airflow/pull/52981#discussion_r2205964637


##########
providers/google/src/airflow/providers/google/cloud/hooks/dataproc.py:
##########
@@ -1286,55 +1288,90 @@ def __init__(
         super().__init__(gcp_conn_id=gcp_conn_id, impersonation_chain=impersonation_chain, **kwargs)
         self._cached_client: JobControllerAsyncClient | None = None
 
-    def get_cluster_client(self, region: str | None = None) -> ClusterControllerAsyncClient:
+    async def get_cluster_client(self, region: str | None = None) -> ClusterControllerAsyncClient:
         """Create a ClusterControllerAsyncClient."""
         client_options = None
         if region and region != "global":
             client_options = ClientOptions(api_endpoint=f"{region}-dataproc.googleapis.com:443")
 
+        sync_hook = await self.get_sync_hook()
         return ClusterControllerAsyncClient(
-            credentials=self.get_credentials(), client_info=CLIENT_INFO, client_options=client_options
+            credentials=sync_hook.get_credentials(), client_info=CLIENT_INFO, client_options=client_options
         )
 
-    def get_template_client(self, region: str | None = None) -> WorkflowTemplateServiceAsyncClient:
+    async def get_template_client(self, region: str | None = None) -> WorkflowTemplateServiceAsyncClient:
         """Create a WorkflowTemplateServiceAsyncClient."""
         client_options = None
         if region and region != "global":
             client_options = ClientOptions(api_endpoint=f"{region}-dataproc.googleapis.com:443")
 
+        sync_hook = await self.get_sync_hook()
         return WorkflowTemplateServiceAsyncClient(
-            credentials=self.get_credentials(), client_info=CLIENT_INFO, client_options=client_options
+            credentials=sync_hook.get_credentials(), client_info=CLIENT_INFO, client_options=client_options
         )
 
-    def get_job_client(self, region: str | None = None) -> JobControllerAsyncClient:
+    async def get_job_client(self, region: str | None = None) -> JobControllerAsyncClient:
         """Create a JobControllerAsyncClient."""
         if self._cached_client is None:
             client_options = None
             if region and region != "global":
                 client_options = ClientOptions(api_endpoint=f"{region}-dataproc.googleapis.com:443")
 
+            sync_hook = await self.get_sync_hook()
             self._cached_client = JobControllerAsyncClient(
-                credentials=self.get_credentials(),
+                credentials=sync_hook.get_credentials(),
                 client_info=CLIENT_INFO,
                 client_options=client_options,
             )
         return self._cached_client
 
-    def get_batch_client(self, region: str | None = None) -> BatchControllerAsyncClient:
+    async def get_batch_client(self, region: str | None = None) -> BatchControllerAsyncClient:
         """Create a BatchControllerAsyncClient."""
         client_options = None
         if region and region != "global":
             client_options = ClientOptions(api_endpoint=f"{region}-dataproc.googleapis.com:443")
 
+        sync_hook = await self.get_sync_hook()
         return BatchControllerAsyncClient(
-            credentials=self.get_credentials(), client_info=CLIENT_INFO, client_options=client_options
+            credentials=sync_hook.get_credentials(), client_info=CLIENT_INFO, client_options=client_options
         )
 
-    def get_operations_client(self, region: str) -> OperationsClient:
+    async def get_operations_client(self, region: str) -> OperationsClient:
         """Create a OperationsClient."""
-        return self.get_template_client(region=region).transport.operations_client
+        template_client = await self.get_template_client(region=region)
+        return template_client.transport.operations_client
+
+    async def get_cluster(
+        self,
+        region: str,
+        project_id: str,
+        cluster_name: str,

Review Comment:
   You're right. I didn't really think much about that. It could be a breaking change. I’ve fixed it.



-- 
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-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix: Change DataprocAsyncHook parent class to GoogleBaseAsyncHook [airflow]

Posted by "kgw7401 (via GitHub)" <gi...@apache.org>.
kgw7401 commented on PR #52981:
URL: https://github.com/apache/airflow/pull/52981#issuecomment-3046790262

   I’m updating the test codes.


-- 
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-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix: Change DataprocAsyncHook parent class to GoogleBaseAsyncHook [airflow]

Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on PR #52981:
URL: https://github.com/apache/airflow/pull/52981#issuecomment-3092319368

   > it should be removed. because that fixture is not being used in that module.
   could you check again?
   
   Could be separate PR.


-- 
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-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix: Change DataprocAsyncHook parent class to GoogleBaseAsyncHook [airflow]

Posted by "kgw7401 (via GitHub)" <gi...@apache.org>.
kgw7401 commented on PR #52981:
URL: https://github.com/apache/airflow/pull/52981#issuecomment-3076439513

   @eladkal I got approved. Could you please merge this pr?


-- 
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-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix: Change DataprocAsyncHook parent class to GoogleBaseAsyncHook [airflow]

Posted by "kyungjunleeme (via GitHub)" <gi...@apache.org>.
kyungjunleeme commented on PR #52981:
URL: https://github.com/apache/airflow/pull/52981#issuecomment-3083889084

   @kgw7401  I think that this is nice pr. 
   
   but if one morething to be added, it is nice pr more.
   
   in test_dataproc.py 
   
   ```python
   @pytest.fixture
   def async_get_operation():
       def func(**kwargs):
           m = mock.MagicMock()
           m.configure_mock(**kwargs)
           f = Future()
           f.set_result(m)
           return f
   
       return func
   ```
   it should be removed. because that fixture is not being used in that module. 
   could you check again?


-- 
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-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix: Change DataprocAsyncHook parent class to GoogleBaseAsyncHook [airflow]

Posted by "RNHTTR (via GitHub)" <gi...@apache.org>.
RNHTTR commented on code in PR #52981:
URL: https://github.com/apache/airflow/pull/52981#discussion_r2205211336


##########
providers/google/src/airflow/providers/google/cloud/hooks/dataproc.py:
##########
@@ -1404,7 +1441,6 @@ async def create_cluster(
         )
         return result
 
-    @GoogleBaseHook.fallback_to_default_project_id

Review Comment:
   Why are these being removed? I think this would be a breaking change for anyone who provides `project_id=None`



##########
providers/google/src/airflow/providers/google/cloud/hooks/dataproc.py:
##########
@@ -1286,55 +1288,90 @@ def __init__(
         super().__init__(gcp_conn_id=gcp_conn_id, impersonation_chain=impersonation_chain, **kwargs)
         self._cached_client: JobControllerAsyncClient | None = None
 
-    def get_cluster_client(self, region: str | None = None) -> ClusterControllerAsyncClient:
+    async def get_cluster_client(self, region: str | None = None) -> ClusterControllerAsyncClient:
         """Create a ClusterControllerAsyncClient."""
         client_options = None
         if region and region != "global":
             client_options = ClientOptions(api_endpoint=f"{region}-dataproc.googleapis.com:443")
 
+        sync_hook = await self.get_sync_hook()
         return ClusterControllerAsyncClient(
-            credentials=self.get_credentials(), client_info=CLIENT_INFO, client_options=client_options
+            credentials=sync_hook.get_credentials(), client_info=CLIENT_INFO, client_options=client_options
         )
 
-    def get_template_client(self, region: str | None = None) -> WorkflowTemplateServiceAsyncClient:
+    async def get_template_client(self, region: str | None = None) -> WorkflowTemplateServiceAsyncClient:
         """Create a WorkflowTemplateServiceAsyncClient."""
         client_options = None
         if region and region != "global":
             client_options = ClientOptions(api_endpoint=f"{region}-dataproc.googleapis.com:443")
 
+        sync_hook = await self.get_sync_hook()
         return WorkflowTemplateServiceAsyncClient(
-            credentials=self.get_credentials(), client_info=CLIENT_INFO, client_options=client_options
+            credentials=sync_hook.get_credentials(), client_info=CLIENT_INFO, client_options=client_options
         )
 
-    def get_job_client(self, region: str | None = None) -> JobControllerAsyncClient:
+    async def get_job_client(self, region: str | None = None) -> JobControllerAsyncClient:
         """Create a JobControllerAsyncClient."""
         if self._cached_client is None:
             client_options = None
             if region and region != "global":
                 client_options = ClientOptions(api_endpoint=f"{region}-dataproc.googleapis.com:443")
 
+            sync_hook = await self.get_sync_hook()
             self._cached_client = JobControllerAsyncClient(
-                credentials=self.get_credentials(),
+                credentials=sync_hook.get_credentials(),
                 client_info=CLIENT_INFO,
                 client_options=client_options,
             )
         return self._cached_client
 
-    def get_batch_client(self, region: str | None = None) -> BatchControllerAsyncClient:
+    async def get_batch_client(self, region: str | None = None) -> BatchControllerAsyncClient:
         """Create a BatchControllerAsyncClient."""
         client_options = None
         if region and region != "global":
             client_options = ClientOptions(api_endpoint=f"{region}-dataproc.googleapis.com:443")
 
+        sync_hook = await self.get_sync_hook()
         return BatchControllerAsyncClient(
-            credentials=self.get_credentials(), client_info=CLIENT_INFO, client_options=client_options
+            credentials=sync_hook.get_credentials(), client_info=CLIENT_INFO, client_options=client_options
         )
 
-    def get_operations_client(self, region: str) -> OperationsClient:
+    async def get_operations_client(self, region: str) -> OperationsClient:
         """Create a OperationsClient."""
-        return self.get_template_client(region=region).transport.operations_client
+        template_client = await self.get_template_client(region=region)
+        return template_client.transport.operations_client
+
+    async def get_cluster(
+        self,
+        region: str,
+        project_id: str,
+        cluster_name: str,

Review Comment:
   Is there a reason the parameters are in a different order? Because these are required parameters, this could be a breaking change for users who don't specify the parameter name.



-- 
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-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix: Change DataprocAsyncHook parent class to GoogleBaseAsyncHook [airflow]

Posted by "kgw7401 (via GitHub)" <gi...@apache.org>.
kgw7401 commented on code in PR #52981:
URL: https://github.com/apache/airflow/pull/52981#discussion_r2205960181


##########
providers/google/src/airflow/providers/google/cloud/hooks/dataproc.py:
##########
@@ -1404,7 +1441,6 @@ async def create_cluster(
         )
         return result
 
-    @GoogleBaseHook.fallback_to_default_project_id

Review Comment:
   I couldn't expect the breaking change. I've added the decorator again



-- 
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-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix: Change DataprocAsyncHook parent class to GoogleBaseAsyncHook [airflow]

Posted by "kgw7401 (via GitHub)" <gi...@apache.org>.
kgw7401 commented on PR #52981:
URL: https://github.com/apache/airflow/pull/52981#issuecomment-3066331861

   @RNHTTR Hi there! Could you review my pr when you have time?


-- 
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-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix: Change DataprocAsyncHook parent class to GoogleBaseAsyncHook [airflow]

Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on PR #52981:
URL: https://github.com/apache/airflow/pull/52981#issuecomment-3092319720

   We try to focus on one thing only in one PR - this is super important for cherry-picking/reverting / tracking what was changed when


-- 
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-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org