jyapayne/dify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: add ast-grep rule to convert Optional[T] to T | None (#25560)

Browse source 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
This commit is contained in:
-LAN- 2025-09-15 13:06:33 +08:00 • committed by GitHub
commit bab4975809
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
394 changed files with 2555 additions and 2792 deletions
Download patch file Download diff file Expand all files Collapse all files

9
api/core/model_runtime/model_providers/__base/ai_model.py
View file

@ -1,7 +1,6 @@
import decimal
import hashlib
from threading import Lock
from typing import Optional
from pydantic import BaseModel, ConfigDict, Field
@ -99,7 +98,7 @@ class AIModel(BaseModel):
model_schema = self.get_model_schema(model, credentials)
# get price info from predefined model schema
price_config: Optional[PriceConfig] = None
price_config: PriceConfig | None = None
if model_schema and model_schema.pricing:
price_config = model_schema.pricing
@ -132,7 +131,7 @@ class AIModel(BaseModel):
currency=price_config.currency,
)
def get_model_schema(self, model: str, credentials: Optional[dict] = None) -> Optional[AIModelEntity]:
def get_model_schema(self, model: str, credentials: dict | None = None) -> AIModelEntity | None:
"""
Get model schema by model name and credentials
@ -171,7 +170,7 @@ class AIModel(BaseModel):
return schema
def get_customizable_model_schema_from_credentials(self, model: str, credentials: dict) -> Optional[AIModelEntity]:
def get_customizable_model_schema_from_credentials(self, model: str, credentials: dict) -> AIModelEntity | None:
"""
Get customizable model schema from credentials
@ -229,7 +228,7 @@ class AIModel(BaseModel):
return schema
def get_customizable_model_schema(self, model: str, credentials: dict) -> Optional[AIModelEntity]:
def get_customizable_model_schema(self, model: str, credentials: dict) -> AIModelEntity | None:
"""
Get customizable model schema

54
api/core/model_runtime/model_providers/__base/large_language_model.py
View file

@ -2,7 +2,7 @@ import logging
import time
import uuid
from collections.abc import Generator, Sequence
from typing import Optional, Union
from typing import Union
from pydantic import ConfigDict
@ -94,12 +94,12 @@ class LargeLanguageModel(AIModel):
model: str,
credentials: dict,
prompt_messages: list[PromptMessage],
model_parameters: Optional[dict] = None,
tools: Optional[list[PromptMessageTool]] = None,
stop: Optional[list[str]] = None,
model_parameters: dict | None = None,
tools: list[PromptMessageTool] | None = None,
stop: list[str] | None = None,
stream: bool = True,
user: Optional[str] = None,
callbacks: Optional[list[Callback]] = None,
user: str | None = None,
callbacks: list[Callback] | None = None,
) -> Union[LLMResult, Generator[LLMResultChunk, None, None]]:
"""
Invoke large language model
@ -243,11 +243,11 @@ class LargeLanguageModel(AIModel):
credentials: dict,
prompt_messages: Sequence[PromptMessage],
model_parameters: dict,
tools: Optional[list[PromptMessageTool]] = None,
stop: Optional[Sequence[str]] = None,
tools: list[PromptMessageTool] | None = None,
stop: Sequence[str] | None = None,
stream: bool = True,
user: Optional[str] = None,
callbacks: Optional[list[Callback]] = None,
user: str | None = None,
callbacks: list[Callback] | None = None,
) -> Generator[LLMResultChunk, None, None]:
"""
Invoke result generator
@ -328,7 +328,7 @@ class LargeLanguageModel(AIModel):
model: str,
credentials: dict,
prompt_messages: list[PromptMessage],
tools: Optional[list[PromptMessageTool]] = None,
tools: list[PromptMessageTool] | None = None,
) -> int:
"""
Get number of tokens for given prompt messages
@ -403,11 +403,11 @@ class LargeLanguageModel(AIModel):
credentials: dict,
prompt_messages: list[PromptMessage],
model_parameters: dict,
tools: Optional[list[PromptMessageTool]] = None,
stop: Optional[Sequence[str]] = None,
tools: list[PromptMessageTool] | None = None,
stop: Sequence[str] | None = None,
stream: bool = True,
user: Optional[str] = None,
callbacks: Optional[list[Callback]] = None,
user: str | None = None,
callbacks: list[Callback] | None = None,
):
"""
Trigger before invoke callbacks
@ -451,11 +451,11 @@ class LargeLanguageModel(AIModel):
credentials: dict,
prompt_messages: Sequence[PromptMessage],
model_parameters: dict,
tools: Optional[list[PromptMessageTool]] = None,
stop: Optional[Sequence[str]] = None,
tools: list[PromptMessageTool] | None = None,
stop: Sequence[str] | None = None,
stream: bool = True,
user: Optional[str] = None,
callbacks: Optional[list[Callback]] = None,
user: str | None = None,
callbacks: list[Callback] | None = None,
):
"""
Trigger new chunk callbacks
@ -498,11 +498,11 @@ class LargeLanguageModel(AIModel):
credentials: dict,
prompt_messages: Sequence[PromptMessage],
model_parameters: dict,
tools: Optional[list[PromptMessageTool]] = None,
stop: Optional[Sequence[str]] = None,
tools: list[PromptMessageTool] | None = None,
stop: Sequence[str] | None = None,
stream: bool = True,
user: Optional[str] = None,
callbacks: Optional[list[Callback]] = None,
user: str | None = None,
callbacks: list[Callback] | None = None,
):
"""
Trigger after invoke callbacks
@ -548,11 +548,11 @@ class LargeLanguageModel(AIModel):
credentials: dict,
prompt_messages: list[PromptMessage],
model_parameters: dict,
tools: Optional[list[PromptMessageTool]] = None,
stop: Optional[Sequence[str]] = None,
tools: list[PromptMessageTool] | None = None,
stop: Sequence[str] | None = None,
stream: bool = True,
user: Optional[str] = None,
callbacks: Optional[list[Callback]] = None,
user: str | None = None,
callbacks: list[Callback] | None = None,
):
"""
Trigger invoke error callbacks

