From da06e0893edc5785a1095e24533304fbff24f8c6 Mon Sep 17 00:00:00 2001 From: Anton Dubovik Date: Thu, 9 May 2024 16:31:59 +0200 Subject: [PATCH] feat: bumped to DIAL 1.8 and aidial-sdk 0.8.0 (#103) --- dial-docker-compose/addon/docker-compose.yml | 4 ++-- dial-docker-compose/ci/addon/docker-compose.yml | 1 + dial-docker-compose/ci/addon/test/app.py | 8 +++++--- dial-docker-compose/ci/application/docker-compose.yml | 1 + dial-docker-compose/ci/application/test/app.py | 8 +++++--- dial-docker-compose/ci/model/docker-compose.yml | 1 + dial-docker-compose/ci/model/test/app.py | 8 +++++--- dial-docker-compose/common.yml | 10 +++++++--- dial-docker-compose/model/docker-compose.yml | 2 +- dial-sdk | 2 +- 10 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dial-docker-compose/addon/docker-compose.yml b/dial-docker-compose/addon/docker-compose.yml index 8fc24bbc..0ac8ecd4 100644 --- a/dial-docker-compose/addon/docker-compose.yml +++ b/dial-docker-compose/addon/docker-compose.yml @@ -6,12 +6,12 @@ include: services: adapter-openai: - image: epam/ai-dial-adapter-openai:0.7.0 + image: epam/ai-dial-adapter-openai:0.11.0 environment: WEB_CONCURRENCY: "3" assistant: - image: epam/ai-dial-assistant:0.6.0 + image: epam/ai-dial-assistant:0.7.0 environment: OPENAI_API_BASE: "http://core:8080" WEB_CONCURRENCY: "3" diff --git a/dial-docker-compose/ci/addon/docker-compose.yml b/dial-docker-compose/ci/addon/docker-compose.yml index 8a93fb1d..3e1762a5 100644 --- a/dial-docker-compose/ci/addon/docker-compose.yml +++ b/dial-docker-compose/ci/addon/docker-compose.yml @@ -15,6 +15,7 @@ services: environment: DIAL_URL: "http://core:8080" DIAL_API_KEY: "dial_api_key" + DIAL_API_VERSION: "2024-02-01" depends_on: azure_deployment_host: condition: service_started diff --git a/dial-docker-compose/ci/addon/test/app.py b/dial-docker-compose/ci/addon/test/app.py index 01314780..f58c6b42 100644 --- a/dial-docker-compose/ci/addon/test/app.py +++ b/dial-docker-compose/ci/addon/test/app.py @@ -15,6 +15,7 @@ def get_env(name: str) -> str: DIAL_URL = get_env("DIAL_URL") DIAL_API_KEY = get_env("DIAL_API_KEY") +DIAL_API_VERSION = get_env("DIAL_API_VERSION") logging.basicConfig(level=logging.DEBUG) @@ -24,9 +25,9 @@ def get_env(name: str) -> str: (aiohttp.ClientError, aiohttp.ServerTimeoutError), max_time=60, ) -async def post_with_retry(url: str, payload: dict, headers: dict): +async def post_with_retry(url: str, payload: dict, headers: dict, params: dict): async with aiohttp.ClientSession() as session: - async with session.post(url, json=payload, headers=headers) as response: + async with session.post(url, json=payload, headers=headers, params=params) as response: response.raise_for_status() return await response.json() @@ -46,8 +47,9 @@ async def test_model(deployment_id: str, model: str): "stream": False, } headers = {"api-key": DIAL_API_KEY} + params = {"api-version": DIAL_API_VERSION} - body = await post_with_retry(api_url, payload, headers) + body = await post_with_retry(api_url, payload, headers, params) content = body.get("choices", [])[0].get("message", {}).get("content", "") if content != expected_response: diff --git a/dial-docker-compose/ci/application/docker-compose.yml b/dial-docker-compose/ci/application/docker-compose.yml index 7bee0ca3..1de7b465 100644 --- a/dial-docker-compose/ci/application/docker-compose.yml +++ b/dial-docker-compose/ci/application/docker-compose.yml @@ -10,6 +10,7 @@ services: environment: DIAL_URL: "http://core:8080" DIAL_API_KEY: "dial_api_key" + DIAL_API_VERSION: "2024-02-01" depends_on: echo: condition: service_started diff --git a/dial-docker-compose/ci/application/test/app.py b/dial-docker-compose/ci/application/test/app.py index b54901b6..3b692248 100644 --- a/dial-docker-compose/ci/application/test/app.py +++ b/dial-docker-compose/ci/application/test/app.py @@ -15,6 +15,7 @@ def get_env(name: str) -> str: DIAL_URL = get_env("DIAL_URL") DIAL_API_KEY = get_env("DIAL_API_KEY") +DIAL_API_VERSION = get_env("DIAL_API_VERSION") logging.basicConfig(level=logging.DEBUG) @@ -24,9 +25,9 @@ def get_env(name: str) -> str: (aiohttp.ClientError, aiohttp.ServerTimeoutError), max_time=60, ) -async def post_with_retry(url: str, payload: dict, headers: dict): +async def post_with_retry(url: str, payload: dict, headers: dict, params: dict): async with aiohttp.ClientSession() as session: - async with session.post(url, json=payload, headers=headers) as response: + async with session.post(url, json=payload, headers=headers, params=params) as response: response.raise_for_status() return await response.json() @@ -37,8 +38,9 @@ async def test_model(deployment_id: str): message = "Hello" payload = {"messages": [{"role": "user", "content": message}], "stream": False} headers = {"api-key": DIAL_API_KEY} + params = {"api-version": DIAL_API_VERSION} - body = await post_with_retry(api_url, payload, headers) + body = await post_with_retry(api_url, payload, headers, params) content = body.get("choices", [])[0].get("message", {}).get("content", "") if content != message: diff --git a/dial-docker-compose/ci/model/docker-compose.yml b/dial-docker-compose/ci/model/docker-compose.yml index f2c1a639..ec81a89e 100644 --- a/dial-docker-compose/ci/model/docker-compose.yml +++ b/dial-docker-compose/ci/model/docker-compose.yml @@ -15,6 +15,7 @@ services: environment: DIAL_URL: "http://core:8080" DIAL_API_KEY: "dial_api_key" + DIAL_API_VERSION: "2024-02-01" depends_on: adapter-openai: condition: service_started diff --git a/dial-docker-compose/ci/model/test/app.py b/dial-docker-compose/ci/model/test/app.py index ff4f5133..8aa7df40 100644 --- a/dial-docker-compose/ci/model/test/app.py +++ b/dial-docker-compose/ci/model/test/app.py @@ -15,6 +15,7 @@ def get_env(name: str) -> str: DIAL_URL = get_env("DIAL_URL") DIAL_API_KEY = get_env("DIAL_API_KEY") +DIAL_API_VERSION = get_env("DIAL_API_VERSION") logging.basicConfig(level=logging.DEBUG) @@ -24,9 +25,9 @@ def get_env(name: str) -> str: (aiohttp.ClientError, aiohttp.ServerTimeoutError), max_time=60, ) -async def post_with_retry(url: str, payload: dict, headers: dict): +async def post_with_retry(url: str, payload: dict, headers: dict, params: dict): async with aiohttp.ClientSession() as session: - async with session.post(url, json=payload, headers=headers) as response: + async with session.post(url, json=payload, headers=headers, params=params) as response: response.raise_for_status() return await response.json() @@ -37,8 +38,9 @@ async def test_model(deployment_id: str): message = "Hello" payload = {"messages": [{"role": "user", "content": message}], "stream": False} headers = {"api-key": DIAL_API_KEY} + params = {"api-version": DIAL_API_VERSION} - body = await post_with_retry(api_url, payload, headers) + body = await post_with_retry(api_url, payload, headers, params) content = body.get("choices", [])[0].get("message", {}).get("content", "") if content != message: diff --git a/dial-docker-compose/common.yml b/dial-docker-compose/common.yml index 61e57935..acd00eb1 100644 --- a/dial-docker-compose/common.yml +++ b/dial-docker-compose/common.yml @@ -3,14 +3,14 @@ version: '3' services: themes: - image: epam/ai-dial-chat-themes:0.3.0 + image: epam/ai-dial-chat-themes:0.4.0 ports: - "3001:8080" chat: ports: - "3000:3000" - image: epam/ai-dial-chat:0.5.1 + image: epam/ai-dial-chat:0.10.0 depends_on: - themes - core @@ -42,11 +42,15 @@ services: environment: 'AIDIAL_SETTINGS': '/opt/settings/settings.json' 'JAVA_OPTS': '-Dgflog.config=/opt/settings/gflog.xml' + 'LOG_DIR': '/app/log' + 'STORAGE_DIR': '/app/data' 'aidial.config.files': '["/opt/config/config.json"]' + 'aidial.storage.overrides': '{ "jclouds.filesystem.basedir": "data" }' 'aidial.redis.singleServerConfig.address': 'redis://redis:6379' depends_on: - redis volumes: - ./settings:/opt/settings - ${DIAL_DIR:-.}/core:/opt/config - - ${DIAL_DIR:-.}/core-logs/:/app/log \ No newline at end of file + - ${DIAL_DIR:-.}/core-logs/:/app/log + - ${DIAL_DIR:-.}/core-data/:/app/data \ No newline at end of file diff --git a/dial-docker-compose/model/docker-compose.yml b/dial-docker-compose/model/docker-compose.yml index 826418a1..fc530578 100644 --- a/dial-docker-compose/model/docker-compose.yml +++ b/dial-docker-compose/model/docker-compose.yml @@ -6,6 +6,6 @@ include: services: adapter-openai: - image: epam/ai-dial-adapter-openai:0.7.0 + image: epam/ai-dial-adapter-openai:0.11.0 environment: WEB_CONCURRENCY: "3" \ No newline at end of file diff --git a/dial-sdk b/dial-sdk index 90d79a6f..a17a4cf7 160000 --- a/dial-sdk +++ b/dial-sdk @@ -1 +1 @@ -Subproject commit 90d79a6ff1e8fc4b8aba6feaebe68f539b141a7b +Subproject commit a17a4cf7c1493b7f0a7fe45e780764d088222891