Thanks to visit codestin.com
Credit goes to github.com

Skip to content
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/lmstudio/json_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
DEFAULT_TTL = 60 * 60 # By default, leaves idle models loaded for an hour

# lmstudio-js and lmstudio-python use the same API token environment variable
_ENV_API_TOKEN = "LMSTUDIO_API_TOKEN"
_ENV_API_TOKEN = "LM_API_TOKEN"
_LMS_API_TOKEN_REGEX = re.compile(
r"^sk-lm-(?P<clientIdentifier>[A-Za-z0-9]{8}):(?P<clientPasskey>[A-Za-z0-9]{20})$"
)
Expand Down
12 changes: 6 additions & 6 deletions tests/test_sessions.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
@pytest.mark.parametrize("client_cls", [AsyncClient, Client])
def test_auth_message_default(client_cls: ClientBase) -> None:
with mock.patch.dict(os.environ) as env:
env.pop("LMSTUDIO_API_TOKEN", None)
env.pop("LM_API_TOKEN", None)
auth_message = client_cls._create_auth_from_token(None)
assert auth_message["authVersion"] == 1
assert auth_message["clientIdentifier"].startswith("guest:")
Expand All @@ -49,7 +49,7 @@ def test_auth_message_default(client_cls: ClientBase) -> None:
def test_auth_message_empty_token(client_cls: ClientBase) -> None:
with mock.patch.dict(os.environ) as env:
# Set a valid token in the env to ensure it is ignored
env["LMSTUDIO_API_TOKEN"] = _VALID_API_TOKEN
env["LM_API_TOKEN"] = _VALID_API_TOKEN
auth_message = client_cls._create_auth_from_token("")
assert auth_message["authVersion"] == 1
assert auth_message["clientIdentifier"].startswith("guest:")
Expand All @@ -61,7 +61,7 @@ def test_auth_message_empty_token(client_cls: ClientBase) -> None:
@pytest.mark.parametrize("client_cls", [AsyncClient, Client])
def test_auth_message_empty_token_from_env(client_cls: ClientBase) -> None:
with mock.patch.dict(os.environ) as env:
env["LMSTUDIO_API_TOKEN"] = ""
env["LM_API_TOKEN"] = ""
auth_message = client_cls._create_auth_from_token(None)
assert auth_message["authVersion"] == 1
assert auth_message["clientIdentifier"].startswith("guest:")
Expand All @@ -81,7 +81,7 @@ def test_auth_message_valid_token(client_cls: ClientBase) -> None:
@pytest.mark.parametrize("client_cls", [AsyncClient, Client])
def test_auth_message_valid_token_from_env(client_cls: ClientBase) -> None:
with mock.patch.dict(os.environ) as env:
env["LMSTUDIO_API_TOKEN"] = _VALID_API_TOKEN
env["LM_API_TOKEN"] = _VALID_API_TOKEN
auth_message = client_cls._create_auth_from_token(None)
assert auth_message["authVersion"] == 1
assert auth_message["clientIdentifier"] == "abcDEF78"
Expand All @@ -101,7 +101,7 @@ def test_auth_message_valid_token_from_env(client_cls: ClientBase) -> None:
@pytest.mark.parametrize("api_token", _INVALID_TOKENS)
def test_auth_message_invalid_token(client_cls: ClientBase, api_token: str) -> None:
with mock.patch.dict(os.environ) as env:
env["LMSTUDIO_API_TOKEN"] = _VALID_API_TOKEN
env["LM_API_TOKEN"] = _VALID_API_TOKEN
with pytest.raises(LMStudioValueError):
client_cls._create_auth_from_token(api_token)

Expand All @@ -112,7 +112,7 @@ def test_auth_message_invalid_token_from_env(
client_cls: ClientBase, api_token: str
) -> None:
with mock.patch.dict(os.environ) as env:
env["LMSTUDIO_API_TOKEN"] = api_token
env["LM_API_TOKEN"] = api_token
with pytest.raises(LMStudioValueError):
client_cls._create_auth_from_token(None)

Expand Down