Compare commits
13 Commits
feature/te
...
feature/do
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
159207b86f | ||
|
|
40ab287c90 | ||
|
|
90af453506 | ||
|
|
8bb0e68cce | ||
|
|
95051020f4 | ||
|
|
69961cf40b | ||
|
|
ef174a4c7a | ||
|
|
f4206d6ba1 | ||
|
|
dad7c51481 | ||
|
|
ecbe5ffb84 | ||
|
|
7a8190ecb6 | ||
|
|
8e3c411a3e | ||
|
|
1e1c887a2f |
@@ -373,7 +373,7 @@ async def main():
|
|||||||
|
|
||||||
async with AsyncWebCrawler(config=browser_config) as crawler:
|
async with AsyncWebCrawler(config=browser_config) as crawler:
|
||||||
result = await crawler.arun(
|
result = await crawler.arun(
|
||||||
url="https://docs.micronaut.io/4.7.6/guide/",
|
url="https://docs.micronaut.io/4.9.9/guide/",
|
||||||
config=run_config
|
config=run_config
|
||||||
)
|
)
|
||||||
print(len(result.markdown.raw_markdown))
|
print(len(result.markdown.raw_markdown))
|
||||||
@@ -425,7 +425,7 @@ async def main():
|
|||||||
"type": "attribute",
|
"type": "attribute",
|
||||||
"attribute": "src"
|
"attribute": "src"
|
||||||
}
|
}
|
||||||
}
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
extraction_strategy = JsonCssExtractionStrategy(schema, verbose=True)
|
extraction_strategy = JsonCssExtractionStrategy(schema, verbose=True)
|
||||||
|
|||||||
@@ -2184,8 +2184,10 @@ def normalize_url(
|
|||||||
netloc = parsed.netloc.lower()
|
netloc = parsed.netloc.lower()
|
||||||
|
|
||||||
# ── path ──
|
# ── path ──
|
||||||
# Strip duplicate slashes and trailing “/” (except root)
|
# Strip duplicate slashes and trailing "/" (except root)
|
||||||
path = quote(unquote(parsed.path))
|
# IMPORTANT: Don't use quote(unquote()) as it mangles + signs in URLs
|
||||||
|
# The path from urlparse is already properly encoded
|
||||||
|
path = parsed.path
|
||||||
if path.endswith('/') and path != '/':
|
if path.endswith('/') and path != '/':
|
||||||
path = path.rstrip('/')
|
path = path.rstrip('/')
|
||||||
|
|
||||||
|
|||||||
@@ -10,4 +10,23 @@ GEMINI_API_TOKEN=your_gemini_key_here
|
|||||||
# Optional: Override the default LLM provider
|
# Optional: Override the default LLM provider
|
||||||
# Examples: "openai/gpt-4", "anthropic/claude-3-opus", "deepseek/chat", etc.
|
# Examples: "openai/gpt-4", "anthropic/claude-3-opus", "deepseek/chat", etc.
|
||||||
# If not set, uses the provider specified in config.yml (default: openai/gpt-4o-mini)
|
# If not set, uses the provider specified in config.yml (default: openai/gpt-4o-mini)
|
||||||
# LLM_PROVIDER=anthropic/claude-3-opus
|
# LLM_PROVIDER=anthropic/claude-3-opus
|
||||||
|
|
||||||
|
# Optional: Global LLM temperature setting (0.0-2.0)
|
||||||
|
# Controls randomness in responses. Lower = more focused, Higher = more creative
|
||||||
|
# LLM_TEMPERATURE=0.7
|
||||||
|
|
||||||
|
# Optional: Global custom API base URL
|
||||||
|
# Use this to point to custom endpoints or proxy servers
|
||||||
|
# LLM_BASE_URL=https://api.custom.com/v1
|
||||||
|
|
||||||
|
# Optional: Provider-specific temperature overrides
|
||||||
|
# These take precedence over the global LLM_TEMPERATURE
|
||||||
|
# OPENAI_TEMPERATURE=0.5
|
||||||
|
# ANTHROPIC_TEMPERATURE=0.3
|
||||||
|
# GROQ_TEMPERATURE=0.8
|
||||||
|
|
||||||
|
# Optional: Provider-specific base URL overrides
|
||||||
|
# Use for provider-specific proxy endpoints
|
||||||
|
# OPENAI_BASE_URL=https://custom-openai.company.com/v1
|
||||||
|
# GROQ_BASE_URL=https://custom-groq.company.com/v1
|
||||||
@@ -692,8 +692,7 @@ app:
|
|||||||
# Default LLM Configuration
|
# Default LLM Configuration
|
||||||
llm:
|
llm:
|
||||||
provider: "openai/gpt-4o-mini" # Can be overridden by LLM_PROVIDER env var
|
provider: "openai/gpt-4o-mini" # Can be overridden by LLM_PROVIDER env var
|
||||||
api_key_env: "OPENAI_API_KEY"
|
# api_key: sk-... # If you pass the API key directly (not recommended)
|
||||||
# api_key: sk-... # If you pass the API key directly then api_key_env will be ignored
|
|
||||||
|
|
||||||
# Redis Configuration (Used by internal Redis server managed by supervisord)
|
# Redis Configuration (Used by internal Redis server managed by supervisord)
|
||||||
redis:
|
redis:
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import asyncio
|
|||||||
from typing import List, Tuple, Dict
|
from typing import List, Tuple, Dict
|
||||||
from functools import partial
|
from functools import partial
|
||||||
from uuid import uuid4
|
from uuid import uuid4
|
||||||
from datetime import datetime
|
from datetime import datetime, timezone
|
||||||
from base64 import b64encode
|
from base64 import b64encode
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
@@ -42,7 +42,9 @@ from utils import (
|
|||||||
should_cleanup_task,
|
should_cleanup_task,
|
||||||
decode_redis_hash,
|
decode_redis_hash,
|
||||||
get_llm_api_key,
|
get_llm_api_key,
|
||||||
validate_llm_provider
|
validate_llm_provider,
|
||||||
|
get_llm_temperature,
|
||||||
|
get_llm_base_url
|
||||||
)
|
)
|
||||||
|
|
||||||
import psutil, time
|
import psutil, time
|
||||||
@@ -96,7 +98,9 @@ async def handle_llm_qa(
|
|||||||
response = perform_completion_with_backoff(
|
response = perform_completion_with_backoff(
|
||||||
provider=config["llm"]["provider"],
|
provider=config["llm"]["provider"],
|
||||||
prompt_with_variables=prompt,
|
prompt_with_variables=prompt,
|
||||||
api_token=get_llm_api_key(config)
|
api_token=get_llm_api_key(config), # Returns None to let litellm handle it
|
||||||
|
temperature=get_llm_temperature(config),
|
||||||
|
base_url=get_llm_base_url(config)
|
||||||
)
|
)
|
||||||
|
|
||||||
return response.choices[0].message.content
|
return response.choices[0].message.content
|
||||||
@@ -115,7 +119,9 @@ async def process_llm_extraction(
|
|||||||
instruction: str,
|
instruction: str,
|
||||||
schema: Optional[str] = None,
|
schema: Optional[str] = None,
|
||||||
cache: str = "0",
|
cache: str = "0",
|
||||||
provider: Optional[str] = None
|
provider: Optional[str] = None,
|
||||||
|
temperature: Optional[float] = None,
|
||||||
|
base_url: Optional[str] = None
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Process LLM extraction in background."""
|
"""Process LLM extraction in background."""
|
||||||
try:
|
try:
|
||||||
@@ -127,11 +133,13 @@ async def process_llm_extraction(
|
|||||||
"error": error_msg
|
"error": error_msg
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
api_key = get_llm_api_key(config, provider)
|
api_key = get_llm_api_key(config, provider) # Returns None to let litellm handle it
|
||||||
llm_strategy = LLMExtractionStrategy(
|
llm_strategy = LLMExtractionStrategy(
|
||||||
llm_config=LLMConfig(
|
llm_config=LLMConfig(
|
||||||
provider=provider or config["llm"]["provider"],
|
provider=provider or config["llm"]["provider"],
|
||||||
api_token=api_key
|
api_token=api_key,
|
||||||
|
temperature=temperature or get_llm_temperature(config, provider),
|
||||||
|
base_url=base_url or get_llm_base_url(config, provider)
|
||||||
),
|
),
|
||||||
instruction=instruction,
|
instruction=instruction,
|
||||||
schema=json.loads(schema) if schema else None,
|
schema=json.loads(schema) if schema else None,
|
||||||
@@ -178,7 +186,9 @@ async def handle_markdown_request(
|
|||||||
query: Optional[str] = None,
|
query: Optional[str] = None,
|
||||||
cache: str = "0",
|
cache: str = "0",
|
||||||
config: Optional[dict] = None,
|
config: Optional[dict] = None,
|
||||||
provider: Optional[str] = None
|
provider: Optional[str] = None,
|
||||||
|
temperature: Optional[float] = None,
|
||||||
|
base_url: Optional[str] = None
|
||||||
) -> str:
|
) -> str:
|
||||||
"""Handle markdown generation requests."""
|
"""Handle markdown generation requests."""
|
||||||
try:
|
try:
|
||||||
@@ -203,7 +213,9 @@ async def handle_markdown_request(
|
|||||||
FilterType.LLM: LLMContentFilter(
|
FilterType.LLM: LLMContentFilter(
|
||||||
llm_config=LLMConfig(
|
llm_config=LLMConfig(
|
||||||
provider=provider or config["llm"]["provider"],
|
provider=provider or config["llm"]["provider"],
|
||||||
api_token=get_llm_api_key(config, provider),
|
api_token=get_llm_api_key(config, provider), # Returns None to let litellm handle it
|
||||||
|
temperature=temperature or get_llm_temperature(config, provider),
|
||||||
|
base_url=base_url or get_llm_base_url(config, provider)
|
||||||
),
|
),
|
||||||
instruction=query or "Extract main content"
|
instruction=query or "Extract main content"
|
||||||
)
|
)
|
||||||
@@ -248,7 +260,9 @@ async def handle_llm_request(
|
|||||||
schema: Optional[str] = None,
|
schema: Optional[str] = None,
|
||||||
cache: str = "0",
|
cache: str = "0",
|
||||||
config: Optional[dict] = None,
|
config: Optional[dict] = None,
|
||||||
provider: Optional[str] = None
|
provider: Optional[str] = None,
|
||||||
|
temperature: Optional[float] = None,
|
||||||
|
api_base_url: Optional[str] = None
|
||||||
) -> JSONResponse:
|
) -> JSONResponse:
|
||||||
"""Handle LLM extraction requests."""
|
"""Handle LLM extraction requests."""
|
||||||
base_url = get_base_url(request)
|
base_url = get_base_url(request)
|
||||||
@@ -279,7 +293,9 @@ async def handle_llm_request(
|
|||||||
cache,
|
cache,
|
||||||
base_url,
|
base_url,
|
||||||
config,
|
config,
|
||||||
provider
|
provider,
|
||||||
|
temperature,
|
||||||
|
api_base_url
|
||||||
)
|
)
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@@ -324,7 +340,9 @@ async def create_new_task(
|
|||||||
cache: str,
|
cache: str,
|
||||||
base_url: str,
|
base_url: str,
|
||||||
config: dict,
|
config: dict,
|
||||||
provider: Optional[str] = None
|
provider: Optional[str] = None,
|
||||||
|
temperature: Optional[float] = None,
|
||||||
|
api_base_url: Optional[str] = None
|
||||||
) -> JSONResponse:
|
) -> JSONResponse:
|
||||||
"""Create and initialize a new task."""
|
"""Create and initialize a new task."""
|
||||||
decoded_url = unquote(input_path)
|
decoded_url = unquote(input_path)
|
||||||
@@ -349,7 +367,9 @@ async def create_new_task(
|
|||||||
query,
|
query,
|
||||||
schema,
|
schema,
|
||||||
cache,
|
cache,
|
||||||
provider
|
provider,
|
||||||
|
temperature,
|
||||||
|
api_base_url
|
||||||
)
|
)
|
||||||
|
|
||||||
return JSONResponse({
|
return JSONResponse({
|
||||||
@@ -576,7 +596,7 @@ async def handle_crawl_job(
|
|||||||
task_id = f"crawl_{uuid4().hex[:8]}"
|
task_id = f"crawl_{uuid4().hex[:8]}"
|
||||||
await redis.hset(f"task:{task_id}", mapping={
|
await redis.hset(f"task:{task_id}", mapping={
|
||||||
"status": TaskStatus.PROCESSING, # <-- keep enum values consistent
|
"status": TaskStatus.PROCESSING, # <-- keep enum values consistent
|
||||||
"created_at": datetime.utcnow().isoformat(),
|
"created_at": datetime.now(timezone.utc).replace(tzinfo=None).isoformat(),
|
||||||
"url": json.dumps(urls), # store list as JSON string
|
"url": json.dumps(urls), # store list as JSON string
|
||||||
"result": "",
|
"result": "",
|
||||||
"error": "",
|
"error": "",
|
||||||
|
|||||||
@@ -11,8 +11,7 @@ app:
|
|||||||
# Default LLM Configuration
|
# Default LLM Configuration
|
||||||
llm:
|
llm:
|
||||||
provider: "openai/gpt-4o-mini"
|
provider: "openai/gpt-4o-mini"
|
||||||
api_key_env: "OPENAI_API_KEY"
|
# api_key: sk-... # If you pass the API key directly (not recommended)
|
||||||
# api_key: sk-... # If you pass the API key directly then api_key_env will be ignored
|
|
||||||
|
|
||||||
# Redis Configuration
|
# Redis Configuration
|
||||||
redis:
|
redis:
|
||||||
|
|||||||
@@ -37,6 +37,8 @@ class LlmJobPayload(BaseModel):
|
|||||||
schema: Optional[str] = None
|
schema: Optional[str] = None
|
||||||
cache: bool = False
|
cache: bool = False
|
||||||
provider: Optional[str] = None
|
provider: Optional[str] = None
|
||||||
|
temperature: Optional[float] = None
|
||||||
|
base_url: Optional[str] = None
|
||||||
|
|
||||||
|
|
||||||
class CrawlJobPayload(BaseModel):
|
class CrawlJobPayload(BaseModel):
|
||||||
@@ -63,6 +65,8 @@ async def llm_job_enqueue(
|
|||||||
cache=payload.cache,
|
cache=payload.cache,
|
||||||
config=_config,
|
config=_config,
|
||||||
provider=payload.provider,
|
provider=payload.provider,
|
||||||
|
temperature=payload.temperature,
|
||||||
|
api_base_url=payload.base_url,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -72,7 +76,7 @@ async def llm_job_status(
|
|||||||
task_id: str,
|
task_id: str,
|
||||||
_td: Dict = Depends(lambda: _token_dep())
|
_td: Dict = Depends(lambda: _token_dep())
|
||||||
):
|
):
|
||||||
return await handle_task_status(_redis, task_id)
|
return await handle_task_status(_redis, task_id, base_url=str(request.base_url))
|
||||||
|
|
||||||
|
|
||||||
# ---------- CRAWL job -------------------------------------------------------
|
# ---------- CRAWL job -------------------------------------------------------
|
||||||
|
|||||||
@@ -16,6 +16,8 @@ class MarkdownRequest(BaseModel):
|
|||||||
q: Optional[str] = Field(None, description="Query string used by BM25/LLM filters")
|
q: Optional[str] = Field(None, description="Query string used by BM25/LLM filters")
|
||||||
c: Optional[str] = Field("0", description="Cache‑bust / revision counter")
|
c: Optional[str] = Field("0", description="Cache‑bust / revision counter")
|
||||||
provider: Optional[str] = Field(None, description="LLM provider override (e.g., 'anthropic/claude-3-opus')")
|
provider: Optional[str] = Field(None, description="LLM provider override (e.g., 'anthropic/claude-3-opus')")
|
||||||
|
temperature: Optional[float] = Field(None, description="LLM temperature override (0.0-2.0)")
|
||||||
|
base_url: Optional[str] = Field(None, description="LLM API base URL override")
|
||||||
|
|
||||||
|
|
||||||
class RawCode(BaseModel):
|
class RawCode(BaseModel):
|
||||||
|
|||||||
@@ -241,7 +241,8 @@ async def get_markdown(
|
|||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
400, "Invalid URL format. Must start with http://, https://, or for raw HTML (raw:, raw://)")
|
400, "Invalid URL format. Must start with http://, https://, or for raw HTML (raw:, raw://)")
|
||||||
markdown = await handle_markdown_request(
|
markdown = await handle_markdown_request(
|
||||||
body.url, body.f, body.q, body.c, config, body.provider
|
body.url, body.f, body.q, body.c, config, body.provider,
|
||||||
|
body.temperature, body.base_url
|
||||||
)
|
)
|
||||||
return JSONResponse({
|
return JSONResponse({
|
||||||
"url": body.url,
|
"url": body.url,
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ def decode_redis_hash(hash_data: Dict[bytes, bytes]) -> Dict[str, str]:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
def get_llm_api_key(config: Dict, provider: Optional[str] = None) -> str:
|
def get_llm_api_key(config: Dict, provider: Optional[str] = None) -> Optional[str]:
|
||||||
"""Get the appropriate API key based on the LLM provider.
|
"""Get the appropriate API key based on the LLM provider.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
@@ -79,19 +79,14 @@ def get_llm_api_key(config: Dict, provider: Optional[str] = None) -> str:
|
|||||||
provider: Optional provider override (e.g., "openai/gpt-4")
|
provider: Optional provider override (e.g., "openai/gpt-4")
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
The API key for the provider, or empty string if not found
|
The API key if directly configured, otherwise None to let litellm handle it
|
||||||
"""
|
"""
|
||||||
|
# Check if direct API key is configured (for backward compatibility)
|
||||||
# Use provided provider or fall back to config
|
|
||||||
if not provider:
|
|
||||||
provider = config["llm"]["provider"]
|
|
||||||
|
|
||||||
# Check if direct API key is configured
|
|
||||||
if "api_key" in config["llm"]:
|
if "api_key" in config["llm"]:
|
||||||
return config["llm"]["api_key"]
|
return config["llm"]["api_key"]
|
||||||
|
|
||||||
# Fall back to the configured api_key_env if no match
|
# Return None - litellm will automatically find the right environment variable
|
||||||
return os.environ.get(config["llm"].get("api_key_env", ""), "")
|
return None
|
||||||
|
|
||||||
|
|
||||||
def validate_llm_provider(config: Dict, provider: Optional[str] = None) -> tuple[bool, str]:
|
def validate_llm_provider(config: Dict, provider: Optional[str] = None) -> tuple[bool, str]:
|
||||||
@@ -104,19 +99,78 @@ def validate_llm_provider(config: Dict, provider: Optional[str] = None) -> tuple
|
|||||||
Returns:
|
Returns:
|
||||||
Tuple of (is_valid, error_message)
|
Tuple of (is_valid, error_message)
|
||||||
"""
|
"""
|
||||||
# Use provided provider or fall back to config
|
# If a direct API key is configured, validation passes
|
||||||
if not provider:
|
if "api_key" in config["llm"]:
|
||||||
provider = config["llm"]["provider"]
|
return True, ""
|
||||||
|
|
||||||
# Get the API key for this provider
|
|
||||||
api_key = get_llm_api_key(config, provider)
|
|
||||||
|
|
||||||
if not api_key:
|
|
||||||
return False, f"No API key found for provider '{provider}'. Please set the appropriate environment variable."
|
|
||||||
|
|
||||||
|
# Otherwise, trust that litellm will find the appropriate environment variable
|
||||||
|
# We can't easily validate this without reimplementing litellm's logic
|
||||||
return True, ""
|
return True, ""
|
||||||
|
|
||||||
|
|
||||||
|
def get_llm_temperature(config: Dict, provider: Optional[str] = None) -> Optional[float]:
|
||||||
|
"""Get temperature setting based on the LLM provider.
|
||||||
|
|
||||||
|
Priority order:
|
||||||
|
1. Provider-specific environment variable (e.g., OPENAI_TEMPERATURE)
|
||||||
|
2. Global LLM_TEMPERATURE environment variable
|
||||||
|
3. None (to use litellm/provider defaults)
|
||||||
|
|
||||||
|
Args:
|
||||||
|
config: The application configuration dictionary
|
||||||
|
provider: Optional provider override (e.g., "openai/gpt-4")
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
The temperature setting if configured, otherwise None
|
||||||
|
"""
|
||||||
|
# Check provider-specific temperature first
|
||||||
|
if provider:
|
||||||
|
provider_name = provider.split('/')[0].upper()
|
||||||
|
provider_temp = os.environ.get(f"{provider_name}_TEMPERATURE")
|
||||||
|
if provider_temp:
|
||||||
|
try:
|
||||||
|
return float(provider_temp)
|
||||||
|
except ValueError:
|
||||||
|
logging.warning(f"Invalid temperature value for {provider_name}: {provider_temp}")
|
||||||
|
|
||||||
|
# Check global LLM_TEMPERATURE
|
||||||
|
global_temp = os.environ.get("LLM_TEMPERATURE")
|
||||||
|
if global_temp:
|
||||||
|
try:
|
||||||
|
return float(global_temp)
|
||||||
|
except ValueError:
|
||||||
|
logging.warning(f"Invalid global temperature value: {global_temp}")
|
||||||
|
|
||||||
|
# Return None to use litellm/provider defaults
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def get_llm_base_url(config: Dict, provider: Optional[str] = None) -> Optional[str]:
|
||||||
|
"""Get base URL setting based on the LLM provider.
|
||||||
|
|
||||||
|
Priority order:
|
||||||
|
1. Provider-specific environment variable (e.g., OPENAI_BASE_URL)
|
||||||
|
2. Global LLM_BASE_URL environment variable
|
||||||
|
3. None (to use default endpoints)
|
||||||
|
|
||||||
|
Args:
|
||||||
|
config: The application configuration dictionary
|
||||||
|
provider: Optional provider override (e.g., "openai/gpt-4")
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
The base URL if configured, otherwise None
|
||||||
|
"""
|
||||||
|
# Check provider-specific base URL first
|
||||||
|
if provider:
|
||||||
|
provider_name = provider.split('/')[0].upper()
|
||||||
|
provider_url = os.environ.get(f"{provider_name}_BASE_URL")
|
||||||
|
if provider_url:
|
||||||
|
return provider_url
|
||||||
|
|
||||||
|
# Check global LLM_BASE_URL
|
||||||
|
return os.environ.get("LLM_BASE_URL")
|
||||||
|
|
||||||
|
|
||||||
def verify_email_domain(email: str) -> bool:
|
def verify_email_domain(email: str) -> bool:
|
||||||
try:
|
try:
|
||||||
domain = email.split('@')[1]
|
domain = email.split('@')[1]
|
||||||
|
|||||||
@@ -89,6 +89,16 @@ ANTHROPIC_API_KEY=your-anthropic-key
|
|||||||
# TOGETHER_API_KEY=your-together-key
|
# TOGETHER_API_KEY=your-together-key
|
||||||
# MISTRAL_API_KEY=your-mistral-key
|
# MISTRAL_API_KEY=your-mistral-key
|
||||||
# GEMINI_API_TOKEN=your-gemini-token
|
# GEMINI_API_TOKEN=your-gemini-token
|
||||||
|
|
||||||
|
# Optional: Global LLM settings
|
||||||
|
# LLM_PROVIDER=openai/gpt-4o-mini
|
||||||
|
# LLM_TEMPERATURE=0.7
|
||||||
|
# LLM_BASE_URL=https://api.custom.com/v1
|
||||||
|
|
||||||
|
# Optional: Provider-specific overrides
|
||||||
|
# OPENAI_TEMPERATURE=0.5
|
||||||
|
# OPENAI_BASE_URL=https://custom-openai.com/v1
|
||||||
|
# ANTHROPIC_TEMPERATURE=0.3
|
||||||
EOL
|
EOL
|
||||||
```
|
```
|
||||||
> 🔑 **Note**: Keep your API keys secure! Never commit `.llm.env` to version control.
|
> 🔑 **Note**: Keep your API keys secure! Never commit `.llm.env` to version control.
|
||||||
@@ -156,27 +166,43 @@ cp deploy/docker/.llm.env.example .llm.env
|
|||||||
|
|
||||||
**Flexible LLM Provider Configuration:**
|
**Flexible LLM Provider Configuration:**
|
||||||
|
|
||||||
The Docker setup now supports flexible LLM provider configuration through three methods:
|
The Docker setup now supports flexible LLM provider configuration through a hierarchical system:
|
||||||
|
|
||||||
1. **Environment Variable** (Highest Priority): Set `LLM_PROVIDER` to override the default
|
1. **API Request Parameters** (Highest Priority): Specify per request
|
||||||
```bash
|
|
||||||
export LLM_PROVIDER="anthropic/claude-3-opus"
|
|
||||||
# Or in your .llm.env file:
|
|
||||||
# LLM_PROVIDER=anthropic/claude-3-opus
|
|
||||||
```
|
|
||||||
|
|
||||||
2. **API Request Parameter**: Specify provider per request
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"url": "https://example.com",
|
"url": "https://example.com",
|
||||||
"f": "llm",
|
"f": "llm",
|
||||||
"provider": "groq/mixtral-8x7b"
|
"provider": "groq/mixtral-8x7b",
|
||||||
|
"temperature": 0.7,
|
||||||
|
"base_url": "https://api.custom.com/v1"
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
3. **Config File Default**: Falls back to `config.yml` (default: `openai/gpt-4o-mini`)
|
2. **Provider-Specific Environment Variables**: Override for specific providers
|
||||||
|
```bash
|
||||||
|
# In your .llm.env file:
|
||||||
|
OPENAI_TEMPERATURE=0.5
|
||||||
|
OPENAI_BASE_URL=https://custom-openai.com/v1
|
||||||
|
ANTHROPIC_TEMPERATURE=0.3
|
||||||
|
```
|
||||||
|
|
||||||
The system automatically selects the appropriate API key based on the configured `api_key_env` in the config file.
|
3. **Global Environment Variables**: Set defaults for all providers
|
||||||
|
```bash
|
||||||
|
# In your .llm.env file:
|
||||||
|
LLM_PROVIDER=anthropic/claude-3-opus
|
||||||
|
LLM_TEMPERATURE=0.7
|
||||||
|
LLM_BASE_URL=https://api.proxy.com/v1
|
||||||
|
```
|
||||||
|
|
||||||
|
4. **Config File Default**: Falls back to `config.yml` (default: `openai/gpt-4o-mini`)
|
||||||
|
|
||||||
|
The system automatically selects the appropriate API key based on the provider. LiteLLM handles finding the correct environment variable for each provider (e.g., OPENAI_API_KEY for OpenAI, GEMINI_API_TOKEN for Google Gemini, etc.).
|
||||||
|
|
||||||
|
**Supported LLM Parameters:**
|
||||||
|
- `provider`: LLM provider and model (e.g., "openai/gpt-4", "anthropic/claude-3-opus")
|
||||||
|
- `temperature`: Controls randomness (0.0-2.0, lower = more focused, higher = more creative)
|
||||||
|
- `base_url`: Custom API endpoint for proxy servers or alternative endpoints
|
||||||
|
|
||||||
#### 3. Build and Run with Compose
|
#### 3. Build and Run with Compose
|
||||||
|
|
||||||
@@ -555,6 +581,101 @@ Crucially, when sending configurations directly via JSON, they **must** follow t
|
|||||||
**LLM Extraction Strategy** *(Keep example, ensure schema uses type/value wrapper)*
|
**LLM Extraction Strategy** *(Keep example, ensure schema uses type/value wrapper)*
|
||||||
*(Keep Deep Crawler Example)*
|
*(Keep Deep Crawler Example)*
|
||||||
|
|
||||||
|
### LLM Configuration Examples
|
||||||
|
|
||||||
|
The Docker API supports dynamic LLM configuration through multiple levels:
|
||||||
|
|
||||||
|
#### Temperature Control
|
||||||
|
|
||||||
|
Temperature affects the randomness of LLM responses (0.0 = deterministic, 2.0 = very creative):
|
||||||
|
|
||||||
|
```python
|
||||||
|
import requests
|
||||||
|
|
||||||
|
# Low temperature for factual extraction
|
||||||
|
response = requests.post(
|
||||||
|
"http://localhost:11235/md",
|
||||||
|
json={
|
||||||
|
"url": "https://example.com",
|
||||||
|
"f": "llm",
|
||||||
|
"q": "Extract all dates and numbers from this page",
|
||||||
|
"temperature": 0.2 # Very focused, deterministic
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
# High temperature for creative tasks
|
||||||
|
response = requests.post(
|
||||||
|
"http://localhost:11235/md",
|
||||||
|
json={
|
||||||
|
"url": "https://example.com",
|
||||||
|
"f": "llm",
|
||||||
|
"q": "Write a creative summary of this content",
|
||||||
|
"temperature": 1.2 # More creative, varied responses
|
||||||
|
}
|
||||||
|
)
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Custom API Endpoints
|
||||||
|
|
||||||
|
Use custom base URLs for proxy servers or alternative API endpoints:
|
||||||
|
|
||||||
|
```python
|
||||||
|
|
||||||
|
# Using a local LLM server
|
||||||
|
response = requests.post(
|
||||||
|
"http://localhost:11235/md",
|
||||||
|
json={
|
||||||
|
"url": "https://example.com",
|
||||||
|
"f": "llm",
|
||||||
|
"q": "Extract key information",
|
||||||
|
"provider": "ollama/llama2",
|
||||||
|
"base_url": "http://localhost:11434/v1"
|
||||||
|
}
|
||||||
|
)
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Dynamic Provider Selection
|
||||||
|
|
||||||
|
Switch between providers based on task requirements:
|
||||||
|
|
||||||
|
```python
|
||||||
|
async def smart_extraction(url: str, content_type: str):
|
||||||
|
"""Select provider and temperature based on content type"""
|
||||||
|
|
||||||
|
configs = {
|
||||||
|
"technical": {
|
||||||
|
"provider": "openai/gpt-4",
|
||||||
|
"temperature": 0.3,
|
||||||
|
"query": "Extract technical specifications and code examples"
|
||||||
|
},
|
||||||
|
"creative": {
|
||||||
|
"provider": "anthropic/claude-3-opus",
|
||||||
|
"temperature": 0.9,
|
||||||
|
"query": "Create an engaging narrative summary"
|
||||||
|
},
|
||||||
|
"quick": {
|
||||||
|
"provider": "groq/mixtral-8x7b",
|
||||||
|
"temperature": 0.5,
|
||||||
|
"query": "Quick summary in bullet points"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
config = configs.get(content_type, configs["quick"])
|
||||||
|
|
||||||
|
response = await httpx.post(
|
||||||
|
"http://localhost:11235/md",
|
||||||
|
json={
|
||||||
|
"url": url,
|
||||||
|
"f": "llm",
|
||||||
|
"q": config["query"],
|
||||||
|
"provider": config["provider"],
|
||||||
|
"temperature": config["temperature"]
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
return response.json()
|
||||||
|
```
|
||||||
|
|
||||||
### REST API Examples
|
### REST API Examples
|
||||||
|
|
||||||
Update URLs to use port `11235`.
|
Update URLs to use port `11235`.
|
||||||
@@ -693,8 +814,8 @@ app:
|
|||||||
# Default LLM Configuration
|
# Default LLM Configuration
|
||||||
llm:
|
llm:
|
||||||
provider: "openai/gpt-4o-mini" # Can be overridden by LLM_PROVIDER env var
|
provider: "openai/gpt-4o-mini" # Can be overridden by LLM_PROVIDER env var
|
||||||
api_key_env: "OPENAI_API_KEY"
|
# api_key: sk-... # If you pass the API key directly (not recommended)
|
||||||
# api_key: sk-... # If you pass the API key directly then api_key_env will be ignored
|
# temperature and base_url are controlled via environment variables or request parameters
|
||||||
|
|
||||||
# Redis Configuration (Used by internal Redis server managed by supervisord)
|
# Redis Configuration (Used by internal Redis server managed by supervisord)
|
||||||
redis:
|
redis:
|
||||||
|
|||||||
@@ -102,16 +102,16 @@ async def smart_blog_crawler():
|
|||||||
|
|
||||||
# Step 2: Configure discovery - let's find all blog posts
|
# Step 2: Configure discovery - let's find all blog posts
|
||||||
config = SeedingConfig(
|
config = SeedingConfig(
|
||||||
source="sitemap", # Use the website's sitemap
|
source="sitemap+cc", # Use the website's sitemap+cc
|
||||||
pattern="*/blog/*.html", # Only blog posts
|
pattern="*/courses/*", # Only courses related posts
|
||||||
extract_head=True, # Get page metadata
|
extract_head=True, # Get page metadata
|
||||||
max_urls=100 # Limit for this example
|
max_urls=100 # Limit for this example
|
||||||
)
|
)
|
||||||
|
|
||||||
# Step 3: Discover URLs from the Python blog
|
# Step 3: Discover URLs from the Python blog
|
||||||
print("🔍 Discovering blog posts...")
|
print("🔍 Discovering course posts...")
|
||||||
urls = await seeder.urls("realpython.com", config)
|
urls = await seeder.urls("realpython.com", config)
|
||||||
print(f"✅ Found {len(urls)} blog posts")
|
print(f"✅ Found {len(urls)} course posts")
|
||||||
|
|
||||||
# Step 4: Filter for Python tutorials (using metadata!)
|
# Step 4: Filter for Python tutorials (using metadata!)
|
||||||
tutorials = [
|
tutorials = [
|
||||||
@@ -134,7 +134,8 @@ async def smart_blog_crawler():
|
|||||||
async with AsyncWebCrawler() as crawler:
|
async with AsyncWebCrawler() as crawler:
|
||||||
config = CrawlerRunConfig(
|
config = CrawlerRunConfig(
|
||||||
only_text=True,
|
only_text=True,
|
||||||
word_count_threshold=300 # Only substantial articles
|
word_count_threshold=300, # Only substantial articles
|
||||||
|
stream=True
|
||||||
)
|
)
|
||||||
|
|
||||||
# Extract URLs and crawl them
|
# Extract URLs and crawl them
|
||||||
@@ -155,7 +156,7 @@ asyncio.run(smart_blog_crawler())
|
|||||||
|
|
||||||
**What just happened?**
|
**What just happened?**
|
||||||
|
|
||||||
1. We discovered all blog URLs from the sitemap
|
1. We discovered all blog URLs from the sitemap+cc
|
||||||
2. We filtered using metadata (no crawling needed!)
|
2. We filtered using metadata (no crawling needed!)
|
||||||
3. We crawled only the relevant tutorials
|
3. We crawled only the relevant tutorials
|
||||||
4. We saved tons of time and bandwidth
|
4. We saved tons of time and bandwidth
|
||||||
@@ -282,8 +283,8 @@ config = SeedingConfig(
|
|||||||
live_check=True, # Verify each URL is accessible
|
live_check=True, # Verify each URL is accessible
|
||||||
concurrency=20 # Check 20 URLs in parallel
|
concurrency=20 # Check 20 URLs in parallel
|
||||||
)
|
)
|
||||||
|
async with AsyncUrlSeeder() as seeder:
|
||||||
urls = await seeder.urls("example.com", config)
|
urls = await seeder.urls("example.com", config)
|
||||||
|
|
||||||
# Now you can filter by status
|
# Now you can filter by status
|
||||||
live_urls = [u for u in urls if u["status"] == "valid"]
|
live_urls = [u for u in urls if u["status"] == "valid"]
|
||||||
@@ -311,8 +312,8 @@ This is where URL seeding gets really powerful. Instead of crawling entire pages
|
|||||||
config = SeedingConfig(
|
config = SeedingConfig(
|
||||||
extract_head=True # Extract metadata from <head> section
|
extract_head=True # Extract metadata from <head> section
|
||||||
)
|
)
|
||||||
|
async with AsyncUrlSeeder() as seeder:
|
||||||
urls = await seeder.urls("example.com", config)
|
urls = await seeder.urls("example.com", config)
|
||||||
|
|
||||||
# Now each URL has rich metadata
|
# Now each URL has rich metadata
|
||||||
for url in urls[:3]:
|
for url in urls[:3]:
|
||||||
@@ -387,8 +388,8 @@ config = SeedingConfig(
|
|||||||
scoring_method="bm25",
|
scoring_method="bm25",
|
||||||
score_threshold=0.3
|
score_threshold=0.3
|
||||||
)
|
)
|
||||||
|
async with AsyncUrlSeeder() as seeder:
|
||||||
urls = await seeder.urls("example.com", config)
|
urls = await seeder.urls("example.com", config)
|
||||||
|
|
||||||
# URLs are scored based on:
|
# URLs are scored based on:
|
||||||
# 1. Domain parts matching (e.g., 'python' in python.example.com)
|
# 1. Domain parts matching (e.g., 'python' in python.example.com)
|
||||||
@@ -429,8 +430,8 @@ config = SeedingConfig(
|
|||||||
extract_head=True,
|
extract_head=True,
|
||||||
live_check=True
|
live_check=True
|
||||||
)
|
)
|
||||||
|
async with AsyncUrlSeeder() as seeder:
|
||||||
urls = await seeder.urls("blog.example.com", config)
|
urls = await seeder.urls("blog.example.com", config)
|
||||||
|
|
||||||
# Analyze the results
|
# Analyze the results
|
||||||
for url in urls[:5]:
|
for url in urls[:5]:
|
||||||
@@ -488,8 +489,8 @@ config = SeedingConfig(
|
|||||||
scoring_method="bm25", # Use BM25 algorithm
|
scoring_method="bm25", # Use BM25 algorithm
|
||||||
score_threshold=0.3 # Minimum relevance score
|
score_threshold=0.3 # Minimum relevance score
|
||||||
)
|
)
|
||||||
|
async with AsyncUrlSeeder() as seeder:
|
||||||
urls = await seeder.urls("realpython.com", config)
|
urls = await seeder.urls("realpython.com", config)
|
||||||
|
|
||||||
# Results are automatically sorted by relevance!
|
# Results are automatically sorted by relevance!
|
||||||
for url in urls[:5]:
|
for url in urls[:5]:
|
||||||
@@ -511,8 +512,8 @@ config = SeedingConfig(
|
|||||||
score_threshold=0.5,
|
score_threshold=0.5,
|
||||||
max_urls=20
|
max_urls=20
|
||||||
)
|
)
|
||||||
|
async with AsyncUrlSeeder() as seeder:
|
||||||
urls = await seeder.urls("docs.example.com", config)
|
urls = await seeder.urls("docs.example.com", config)
|
||||||
|
|
||||||
# The highest scoring URLs will be API docs!
|
# The highest scoring URLs will be API docs!
|
||||||
```
|
```
|
||||||
@@ -529,8 +530,8 @@ config = SeedingConfig(
|
|||||||
score_threshold=0.4,
|
score_threshold=0.4,
|
||||||
pattern="*/product/*" # Combine with pattern matching
|
pattern="*/product/*" # Combine with pattern matching
|
||||||
)
|
)
|
||||||
|
async with AsyncUrlSeeder() as seeder:
|
||||||
urls = await seeder.urls("shop.example.com", config)
|
urls = await seeder.urls("shop.example.com", config)
|
||||||
|
|
||||||
# Filter further by price (from metadata)
|
# Filter further by price (from metadata)
|
||||||
affordable = [
|
affordable = [
|
||||||
@@ -550,8 +551,8 @@ config = SeedingConfig(
|
|||||||
scoring_method="bm25",
|
scoring_method="bm25",
|
||||||
score_threshold=0.35
|
score_threshold=0.35
|
||||||
)
|
)
|
||||||
|
async with AsyncUrlSeeder() as seeder:
|
||||||
urls = await seeder.urls("technews.com", config)
|
urls = await seeder.urls("technews.com", config)
|
||||||
|
|
||||||
# Filter by date
|
# Filter by date
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
@@ -591,8 +592,8 @@ for query in queries:
|
|||||||
score_threshold=0.4,
|
score_threshold=0.4,
|
||||||
max_urls=10 # Top 10 per topic
|
max_urls=10 # Top 10 per topic
|
||||||
)
|
)
|
||||||
|
async with AsyncUrlSeeder() as seeder:
|
||||||
urls = await seeder.urls("learning-platform.com", config)
|
urls = await seeder.urls("learning-platform.com", config)
|
||||||
all_tutorials.extend(urls)
|
all_tutorials.extend(urls)
|
||||||
|
|
||||||
# Remove duplicates while preserving order
|
# Remove duplicates while preserving order
|
||||||
@@ -625,7 +626,8 @@ config = SeedingConfig(
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Returns a dictionary: {domain: [urls]}
|
# Returns a dictionary: {domain: [urls]}
|
||||||
results = await seeder.many_urls(domains, config)
|
async with AsyncUrlSeeder() as seeder:
|
||||||
|
results = await seeder.many_urls(domains, config)
|
||||||
|
|
||||||
# Process results
|
# Process results
|
||||||
for domain, urls in results.items():
|
for domain, urls in results.items():
|
||||||
@@ -654,8 +656,8 @@ config = SeedingConfig(
|
|||||||
pattern="*/blog/*",
|
pattern="*/blog/*",
|
||||||
max_urls=100
|
max_urls=100
|
||||||
)
|
)
|
||||||
|
async with AsyncUrlSeeder() as seeder:
|
||||||
results = await seeder.many_urls(competitors, config)
|
results = await seeder.many_urls(competitors, config)
|
||||||
|
|
||||||
# Analyze content types
|
# Analyze content types
|
||||||
for domain, urls in results.items():
|
for domain, urls in results.items():
|
||||||
@@ -690,8 +692,8 @@ config = SeedingConfig(
|
|||||||
score_threshold=0.3,
|
score_threshold=0.3,
|
||||||
max_urls=20 # Per site
|
max_urls=20 # Per site
|
||||||
)
|
)
|
||||||
|
async with AsyncUrlSeeder() as seeder:
|
||||||
results = await seeder.many_urls(educational_sites, config)
|
results = await seeder.many_urls(educational_sites, config)
|
||||||
|
|
||||||
# Find the best beginner tutorials
|
# Find the best beginner tutorials
|
||||||
all_tutorials = []
|
all_tutorials = []
|
||||||
@@ -731,8 +733,8 @@ config = SeedingConfig(
|
|||||||
score_threshold=0.5, # High threshold for relevance
|
score_threshold=0.5, # High threshold for relevance
|
||||||
max_urls=10
|
max_urls=10
|
||||||
)
|
)
|
||||||
|
async with AsyncUrlSeeder() as seeder:
|
||||||
results = await seeder.many_urls(news_sites, config)
|
results = await seeder.many_urls(news_sites, config)
|
||||||
|
|
||||||
# Collect all mentions
|
# Collect all mentions
|
||||||
mentions = []
|
mentions = []
|
||||||
|
|||||||
349
tests/docker/test_llm_params.py
Executable file
349
tests/docker/test_llm_params.py
Executable file
@@ -0,0 +1,349 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""
|
||||||
|
Test script for LLM temperature and base_url parameters in Crawl4AI Docker API.
|
||||||
|
This demonstrates the new hierarchical configuration system:
|
||||||
|
1. Request-level parameters (highest priority)
|
||||||
|
2. Provider-specific environment variables
|
||||||
|
3. Global environment variables
|
||||||
|
4. System defaults (lowest priority)
|
||||||
|
"""
|
||||||
|
|
||||||
|
import asyncio
|
||||||
|
import httpx
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
from rich.console import Console
|
||||||
|
from rich.panel import Panel
|
||||||
|
from rich.syntax import Syntax
|
||||||
|
from rich.table import Table
|
||||||
|
|
||||||
|
|
||||||
|
console = Console()
|
||||||
|
|
||||||
|
# Configuration
|
||||||
|
BASE_URL = "http://localhost:11235" # Docker API endpoint
|
||||||
|
TEST_URL = "https://httpbin.org/html" # Simple test page
|
||||||
|
|
||||||
|
# --- Helper Functions ---
|
||||||
|
|
||||||
|
async def check_server_health(client: httpx.AsyncClient) -> bool:
|
||||||
|
"""Check if the server is healthy."""
|
||||||
|
console.print("[bold cyan]Checking server health...[/]", end="")
|
||||||
|
try:
|
||||||
|
response = await client.get("/health", timeout=10.0)
|
||||||
|
response.raise_for_status()
|
||||||
|
console.print(" [bold green]✓ Server is healthy![/]")
|
||||||
|
return True
|
||||||
|
except Exception as e:
|
||||||
|
console.print(f"\n[bold red]✗ Server health check failed: {e}[/]")
|
||||||
|
console.print(f"Is the server running at {BASE_URL}?")
|
||||||
|
return False
|
||||||
|
|
||||||
|
def print_request(endpoint: str, payload: dict, title: str = "Request"):
|
||||||
|
"""Pretty print the request."""
|
||||||
|
syntax = Syntax(json.dumps(payload, indent=2), "json", theme="monokai")
|
||||||
|
console.print(Panel.fit(
|
||||||
|
f"[cyan]POST {endpoint}[/cyan]\n{syntax}",
|
||||||
|
title=f"[bold blue]{title}[/]",
|
||||||
|
border_style="blue"
|
||||||
|
))
|
||||||
|
|
||||||
|
def print_response(response: dict, title: str = "Response"):
|
||||||
|
"""Pretty print relevant parts of the response."""
|
||||||
|
# Extract only the relevant parts
|
||||||
|
relevant = {}
|
||||||
|
if "markdown" in response:
|
||||||
|
relevant["markdown"] = response["markdown"][:200] + "..." if len(response.get("markdown", "")) > 200 else response.get("markdown", "")
|
||||||
|
if "success" in response:
|
||||||
|
relevant["success"] = response["success"]
|
||||||
|
if "url" in response:
|
||||||
|
relevant["url"] = response["url"]
|
||||||
|
if "filter" in response:
|
||||||
|
relevant["filter"] = response["filter"]
|
||||||
|
|
||||||
|
console.print(Panel.fit(
|
||||||
|
Syntax(json.dumps(relevant, indent=2), "json", theme="monokai"),
|
||||||
|
title=f"[bold green]{title}[/]",
|
||||||
|
border_style="green"
|
||||||
|
))
|
||||||
|
|
||||||
|
# --- Test Functions ---
|
||||||
|
|
||||||
|
async def test_default_no_params(client: httpx.AsyncClient):
|
||||||
|
"""Test 1: No temperature or base_url specified - uses defaults"""
|
||||||
|
console.rule("[bold yellow]Test 1: Default Configuration (No Parameters)[/]")
|
||||||
|
|
||||||
|
payload = {
|
||||||
|
"url": TEST_URL,
|
||||||
|
"f": "llm",
|
||||||
|
"q": "What is the main heading of this page? Answer in exactly 5 words."
|
||||||
|
}
|
||||||
|
|
||||||
|
print_request("/md", payload, "Request without temperature/base_url")
|
||||||
|
|
||||||
|
try:
|
||||||
|
response = await client.post("/md", json=payload, timeout=30.0)
|
||||||
|
response.raise_for_status()
|
||||||
|
data = response.json()
|
||||||
|
print_response(data, "Response (using system defaults)")
|
||||||
|
console.print("[dim]→ This used system defaults or environment variables if set[/]")
|
||||||
|
except Exception as e:
|
||||||
|
console.print(f"[red]Error: {e}[/]")
|
||||||
|
|
||||||
|
async def test_request_temperature(client: httpx.AsyncClient):
|
||||||
|
"""Test 2: Request-level temperature (highest priority)"""
|
||||||
|
console.rule("[bold yellow]Test 2: Request-Level Temperature[/]")
|
||||||
|
|
||||||
|
# Test with low temperature (more focused)
|
||||||
|
payload_low = {
|
||||||
|
"url": TEST_URL,
|
||||||
|
"f": "llm",
|
||||||
|
"q": "What is the main heading? Be creative and poetic.",
|
||||||
|
"temperature": 0.1 # Very low - should be less creative
|
||||||
|
}
|
||||||
|
|
||||||
|
print_request("/md", payload_low, "Low Temperature (0.1)")
|
||||||
|
|
||||||
|
try:
|
||||||
|
response = await client.post("/md", json=payload_low, timeout=30.0)
|
||||||
|
response.raise_for_status()
|
||||||
|
data_low = response.json()
|
||||||
|
print_response(data_low, "Response with Low Temperature")
|
||||||
|
console.print("[dim]→ Low temperature (0.1) should produce focused, less creative output[/]")
|
||||||
|
except Exception as e:
|
||||||
|
console.print(f"[red]Error: {e}[/]")
|
||||||
|
|
||||||
|
console.print()
|
||||||
|
|
||||||
|
# Test with high temperature (more creative)
|
||||||
|
payload_high = {
|
||||||
|
"url": TEST_URL,
|
||||||
|
"f": "llm",
|
||||||
|
"q": "What is the main heading? Be creative and poetic.",
|
||||||
|
"temperature": 1.5 # High - should be more creative
|
||||||
|
}
|
||||||
|
|
||||||
|
print_request("/md", payload_high, "High Temperature (1.5)")
|
||||||
|
|
||||||
|
try:
|
||||||
|
response = await client.post("/md", json=payload_high, timeout=30.0)
|
||||||
|
response.raise_for_status()
|
||||||
|
data_high = response.json()
|
||||||
|
print_response(data_high, "Response with High Temperature")
|
||||||
|
console.print("[dim]→ High temperature (1.5) should produce more creative, varied output[/]")
|
||||||
|
except Exception as e:
|
||||||
|
console.print(f"[red]Error: {e}[/]")
|
||||||
|
|
||||||
|
async def test_provider_override(client: httpx.AsyncClient):
|
||||||
|
"""Test 3: Provider override with temperature"""
|
||||||
|
console.rule("[bold yellow]Test 3: Provider Override with Temperature[/]")
|
||||||
|
|
||||||
|
provider = "gemini/gemini-2.5-flash-lite"
|
||||||
|
payload = {
|
||||||
|
"url": TEST_URL,
|
||||||
|
"f": "llm",
|
||||||
|
"q": "Summarize this page in one sentence.",
|
||||||
|
"provider": provider, # Explicitly set provider
|
||||||
|
"temperature": 0.7
|
||||||
|
}
|
||||||
|
|
||||||
|
print_request("/md", payload, "Provider + Temperature Override")
|
||||||
|
|
||||||
|
try:
|
||||||
|
response = await client.post("/md", json=payload, timeout=30.0)
|
||||||
|
response.raise_for_status()
|
||||||
|
data = response.json()
|
||||||
|
print_response(data, "Response with Provider Override")
|
||||||
|
console.print(f"[dim]→ This explicitly uses {provider} with temperature 0.7[/]")
|
||||||
|
except Exception as e:
|
||||||
|
console.print(f"[red]Error: {e}[/]")
|
||||||
|
|
||||||
|
async def test_base_url_custom(client: httpx.AsyncClient):
|
||||||
|
"""Test 4: Custom base_url (will fail unless you have a custom endpoint)"""
|
||||||
|
console.rule("[bold yellow]Test 4: Custom Base URL (Demo Only)[/]")
|
||||||
|
|
||||||
|
payload = {
|
||||||
|
"url": TEST_URL,
|
||||||
|
"f": "llm",
|
||||||
|
"q": "What is this page about?",
|
||||||
|
"base_url": "https://api.custom-endpoint.com/v1", # Custom endpoint
|
||||||
|
"temperature": 0.5
|
||||||
|
}
|
||||||
|
|
||||||
|
print_request("/md", payload, "Custom Base URL Request")
|
||||||
|
console.print("[yellow]Note: This will fail unless you have a custom endpoint set up[/]")
|
||||||
|
|
||||||
|
try:
|
||||||
|
response = await client.post("/md", json=payload, timeout=10.0)
|
||||||
|
response.raise_for_status()
|
||||||
|
data = response.json()
|
||||||
|
print_response(data, "Response from Custom Endpoint")
|
||||||
|
except httpx.HTTPStatusError as e:
|
||||||
|
console.print(f"[yellow]Expected failure (no custom endpoint): Status {e.response.status_code}[/]")
|
||||||
|
except Exception as e:
|
||||||
|
console.print(f"[yellow]Expected error: {e}[/]")
|
||||||
|
|
||||||
|
async def test_llm_job_endpoint(client: httpx.AsyncClient):
|
||||||
|
"""Test 5: Test the /llm/job endpoint with temperature and base_url"""
|
||||||
|
console.rule("[bold yellow]Test 5: LLM Job Endpoint with Parameters[/]")
|
||||||
|
|
||||||
|
payload = {
|
||||||
|
"url": TEST_URL,
|
||||||
|
"q": "Extract the main title and any key information",
|
||||||
|
"temperature": 0.3,
|
||||||
|
# "base_url": "https://api.openai.com/v1" # Optional
|
||||||
|
}
|
||||||
|
|
||||||
|
print_request("/llm/job", payload, "LLM Job with Temperature")
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Submit the job
|
||||||
|
response = await client.post("/llm/job", json=payload, timeout=30.0)
|
||||||
|
response.raise_for_status()
|
||||||
|
job_data = response.json()
|
||||||
|
|
||||||
|
if "task_id" in job_data:
|
||||||
|
task_id = job_data["task_id"]
|
||||||
|
console.print(f"[green]Job created with task_id: {task_id}[/]")
|
||||||
|
|
||||||
|
# Poll for result (simplified - in production use proper polling)
|
||||||
|
await asyncio.sleep(3)
|
||||||
|
|
||||||
|
status_response = await client.get(f"/llm/job/{task_id}")
|
||||||
|
status_data = status_response.json()
|
||||||
|
|
||||||
|
if status_data.get("status") == "completed":
|
||||||
|
console.print("[green]Job completed successfully![/]")
|
||||||
|
if "result" in status_data:
|
||||||
|
console.print(Panel.fit(
|
||||||
|
Syntax(json.dumps(status_data["result"], indent=2), "json", theme="monokai"),
|
||||||
|
title="Extraction Result",
|
||||||
|
border_style="green"
|
||||||
|
))
|
||||||
|
else:
|
||||||
|
console.print(f"[yellow]Job status: {status_data.get('status', 'unknown')}[/]")
|
||||||
|
else:
|
||||||
|
console.print(f"[red]Unexpected response: {job_data}[/]")
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
console.print(f"[red]Error: {e}[/]")
|
||||||
|
|
||||||
|
|
||||||
|
async def test_llm_endpoint(client: httpx.AsyncClient):
|
||||||
|
"""
|
||||||
|
Quick QA round-trip with /llm.
|
||||||
|
Asks a trivial question against SIMPLE_URL just to show wiring.
|
||||||
|
"""
|
||||||
|
import time
|
||||||
|
import urllib.parse
|
||||||
|
|
||||||
|
page_url = "https://kidocode.com"
|
||||||
|
question = "What is the title of this page?"
|
||||||
|
|
||||||
|
enc = urllib.parse.quote_plus(page_url, safe="")
|
||||||
|
console.print(f"GET /llm/{enc}?q={question}")
|
||||||
|
|
||||||
|
try:
|
||||||
|
t0 = time.time()
|
||||||
|
resp = await client.get(f"/llm/{enc}", params={"q": question})
|
||||||
|
dt = time.time() - t0
|
||||||
|
console.print(
|
||||||
|
f"Response Status: [bold {'green' if resp.is_success else 'red'}]{resp.status_code}[/] (took {dt:.2f}s)")
|
||||||
|
resp.raise_for_status()
|
||||||
|
answer = resp.json().get("answer", "")
|
||||||
|
console.print(Panel(answer or "No answer returned",
|
||||||
|
title="LLM answer", border_style="magenta", expand=False))
|
||||||
|
except Exception as e:
|
||||||
|
console.print(f"[bold red]Error hitting /llm:[/] {e}")
|
||||||
|
|
||||||
|
|
||||||
|
async def show_environment_info():
|
||||||
|
"""Display current environment configuration"""
|
||||||
|
console.rule("[bold cyan]Current Environment Configuration[/]")
|
||||||
|
|
||||||
|
table = Table(title="LLM Environment Variables", show_header=True, header_style="bold magenta")
|
||||||
|
table.add_column("Variable", style="cyan", width=30)
|
||||||
|
table.add_column("Value", style="yellow")
|
||||||
|
table.add_column("Description", style="dim")
|
||||||
|
|
||||||
|
env_vars = [
|
||||||
|
("LLM_PROVIDER", "Global default provider"),
|
||||||
|
("LLM_TEMPERATURE", "Global default temperature"),
|
||||||
|
("LLM_BASE_URL", "Global custom API endpoint"),
|
||||||
|
("OPENAI_API_KEY", "OpenAI API key"),
|
||||||
|
("OPENAI_TEMPERATURE", "OpenAI-specific temperature"),
|
||||||
|
("OPENAI_BASE_URL", "OpenAI-specific endpoint"),
|
||||||
|
("ANTHROPIC_API_KEY", "Anthropic API key"),
|
||||||
|
("ANTHROPIC_TEMPERATURE", "Anthropic-specific temperature"),
|
||||||
|
("GROQ_API_KEY", "Groq API key"),
|
||||||
|
("GROQ_TEMPERATURE", "Groq-specific temperature"),
|
||||||
|
]
|
||||||
|
|
||||||
|
for var, desc in env_vars:
|
||||||
|
value = os.environ.get(var, "[not set]")
|
||||||
|
if "API_KEY" in var and value != "[not set]":
|
||||||
|
# Mask API keys for security
|
||||||
|
value = value[:10] + "..." if len(value) > 10 else "***"
|
||||||
|
table.add_row(var, value, desc)
|
||||||
|
|
||||||
|
console.print(table)
|
||||||
|
console.print()
|
||||||
|
|
||||||
|
# --- Main Test Runner ---
|
||||||
|
|
||||||
|
async def main():
|
||||||
|
"""Run all tests"""
|
||||||
|
console.print(Panel.fit(
|
||||||
|
"[bold cyan]Crawl4AI LLM Parameters Test Suite[/]\n" +
|
||||||
|
"Testing temperature and base_url configuration hierarchy",
|
||||||
|
border_style="cyan"
|
||||||
|
))
|
||||||
|
|
||||||
|
# Show current environment
|
||||||
|
# await show_environment_info()
|
||||||
|
|
||||||
|
# Create HTTP client
|
||||||
|
async with httpx.AsyncClient(base_url=BASE_URL, timeout=60.0) as client:
|
||||||
|
# Check server health
|
||||||
|
if not await check_server_health(client):
|
||||||
|
console.print("[red]Server is not available. Please ensure the Docker container is running.[/]")
|
||||||
|
return
|
||||||
|
|
||||||
|
# Run tests
|
||||||
|
tests = [
|
||||||
|
("Default Configuration", test_default_no_params),
|
||||||
|
("Request Temperature", test_request_temperature),
|
||||||
|
("Provider Override", test_provider_override),
|
||||||
|
("Custom Base URL", test_base_url_custom),
|
||||||
|
("LLM Job Endpoint", test_llm_job_endpoint),
|
||||||
|
("LLM Endpoint", test_llm_endpoint),
|
||||||
|
]
|
||||||
|
|
||||||
|
for i, (name, test_func) in enumerate(tests, 1):
|
||||||
|
if i > 1:
|
||||||
|
console.print() # Add spacing between tests
|
||||||
|
|
||||||
|
try:
|
||||||
|
await test_func(client)
|
||||||
|
except Exception as e:
|
||||||
|
console.print(f"[red]Test '{name}' failed with error: {e}[/]")
|
||||||
|
console.print_exception(show_locals=False)
|
||||||
|
|
||||||
|
console.rule("[bold green]All Tests Complete![/]", style="green")
|
||||||
|
|
||||||
|
# Summary
|
||||||
|
console.print("\n[bold cyan]Configuration Hierarchy Summary:[/]")
|
||||||
|
console.print("1. [yellow]Request parameters[/] - Highest priority (temperature, base_url in API call)")
|
||||||
|
console.print("2. [yellow]Provider-specific env[/] - e.g., OPENAI_TEMPERATURE, GROQ_BASE_URL")
|
||||||
|
console.print("3. [yellow]Global env variables[/] - LLM_TEMPERATURE, LLM_BASE_URL")
|
||||||
|
console.print("4. [yellow]System defaults[/] - Lowest priority (provider/litellm defaults)")
|
||||||
|
console.print()
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
try:
|
||||||
|
asyncio.run(main())
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
console.print("\n[yellow]Tests interrupted by user.[/]")
|
||||||
|
except Exception as e:
|
||||||
|
console.print(f"\n[bold red]An error occurred:[/]")
|
||||||
|
console.print_exception(show_locals=False)
|
||||||
Reference in New Issue
Block a user