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.

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

Update forked code #24

Open
wants to merge 55 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
519a351
Update README.md
jinyoungkim927 Jan 13, 2024
b1311da
Update README.md
jinyoungkim927 Jan 13, 2024
a5b81d2
Update README.md
jinyoungkim927 Jan 13, 2024
dcc8ce3
GPT-4
oliviaylee Jan 13, 2024
f76d00d
Update README.md
jinyoungkim927 Jan 13, 2024
7d9c25f
GPT-4
oliviaylee Jan 13, 2024
b580886
Flutter with threading
jinyoungkim927 Jan 13, 2024
e7ceca2
object counting cloud vision API
oliviaylee Jan 13, 2024
580ea5e
New logic for Vision API + GPT-4
oliviaylee Jan 13, 2024
8df8238
Basic GUI website
jinyoungkim927 Jan 13, 2024
f810521
Fixes to fluttering mechanism
jinyoungkim927 Jan 13, 2024
ab743f7
Fix google cloud dependency
jinyoungkim927 Jan 13, 2024
410f48d
Web UI debugging #1
jinyoungkim927 Jan 13, 2024
9f04d38
Web UI debugging #2
jinyoungkim927 Jan 13, 2024
494d2d1
old web ui deleted
Jan 13, 2024
c28db83
Automatic stop fluttering
Jan 13, 2024
4f5aaf0
Hook up to Vision OpenAI model
jinyoungkim927 Jan 13, 2024
db5344e
vision model edits
oliviaylee Jan 13, 2024
2f7429d
basic skeleton complex commands
oliviaylee Jan 13, 2024
81c80b4
Merged changes
jinyoungkim927 Jan 13, 2024
4708f0e
Image debugging #2
jinyoungkim927 Jan 13, 2024
c6ac406
Include self
jinyoungkim927 Jan 13, 2024
5cad17a
Image recognition error #4
jinyoungkim927 Jan 13, 2024
f0a05f9
Image recognition error #5
jinyoungkim927 Jan 13, 2024
8696fb1
Image recognition error #6
jinyoungkim927 Jan 13, 2024
89982eb
Image recognition error #7
jinyoungkim927 Jan 13, 2024
54bbfa7
Image recognition error #8
jinyoungkim927 Jan 13, 2024
d87caa0
count function
oliviaylee Jan 13, 2024
43e59f0
count function
oliviaylee Jan 13, 2024
d48c1e0
added-images
Jan 13, 2024
12fad05
Try adjusting settings #1
jinyoungkim927 Jan 13, 2024
31bedbc
settings change 2
jinyoungkim927 Jan 13, 2024
c2659fc
vision model, search in progress
oliviaylee Jan 13, 2024
69f44ff
Merge branch 'main' of https://github.com/jinyoungkim927/PromptCraft-…
oliviaylee Jan 13, 2024
a99e68b
count done, search in progress
oliviaylee Jan 13, 2024
3aff568
correct photo taking
jinyoungkim927 Jan 13, 2024
a8dd48d
correct photo taking #2
jinyoungkim927 Jan 13, 2024
1cfb77f
correct photo taking #3
jinyoungkim927 Jan 13, 2024
3410146
correct photo taking #3
jinyoungkim927 Jan 13, 2024
a51e243
search done
oliviaylee Jan 13, 2024
da84d3c
Merge branch 'main' of https://github.com/jinyoungkim927/PromptCraft-…
oliviaylee Jan 13, 2024
bdff6c2
added new functions to prompt txt
oliviaylee Jan 13, 2024
e727c4c
correct photo taking #4
jinyoungkim927 Jan 13, 2024
15e8133
Edited airsim_wrapper.py
jinyoungkim927 Jan 13, 2024
bfd6d5a
App backend
kaien-yang Jan 13, 2024
677ce28
Webapp frontend
kaien-yang Jan 13, 2024
620bd79
Fix bugs with liv's methods
jinyoungkim927 Jan 13, 2024
b8952b9
Multiple drones trial
jinyoungkim927 Jan 13, 2024
1928a0a
Update index.html
kaien-yang Jan 13, 2024
a16c8cd
fixed count, vision model work in progress
oliviaylee Jan 13, 2024
7aa6e11
Merge branch 'main' of https://github.com/jinyoungkim927/PromptCraft-…
oliviaylee Jan 13, 2024
aa46720
Update app.py
kaien-yang Jan 13, 2024
b6e7fce
Merge branch 'main' of https://github.com/jinyoungkim927/PromptCraft-…
oliviaylee Jan 13, 2024
b6656eb
Merge branch 'main' of https://github.com/jinyoungkim927/PromptCraft-…
Jan 13, 2024
0332745
Webapp and stuff
kaien-yang Jan 14, 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
Prev Previous commit
Next Next commit
Image recognition error #8
  • Loading branch information
jinyoungkim927 committed Jan 13, 2024
commit 54bbfa75ebacfe611eba9430ec07f7d1a39bbdfb
3 changes: 3 additions & 0 deletions chatgpt_airsim/airsim_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ def analyze_with_vision_model(self, image_data):
data = json.load(f)
api_key = data["OPENAI_API_KEY"]

if isinstance(image_data, str):
image_data = image_data.encode()

# Convert image data to base64
base64_image = base64.b64encode(image_data).decode("utf-8")

Expand Down