Add missing argument to OSSHandler's _format_prompt function (#373)

# Overview

In this PR, I added a missing argument to `OSSHandler`'s
`_format_prompt` function.

Also my code formatter sorted the imports alphabetically which accounts
for all the other changes, including those in `handler_map.py`.

# What Happened?

In every model handler, we define `_format_prompt` as taking in three
arguments (`prompt`, `function`, `test_category`). This is the standard.
But in `OSSHandler`, `_format_prompt` is defined as only taking in
`prompt` and `function` and forgetting to take `test_category` as an
input.

This caused an error. So I simply added `test_category` to the
definition of `_format_prompt`.

Author: eitanturok

berkeley-function-call-leaderboard/model_handler/handler_map.py

@@ -1,18 +1,18 @@
-from model_handler.gorilla_handler import GorillaHandler
-from model_handler.gpt_handler import OpenAIHandler
 from model_handler.claude_fc_handler import ClaudeFCHandler
 from model_handler.claude_prompt_handler import ClaudePromptingHandler
-from model_handler.mistral_handler import MistralHandler
+from model_handler.databricks_handler import DatabricksHandler
+from model_handler.deepseek_handler import DeepseekHandler
 from model_handler.firework_ai_handler import FireworkAIHandler
-from model_handler.nexus_handler import NexusHandler
+from model_handler.functionary_handler import FunctionaryHandler
 from model_handler.gemini_handler import GeminiHandler
-from model_handler.oss_handler import OSSHandler
 from model_handler.gemma_handler import GemmaHandler
 from model_handler.glaive_handler import GlaiveHandler
-from model_handler.deepseek_handler import DeepseekHandler
-from model_handler.functionary_handler import FunctionaryHandler
-from model_handler.databricks_handler import DatabricksHandler
+from model_handler.gorilla_handler import GorillaHandler
+from model_handler.gpt_handler import OpenAIHandler
 from model_handler.hermes_handler import HermesHandler
+from model_handler.mistral_handler import MistralHandler
+from model_handler.nexus_handler import NexusHandler
+from model_handler.oss_handler import OSSHandler
 
 handler_map = {
     "gorilla-openfunctions-v0": GorillaHandler,

berkeley-function-call-leaderboard/model_handler/oss_handler.py

@@ -1,12 +1,17 @@
+import json
+import os
+
+import ray
+import shortuuid
+import torch
+from eval_checker.eval_runner_constant import FILENAME_INDEX_MAPPING
 from model_handler.handler import BaseHandler
 from model_handler.model_style import ModelStyle
 from model_handler.utils import (
     ast_parse,
     augment_prompt_by_languge,
     language_specific_pre_processing,
 )
-from eval_checker.eval_runner_constant import FILENAME_INDEX_MAPPING
-import shortuuid, ray, os, json, torch
 
 
 class OSSHandler(BaseHandler):
@@ -18,7 +23,7 @@ def __init__(self, model_name, temperature=0.7, top_p=1, max_tokens=1000) -> Non
     def _init_model(self):
         ray.init(ignore_reinit_error=True, num_cpus=8)
 
-    def _format_prompt(prompt, function):
+    def _format_prompt(prompt, function, test_category):
         SYSTEM_PROMPT = """
             You are an helpful assistant who has access to the following functions to help the user, you can use the functions if needed-
         """