Fix: Broken serve cli

Author: jianshen92

pdm.lock

@@ -4,7 +4,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "CLIP-API-service"
-version = "0.1.2"
+version = "0.1.3"
 authors = [
   { name="BentoML Authors", email="[email protected]" },
 ]
@@ -35,7 +35,7 @@ dependencies = [
     "transformers",
     "accelerate",
     "optimum",
-    "pydantic",
+    "pydantic>=2.0.0",
     "Pillow",
     "open-clip-torch",
     "torch==2.0.0",

pyproject.toml

@@ -1 +1 @@
-__version__ = "0.1.2"
+__version__ = "0.1.3"

src/clip_api_service/__about__.py

@@ -3,12 +3,15 @@
 import asyncio
 import typing
 
+import os
+
+
 import bentoml
 import numpy as np
 from bentoml.io import JSON
 from typing import Optional, List
 
-from clip_api_service.models import init_model
+from clip_api_service.models import init_model, DEFAULT_MODEL_NAME, MODEL_ENV_VAR_KEY
 from clip_api_service.runners import get_clip_runner
 from clip_api_service.samples import ENCODING_INPUT_SAMPLE, RANKING_INPUT_SAMPLE
 from clip_api_service.utils import (
@@ -43,7 +46,9 @@ class RankOutput(BaseItem):
     probabilities: List[List[float]]
     cosine_similarities: List[List[float]]
 
-bento_model = init_model("__model_name__")
+model_name = os.environ.get(MODEL_ENV_VAR_KEY, "__model_name__")
+bento_model = init_model(model_name)
+
 logit_scale = np.exp(bento_model.info.metadata.get("logit_scale", 4.60517))
 
 clip_runner = get_clip_runner(bento_model)

src/clip_api_service/_service.py

@@ -14,7 +14,7 @@ def serve(model_name: Annotated[str, typer.Option(help="CLIP Model name")] = DEF
     env[MODEL_ENV_VAR_KEY] = model_name
 
     try:
-        subprocess.run(["bentoml", "serve", "clip_api_service.service:svc"], env=env, check=True)
+        subprocess.run(["bentoml", "serve", "clip_api_service._service:svc"], env=env, check=True)
     except subprocess.CalledProcessError as e:
         typer.echo(f"Command 'bentoml serve {model_name}' failed with error code {e.returncode}")
 

src/clip_api_service/cli.py

@@ -122,13 +122,11 @@ def save_model(
     )
 
 
-def init_model(model_name: str | None = None) -> bentoml.Model:
+def init_model(model_name: str = DEFAULT_MODEL_NAME) -> bentoml.Model:
     """
     Initialize a CLIP model from BentoML format. The model_name must be specified to
     support multiple models in a single BentoML bundle.
-    """
-    if model_name is None:
-        model_name = os.environ.get(MODEL_ENV_VAR_KEY, DEFAULT_MODEL_NAME)
+    """       
 
     for clip_module in CLIP_MODULES:
         if model_name in clip_module.MODELS: