You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2021/05/29 15:19:27 UTC

[GitHub] [airflow] tegardp opened a new pull request #16160: Fix: GCS To BigQuery source_object #16008

tegardp opened a new pull request #16160:
URL: https://github.com/apache/airflow/pull/16160


   Fix GCS To BigQuery Operator's parameter `source_object` to accept both str and list
   
   <!--
   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 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/
   -->
   
   ---
   **^ Add meaningful description above**
   
   Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#pull-request-guidelines)** for more information.
   In case of fundamental code change, Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvements+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 [UPDATING.md](https://github.com/apache/airflow/blob/master/UPDATING.md).
   


-- 
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.

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



[GitHub] [airflow] eladkal commented on a change in pull request #16160: Fix: GCS To BigQuery source_object

Posted by GitBox <gi...@apache.org>.
eladkal commented on a change in pull request #16160:
URL: https://github.com/apache/airflow/pull/16160#discussion_r642054200



##########
File path: airflow/providers/google/cloud/transfers/gcs_to_bigquery.py
##########
@@ -286,7 +286,7 @@ def execute(self, context):
         else:
             schema_fields = self.schema_fields
 
-        source_uris = [f'gs://{self.bucket}/{source_object}' for source_object in self.source_objects]
+        source_uris = [f'gs://{self.bucket}/{source_object}' for source_object in self.source_objects] if type(self.source_objects) is list else [f'gs://{self.bucket}/{self.source_objects}'] 

Review comment:
       No. I was thinking of converting the type to List (if needed) so the logic part of the code won't need any modification as it works fine with List type. something like:
   ```
   if isinstance(obj, str):
      obj=[obj]
   ```




-- 
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.

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



[GitHub] [airflow] tegardp commented on a change in pull request #16160: Fix: GCS To BigQuery source_object

Posted by GitBox <gi...@apache.org>.
tegardp commented on a change in pull request #16160:
URL: https://github.com/apache/airflow/pull/16160#discussion_r642055227



##########
File path: airflow/providers/google/cloud/transfers/gcs_to_bigquery.py
##########
@@ -286,7 +286,7 @@ def execute(self, context):
         else:
             schema_fields = self.schema_fields
 
-        source_uris = [f'gs://{self.bucket}/{source_object}' for source_object in self.source_objects]
+        source_uris = [f'gs://{self.bucket}/{source_object}' for source_object in self.source_objects] if type(self.source_objects) is list else [f'gs://{self.bucket}/{self.source_objects}'] 

Review comment:
       ahh, I was thinking about that solution too. So, it doesn't have to be one line code?




-- 
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.

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



[GitHub] [airflow] eladkal commented on a change in pull request #16160: Fix: GCS To BigQuery source_object #16008

Posted by GitBox <gi...@apache.org>.
eladkal commented on a change in pull request #16160:
URL: https://github.com/apache/airflow/pull/16160#discussion_r642038157



##########
File path: airflow/providers/google/cloud/transfers/gcs_to_bigquery.py
##########
@@ -286,7 +286,7 @@ def execute(self, context):
         else:
             schema_fields = self.schema_fields
 
-        source_uris = [f'gs://{self.bucket}/{source_object}' for source_object in self.source_objects]
+        source_uris = [f'gs://{self.bucket}/{source_object}' for source_object in self.source_objects] if type(self.source_objects) is list else [f'gs://{self.bucket}/{self.source_objects}'] 

Review comment:
       Wouldn't it be better to convert the string to list and then the code will work just fine without a special case for string?




-- 
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.

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



[GitHub] [airflow] tegardp commented on a change in pull request #16160: Fix: GCS To BigQuery source_object

Posted by GitBox <gi...@apache.org>.
tegardp commented on a change in pull request #16160:
URL: https://github.com/apache/airflow/pull/16160#discussion_r642047217



##########
File path: airflow/providers/google/cloud/transfers/gcs_to_bigquery.py
##########
@@ -286,7 +286,7 @@ def execute(self, context):
         else:
             schema_fields = self.schema_fields
 
-        source_uris = [f'gs://{self.bucket}/{source_object}' for source_object in self.source_objects]
+        source_uris = [f'gs://{self.bucket}/{source_object}' for source_object in self.source_objects] if type(self.source_objects) is list else [f'gs://{self.bucket}/{self.source_objects}'] 

Review comment:
       But if the input is a list, wouldn't it be converted to a 2-dimensional list?
   ```
   self.source_objects = "file1.csv"
   source_object = [self.source_objects]
   output: ["file1.csv"]
   
   self.source_objects = ["file1.csv", "file2.csv", "file3.csv"]
   source_object = [self.source_objects]
   output: [["file1.csv", "file2.csv", "file3.csv"]]
   ```




-- 
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.

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



[GitHub] [airflow] tegardp edited a comment on pull request #16160: Fix: GCS To BigQuery source_object #16008

Posted by GitBox <gi...@apache.org>.
tegardp edited a comment on pull request #16160:
URL: https://github.com/apache/airflow/pull/16160#issuecomment-850912338


   > Could you please add a test for that @tegardp
   
   ah, okay
   
   EDIT: I already checked the `test_gcs_to_bigquery`, but I a little bit confused about how to write the test. Would you mind giving me a hint?


-- 
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.

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



[GitHub] [airflow] linchun3 commented on pull request #16160: Fix: GCS To BigQuery source_object

Posted by GitBox <gi...@apache.org>.
linchun3 commented on pull request #16160:
URL: https://github.com/apache/airflow/pull/16160#issuecomment-943090621


   hey, @tegardp I noticed that this change could be missing an edge case when retrieving a list of files from `x_com`:
   
   Example:
   ```
   default_args = {
   "render_template_as_native_obj": True
   } 
   
   ...
   
   # retrieval of files from x_com
   files = ["file1.txt", "file2.txt", "file3.txt"]
   ```
   since the rendering to native object only happens on `execute`, the value retrieve from x_comms would still be
   `"["file1.txt", "file2.txt", "file3.txt"]"` on initialisation and `self.source_objects` of the operator would be `["["file1.txt", "file2.txt", "file3.txt"]"]` which is not the intended behaviour.


-- 
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



[GitHub] [airflow] potiuk commented on pull request #16160: Fix: GCS To BigQuery source_object #16008

Posted by GitBox <gi...@apache.org>.
potiuk commented on pull request #16160:
URL: https://github.com/apache/airflow/pull/16160#issuecomment-850894924


   Could you please add a test for that @tegardp 


-- 
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.

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



[GitHub] [airflow] tegardp commented on pull request #16160: Fix: GCS To BigQuery source_object #16008

Posted by GitBox <gi...@apache.org>.
tegardp commented on pull request #16160:
URL: https://github.com/apache/airflow/pull/16160#issuecomment-850912338


   > Could you please add a test for that @tegardp
   
   ah, okay


-- 
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.

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



[GitHub] [airflow] boring-cyborg[bot] commented on pull request #16160: Fix: GCS To BigQuery source_object

Posted by GitBox <gi...@apache.org>.
boring-cyborg[bot] commented on pull request #16160:
URL: https://github.com/apache/airflow/pull/16160#issuecomment-851176352


   Awesome work, congrats on your first merged pull request!
   


-- 
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.

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



[GitHub] [airflow] potiuk commented on pull request #16160: Fix: GCS To BigQuery source_object

Posted by GitBox <gi...@apache.org>.
potiuk commented on pull request #16160:
URL: https://github.com/apache/airflow/pull/16160#issuecomment-851035095


   Looks good :). Running the workflow now !


