Skip to content

"omniparser + gpt-4.5-preview" and "omniparser + gpt-4.5-preview-orchestrated" added and tested #260

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

Open
tinycrops wants to merge 9 commits into
base: master
Choose a base branch
from
Open

"omniparser + gpt-4.5-preview" and "omniparser + gpt-4.5-preview-orchestrated" added and tested #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
50a3035
prayge
tinycrops Mar 15, 2025
cc90fb1
keep praying
tinycrops Mar 15, 2025
437de47
final prayge
tinycrops Mar 15, 2025
f8fd542
this is it
tinycrops Mar 15, 2025
ebc67a2
model prov openai
tinycrops Mar 15, 2025
734dd0d
gpt45 doesn't work
tinycrops Mar 15, 2025
02a7030
update openai package version
tinycrops Mar 15, 2025
0a5fef2
maybe
tinycrops Mar 15, 2025
9be897a
wow-did-it
tinycrops Mar 15, 2025
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
2 changes: 2 additions & 0 deletions omnitool/gradio/agent/vlm_agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ def __init__(
):
if model == "omniparser + gpt-4o":
self.model = "gpt-4o-2024-11-20"
elif model == "omniparser + gpt-4.5-preview":
self.model = "gpt-4.5-preview"
elif model == "omniparser + R1":
self.model = "deepseek-r1-distill-llama-70b"
elif model == "omniparser + qwen2.5vl":
Expand Down
2 changes: 2 additions & 0 deletions omnitool/gradio/agent/vlm_agent_with_orchestrator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ def __init__(
):
if model == "omniparser + gpt-4o" or model == "omniparser + gpt-4o-orchestrated":
self.model = "gpt-4o-2024-11-20"
elif model == "omniparser + gpt-4.5-preview" or model == "omniparser + gpt-4.5-preview-orchestrated":
self.model = "gpt-4.5-preview"
elif model == "omniparser + R1" or model == "omniparser + R1-orchestrated":
self.model = "deepseek-r1-distill-llama-70b"
elif model == "omniparser + qwen2.5vl" or model == "omniparser + qwen2.5vl-orchestrated":
Expand Down
4 changes: 2 additions & 2 deletions omnitool/gradio/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ def get_header_image_base64():
with gr.Column():
model = gr.Dropdown(
label="Model",
choices=["omniparser + gpt-4o", "omniparser + o1", "omniparser + o3-mini", "omniparser + R1", "omniparser + qwen2.5vl", "claude-3-5-sonnet-20241022", "omniparser + gpt-4o-orchestrated", "omniparser + o1-orchestrated", "omniparser + o3-mini-orchestrated", "omniparser + R1-orchestrated", "omniparser + qwen2.5vl-orchestrated"],
choices=["omniparser + gpt-4.5-preview","omniparser + gpt-4.5-preview-orchestrated","omniparser + gpt-4o", "omniparser + o1", "omniparser + o3-mini", "omniparser + R1", "omniparser + qwen2.5vl", "claude-3-5-sonnet-20241022", "omniparser + gpt-4o-orchestrated", "omniparser + o1-orchestrated", "omniparser + o3-mini-orchestrated", "omniparser + R1-orchestrated", "omniparser + qwen2.5vl-orchestrated"],
value="omniparser + gpt-4o",
interactive=True,
)
Expand Down Expand Up @@ -356,7 +356,7 @@ def update_model(model_selection, state):

