forked from MakazhanAlpamys/Soup
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathtest_multi_adapter.py
More file actions
311 lines (243 loc) · 10.1 KB
/
Copy pathtest_multi_adapter.py
File metadata and controls
311 lines (243 loc) · 10.1 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
"""Tests for multi-adapter serving — Part B of v0.22.0."""
from unittest.mock import MagicMock
import pytest
class TestAdapterValidation:
"""Test adapter name and path validation."""
def test_valid_adapter_name(self):
from soup_cli.commands.serve import _validate_adapter_name
assert _validate_adapter_name("my-adapter") is True
assert _validate_adapter_name("chat") is True
assert _validate_adapter_name("code-v2") is True
assert _validate_adapter_name("model123") is True
def test_invalid_adapter_name_path_separator(self):
from soup_cli.commands.serve import _validate_adapter_name
assert _validate_adapter_name("../evil") is False
assert _validate_adapter_name("path/to") is False
assert _validate_adapter_name("path\\to") is False
def test_invalid_adapter_name_special_chars(self):
from soup_cli.commands.serve import _validate_adapter_name
assert _validate_adapter_name("") is False
assert _validate_adapter_name("name with spaces") is False
assert _validate_adapter_name("name\x00null") is False
def test_adapter_path_traversal_protection(self, tmp_path):
from soup_cli.commands.serve import _validate_adapter_path
# Valid path under cwd
adapter_dir = tmp_path / "adapters" / "chat"
adapter_dir.mkdir(parents=True)
assert _validate_adapter_path(str(adapter_dir), cwd=str(tmp_path)) is True
# Path traversal attempt
assert _validate_adapter_path("../../etc/passwd", cwd=str(tmp_path)) is False
def test_adapter_path_must_exist(self, tmp_path):
from soup_cli.commands.serve import _validate_adapter_path
assert _validate_adapter_path(
str(tmp_path / "nonexistent"), cwd=str(tmp_path)
) is False
class TestParseAdapters:
"""Test --adapters flag parsing."""
def test_parse_single_adapter(self):
from soup_cli.commands.serve import _parse_adapters
result = _parse_adapters(["chat=./adapters/chat"])
assert result == {"chat": "./adapters/chat"}
def test_parse_multiple_adapters(self):
from soup_cli.commands.serve import _parse_adapters
result = _parse_adapters([
"chat=./adapters/chat",
"code=./adapters/code",
"medical=./adapters/med",
])
assert len(result) == 3
assert result["chat"] == "./adapters/chat"
assert result["code"] == "./adapters/code"
assert result["medical"] == "./adapters/med"
def test_parse_invalid_format(self):
from soup_cli.commands.serve import _parse_adapters
with pytest.raises(ValueError, match="key=path"):
_parse_adapters(["invalid_no_equals"])
def test_parse_empty_list(self):
from soup_cli.commands.serve import _parse_adapters
result = _parse_adapters([])
assert result == {}
def test_parse_none(self):
from soup_cli.commands.serve import _parse_adapters
result = _parse_adapters(None)
assert result == {}
class TestMultiAdapterApp:
"""Test multi-adapter FastAPI app."""
@pytest.fixture
def multi_adapter_app(self):
"""Create a FastAPI app with multiple mock adapters."""
try:
import fastapi # noqa: F401
except ImportError:
pytest.skip("FastAPI not installed")
from soup_cli.commands.serve import _create_app
mock_model = MagicMock()
mock_tokenizer = MagicMock()
adapter_map = {
"chat": "/fake/path/chat",
"code": "/fake/path/code",
}
app = _create_app(
model_obj=mock_model,
tokenizer=mock_tokenizer,
device="cpu",
model_name="test-model",
max_tokens_default=256,
adapter_map=adapter_map,
)
return app
def test_adapters_endpoint_exists(self, multi_adapter_app):
"""GET /v1/adapters should exist."""
routes = [route.path for route in multi_adapter_app.routes]
assert "/v1/adapters" in routes
def test_adapters_endpoint_lists_adapters(self, multi_adapter_app):
"""GET /v1/adapters returns loaded adapters."""
try:
from fastapi.testclient import TestClient
except ImportError:
pytest.skip("FastAPI not installed")
client = TestClient(multi_adapter_app)
response = client.get("/v1/adapters")
assert response.status_code == 200
data = response.json()
assert "adapters" in data
names = [adapter["name"] for adapter in data["adapters"]]
assert "chat" in names
assert "code" in names
# Security: paths should NOT be exposed
for adapter in data["adapters"]:
assert "path" not in adapter
def test_no_adapters_returns_empty(self):
"""GET /v1/adapters with no adapters returns empty list."""
try:
from fastapi.testclient import TestClient
except ImportError:
pytest.skip("FastAPI not installed")
from soup_cli.commands.serve import _create_app
mock_model = MagicMock()
mock_tokenizer = MagicMock()
app = _create_app(
model_obj=mock_model,
tokenizer=mock_tokenizer,
device="cpu",
model_name="test-model",
max_tokens_default=256,
)
client = TestClient(app)
response = client.get("/v1/adapters")
assert response.status_code == 200
data = response.json()
assert data["adapters"] == []
def test_unknown_adapter_returns_404(self, multi_adapter_app):
"""Request with unknown adapter name returns 404."""
try:
from fastapi.testclient import TestClient
except ImportError:
pytest.skip("FastAPI not installed")
client = TestClient(multi_adapter_app)
response = client.post(
"/v1/chat/completions",
json={
"model": "test-model",
"messages": [{"role": "user", "content": "Hello"}],
"adapter": "nonexistent",
},
)
assert response.status_code == 404
def test_app_without_adapters_still_works(self):
"""App with no adapters should work normally."""
try:
import fastapi # noqa: F401
except ImportError:
pytest.skip("FastAPI not installed")
from soup_cli.commands.serve import _create_app
mock_model = MagicMock()
mock_tokenizer = MagicMock()
app = _create_app(
model_obj=mock_model,
tokenizer=mock_tokenizer,
device="cpu",
model_name="test-model",
max_tokens_default=256,
)
routes = [route.path for route in app.routes]
assert "/v1/chat/completions" in routes
assert "/v1/adapters" in routes
class TestAdapterPathAbsolute:
"""Test adapter path validation with absolute paths."""
def test_adapter_path_absolute_outside_cwd(self, tmp_path):
"""Absolute path to real directory outside cwd should be rejected."""
import tempfile
from soup_cli.commands.serve import _validate_adapter_path
with tempfile.TemporaryDirectory() as external_dir:
assert _validate_adapter_path(external_dir, cwd=str(tmp_path)) is False
def test_adapters_endpoint_schema_strict(self):
"""Adapter objects should only contain 'name' key — no path leakage."""
try:
from fastapi.testclient import TestClient
except ImportError:
import pytest
pytest.skip("FastAPI not installed")
from soup_cli.commands.serve import _create_app
app = _create_app(
model_obj=MagicMock(),
tokenizer=MagicMock(),
device="cpu",
model_name="test-model",
max_tokens_default=256,
adapter_map={"chat": "/fake/path"},
)
client = TestClient(app)
response = client.get("/v1/adapters")
for adapter in response.json()["adapters"]:
# name is always present; active (bool) may be present (v0.30.0).
# The security invariant is: no path leaks.
assert "name" in adapter
assert "path" not in adapter
assert set(adapter.keys()) <= {"name", "active"}
class TestAdaptersBackendRejection:
"""Test --adapters rejected for non-transformers backends."""
def test_adapters_with_vllm_backend_rejected(self, tmp_path):
"""--adapters with --backend vllm should fail."""
from typer.testing import CliRunner
from soup_cli.cli import app
runner = CliRunner()
model_dir = tmp_path / "model"
model_dir.mkdir()
adapter_dir = tmp_path / "adapter"
adapter_dir.mkdir()
result = runner.invoke(app, [
"serve", "--model", str(model_dir),
"--backend", "vllm",
"--adapters", f"chat={adapter_dir}",
])
assert result.exit_code != 0
assert "transformers" in result.output.lower() or "not" in result.output.lower()
class TestMultiAdapterCLI:
"""Test multi-adapter CLI flags."""
def test_adapters_flag_invalid_format(self, tmp_path):
"""--adapters with invalid format shows error."""
from typer.testing import CliRunner
from soup_cli.cli import app
runner = CliRunner()
model_dir = tmp_path / "model"
model_dir.mkdir()
result = runner.invoke(app, [
"serve", "--model", str(model_dir),
"--adapters", "invalid_no_equals",
])
assert result.exit_code != 0
def test_adapters_flag_bad_name(self, tmp_path):
"""--adapters with invalid adapter name shows error."""
from typer.testing import CliRunner
from soup_cli.cli import app
runner = CliRunner()
model_dir = tmp_path / "model"
model_dir.mkdir()
adapter_dir = tmp_path / "adapter"
adapter_dir.mkdir()
result = runner.invoke(app, [
"serve", "--model", str(model_dir),
"--adapters", f"../evil={adapter_dir}",
])
assert result.exit_code != 0