Skip to content
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.

Sign up for GitHub

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

fix: "None" in key path when no prefix is specified #43

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: "None" in key path when no prefix is specified #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
952d4aa
Fix git conflict markers in `poetry.lock`
ReubenFrankel Sep 13, 2024
a1d9c3c
Use `PurePosixPath` to normalise constructed path
ReubenFrankel Sep 13, 2024
84cd7f2
`steam_name` -> `stream_name`
ReubenFrankel Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 9 additions & 14 deletions target_s3/formats/format_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
import re
import inflection
import json
import collections
import logging
from datetime import datetime
from abc import ABCMeta, abstractmethod
from datetime import datetime
from pathlib import PurePosixPath

from boto3 import Session
from smart_open import open


LOGGER = logging.getLogger("target-s3")
DATE_GRAIN = {
"year": 7,
Expand Down Expand Up @@ -67,11 +63,11 @@ def __init__(self, config: dict, context: dict, extension: str) -> None:
endpoint_url=aws_config.get("aws_endpoint_override", None),
)

steam_name: str = self.context["stream_name"]
self.prefix = config.get("prefix", None)
stream_name: str = self.context["stream_name"]
self.prefix = config.get("prefix", "")
self.logger = context["logger"]
self.fully_qualified_key = (
f"{self.bucket}/{self.prefix}/{steam_name}"
PurePosixPath(self.bucket, self.prefix, stream_name)
if config.get("use_raw_stream_name")
else self.create_key()
)
Expand Down Expand Up @@ -111,21 +107,20 @@ def create_key(self) -> str:
if self.stream_name_path_override is None
else self.stream_name_path_override
)
folder_path = f"{self.bucket}/{self.prefix}/{stream_name}/"
file_name = ""
file_path = PurePosixPath(self.bucket, self.prefix, stream_name)
if self.config["append_date_to_prefix"]:
grain = DATE_GRAIN[self.config["append_date_to_prefix_grain"].lower()]
partition_name_enabled = False
if self.config["partition_name_enabled"]:
partition_name_enabled = self.config["partition_name_enabled"]
folder_path += self.create_folder_structure(
file_path /= self.create_folder_structure(
batch_start, grain, partition_name_enabled
)
if self.config["append_date_to_filename"]:
grain = DATE_GRAIN[self.config["append_date_to_filename_grain"].lower()]
file_name += f"{self.create_file_structure(batch_start, grain)}"
file_path /= self.create_file_structure(batch_start, grain)

return f"{folder_path}{file_name}.{self.extension}.{self.compression}"
return f"{file_path}.{self.extension}.{self.compression}"

def create_folder_structure(
self, batch_start: datetime, grain: int, partition_name_enabled: bool
Expand Down