thomas commited on
Commit
156199c
·
1 Parent(s): c739e98

bugfix: fixed update train

Browse files
Brain/src/rising_plugin/csv_embed.py CHANGED
@@ -4,6 +4,7 @@ from langchain.document_loaders.csv_loader import CSVLoader
4
  from langchain.embeddings.openai import OpenAIEmbeddings
5
  import json
6
 
 
7
  from ..common.utils import OPENAI_API_KEY
8
 
9
 
@@ -25,8 +26,8 @@ def csv_embed():
25
  """getting embed"""
26
 
27
 
28
- def get_embed(data: str) -> list[float]:
29
- embeddings = OpenAIEmbeddings(openai_api_key=OPENAI_API_KEY)
30
  return embeddings.embed_query(data)
31
 
32
 
 
4
  from langchain.embeddings.openai import OpenAIEmbeddings
5
  import json
6
 
7
+ from Brain.src.model.req_model import ReqModel
8
  from ..common.utils import OPENAI_API_KEY
9
 
10
 
 
26
  """getting embed"""
27
 
28
 
29
+ def get_embed(data: str, setting:ReqModel) -> list[float]:
30
+ embeddings = OpenAIEmbeddings(openai_api_key=setting.openai_key)
31
  return embeddings.embed_query(data)
32
 
33
 
Brain/src/rising_plugin/image_embedding.py CHANGED
@@ -12,8 +12,8 @@ from ..model.image_model import ImageModel
12
  from ..model.req_model import ReqModel
13
 
14
 
15
- def get_embeddings():
16
- return OpenAIEmbeddings(openai_api_key=OPENAI_API_KEY)
17
 
18
 
19
  # def embed_image_text(image_text: str, image_name: str, uuid: str) -> str:
@@ -24,7 +24,7 @@ def embed_image_text(image: ImageModel, setting: ReqModel) -> str:
24
  {image.image_text}
25
  """
26
 
27
- embed_image = get_embeddings().embed_query(prompt_template)
28
  index = init_pinecone(index_name=PINECONE_INDEX_NAME, setting=setting)
29
 
30
  """create | update | delete in pinecone"""
@@ -48,7 +48,7 @@ def embed_image_text(image: ImageModel, setting: ReqModel) -> str:
48
 
49
 
50
  def query_image_text(image_content, message, setting: ReqModel):
51
- embed_image = get_embeddings().embed_query(
52
  get_prompt_image_with_message(image_content, message)
53
  )
54
  index = init_pinecone(index_name=PINECONE_INDEX_NAME, setting=setting)
 
12
  from ..model.req_model import ReqModel
13
 
14
 
15
+ def get_embeddings(setting: ReqModel):
16
+ return OpenAIEmbeddings(openai_api_key=setting.openai_key)
17
 
18
 
19
  # def embed_image_text(image_text: str, image_name: str, uuid: str) -> str:
 
24
  {image.image_text}
25
  """
26
 
27
+ embed_image = get_embeddings(setting=setting).embed_query(prompt_template)
28
  index = init_pinecone(index_name=PINECONE_INDEX_NAME, setting=setting)
29
 
30
  """create | update | delete in pinecone"""
 
48
 
49
 
50
  def query_image_text(image_content, message, setting: ReqModel):
51
+ embed_image = get_embeddings(setting=setting).embed_query(
52
  get_prompt_image_with_message(image_content, message)
53
  )
54
  index = init_pinecone(index_name=PINECONE_INDEX_NAME, setting=setting)
