Upload folder using huggingface_hub

.idea/workspace.xml

@@ -5,7 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="fa28c5e7-7701-41dc-9f17-0b006dec0c27" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/commands.txt" beforeDir="false" afterPath="$PROJECT_DIR$/commands.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app.py" beforeDir="false" afterPath="$PROJECT_DIR$/app.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/server/uav_api.py" beforeDir="false" afterPath="$PROJECT_DIR$/server/uav_api.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/uav_api.py" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -45,7 +47,7 @@
     &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
 }</component>
-  <component name="RunManager" selected="Python tests.pytest in test_fewshot.py">
+  <component name="RunManager" selected="Python.app">
     <configuration name="app" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="conversational_uav_explorer" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -90,21 +92,26 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="pytest for test_fewshot.test_action_and_location" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+    <configuration name="uav_api" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="conversational_uav_explorer" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="_new_keywords" value="&quot;&quot;" />
-      <option name="_new_parameters" value="&quot;&quot;" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;test_fewshot.test_action_and_location&quot;" />
-      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/uav_api.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
     <configuration name="pytest for test_fewshot.test_multiple_actions" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
@@ -143,11 +150,11 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="Python tests.pytest in test_fewshot.py" />
         <item itemvalue="Python.app" />
+        <item itemvalue="Python.uav_api" />
+        <item itemvalue="Python tests.pytest in test_fewshot.py" />
         <item itemvalue="Python.maps" />
         <item itemvalue="Python tests.pytest for test_fewshot.test_multiple_actions" />
-        <item itemvalue="Python tests.pytest for test_fewshot.test_action_and_location" />
       </list>
     </recent_temporary>
   </component>
@@ -181,6 +188,8 @@
       <workItem from="1690061425992" duration="406000" />
       <workItem from="1690062126029" duration="3577000" />
       <workItem from="1690068665233" duration="59000" />
+      <workItem from="1691001889072" duration="1298000" />
+      <workItem from="1691003416341" duration="16124000" />
     </task>
     <servers />
   </component>
@@ -214,6 +223,7 @@
     <SUITE FILE_PATH="coverage/conversational_uav_explorer$pytest_for_test_fewshot_test_multiple_actions.coverage" NAME="pytest for test_fewshot.test_multiple_actions Coverage Results" MODIFIED="1690037995937" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" />
     <SUITE FILE_PATH="coverage/conversational_uav_explorer$pytest_for_test_fewshot_test_action_and_location.coverage" NAME="pytest for test_fewshot.test_action_and_location Coverage Results" MODIFIED="1690016118401" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" />
     <SUITE FILE_PATH="coverage/conversational_uav_explorer$pytest_in_test_fewshot_py.coverage" NAME="pytest in test_fewshot.py Coverage Results" MODIFIED="1690064452122" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" />
+    <SUITE FILE_PATH="coverage/conversational_uav_explorer$uav_api.coverage" NAME="uav_api Coverage Results" MODIFIED="1691100356266" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/conversational_uav_explorer$pytest_for_test_fewshot_test_action_and_location_synonyms.coverage" NAME="pytest for test_fewshot.test_action_and_location_synonyms Coverage Results" MODIFIED="1690016083172" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" />
     <SUITE FILE_PATH="coverage/conversational_uav_explorer$pytest_for_test_fewshot_test_invalid_command2.coverage" NAME="pytest for test_fewshot.test_invalid_command2 Coverage Results" MODIFIED="1689919761343" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" />
     <SUITE FILE_PATH="coverage/conversational_uav_explorer$gradio_theme.coverage" NAME="gradio_theme Coverage Results" MODIFIED="1690008184752" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />

app.py

@@ -3,37 +3,78 @@ import gradio as gr
 from prompts import prompt_chat_response
 from fewshot import FewShot4UAVs
 
-
 fewshot = FewShot4UAVs()
 
