Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5998571890 | ||
|
|
6ac1d15591 | ||
|
|
22af23827d |
@@ -6,7 +6,7 @@ on:
|
|||||||
- 'api/v*'
|
- 'api/v*'
|
||||||
|
|
||||||
env:
|
env:
|
||||||
IMAGE_NAME: git.schweitz.internal/jpmschweitzer/webber-api
|
IMAGE_NAME: git.schweitz.net/jpmschweitzer/webber-api
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
release:
|
release:
|
||||||
@@ -44,7 +44,7 @@ jobs:
|
|||||||
- name: Login to Gitea Registry
|
- name: Login to Gitea Registry
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
registry: git.schweitz.internal
|
registry: git.schweitz.net
|
||||||
username: ${{ secrets.REGISTRY_USER }}
|
username: ${{ secrets.REGISTRY_USER }}
|
||||||
password: ${{ secrets.REGISTRY_PASSWORD }}
|
password: ${{ secrets.REGISTRY_PASSWORD }}
|
||||||
|
|
||||||
|
|||||||
@@ -18,9 +18,12 @@ OLLAMA_AGENT_MODEL=mistral-nemo-large:latest
|
|||||||
OLLAMA_EMBED_MODEL=nomic-embed-text:latest
|
OLLAMA_EMBED_MODEL=nomic-embed-text:latest
|
||||||
|
|
||||||
# Auth - Tatlock integration (optional)
|
# Auth - Tatlock integration (optional)
|
||||||
# TATLOCK_API_URL=http://192.168.86.149:8000
|
# TATLOCK_API_URL=http://tatlock:8000
|
||||||
# INTERNAL_API_KEY=your-internal-key
|
# INTERNAL_API_KEY=your-internal-key
|
||||||
|
|
||||||
|
# Web search - SearXNG (container name on docker-dataplane; internal port 8080)
|
||||||
|
# SEARXNG_URL=http://searxng:8080
|
||||||
|
|
||||||
# Tool execution
|
# Tool execution
|
||||||
TOOL_TIMEOUT_SECONDS=120
|
TOOL_TIMEOUT_SECONDS=120
|
||||||
SANDBOX_ENABLED=true
|
SANDBOX_ENABLED=true
|
||||||
|
|||||||
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## [1.0.1] - 2026-07-19
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Default `TATLOCK_API_URL` and `SEARXNG_URL` now use docker container names (`http://tatlock:8000`, `http://searxng:8080`) instead of host IP:port, for container-to-container traffic on the docker-dataplane network
|
||||||
|
- CI workflow now pushes Docker images via the `git.schweitz.net` registry route
|
||||||
|
|
||||||
## [1.0.0] - 2026-01-15
|
## [1.0.0] - 2026-01-15
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
@@ -207,7 +207,9 @@ All settings via environment variables or `.env`:
|
|||||||
| OLLAMA_URL | http://192.168.86.149:11434 | Ollama API URL |
|
| OLLAMA_URL | http://192.168.86.149:11434 | Ollama API URL |
|
||||||
| OLLAMA_AGENT_MODEL | mistral-nemo-large:latest | Agent reasoning model |
|
| OLLAMA_AGENT_MODEL | mistral-nemo-large:latest | Agent reasoning model |
|
||||||
| OLLAMA_EMBED_MODEL | nomic-embed-text:latest | Embedding model |
|
| OLLAMA_EMBED_MODEL | nomic-embed-text:latest | Embedding model |
|
||||||
| TATLOCK_API_URL | http://192.168.86.149:8000 | Tatlock auth service |
|
| TATLOCK_API_URL | http://tatlock:8000 | Tatlock auth service |
|
||||||
|
| SEARXNG_URL | http://searxng:8080 | SearXNG web search instance |
|
||||||
|
| SEARXNG_TIMEOUT | 10 | SearXNG request timeout (seconds) |
|
||||||
| TOOL_TIMEOUT_SECONDS | 120 | Tool execution timeout |
|
| TOOL_TIMEOUT_SECONDS | 120 | Tool execution timeout |
|
||||||
| SANDBOX_ENABLED | true | Enable sandboxed execution |
|
| SANDBOX_ENABLED | true | Enable sandboxed execution |
|
||||||
| ALLOWED_PATHS | [] | Paths accessible to tools |
|
| ALLOWED_PATHS | [] | Paths accessible to tools |
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "webber-api"
|
name = "webber-api"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
description = "Webber API - Multi-Agent AI Development Server"
|
description = "Webber API - Multi-Agent AI Development Server"
|
||||||
authors = [
|
authors = [
|
||||||
{name = "jpmschweitzer"}
|
{name = "jpmschweitzer"}
|
||||||
|
|||||||
@@ -68,11 +68,11 @@ class Settings(BaseSettings):
|
|||||||
ollama_embed_model: str = "nomic-embed-text:latest"
|
ollama_embed_model: str = "nomic-embed-text:latest"
|
||||||
|
|
||||||
# Auth - Tatlock integration
|
# Auth - Tatlock integration
|
||||||
tatlock_api_url: str | None = "http://192.168.86.149:8000"
|
tatlock_api_url: str | None = "http://tatlock:8000"
|
||||||
internal_api_key: str | None = None
|
internal_api_key: str | None = None
|
||||||
|
|
||||||
# Web search - SearXNG (use SEARXNG_URL env var to override)
|
# Web search - SearXNG (use SEARXNG_URL env var to override)
|
||||||
searxng_url: str = "http://192.168.86.149:8087"
|
searxng_url: str = "http://searxng:8080"
|
||||||
searxng_timeout: int = 10
|
searxng_timeout: int = 10
|
||||||
|
|
||||||
# Tool execution
|
# Tool execution
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ class TestWebSearchTool:
|
|||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def tool(self):
|
def tool(self):
|
||||||
return WebSearchTool(searxng_url="http://localhost:8087", timeout=5)
|
return WebSearchTool(searxng_url="http://searxng:8080", timeout=5)
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def mock_search_response(self):
|
def mock_search_response(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user