Skip to content

Commit 61584a6

Browse files
committed
Add gpt-4-with-som model option
1 parent 05a4733 commit 61584a6

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

operate/actions/actions.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import asyncio
88
import aiohttp
99
from PIL import Image
10+
from ultralytics import YOLO
1011
import google.generativeai as genai
1112
from operate.config.settings import Config
1213
from operate.exceptions.exceptions import ModelNotRecognizedException
@@ -38,22 +39,19 @@
3839

3940
client = config.initialize_openai_client()
4041

41-
# yolo_model = YOLO(
42-
# "something/here"
43-
# ) # Load your tra
4442

4543
yolo_model = None
4644

4745

48-
def get_next_action(model, messages, objective):
49-
if model == "gpt-4-vision-preview":
50-
content = call_gpt_4_v(messages, objective)
51-
return content
46+
async def get_next_action(model, messages, objective):
47+
if model == "gpt-4":
48+
return call_gpt_4_v(messages, objective)
49+
if model == "gpt-4-with-som":
50+
return await call_gpt_4_v_labeled(messages, objective)
5251
elif model == "agent-1":
5352
return "coming soon"
5453
elif model == "gemini-pro-vision":
55-
content = call_gemini_pro_vision(messages, objective)
56-
return content
54+
return call_gemini_pro_vision(messages, objective)
5755

5856
raise ModelNotRecognizedException(model)
5957

operate/dialogs/dialog.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import sys
22
import os
33
import platform
4+
import asyncio
45
from prompt_toolkit.shortcuts import message_dialog
56
from prompt_toolkit import prompt
67
from operate.exceptions.exceptions import ModelNotRecognizedException
@@ -102,7 +103,7 @@ def main(model, terminal_prompt, voice_mode=False):
102103
if config.debug:
103104
print("[loop] messages before next action:\n\n\n", messages[1:])
104105
try:
105-
response = get_next_action(model, messages, objective)
106+
response = asyncio.run(get_next_action(model, messages, objective))
106107

107108
action = parse_response(response)
108109
action_type = action.get("type")

operate/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def main_entry():
1515
"--model",
1616
help="Specify the model to use",
1717
required=False,
18-
default="gpt-4-vision-preview",
18+
default="gpt-4",
1919
)
2020

2121
# Add a voice flag

0 commit comments

Comments
 (0)