From 3f5e694375f3e6750142a5f5eef7ac28815729fa Mon Sep 17 00:00:00 2001
From: Adil Hafeez <adil@katanemo.com>
Date: Wed, 30 Oct 2024 14:40:13 -0700
Subject: [PATCH] fix build path

---
 arch/tools/poetry.lock     | 14 +++++++-------
 e2e_tests/run_e2e_tests.sh | 30 ++++++++----------------------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/arch/tools/poetry.lock b/arch/tools/poetry.lock
index 65999641..3968834d 100644
--- a/arch/tools/poetry.lock
+++ b/arch/tools/poetry.lock
@@ -3365,23 +3365,23 @@ files = [
 
 [[package]]
 name = "setuptools"
-version = "75.2.0"
+version = "75.3.0"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "setuptools-75.2.0-py3-none-any.whl", hash = "sha256:a7fcb66f68b4d9e8e66b42f9876150a3371558f98fa32222ffaa5bced76406f8"},
-    {file = "setuptools-75.2.0.tar.gz", hash = "sha256:753bb6ebf1f465a1912e19ed1d41f403a79173a9acf66a42e7e6aec45c3c16ec"},
+    {file = "setuptools-75.3.0-py3-none-any.whl", hash = "sha256:f2504966861356aa38616760c0f66568e535562374995367b4e69c7143cf6bcd"},
+    {file = "setuptools-75.3.0.tar.gz", hash = "sha256:fba5dd4d766e97be1b1681d98712680ae8f2f26d7881245f2ce9e40714f1a686"},
 ]
 
 [package.extras]
 check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)", "ruff (>=0.5.2)"]
-core = ["importlib-metadata (>=6)", "importlib-resources (>=5.10.2)", "jaraco.collections", "jaraco.functools", "jaraco.text (>=3.7)", "more-itertools", "more-itertools (>=8.8)", "packaging", "packaging (>=24)", "platformdirs (>=2.6.2)", "tomli (>=2.0.1)", "wheel (>=0.43.0)"]
+core = ["importlib-metadata (>=6)", "importlib-resources (>=5.10.2)", "jaraco.collections", "jaraco.functools", "jaraco.text (>=3.7)", "more-itertools", "more-itertools (>=8.8)", "packaging", "packaging (>=24)", "platformdirs (>=4.2.2)", "tomli (>=2.0.1)", "wheel (>=0.43.0)"]
 cover = ["pytest-cov"]
 doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier", "towncrier (<24.7)"]
 enabler = ["pytest-enabler (>=2.2)"]
-test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"]
-type = ["importlib-metadata (>=7.0.2)", "jaraco.develop (>=7.21)", "mypy (==1.11.*)", "pytest-mypy"]
+test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test (>=5.5)", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"]
+type = ["importlib-metadata (>=7.0.2)", "jaraco.develop (>=7.21)", "mypy (==1.12.*)", "pytest-mypy"]
 
 [[package]]
 name = "six"
@@ -4305,4 +4305,4 @@ propcache = ">=0.2.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "f3210810e843b529258ea0ac42681503a19f693f5d63ca6bb281485a828006de"
+content-hash = "6f26f39b146023d75e38a3ba5b94a8592a4cd3ed46370828af5243784b177eed"
diff --git a/e2e_tests/run_e2e_tests.sh b/e2e_tests/run_e2e_tests.sh
index c30056ab..c8fb8592 100644
--- a/e2e_tests/run_e2e_tests.sh
+++ b/e2e_tests/run_e2e_tests.sh
@@ -6,6 +6,8 @@ set -e
 
 print_disk_usage
 
+touch ~/archgw_logs/modelserver.log
+
 print_debug() {
   log "Received signal to stop"
   log "Printing debug logs for model_server"
@@ -28,42 +30,26 @@ cd -
 
 print_disk_usage
 
-# log building model server
-# log =====================
-# cd ../model_server
-# poetry install 2>&1 >> ../build.log
-# print_disk_usage
-
-# log starting model server
-# log =====================
-# mkdir -p ~/archgw_logs
-# touch ~/archgw_logs/modelserver.log
-# poetry run archgw_modelserver restart &
-# tail -F ~/archgw_logs/modelserver.log &
-# model_server_tail_pid=$!
-# cd -
-
-log building model server
-log =====================
+log building and install model server
+log =================================
 cd ../model_server
 poetry install
 cd -
 
-log building archgw cli
-log ===================
+log building and installing archgw cli
+log ==================================
 cd ../arch/tools
 sh build_cli.sh
 cd -
 
 log building docker image for arch gateway
 log ======================================
-cd ../arch
-sh build_filter_image.sh
+cd ../
+archgw build
 cd -
 
 log startup arch gateway with function calling demo
 cd ..
-touch ~/archgw_logs/modelserver.log
 tail -F ~/archgw_logs/modelserver.log &
 model_server_tail_pid=$!
 archgw down