这是indexloc提供的服务，不要输入任何密码
Skip to content

Update SAML schema to support tools in oss llms #849

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Feb 24, 2024
Merged

Update SAML schema to support tools in oss llms #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3acef9e
feat: update saml schema to support tools in oss llms
elisalimli Feb 24, 2024
ff09392
chore: small fix
elisalimli Feb 24, 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
33 changes: 19 additions & 14 deletions libs/superagent/app/api/workflow_configs/saml_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from enum import Enum
from typing import Any, Optional
from typing import Any, Generic, Optional, TypeVar

from pydantic import BaseModel, Field, validator

Expand Down Expand Up @@ -72,9 +72,9 @@ class ToolModel(BaseModel):
metaphor: Optional[Tool]
function: Optional[Tool]
# ~~~~~~Assistants as tools~~~~~~
superagent: Optional["AgentTool"]
openai_assistant: Optional["AgentTool"]
llm: Optional["AssistantTool"]
superagent: Optional["BaseAssistantToolModel[SuperagentAgent]"]
openai_assistant: Optional["BaseAssistantToolModel[OpenAIAgent]"]
llm: Optional["BaseAssistantToolModel[LLMAgent]"]

# OpenAI Assistant tools
code_interpreter: Optional[Tool]
Expand All @@ -92,22 +92,27 @@ class Assistant(BaseModel):
intro: Optional[str]


class Agent(Assistant):
# ~~~Agents~~~
class SuperagentAgent(Assistant):
tools: Optional[Tools]
data: Optional[Data]
data: Optional[Data] # deprecated, use superrag instead
superrag: Optional[Superrag]


class BaseAssistantToolModel(BaseModel):
use_for: str
class LLMAgent(Assistant):
tools: Optional[Tools]
superrag: Optional[Superrag]


class AgentTool(BaseAssistantToolModel, Agent):
class OpenAIAgent(Assistant):
pass


class AssistantTool(BaseAssistantToolModel, Assistant):
pass
AgentT = TypeVar("AgentT")


class BaseAssistantToolModel(BaseModel, Generic[AgentT]):
use_for: str


# This is for the circular reference between Agent, Assistant and ToolModel
Expand All @@ -116,9 +121,9 @@ class AssistantTool(BaseAssistantToolModel, Assistant):


class Workflow(BaseModel):
superagent: Optional[Agent]
openai_assistant: Optional[Assistant]
llm: Optional[Assistant]
superagent: Optional[SuperagentAgent]
openai_assistant: Optional[OpenAIAgent]
llm: Optional[LLMAgent]


class WorkflowConfigModel(BaseModel):
Expand Down
8 changes: 4 additions & 4 deletions libs/superagent/app/api/workflow_configs/validator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def validate(self):
self.validate_superrag_names()

def validate_assistant_names(self):
assistants = self.config.get("workflows", [])
assistants = self.config.get("workflows") or []
assistant_names = []

for new_assistant in assistants:
Expand All @@ -30,13 +30,13 @@ def validate_assistant_names(self):
assistant_names.append(assistant_name)

def validate_tool_names(self):
assistants = self.config.get("workflows", [])
assistants = self.config.get("workflows") or []

for new_assistant in assistants:
assistant_type = get_first_non_null_key(new_assistant)
assistant = new_assistant.get(assistant_type)

tools = assistant.get("tools", [])
tools = assistant.get("tools") or []
tool_names = []

for tool in tools:
Expand All @@ -51,7 +51,7 @@ def validate_tool_names(self):
tool_names.append(tool_name)

def validate_superrag_names(self):
assistants = self.config.get("workflows", [])
assistants = self.config.get("workflows") or []

for new_assistant in assistants:
assistant_type = get_first_non_null_key(new_assistant)
Expand Down