github/langchain
1
0
Fork 0
mirror of https://github.com/hwchase17/langchain.git synced 2025-07-04 04:07:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

langchain-openai[patch]: Add ruff bandit rules to linter (#31788)

Browse Source
This commit is contained in:
Mason Daugherty 2025-06-30 14:01:32 -04:00 committed by GitHub
parent 645e25f624
commit 33c9bf1adc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/partners/openai/langchain_openai/chat_models/_client_utils.py
View File

@ -23,7 +23,7 @@ class _SyncHttpxClientWrapper(openai.DefaultHttpxClient):
try:
self.close()
except Exception:
except Exception: # noqa: S110
pass
@ -37,7 +37,7 @@ class _AsyncHttpxClientWrapper(openai.DefaultAsyncHttpxClient):
try:
# TODO(someday): support non asyncio runtimes here
asyncio.get_running_loop().create_task(self.aclose())
except Exception:
except Exception: # noqa: S110
pass

6
libs/partners/openai/langchain_openai/llms/base.py
View File

@ -310,7 +310,8 @@ class BaseOpenAI(BaseLLM):
generation = chunk
else:
generation += chunk
assert generation is not None
if generation is None:
raise ValueError("Generation is empty after streaming.")
choices.append(
{
"text": generation.text,
@ -378,7 +379,8 @@ class BaseOpenAI(BaseLLM):
generation = chunk
else:
generation += chunk
assert generation is not None
if generation is None:
raise ValueError("Generation is empty after streaming.")
choices.append(
{
"text": generation.text,

8
libs/partners/openai/pyproject.toml
View File

@ -64,7 +64,7 @@ ignore_missing_imports = true
target-version = "py39"
[tool.ruff.lint]
select = ["E", "F", "I", "T201", "UP"]
select = ["E", "F", "I", "T201", "UP", "S"]
ignore = [ "UP007", ]
[tool.ruff.format]
@ -85,3 +85,9 @@ asyncio_mode = "auto"
filterwarnings = [
"ignore::langchain_core._api.beta_decorator.LangChainBetaWarning",
]
[tool.ruff.lint.extend-per-file-ignores]
"tests/**/*.py" = [
"S101", # Tests need assertions
"S311", # Standard pseudo-random generators are not suitable for cryptographic purposes
]

18
libs/partners/openai/tests/unit_tests/test_secrets.py
View File

@ -14,6 +14,8 @@ from langchain_openai import (
OpenAIEmbeddings,
)
AZURE_AD_TOKEN = "secret-api-key" # noqa: S105
def test_chat_openai_secrets() -> None:
o = ChatOpenAI(openai_api_key="foo") # type: ignore[call-arg]
@ -37,7 +39,7 @@ def test_azure_chat_openai_secrets() -> None:
o = AzureChatOpenAI( # type: ignore[call-arg]
openai_api_key="foo1",
azure_endpoint="endpoint",
azure_ad_token="foo2", # type: ignore[arg-type]
azure_ad_token=AZURE_AD_TOKEN, # type: ignore[arg-type]
api_version="version",
)
s = str(o)
@ -49,7 +51,7 @@ def test_azure_openai_secrets() -> None:
o = AzureOpenAI( # type: ignore[call-arg]
openai_api_key="foo1",
azure_endpoint="endpoint",
azure_ad_token="foo2", # type: ignore[arg-type]
azure_ad_token=AZURE_AD_TOKEN, # type: ignore[arg-type]
api_version="version",
)
s = str(o)
@ -61,7 +63,7 @@ def test_azure_openai_embeddings_secrets() -> None:
o = AzureOpenAIEmbeddings( # type: ignore[call-arg]
openai_api_key="foo1",
azure_endpoint="endpoint",
azure_ad_token="foo2", # type: ignore[arg-type]
azure_ad_token=AZURE_AD_TOKEN, # type: ignore[arg-type]
api_version="version",
)
s = str(o)
@ -77,7 +79,7 @@ def test_azure_openai_api_key_is_secret_string(model_class: type) -> None:
model = model_class(
openai_api_key="secret-api-key",
azure_endpoint="endpoint",
azure_ad_token="secret-ad-token",
azure_ad_token=AZURE_AD_TOKEN,
api_version="version",
)
assert isinstance(model.openai_api_key, SecretStr)
@ -115,7 +117,7 @@ def test_azure_openai_api_key_masked_when_passed_via_constructor(
model = model_class(
openai_api_key="secret-api-key",
azure_endpoint="endpoint",
azure_ad_token="secret-ad-token",
azure_ad_token=AZURE_AD_TOKEN,
api_version="version",
)
print(model.openai_api_key, end="") # noqa: T201
@ -139,11 +141,11 @@ def test_azure_openai_uses_actual_secret_value_from_secretstr(
model = model_class(
openai_api_key="secret-api-key",
azure_endpoint="endpoint",
azure_ad_token="secret-ad-token",
azure_ad_token=AZURE_AD_TOKEN,
api_version="version",
)
assert cast(SecretStr, model.openai_api_key).get_secret_value() == "secret-api-key"
assert cast(SecretStr, model.azure_ad_token).get_secret_value() == "secret-ad-token"
assert cast(SecretStr, model.azure_ad_token).get_secret_value() == AZURE_AD_TOKEN
@pytest.mark.parametrize("model_class", [ChatOpenAI, OpenAI, OpenAIEmbeddings])
@ -195,7 +197,7 @@ def test_azure_serialized_secrets(model_class: type) -> None:
assert serialized["kwargs"]["openai_api_key"]["id"] == ["AZURE_OPENAI_API_KEY"]
model = model_class(
azure_ad_token="secret-token", api_version="foo", azure_endpoint="foo"
azure_ad_token=AZURE_AD_TOKEN, api_version="foo", azure_endpoint="foo"
)
serialized = dumpd(model)
assert serialized["kwargs"]["azure_ad_token"]["id"] == ["AZURE_OPENAI_AD_TOKEN"]