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 DSL/CronManager/script/service_enrichment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ echo "[PACKAGES] Installing required packages..."
"$UV_BIN" pip install --python "$VENV_PATH/bin/python3" "httpx>=0.27.0" || exit 1
"$UV_BIN" pip install --python "$VENV_PATH/bin/python3" "pydantic>=2.11.7" || exit 1
"$UV_BIN" pip install --python "$VENV_PATH/bin/python3" "qdrant-client>=1.15.1" || exit 1
"$UV_BIN" pip install --python "$VENV_PATH/bin/python3" "loguru>=0.7.3" || exit 1
"$UV_BIN" pip install --python "$VENV_PATH/bin/python3" "requests>=2.32.5" || exit 1

echo "[PACKAGES] All packages installed successfully"

Expand Down
10 changes: 2 additions & 8 deletions DSL/Ruuter.public/rag-search/POST/api-tools/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,7 @@ execute_indexing:
params: ${params}
result: indexing_result
on_error: handle_cron_error
next: check_indexing_status

check_indexing_status:
switch:
- condition: ${200 <= indexing_result.response.statusCodeValue && indexing_result.response.statusCodeValue < 300}
next: assign_success
next: assign_cron_failure
next: assign_success

handle_cron_error:
log: "ERROR: Failed to queue api_tool indexing job - ${indexing_result.error || 'CronManager unreachable'}"
Expand All @@ -98,7 +92,7 @@ assign_cron_failure:
success: false
error: "INDEXING_QUEUE_FAILED"
message: "Failed to queue indexing job. CronManager may be unavailable."
details: ${indexing_result.error}
details: ${indexing_result.error || 'CronManager unreachable'}
next: return_server_error

assign_success:
Expand Down
10 changes: 2 additions & 8 deletions DSL/Ruuter.public/rag-search/POST/services/enrich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,7 @@ execute_enrichment:
is_common: ${service_is_common}
result: enrichment_result
on_error: handle_cron_error
next: check_enrichment_status

check_enrichment_status:
switch:
- condition: ${200 <= enrichment_result.response.statusCodeValue && enrichment_result.response.statusCodeValue < 300}
next: assign_success
next: assign_cron_failure
next: assign_success

handle_cron_error:
log: "ERROR: Failed to queue enrichment job - ${enrichment_result.error || 'CronManager unreachable'}"
Expand All @@ -93,7 +87,7 @@ assign_cron_failure:
success: false
error: "ENRICHMENT_QUEUE_FAILED"
message: "Failed to queue enrichment job. CronManager may be unavailable."
details: ${enrichment_result.error}
details: ${enrichment_result.error || 'CronManager unreachable'}
next: return_server_error

assign_success:
Expand Down
4 changes: 3 additions & 1 deletion src/api_tool_indexer/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ class ApiToolIndexerConstants:
# LLM / Embedding API
DEFAULT_API_BASE_URL = "http://llm-orchestration-service:8100"
DEFAULT_ENVIRONMENT = "production"
DEFAULT_CONNECTION_ID = ""
# None → orchestration service resolves the embedding model via the
# DB-fetched vault UUID (path: embeddings/connections/{provider}/{vault_uuid}).
DEFAULT_CONNECTION_ID = None

# Retry Configuration
MAX_RETRIES = 3
Expand Down
2 changes: 1 addition & 1 deletion src/intent_data_enrichment/api_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def __init__(
self,
api_base_url: str = EnrichmentConstants.DEFAULT_API_BASE_URL,
environment: str = EnrichmentConstants.DEFAULT_ENVIRONMENT,
connection_id: str = EnrichmentConstants.DEFAULT_CONNECTION_ID,
connection_id: Optional[str] = EnrichmentConstants.DEFAULT_CONNECTION_ID,
max_retries: int = EnrichmentConstants.MAX_RETRIES,
retry_delay_base: int = EnrichmentConstants.RETRY_DELAY_BASE,
timeout: int = EnrichmentConstants.REQUEST_TIMEOUT,
Expand Down
4 changes: 3 additions & 1 deletion src/intent_data_enrichment/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ class EnrichmentConstants:
# API Configuration
DEFAULT_API_BASE_URL = "http://llm-orchestration-service:8100"
DEFAULT_ENVIRONMENT = "production"
DEFAULT_CONNECTION_ID = "gpt-4o-mini"
# None → orchestration service resolves the embedding model via the
# DB-fetched vault UUID (path: embeddings/connections/{provider}/{vault_uuid}).
DEFAULT_CONNECTION_ID = None

# Retry Configuration
MAX_RETRIES = 3
Expand Down
Loading