From c7cbf03dae74a6046500a0df3334fd607018bece Mon Sep 17 00:00:00 2001 From: ewezy Date: Tue, 29 Mar 2022 09:47:50 +0800 Subject: [PATCH 1/4] Update workflows to use Python 3.7 for ensembler engines and sdk --- .github/workflows/pyfunc-ensembler-job.yaml | 2 +- .github/workflows/pyfunc-ensembler-service.yaml | 2 +- .github/workflows/sdk.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pyfunc-ensembler-job.yaml b/.github/workflows/pyfunc-ensembler-job.yaml index 914254d83..b170e3841 100644 --- a/.github/workflows/pyfunc-ensembler-job.yaml +++ b/.github/workflows/pyfunc-ensembler-job.yaml @@ -34,7 +34,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.7 - name: Setup Java uses: actions/setup-java@v2 diff --git a/.github/workflows/pyfunc-ensembler-service.yaml b/.github/workflows/pyfunc-ensembler-service.yaml index 0f915b4fe..1632d4374 100644 --- a/.github/workflows/pyfunc-ensembler-service.yaml +++ b/.github/workflows/pyfunc-ensembler-service.yaml @@ -34,7 +34,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.7 - name: Setup Conda uses: conda-incubator/setup-miniconda@v2 diff --git a/.github/workflows/sdk.yaml b/.github/workflows/sdk.yaml index 0badb5e08..43b4e4e0a 100644 --- a/.github/workflows/sdk.yaml +++ b/.github/workflows/sdk.yaml @@ -33,7 +33,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.7 - name: Cache pip dependencies uses: actions/cache@v2 @@ -84,7 +84,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.7 - name: Cache pip dependencies uses: actions/cache@v2 From bc4414618ed06dcf20f3c2ac523604eb2d9c6790 Mon Sep 17 00:00:00 2001 From: ewezy Date: Tue, 29 Mar 2022 14:42:11 +0800 Subject: [PATCH 2/4] Add none return option for config in Router SDK class --- sdk/turing/router/router.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sdk/turing/router/router.py b/sdk/turing/router/router.py index 68dea112e..f36eb8d15 100644 --- a/sdk/turing/router/router.py +++ b/sdk/turing/router/router.py @@ -1,7 +1,7 @@ import time import logging -from typing import List, Dict +from typing import List, Dict, Optional import turing.generated.models from turing._base_types import ApiObject, ApiObjectSpec @@ -75,8 +75,11 @@ def status(self) -> RouterStatus: return self._status @property - def config(self) -> 'RouterConfig': - return RouterConfig(name=self.name, environment_name=self.environment_name, **self._config) + def config(self) -> Optional['RouterConfig']: + if self._config is not None: + return RouterConfig(name=self.name, environment_name=self.environment_name, **self._config) + else: + return None @property def version(self) -> int: From 0dae774faaede798e901f11d403bf02969c0770b Mon Sep 17 00:00:00 2001 From: ewezy Date: Tue, 29 Mar 2022 19:31:51 +0800 Subject: [PATCH 3/4] Update text display settings to display entire image name --- ui/src/components/config_section/index.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/components/config_section/index.scss b/ui/src/components/config_section/index.scss index 1e77f77e4..b8846b054 100644 --- a/ui/src/components/config_section/index.scss +++ b/ui/src/components/config_section/index.scss @@ -11,7 +11,7 @@ .euiPanel--configSection { .euiDescriptionList.euiDescriptionList--responsiveColumn { > * { - @include euiTextTruncate; + @include euiTextBreakWord; line-height: 2.1 !important; margin-top: 2px !important; From 02c5884f03dad19c270e51b2ecec664afd32e641 Mon Sep 17 00:00:00 2001 From: ewezy Date: Wed, 30 Mar 2022 14:05:57 +0800 Subject: [PATCH 4/4] Set container image name to overflow instead of being truncated --- ui/src/components/config_section/index.scss | 2 +- .../docker_config_section/ContainerConfigTable.js | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ui/src/components/config_section/index.scss b/ui/src/components/config_section/index.scss index b8846b054..1e77f77e4 100644 --- a/ui/src/components/config_section/index.scss +++ b/ui/src/components/config_section/index.scss @@ -11,7 +11,7 @@ .euiPanel--configSection { .euiDescriptionList.euiDescriptionList--responsiveColumn { > * { - @include euiTextBreakWord; + @include euiTextTruncate; line-height: 2.1 !important; margin-top: 2px !important; diff --git a/ui/src/router/components/configuration/components/docker_config_section/ContainerConfigTable.js b/ui/src/router/components/configuration/components/docker_config_section/ContainerConfigTable.js index 64b8850d0..38c45e86b 100644 --- a/ui/src/router/components/configuration/components/docker_config_section/ContainerConfigTable.js +++ b/ui/src/router/components/configuration/components/docker_config_section/ContainerConfigTable.js @@ -7,7 +7,16 @@ export const ContainerConfigTable = ({ const items = [ { title: "Image", - description: image, + description: ( + + {image} + + ), }, { title: "Endpoint",