3
api/core/model_runtime/model_providers/__base/moderation_model.py
View file

@ -1,5 +1,4 @@
import time
from typing import Optional
from pydantic import ConfigDict
@ -18,7 +17,7 @@ class ModerationModel(AIModel):
# pydantic configs
model_config = ConfigDict(protected_namespaces=())
def invoke(self, model: str, credentials: dict, text: str, user: Optional[str] = None) -> bool:
def invoke(self, model: str, credentials: dict, text: str, user: str | None = None) -> bool:
"""
Invoke moderation model

8
api/core/model_runtime/model_providers/__base/rerank_model.py
View file

@ -1,5 +1,3 @@
from typing import Optional
from core.model_runtime.entities.model_entities import ModelType
from core.model_runtime.entities.rerank_entities import RerankResult
from core.model_runtime.model_providers.__base.ai_model import AIModel
@ -19,9 +17,9 @@ class RerankModel(AIModel):
credentials: dict,
query: str,
docs: list[str],
score_threshold: Optional[float] = None,
top_n: Optional[int] = None,
user: Optional[str] = None,
score_threshold: float | None = None,
top_n: int | None = None,
user: str | None = None,
) -> RerankResult:
"""
Invoke rerank model

4
api/core/model_runtime/model_providers/__base/speech2text_model.py
View file

@ -1,4 +1,4 @@
from typing import IO, Optional
from typing import IO
from pydantic import ConfigDict
@ -17,7 +17,7 @@ class Speech2TextModel(AIModel):
# pydantic configs
model_config = ConfigDict(protected_namespaces=())
def invoke(self, model: str, credentials: dict, file: IO[bytes], user: Optional[str] = None) -> str:
def invoke(self, model: str, credentials: dict, file: IO[bytes], user: str | None = None) -> str:
"""
Invoke speech to text model

4
api/core/model_runtime/model_providers/__base/text_embedding_model.py
View file

@ -1,5 +1,3 @@
from typing import Optional
from pydantic import ConfigDict
from core.entities.embedding_type import EmbeddingInputType
@ -24,7 +22,7 @@ class TextEmbeddingModel(AIModel):
model: str,
credentials: dict,
texts: list[str],
user: Optional[str] = None,
user: str | None = None,
input_type: EmbeddingInputType = EmbeddingInputType.DOCUMENT,
) -> TextEmbeddingResult:
"""

4
api/core/model_runtime/model_providers/__base/tokenizers/gpt2_tokenizer.py
View file

@ -1,10 +1,10 @@
import logging
from threading import Lock
from typing import Any, Optional
from typing import Any
logger = logging.getLogger(__name__)
_tokenizer: Optional[Any] = None
_tokenizer: Any | None = None
_lock = Lock()

5
api/core/model_runtime/model_providers/__base/tts_model.py
View file

@ -1,6 +1,5 @@
import logging
from collections.abc import Iterable
from typing import Optional
from pydantic import ConfigDict
@ -28,7 +27,7 @@ class TTSModel(AIModel):
credentials: dict,
content_text: str,
voice: str,
user: Optional[str] = None,
user: str | None = None,
) -> Iterable[bytes]:
"""
Invoke large language model
@ -56,7 +55,7 @@ class TTSModel(AIModel):
except Exception as e:
raise self._transform_invoke_error(e)
def get_tts_model_voices(self, model: str, credentials: dict, language: Optional[str] = None):
def get_tts_model_voices(self, model: str, credentials: dict, language: str | None = None):
"""
Retrieves the list of voices supported by a given text-to-speech (TTS) model.

7
api/core/model_runtime/model_providers/model_provider_factory.py
View file

@ -2,7 +2,6 @@ import hashlib
import logging
from collections.abc import Sequence
from threading import Lock
from typing import Optional
import contexts
from core.model_runtime.entities.model_entities import AIModelEntity, ModelType
@ -206,9 +205,9 @@ class ModelProviderFactory:
def get_models(
self,
*,
provider: Optional[str] = None,
model_type: Optional[ModelType] = None,
provider_configs: Optional[list[ProviderConfig]] = None,
provider: str | None = None,
model_type: ModelType | None = None,
provider_configs: list[ProviderConfig] | None = None,
) -> list[SimpleProviderEntity]:
"""
Get all models for given model type