feature(#9): updated request body type with confs.

Brain/src/common/assembler.py

@@ -67,5 +67,5 @@ class Assembler:
 
     """mapping basic req"""
 
-    def to_req_model(self, basic_req: BasicReq) -> ReqModel:
+    def to_req_model(self, basic_req: BasicReq.Confs) -> ReqModel:
         return ReqModel(basic_req.to_json())

Brain/src/firebase/firebase.py

@@ -42,7 +42,7 @@ def get_firebase_admin_name(uuid: str = ""):
 def firebase_admin_with_setting(data: BasicReq):
     # firebase admin init
     assembler = Assembler()
-    setting = assembler.to_req_model(data)
+    setting = assembler.to_req_model(data.confs)
     try:
         firebase_app = initialize_app(setting)
     except Exception as ex:

Brain/src/model/requests/request_model.py

@@ -67,27 +67,30 @@ def get_client_info(request: Request):
 
 
 class BasicReq(BaseModel):
-    class Settings(BaseModel):
-        temperature: float = 0.6
-
-    openai_key: str
-    pinecone_key: str
-    pinecone_env: str
-    firebase_key: str
-    token: str = ""
-    uuid: str = ""
-    settings: Settings
-
-    def to_json(self):
-        return {
-            "openai_key": self.openai_key,
-            "pinecone_key": self.pinecone_key,
-            "pinecone_env": self.pinecone_env,
-            "firebase_key": self.firebase_key,
-            "settings": {"temperature": self.settings.temperature},
-            "token": self.token,
-            "uuid": self.uuid,
-        }
+    class Confs(BaseModel):
+        class Settings(BaseModel):
+            temperature: float = 0.6
+
+        openai_key: str
+        pinecone_key: str
+        pinecone_env: str
+        firebase_key: str
+        token: str = ""
+        uuid: str = ""
+        settings: Settings
+
+        def to_json(self):
+            return {
+                "openai_key": self.openai_key,
+                "pinecone_key": self.pinecone_key,
+                "pinecone_env": self.pinecone_env,
+                "firebase_key": self.firebase_key,
+                "settings": {"temperature": self.settings.temperature},
+                "token": self.token,
+                "uuid": self.uuid,
+            }
+
+    confs: Confs
 
 
 """endpoint: /sendNotification"""

Brain/src/router/api.py

@@ -71,14 +71,16 @@ def construct_blueprint_api() -> APIRouter:
 
         # parsing params
         query = data.message
-        token = data.token
-        uuid = data.uuid
+        token = setting.token
+        uuid = setting.uuid
         # check browser endpoint
         if client_info.is_browser():
             query = f"{query} in a web browser"
 
         result = getCompletion(
-            query=query, setting=assembler.to_req_model(data), firebase_app=firebase_app
+            query=query,
+            setting=setting,
+            firebase_app=firebase_app,
         )
 
         # check contact querying
@@ -126,10 +128,10 @@ def construct_blueprint_api() -> APIRouter:
             cloud_message = CloudMessage(firebase_app=firebase_app)
 
             image_model = ImageModel()
-            token = data.token
+            token = setting.token
 
             image_model.image_name = data.image_name
-            image_model.uuid = data.uuid
+            image_model.uuid = setting.uuid
             image_model.status = data.status
 
             image_model.image_text = getTextFromImage(
@@ -170,8 +172,8 @@ def construct_blueprint_api() -> APIRouter:
         # parsing params
         image_name = data.image_name
         message = data.message
-        token = data.token
-        uuid = data.uuid
+        token = setting.token
+        uuid = setting.uuid
 
         image_content = getTextFromImage(filename=image_name, firebase_app=firebase_app)
         # check message type
@@ -222,8 +224,8 @@ def construct_blueprint_api() -> APIRouter:
             # cloud message
             cloud_message = CloudMessage(firebase_app=firebase_app)
             feedback_service = FeedbackService(firebase_app=firebase_app)
-            token = data.token
-            uuid = data.uuid
+            token = setting.token
+            uuid = setting.uuid
 
             # parsing feedback payload
             prompt = BasicModel(
@@ -303,8 +305,8 @@ def construct_blueprint_api() -> APIRouter:
         # cloud message
         cloud_message = CloudMessage(firebase_app=firebase_app)
         try:
-            token = data.token
-            uuid = data.uuid
+            token = setting.token
+            uuid = setting.uuid
             histories = assembler.to_array_message_model(data.history)  # json array
             user_input = data.user_input
             """init chat service with model"""
@@ -352,8 +354,8 @@ def construct_blueprint_api() -> APIRouter:
         except BrainException as ex:
             return assembler.to_response(ex.code, ex.message, "")
         try:
-            token = data.token
-            uuid = data.uuid
+            token = setting.token
+            uuid = setting.uuid
 
             # parsing feedback payload
             sms_model = assembler.to_sms_model(data.data)
@@ -390,8 +392,8 @@ def construct_blueprint_api() -> APIRouter:
         except BrainException as ex:
             return assembler.to_response(ex.code, ex.message, "")
         try:
-            token = data.token
-            uuid = data.uuid
+            token = setting.token
+            uuid = setting.uuid
 
             # parsing contacts
             contacts = []
@@ -424,8 +426,8 @@ def construct_blueprint_api() -> APIRouter:
         except BrainException as ex:
             return assembler.to_response(ex.code, ex.message, "")
         try:
-            token = data.token
-            uuid = data.uuid
+            token = setting.token
+            uuid = setting.uuid
 
             # parsing contacts
             # train contact

Brain/src/router/browser_router.py

@@ -38,8 +38,8 @@ def construct_blueprint_browser_api() -> APIRouter:
 
         item_link = ""
         try:
-            token = data.token
-            uuid = data.uuid
+            token = setting.token
+            uuid = setting.uuid
 
             # parsing contacts
             # train contact