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.

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

chore(internal): replace string concatenation with f-strings #908

Merged
merged 1 commit into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/openai/_utils/_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ def human_join(seq: Sequence[str], *, delim: str = ", ", final: str = "or") -> s

def quote(string: str) -> str:
"""Add single quotation marks around the given string. Does *not* do any escaping."""
return "'" + string + "'"
return f"'{string}'"


def required_args(*variants: Sequence[str]) -> Callable[[CallableT], CallableT]:
Expand Down
6 changes: 3 additions & 3 deletions src/openai/lib/_validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,10 +309,10 @@ def common_completion_prefix_validator(df: pd.DataFrame) -> Remediation:
return Remediation(name="common_prefix")

def remove_common_prefix(x: Any, prefix: Any, ws_prefix: Any) -> Any:
x["completion"] = x["completion"].str[len(prefix) :]
x["completion"] = x["completion"].str[len(prefix):]
if ws_prefix:
# keep the single whitespace as prefix
x["completion"] = " " + x["completion"]
x["completion"] = f" {x['completion']}"
return x

if (df.completion == common_prefix).all():
Expand Down Expand Up @@ -624,7 +624,7 @@ def get_outfnames(fname: str, split: bool) -> list[str]:
while True:
index_suffix = f" ({i})" if i > 0 else ""
candidate_fnames = [
os.path.splitext(fname)[0] + "_prepared" + suffix + index_suffix + ".jsonl" for suffix in suffixes
f"{os.path.splitext(fname)[0]}_prepared{suffix}{index_suffix}.jsonl" for suffix in suffixes
]
if not any(os.path.isfile(f) for f in candidate_fnames):
return candidate_fnames
Expand Down
2 changes: 1 addition & 1 deletion tests/test_required_args.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def foo(*, a: str | None = None) -> str | None:
def test_multiple_params() -> None:
@required_args(["a", "b", "c"])
def foo(a: str = "", *, b: str = "", c: str = "") -> str | None:
return a + " " + b + " " + c
return f"{a} {b} {c}"

assert foo(a="a", b="b", c="c") == "a b c"

Expand Down