Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

ci: enable Ruff SIM108 (#44113)

Asuka Minatocd8301a46873
diff --git a/api/.ruff.toml b/api/.ruff.toml
index 7d5d0185f24..d5e57ffb0b4 100644
--- a/api/.ruff.toml
+++ b/api/.ruff.toml
@@ -71,7 +71,6 @@ ignore = [
"PT011", # pytest-raises-too-broad
"SIM102", # collapsible-if
"SIM105", # suppressible-exception
- "SIM108", # if-else-block-instead-of-if-exp
"SIM117", # multiple-with-statements
]
diff --git a/api/controllers/common/agent_access.py b/api/controllers/common/agent_access.py
index 21a6091bba9..52254310c10 100644
--- a/api/controllers/common/agent_access.py
+++ b/api/controllers/common/agent_access.py
@@ -71,9 +71,6 @@ def resolve_agent_access_filter(
if has_agent_list_permission(override.permission_keys)
}
- if whitelist_scope.unrestricted:
- accessible_agent_ids = permission_agent_ids
- else:
- accessible_agent_ids = set(whitelist_scope.resource_ids)
+ accessible_agent_ids = permission_agent_ids if whitelist_scope.unrestricted else set(whitelist_scope.resource_ids)
return AgentAccessFilter(accessible_agent_ids=accessible_agent_ids)
diff --git a/api/controllers/common/helpers.py b/api/controllers/common/helpers.py
index 23d5e2c56b7..691a755f935 100644
--- a/api/controllers/common/helpers.py
+++ b/api/controllers/common/helpers.py
@@ -3,10 +3,7 @@ import urllib.parse
def decode_remote_url(url: str, query_string: bytes | str = b"") -> str:
decoded_url = urllib.parse.unquote(url)
- if isinstance(query_string, bytes):
- raw_query = query_string.decode()
- else:
- raw_query = query_string
+ raw_query = query_string.decode() if isinstance(query_string, bytes) else query_string
if not raw_query:
return decoded_url
diff --git a/api/controllers/console/app/wraps.py b/api/controllers/console/app/wraps.py
index f4bd0c10c97..112e133b997 100644
--- a/api/controllers/console/app/wraps.py
+++ b/api/controllers/console/app/wraps.py
@@ -117,10 +117,7 @@ def get_app_model[**P, R](
app_mode = AppMode.value_of(app_model.mode)
if mode is not None:
- if isinstance(mode, list):
- modes = mode
- else:
- modes = [mode]
+ modes = mode if isinstance(mode, list) else [mode]
if app_mode not in modes:
mode_values = {m.value for m in modes}
diff --git a/api/controllers/openapi/workflow_events.py b/api/controllers/openapi/workflow_events.py
index 3e8c4922af8..a63303263de 100644
--- a/api/controllers/openapi/workflow_events.py
+++ b/api/controllers/openapi/workflow_events.py
@@ -125,10 +125,7 @@ class OpenApiWorkflowEventsApi(Resource):
else:
msg_generator = MessageGenerator()
generator: BaseAppGenerator
- if app_mode == AppMode.ADVANCED_CHAT:
- generator = AdvancedChatAppGenerator()
- else:
- generator = WorkflowAppGenerator()
+ generator = AdvancedChatAppGenerator() if app_mode == AppMode.ADVANCED_CHAT else WorkflowAppGenerator()
include_state_snapshot = query.include_state_snapshot
continue_on_pause = query.continue_on_pause
diff --git a/api/core/file/remote_fetcher.py b/api/core/file/remote_fetcher.py
index c602e1f6d23..584d6ef7f8e 100644
--- a/api/core/file/remote_fetcher.py
+++ b/api/core/file/remote_fetcher.py
@@ -143,10 +143,7 @@ def _parse_signed_file_path(path: str) -> _SignedFileUrl | None:
upload_match = _UPLOAD_FILE_PATH_PATTERN.match(path)
if upload_match:
preview_kind: Literal["file-preview", "image-preview"]
- if upload_match.group("preview_kind") == "image-preview":
- preview_kind = "image-preview"
- else:
- preview_kind = "file-preview"
+ preview_kind = "image-preview" if upload_match.group("preview_kind") == "image-preview" else "file-preview"
return _SignedFileUrl(
file_id=upload_match.group("file_id"),
diff --git a/api/core/llm_generator/llm_generator.py b/api/core/llm_generator/llm_generator.py
index 06272037c27..d0189d62355 100644
--- a/api/core/llm_generator/llm_generator.py
+++ b/api/core/llm_generator/llm_generator.py
@@ -75,10 +75,7 @@ def _normalize_completion_params(completion_params: dict[str, object]) -> tuple[
"""
normalized_parameters = dict(completion_params)
stop_value = normalized_parameters.pop("stop", [])
- if isinstance(stop_value, list) and all(isinstance(item, str) for item in stop_value):
- stop = stop_value
- else:
- stop = []
+ stop = stop_value if isinstance(stop_value, list) and all(isinstance(item, str) for item in stop_value) else []
for token_limit_key in ("max_tokens", "max_output_tokens"):
token_limit = normalized_parameters.get(token_limit_key)
@@ -276,10 +273,7 @@ class LLMGenerator:
answer = query
else:
output = result_dict.get("Your Output")
- if isinstance(output, str) and output.strip():
- answer = output.strip()
- else:
- answer = query
+ answer = output.strip() if isinstance(output, str) and output.strip() else query
name = answer.strip()
diff --git a/api/core/memory/token_buffer_memory.py b/api/core/memory/token_buffer_memory.py
index 3d0436931cf..bb0d50357ff 100644
--- a/api/core/memory/token_buffer_memory.py
+++ b/api/core/memory/token_buffer_memory.py
@@ -217,10 +217,7 @@ class TokenBufferMemory:
# fetch limited messages, and return reversed
stmt = select(Message).where(Message.conversation_id == conversation.id).order_by(Message.created_at.desc())
- if message_limit and message_limit > 0:
- message_limit = min(message_limit, 500)
- else:
- message_limit = 500
+ message_limit = min(message_limit, 500) if message_limit and message_limit > 0 else 500
msg_limit_stmt = stmt.limit(message_limit)
diff --git a/api/core/moderation/output_moderation.py b/api/core/moderation/output_moderation.py
index a97e3d4253c..60e53cbe676 100644
--- a/api/core/moderation/output_moderation.py
+++ b/api/core/moderation/output_moderation.py
@@ -55,10 +55,7 @@ class OutputModeration(BaseModel):
if not result or not result.flagged:
return completion, False
- if result.action == ModerationAction.DIRECT_OUTPUT:
- final_output = result.preset_response
- else:
- final_output = result.text
+ final_output = result.preset_response if result.action == ModerationAction.DIRECT_OUTPUT else result.text
if public_event:
self.queue_manager.publish(
diff --git a/api/core/plugin/impl/base.py b/api/core/plugin/impl/base.py
index decce60c493..6448f58be9d 100644
--- a/api/core/plugin/impl/base.py
+++ b/api/core/plugin/impl/base.py
@@ -187,10 +187,7 @@ class BasePluginClient:
data if isinstance(data, (bytes, str, dict)) or data is None else None
)
if isinstance(data, dict):
- if prepared_headers.get("Content-Type") == "application/json":
- prepared_data = json.dumps(data)
- else:
- prepared_data = data
+ prepared_data = json.dumps(data) if prepared_headers.get("Content-Type") == "application/json" else data
return str(url), prepared_headers, prepared_data, params, files
diff --git a/api/core/rag/datasource/retrieval_service.py b/api/core/rag/datasource/retrieval_service.py
index 144f63af9e8..b5e8bb3c93e 100644
--- a/api/core/rag/datasource/retrieval_service.py
+++ b/api/core/rag/datasource/retrieval_service.py
@@ -671,10 +671,7 @@ class RetrievalService:
child_chunk_details: list[ChildChunkDetail] = []
for child_chunk in child_chunks:
child_document: Document | None = doc_to_document_map.get(child_chunk.index_node_id)
- if child_document:
- child_score = child_document.metadata.get("score", 0.0)
- else:
- child_score = 0.0
+ child_score = child_document.metadata.get("score", 0.0) if child_document else 0.0
child_chunk_detail: ChildChunkDetail = {
"id": child_chunk.id,
"content": child_chunk.content,
diff --git a/api/core/rag/extractor/blob/blob.py b/api/core/rag/extractor/blob/blob.py
index aa7137cc4ae..3a4b2f105ab 100644
--- a/api/core/rag/extractor/blob/blob.py
+++ b/api/core/rag/extractor/blob/blob.py
@@ -109,10 +109,7 @@ class Blob(BaseModel):
Returns:
Blob instance
"""
- if mime_type is None and guess_type:
- _mimetype = mimetypes.guess_type(path)[0]
- else:
- _mimetype = mime_type
+ _mimetype = mimetypes.guess_type(path)[0] if mime_type is None and guess_type else mime_type
# We do not load the data immediately, instead we treat the blob as a
# reference to the underlying data.
return cls(data=None, mimetype=_mimetype, encoding=encoding, path=path)
diff --git a/api/core/rag/extractor/extract_processor.py b/api/core/rag/extractor/extract_processor.py
index a8d83d57d83..fa9d0437bdd 100644
--- a/api/core/rag/extractor/extract_processor.py
+++ b/api/core/rag/extractor/extract_processor.py
@@ -96,10 +96,7 @@ class ExtractProcessor:
if filename_match:
filename = unquote(filename_match.group(1))
match = re.search(r"\.(\w+)$", filename)
- if match:
- suffix = "." + match.group(1)
- else:
- suffix = ""
+ suffix = "." + match.group(1) if match else ""
# https://stackoverflow.com/questions/26541416/generate-temporary-file-names-without-creating-actual-file-in-python#comment90414256_26541521
# Generate a temporary filename under the created temp_dir and ensure the directory exists
file_path = f"{temp_dir}/{next(tempfile._get_candidate_names())}{suffix}" # type: ignore
diff --git a/api/core/rag/extractor/notion_extractor.py b/api/core/rag/extractor/notion_extractor.py
index bffeca3721f..8aa6da77616 100644
--- a/api/core/rag/extractor/notion_extractor.py
+++ b/api/core/rag/extractor/notion_extractor.py
@@ -127,10 +127,7 @@ class NotionExtractor(BaseExtractor):
# join them all so no part of the value is dropped.
value = "".join(segment.get("plain_text", "") for segment in property_value[type])
elif type in {"select", "status"}:
- if property_value[type]:
- value = property_value[type]["name"]
- else:
- value = ""
+ value = property_value[type]["name"] if property_value[type] else ""
else:
value = property_value[type]
data[property_name] = value
diff --git a/api/core/rag/retrieval/dataset_retrieval.py b/api/core/rag/retrieval/dataset_retrieval.py
index 04a13af66a8..d81f26f88e9 100644
--- a/api/core/rag/retrieval/dataset_retrieval.py
+++ b/api/core/rag/retrieval/dataset_retrieval.py
@@ -470,10 +470,7 @@ class DatasetRetrieval:
planning_strategy = PlanningStrategy.ROUTER
available_datasets = self._get_available_datasets(tenant_id, dataset_ids)
- if inputs:
- inputs = {key: str(value) for key, value in inputs.items()}
- else:
- inputs = {}
+ inputs = {key: str(value) for key, value in inputs.items()} if inputs else {}
available_datasets_ids = [dataset.id for dataset in available_datasets]
metadata_filter_document_ids, metadata_condition = self.get_metadata_filter_condition(
session,
@@ -566,10 +563,7 @@ class DatasetRetrieval:
segment_content = sign_segment_content(segment, session=session)
# If summary exists, prepend it to the content
- if record.summary:
- final_content = f"{record.summary}\n{segment_content}"
- else:
- final_content = segment_content
+ final_content = f"{record.summary}\n{segment_content}" if record.summary else segment_content
document_context_list.append(
DocumentContext(
diff --git a/api/core/rag/splitter/fixed_text_splitter.py b/api/core/rag/splitter/fixed_text_splitter.py
index 5f91b2f1f78..e6b0e80d4f1 100644
--- a/api/core/rag/splitter/fixed_text_splitter.py
+++ b/api/core/rag/splitter/fixed_text_splitter.py
@@ -41,10 +41,7 @@ class FixedRecursiveCharacterTextSplitter(EnhanceRecursiveCharacterTextSplitter)
@override
def split_text(self, text: str) -> list[str]:
"""Split incoming text and return chunks."""
- if self._fixed_separator:
- chunks = text.split(self._fixed_separator)
- else:
- chunks = [text]
+ chunks = text.split(self._fixed_separator) if self._fixed_separator else [text]
final_chunks = []
chunks_lengths = self._length_function(chunks)
@@ -74,18 +71,12 @@ class FixedRecursiveCharacterTextSplitter(EnhanceRecursiveCharacterTextSplitter)
# Now that we have the separator, split the text
if separator:
- if separator == " ":
- splits = re.split(r" +", text)
- else:
- splits = text.split(separator)
+ splits = re.split(r" +", text) if separator == " " else text.split(separator)
if self._keep_separator:
splits = [s + separator for s in splits[:-1]] + splits[-1:]
else:
splits = list(text)
- if separator == "\n":
- splits = [s for s in splits if s != ""]
- else:
- splits = [s for s in splits if (s not in {"", "\n"})]
+ splits = [s for s in splits if s != ""] if separator == "\n" else [s for s in splits if s not in {"", "\n"}]
_good_splits = []
_good_splits_lengths = [] # cache the lengths of the splits
_separator = "" if self._keep_separator else separator
diff --git a/api/core/tools/utils/dataset_retriever/dataset_retriever_tool.py b/api/core/tools/utils/dataset_retriever/dataset_retriever_tool.py
index 715ab7453a0..ac8d12b19f2 100644
--- a/api/core/tools/utils/dataset_retriever/dataset_retriever_tool.py
+++ b/api/core/tools/utils/dataset_retriever/dataset_retriever_tool.py
@@ -78,10 +78,7 @@ class DatasetRetrieverTool(DatasetRetrieverBaseTool):
self.retrieve_config.metadata_filtering_conditions,
self.inputs,
)
- if metadata_filter_document_ids:
- document_ids_filter = metadata_filter_document_ids.get(dataset.id, [])
- else:
- document_ids_filter = None
+ document_ids_filter = metadata_filter_document_ids.get(dataset.id, []) if metadata_filter_document_ids else None
if dataset.provider == "external":
results: list[RetrievalDocument] = []
external_documents = ExternalDatasetService.fetch_external_knowledge_retrieval(
@@ -183,10 +180,7 @@ class DatasetRetrieverTool(DatasetRetrieverBaseTool):
segment_content = sign_segment_content(segment, session=session)
# If summary exists, prepend it to the content
- if record.summary:
- final_content = f"{record.summary}\n{segment_content}"
- else:
- final_content = segment_content
+ final_content = f"{record.summary}\n{segment_content}" if record.summary else segment_content
document_context_list.append(
DocumentContext(
diff --git a/api/core/tools/utils/web_reader_tool.py b/api/core/tools/utils/web_reader_tool.py
index 056703413af..d808adce63b 100644
--- a/api/core/tools/utils/web_reader_tool.py
+++ b/api/core/tools/utils/web_reader_tool.py
@@ -70,10 +70,7 @@ def get_url(url: str, user_agent: str | None = None) -> str:
# Detect encoding using charset_normalizer
detected_encoding = charset_normalizer.from_bytes(response.content).best()
- if detected_encoding:
- encoding = detected_encoding.encoding
- else:
- encoding = "utf-8"
+ encoding = detected_encoding.encoding if detected_encoding else "utf-8"
if encoding:
try:
content = response.content.decode(encoding)
diff --git a/api/enterprise/telemetry/exporter.py b/api/enterprise/telemetry/exporter.py
index 20ad45e017e..f7c8bad52c8 100644
--- a/api/enterprise/telemetry/exporter.py
+++ b/api/enterprise/telemetry/exporter.py
@@ -61,10 +61,7 @@ def _parse_otlp_headers(raw: str) -> dict[str, str]:
def _datetime_to_ns(dt: datetime) -> int:
"""Convert a datetime to nanoseconds since epoch (OTEL convention)."""
# Ensure we always interpret naive datetimes as UTC instead of local time.
- if dt.tzinfo is None:
- dt = dt.replace(tzinfo=UTC)
- else:
- dt = dt.astimezone(UTC)
+ dt = dt.replace(tzinfo=UTC) if dt.tzinfo is None else dt.astimezone(UTC)
return int(dt.timestamp() * 1_000_000_000)
diff --git a/api/extensions/logstore/repositories/logstore_api_workflow_node_execution_repository.py b/api/extensions/logstore/repositories/logstore_api_workflow_node_execution_repository.py
index 7803297aa11..846429f8c02 100644
--- a/api/extensions/logstore/repositories/logstore_api_workflow_node_execution_repository.py
+++ b/api/extensions/logstore/repositories/logstore_api_workflow_node_execution_repository.py
@@ -220,10 +220,7 @@ class LogstoreAPIWorkflowNodeExecutionRepository(DifyAPIWorkflowNodeExecutionRep
# For each id, select the row with max log_version
deduplicated_results = []
for rows in id_to_results.values():
- if len(rows) > 1:
- max_row = max(rows, key=lambda x: int(x.get("log_version", 0)))
- else:
- max_row = rows[0]
+ max_row = max(rows, key=lambda x: int(x.get("log_version", 0))) if len(rows) > 1 else rows[0]
deduplicated_results.append(max_row)
else:
# For PG mode, results are already deduplicated by the SQL query
@@ -325,10 +322,7 @@ class LogstoreAPIWorkflowNodeExecutionRepository(DifyAPIWorkflowNodeExecutionRep
# For each id, select the row with max log_version
for rows in id_to_results.values():
- if len(rows) > 1:
- max_row = max(rows, key=lambda x: int(x.get("log_version", 0)))
- else:
- max_row = rows[0]
+ max_row = max(rows, key=lambda x: int(x.get("log_version", 0))) if len(rows) > 1 else rows[0]
model = _dict_to_workflow_node_execution_model(max_row)
if model and model.id: # Ensure model is valid
diff --git a/api/extensions/storage/clickzetta_volume/clickzetta_volume_storage.py b/api/extensions/storage/clickzetta_volume/clickzetta_volume_storage.py
index 59d8ffa373e..fb70127b9d4 100644
--- a/api/extensions/storage/clickzetta_volume/clickzetta_volume_storage.py
+++ b/api/extensions/storage/clickzetta_volume/clickzetta_volume_storage.py
@@ -191,11 +191,8 @@ class ClickZettaVolumeStorage(BaseStorage):
# Only use TABLE VOLUME for actual dataset-specific paths
# like "dataset_12345/file.pdf" or paths with dataset_ prefix
- if dataset_id:
- table_name = f"{self._config.table_prefix}{dataset_id}"
- else:
- # Default table name for generic operations
- table_name = "default_dataset"
+ # Default table name for generic operations
+ table_name = f"{self._config.table_prefix}{dataset_id}" if dataset_id else "default_dataset"
return f"TABLE VOLUME {table_name}"
elif self._config.volume_type == "external":
return f"VOLUME {self._config.volume_name}"
@@ -517,10 +514,7 @@ class ClickZettaVolumeStorage(BaseStorage):
else:
sql = f"LIST {volume_prefix} SUBDIRECTORY '{self._config.dify_prefix}'"
else:
- if path:
- sql = f"LIST {volume_prefix} SUBDIRECTORY '{path}'"
- else:
- sql = f"LIST {volume_prefix}"
+ sql = f"LIST {volume_prefix} SUBDIRECTORY '{path}'" if path else f"LIST {volume_prefix}"
rows = self._execute_sql(sql, fetch=True)
diff --git a/api/libs/broadcast_channel/redis/streams_channel.py b/api/libs/broadcast_channel/redis/streams_channel.py
index bdf73792187..1d68eb179a4 100644
--- a/api/libs/broadcast_channel/redis/streams_channel.py
+++ b/api/libs/broadcast_channel/redis/streams_channel.py
@@ -202,10 +202,7 @@ class _StreamsSubscription(Subscription):
self._start_if_needed()
try:
- if timeout is None:
- item = self._queue.get()
- else:
- item = self._queue.get(timeout=timeout)
+ item = self._queue.get() if timeout is None else self._queue.get(timeout=timeout)
except queue.Empty:
return None
diff --git a/api/providers/vdb/vdb-alibabacloud-mysql/src/dify_vdb_alibabacloud_mysql/alibabacloud_mysql_vector.py b/api/providers/vdb/vdb-alibabacloud-mysql/src/dify_vdb_alibabacloud_mysql/alibabacloud_mysql_vector.py
index ddce5abc620..b08471a0588 100644
--- a/api/providers/vdb/vdb-alibabacloud-mysql/src/dify_vdb_alibabacloud_mysql/alibabacloud_mysql_vector.py
+++ b/api/providers/vdb/vdb-alibabacloud-mysql/src/dify_vdb_alibabacloud_mysql/alibabacloud_mysql_vector.py
@@ -262,13 +262,10 @@ class AlibabaCloudMySQLVector(BaseVector):
try:
distance = float(record["distance"])
# Convert distance to similarity score
- if self.distance_function == "cosine":
- # For cosine distance: similarity = 1 - distance
- similarity = 1.0 - distance
- else:
- # For euclidean distance: use inverse relationship
- # similarity = 1 / (1 + distance)
- similarity = 1.0 / (1.0 + distance)
+ # For cosine distance: similarity = 1 - distance
+ # For euclidean distance: use inverse relationship
+ # similarity = 1 / (1 + distance)
+ similarity = 1.0 - distance if self.distance_function == "cosine" else 1.0 / (1.0 + distance)
metadata = parse_metadata_json(record["meta"])
metadata["score"] = similarity
diff --git a/api/providers/vdb/vdb-weaviate/src/dify_vdb_weaviate/weaviate_vector.py b/api/providers/vdb/vdb-weaviate/src/dify_vdb_weaviate/weaviate_vector.py
index 73d31a1a802..dba9b4bbedf 100644
--- a/api/providers/vdb/vdb-weaviate/src/dify_vdb_weaviate/weaviate_vector.py
+++ b/api/providers/vdb/vdb-weaviate/src/dify_vdb_weaviate/weaviate_vector.py
@@ -531,10 +531,7 @@ class WeaviateVector(BaseVector):
for obj in res.objects:
properties = dict(obj.properties or {})
text = properties.pop(Field.TEXT_KEY.value, "")
- if obj.metadata and obj.metadata.distance is not None:
- distance = obj.metadata.distance
- else:
- distance = 1.0
+ distance = obj.metadata.distance if obj.metadata and obj.metadata.distance is not None else 1.0
score = 1.0 - distance
if score > score_threshold:
diff --git a/api/repositories/app/console_repository.py b/api/repositories/app/console_repository.py
index bffca439feb..f9753a01486 100644
--- a/api/repositories/app/console_repository.py
+++ b/api/repositories/app/console_repository.py
@@ -774,10 +774,7 @@ class ConsoleAppRepository(ConsoleApps, DiscoveryApps, RelatedApps):
app.name = args["name"]
app.description = args["description"]
icon_type = args.get("icon_type")
- if icon_type is None:
- resolved_icon_type = app.icon_type
- else:
- resolved_icon_type = IconType(icon_type)
+ resolved_icon_type = app.icon_type if icon_type is None else IconType(icon_type)
app.icon_type = resolved_icon_type
app.icon = args["icon"]
diff --git a/api/repositories/sqlalchemy_execution_extra_content_repository.py b/api/repositories/sqlalchemy_execution_extra_content_repository.py
index f20ee7f3f58..5ba8793417b 100644
--- a/api/repositories/sqlalchemy_execution_extra_content_repository.py
+++ b/api/repositories/sqlalchemy_execution_extra_content_repository.py
@@ -124,10 +124,7 @@ class SQLAlchemyExecutionExtraContentRepository(ExecutionExtraContentRepository)
display_in_ui = bool(form_definition.display_in_ui)
submitted = form.submitted_at is not None or form.status == HumanInputFormStatus.SUBMITTED
- if not submitted:
- form_token = self._resolve_form_token(recipients_by_form_id.get(form.id, []))
- else:
- form_token = None
+ form_token = self._resolve_form_token(recipients_by_form_id.get(form.id, [])) if not submitted else None
form_definition_domain_model = HumanInputFormDefinition(
form_id=form.id,
node_id=form.node_id,
diff --git a/api/services/app_dsl_service.py b/api/services/app_dsl_service.py
index 076343c3258..2ef385d77f8 100644
--- a/api/services/app_dsl_service.py
+++ b/api/services/app_dsl_service.py
@@ -723,10 +723,7 @@ class AppDslService:
workflow_service = WorkflowService()
current_draft_workflow = workflow_service.get_draft_workflow(app_model=app, session=self._session)
- if current_draft_workflow:
- unique_hash = current_draft_workflow.unique_hash
- else:
- unique_hash = None
+ unique_hash = current_draft_workflow.unique_hash if current_draft_workflow else None
graph = workflow_data.get("graph", {})
if not isinstance(graph, dict):
raise ValueError("Workflow graph must be a mapping")
diff --git a/api/services/app_service.py b/api/services/app_service.py
index 5d5ce4a0825..64af129f2c2 100644
--- a/api/services/app_service.py
+++ b/api/services/app_service.py
@@ -700,10 +700,7 @@ class AppService:
app.name = args["name"]
app.description = args["description"]
icon_type = args.get("icon_type")
- if icon_type is None:
- resolved_icon_type = app.icon_type
- else:
- resolved_icon_type = IconType(icon_type)
+ resolved_icon_type = app.icon_type if icon_type is None else IconType(icon_type)
app.icon_type = resolved_icon_type
app.icon = args["icon"]
diff --git a/api/services/knowledge/dataset_service.py b/api/services/knowledge/dataset_service.py
index 5c1c4d80682..5259e99839d 100644
--- a/api/services/knowledge/dataset_service.py
+++ b/api/services/knowledge/dataset_service.py
@@ -2515,10 +2515,7 @@ class DocumentService:
"only_main_content": website_info.only_main_content,
"mode": "crawl",
}
- if len(url) > 255:
- document_name = url[:200] + "..."
- else:
- document_name = url
+ document_name = url[:200] + "..." if len(url) > 255 else url
document = DocumentService.build_document(
dataset,
dataset_process_rule.id,
diff --git a/api/services/knowledge/external/service.py b/api/services/knowledge/external/service.py
index 722ebb2e752..ae3ea393e06 100644
--- a/api/services/knowledge/external/service.py
+++ b/api/services/knowledge/external/service.py
@@ -261,10 +261,7 @@ class ExternalDatasetService:
@staticmethod
def assembling_headers(authorization: Authorization, headers: dict[str, Any] | None = None) -> dict[str, Any]:
authorization = deepcopy(authorization)
- if headers:
- headers = deepcopy(headers)
- else:
- headers = {}
+ headers = deepcopy(headers) if headers else {}
if authorization.type == "api-key":
if authorization.config is None:
raise ValueError("authorization config is required")
diff --git a/api/services/rag_pipeline/rag_pipeline.py b/api/services/rag_pipeline/rag_pipeline.py
index a2743db07b0..ad0b03d629f 100644
--- a/api/services/rag_pipeline/rag_pipeline.py
+++ b/api/services/rag_pipeline/rag_pipeline.py
@@ -1595,10 +1595,7 @@ class RagPipelineService:
continue
variables = workflow.rag_pipeline_variables
- if variables:
- variables_map = {item["variable"]: item for item in variables}
- else:
- variables_map = {}
+ variables_map = {item["variable"]: item for item in variables} if variables else {}
datasource_parameters = datasource_node_data.get("datasource_parameters", {})
user_input_variables_keys = []
diff --git a/api/services/remote_file_service.py b/api/services/remote_file_service.py
index 2d940abfd86..efed48c73d2 100644
--- a/api/services/remote_file_service.py
+++ b/api/services/remote_file_service.py
@@ -118,10 +118,7 @@ class RemoteFileService:
):
raise FileTooLargeError()
- if response.request.method == "GET":
- content = response.content
- else:
- content = self._fetch_content(url=url)
+ content = response.content if response.request.method == "GET" else self._fetch_content(url=url)
upload_file = self._files.upload_file(
filename=file_info.filename,
diff --git a/api/services/retention/workflow_run/archive_paid_plan_workflow_run.py b/api/services/retention/workflow_run/archive_paid_plan_workflow_run.py
index 46817f4c6b3..5e4821c83c8 100644
--- a/api/services/retention/workflow_run/archive_paid_plan_workflow_run.py
+++ b/api/services/retention/workflow_run/archive_paid_plan_workflow_run.py
@@ -325,10 +325,7 @@ class WorkflowRunArchiver:
# Initialize archive storage (will raise if not configured)
try:
- if not self.dry_run:
- storage = get_archive_storage()
- else:
- storage = None
+ storage = get_archive_storage() if not self.dry_run else None
except ArchiveStorageNotConfiguredError as e:
click.echo(click.style(f"Archive storage not configured: {e}", fg="red"))
return summary
diff --git a/api/services/workflow_draft_variable_service.py b/api/services/workflow_draft_variable_service.py
index e0acab10def..5f010c8ca85 100644
--- a/api/services/workflow_draft_variable_service.py
+++ b/api/services/workflow_draft_variable_service.py
@@ -1023,10 +1023,7 @@ class DraftVariableSaver:
self._node_type,
)
continue
- if isinstance(value, Segment):
- value_seg = value
- else:
- value_seg = _build_segment_for_serialized_values(value)
+ value_seg = value if isinstance(value, Segment) else _build_segment_for_serialized_values(value)
draft_vars.append(
self._create_draft_variable(
name=name,
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes.py b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes.py
index a4ca24803ce..b307a26c28f 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes.py
@@ -202,10 +202,7 @@ class MockLLMNode(MockNodeMixin, LLMNode):
words = text.split(" ")
for i, word in enumerate(words):
# Add space before word (except for first word) to reconstruct text properly
- if i > 0:
- chunk = " " + word
- else:
- chunk = word
+ chunk = " " + word if i > 0 else word
yield StreamChunkEvent(
selector=[self._node_id, "text"],