From 8653b482d5b2de134f496c7a254cff6e1d88e48a Mon Sep 17 00:00:00 2001 From: erangi-ar Date: Tue, 14 Oct 2025 19:05:21 +0530 Subject: [PATCH 1/2] gui running on 3003 issue fixed --- GUI/.env.development | 5 +- GUI/src/services/llmConnections.ts | 1 + docker-compose.yml | 74 +++++++++++++++--------------- 3 files changed, 39 insertions(+), 41 deletions(-) diff --git a/GUI/.env.development b/GUI/.env.development index 7ff4d8b..39f5e47 100644 --- a/GUI/.env.development +++ b/GUI/.env.development @@ -1,8 +1,7 @@ REACT_APP_RUUTER_API_URL=http://localhost:8086 REACT_APP_RUUTER_PRIVATE_API_URL=http://localhost:8088 -REACT_APP_EXTERNAL_API_URL=http://localhost:8000 REACT_APP_CUSTOMER_SERVICE_LOGIN=http://localhost:3004/et/dev-auth REACT_APP_SERVICE_ID=conversations,settings,monitoring -REACT_APP_NOTIFICATION_NODE_URL=http://localhost:4040 -REACT_APP_CSP=upgrade-insecure-requests; default-src 'self'; font-src 'self' data:; img-src 'self' data:; script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; object-src 'none'; connect-src 'self' http://localhost:8086 http://localhost:8088 http://localhost:8085 http://localhost:4040; +REACT_APP_NOTIFICATION_NODE_URL=http://localhost:3005 +REACT_APP_CSP=upgrade-insecure-requests; default-src 'self'; font-src 'self' data:; img-src 'self' data:; script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; object-src 'none'; connect-src 'self' http://localhost:8086 http://localhost:8088 http://localhost:3004 http://localhost:3005 ws://localhost; REACT_APP_ENABLE_HIDDEN_FEATURES=TRUE \ No newline at end of file diff --git a/GUI/src/services/llmConnections.ts b/GUI/src/services/llmConnections.ts index b385aaf..96d37e9 100644 --- a/GUI/src/services/llmConnections.ts +++ b/GUI/src/services/llmConnections.ts @@ -197,6 +197,7 @@ export async function checkBudgetStatus(): Promise { // Return null if no production connection found (404) or other errors return null; } +} export async function updateLLMConnectionStatus( id: string | number, diff --git a/docker-compose.yml b/docker-compose.yml index c61e6c9..b3a8473 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -140,12 +140,11 @@ services: container_name: gui environment: - NODE_ENV=development - - REACT_APP_RUUTER_API_URL=http://localhost/ruuter-public - - REACT_APP_RUUTER_PRIVATE_API_URL=http://localhost/ruuter-private - - REACT_APP_EXTERNAL_API_URL=http://localhost/dataset-gen-service - - REACT_APP_CUSTOMER_SERVICE_LOGIN=http://localhost/authentication-layer/et/dev-auth - - REACT_APP_NOTIFICATION_NODE_URL=http://localhost/notifications-node - - REACT_APP_CSP=upgrade-insecure-requests; default-src 'self'; font-src 'self' data:; img-src 'self' data:; script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; object-src 'none'; connect-src 'self' http://localhost ws://localhost; + - REACT_APP_RUUTER_API_URL=http://localhost:8086 + - REACT_APP_RUUTER_PRIVATE_API_URL=http://localhost:8088 + - REACT_APP_CUSTOMER_SERVICE_LOGIN=http://localhost:3004 + - REACT_APP_NOTIFICATION_NODE_URL=http://localhost:3005 + - REACT_APP_CSP=upgrade-insecure-requests; default-src 'self'; font-src 'self' data:; img-src 'self' data:; script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; object-src 'none'; connect-src 'self' http://localhost:8086 http://localhost:8088 http://localhost:3004 http://localhost:3005 ws://localhost; - DEBUG_ENABLED=true - CHOKIDAR_USEPOLLING=true - PORT=3001 @@ -447,39 +446,38 @@ services: - bykstack restart: unless-stopped - # LLM Orchestration Service - # llm-orchestration-service: - # build: - # context: . - # dockerfile: Dockerfile.llm_orchestration_service - # container_name: llm-orchestration-service - # restart: always - # ports: - # - "8100:8100" - # env_file: - # - .env - # environment: - # - ENVIRONMENT=production - # - VAULT_ADDR=http://vault:8200 - # - VAULT_TOKEN=/agent/out/token - # volumes: - # # Mount configuration files - # - ./src/llm_config_module/config:/app/src/llm_config_module/config:ro - # # Mount logs directory for persistence - # - llm_orchestration_logs:/app/logs - # - ./vault/agent-out:/agent/out:ro - # networks: - # - bykstack - # depends_on: - # - vault - # - vault-agent-llm - # healthcheck: - # test: ["CMD", "curl", "-f", "http://llm-orchestration-service:8100/health"] - # interval: 30s - # timeout: 10s - # start_period: 40s - # retries: 3 + llm-orchestration-service: + build: + context: . + dockerfile: Dockerfile.llm_orchestration_service + container_name: llm-orchestration-service + restart: always + ports: + - "8100:8100" + env_file: + - .env + environment: + - ENVIRONMENT=production + - VAULT_ADDR=http://vault:8200 + - VAULT_TOKEN=/agent/out/token + volumes: + # Mount configuration files + - ./src/llm_config_module/config:/app/src/llm_config_module/config:ro + # Mount logs directory for persistence + - llm_orchestration_logs:/app/logs + - ./vault/agent-out:/agent/out:ro + networks: + - bykstack + depends_on: + - vault + - vault-agent-llm + healthcheck: + test: ["CMD", "curl", "-f", "http://llm-orchestration-service:8100/health"] + interval: 30s + timeout: 10s + start_period: 40s + retries: 3 volumes: loki-data: From 4f9dbc59cc83d5115eab89b283408ba7583558ae Mon Sep 17 00:00:00 2001 From: erangi-ar Date: Wed, 15 Oct 2025 10:07:17 +0530 Subject: [PATCH 2/2] Add SQL query to retrieve configuration values --- DSL/Resql/rag-search/POST/get-configuration.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 DSL/Resql/rag-search/POST/get-configuration.sql diff --git a/DSL/Resql/rag-search/POST/get-configuration.sql b/DSL/Resql/rag-search/POST/get-configuration.sql new file mode 100644 index 0000000..f03b322 --- /dev/null +++ b/DSL/Resql/rag-search/POST/get-configuration.sql @@ -0,0 +1,5 @@ +SELECT id, key, value +FROM configuration +WHERE key=:key +AND id IN (SELECT max(id) from configuration GROUP BY key) +AND NOT deleted;