+"""def send_command(command, location=None):
+    url = f"http://url/{command}"
+    data = {}
+    if location:
+        data["location"] = location
+    response = requests.post(url, json=data)
+    return response.content
 
-def transcribe(audio):
-    messages = [
-        {"role": "system",
-         "content": prompt_chat_response}
-    ]
 
+def parse_command(text):
+    tokens = re.split(' \t|\n|: ', text.lower())
+    print(tokens)
+    if len(tokens) >= 2:
+        return tokens[1]
+    else:
+        return 'none'"""
+
+
+def transcribe_audio(audio):
     audio_file = open(audio, "rb")
     transcript = openai.Audio.transcribe("whisper-1", audio_file)
+    return transcript["text"]
+
+
+def append_user_transcript(messages, user_transcript):
+    messages.append({"role": "user", "content": user_transcript, "name": "Operator"})
 
-    original_transcript = transcript["text"]
-    messages.append({"role": "user", "content": original_transcript, "name": "Operator"})
 
-    formatted_command_text = fewshot.get_command(original_transcript)
+def append_formatted_command(messages, user_transcript):
+    formatted_command_text = fewshot.get_command(user_transcript)
     messages.append({"role": "function", "content": formatted_command_text, "name": "UAV"})
+    return formatted_command_text
 
+
+def append_uav_response(messages):
     response = openai.ChatCompletion.create(
         model="gpt-3.5-turbo",
         messages=messages
     )
-
     uav_response = response["choices"][0]["message"]["content"]
     messages.append({"role": "assistant", "content": uav_response, "name": "Assistant"})
+    return uav_response
+
 
+def build_chat_transcript(messages):
     chat_transcript = ""
     for message in messages:
         if message['role'] != 'system':
             chat_transcript += f"{message['name']}: {message['content']} \n\n"
+    return chat_transcript
+
+
+def transcribe(audio):
+    messages = [
+        {"role": "system",
+         "content": prompt_chat_response}
+    ]
+
+    user_transcript = transcribe_audio(audio)
+    append_user_transcript(messages, user_transcript)
+
+    formatted_command_text = append_formatted_command(messages, user_transcript)
+
+    # turn on the below to invoke API
+    # command = parse_command(formatted_command_text)
+    # send_command(command)
+
+    uav_response = append_uav_response(messages, formatted_command_text)
+
+    chat_transcript = build_chat_transcript(messages)
 
     return chat_transcript
 

server/uav_api.py

@@ -0,0 +1,25 @@
+from flask import Flask
+from app import send_command
+
+app = Flask(__name__)
+
+
+@app.route('/goto/<location>', methods=['POST'])
+def goto(location):
+    pass
+
+
+@app.route('/land', methods=['POST'])
+def land():
+    pass
+
+@app.route('/takeoff', methods=['POST'])
+def takeoff():
+    pass
+
+@app.route('/takepicture/<location>', methods=['POST'])
+def takepicture(location):
+    pass
+
+if __name__ == '__main__':
+    app.run()

test/.pytest_cache/v/cache/lastfailed

@@ -1,5 +1,30 @@
 {
   "test_chatgpt4uavs.py::test_red_house": true,
-  "test_chatgpt4uavs.py": true,
-  "test_fewshot.py": true
+  "test_chatgpt4uavs.py::test_take_off": true,
+  "test_chatgpt4uavs.py::test_land": true,
+  "test_chatgpt4uavs.py::test_picture": true,
+  "test_chatgpt4uavs.py::test_snap_pic": true,
+  "test_chatgpt4uavs.py::test_purple_house": true,
+  "test_chatgpt4uavs.py::test_parking_garage": true,
+  "test_chatgpt4uavs.py::test_gym": true,
+  "test_chatgpt4uavs.py::test_cease_flight": true,
+  "test_chatgpt4uavs.py::test_stop_flight": true,
+  "test_chatgpt4uavs.py::test_lift_off": true,
+  "test_chatgpt4uavs.py::test_no_location1": true,
+  "test_chatgpt4uavs.py::test_no_location2": true,
+  "test_chatgpt4uavs.py::test_no_location3": true,
+  "test_fewshot.py::test_stop_flight1": true,
+  "test_fewshot.py::test_invalid_command2": true,
+  "test_fewshot.py::test_location_no_action4": true,
+  "test_fewshot.py::test_action_and_location_synonyms": true,
+  "test_fewshot.py::test_action_synonyms": true,
+  "test_fewshot.py::test_action_and_location": true,
+  "test_fewshot.py::test_multiple_actions": true,
+  "test_fewshot.py::test_multiple_actions1": true,
+  "test_fewshot.py::test_multiple_actions2": true,
+  "test_fewshot.py::test_multiple_actions3": true,
+  "test_fewshot.py::test_multiple_actions4": true,
+  "test_fewshot.py::test_multiple_actions5": true,
+  "test_fewshot.py::test_multiple_actions_and_locations1": true,
+  "test_fewshot.py::test_multiple_actions_and_locations2": true
 }

