feature(#45): Actions-Rails: Issues Fixed to pass its argument

.gitignore

@@ -1,2 +1,2 @@
-/firebase_cred.json
+/Brain/firebase_cred.json
 /.idea

Brain/src/common/brain_exception.py

@@ -5,6 +5,8 @@ from Brain.src.common.http_response_codes import responses
 
 
 class BrainException(Exception):
+    JSON_PARSING_ISSUE_MSG = "Exception occurred in json paring."
+
     def __init__(self, message: str = "Exception occurred in brain"):
         self.message = message
         super().__init__(self.message)

Brain/src/rising_plugin/guardrails-config/actions/actions.py

@@ -22,6 +22,7 @@ from langchain.vectorstores import utils
 from langchain.document_loaders.csv_loader import CSVLoader
 from langchain.docstore.document import Document
 
+from Brain.src.common.brain_exception import BrainException
 from Brain.src.common.utils import (
     OPENAI_API_KEY,
     COMMAND_SMS_INDEXS,
@@ -43,10 +44,31 @@ from Brain.src.rising_plugin.llm.llms import (
     FALCON_7B,
 )
 
+"""
+query is json string with below format
+{
+    "query": string,
+    "model": string,
+    "uuid": string,
+    "image_search": bool,
+}
+"""
+
 
 @action()
-async def general_question(query, model, uuid, image_search):
-    """step1: handle with gpt-4"""
+async def general_question(query):
+    """step 0: convert string to json"""
+    try:
+        json_query = json.loads(query)
+    except Exception as ex:
+        raise BrainException(BrainException.JSON_PARSING_ISSUE_MSG)
+    """step 0-->: parsing parms from the json query"""
+    query = json_query["query"]
+    model = json_query["model"]
+    uuid = json_query["uuid"]
+    image_search = json_query["image_search"]
+
+    """step 1: handle with gpt-4"""
     file_path = os.path.dirname(os.path.abspath(__file__))
 
     with open(f"{file_path}/phone.json", "r") as infile:

Brain/src/rising_plugin/guardrails-config/general.co

@@ -15,5 +15,5 @@ define bot inform capabilities
 define flow
   priority 0.9
   user ...
-  $result = execute general_question(query=$last_user_message, model="gpt-4", uuid="", image_search=True)
+  $result = execute general_question(query=$last_user_message)
   bot $result

Brain/src/rising_plugin/risingplugin.py

@@ -40,13 +40,20 @@ def getChunks(query: str):
     )
 
 
-def processLargeText(app: any, chunks: any):
+def processLargeText(
+    app: any, chunks: any, model: str, uuid: str = "", image_search: bool = True
+):
     if len(chunks) == 1:
         message = app.generate(
             messages=[
                 {
                     "role": "user",
-                    "content": chunks[0],
+                    "content": rails_input_with_args(
+                        query=chunks[0],
+                        model=model,
+                        uuid=uuid,
+                        image_search=image_search,
+                    ),
                 }
             ]
         )
@@ -81,7 +88,12 @@ def processLargeText(app: any, chunks: any):
                     messages=[
                         {
                             "role": "user",
-                            "content": chunk_query,
+                            "content": rails_input_with_args(
+                                query=chunk_query,
+                                model=model,
+                                uuid=uuid,
+                                image_search=image_search,
+                            ),
                         }
                     ]
                 )
@@ -100,7 +112,17 @@ def processLargeText(app: any, chunks: any):
                     + "ALL PART SENT. Now you can continue processing the request."
                 )
                 message = app.generate(
-                    messages=[{"role": "user", "content": last_query}]
+                    messages=[
+                        {
+                            "role": "user",
+                            "content": rails_input_with_args(
+                                query=last_query,
+                                model=model,
+                                uuid=uuid,
+                                image_search=image_search,
+                            ),
+                        }
+                    ]
                 )
                 result = json.dumps(message["content"])
                 return parseJsonFromCompletion(result)
@@ -119,7 +141,9 @@ def getCompletion(
 
     app = LLMRails(config, llm)
 
-    return processLargeText(app, chunks)
+    return processLargeText(
+        app=app, chunks=chunks, model=model, uuid=uuid, image_search=image_search
+    )
 
 
 def getCompletionOnly(
@@ -198,7 +222,7 @@ def filter_guardrails(model: any, query: str):
     chunks = getChunks(query)
 
     # get message from guardrails
-    message = processLargeText(app, chunks)
+    message = processLargeText(app=app, chunks=chunks, model=model)
 
     if (
         message
@@ -211,6 +235,22 @@ def filter_guardrails(model: any, query: str):
         return ""
 
 
+"""
+compose json_string for rails input with its arguments 
+"""
+
+
+def rails_input_with_args(query: str, model: str, uuid: str, image_search: bool) -> str:
+    # convert json with params for rails.
+    json_query_with_params = {
+        "query": query,
+        "model": model,
+        "uuid": uuid,
+        "image_search": image_search,
+    }
+    return json.dumps(json_query_with_params)
+
+
 def handle_chat_completion(messages: Any, model: str = "gpt-3.5-turbo") -> Any:
     openai.api_key = OPENAI_API_KEY
 
@@ -220,11 +260,11 @@ def handle_chat_completion(messages: Any, model: str = "gpt-3.5-turbo") -> Any:
     )
 
     # Filter the reply using the content filter
-    result = filter_guardrails(model, messages[-1]["content"])
-
-    if result == "":
-        return response
-    else:
-        response["choices"][0]["message"]["content"] = result
-        return response
-    # return response
+    # result = filter_guardrails(model, messages[-1]["content"])
+    # comment logic issue with guardrails
+    # if result == "":
+    #     return response
+    # else:
+    #     response["choices"][0]["message"]["content"] = result
+    #     return response
+    return response