From 98426d292fb19a5101059f525fe045a4f6c554e9 Mon Sep 17 00:00:00 2001
From: ALIHAN DIKEL <alihan.dikel@turkcell.com.tr>
Date: Thu, 18 May 2023 23:51:48 +0300
Subject: [PATCH] improvements on brain service manage.sh

---
 brain/brain_base.py                     |  2 +-
 {commander => brain}/commands.py        |  0
 brain/{service_gradio.py => service.py} |  0
 brain/service_fastapi.py                | 34 -----------------------
 brain/service_gradio_nicetry_1.py       | 37 -------------------------
 commander/{commander.py => service.py}  |  0
 manage.sh                               | 16 ++++++-----
 7 files changed, 10 insertions(+), 79 deletions(-)
 rename {commander => brain}/commands.py (100%)
 rename brain/{service_gradio.py => service.py} (100%)
 delete mode 100644 brain/service_fastapi.py
 delete mode 100644 brain/service_gradio_nicetry_1.py
 rename commander/{commander.py => service.py} (100%)

diff --git a/brain/brain_base.py b/brain/brain_base.py
index 8a0be07..3aafcb3 100644
--- a/brain/brain_base.py
+++ b/brain/brain_base.py
@@ -4,7 +4,7 @@ import os
 
 from loguru import logger
 
-from commander.commands import CommandHandler
+from brain.commands import CommandHandler
 
 
 class BaseBrain:
diff --git a/commander/commands.py b/brain/commands.py
similarity index 100%
rename from commander/commands.py
rename to brain/commands.py
diff --git a/brain/service_gradio.py b/brain/service.py
similarity index 100%
rename from brain/service_gradio.py
rename to brain/service.py
diff --git a/brain/service_fastapi.py b/brain/service_fastapi.py
deleted file mode 100644
index 2efa677..0000000
--- a/brain/service_fastapi.py
+++ /dev/null
@@ -1,34 +0,0 @@
-import sys
-
-from fastapi import FastAPI
-import uvicorn
-
-from brain_openai import CloudChatBrain
-
-
-
-#def start_application():
-#    app = FastAPI()
-#    # app.include_router(api_router)
-#    # brain = CloudChatBrain()
-#    return app
-
-
-
-
-if __name__ == "__main__":
-    if len(sys.argv) == 1: 
-        port = 8890
-    else:
-        port = int(sys.argv[1])
-
-    app = FastAPI()
-
-    @app.post("/command/")
-    def post_command(payload: dict):
-        prompt = payload.get("prompt")
-        return {"response": prompt}
-
-    
-    #app = start_application()
-    uvicorn.run(app, host="0.0.0.0", port=port, log_level="debug")
diff --git a/brain/service_gradio_nicetry_1.py b/brain/service_gradio_nicetry_1.py
deleted file mode 100644
index d4106cb..0000000
--- a/brain/service_gradio_nicetry_1.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import gradio as gr
-import requests
-
-
-conversation = []
-
-def generate_response(prompt, params):
-    #response = requests.get(f"http://localhost:8000/command/{prompt}").json()
-    response = f"I got {prompt}"
-    conversation.append({"prompt": prompt, "response": response})
-    print(params)
-    #params["conversation_history"].description = f"Conversation History:\n\n{populate_chat_history(conversation)}"
-    return f"I got: {prompt}"
-
-def populate_chat_history(conversation):
-    history = ""
-    for i, chat in enumerate(conversation):
-        history += f"User: {chat['prompt']}\nBot: {chat['response']}\n\n"
-    return history
-
-iface = gr.Interface(
-    fn=generate_response,
-    inputs=["text"],
-    outputs=["text"],
-    parameters=[
-        {
-            "type": "textbox", 
-            "key": "conversation_history", 
-            "label": "Conversation:", 
-            "default": ""
-        }
-    ],
-    title="fly my drone by talking",
-    description="what should I do now?\n(enter q for emergency)"
-)
-
-iface.launch(server_name="0.0.0.0", server_port=8890, debug=True)
\ No newline at end of file
diff --git a/commander/commander.py b/commander/service.py
similarity index 100%
rename from commander/commander.py
rename to commander/service.py
diff --git a/manage.sh b/manage.sh
index d79a2b0..5ee02b9 100755
--- a/manage.sh
+++ b/manage.sh
@@ -59,16 +59,18 @@ start_codeserver(){
 }
 
 start_commander_service() {
-	venv/bin/python commander/commander.py $1
+	venv/bin/python commander/service.py $1
 }
 
 start_brain_service() {
-    venv/bin/python -m gradio brain/service.py $1
+  commander_host=$1
+  port=$2
+  ENV_FOR_DYNACONF=$commander_host venv/bin/python -m gradio brain/service.py $port
 }
 
 talk_to_drone_via_cli() {
-    commander_host=$1
-    ENV_FOR_DYNACONF=$commander_host python brain/cli.py
+  commander_host=$1
+  ENV_FOR_DYNACONF=$commander_host python brain/cli.py
 }
 
 kill_everything() {
@@ -172,7 +174,7 @@ elif [ "$1" == "stop-commander" ]; then
 	fi
 
 elif [ "$1" == "start-brain" ]; then
-    start_brain_service $2 > logs/brain.log 2>&1 &
+    start_brain_service $2 $3 > logs/brain.log 2>&1 &
     brain_pid=$!
     echo "started brain service with PID brain_pid"
     echo brain_pid > $pids_dir/brain_pid.txt
@@ -211,8 +213,8 @@ else
   - get-/ kill-dhcp
   - start-/ stop-jupyter (8888)
   - start-/ stop-cs (8888)
-  - start-/ stop-commander [port (8889)]
-  - start-/ stop-brain [port (8890)]
+  - start-/ stop-commander port (8889)
+  - start-/ stop-brain [host (tuncel/commander)]  port (8890)
   - start-clitalk [host (tuncel/commander)]
   - turn-off
   - prepare-/ finish-flight"