test/.pytest_cache/v/cache/nodeids

@@ -1,4 +1,56 @@
 [
+  "test_chatgpt4uavs.py::test_cease_flight",
+  "test_chatgpt4uavs.py::test_gym",
+  "test_chatgpt4uavs.py::test_land",
+  "test_chatgpt4uavs.py::test_lift_off",
+  "test_chatgpt4uavs.py::test_no_location1",
+  "test_chatgpt4uavs.py::test_no_location2",
+  "test_chatgpt4uavs.py::test_no_location3",
+  "test_chatgpt4uavs.py::test_parking_garage",
+  "test_chatgpt4uavs.py::test_picture",
+  "test_chatgpt4uavs.py::test_purple_house",
   "test_chatgpt4uavs.py::test_red_house",
-  "test_fewshot.py::test_red_house"
+  "test_chatgpt4uavs.py::test_snap_pic",
+  "test_chatgpt4uavs.py::test_stop_flight",
+  "test_chatgpt4uavs.py::test_take_off",
+  "test_fewshot.py::test_action_and_location",
+  "test_fewshot.py::test_action_and_location_synonyms",
+  "test_fewshot.py::test_action_synonyms",
+  "test_fewshot.py::test_cease_flight",
+  "test_fewshot.py::test_empty_input",
+  "test_fewshot.py::test_gym",
+  "test_fewshot.py::test_invalid_command",
+  "test_fewshot.py::test_invalid_command1",
+  "test_fewshot.py::test_invalid_command2",
+  "test_fewshot.py::test_land",
+  "test_fewshot.py::test_lift_off",
+  "test_fewshot.py::test_location_no_action",
+  "test_fewshot.py::test_location_no_action2",
+  "test_fewshot.py::test_location_no_action3",
+  "test_fewshot.py::test_location_no_action4",
+  "test_fewshot.py::test_multiple_actions",
+  "test_fewshot.py::test_multiple_actions1",
+  "test_fewshot.py::test_multiple_actions2",
+  "test_fewshot.py::test_multiple_actions3",
+  "test_fewshot.py::test_multiple_actions4",
+  "test_fewshot.py::test_multiple_actions5",
+  "test_fewshot.py::test_multiple_actions_and_locations",
+  "test_fewshot.py::test_multiple_actions_and_locations1",
+  "test_fewshot.py::test_multiple_actions_and_locations2",
+  "test_fewshot.py::test_no_location1",
+  "test_fewshot.py::test_no_location2",
+  "test_fewshot.py::test_no_location3",
+  "test_fewshot.py::test_no_location4",
+  "test_fewshot.py::test_parking_garage",
+  "test_fewshot.py::test_picture",
+  "test_fewshot.py::test_purple_house",
+  "test_fewshot.py::test_red_house",
+  "test_fewshot.py::test_snap_pic",
+  "test_fewshot.py::test_stop_flight",
+  "test_fewshot.py::test_stop_flight1",
+  "test_fewshot.py::test_take_off",
+  "test_fewshot.py::test_take_off_synonym",
+  "test_fewshot.py::test_two_go_to",
+  "test_fewshot.py::test_with_extra_words",
+  "test_fewshot.py::test_with_extra_words2"
 ]