Brain/src/rising_plugin/risingplugin.py CHANGED
@@ -64,7 +64,7 @@ def llm_rails(
64
 
65
  """step 1: handle with gpt-4"""
66
 
67
- query_result = get_embed(query)
68
  try:
69
  relatedness_data = index.query(
70
  vector=query_result,
 
64
 
65
  """step 1: handle with gpt-4"""
66
 
67
+ query_result = get_embed(data=query, setting=setting)
68
  try:
69
  relatedness_data = index.query(
70
  vector=query_result,
Brain/src/router/train_router.py CHANGED
@@ -20,7 +20,7 @@ def construct_blueprint_train_api() -> APIRouter:
20
  status_code=200, schema={"message": "message", "result": "test_result"}
21
  )"""
22
 
23
- @router.get("")
24
  def read_all_documents(data: BasicReq):
25
  # parsing params
26
  try:
@@ -82,7 +82,7 @@ def construct_blueprint_train_api() -> APIRouter:
82
  @generator.response( status_code=200, schema={"message": "message", "result": {"document_id": "document_id",
83
  "page_content":"page_content"}} )"""
84
 
85
- @router.post("")
86
  def create_document_train(data: Document):
87
  # parsing params
88
  try:
 
20
  status_code=200, schema={"message": "message", "result": "test_result"}
21
  )"""
22
 
23
+ @router.post("")
24
  def read_all_documents(data: BasicReq):
25
  # parsing params
26
  try:
 
82
  @generator.response( status_code=200, schema={"message": "message", "result": {"document_id": "document_id",
83
  "page_content":"page_content"}} )"""
84
 
85
+ @router.post("/create")
86
  def create_document_train(data: Document):
87
  # parsing params
88
  try:
Brain/src/service/contact_service.py CHANGED
@@ -33,7 +33,7 @@ class ContactsService:
33
  key = contact.contact_id
34
  value = f"{contact.display_name}, {contact.get_str_phones()}"
35
  # get vectoring data(embedding data)
36
- vectoring_values = get_embed(value)
37
  # create | update | delete pinecone
38
  if contact.status == ContactStatus.CREATED:
39
  add_pinecone(
@@ -60,7 +60,7 @@ class ContactsService:
60
  response: list of contactId as index key of pinecone"""
61
 
62
  def query_contacts(self, uuid: str, search: str) -> List[str]:
63
- vector_data = get_embed(search)
64
  index = init_pinecone(index_name=PINECONE_INDEX_NAME, setting=self.setting)
65
  relatedness_data = index.query(
66
  vector=vector_data,
 
33
  key = contact.contact_id
34
  value = f"{contact.display_name}, {contact.get_str_phones()}"
35
  # get vectoring data(embedding data)
36
+ vectoring_values = get_embed(data=value, setting=self.setting)
37
  # create | update | delete pinecone
38
  if contact.status == ContactStatus.CREATED:
39
  add_pinecone(
 
60
  response: list of contactId as index key of pinecone"""
61
 
62
  def query_contacts(self, uuid: str, search: str) -> List[str]:
63
+ vector_data = get_embed(data=search, setting=self.setting)
64
  index = init_pinecone(index_name=PINECONE_INDEX_NAME, setting=self.setting)
65
  relatedness_data = index.query(
66
  vector=vector_data,
Brain/src/service/train_service.py CHANGED
@@ -101,12 +101,12 @@ class TrainService:
101
  result = list()
102
  pinecone_namespace = self.get_pinecone_index_namespace()
103
  for item in documents:
104
- query_result = get_embed(item["page_content"])
105
  result.append(query_result)
106
  key = item["document_id"]
107
  value = f'{item["page_content"]}'
108
  # get vectoring data(embedding data)
109
- vectoring_values = get_embed(value)
110
  add_pinecone(
111
  namespace=pinecone_namespace,
112
  key=key,
@@ -120,12 +120,12 @@ class TrainService:
120
  self.init_firestore()
121
  pinecone_namespace = self.get_pinecone_index_namespace()
122
  result = list()
123
- query_result = get_embed(page_content)
124
  result.append(query_result)
125
  key = document_id
126
  value = f"{page_content}, {query_result}"
127
  # get vectoring data(embedding data)
128
- vectoring_values = get_embed(value)
129
  add_pinecone(
130
  namespace=pinecone_namespace,
131
  key=key,
 
101
  result = list()
102
  pinecone_namespace = self.get_pinecone_index_namespace()
103
  for item in documents:
104
+ query_result = get_embed(data=item["page_content"], setting=self.setting)
105
  result.append(query_result)
106
  key = item["document_id"]
107
  value = f'{item["page_content"]}'
108
  # get vectoring data(embedding data)
109
+ vectoring_values = get_embed(data=value, setting=self.setting)
110
  add_pinecone(
111
  namespace=pinecone_namespace,
112
  key=key,
 
120
  self.init_firestore()
121
  pinecone_namespace = self.get_pinecone_index_namespace()
122
  result = list()
123
+ query_result = get_embed(data=page_content, setting=self.setting)
124
  result.append(query_result)
125
  key = document_id
126
  value = f"{page_content}, {query_result}"
127
  # get vectoring data(embedding data)
128
+ vectoring_values = get_embed(data=value, setting=self.setting)
129
  add_pinecone(
130
  namespace=pinecone_namespace,
131
  key=key,
requirements.txt CHANGED
@@ -68,4 +68,5 @@ wrapt==1.15.0
68
  yarl==1.8.2
69
  twilio==8.2.1
70
  nemoguardrails==0.2.0
71
- user-agents==2.2.0
 
 
68
  yarl==1.8.2
69
  twilio==8.2.1
70
  nemoguardrails==0.2.0
71
+ user-agents==2.2.0
72
+ tiktoken==0.4.0