-- 
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.

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



[GitHub] [airflow] eladkal merged pull request #16160: Fix: GCS To BigQuery source_object

Posted by GitBox <gi...@apache.org>.
eladkal merged pull request #16160:
URL: https://github.com/apache/airflow/pull/16160


   


-- 
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.

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



[GitHub] [airflow] tegardp commented on pull request #16160: Fix: GCS To BigQuery source_object

Posted by GitBox <gi...@apache.org>.
tegardp commented on pull request #16160:
URL: https://github.com/apache/airflow/pull/16160#issuecomment-851000067


   Thanks, @potiuk @eladkal, I pushed my tests. Did I do it correctly?


-- 
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.

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



[GitHub] [airflow] eladkal commented on pull request #16160: Fix: GCS To BigQuery source_object

Posted by GitBox <gi...@apache.org>.
eladkal commented on pull request #16160:
URL: https://github.com/apache/airflow/pull/16160#issuecomment-850985807


   Also please add a test to https://github.com/apache/airflow/blob/master/tests/providers/google/cloud/transfers/test_gcs_to_bigquery.py I think just a test that verify once with list and once with string is enough


-- 
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.

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



[GitHub] [airflow] github-actions[bot] commented on pull request #16160: Fix: GCS To BigQuery source_object

Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #16160:
URL: https://github.com/apache/airflow/pull/16160#issuecomment-851175953


   The PR is likely OK to be merged with just subset of tests for default Python and Database versions without running the full matrix of tests, because it does not modify the core of Airflow. If the committers decide that the full tests matrix is needed, they will add the label 'full tests needed'. Then you should rebase to the latest master or amend the last commit of the PR, and push it with --force-with-lease.


