You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "philipgray (via GitHub)" <gi...@apache.org> on 2023/09/21 20:51:13 UTC
[GitHub] [airflow] philipgray opened a new pull request, #34533: Defined constants for repo routes in databricks hook
philipgray opened a new pull request, #34533:
URL: https://github.com/apache/airflow/pull/34533
<!--
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/
-->
Hi, this is my first PR, so I'm sorry if this isn't perfect.
Per #34521 I created three new constants for the routes, and then modified said functions to use those constants as opposed to having the route defined within the function.
<!-- Please keep an empty line above the dashes. -->
---
**^ Add meaningful description above**
Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/main/CONTRIBUTING.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 [newsfragments](https://github.com/apache/airflow/tree/main/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
[GitHub] [airflow] hussein-awala commented on a diff in pull request #34533: Defined constants for repo routes in databricks hook
Posted by "hussein-awala (via GitHub)" <gi...@apache.org>.
hussein-awala commented on code in PR #34533:
URL: https://github.com/apache/airflow/pull/34533#discussion_r1333638432
##########
airflow/providers/databricks/hooks/databricks.py:
##########
@@ -526,7 +530,7 @@ def update_repo(self, repo_id: str, json: dict[str, Any]) -> dict:
:param json: payload
:return: metadata from update
"""
- repos_endpoint = ("PATCH", f"api/2.0/repos/{repo_id}")
+ repos_endpoint = UPDATE_REPO_ENDPOINT[1].format(repo_id=repo_id)
Review Comment:
It looks like you use only the second part of the tuple and not the whole tuple which is needed.
##########
airflow/providers/databricks/hooks/databricks.py:
##########
@@ -536,7 +540,7 @@ def delete_repo(self, repo_id: str):
:param repo_id: ID of Databricks Repos
:return:
"""
- repos_endpoint = ("DELETE", f"api/2.0/repos/{repo_id}")
+ repos_endpoint = DELETE_REPO_ENDPOINT[1].format(repo_id=repo_id)
Review Comment:
Same here
--
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] philipgray commented on a diff in pull request #34533: Defined constants for repo routes in databricks hook
Posted by "philipgray (via GitHub)" <gi...@apache.org>.
philipgray commented on code in PR #34533:
URL: https://github.com/apache/airflow/pull/34533#discussion_r1337616686
##########
airflow/providers/databricks/hooks/databricks.py:
##########
@@ -536,7 +540,7 @@ def delete_repo(self, repo_id: str):
:param repo_id: ID of Databricks Repos
:return:
"""
- repos_endpoint = ("DELETE", f"api/2.0/repos/{repo_id}")
+ repos_endpoint = DELETE_REPO_ENDPOINT[1].format(repo_id=repo_id)
Review Comment:
Piggybacking off what @frankcash suggested, how does this change look @hussein-awala?
`
def update_repo(self, repo_id: str, json: dict[str, Any]) -> dict:
"""
Updates given Databricks Repos.
:param repo_id: ID of Databricks Repos
:param json: payload
:return: metadata from update
"""
modify_route = lambda t, repo_id: (t[0], t[1].format(repo_id=repo_id))
modified_update_repo_endpoint = modify_route(UPDATE_REPO_ENDPOINT, repo_id)
return self._do_api_call(modified_update_repo_endpoint, json)
`
And:
`
def delete_repo(self, repo_id: str):
"""
Deletes given Databricks Repos.
:param repo_id: ID of Databricks Repos
:return:
"""
modify_route = lambda t, repo_id: (t[0], t[1].format(repo_id=repo_id))
modified_delete_repo_endpoint = modify_route(DELETE_REPO_ENDPOINT, repo_id)
self._do_api_call(modified_delete_repo_endpoint)
`
Wasn't too sure if it would be more helpful to just create a helper function instead to do this. Let me know what you think!
--
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] philipgray commented on a diff in pull request #34533: Defined constants for repo routes in databricks hook
Posted by "philipgray (via GitHub)" <gi...@apache.org>.
philipgray commented on code in PR #34533:
URL: https://github.com/apache/airflow/pull/34533#discussion_r1337616686
##########
airflow/providers/databricks/hooks/databricks.py:
##########
@@ -536,7 +540,7 @@ def delete_repo(self, repo_id: str):
:param repo_id: ID of Databricks Repos
:return:
"""
- repos_endpoint = ("DELETE", f"api/2.0/repos/{repo_id}")
+ repos_endpoint = DELETE_REPO_ENDPOINT[1].format(repo_id=repo_id)
Review Comment:
Piggybacking off what @frankcash suggested, how does this change look @hussein-awala?
```
def update_repo(self, repo_id: str, json: dict[str, Any]) -> dict:
"""
Updates given Databricks Repos.
:param repo_id: ID of Databricks Repos
:param json: payload
:return: metadata from update
"""
modify_route = lambda t, repo_id: (t[0], t[1].format(repo_id=repo_id))
modified_update_repo_endpoint = modify_route(UPDATE_REPO_ENDPOINT, repo_id)
return self._do_api_call(modified_update_repo_endpoint, json)
def delete_repo(self, repo_id: str):
"""
Deletes given Databricks Repos.
:param repo_id: ID of Databricks Repos
:return:
"""
modify_route = lambda t, repo_id: (t[0], t[1].format(repo_id=repo_id))
modified_delete_repo_endpoint = modify_route(DELETE_REPO_ENDPOINT, repo_id)
self._do_api_call(modified_delete_repo_endpoint)
```
Wasn't too sure if it would be more helpful to just create a helper function instead to do this. Let me know what you think!
--
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] philipgray commented on a diff in pull request #34533: Defined constants for repo routes in databricks hook
Posted by "philipgray (via GitHub)" <gi...@apache.org>.
philipgray commented on code in PR #34533:
URL: https://github.com/apache/airflow/pull/34533#discussion_r1337616686
##########
airflow/providers/databricks/hooks/databricks.py:
##########
@@ -536,7 +540,7 @@ def delete_repo(self, repo_id: str):
:param repo_id: ID of Databricks Repos
:return:
"""
- repos_endpoint = ("DELETE", f"api/2.0/repos/{repo_id}")
+ repos_endpoint = DELETE_REPO_ENDPOINT[1].format(repo_id=repo_id)
Review Comment:
Piggybacking off what @frankcash suggested, how does this change look @hussein-awala?
```
def update_repo(self, repo_id: str, json: dict[str, Any]) -> dict:
"""
Updates given Databricks Repos.
:param repo_id: ID of Databricks Repos
:param json: payload
:return: metadata from update
"""
modify_route = lambda t, repo_id: (t[0], t[1].format(repo_id=repo_id))
modified_update_repo_endpoint = modify_route(UPDATE_REPO_ENDPOINT, repo_id)
return self._do_api_call(modified_update_repo_endpoint, json)
def delete_repo(self, repo_id: str):
"""
Deletes given Databricks Repos.
:param repo_id: ID of Databricks Repos
:return:
"""
modify_route = lambda t, repo_id: (t[0], t[1].format(repo_id=repo_id))
modified_delete_repo_endpoint = modify_route(DELETE_REPO_ENDPOINT, repo_id)
self._do_api_call(modified_delete_repo_endpoint)
```
Wasn't too sure if it would be more helpful to just create a helper function instead to doing this. Let me know what you think!
--
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] frankcash commented on a diff in pull request #34533: Defined constants for repo routes in databricks hook
Posted by "frankcash (via GitHub)" <gi...@apache.org>.
frankcash commented on code in PR #34533:
URL: https://github.com/apache/airflow/pull/34533#discussion_r1334262330
##########
airflow/providers/databricks/hooks/databricks.py:
##########
@@ -526,7 +530,7 @@ def update_repo(self, repo_id: str, json: dict[str, Any]) -> dict:
:param json: payload
:return: metadata from update
"""
- repos_endpoint = ("PATCH", f"api/2.0/repos/{repo_id}")
+ repos_endpoint = UPDATE_REPO_ENDPOINT[1].format(repo_id=repo_id)
Review Comment:
Yeah, it looks like you are setting repos endpoint to just the endpoint will which not work for [self._do_api_calls ](https://github.com/apache/airflow/blob/24394ee79df085edf8502894ceb82aa0150147bf/airflow/providers/databricks/hooks/databricks_base.py#L552-L572) as it is expecting a tuple
--
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] frankcash commented on pull request #34533: Defined constants for repo routes in databricks hook
Posted by "frankcash (via GitHub)" <gi...@apache.org>.
frankcash commented on PR #34533:
URL: https://github.com/apache/airflow/pull/34533#issuecomment-1735343581
@philipgray are you still working on this?
--
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] philipgray closed pull request #34533: Defined constants for repo routes in databricks hook
Posted by "philipgray (via GitHub)" <gi...@apache.org>.
philipgray closed pull request #34533: Defined constants for repo routes in databricks hook
URL: https://github.com/apache/airflow/pull/34533
--
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] philipgray commented on a diff in pull request #34533: Defined constants for repo routes in databricks hook
Posted by "philipgray (via GitHub)" <gi...@apache.org>.
philipgray commented on code in PR #34533:
URL: https://github.com/apache/airflow/pull/34533#discussion_r1337616686
##########
airflow/providers/databricks/hooks/databricks.py:
##########
@@ -536,7 +540,7 @@ def delete_repo(self, repo_id: str):
:param repo_id: ID of Databricks Repos
:return:
"""
- repos_endpoint = ("DELETE", f"api/2.0/repos/{repo_id}")
+ repos_endpoint = DELETE_REPO_ENDPOINT[1].format(repo_id=repo_id)
Review Comment:
Piggybacking off what @frankcash suggested, how does this change look @hussein-awala?
`
def update_repo(self, repo_id: str, json: dict[str, Any]) -> dict:
"""
Updates given Databricks Repos.
:param repo_id: ID of Databricks Repos
:param json: payload
:return: metadata from update
"""
modify_route = lambda t, repo_id: (t[0], t[1].format(repo_id=repo_id))
modified_update_repo_endpoint = modify_route(UPDATE_REPO_ENDPOINT, repo_id)
return self._do_api_call(modified_update_repo_endpoint, json)
def delete_repo(self, repo_id: str):
"""
Deletes given Databricks Repos.
:param repo_id: ID of Databricks Repos
:return:
"""
modify_route = lambda t, repo_id: (t[0], t[1].format(repo_id=repo_id))
modified_delete_repo_endpoint = modify_route(DELETE_REPO_ENDPOINT, repo_id)
self._do_api_call(modified_delete_repo_endpoint)
`
Wasn't too sure if it would be more helpful to just create a helper function instead to do this. Let me know what you think!
--
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] boring-cyborg[bot] commented on pull request #34533: Defined constants for repo routes in databricks hook
Posted by "boring-cyborg[bot] (via GitHub)" <gi...@apache.org>.
boring-cyborg[bot] commented on PR #34533:
URL: https://github.com/apache/airflow/pull/34533#issuecomment-1730282603
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/main/CONTRIBUTING.rst)
Here are some useful points:
- Pay attention to the quality of your code (ruff, mypy and type annotations). Our [pre-commits]( https://github.com/apache/airflow/blob/main/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/main/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/main/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/main/CONTRIBUTING.rst#coding-style-and-best-practices).
- Always keep your Pull Requests rebased, otherwise your build might fail due to changes not related to your commits.
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] frankcash commented on a diff in pull request #34533: Defined constants for repo routes in databricks hook
Posted by "frankcash (via GitHub)" <gi...@apache.org>.
frankcash commented on code in PR #34533:
URL: https://github.com/apache/airflow/pull/34533#discussion_r1334274452
##########
airflow/providers/databricks/hooks/databricks.py:
##########
@@ -536,7 +540,7 @@ def delete_repo(self, repo_id: str):
:param repo_id: ID of Databricks Repos
:return:
"""
- repos_endpoint = ("DELETE", f"api/2.0/repos/{repo_id}")
+ repos_endpoint = DELETE_REPO_ENDPOINT[1].format(repo_id=repo_id)
Review Comment:
you could utilize a lambda to handle the formatting
```python
>>> y = lambda t, repo_id: (t[0], t[1].format(repo_id=repo_id))
>>> y(DELETE_REPO_ENDPOINT, repo_id)
('DELETE', 'api/2.0/repos/fizzbuzz')
```
--
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] philipgray commented on a diff in pull request #34533: Defined constants for repo routes in databricks hook
Posted by "philipgray (via GitHub)" <gi...@apache.org>.
philipgray commented on code in PR #34533:
URL: https://github.com/apache/airflow/pull/34533#discussion_r1337616686
##########
airflow/providers/databricks/hooks/databricks.py:
##########
@@ -536,7 +540,7 @@ def delete_repo(self, repo_id: str):
:param repo_id: ID of Databricks Repos
:return:
"""
- repos_endpoint = ("DELETE", f"api/2.0/repos/{repo_id}")
+ repos_endpoint = DELETE_REPO_ENDPOINT[1].format(repo_id=repo_id)
Review Comment:
Piggybacking off what @frankcash suggested, how does this change look @hussein-awala?
` def update_repo(self, repo_id: str, json: dict[str, Any]) -> dict:
"""
Updates given Databricks Repos.
:param repo_id: ID of Databricks Repos
:param json: payload
:return: metadata from update
"""
modify_route = lambda t, repo_id: (t[0], t[1].format(repo_id=repo_id))
modified_update_repo_endpoint = modify_route(UPDATE_REPO_ENDPOINT, repo_id)
return self._do_api_call(modified_update_repo_endpoint, json)
def delete_repo(self, repo_id: str):
"""
Deletes given Databricks Repos.
:param repo_id: ID of Databricks Repos
:return:
"""
modify_route = lambda t, repo_id: (t[0], t[1].format(repo_id=repo_id))
modified_delete_repo_endpoint = modify_route(DELETE_REPO_ENDPOINT, repo_id)
self._do_api_call(modified_delete_repo_endpoint)`
Wasn't too sure if it would be more helpful to just create a helper function instead to do this. Let me know what you think!
##########
airflow/providers/databricks/hooks/databricks.py:
##########
@@ -536,7 +540,7 @@ def delete_repo(self, repo_id: str):
:param repo_id: ID of Databricks Repos
:return:
"""
- repos_endpoint = ("DELETE", f"api/2.0/repos/{repo_id}")
+ repos_endpoint = DELETE_REPO_ENDPOINT[1].format(repo_id=repo_id)
Review Comment:
Piggybacking off what @frankcash suggested, how does this change look @hussein-awala?
`def update_repo(self, repo_id: str, json: dict[str, Any]) -> dict:
"""
Updates given Databricks Repos.
:param repo_id: ID of Databricks Repos
:param json: payload
:return: metadata from update
"""
modify_route = lambda t, repo_id: (t[0], t[1].format(repo_id=repo_id))
modified_update_repo_endpoint = modify_route(UPDATE_REPO_ENDPOINT, repo_id)
return self._do_api_call(modified_update_repo_endpoint, json)
def delete_repo(self, repo_id: str):
"""
Deletes given Databricks Repos.
:param repo_id: ID of Databricks Repos
:return:
"""
modify_route = lambda t, repo_id: (t[0], t[1].format(repo_id=repo_id))
modified_delete_repo_endpoint = modify_route(DELETE_REPO_ENDPOINT, repo_id)
self._do_api_call(modified_delete_repo_endpoint)`
Wasn't too sure if it would be more helpful to just create a helper function instead to do this. Let me know what you think!
--
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] philipgray commented on a diff in pull request #34533: Defined constants for repo routes in databricks hook
Posted by "philipgray (via GitHub)" <gi...@apache.org>.
philipgray commented on code in PR #34533:
URL: https://github.com/apache/airflow/pull/34533#discussion_r1337616686
##########
airflow/providers/databricks/hooks/databricks.py:
##########
@@ -536,7 +540,7 @@ def delete_repo(self, repo_id: str):
:param repo_id: ID of Databricks Repos
:return:
"""
- repos_endpoint = ("DELETE", f"api/2.0/repos/{repo_id}")
+ repos_endpoint = DELETE_REPO_ENDPOINT[1].format(repo_id=repo_id)
Review Comment:
Piggybacking off what @frankcash suggested, how does this change look @hussein-awala?
```python
def update_repo(self, repo_id: str, json: dict[str, Any]) -> dict:
"""
Updates given Databricks Repos.
:param repo_id: ID of Databricks Repos
:param json: payload
:return: metadata from update
"""
modify_route = lambda t, repo_id: (t[0], t[1].format(repo_id=repo_id))
modified_update_repo_endpoint = modify_route(UPDATE_REPO_ENDPOINT, repo_id)
return self._do_api_call(modified_update_repo_endpoint, json)
def delete_repo(self, repo_id: str):
"""
Deletes given Databricks Repos.
:param repo_id: ID of Databricks Repos
:return:
"""
modify_route = lambda t, repo_id: (t[0], t[1].format(repo_id=repo_id))
modified_delete_repo_endpoint = modify_route(DELETE_REPO_ENDPOINT, repo_id)
self._do_api_call(modified_delete_repo_endpoint)
```
Wasn't too sure if it would be more helpful to just create a helper function instead to doing this. Let me know what you think!
--
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