Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into master #384

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b048ea4
some changes
vipul-maheshwari Aug 2, 2024
2e89d54
Merge branch 'dev/rag' into dev/proxy-server
vipul-maheshwari Aug 2, 2024
431f324
adding extra config schema in the LLM , missed
vipul-maheshwari Aug 2, 2024
4807bab
Merge branch 'develop' into dev/proxy-server
vipul-maheshwari Aug 2, 2024
fd154ff
some minor fixes
vipul-maheshwari Aug 3, 2024
7bb3487
change llama_index_agent to knowledgebase agent
marmikcfc Aug 5, 2024
507cf06
refactor rag agent
marmikcfc Aug 6, 2024
5d29845
Merge branch 'dev/proxy-server' into develop
vipul-maheshwari Aug 7, 2024
3449352
changes in quickstart_ingestion_server script
vipul-maheshwari Aug 7, 2024
6022691
Merge branch 'dev/proxy-server' into develop
vipul-maheshwari Aug 7, 2024
6b2a7ba
some changes for LANCEDB rag
vipul-maheshwari Aug 7, 2024
962c658
Revert "some changes for LANCEDB rag"
vipul-maheshwari Aug 8, 2024
5007c27
Revert "Merge branch 'dev/proxy-server' into develop"
vipul-maheshwari Aug 8, 2024
20cd842
Revert "Merge branch 'dev/proxy-server' into develop"
vipul-maheshwari Aug 8, 2024
bd4a72a
fixed some issues for RAG
vipul-maheshwari Aug 8, 2024
c9c2f6b
Merge dev/proxy-server into develop
vipul-maheshwari Aug 9, 2024
e7333fa
Update requirements.txt
marmikcfc Aug 13, 2024
1a15427
rag is added with bolna package
vipul-maheshwari Aug 16, 2024
1d91ded
Union issue is resolved, uffff.
vipul-maheshwari Aug 16, 2024
7b0c338
changes
vipul-maheshwari Aug 16, 2024
e33c1ca
RAG in local_setup
vipul-maheshwari Aug 26, 2024
33f8466
changes
vipul-maheshwari Aug 26, 2024
4a94aad
some changes in local setup for RAG
vipul-maheshwari Aug 28, 2024
4673b4f
bring models up to speed with develop
marmikcfc Aug 28, 2024
83f8271
merge with develop
marmikcfc Aug 28, 2024
211f643
Merge pull request #386 from voxos-ai/master-bkp
marmikcfc Aug 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
change llama_index_agent to knowledgebase agent
marmikcfc committed Aug 5, 2024
commit 7bb3487e4370cce0e018f5e893f706897ef8ce6a
6 changes: 3 additions & 3 deletions bolna/agent_manager/task_manager.py
Original file line number Diff line number Diff line change
@@ -561,8 +561,8 @@ def __get_agent_object(self, llm, agent_type, assistant_config = None ):
def __setup_tasks(self, llm = None, agent_type = None, assistant_config= None):
if self.task_config["task_type"] == "conversation" and not self.__is_multiagent():
self.tools["llm_agent"] = self.__get_agent_object(llm, agent_type, assistant_config)
if agent_type == "llama-index-rag":
logger.info("#### Setting up llama-index-rag agent ####")
if agent_type == "knowledgebase_agent":
logger.info("#### Setting up knowledgebase_agent agent ####")
extra_config = self.task_config["tools_config"]["llm_agent"].get("extra_config", {})
vector_store_config = extra_config.get("vector_store", {})
self.tools["llm_agent"] = LlamaIndexRag(
@@ -608,7 +608,7 @@ def __get_final_prompt(self, prompt, today):
async def load_prompt(self, assistant_name, task_id, local, **kwargs):
logger.info("prompt and config setup started")
agent_type = self.task_config["tools_config"]["llm_agent"].get("agent_type", "simple_llm_agent")
if self.task_config["task_type"] == "webhook" or agent_type in ["openai_assistant", "llamaindex_rag_agent"]:
if self.task_config["task_type"] == "webhook" or agent_type in ["openai_assistant", "knowledgebase_agent"]:
return
self.is_local = local
today = datetime.now().strftime("%A, %B %d, %Y")
8 changes: 5 additions & 3 deletions bolna/models.py
Original file line number Diff line number Diff line change
@@ -156,8 +156,6 @@ class VectorStore(BaseModel):
provider: str
provider_config: Union[LanceDBProviderConfig, MongoDBProviderConfig]

class ExtraConfig(BaseModel):
vector_store : VectorStore

class LLM(BaseModel):
model: Optional[str] = "gpt-3.5-turbo"
@@ -181,6 +179,7 @@ class SIMPLE_LLM_AGENT(LLM):
extraction_details: Optional[str] = None
summarization_details: Optional[str] = None


class Node(BaseModel):
id: str
type: str #Can be router or conversation for now
@@ -209,12 +208,15 @@ class MultiAgent(BaseModel):
default_agent: str
embedding_model: Optional[str] = "Snowflake/snowflake-arctic-embed-l"

class KnowledgebaseAgent(LLM):
vector_store: VectorStore

class LLM_AGENT(BaseModel):
agent_flow_type: str
agent_type: str #can be llamaindex_rag, simple_llm_agent, router_agent, dag_agent, openai_assistant, custom, etc
#extra_config: Union[OpenaiAssistants, LLM_AGENT_GRAPH, MultiAgent, LLM, SIMPLE_LLM_AGENT]
guardrails: Optional[Routes] = None #Just to reduce confusion
extra_config: Union[OpenaiAssistants, LLM_AGENT_GRAPH, MultiAgent, LLM]
extra_config: Union[OpenaiAssistants, LLM_AGENT_GRAPH, MultiAgent, KnowledgebaseAgent, SIMPLE_LLM_AGENT, LLM]


class MessagingModel(BaseModel):