Thomas Richardson commited on
Commit
a1b1b91
·
unverified ·
2 Parent(s): da461041fac9b0

Merge pull request #71 from ttt246/feature/16_merge_repos

Browse files
Brain/src/common/assembler.py CHANGED
@@ -1,12 +1,12 @@
1
  # assembler to mapping data into another data type.
2
  from typing import Any, List
3
 
4
- from src.common.http_response_codes import responses
5
- from src.model.basic_model import BasicModel
6
- from src.model.contact_model import ContactModel
7
- from src.model.message_model import MessageModel
8
- from src.model.requests.request_model import ChatRising, SendSMS, TrainContacts
9
- from src.model.sms_model import SMSModel
10
 
11
 
12
  class Assembler:
 
1
  # assembler to mapping data into another data type.
2
  from typing import Any, List
3
 
4
+ from Brain.src.common.http_response_codes import responses
5
+ from Brain.src.model.basic_model import BasicModel
6
+ from Brain.src.model.contact_model import ContactModel
7
+ from Brain.src.model.message_model import MessageModel
8
+ from Brain.src.model.requests.request_model import ChatRising, SendSMS, TrainContacts
9
+ from Brain.src.model.sms_model import SMSModel
10
 
11
 
12
  class Assembler:
Brain/src/common/brain_exception.py CHANGED
@@ -1,7 +1,7 @@
1
  """Basic Exception in Brain"""
2
  from typing import Any
3
 
4
- from src.common.http_response_codes import responses
5
 
6
 
7
  class BrainException(Exception):
 
1
  """Basic Exception in Brain"""
2
  from typing import Any
3
 
4
+ from Brain.src.common.http_response_codes import responses
5
 
6
 
7
  class BrainException(Exception):
Brain/src/common/utils.py CHANGED
@@ -41,8 +41,8 @@ HUGGINGFACEHUB_API_TOKEN = os.getenv("HUGGINGFACEHUB_API_TOKEN")
41
 
42
 
43
  def get_firebase_cred():
44
- if os.path.exists("firebase_cred.json"):
45
- file = open("firebase_cred.json")
46
  cred = json.load(file)
47
  file.close()
48
  return credentials.Certificate(cred)
 
41
 
42
 
43
  def get_firebase_cred():
44
+ if os.path.exists("Brain/firebase_cred.json"):
45
+ file = open("Brain/firebase_cred.json")
46
  cred = json.load(file)
47
  file.close()
48
  return credentials.Certificate(cred)
Brain/src/firebase/firebase.py CHANGED
@@ -1,5 +1,5 @@
1
  import firebase_admin
2
- from src.common.utils import get_firebase_cred, FIREBASE_STORAGE_BUCKET
3
 
4
 
5
  def initialize_app():
 
1
  import firebase_admin
2
+ from Brain.src.common.utils import get_firebase_cred, FIREBASE_STORAGE_BUCKET
3
 
4
 
5
  def initialize_app():
Brain/src/logs.py CHANGED
@@ -9,8 +9,8 @@ from typing import Any
9
 
10
  from colorama import Fore, Style
11
 
12
- from src.log_cycle.json_handler import JsonFormatter, JsonFileHandler
13
- from src.singletone import Singleton
14
 
15
 
16
  class Logger(metaclass=Singleton):
 
9
 
10
  from colorama import Fore, Style
11
 
12
+ from Brain.src.log_cycle.json_handler import JsonFormatter, JsonFileHandler
13
+ from Brain.src.singletone import Singleton
14
 
15
 
16
  class Logger(metaclass=Singleton):
Brain/src/model/chat_response_model.py CHANGED
@@ -1,7 +1,7 @@
1
  """chat response model"""
2
  from typing import Any
3
 
4
- from src.model.message_model import MessageModel
5
 
6
 
7
  class ChatResponseModel:
 
1
  """chat response model"""
2
  from typing import Any
3
 
4
+ from Brain.src.model.message_model import MessageModel
5
 
6
 
7
  class ChatResponseModel:
