Skip to content
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

Fixes Gemini model name in config.py and improves JSON parsing success rate #224

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixes Gemini model name in config.py and improves JSON parsing success rate #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions operate/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def initialize_google(self):
)
api_key = os.getenv("GOOGLE_API_KEY")
genai.configure(api_key=api_key, transport="rest")
model = genai.GenerativeModel("gemini-pro-vision")
model = genai.GenerativeModel("gemini-exp-1206")

return model

Expand Down Expand Up @@ -116,7 +116,7 @@ def validation(self, model, voice_mode):
or model == "o1-with-ocr",
)
self.require_api_key(
"GOOGLE_API_KEY", "Google API key", model == "gemini-pro-vision"
"GOOGLE_API_KEY", "Google API key", model == "gemini-exp-1206"
)
self.require_api_key(
"ANTHROPIC_API_KEY", "Anthropic API key", model == "claude-3"
Expand Down
24 changes: 19 additions & 5 deletions operate/models/apis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,32 +162,46 @@ def call_gemini_pro_vision(messages, objective):
if config.verbose:
print("[call_gemini_pro_vision] model", model)

response = model.generate_content([prompt, Image.open(screenshot_filename)])
response = model.generate_content(
[prompt, Image.open(screenshot_filename)])

content = response.text[1:]
if config.verbose:
print("[call_gemini_pro_vision] response", response)
print("[call_gemini_pro_vision] content", content)
print("[call_gemini_pro_vision] raw content before parsing:", content)

content = content.strip("`").strip()
if not content:
raise ValueError(
"[call_gemini_pro_vision] Empty content received.")

try:
content = json.loads(content)
except json.JSONDecodeError as e:
print(f"[ERROR] JSONDecodeError: {e}")
print(f"[DEBUG] Problematic content: {content}")
raise

content = json.loads(content)
if config.verbose:
print(
"[get_next_action][call_gemini_pro_vision] content",
"[get_next_action][call_gemini_pro_vision] parsed content",
content,
)

return content

except Exception as e:
print(
f"{ANSI_GREEN}[Self-Operating Computer]{ANSI_BRIGHT_MAGENTA}[Operate] That did not work. Trying another method {ANSI_RESET}"
f"{ANSI_GREEN}[Self-Operating Computer]{
ANSI_BRIGHT_MAGENTA}[Operate] That did not work. Trying another method {ANSI_RESET}"
)
if config.verbose:
print("[Self-Operating Computer][Operate] error", e)
traceback.print_exc()
return call_gpt_4o(messages)



async def call_gpt_4o_with_ocr(messages, objective, model):
if config.verbose:
print("[call_gpt_4o_with_ocr]")
Expand Down