-
Notifications
You must be signed in to change notification settings - Fork 149
Ftr/dev 12639 update custom download #4447
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
ae408ab
[DEV-12639] add file c spark functionality
loreleitrimberger c6be152
Merge branch 'qat' into ftr/dev-12639-update-custom-download
loreleitrimberger 1062b18
[DEV-12639] add spark job for downloading file c accounts in spark
loreleitrimberger 7b7f904
[DEV-12639] update to account for other submission types
loreleitrimberger 4d7050e
[DEV-12639] add test, clean up
loreleitrimberger 0daaa4a
[DEV-12639] pre-commit fix
loreleitrimberger ee3c1e4
[DEV-12639] Update spark test, add ability to include object_class_pr…
loreleitrimberger a0ae19c
Merge branch 'qat' into ftr/dev-12639-update-custom-download
loreleitrimberger 654c4b8
[DEV-12639] format
loreleitrimberger 4558e83
[DEV-12639] format
loreleitrimberger ee82139
Merge branch 'ftr/dev-12639-update-custom-download' of https://github…
loreleitrimberger 4900b48
Revert "[DEV-12639] format"
loreleitrimberger f07a3e5
Revert "[DEV-12639] format"
loreleitrimberger e9ffd2d
[DEV-12639] cleanup
loreleitrimberger 19c7017
[DEV-12639] format
loreleitrimberger 9a49a2f
[DEV-12639] format
loreleitrimberger 6e10e5b
Revert "[DEV-12639] format"
loreleitrimberger 7bbaceb
[DEV-12639] Fix files updated from black
loreleitrimberger c13a2a1
[DEV-12639] fix builder.py
loreleitrimberger e5c86d5
[DEV-12639] remove duplicate method
loreleitrimberger 427786b
[DEV-12639] sandbox changes
loreleitrimberger 9bb8ddb
[DEV-12639] revert builders.py
loreleitrimberger 918752b
Merge branch 'qat' into ftr/dev-12639-update-custom-download
sethstoudenmier File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -4,11 +4,17 @@ | |||
| from typing import TYPE_CHECKING, Generator | ||||
|
|
||||
| from databricks.sdk import WorkspaceClient | ||||
| from django.conf import settings | ||||
| from django.core.management import call_command | ||||
|
|
||||
| from usaspending_api.common.helpers.spark_helpers import configure_spark_session, get_active_spark_session | ||||
| from usaspending_api.common.spark.configs import LOCAL_EXTENDED_EXTRA_CONF | ||||
|
|
||||
| if settings.IS_LOCAL: | ||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
This is causing the import below to happen, which errors in not spark contexts because pyspark is not a defined dependency of the app.
|
||||
| # Importing this only for local development. For local strategy it is expected that a Spark session is available, | ||||
| # however, for Databricks and EMR strategies a Spark session is not available on the API itself. In these cases the | ||||
| # job is submitted to Databricks or EMR where the Spark session exists. | ||||
| from usaspending_api.common.helpers.spark_helpers import configure_spark_session, get_active_spark_session | ||||
|
|
||||
| if TYPE_CHECKING: | ||||
| from pyspark.sql import SparkSession | ||||
|
|
||||
|
|
||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.