Brain/src/model/contact_model.py CHANGED
@@ -7,7 +7,7 @@
7
  }"""
8
  from typing import Any
9
 
10
- from src.model.requests.request_model import TrainContacts
11
 
12
 
13
  class ContactModel:
 
7
  }"""
8
  from typing import Any
9
 
10
+ from Brain.src.model.requests.request_model import TrainContacts
11
 
12
 
13
  class ContactModel:
Brain/src/model/feedback_model.py CHANGED
@@ -2,7 +2,7 @@ import datetime
2
 
3
 
4
  # feedback model to manage user's feedback (thumb up and down)
5
- from src.model.basic_model import BasicModel
6
 
7
 
8
  class FeedbackModel:
 
2
 
3
 
4
  # feedback model to manage user's feedback (thumb up and down)
5
+ from Brain.src.model.basic_model import BasicModel
6
 
7
 
8
  class FeedbackModel:
Brain/src/model/image_model.py CHANGED
@@ -1,7 +1,7 @@
1
  """Image model to process & handle them"""
2
  from typing import Any
3
 
4
- from src.model.basic_model import DataStatus
5
 
6
 
7
  class ImageModel:
 
1
  """Image model to process & handle them"""
2
  from typing import Any
3
 
4
+ from Brain.src.model.basic_model import DataStatus
5
 
6
 
7
  class ImageModel:
Brain/src/model/message_model.py CHANGED
@@ -1,5 +1,5 @@
1
  """message model to manage browsering questions as agent"""
2
- from src.service.llm.base import Message
3
 
4
 
5
  class MessageModel:
 
1
  """message model to manage browsering questions as agent"""
2
+ from Brain.src.service.llm.base import Message
3
 
4
 
5
  class MessageModel:
Brain/src/model/sms_model.py CHANGED
@@ -1,7 +1,7 @@
1
  """sms message model includes from, to and body"""
2
  from typing import Any
3
 
4
- from src.model.requests.request_model import SendSMS
5
 
6
 
7
  class SMSModel:
 
1
  """sms message model includes from, to and body"""
2
  from typing import Any
3
 
4
+ from Brain.src.model.requests.request_model import SendSMS
5
 
6
 
7
  class SMSModel:
Brain/src/rising_plugin/guardrails-config/actions/actions.py CHANGED
@@ -22,20 +22,20 @@ from langchain.vectorstores import utils
22
  from langchain.document_loaders.csv_loader import CSVLoader
23
  from langchain.docstore.document import Document
24
 
25
- from src.common.utils import (
26
  OPENAI_API_KEY,
27
  COMMAND_SMS_INDEXS,
28
  COMMAND_BROWSER_OPEN,
29
  )
30
- from src.rising_plugin.image_embedding import (
31
  query_image_text,
32
  )
33
 
34
  from nemoguardrails.actions import action
35
 