if model_selection == "claude-3-5-sonnet-20241022":
provider_choices = [option.value for option in APIProvider if option.value != "openai"]
elif model_selection in set(["omniparser + gpt-4o", "omniparser + o1", "omniparser + o3-mini", "omniparser + gpt-4o-orchestrated", "omniparser + o1-orchestrated", "omniparser + o3-mini-orchestrated"]):
elif model_selection in set(["omniparser + gpt-4.5-preview","omniparser + gpt-4.5-preview-orchestrated","omniparser + gpt-4o", "omniparser + o1", "omniparser + o3-mini", "omniparser + gpt-4o-orchestrated", "omniparser + o1-orchestrated", "omniparser + o3-mini-orchestrated"]):
provider_choices = ["openai"]
elif model_selection == "omniparser + R1":
provider_choices = ["groq"]
Expand Down
4 changes: 2 additions & 2 deletions omnitool/gradio/app_new.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ def auto_refresh_files(state):
with gr.Column():
model = gr.Dropdown(
label="Model",
choices=["omniparser + gpt-4o", "omniparser + o1", "omniparser + o3-mini", "omniparser + R1", "omniparser + qwen2.5vl", "claude-3-5-sonnet-20241022", "omniparser + gpt-4o-orchestrated", "omniparser + o1-orchestrated", "omniparser + o3-mini-orchestrated", "omniparser + R1-orchestrated", "omniparser + qwen2.5vl-orchestrated"],
choices=["omniparser + gpt-4.5-preview-orchestrated","omniparser + gpt-4.5-preview","omniparser + gpt-4o", "omniparser + o1", "omniparser + o3-mini", "omniparser + R1", "omniparser + qwen2.5vl", "claude-3-5-sonnet-20241022", "omniparser + gpt-4o-orchestrated", "omniparser + o1-orchestrated", "omniparser + o3-mini-orchestrated", "omniparser + R1-orchestrated", "omniparser + qwen2.5vl-orchestrated"],
value="omniparser + gpt-4o-orchestrated",
interactive=True,
container=True
Expand Down Expand Up @@ -623,7 +623,7 @@ def update_model(model_selection, state):

if model_selection == "claude-3-5-sonnet-20241022":
provider_choices = [option.value for option in APIProvider if option.value != "openai"]
elif model_selection in set(["omniparser + gpt-4o", "omniparser + o1", "omniparser + o3-mini", "omniparser + gpt-4o-orchestrated", "omniparser + o1-orchestrated", "omniparser + o3-mini-orchestrated"]):
elif model_selection in set(["omniparser + gpt-4.5-preview-orchestrated", "omniparser + gpt-4.5-preview","omniparser + gpt-4o", "omniparser + o1", "omniparser + o3-mini", "omniparser + gpt-4o-orchestrated", "omniparser + o1-orchestrated", "omniparser + o3-mini-orchestrated"]):
provider_choices = ["openai"]
elif model_selection == "omniparser + R1":
provider_choices = ["groq"]
Expand Down
6 changes: 3 additions & 3 deletions omnitool/gradio/loop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def sampling_loop_sync(
max_tokens=max_tokens,
only_n_most_recent_images=only_n_most_recent_images
)
elif model in set(["omniparser + gpt-4o", "omniparser + o1", "omniparser + o3-mini", "omniparser + R1", "omniparser + qwen2.5vl"]):
elif model in set(["omniparser + gpt-4.5-preview","omniparser + gpt-4o", "omniparser + o1", "omniparser + o3-mini", "omniparser + R1", "omniparser + qwen2.5vl"]):
actor = VLMAgent(
model=model,
provider=provider,
Expand All @@ -76,7 +76,7 @@ def sampling_loop_sync(
max_tokens=max_tokens,
only_n_most_recent_images=only_n_most_recent_images
)
elif model in set(["omniparser + gpt-4o-orchestrated", "omniparser + o1-orchestrated", "omniparser + o3-mini-orchestrated", "omniparser + R1-orchestrated", "omniparser + qwen2.5vl-orchestrated"]):
elif model in set(["omniparser + gpt-4.5-preview-orchestrated","omniparser + gpt-4o-orchestrated", "omniparser + o1-orchestrated", "omniparser + o3-mini-orchestrated", "omniparser + R1-orchestrated", "omniparser + qwen2.5vl-orchestrated"]):
actor = VLMOrchestratedAgent(
model=model,
provider=provider,
Expand Down Expand Up @@ -115,7 +115,7 @@ def sampling_loop_sync(

messages.append({"content": tool_result_content, "role": "user"})

elif model in set(["omniparser + gpt-4o", "omniparser + o1", "omniparser + o3-mini", "omniparser + R1", "omniparser + qwen2.5vl", "omniparser + gpt-4o-orchestrated", "omniparser + o1-orchestrated", "omniparser + o3-mini-orchestrated", "omniparser + R1-orchestrated", "omniparser + qwen2.5vl-orchestrated"]):
elif model in set(["omniparser + gpt-4.5-preview","omniparser + gpt-4.5-preview-orchestrated","omniparser + gpt-4o", "omniparser + o1", "omniparser + o3-mini", "omniparser + R1", "omniparser + qwen2.5vl", "omniparser + gpt-4o-orchestrated", "omniparser + o1-orchestrated", "omniparser + o3-mini-orchestrated", "omniparser + R1-orchestrated", "omniparser + qwen2.5vl-orchestrated"]):
while True:
parsed_screen = omniparser_client()
tools_use_needed, vlm_response_json = actor(messages=messages, parsed_screen=parsed_screen)
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ torch
easyocr
torchvision
supervision==0.18.0
openai==1.3.5
openai==1.66.3
transformers
ultralytics==8.3.70
azure-identity
Expand Down