From 50a30355ac0cba297be747828884e20c79276be8 Mon Sep 17 00:00:00 2001 From: MeDott29 Date: Fri, 14 Mar 2025 20:59:17 -0400 Subject: [PATCH 1/9] prayge --- omnitool/gradio/agent/vlm_agent_with_orchestrator.py | 2 ++ omnitool/gradio/app_new.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/omnitool/gradio/agent/vlm_agent_with_orchestrator.py b/omnitool/gradio/agent/vlm_agent_with_orchestrator.py index 650a8e30..a8d9d7c8 100644 --- a/omnitool/gradio/agent/vlm_agent_with_orchestrator.py +++ b/omnitool/gradio/agent/vlm_agent_with_orchestrator.py @@ -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": diff --git a/omnitool/gradio/app_new.py b/omnitool/gradio/app_new.py index a9e5e6d2..b61df5c3 100644 --- a/omnitool/gradio/app_new.py +++ b/omnitool/gradio/app_new.py @@ -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","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 @@ -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","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"] From cc90fb17613d114ee5117cabc0f98db4ee3fea7e Mon Sep 17 00:00:00 2001 From: MeDott29 Date: Fri, 14 Mar 2025 21:07:51 -0400 Subject: [PATCH 2/9] keep praying --- omnitool/gradio/loop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnitool/gradio/loop.py b/omnitool/gradio/loop.py index 9ce63169..edea4c8a 100644 --- a/omnitool/gradio/loop.py +++ b/omnitool/gradio/loop.py @@ -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, From 437de4781c6209398be16ef6a52c2401784779a5 Mon Sep 17 00:00:00 2001 From: MeDott29 Date: Fri, 14 Mar 2025 21:17:50 -0400 Subject: [PATCH 3/9] final prayge --- omnitool/gradio/agent/vlm_agent.py | 2 ++ omnitool/gradio/app_new.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/omnitool/gradio/agent/vlm_agent.py b/omnitool/gradio/agent/vlm_agent.py index 9f631a70..50aa6f04 100644 --- a/omnitool/gradio/agent/vlm_agent.py +++ b/omnitool/gradio/agent/vlm_agent.py @@ -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": diff --git a/omnitool/gradio/app_new.py b/omnitool/gradio/app_new.py index b61df5c3..6467b7e6 100644 --- a/omnitool/gradio/app_new.py +++ b/omnitool/gradio/app_new.py @@ -528,7 +528,7 @@ def auto_refresh_files(state): with gr.Column(): model = gr.Dropdown( label="Model", - choices=["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"], + 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 From f8fd542ead96d4be31732723c811adc3ddaf5b70 Mon Sep 17 00:00:00 2001 From: MeDott29 Date: Fri, 14 Mar 2025 21:24:40 -0400 Subject: [PATCH 4/9] this is it --- omnitool/gradio/loop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnitool/gradio/loop.py b/omnitool/gradio/loop.py index edea4c8a..16c246e6 100644 --- a/omnitool/gradio/loop.py +++ b/omnitool/gradio/loop.py @@ -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, From ebc67a2cda176185471a023821ba91180fc44277 Mon Sep 17 00:00:00 2001 From: MeDott29 Date: Fri, 14 Mar 2025 21:28:56 -0400 Subject: [PATCH 5/9] model prov openai --- omnitool/gradio/app_new.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnitool/gradio/app_new.py b/omnitool/gradio/app_new.py index 6467b7e6..454eaa0a 100644 --- a/omnitool/gradio/app_new.py +++ b/omnitool/gradio/app_new.py @@ -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-4.5-preview","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"] From 734dd0d03d4024a168d2c7941d2ac60ee26c2d20 Mon Sep 17 00:00:00 2001 From: MeDott29 Date: Fri, 14 Mar 2025 21:46:38 -0400 Subject: [PATCH 6/9] gpt45 doesn't work --- omnitool/gradio/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omnitool/gradio/app.py b/omnitool/gradio/app.py index 54cca8a0..b02226fb 100644 --- a/omnitool/gradio/app.py +++ b/omnitool/gradio/app.py @@ -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, ) @@ -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"] From 02a7030b04e3e5d86e2cb18ca2053281e4121562 Mon Sep 17 00:00:00 2001 From: MeDott29 Date: Fri, 14 Mar 2025 21:49:37 -0400 Subject: [PATCH 7/9] update openai package version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 901a27fa..80a3f3bc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 From 0a5fef2122de5324e603fea22c92459888330953 Mon Sep 17 00:00:00 2001 From: MeDott29 Date: Fri, 14 Mar 2025 23:18:03 -0400 Subject: [PATCH 8/9] maybe --- omnitool/gradio/loop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnitool/gradio/loop.py b/omnitool/gradio/loop.py index 16c246e6..0e3f9f56 100644 --- a/omnitool/gradio/loop.py +++ b/omnitool/gradio/loop.py @@ -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-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) From 9be897a3d2a567a9d246ece9137384a150e1f398 Mon Sep 17 00:00:00 2001 From: MeDott29 Date: Fri, 14 Mar 2025 23:21:46 -0400 Subject: [PATCH 9/9] wow-did-it --- omnitool/gradio/loop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnitool/gradio/loop.py b/omnitool/gradio/loop.py index 0e3f9f56..23856667 100644 --- a/omnitool/gradio/loop.py +++ b/omnitool/gradio/loop.py @@ -115,7 +115,7 @@ def sampling_loop_sync( messages.append({"content": tool_result_content, "role": "user"}) - elif model in set(["omniparser + gpt-4.5-preview","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)