36
- from src.rising_plugin.llm.falcon_llm import FalconLLM
37
- from src.rising_plugin.llm.gpt_llm import GptLLM
38
- from src.rising_plugin.llm.llms import (
39
  get_llm_chain,
40
  GPT_3_5_TURBO,
41
  GPT_4_32K,
 
22
  from langchain.document_loaders.csv_loader import CSVLoader
23
  from langchain.docstore.document import Document
24
 
25
+ from Brain.src.common.utils import (
26
  OPENAI_API_KEY,
27
  COMMAND_SMS_INDEXS,
28
  COMMAND_BROWSER_OPEN,
29
  )
30
+ from Brain.src.rising_plugin.image_embedding import (
31
  query_image_text,
32
  )
33
 
34
  from nemoguardrails.actions import action
35
 
36
+ from Brain.src.rising_plugin.llm.falcon_llm import FalconLLM
37
+ from Brain.src.rising_plugin.llm.gpt_llm import GptLLM
38
+ from Brain.src.rising_plugin.llm.llms import (
39
  get_llm_chain,
40
  GPT_3_5_TURBO,
41
  GPT_4_32K,
Brain/src/rising_plugin/llm/falcon_llm.py CHANGED
@@ -1,7 +1,7 @@
1
  """falcon llm"""
2
  from langchain import HuggingFaceHub, PromptTemplate, LLMChain
3
 
4
- from src.common.utils import HUGGINGFACEHUB_API_TOKEN
5
 
6
  repo_id = "tiiuae/falcon-7b-instruct"
7
  template = """
 
1
  """falcon llm"""
2
  from langchain import HuggingFaceHub, PromptTemplate, LLMChain
3
 
4
+ from Brain.src.common.utils import HUGGINGFACEHUB_API_TOKEN
5
 
6
  repo_id = "tiiuae/falcon-7b-instruct"
7
  template = """
Brain/src/rising_plugin/llm/gpt_llm.py CHANGED
@@ -3,7 +3,7 @@ from typing import Any
3
 
4
  from langchain.chat_models import ChatOpenAI
5
  from langchain.chains.question_answering import load_qa_chain
6
- from src.common.utils import (
7
  OPENAI_API_KEY,
8
  )
9
 
 
3
 
4
  from langchain.chat_models import ChatOpenAI
5
  from langchain.chains.question_answering import load_qa_chain
6
+ from Brain.src.common.utils import (
7
  OPENAI_API_KEY,
8
  )
9
 
Brain/src/rising_plugin/llm/llms.py CHANGED
@@ -1,9 +1,9 @@
1
  """lLMs which we offer"""
2
  from typing import Any
3
 
4
- from src.common.brain_exception import BrainException
5
- from src.rising_plugin.llm.falcon_llm import FalconLLM
6
- from src.rising_plugin.llm.gpt_llm import GptLLM
7
 
8
  GPT_3_5_TURBO = "gpt-3.5-turbo"
9
  GPT_4 = "gpt-4"
 
1
  """lLMs which we offer"""
2
  from typing import Any
3
 
4
+ from Brain.src.common.brain_exception import BrainException
5
+ from Brain.src.rising_plugin.llm.falcon_llm import FalconLLM
6
+ from Brain.src.rising_plugin.llm.gpt_llm import GptLLM
7
 
8
  GPT_3_5_TURBO = "gpt-3.5-turbo"
9
  GPT_4 = "gpt-4"
Brain/src/router/api.py CHANGED
@@ -1,11 +1,11 @@
1
  import json
2
  import os
3
 
4
- from src.common.assembler import Assembler
5
- from src.common.brain_exception import BrainException
6
- from src.common.utils import ProgramType
7
- from src.model.image_model import ImageModel
8
- from src.model.requests.request_model import (
9
  Notification,
10
  UploadImage,
11
  ImageRelatedness,
@@ -17,24 +17,24 @@ from src.model.requests.request_model import (
17
  ClientInfo,
18
  get_client_info,
19
  )
20
- from src.rising_plugin.risingplugin import (
21
  getCompletion,
22
  getTextFromImage,
23
  query_image_ask,
24
  handle_chat_completion,
25
  )
26
- from src.firebase.cloudmessage import send_message, get_tokens
27
- from src.rising_plugin.csv_embed import csv_embed
28
- from src.rising_plugin.image_embedding import embed_image_text, query_image_text
29
-
30
- from src.logs import logger
31
- from src.model.basic_model import BasicModel
32
- from src.model.feedback_model import FeedbackModel
33
- from src.service.command_service import CommandService
34
- from src.service.contact_service import ContactsService
35
- from src.service.feedback_service import FeedbackService
36
- from src.service.llm.chat_service import ChatService
37
- from src.service.twilio_service import TwilioService
38
 
39
  from fastapi import APIRouter, Request, Depends
40
 
 
1
  import json
2
  import os
3
 
4
+ from Brain.src.common.assembler import Assembler
5
+ from Brain.src.common.brain_exception import BrainException
6
+ from Brain.src.common.utils import ProgramType
7
+ from Brain.src.model.image_model import ImageModel
8
+ from Brain.src.model.requests.request_model import (
9
  Notification,
10
  UploadImage,
11
  ImageRelatedness,
 
17
  ClientInfo,
18
  get_client_info,
19
  )
20
+ from Brain.src.rising_plugin.risingplugin import (
21
  getCompletion,
22
  getTextFromImage,
23
  query_image_ask,
24
  handle_chat_completion,
25
  )
26
+ from Brain.src.firebase.cloudmessage import send_message, get_tokens
27
+ from Brain.src.rising_plugin.csv_embed import csv_embed
28
+ from Brain.src.rising_plugin.image_embedding import embed_image_text, query_image_text
29
+
30
+ from Brain.src.logs import logger
31
+ from Brain.src.model.basic_model import BasicModel
32
+ from Brain.src.model.feedback_model import FeedbackModel
33
+ from Brain.src.service.command_service import CommandService
34
+ from Brain.src.service.contact_service import ContactsService
35
+ from Brain.src.service.feedback_service import FeedbackService
36
+ from Brain.src.service.llm.chat_service import ChatService
37
+ from Brain.src.service.twilio_service import TwilioService
38
 
39
  from fastapi import APIRouter, Request, Depends
40
 
Brain/src/router/browser_router.py CHANGED
@@ -1,10 +1,10 @@
1
  from fastapi import APIRouter, Request, Depends
2
 
3
- from src.common.assembler import Assembler
4
- from src.common.program_type import ProgramType
5
- from src.common.utils import parseUrlFromStr
6
- from src.model.requests.request_model import BrowserItem
7
- from src.service.browser_service import BrowserService
8
 
9
  router = APIRouter()
10
 
 
1
  from fastapi import APIRouter, Request, Depends
2
 
3
+ from Brain.src.common.assembler import Assembler
4
+ from Brain.src.common.program_type import ProgramType
5
+ from Brain.src.common.utils import parseUrlFromStr
6
+ from Brain.src.model.requests.request_model import BrowserItem
7
+ from Brain.src.service.browser_service import BrowserService
8
 
9
  router = APIRouter()
10
 
Brain/src/service/browser_service.py CHANGED
@@ -1,6 +1,6 @@
1
  """service to handle & process the browser"""
2
- from src.model.requests.request_model import BrowserItem
3
- from src.rising_plugin.risingplugin import getCompletionOnly
4
 
5
 
6
  class BrowserService:
 
1
  """service to handle & process the browser"""
2
+ from Brain.src.model.requests.request_model import BrowserItem
3
+ from Brain.src.rising_plugin.risingplugin import getCompletionOnly
4
 
5
 
6
  class BrowserService:
Brain/src/service/command_service.py CHANGED
@@ -1,7 +1,7 @@
1
  """service to manage command"""
2
  from typing import Any
3
 
4
- from src.commands.command import CommandRegistry
5
 
6
 
7
  class CommandService:
 
1
  """service to manage command"""
2
  from typing import Any
3
 
4
+ from Brain.src.commands.command import CommandRegistry
5
 
6
 
7
  class CommandService:
Brain/src/service/contact_service.py CHANGED
@@ -1,8 +1,8 @@
1
  """service to manage contacts"""
2
  from typing import List, Any
3
 
4
- from src.rising_plugin.csv_embed import get_embed
5
- from src.rising_plugin.pinecone_engine import (
6
  get_pinecone_index_namespace,
7
  update_pinecone,
8
  init_pinecone,
@@ -11,8 +11,8 @@ from src.rising_plugin.pinecone_engine import (
11
  delete_all_pinecone,
12
  )
13
 
14
- from src.common.utils import PINECONE_INDEX_NAME
15
- from src.model.contact_model import ContactModel, ContactStatus
16
 
17
 
18
  class ContactsService:
 
1
  """service to manage contacts"""
2
  from typing import List, Any
3
 
4
+ from Brain.src.rising_plugin.csv_embed import get_embed
5
+ from Brain.src.rising_plugin.pinecone_engine import (
6
  get_pinecone_index_namespace,
7
  update_pinecone,
8
  init_pinecone,
 
11
  delete_all_pinecone,
12
  )
13
 
14
+ from Brain.src.common.utils import PINECONE_INDEX_NAME
15
+ from Brain.src.model.contact_model import ContactModel, ContactStatus
16
 
17
 
18
  class ContactsService:
Brain/src/service/feedback_service.py CHANGED
@@ -3,7 +3,7 @@ from os import remove
3
  from firebase_admin import firestore
4
 
5
 
6
- from src.model.feedback_model import FeedbackModel
7
 
8
  """service to manage feedback collection"""
9
 
 
3
  from firebase_admin import firestore
4
 
5
 
6
+ from Brain.src.model.feedback_model import FeedbackModel
7
 
8
  """service to manage feedback collection"""
9
 
Brain/src/service/llm/chat_service.py CHANGED
@@ -3,11 +3,11 @@ import time
3
 
4
  from openai.error import RateLimitError
5
 
6
- from src.common.utils import AGENT_NAME, DEFAULT_GPT_MODEL
7
- from src.rising_plugin.risingplugin import handle_chat_completion
8
- from src.logs import logger
9
- from src.model.chat_response_model import ChatResponseModel
10
- from src.model.message_model import MessageModel
11
 
12
 
13
  class ChatService:
 
3
 
4
  from openai.error import RateLimitError
5
 
6
+ from Brain.src.common.utils import AGENT_NAME, DEFAULT_GPT_MODEL
7
+ from Brain.src.rising_plugin.risingplugin import handle_chat_completion
8
+ from Brain.src.logs import logger
9
+ from Brain.src.model.chat_response_model import ChatResponseModel
10
+ from Brain.src.model.message_model import MessageModel
11
 
12
 
13
  class ChatService:
Brain/src/service/twilio_service.py CHANGED
@@ -4,9 +4,9 @@ from typing import Any
4
 
5
  from twilio.rest import Client
6
 
7
- from src.common.utils import ACCOUNT_SID, AUTH_TOKEN
8
- from src.logs import logger
9
- from src.model.sms_model import SMSModel
10
 
11
 
12
  class TwilioService:
 
4
 
5
  from twilio.rest import Client
6
 
7
+ from Brain.src.common.utils import ACCOUNT_SID, AUTH_TOKEN
8
+ from Brain.src.logs import logger
9
+ from Brain.src.model.sms_model import SMSModel
10
 
11
 
12
  class TwilioService:
Brain/tests/conftest.py CHANGED
@@ -2,7 +2,7 @@ import pytest
2
  from fastapi import FastAPI
3
  from fastapi.testclient import TestClient
4
 
5
- from src.firebase.firebase import initialize_app
6
 
7
  initialize_app()
8
 
 
2
  from fastapi import FastAPI
3
  from fastapi.testclient import TestClient
4
 
5
+ from Brain.src.firebase.firebase import initialize_app
6
 
7
  initialize_app()
8
 
Brain/tests/functional/test_recipes.py CHANGED
@@ -1,10 +1,10 @@
1
  import re
2
 
3
- from src.firebase.firebase import initialize_app
4
- from src.rising_plugin.risingplugin import getCompletion, getTextFromImage
5
- from src.firebase.cloudmessage import send_message
6
- from src.firebase.cloudmessage import get_tokens
7
- from src.rising_plugin.image_embedding import query_image_text
8
 
9
  TEST_IAMGE_NAME = "0ddffe51-3763-48d9-ab74-2086de529217"
10
  TEST_UUID = "TEST_UUID"
 
1
  import re
2
 
3
+ from Brain.src.firebase.firebase import initialize_app
4
+ from Brain.src.rising_plugin.risingplugin import getCompletion, getTextFromImage
5
+ from Brain.src.firebase.cloudmessage import send_message
6
+ from Brain.src.firebase.cloudmessage import get_tokens
7
+ from Brain.src.rising_plugin.image_embedding import query_image_text
8
 
9
  TEST_IAMGE_NAME = "0ddffe51-3763-48d9-ab74-2086de529217"
10
  TEST_UUID = "TEST_UUID"