estel/dify
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore(api/services): apply ruff reformatting (#7599)

Browse Source 
Co-authored-by: -LAN- <laipz8200@outlook.com>
This commit is contained in:
Bowen Liang
2024-08-26 13:43:57 +08:00
committed by GitHub
parent 979422cdc6
commit 17fd773a30
49 changed files with 2630 additions and 2655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
api/services/recommended_app_service.py
View File

@@ -16,7 +16,6 @@ logger = logging.getLogger(__name__)
class RecommendedAppService:
builtin_data: Optional[dict] = None
@classmethod
@@ -27,21 +26,21 @@ class RecommendedAppService:
:return:
"""
mode = dify_config.HOSTED_FETCH_APP_TEMPLATES_MODE
if mode == 'remote':
if mode == "remote":
try:
result = cls._fetch_recommended_apps_from_dify_official(language)
except Exception as e:
logger.warning(f'fetch recommended apps from dify official failed: {e}, switch to built-in.')
logger.warning(f"fetch recommended apps from dify official failed: {e}, switch to built-in.")
result = cls._fetch_recommended_apps_from_builtin(language)
elif mode == 'db':
elif mode == "db":
result = cls._fetch_recommended_apps_from_db(language)
elif mode == 'builtin':
elif mode == "builtin":
result = cls._fetch_recommended_apps_from_builtin(language)
else:
raise ValueError(f'invalid fetch recommended apps mode: {mode}')
raise ValueError(f"invalid fetch recommended apps mode: {mode}")
if not result.get('recommended_apps') and language != 'en-US':
result = cls._fetch_recommended_apps_from_builtin('en-US')
if not result.get("recommended_apps") and language != "en-US":
result = cls._fetch_recommended_apps_from_builtin("en-US")
return result
@@ -52,16 +51,18 @@ class RecommendedAppService:
:param language: language
:return:
"""
recommended_apps = db.session.query(RecommendedApp).filter(
RecommendedApp.is_listed == True,
RecommendedApp.language == language
).all()
recommended_apps = (
db.session.query(RecommendedApp)
.filter(RecommendedApp.is_listed == True, RecommendedApp.language == language)
.all()
)
if len(recommended_apps) == 0:
recommended_apps = db.session.query(RecommendedApp).filter(
RecommendedApp.is_listed == True,
RecommendedApp.language == languages[0]
).all()
recommended_apps = (
db.session.query(RecommendedApp)
.filter(RecommendedApp.is_listed == True, RecommendedApp.language == languages[0])
.all()
)
categories = set()
recommended_apps_result = []
@@ -75,28 +76,28 @@ class RecommendedAppService:
continue
recommended_app_result = {
'id': recommended_app.id,
'app': {
'id': app.id,
'name': app.name,
'mode': app.mode,
'icon': app.icon,
'icon_background': app.icon_background
"id": recommended_app.id,
"app": {
"id": app.id,
"name": app.name,
"mode": app.mode,
"icon": app.icon,
"icon_background": app.icon_background,
},
'app_id': recommended_app.app_id,
'description': site.description,
'copyright': site.copyright,
'privacy_policy': site.privacy_policy,
'custom_disclaimer': site.custom_disclaimer,
'category': recommended_app.category,
'position': recommended_app.position,
'is_listed': recommended_app.is_listed
"app_id": recommended_app.app_id,
"description": site.description,
"copyright": site.copyright,
"privacy_policy": site.privacy_policy,
"custom_disclaimer": site.custom_disclaimer,
"category": recommended_app.category,
"position": recommended_app.position,
"is_listed": recommended_app.is_listed,
}
recommended_apps_result.append(recommended_app_result)
categories.add(recommended_app.category) # add category to categories
return {'recommended_apps': recommended_apps_result, 'categories': sorted(categories)}
return {"recommended_apps": recommended_apps_result, "categories": sorted(categories)}
@classmethod
def _fetch_recommended_apps_from_dify_official(cls, language: str) -> dict:
@@ -106,16 +107,16 @@ class RecommendedAppService:
:return:
"""
domain = dify_config.HOSTED_FETCH_APP_TEMPLATES_REMOTE_DOMAIN
url = f'{domain}/apps?language={language}'
url = f"{domain}/apps?language={language}"
response = requests.get(url, timeout=(3, 10))
if response.status_code != 200:
raise ValueError(f'fetch recommended apps failed, status code: {response.status_code}')
raise ValueError(f"fetch recommended apps failed, status code: {response.status_code}")
result = response.json()
if "categories" in result:
result["categories"] = sorted(result["categories"])
return result
@classmethod
@@ -126,7 +127,7 @@ class RecommendedAppService:
:return:
"""
builtin_data = cls._get_builtin_data()
return builtin_data.get('recommended_apps', {}).get(language)
return builtin_data.get("recommended_apps", {}).get(language)
@classmethod
def get_recommend_app_detail(cls, app_id: str) -> Optional[dict]:
@@ -136,18 +137,18 @@ class RecommendedAppService:
:return:
"""
mode = dify_config.HOSTED_FETCH_APP_TEMPLATES_MODE
if mode == 'remote':
if mode == "remote":
try:
result = cls._fetch_recommended_app_detail_from_dify_official(app_id)
except Exception as e:
logger.warning(f'fetch recommended app detail from dify official failed: {e}, switch to built-in.')
logger.warning(f"fetch recommended app detail from dify official failed: {e}, switch to built-in.")
result = cls._fetch_recommended_app_detail_from_builtin(app_id)
elif mode == 'db':
elif mode == "db":
result = cls._fetch_recommended_app_detail_from_db(app_id)
elif mode == 'builtin':
elif mode == "builtin":
result = cls._fetch_recommended_app_detail_from_builtin(app_id)
else:
raise ValueError(f'invalid fetch recommended app detail mode: {mode}')
raise ValueError(f"invalid fetch recommended app detail mode: {mode}")
return result
@@ -159,7 +160,7 @@ class RecommendedAppService:
:return:
"""
domain = dify_config.HOSTED_FETCH_APP_TEMPLATES_REMOTE_DOMAIN
url = f'{domain}/apps/{app_id}'
url = f"{domain}/apps/{app_id}"
response = requests.get(url, timeout=(3, 10))
if response.status_code != 200:
return None
@@ -174,10 +175,11 @@ class RecommendedAppService:
:return:
"""
# is in public recommended list
recommended_app = db.session.query(RecommendedApp).filter(
RecommendedApp.is_listed == True,
RecommendedApp.app_id == app_id
).first()
recommended_app = (
db.session.query(RecommendedApp)
.filter(RecommendedApp.is_listed == True, RecommendedApp.app_id == app_id)
.first()
)
if not recommended_app:
return None
@@ -188,12 +190,12 @@ class RecommendedAppService:
return None
return {
'id': app_model.id,
'name': app_model.name,
'icon': app_model.icon,
'icon_background': app_model.icon_background,
'mode': app_model.mode,
'export_data': AppDslService.export_dsl(app_model=app_model)
"id": app_model.id,
"name": app_model.name,
"icon": app_model.icon,
"icon_background": app_model.icon_background,
"mode": app_model.mode,
"export_data": AppDslService.export_dsl(app_model=app_model),
}
@classmethod
@@ -204,7 +206,7 @@ class RecommendedAppService:
:return:
"""
builtin_data = cls._get_builtin_data()
return builtin_data.get('app_details', {}).get(app_id)
return builtin_data.get("app_details", {}).get(app_id)
@classmethod
def _get_builtin_data(cls) -> dict:
@@ -216,7 +218,7 @@ 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:
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
@@ -229,27 +231,24 @@ class RecommendedAppService:
Fetch all recommended apps and export datas
:return:
"""
templates = {
"recommended_apps": {},
"app_details": {}
}
templates = {"recommended_apps": {}, "app_details": {}}
for language in languages:
try:
result = cls._fetch_recommended_apps_from_dify_official(language)
except Exception as e:
logger.warning(f'fetch recommended apps from dify official failed: {e}, skip.')
logger.warning(f"fetch recommended apps from dify official failed: {e}, skip.")
continue
templates['recommended_apps'][language] = result
templates["recommended_apps"][language] = result
for recommended_app in result.get('recommended_apps'):
app_id = recommended_app.get('app_id')
for recommended_app in result.get("recommended_apps"):
app_id = recommended_app.get("app_id")
# get app detail
app_detail = cls._fetch_recommended_app_detail_from_dify_official(app_id)
if not app_detail:
continue
templates['app_details'][app_id] = app_detail
templates["app_details"][app_id] = app_detail
return templates