Bigquery localisation #62
Merged
Conversation
This file contains 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
3ebd7c7 to
ef87098
Compare
rudolfix
requested changes
Sep 14, 2022
dlt/pipeline/typing.py
Outdated
| @@ -48,20 +49,19 @@ def default_dataset(self, new_value: str) -> None: | |||
| self.DEFAULT_DATASET = new_value | |||
|
|
|||
| @classmethod | |||
| def from_services_dict(cls, services: StrAny, dataset_prefix: str) -> "GCPPipelineCredentials": | |||
| def from_services_dict(cls, services: StrAny, dataset_prefix: str, location: str) -> "GCPPipelineCredentials": | |||
There was a problem hiding this comment.
please add a default for location: str = "US" to make it backward compatible with all our examples. this code will be removed in v2 anyway so we can take some shortcuts
There was a problem hiding this comment.
see the linter output
./check-package.sh
poetry run mypy --config-file mypy.ini dlt examples
examples/sync_schema_example.py:4: error: Missing positional argument "location" in call to "from_services_file" of "GCPPipelineCredentials"
examples/singer_tap_jsonl_example.py:12: error: Missing positional argument "location" in call to "from_services_file" of "GCPPipelineCredentials"
examples/singer_tap_example.py:10: error: Missing positional argument "location" in call to "from_services_file" of "GCPPipelineCredentials"
examples/quickstart.py:25: error: Missing positional argument "location" in call to "from_services_dict" of "GCPPipelineCredentials"
examples/google_sheets.py:9: error: Missing positional argument "location" in call to "from_services_file" of "GCPPipelineCredentials"
examples/google_drive_csv.py:6[8](https://github.com/scale-vector/dlt/actions/runs/3052952945/jobs/4922951182#step:8:9): error: Missing positional argument "location" in call to "from_services_file" of "GCPPipelineCredentials"
examples/demo_example.py:84: error: Missing positional argument "location" in call to "from_services_file" of "GCPPipelineCredentials"
examples/rasa_example.py:3[9](https://github.com/scale-vector/dlt/actions/runs/3052952945/jobs/4922951182#step:8:10): error: Missing positional argument "location" in call to "from_services_dict" of "GCPPipelineCredentials"
Found 8 errors in 8 files (checked [11](https://github.com/scale-vector/dlt/actions/runs/3052952945/jobs/4922951182#step:8:12)4 source files)
make: *** [Makefile:41: lint] Error 1
Error: Process completed with exit code 2.
| @@ -62,7 +62,7 @@ def open_connection(self) -> None: | |||
| credentials = None | |||
| else: | |||
| credentials = service_account.Credentials.from_service_account_info(self.C.as_credentials()) | |||
| self._client = bigquery.Client(self.C.PROJECT_ID, credentials=credentials) | |||
| self._client = bigquery.Client(self.C.PROJECT_ID, credentials=credentials, location=self.C.LOCATION) | |||
There was a problem hiding this comment.
can you do an experiment?
line: 204
return BigQueryLoadJob(
JobClientBase.get_file_name_from_file_path(file_path),
self._create_load_job(table["name"], table["write_disposition"], file_path),
self.CREDENTIALS
)
replace self.CREDENTIALS with self.sql_client.native_connection()
and see if all works. then we are sure the same client contexts used in other places is passed to the load job
There was a problem hiding this comment.
there are 2 places, start_file_load, and restore_file_load, should I just do the restore or both?
There was a problem hiding this comment.
OK I retract this :) all jobs are already using the client when created so they will be in the right location
rudolfix
requested changes
Sep 19, 2022
dlt/load/bigquery/client.py
Outdated
| @@ -203,7 +203,8 @@ def restore_file_load(self, file_path: str) -> LoadJob: | |||
| return BigQueryLoadJob( | |||
| JobClientBase.get_file_name_from_file_path(file_path), | |||
| self._retrieve_load_job(file_path), | |||
| self.CREDENTIALS | |||
| #self.CREDENTIALS | |||
| "sender_id":'90238094809sajlkjxoiewjhduuiuehd', | ||
| "timestamp": str(pendulum.now()) | ||
| } | ||
| #job = expect_load_file(client, file_storage, json.dumps(load_json), user_table_name) |
There was a problem hiding this comment.
what is the problem with the test? let's set up the testing so you can run tests locally
1987430 to
bd92de8
Compare
rudolfix
approved these changes
Sep 20, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.