-- 
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.

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



[GitHub] [airflow] potiuk commented on pull request #16160: Fix: GCS To BigQuery source_object

Posted by GitBox <gi...@apache.org>.
potiuk commented on pull request #16160:
URL: https://github.com/apache/airflow/pull/16160#issuecomment-850987298


    > EDIT: I already checked the `test_gcs_to_bigquery.py`, but I a little bit confused about how to write the test. Would you mind giving me a hint? @potiuk
   
   @eladkal is correct - just add a test where the `source_object` is string /list of strings. In the current test 
   
   ```
   TEST_SOURCE_OBJECTS
   ```
   
   is list of strings, but you can create another TEST_SOURCE_OBJECTS_AS_STRING (with string value) and copy one of the existing tests just using this new constant.
   


-- 
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.

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



[GitHub] [airflow] eladkal commented on a change in pull request #16160: Fix: GCS To BigQuery source_object

Posted by GitBox <gi...@apache.org>.
eladkal commented on a change in pull request #16160:
URL: https://github.com/apache/airflow/pull/16160#discussion_r642062694



##########
File path: airflow/providers/google/cloud/transfers/gcs_to_bigquery.py
##########
@@ -285,7 +285,7 @@ def execute(self, context):
 
         else:
             schema_fields = self.schema_fields
-
+        

Review comment:
       please remove this white space




-- 
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.

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



[GitHub] [airflow] tegardp edited a comment on pull request #16160: Fix: GCS To BigQuery source_object #16008

Posted by GitBox <gi...@apache.org>.
tegardp edited a comment on pull request #16160:
URL: https://github.com/apache/airflow/pull/16160#issuecomment-850912338


   > Could you please add a test for that @tegardp
   
   ah, okay
   
   EDIT: I already checked the `test_gcs_to_bigquery.py`, but I a little bit confused about how to write the test. Would you mind giving me a hint? @potiuk 


-- 
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.

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



[GitHub] [airflow] boring-cyborg[bot] commented on pull request #16160: Fix: GCS To BigQuery source_object #16008

Posted by GitBox <gi...@apache.org>.
boring-cyborg[bot] commented on pull request #16160:
URL: https://github.com/apache/airflow/pull/16160#issuecomment-850850202


   Congratulations on your first Pull Request and welcome to the Apache Airflow community! If you have any issues or are unsure about any anything please check our Contribution Guide (https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst)
   Here are some useful points:
   - Pay attention to the quality of your code (flake8, pylint and type annotations). Our [pre-commits]( https://github.com/apache/airflow/blob/master/STATIC_CODE_CHECKS.rst#prerequisites-for-pre-commit-hooks) will help you with that.
   - In case of a new feature add useful documentation (in docstrings or in `docs/` directory). Adding a new operator? Check this short [guide](https://github.com/apache/airflow/blob/master/docs/apache-airflow/howto/custom-operator.rst) Consider adding an example DAG that shows how users should use it.
   - Consider using [Breeze environment](https://github.com/apache/airflow/blob/master/BREEZE.rst) for testing locally, itโ€™s a heavy docker but it ships with a working Airflow and a lot of integrations.
   - Be patient and persistent. It might take some time to get a review or get the final approval from Committers.
   - Please follow [ASF Code of Conduct](https://www.apache.org/foundation/policies/conduct) for all communication including (but not limited to) comments on Pull Requests, Mailing list and Slack.
   - Be sure to read the [Airflow Coding style]( https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#coding-style-and-best-practices).
   Apache Airflow is a community-driven project and together we are making it better ๐Ÿš€.
   In case of doubts contact the developers at:
   Mailing List: dev@airflow.apache.org
   Slack: https://s.apache.org/airflow-slack
   


-- 
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.

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



[GitHub] [airflow] potiuk edited a comment on pull request #16160: Fix: GCS To BigQuery source_object

Posted by GitBox <gi...@apache.org>.
potiuk edited a comment on pull request #16160:
URL: https://github.com/apache/airflow/pull/16160#issuecomment-850987298






-- 
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.

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