Refacotr model configs

model_server/src/commons/constants.py

@@ -1,79 +0,0 @@
-# ========================== Arch-Intent Default Params ==========================
-ARCH_INTENT_MODEL_ALIAS = "Arch-Intent"
-ARCH_INTENT_INSTRUCTION = "Are there any tools can help?"
-
-ARCH_INTENT_TASK_PROMPT = """
-You are a helpful assistant.
-"""
-
-
-ARCH_INTENT_TOOL_PROMPT_TEMPLATE = """
-You task is to check if there are any tools that can be used to help the last user message in conversations according to the available tools listed below.
-
-<tools>
-{tool_text}
-</tools>
-"""
-
-
-ARCH_INTENT_FORMAT_PROMPT = """
-Provide your tool assessment for ONLY THE LAST USER MESSAGE in the above conversation:
-- First line must read 'Yes' or 'No'.
-- If yes, a second line must include a comma-separated list of tool indexes.
-"""
-
-
-ARCH_INTENT_GENERATION_CONFIG = {
-    "generation_params": {"max_tokens": 1, "stop_token_ids": [151645]}
-}
-
-
-# ========================== Arch-Function Default Params ==========================
-ARCH_FUNCTION_MODEL_ALIAS = "Arch-Function"
-
-ARCH_FUNCTION_TASK_PROMPT = """
-You are a helpful assistant.
-"""
-
-
-ARCH_FUNCTION_TOOL_PROMPT_TEMPLATE = """
-# Tools
-
-You may call one or more functions to assist with the user query.
-
-You are provided with function signatures within <tools></tools> XML tags:
-<tools>
-{tool_text}
-</tools>
-"""
-
-
-ARCH_FUNCTION_FORMAT_PROMPT = """
-For each function call, return a json object with function name and arguments within <tool_call></tool_call> XML tags:
-<tool_call>
-{"name": <function-name>, "arguments": <args-json-object>}
-</tool_call>
-"""
-
-ARCH_FUNCTION_GENERATION_CONFIG = {
-    "generation_params": {
-        "temperature": 0.2,
-        "top_p": 1.0,
-        "top_k": 50,
-        "max_tokens": 512,
-        "stop_token_ids": [151645],
-    },
-    "prefill_params": {
-        "continue_final_message": True,
-        "add_generation_prompt": False,
-    },
-    "prefill_prefix": [
-        "May",
-        "Could",
-        "Sure",
-        "Definitely",
-        "Certainly",
-        "Of course",
-        "Can",
-    ],
-}

model_server/src/commons/globals.py

@@ -1,36 +1,36 @@
 from openai import OpenAI
-from src.commons.constants import *
-from src.core.function_calling import ArchIntentHandler, ArchFunctionHandler
-from src.core.guardrails import get_guardrail_handler
 from src.commons.utils import get_model_server_logger
+from src.core.guardrails import get_guardrail_handler
+from src.core.function_calling import (
+    ArchIntentConfig,
+    ArchIntentHandler,
+    ArchFunctionConfig,
+    ArchFunctionHandler,
+)
 
 
+# Define logger
 logger = get_model_server_logger()
 
+
 # Define the client
 ARCH_ENDPOINT = "https://api.fc.archgw.com/v1"
 ARCH_API_KEY = "EMPTY"
 ARCH_CLIENT = OpenAI(base_url=ARCH_ENDPOINT, api_key=ARCH_API_KEY)
 
 
+# Define model names
+ARCH_INTENT_MODEL_ALIAS = "Arch-Intent"
+ARCH_FUNCTION_MODEL_ALIAS = "Arch-Function"
+
+
 # Define model handlers
 handler_map = {
     "Arch-Intent": ArchIntentHandler(
-        ARCH_CLIENT,
-        ARCH_INTENT_MODEL_ALIAS,
-        ARCH_INTENT_TASK_PROMPT,
-        ARCH_INTENT_TOOL_PROMPT_TEMPLATE,
-        ARCH_INTENT_FORMAT_PROMPT,
-        ARCH_INTENT_INSTRUCTION,
-        **ARCH_INTENT_GENERATION_CONFIG,
+        ARCH_CLIENT, ARCH_INTENT_MODEL_ALIAS, ArchIntentConfig
     ),
     "Arch-Function": ArchFunctionHandler(
-        ARCH_CLIENT,
-        ARCH_FUNCTION_MODEL_ALIAS,
-        ARCH_FUNCTION_TASK_PROMPT,
-        ARCH_FUNCTION_TOOL_PROMPT_TEMPLATE,
-        ARCH_FUNCTION_FORMAT_PROMPT,
-        **ARCH_FUNCTION_GENERATION_CONFIG,
+        ARCH_CLIENT, ARCH_FUNCTION_MODEL_ALIAS, ArchFunctionConfig
     ),
     "Arch-Guard": get_guardrail_handler(),
 }

model_server/src/commons/utils.py

@@ -12,7 +12,7 @@ PROJ_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__fil
 
 
 # Default log directory and file
-DEFAULT_LOG_DIR = os.path.join(PROJ_DIR, "logs")
+DEFAULT_LOG_DIR = os.path.join(PROJ_DIR, ".logs")
 DEFAULT_LOG_FILE = "modelserver.log"
 
 
@@ -50,7 +50,7 @@ def get_model_server_logger(log_dir=None, log_file=None):
     Get or initialize the logger instance for the model server.
 
     Parameters:
-    - log_dir (str): Custom directory to store the log file. Defaults to `~/archgw_logs`.
+    - log_dir (str): Custom directory to store the log file. Defaults to `./.logs`.
     - log_file (str): Custom log file name. Defaults to `modelserver.log`.
 
     Returns:
@@ -146,13 +146,13 @@ def terminate_process_by_pid(pid, timeout):
     subprocess.run(["kill", "-9", str(pid)], check=False)
 
 
-def find_process_by_port(port=51000):
+def find_processes_by_port(port=51000):
     """Find processes listening on a specific port."""
 
     port_processes = []
 
     try:
-        lsof_command = f"lsof -n -i:{port} | grep LISTEN"
+        lsof_command = f"lsof -n | grep {port} | grep -i LISTEN"
         result = subprocess.run(
             lsof_command, shell=True, capture_output=True, text=True
         )
@@ -167,7 +167,7 @@ def find_process_by_port(port=51000):
         return []
 
 
-def kill_process_by_port(port_processes=51000, wait=True, timeout=10):
+def kill_processes(port_processes, wait=True, timeout=10):
     """Kill processes on a specific port."""
 
     try: