feat: bumped to DIAL 1.8 and aidial-sdk 0.8.0 (#103)

epam · May 9, 2024 · da06e08 · da06e08
1 parent 4398663
commit da06e08
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+      - ${DIAL_DIR:-.}/core-logs/:/app/log
+      - ${DIAL_DIR:-.}/core-data/:/app/data
diff --git 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"
diff --git a/dial-sdk b/dial-sdk