From ceca553399506568cab28d98ebd99d14a82b7876 Mon Sep 17 00:00:00 2001 From: Adil Hafeez Date: Wed, 16 Apr 2025 11:34:45 -0700 Subject: [PATCH 1/6] fix release image (#464) --- .github/workflows/docker-push-release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker-push-release.yml b/.github/workflows/docker-push-release.yml index 6d9cf294..12075b65 100644 --- a/.github/workflows/docker-push-release.yml +++ b/.github/workflows/docker-push-release.yml @@ -23,6 +23,8 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ env.DOCKER_IMAGE }} + tags: | + type=ref,event=tag - name: Build and Push ARM64 Image uses: docker/build-push-action@v5 @@ -51,6 +53,8 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ env.DOCKER_IMAGE }} + tags: | + type=ref,event=tag - name: Build and Push AMD64 Image uses: docker/build-push-action@v5 From 3cda4d6b69c4ee8a238d5a49720a0cf758a152a1 Mon Sep 17 00:00:00 2001 From: Adil Hafeez Date: Wed, 16 Apr 2025 11:46:12 -0700 Subject: [PATCH 2/6] fix docker hub tag (#465) --- .github/workflows/docker-push-release.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-push-release.yml b/.github/workflows/docker-push-release.yml index 12075b65..4c6bf7c3 100644 --- a/.github/workflows/docker-push-release.yml +++ b/.github/workflows/docker-push-release.yml @@ -1,5 +1,8 @@ name: Publish docker image (release) +env: + DOCKER_IMAGE: katanemo/archgw + on: release: types: [published] @@ -65,7 +68,6 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }}-amd64 - # Combine ARM64 and AMD64 images into a multi-arch manifest create-manifest: runs-on: ubuntu-latest @@ -82,6 +84,8 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ env.DOCKER_IMAGE }} + tags: | + type=ref,event=tag - name: Create Multi-Arch Manifest run: | From e17d5fb2ebf7371097e1a967379d464aa7614307 Mon Sep 17 00:00:00 2001 From: Adil Hafeez Date: Wed, 16 Apr 2025 12:18:03 -0700 Subject: [PATCH 3/6] test docker rel (#466) --- .github/workflows/docker-push-release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-push-release.yml b/.github/workflows/docker-push-release.yml index 4c6bf7c3..2bd17016 100644 --- a/.github/workflows/docker-push-release.yml +++ b/.github/workflows/docker-push-release.yml @@ -27,7 +27,7 @@ jobs: with: images: ${{ env.DOCKER_IMAGE }} tags: | - type=ref,event=tag + type=raw,value={{tag}} - name: Build and Push ARM64 Image uses: docker/build-push-action@v5 @@ -57,7 +57,7 @@ jobs: with: images: ${{ env.DOCKER_IMAGE }} tags: | - type=ref,event=tag + type=raw,value={{tag}} - name: Build and Push AMD64 Image uses: docker/build-push-action@v5 @@ -85,7 +85,7 @@ jobs: with: images: ${{ env.DOCKER_IMAGE }} tags: | - type=ref,event=tag + type=raw,value={{tag}} - name: Create Multi-Arch Manifest run: | From 3eb438550a24eb092d3e31edfb1ae9a0ee89d749 Mon Sep 17 00:00:00 2001 From: Adil Hafeez Date: Wed, 16 Apr 2025 12:24:17 -0700 Subject: [PATCH 4/6] fix source name for docker images (#467) --- .github/workflows/docker-push-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-push-release.yml b/.github/workflows/docker-push-release.yml index 2bd17016..ee60e724 100644 --- a/.github/workflows/docker-push-release.yml +++ b/.github/workflows/docker-push-release.yml @@ -91,5 +91,5 @@ jobs: run: | # Combine the architecture-specific images into a single manifest docker buildx imagetools create -t ${{ steps.meta.outputs.tags }} \ - ${{ env.DOCKER_IMAGE }}:arm64 \ - ${{ env.DOCKER_IMAGE }}:amd64 + ${{ env.DOCKER_IMAGE }}:${{ steps.meta.outputs.tags }}-arm64 \ + ${{ env.DOCKER_IMAGE }}:${{ steps.meta.outputs.tags }}-amd64 From 6d6c03a7e81f99db4f67c06c158fd2bf6d8de660 Mon Sep 17 00:00:00 2001 From: Adil Hafeez Date: Wed, 16 Apr 2025 13:08:43 -0700 Subject: [PATCH 5/6] fix docker hub release tag source image name (#468) --- .github/workflows/docker-push-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-push-release.yml b/.github/workflows/docker-push-release.yml index ee60e724..63c83689 100644 --- a/.github/workflows/docker-push-release.yml +++ b/.github/workflows/docker-push-release.yml @@ -91,5 +91,5 @@ jobs: run: | # Combine the architecture-specific images into a single manifest docker buildx imagetools create -t ${{ steps.meta.outputs.tags }} \ - ${{ env.DOCKER_IMAGE }}:${{ steps.meta.outputs.tags }}-arm64 \ - ${{ env.DOCKER_IMAGE }}:${{ steps.meta.outputs.tags }}-amd64 + ${{ steps.meta.outputs.tags }}-arm64 \ + ${{ steps.meta.outputs.tags }}-amd64 From 00fb1be8a0f4ab05ca24f63c169feb14921f32c4 Mon Sep 17 00:00:00 2001 From: Adil Hafeez Date: Wed, 16 Apr 2025 13:55:24 -0700 Subject: [PATCH 6/6] release 0.2.7 (#469) --- .github/workflows/e2e_archgw.yml | 2 +- .github/workflows/e2e_test_demos.yml | 2 +- .github/workflows/validate_arch_config.yml | 2 +- README.md | 2 +- arch/tools/README.md | 2 +- arch/tools/cli/consts.py | 5 ++++- arch/tools/cli/main.py | 3 +++ arch/tools/poetry.lock | 4 ++-- arch/tools/pyproject.toml | 4 ++-- build_filter_image.sh | 2 +- docs/source/conf.py | 2 +- docs/source/get_started/quickstart.rst | 2 +- model_server/poetry.lock | 6 +++--- model_server/pyproject.toml | 2 +- 14 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.github/workflows/e2e_archgw.yml b/.github/workflows/e2e_archgw.yml index fdc43726..61f130c2 100644 --- a/.github/workflows/e2e_archgw.yml +++ b/.github/workflows/e2e_archgw.yml @@ -24,7 +24,7 @@ jobs: - name: build arch docker image run: | - cd ../../ && docker build -f arch/Dockerfile . -t katanemo/archgw + cd ../../ && docker build -f arch/Dockerfile . -t katanemo/archgw -t katanemo/archgw:0.2.7 - name: start archgw env: diff --git a/.github/workflows/e2e_test_demos.yml b/.github/workflows/e2e_test_demos.yml index d353fa46..9b699a9c 100644 --- a/.github/workflows/e2e_test_demos.yml +++ b/.github/workflows/e2e_test_demos.yml @@ -21,7 +21,7 @@ jobs: - name: build arch docker image run: | - docker build -f arch/Dockerfile . -t katanemo/archgw + docker build -f arch/Dockerfile . -t katanemo/archgw -t katanemo/archgw:0.2.7 - name: install poetry run: | diff --git a/.github/workflows/validate_arch_config.yml b/.github/workflows/validate_arch_config.yml index 9503dad2..af52ed91 100644 --- a/.github/workflows/validate_arch_config.yml +++ b/.github/workflows/validate_arch_config.yml @@ -24,7 +24,7 @@ jobs: - name: build arch docker image run: | - docker build -f arch/Dockerfile . -t katanemo/archgw + docker build -f arch/Dockerfile . -t katanemo/archgw -t katanemo/archgw:0.2.7 - name: validate arch config run: | diff --git a/README.md b/README.md index 889b8a5d..98081fc9 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ Arch's CLI allows you to manage and interact with the Arch gateway efficiently. ```console $ python -m venv venv $ source venv/bin/activate # On Windows, use: venv\Scripts\activate -$ pip install archgw==0.2.6 +$ pip install archgw==0.2.7 ``` ### Build AI Agent with Arch Gateway diff --git a/arch/tools/README.md b/arch/tools/README.md index 4ebd2da4..46dfdff8 100644 --- a/arch/tools/README.md +++ b/arch/tools/README.md @@ -19,7 +19,7 @@ source venv/bin/activate ### Step 3: Run the build script ```bash -pip install archgw==0.2.6 +pip install archgw==0.2.7 ``` ## Uninstall Instructions: archgw CLI diff --git a/arch/tools/cli/consts.py b/arch/tools/cli/consts.py index fd377120..768bbf6e 100644 --- a/arch/tools/cli/consts.py +++ b/arch/tools/cli/consts.py @@ -1,3 +1,6 @@ +import os + + KATANEMO_DOCKERHUB_REPO = "katanemo/archgw" KATANEMO_LOCAL_MODEL_LIST = [ "katanemo/Arch-Guard", @@ -8,4 +11,4 @@ SERVICE_ALL = "all" MODEL_SERVER_LOG_FILE = "~/archgw_logs/modelserver.log" ACCESS_LOG_FILES = "~/archgw_logs/access*" ARCHGW_DOCKER_NAME = "archgw" -ARCHGW_DOCKER_IMAGE = "katanemo/archgw:latest" +ARCHGW_DOCKER_IMAGE = os.getenv("ARCHGW_DOCKER_IMAGE", "katanemo/archgw:0.2.7") diff --git a/arch/tools/cli/main.py b/arch/tools/cli/main.py index 240a1b8c..6541b51a 100644 --- a/arch/tools/cli/main.py +++ b/arch/tools/cli/main.py @@ -20,6 +20,7 @@ from cli.core import ( download_models_from_hf, ) from cli.consts import ( + ARCHGW_DOCKER_IMAGE, KATANEMO_DOCKERHUB_REPO, SERVICE_NAME_ARCHGW, SERVICE_NAME_MODEL_SERVER, @@ -90,6 +91,8 @@ def build(service): ARCHGW_DOCKERFILE, "-t", f"{KATANEMO_DOCKERHUB_REPO}:latest", + "-t", + f"{ARCHGW_DOCKER_IMAGE}", ".", "--add-host=host.docker.internal:host-gateway", ], diff --git a/arch/tools/poetry.lock b/arch/tools/poetry.lock index b71bd105..26471a36 100644 --- a/arch/tools/poetry.lock +++ b/arch/tools/poetry.lock @@ -2,7 +2,7 @@ [[package]] name = "archgw_modelserver" -version = "0.2.6" +version = "0.2.7" description = "A model server for serving models" optional = false python-versions = "*" @@ -414,4 +414,4 @@ files = [ [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "5cc1d766ed43530c15dfbde7710346e1b157be450bf4736eb4eed2b091efef47" +content-hash = "59e54acc202d697a35636d5ec58b8865e6bc8d6797526df024ea93610198157f" diff --git a/arch/tools/pyproject.toml b/arch/tools/pyproject.toml index f730684e..bf3e8204 100644 --- a/arch/tools/pyproject.toml +++ b/arch/tools/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "archgw" -version = "0.2.6" +version = "0.2.7" description = "Python-based CLI tool to manage Arch Gateway." authors = ["Katanemo Labs, Inc."] packages = [ @@ -10,7 +10,7 @@ readme = "README.md" [tool.poetry.dependencies] python = "^3.10" -archgw_modelserver = "^0.2.6" +archgw_modelserver = "^0.2.7" click = "^8.1.7" jinja2 = "^3.1.4" jsonschema = "^4.23.0" diff --git a/build_filter_image.sh b/build_filter_image.sh index 07093b23..39216974 100644 --- a/build_filter_image.sh +++ b/build_filter_image.sh @@ -1 +1 @@ -docker build -f arch/Dockerfile . -t katanemo/archgw +docker build -f arch/Dockerfile . -t katanemo/archgw -t katanemo/archgw:0.2.7 diff --git a/docs/source/conf.py b/docs/source/conf.py index 8079a4c2..2d2b6fcc 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -15,7 +15,7 @@ from sphinxawesome_theme.postprocess import Icons project = "Arch Docs" copyright = "2025, Katanemo Labs, Inc" author = "Katanemo Labs, Inc" -release = " v0.2.6" +release = " v0.2.7" # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/docs/source/get_started/quickstart.rst b/docs/source/get_started/quickstart.rst index 93ceebad..e1844356 100644 --- a/docs/source/get_started/quickstart.rst +++ b/docs/source/get_started/quickstart.rst @@ -25,7 +25,7 @@ Arch's CLI allows you to manage and interact with the Arch gateway efficiently. $ python -m venv venv $ source venv/bin/activate # On Windows, use: venv\Scripts\activate - $ pip install archgw==0.2.6 + $ pip install archgw==0.2.7 Build AI Agent with Arch Gateway diff --git a/model_server/poetry.lock b/model_server/poetry.lock index a050d664..77365638 100644 --- a/model_server/poetry.lock +++ b/model_server/poetry.lock @@ -995,13 +995,13 @@ files = [ [[package]] name = "openai" -version = "1.74.0" +version = "1.75.0" description = "The official Python library for the openai API" optional = false python-versions = ">=3.8" files = [ - {file = "openai-1.74.0-py3-none-any.whl", hash = "sha256:aff3e0f9fb209836382ec112778667027f4fd6ae38bdb2334bc9e173598b092a"}, - {file = "openai-1.74.0.tar.gz", hash = "sha256:592c25b8747a7cad33a841958f5eb859a785caea9ee22b9e4f4a2ec062236526"}, + {file = "openai-1.75.0-py3-none-any.whl", hash = "sha256:fe6f932d2ded3b429ff67cc9ad118c71327db32eb9d32dd723de3acfca337125"}, + {file = "openai-1.75.0.tar.gz", hash = "sha256:fb3ea907efbdb1bcfd0c44507ad9c961afd7dce3147292b54505ecfd17be8fd1"}, ] [package.dependencies] diff --git a/model_server/pyproject.toml b/model_server/pyproject.toml index 9c471f58..4a2a772c 100644 --- a/model_server/pyproject.toml +++ b/model_server/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "archgw_modelserver" -version = "0.2.6" +version = "0.2.7" description = "A model server for serving models" authors = ["Katanemo Labs, Inc "] license = "Apache 2.0"