Adding chat template api

Author: kumar-shivam-ranjan

ads/aqua/app.py

@@ -19,7 +19,6 @@
     get_artifact_path,
     is_valid_ocid,
     load_config,
-    read_file,
 )
 from ads.aqua.constants import UNKNOWN
 from ads.common import oci_client as oc
@@ -363,18 +362,20 @@ def get_chat_template(self, model_id):
             return chat_template
 
         try:
-            tokenizer_path = f"{os.path.dirname(artifact_path)}/tokenizer_config.json"
-            chat_template = read_file(tokenizer_path)
+            tokenizer_path = f"{os.path.dirname(artifact_path)}/artifact"
+            chat_template = load_config(
+                file_path=tokenizer_path, config_file_name="tokenizer_config.json"
+            )
         except Exception:
-            pass
+            logger.error(
+                f"Error reading tokenizer_config.json file for the model: {model_id}"
+            )
 
         if not chat_template:
             logger.error(
                 f"No default chat template is available for the model: {model_id}."
             )
-            return chat_template
-
-        return chat_template
+        return {"chat_template": chat_template.get("chat_template")}
 
     @property
     def telemetry(self):

ads/aqua/common/utils.py

@@ -228,7 +228,7 @@ def get_artifact_path(custom_metadata_list: List) -> str:
     return UNKNOWN
 
 
-def read_file(file_path: str, **kwargs) -> str:
+def read_file(file_path: str, **kwargs) -> Union[str, dict]:
     try:
         with fsspec.open(file_path, "r", **kwargs.get("auth", {})) as f:
             return f.read()
@@ -239,10 +239,7 @@ def read_file(file_path: str, **kwargs) -> str:
 
 @threaded()
 def load_config(file_path: str, config_file_name: str, **kwargs) -> dict:
-    if config_file_name:
-        artifact_path = f"{file_path.rstrip('/')}/{config_file_name}"
-    else:
-        artifact_path = f"{file_path.rstrip('/')}"
+    artifact_path = f"{file_path.rstrip('/')}/{config_file_name}"
     signer = default_signer() if artifact_path.startswith("oci://") else {}
     config = json.loads(
         read_file(file_path=artifact_path, auth=signer, **kwargs) or UNKNOWN_JSON_STR

ads/aqua/extension/model_handler.py

@@ -14,6 +14,7 @@
 from ads.aqua.common.errors import AquaRuntimeError, AquaValueError
 from ads.aqua.common.utils import (
     get_hf_model_info,
+    is_valid_ocid,
     list_hf_models,
 )
 from ads.aqua.extension.base_handler import AquaAPIhandler
@@ -35,7 +36,6 @@ def get(
         url_parse = urlparse(self.request.path)
         paths = url_parse.path.strip("/")
         path_list = paths.split("/")
-        print(path_list)
         if paths.startswith("aqua/model/files"):
             os_path = self.get_argument("os_path", None)
             model_name = self.get_argument("model_name", None)
@@ -329,10 +329,9 @@ def get(self, model_id):
         url_parse = urlparse(self.request.path)
         paths = url_parse.path.strip("/")
         path_list = paths.split("/")
-        print(path_list)
         if (
             len(path_list) == 4
-            and path_list[2].startswith("ocid1.datasciencemodel")
+            and is_valid_ocid(path_list[2])
             and path_list[3] == "chat_template"
         ):
             return self.finish(AquaModelApp().get_chat_template(model_id))