From 476eb90a9090c6b4ede547a7a4b09f5ac48473a4 Mon Sep 17 00:00:00 2001 From: takatost Date: Mon, 12 Feb 2024 00:56:17 +0800 Subject: [PATCH] fix: List not found in account service (#2434) --- api/core/entities/message_entities.py | 2 +- api/core/model_runtime/docs/en_US/provider_scale_out.md | 2 +- .../docs/zh_Hans/customizable_model_scale_out.md | 2 +- api/core/model_runtime/docs/zh_Hans/interfaces.md | 2 +- .../docs/zh_Hans/predefined_model_scale_out.md | 2 +- api/services/account_service.py | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/core/entities/message_entities.py b/api/core/entities/message_entities.py index 51b9582a91..6f767aafc7 100644 --- a/api/core/entities/message_entities.py +++ b/api/core/entities/message_entities.py @@ -41,7 +41,7 @@ class ImagePromptMessageFile(PromptMessageFile): class LCHumanMessageWithFiles(HumanMessage): - # content: Union[str, List[Union[str, Dict]]] + # content: Union[str, list[Union[str, Dict]]] content: str files: list[PromptMessageFile] diff --git a/api/core/model_runtime/docs/en_US/provider_scale_out.md b/api/core/model_runtime/docs/en_US/provider_scale_out.md index d93a5426b5..ba356c5cab 100644 --- a/api/core/model_runtime/docs/en_US/provider_scale_out.md +++ b/api/core/model_runtime/docs/en_US/provider_scale_out.md @@ -161,7 +161,7 @@ In `llm.py`, create an Anthropic LLM class, which we name `AnthropicLargeLanguag ```python def _invoke(self, model: str, credentials: dict, prompt_messages: list[PromptMessage], model_parameters: dict, - tools: Optional[list[PromptMessageTool]] = None, stop: Optional[List[str]] = None, + tools: Optional[list[PromptMessageTool]] = None, stop: Optional[list[str]] = None, stream: bool = True, user: Optional[str] = None) \ -> Union[LLMResult, Generator]: """ diff --git a/api/core/model_runtime/docs/zh_Hans/customizable_model_scale_out.md b/api/core/model_runtime/docs/zh_Hans/customizable_model_scale_out.md index ccf78d0cdb..7b3a8edba3 100644 --- a/api/core/model_runtime/docs/zh_Hans/customizable_model_scale_out.md +++ b/api/core/model_runtime/docs/zh_Hans/customizable_model_scale_out.md @@ -127,7 +127,7 @@ provider_credential_schema: ```python def _invoke(self, model: str, credentials: dict, prompt_messages: list[PromptMessage], model_parameters: dict, - tools: Optional[list[PromptMessageTool]] = None, stop: Optional[List[str]] = None, + tools: Optional[list[PromptMessageTool]] = None, stop: Optional[list[str]] = None, stream: bool = True, user: Optional[str] = None) \ -> Union[LLMResult, Generator]: """ diff --git a/api/core/model_runtime/docs/zh_Hans/interfaces.md b/api/core/model_runtime/docs/zh_Hans/interfaces.md index 5bd505a0ee..743e575ded 100644 --- a/api/core/model_runtime/docs/zh_Hans/interfaces.md +++ b/api/core/model_runtime/docs/zh_Hans/interfaces.md @@ -128,7 +128,7 @@ class XinferenceProvider(Provider): ```python def _invoke(self, model: str, credentials: dict, prompt_messages: list[PromptMessage], model_parameters: dict, - tools: Optional[list[PromptMessageTool]] = None, stop: Optional[List[str]] = None, + tools: Optional[list[PromptMessageTool]] = None, stop: Optional[list[str]] = None, stream: bool = True, user: Optional[str] = None) \ -> Union[LLMResult, Generator]: """ diff --git a/api/core/model_runtime/docs/zh_Hans/predefined_model_scale_out.md b/api/core/model_runtime/docs/zh_Hans/predefined_model_scale_out.md index c90fb577ca..56f379a92f 100644 --- a/api/core/model_runtime/docs/zh_Hans/predefined_model_scale_out.md +++ b/api/core/model_runtime/docs/zh_Hans/predefined_model_scale_out.md @@ -77,7 +77,7 @@ pricing: # 价格信息 ```python def _invoke(self, model: str, credentials: dict, prompt_messages: list[PromptMessage], model_parameters: dict, - tools: Optional[list[PromptMessageTool]] = None, stop: Optional[List[str]] = None, + tools: Optional[list[PromptMessageTool]] = None, stop: Optional[list[str]] = None, stream: bool = True, user: Optional[str] = None) \ -> Union[LLMResult, Generator]: """ diff --git a/api/services/account_service.py b/api/services/account_service.py index 8342d4bf58..30580afdb5 100644 --- a/api/services/account_service.py +++ b/api/services/account_service.py @@ -243,7 +243,7 @@ class TenantService: return ta @staticmethod - def get_join_tenants(account: Account) -> List[Tenant]: + def get_join_tenants(account: Account) -> list[Tenant]: """Get account join tenants""" return db.session.query(Tenant).join( TenantAccountJoin, Tenant.id == TenantAccountJoin.tenant_id @@ -282,7 +282,7 @@ class TenantService: account.current_tenant_id = tenant_account_join.tenant_id @staticmethod - def get_tenant_members(tenant: Tenant) -> List[Account]: + def get_tenant_members(tenant: Tenant) -> list[Account]: """Get tenant members""" query = ( db.session.query(Account, TenantAccountJoin.role) @@ -303,7 +303,7 @@ class TenantService: return updated_accounts @staticmethod - def has_roles(tenant: Tenant, roles: List[TenantAccountJoinRole]) -> bool: + def has_roles(tenant: Tenant, roles: list[TenantAccountJoinRole]) -> bool: """Check if user has any of the given roles for a tenant""" if not all(isinstance(role, TenantAccountJoinRole) for role in roles): raise ValueError('all roles must be TenantAccountJoinRole')