chore: refurbish Python code by applying refurb linter rules (#8296)

This commit is contained in:
Bowen Liang
2024-09-12 15:50:49 +08:00
committed by GitHub
parent c69f5b07ba
commit 40fb4d16ef
105 changed files with 220 additions and 276 deletions

View File

@@ -544,7 +544,7 @@ class RegisterService:
"""Register account"""
try:
account = AccountService.create_account(
email=email, name=name, interface_language=language if language else languages[0], password=password
email=email, name=name, interface_language=language or languages[0], password=password
)
account.status = AccountStatus.ACTIVE.value if not status else status.value
account.initialized_at = datetime.now(timezone.utc).replace(tzinfo=None)

View File

@@ -81,13 +81,11 @@ class AppDslService:
raise ValueError("Missing app in data argument")
# get app basic info
name = args.get("name") if args.get("name") else app_data.get("name")
description = args.get("description") if args.get("description") else app_data.get("description", "")
icon_type = args.get("icon_type") if args.get("icon_type") else app_data.get("icon_type")
icon = args.get("icon") if args.get("icon") else app_data.get("icon")
icon_background = (
args.get("icon_background") if args.get("icon_background") else app_data.get("icon_background")
)
name = args.get("name") or app_data.get("name")
description = args.get("description") or app_data.get("description", "")
icon_type = args.get("icon_type") or app_data.get("icon_type")
icon = args.get("icon") or app_data.get("icon")
icon_background = args.get("icon_background") or app_data.get("icon_background")
use_icon_as_answer_icon = app_data.get("use_icon_as_answer_icon", False)
# import dsl and create app

View File

@@ -155,7 +155,7 @@ class DatasetService:
dataset.tenant_id = tenant_id
dataset.embedding_model_provider = embedding_model.provider if embedding_model else None
dataset.embedding_model = embedding_model.model if embedding_model else None
dataset.permission = permission if permission else DatasetPermissionEnum.ONLY_ME
dataset.permission = permission or DatasetPermissionEnum.ONLY_ME
db.session.add(dataset)
db.session.commit()
return dataset
@@ -681,11 +681,7 @@ class DocumentService:
"score_threshold_enabled": False,
}
dataset.retrieval_model = (
document_data.get("retrieval_model")
if document_data.get("retrieval_model")
else default_retrieval_model
)
dataset.retrieval_model = document_data.get("retrieval_model") or default_retrieval_model
documents = []
batch = time.strftime("%Y%m%d%H%M%S") + str(random.randint(100000, 999999))

View File

@@ -33,7 +33,7 @@ class HitTestingService:
# get retrieval model , if the model is not setting , using default
if not retrieval_model:
retrieval_model = dataset.retrieval_model if dataset.retrieval_model else default_retrieval_model
retrieval_model = dataset.retrieval_model or default_retrieval_model
all_documents = RetrievalService.retrieve(
retrieval_method=retrieval_model.get("search_method", "semantic_search"),
@@ -46,9 +46,7 @@ class HitTestingService:
reranking_model=retrieval_model.get("reranking_model", None)
if retrieval_model["reranking_enable"]
else None,
reranking_mode=retrieval_model.get("reranking_mode")
if retrieval_model.get("reranking_mode")
else "reranking_model",
reranking_mode=retrieval_model.get("reranking_mode") or "reranking_model",
weights=retrieval_model.get("weights", None),
)

View File

@@ -1,6 +1,7 @@
import logging
import mimetypes
import os
from pathlib import Path
from typing import Optional, cast
import requests
@@ -453,9 +454,8 @@ class ModelProviderService:
mimetype = mimetype or "application/octet-stream"
# read binary from file
with open(file_path, "rb") as f:
byte_data = f.read()
return byte_data, mimetype
byte_data = Path(file_path).read_bytes()
return byte_data, mimetype
def switch_preferred_provider(self, tenant_id: str, provider: str, preferred_provider_type: str) -> None:
"""

View File

@@ -1,6 +1,7 @@
import json
import logging
from os import path
from pathlib import Path
from typing import Optional
import requests
@@ -218,10 +219,9 @@ class RecommendedAppService:
return cls.builtin_data
root_path = current_app.root_path
with open(path.join(root_path, "constants", "recommended_apps.json"), encoding="utf-8") as f:
json_data = f.read()
data = json.loads(json_data)
cls.builtin_data = data
cls.builtin_data = json.loads(
Path(path.join(root_path, "constants", "recommended_apps.json")).read_text(encoding="utf-8")
)
return cls.builtin_data

View File

@@ -57,7 +57,7 @@ class TagService:
.all()
)
return tags if tags else []
return tags or []
@staticmethod
def save_tags(args: dict) -> Tag:

View File

@@ -1,5 +1,6 @@
import json
import logging
from pathlib import Path
from configs import dify_config
from core.helper.position_helper import is_filtered
@@ -183,8 +184,7 @@ class BuiltinToolManageService:
get tool provider icon and it's mimetype
"""
icon_path, mime_type = ToolManager.get_builtin_provider_icon(provider)
with open(icon_path, "rb") as f:
icon_bytes = f.read()
icon_bytes = Path(icon_path).read_bytes()
return icon_bytes, mime_type

View File

@@ -50,8 +50,8 @@ class WebsiteService:
excludes = options.get("excludes").split(",") if options.get("excludes") else []
params = {
"crawlerOptions": {
"includes": includes if includes else [],
"excludes": excludes if excludes else [],
"includes": includes or [],
"excludes": excludes or [],
"generateImgAltText": True,
"limit": options.get("limit", 1),
"returnOnlyUrls": False,

View File

@@ -63,11 +63,11 @@ class WorkflowConverter:
# create new app
new_app = App()
new_app.tenant_id = app_model.tenant_id
new_app.name = name if name else app_model.name + "(workflow)"
new_app.name = name or app_model.name + "(workflow)"
new_app.mode = AppMode.ADVANCED_CHAT.value if app_model.mode == AppMode.CHAT.value else AppMode.WORKFLOW.value
new_app.icon_type = icon_type if icon_type else app_model.icon_type
new_app.icon = icon if icon else app_model.icon
new_app.icon_background = icon_background if icon_background else app_model.icon_background
new_app.icon_type = icon_type or app_model.icon_type
new_app.icon = icon or app_model.icon
new_app.icon_background = icon_background or app_model.icon_background
new_app.enable_site = app_model.enable_site
new_app.enable_api = app_model.enable_api
new_app.api_rpm = app_model.api_rpm