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

Fixing naming confusion in SAML #851

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 1 commit into from
Feb 25, 2024
Merged

Fixing naming confusion in SAML #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions libs/superagent/app/api/workflow_configs/data_transformer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import logging

from app.api.workflow_configs.api.api_manager import ApiManager
from app.api.workflow_configs.saml_schema import SAML_OSS_LLM_PROVIDERS
from app.utils.helpers import (
get_first_non_null_key,
get_mimetype_from_url,
Expand Down Expand Up @@ -89,6 +90,9 @@ def transform_assistant(self):
)

if self.assistant_type:
if self.assistant_type.upper() in SAML_OSS_LLM_PROVIDERS:
self.assistant_type = AgentType.LLM.value

self.assistant["type"] = self.assistant_type.upper()

llm_model = self.assistant.get("llmModel")
Expand Down
4 changes: 4 additions & 0 deletions libs/superagent/app/api/workflow_configs/processors/agent_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ async def process_assistant(
await old_saml_transformer.transform()
await new_saml_transformer.transform()

# this is needed because type can be changed in data transformer
old_assistant_type = old_assistant.get("type")
new_assistant_type = new_assistant.get("type")

if old_assistant:
old_tool_processor = Processor(
self.api_user,
Expand Down
16 changes: 14 additions & 2 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
Expand Up @@ -3,6 +3,8 @@

from pydantic import BaseModel, Field, validator

from prisma.enums import LLMProvider


class SuperragEncoderType(str, Enum):
openai = "openai"
Expand Down Expand Up @@ -95,7 +97,7 @@ class Assistant(BaseModel):
# ~~~Agents~~~
class SuperagentAgent(Assistant):
tools: Optional[Tools]
data: Optional[Data] # deprecated, use superrag instead
data: Optional[Data] = Field(description="Deprecated! Use `superrag` instead.")
superrag: Optional[Superrag]


Expand Down Expand Up @@ -128,11 +130,21 @@ class LLMAgentTool(BaseAgentToolModel, LLMAgent):
# for assistant as tools
ToolModel.update_forward_refs()

SAML_OSS_LLM_PROVIDERS = [
LLMProvider.PERPLEXITY.value,
LLMProvider.TOGETHER_AI.value,
]


class Workflow(BaseModel):
superagent: Optional[SuperagentAgent]
openai_assistant: Optional[OpenAIAgent]
llm: Optional[LLMAgent]
# ~~OSS LLM providers~~
perplexity: Optional[LLMAgent]
together_ai: Optional[LLMAgent]
llm: Optional[LLMAgent] = Field(
description="Deprecated! Use LLM providers instead. e.g. `perplexity` or `together_ai`"
)


class WorkflowConfigModel(BaseModel):
Expand Down