From 8904d28590f55fe9667bcfafcdbfff26ef722232 Mon Sep 17 00:00:00 2001 From: Adil Hafeez Date: Tue, 29 Oct 2024 16:35:20 -0700 Subject: [PATCH] release 0.0.5 --- arch/tools/cli/main.py | 11 ++++++++++- arch/tools/poetry.lock | 16 ++++++++-------- arch/tools/pyproject.toml | 2 +- archgw.code-workspace | 4 ---- model_server/app/cli.py | 17 +++++++++++++++-- model_server/pyproject.toml | 2 +- 6 files changed, 35 insertions(+), 17 deletions(-) diff --git a/arch/tools/cli/main.py b/arch/tools/cli/main.py index 0bac9e5b..183d23d2 100644 --- a/arch/tools/cli/main.py +++ b/arch/tools/cli/main.py @@ -58,6 +58,8 @@ def main(ctx, version): click.echo(f"archgw cli version: {get_version()}") ctx.exit() + log.info(f"Starting archgw cli version: {get_version()}") + if ctx.invoked_subcommand is None: click.echo("""Arch (The Intelligent Prompt Gateway) CLI""") click.echo(logo) @@ -68,7 +70,7 @@ def main(ctx, version): @click.option( "--service", default=SERVICE_ALL, - help="Optioanl parameter to specify which service to build. Options are model_server, archgw", + help="Optional parameter to specify which service to build. Options are model_server, archgw", ) def build(service): """Build Arch from source. Must be in root of cloned repo.""" @@ -178,6 +180,12 @@ def up(file, path, service): env = os.environ.copy() # check if access_keys are preesnt in the config file access_keys = get_llm_provider_access_keys(arch_config_file=arch_config_file) + + # remove duplicates + access_keys = set(access_keys) + # remove the $ from the access_keys + access_keys = [item[1:] if item.startswith("$") else item for item in access_keys] + if access_keys: if file: app_env_file = os.path.join( @@ -186,6 +194,7 @@ def up(file, path, service): else: app_env_file = os.path.abspath(os.path.join(path, ".env")) + print(f"app_env_file: {app_env_file}") if not os.path.exists( app_env_file ): # check to see if the environment variables in the current environment or not diff --git a/arch/tools/poetry.lock b/arch/tools/poetry.lock index 64888456..a107ec96 100644 --- a/arch/tools/poetry.lock +++ b/arch/tools/poetry.lock @@ -13,7 +13,7 @@ files = [ [[package]] name = "archgw_modelserver" -version = "0.0.4" +version = "0.0.5" description = "A model server for serving models" optional = false python-versions = "*" @@ -250,13 +250,13 @@ tqdm = ["tqdm"] [[package]] name = "huggingface-hub" -version = "0.26.1" +version = "0.26.2" description = "Client library to download and publish models, datasets and other repos on the huggingface.co hub" optional = false python-versions = ">=3.8.0" files = [ - {file = "huggingface_hub-0.26.1-py3-none-any.whl", hash = "sha256:5927a8fc64ae68859cd954b7cc29d1c8390a5e15caba6d3d349c973be8fdacf3"}, - {file = "huggingface_hub-0.26.1.tar.gz", hash = "sha256:414c0d9b769eecc86c70f9d939d0f48bb28e8461dd1130021542eff0212db890"}, + {file = "huggingface_hub-0.26.2-py3-none-any.whl", hash = "sha256:98c2a5a8e786c7b2cb6fdeb2740893cba4d53e312572ed3d8afafda65b128c46"}, + {file = "huggingface_hub-0.26.2.tar.gz", hash = "sha256:b100d853465d965733964d123939ba287da60a547087783ddff8a323f340332b"}, ] [package.dependencies] @@ -785,13 +785,13 @@ type = ["importlib-metadata (>=7.0.2)", "jaraco.develop (>=7.21)", "mypy (==1.11 [[package]] name = "tqdm" -version = "4.66.5" +version = "4.66.6" description = "Fast, Extensible Progress Meter" optional = false python-versions = ">=3.7" files = [ - {file = "tqdm-4.66.5-py3-none-any.whl", hash = "sha256:90279a3770753eafc9194a0364852159802111925aa30eb3f9d85b0e805ac7cd"}, - {file = "tqdm-4.66.5.tar.gz", hash = "sha256:e1020aef2e5096702d8a025ac7d16b1577279c9d63f8375b63083e9a5f0fcbad"}, + {file = "tqdm-4.66.6-py3-none-any.whl", hash = "sha256:223e8b5359c2efc4b30555531f09e9f2f3589bcd7fdd389271191031b49b7a63"}, + {file = "tqdm-4.66.6.tar.gz", hash = "sha256:4bdd694238bef1485ce839d67967ab50af8f9272aab687c0d7702a01da0be090"}, ] [package.dependencies] @@ -834,4 +834,4 @@ zstd = ["zstandard (>=0.18.0)"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "e51783523cbe087cb1db94e874a28564b43af03a1689523d3738b212e288f64b" +content-hash = "f3210810e843b529258ea0ac42681503a19f693f5d63ca6bb281485a828006de" diff --git a/arch/tools/pyproject.toml b/arch/tools/pyproject.toml index a159c03d..3fd85ecf 100644 --- a/arch/tools/pyproject.toml +++ b/arch/tools/pyproject.toml @@ -23,7 +23,7 @@ click = "^8.1.7" jinja2 = "^3.1.4" jsonschema = "^4.23.0" setuptools = "75.2.0" -archgw_modelserver = "0.0.4" +archgw_modelserver = "0.0.5" huggingface_hub = "^0.26.0" [tool.poetry.scripts] diff --git a/archgw.code-workspace b/archgw.code-workspace index 230e2225..3a2807f2 100644 --- a/archgw.code-workspace +++ b/archgw.code-workspace @@ -16,10 +16,6 @@ "name": "model_server", "path": "model_server" }, - { - "name": "chatbot_ui", - "path": "chatbot_ui" - }, { "name": "e2e_tests", "path": "e2e_tests" diff --git a/model_server/app/cli.py b/model_server/app/cli.py index 014608b0..a571bca7 100644 --- a/model_server/app/cli.py +++ b/model_server/app/cli.py @@ -1,3 +1,4 @@ +import importlib import sys import os import time @@ -7,6 +8,15 @@ import tempfile import subprocess import logging + +def get_version(): + try: + version = importlib.metadata.version("archgw_modelserver") + return version + except importlib.metadata.PackageNotFoundError: + return "version not found" + + logging.basicConfig( level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", @@ -15,6 +25,8 @@ logging.basicConfig( log = logging.getLogger("model_server.cli") log.setLevel(logging.INFO) +log.info(f"model server version: {get_version()}") + def run_server(port=51000): """Start, stop, or restart the Uvicorn server based on command-line arguments.""" @@ -37,8 +49,9 @@ def run_server(port=51000): def start_server(port=51000): """Start the Uvicorn server""" log.info( - "Starting model server - loading some awesomeness, this may take some time :)" + "starting model server - loading some awesomeness, this may take some time :)" ) + process = subprocess.Popen( [ "python", @@ -61,7 +74,7 @@ def start_server(port=51000): log.info(f"Model server started with PID {process.pid}") else: # Add model_server boot-up logs - log.info("Model server - Didn't Sart In Time. Shutting Down") + log.info("model server - didn't start in time, shutting down") process.terminate() diff --git a/model_server/pyproject.toml b/model_server/pyproject.toml index 207c00d6..5da4008c 100644 --- a/model_server/pyproject.toml +++ b/model_server/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "archgw_modelserver" -version = "0.0.4" +version = "0.0.5" description = "A model server for serving models" authors = ["Katanemo Labs, Inc "] license = "Apache 2.0"