Skip to content

handle parallel function calls from gemini #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 9, 2024
Merged

handle parallel function calls from gemini #406

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6ba964
handle parallel function calls from gemini
May 2, 2024
e71aa84
Merge branch 'main' into parallel-fc
ShishirPatil May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 13 additions & 19 deletions berkeley-function-call-leaderboard/model_handler/gemini_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,7 @@ def _query_gemini(self, user_query, functions):
}

# NOTE: To run the gemini model, you need to provide your own GCP project ID, which can be found in the GCP console.
if self.model_name == "gemini-1.5-pro-preview-0409":
API_URL = "https://us-central1-aiplatform.googleapis.com/v1beta1/projects/{YOUR_GCP_PROJECT_ID_HERE}/locations/us-central1/publishers/google/models/gemini-1.5-pro-preview-0409:generateContent"
else:
API_URL = "https://us-central1-aiplatform.googleapis.com/v1beta1/projects/{YOUR_GCP_PROJECT_ID_HERE}/locations/us-central1/publishers/google/models/gemini-1.0-pro:generateContent"
API_URL = "https://us-central1-aiplatform.googleapis.com/v1beta1/projects/{YOUR_GCP_PROJECT_ID_HERE}/locations/us-central1/publishers/google/models/" + self.model_name + ":generateContent"
headers = {
"Authorization": "Bearer " + token,
"Content-Type": "application/json",
Expand All @@ -65,22 +62,19 @@ def _query_gemini(self, user_query, functions):
"output_tokens": 0,
"latency": latency,
}
contents = result["candidates"][0]["content"]["parts"][0]
if "functionCall" in contents:
if (
"name" in contents["functionCall"]
and "args" in contents["functionCall"]
):
result = {
contents["functionCall"]["name"]: json.dumps(
contents["functionCall"]["args"]
)
}

parts = []
for part in result["candidates"][0]["content"]["parts"]:
if "functionCall" in part:
if (
"name" in part["functionCall"]
and "args" in part["functionCall"]
):
parts.append({part["functionCall"]["name"]: json.dumps(part["functionCall"]["args"])})
else:
parts.append("Parsing error: " + json.dumps(part["functionCall"]))
else:
result = "Parsing error: " + json.dumps(contents["functionCall"])
else:
result = contents["text"]
parts.append(part["text"])
result = parts
metatdata = {}
metatdata["input_tokens"] = json.loads(response.content)["usageMetadata"][
"promptTokenCount"
Expand Down