5203ba9e76
Testy / Testy warstwy prezentacji (dostęp do baz) (pull_request) Waiting to run
Testy / Build obrazu silnika B (swisseph) (pull_request) Waiting to run
Testy / Kontrola składni wszystkich warstw (pull_request) Waiting to run
Testy / Testy warstwy logicznej (silnik) (push) Successful in 10m29s
Testy / Testy warstwy prezentacji (dostęp do baz) (push) Successful in 9m53s
Testy / Build obrazu silnika B (swisseph) (push) Failing after 25s
Testy / Kontrola składni wszystkich warstw (push) Successful in 21s
Testy / Testy warstwy logicznej (silnik) (pull_request) Has started running
UI pozwala wybrac dostawce przy KAZDYM zadaniu, ale factory czytalo jedna wspolna trojke LLM_MODEL / LLM_BASE_URL / LLM_API_KEY dla wszystkich. Na klastrze LLM_BASE_URL trzeba ustawic na lokalny model (localhost:11434 w podzie nie istnieje) — i wtedy: - wybor „OpenAI" wysylal zadanie do Ollamy, - LLM_MODEL=llama3.1:8b kazal Anthropic uzyc modelu llama, - jeden LLM_API_KEY nie moze byc kluczem OpenAI i Anthropic naraz. Czyli nie bylo miejsca, w ktore dalo sie sensownie wpisac klucze do chmury. - konfiguracja per dostawca: <DOSTAWCA>_MODEL / _BASE_URL / _API_KEY (LOCAL_*, OPENAI_*, ANTHROPIC_*), - zgodnosc wstecz: wspolne LLM_* dziala nadal, ale stosuje sie WYLACZNIE do dostawcy domyslnego (LLM_PROVIDER) — instalacja jednodostawcowa bez zmian, - Anthropic dostal brakujaca walidacje klucza (mial ja tylko OpenAI), - komunikat bledu wskazuje konkretna zmienna do ustawienia. Testy regresyjne pilnuja, ze ustawienia jednego dostawcy NIE przeciekaja na pozostalych. Calosc: 143 passed / 1 skipped. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
213 lines
8.3 KiB
Python
213 lines
8.3 KiB
Python
"""Dostawcy LLM (LOG-31) — bez wołania jakiegokolwiek prawdziwego modelu.
|
|
|
|
Transport podstawiamy przez httpx.MockTransport, więc testy są szybkie,
|
|
deterministyczne i nic nie wychodzi na zewnątrz.
|
|
"""
|
|
import httpx
|
|
import pytest
|
|
|
|
from app.llm import factory
|
|
from app.llm.base import Completion, LLMError
|
|
from app.llm.providers import AnthropicProvider, ChatCompletionsProvider
|
|
|
|
|
|
def _mock_client(handler):
|
|
"""Podmienia httpx.Client na wersję z transportem testowym."""
|
|
class _C(httpx.Client):
|
|
def __init__(self, *a, **kw):
|
|
kw["transport"] = httpx.MockTransport(handler)
|
|
super().__init__(*a, **kw)
|
|
return _C
|
|
|
|
|
|
@pytest.fixture
|
|
def chat_ok(monkeypatch):
|
|
def handler(request):
|
|
assert request.url.path.endswith("/chat/completions")
|
|
return httpx.Response(200, json={
|
|
"model": "test-model",
|
|
"choices": [{"message": {"content": "Horoskop testowy."}}],
|
|
"usage": {"prompt_tokens": 100, "completion_tokens": 50},
|
|
})
|
|
monkeypatch.setattr(httpx, "Client", _mock_client(handler))
|
|
|
|
|
|
# ------------------------------------------------------- protokół chat/completions
|
|
|
|
def test_local_provider_generates(chat_ok):
|
|
p = ChatCompletionsProvider("local", "http://localhost:11434/v1", "m", leaves_lan=False)
|
|
out = p.generate("prompt", 500)
|
|
assert isinstance(out, Completion)
|
|
assert out.text == "Horoskop testowy."
|
|
assert out.usage["completion_tokens"] == 50
|
|
|
|
|
|
def test_local_provider_does_not_leave_lan(chat_ok):
|
|
p = ChatCompletionsProvider("local", "http://localhost:11434/v1", "m", leaves_lan=False)
|
|
assert p.generate("prompt", 100).leaves_lan is False
|
|
|
|
|
|
def test_cloud_provider_marks_leaving_lan(chat_ok):
|
|
p = ChatCompletionsProvider("openai", "https://api.openai.com/v1", "m", "klucz",
|
|
leaves_lan=True)
|
|
assert p.generate("prompt", 100).leaves_lan is True
|
|
|
|
|
|
def test_api_key_sent_only_when_set(monkeypatch):
|
|
seen = {}
|
|
|
|
def handler(request):
|
|
seen["auth"] = request.headers.get("authorization")
|
|
return httpx.Response(200, json={"choices": [{"message": {"content": "x"}}]})
|
|
|
|
monkeypatch.setattr(httpx, "Client", _mock_client(handler))
|
|
ChatCompletionsProvider("local", "http://x/v1", "m").generate("p", 10)
|
|
assert seen["auth"] is None
|
|
ChatCompletionsProvider("openai", "http://x/v1", "m", "tajny").generate("p", 10)
|
|
assert seen["auth"] == "Bearer tajny"
|
|
|
|
|
|
def test_http_error_becomes_readable_message(monkeypatch):
|
|
monkeypatch.setattr(httpx, "Client",
|
|
_mock_client(lambda r: httpx.Response(400, text="zly model")))
|
|
with pytest.raises(LLMError, match="400"):
|
|
ChatCompletionsProvider("local", "http://x/v1", "m").generate("p", 10)
|
|
|
|
|
|
def test_malformed_response_reported(monkeypatch):
|
|
monkeypatch.setattr(httpx, "Client",
|
|
_mock_client(lambda r: httpx.Response(200, json={"nonsens": 1})))
|
|
with pytest.raises(LLMError, match="kształt"):
|
|
ChatCompletionsProvider("local", "http://x/v1", "m").generate("p", 10)
|
|
|
|
|
|
def test_retries_then_succeeds(monkeypatch):
|
|
calls = {"n": 0}
|
|
|
|
def handler(request):
|
|
calls["n"] += 1
|
|
if calls["n"] < 3:
|
|
return httpx.Response(429, text="za duzo")
|
|
return httpx.Response(200, json={"choices": [{"message": {"content": "ok"}}]})
|
|
|
|
monkeypatch.setattr(httpx, "Client", _mock_client(handler))
|
|
monkeypatch.setattr("app.llm.providers.time.sleep", lambda s: None) # bez czekania
|
|
assert ChatCompletionsProvider("local", "http://x/v1", "m").generate("p", 10).text == "ok"
|
|
assert calls["n"] == 3
|
|
|
|
|
|
# ------------------------------------------------------------------- Anthropic
|
|
|
|
def test_anthropic_generates(monkeypatch):
|
|
def handler(request):
|
|
assert request.url.path.endswith("/v1/messages")
|
|
assert request.headers.get("x-api-key") == "klucz"
|
|
assert request.headers.get("anthropic-version")
|
|
return httpx.Response(200, json={
|
|
"model": "claude-x",
|
|
"content": [{"type": "text", "text": "Prognoza."}],
|
|
"usage": {"input_tokens": 10, "output_tokens": 5},
|
|
})
|
|
|
|
monkeypatch.setattr(httpx, "Client", _mock_client(handler))
|
|
out = AnthropicProvider("https://api.anthropic.com", "claude-x", "klucz").generate("p", 100)
|
|
assert out.text == "Prognoza." and out.leaves_lan is True
|
|
|
|
|
|
def test_anthropic_requires_key():
|
|
with pytest.raises(LLMError, match="LLM_API_KEY"):
|
|
AnthropicProvider("https://api.anthropic.com", "m", "").generate("p", 10)
|
|
|
|
|
|
# --------------------------------------------------------------------- fabryka
|
|
|
|
def test_default_provider_is_local(monkeypatch):
|
|
monkeypatch.delenv("LLM_PROVIDER", raising=False)
|
|
monkeypatch.delenv("LLM_MODEL", raising=False)
|
|
monkeypatch.delenv("LLM_BASE_URL", raising=False)
|
|
p = factory.build_provider()
|
|
assert p.name == "local"
|
|
# domyślnie NIC nie opuszcza sieci — prompt niesie opisy z baz (LOG-32)
|
|
assert p.leaves_lan is False
|
|
|
|
|
|
def test_openai_requires_key(monkeypatch):
|
|
monkeypatch.delenv("LLM_API_KEY", raising=False)
|
|
monkeypatch.delenv("OPENAI_API_KEY", raising=False)
|
|
# komunikat wskazuje ZMIENNĄ DO USTAWIENIA dla tego dostawcy, nie ogólne LLM_API_KEY
|
|
with pytest.raises(LLMError, match="OPENAI_API_KEY"):
|
|
factory.build_provider("openai")
|
|
|
|
|
|
def test_unknown_provider_rejected():
|
|
with pytest.raises(LLMError, match="Nieznany dostawca"):
|
|
factory.build_provider("bzdura")
|
|
|
|
|
|
def test_env_overrides_model_and_url(monkeypatch):
|
|
monkeypatch.setenv("LLM_MODEL", "moj-model")
|
|
monkeypatch.setenv("LLM_BASE_URL", "http://serwer:8000/v1")
|
|
p = factory.build_provider("local")
|
|
assert p.model == "moj-model" and p.base_url == "http://serwer:8000/v1"
|
|
|
|
|
|
# ---------------------------------------- konfiguracja per dostawca (regresja LOG-31)
|
|
# UI pozwala przelaczac dostawce przy kazdym zadaniu, wiec ustawienia JEDNEGO nie moga
|
|
# przeciekac na pozostalych. Wczesniej wspolne LLM_BASE_URL/LLM_MODEL kierowaly zadania
|
|
# do OpenAI na adres lokalnej Ollamy i prosily Anthropic o model llama.
|
|
|
|
def _clear(monkeypatch):
|
|
for v in ("LLM_PROVIDER", "LLM_MODEL", "LLM_BASE_URL", "LLM_API_KEY",
|
|
"LOCAL_MODEL", "LOCAL_BASE_URL", "LOCAL_API_KEY",
|
|
"OPENAI_MODEL", "OPENAI_BASE_URL", "OPENAI_API_KEY",
|
|
"ANTHROPIC_MODEL", "ANTHROPIC_BASE_URL", "ANTHROPIC_API_KEY"):
|
|
monkeypatch.delenv(v, raising=False)
|
|
|
|
|
|
def test_local_config_does_not_leak_to_cloud(monkeypatch):
|
|
"""Sedno bledu: skonfigurowany model lokalny przejmowal zadania do chmury."""
|
|
_clear(monkeypatch)
|
|
monkeypatch.setenv("LLM_PROVIDER", "local")
|
|
monkeypatch.setenv("LLM_BASE_URL", "http://ollama:11434/v1") # konfiguracja lokalnego
|
|
monkeypatch.setenv("LLM_MODEL", "llama3.1:8b")
|
|
monkeypatch.setenv("OPENAI_API_KEY", "sk-test")
|
|
|
|
local = factory.build_provider("local")
|
|
assert local.base_url == "http://ollama:11434/v1" and local.model == "llama3.1:8b"
|
|
|
|
openai = factory.build_provider("openai")
|
|
assert openai.base_url == "https://api.openai.com/v1", "zadanie do OpenAI poszloby do Ollamy"
|
|
assert openai.model == "gpt-4o-mini", "OpenAI dostalby nazwe modelu llama"
|
|
|
|
|
|
def test_provider_specific_settings_win(monkeypatch):
|
|
_clear(monkeypatch)
|
|
monkeypatch.setenv("LLM_PROVIDER", "local")
|
|
monkeypatch.setenv("ANTHROPIC_API_KEY", "sk-ant")
|
|
monkeypatch.setenv("ANTHROPIC_MODEL", "claude-opus-4-8")
|
|
p = factory.build_provider("anthropic")
|
|
assert p.model == "claude-opus-4-8" and p.api_key == "sk-ant"
|
|
|
|
|
|
def test_generic_vars_apply_only_to_default_provider(monkeypatch):
|
|
"""Zgodnosc wstecz: wspolne LLM_* konfiguruja dostawce domyslnego i tylko jego."""
|
|
_clear(monkeypatch)
|
|
monkeypatch.setenv("LLM_PROVIDER", "openai")
|
|
monkeypatch.setenv("LLM_API_KEY", "sk-generic")
|
|
monkeypatch.setenv("LLM_MODEL", "gpt-4o")
|
|
assert factory.build_provider("openai").model == "gpt-4o"
|
|
assert factory.build_provider("local").model == "llama3.1:8b" # nie dziedziczy
|
|
|
|
|
|
def test_cloud_without_key_is_rejected_clearly(monkeypatch):
|
|
_clear(monkeypatch)
|
|
monkeypatch.setenv("LLM_PROVIDER", "local")
|
|
for name in ("openai", "anthropic"):
|
|
with pytest.raises(LLMError, match=f"{name.upper()}_API_KEY"):
|
|
factory.build_provider(name)
|
|
|
|
|
|
def test_local_needs_no_key(monkeypatch):
|
|
_clear(monkeypatch)
|
|
assert factory.build_provider("local").api_key == ""
|