fix

api/app.py

@@ -23,6 +23,7 @@
 
 from commands import register_commands
 from config import CloudEditionConfig, Config
+from events import event_handlers
 from extensions import (
  ext_celery,
  ext_code_based_extension,
@@ -39,19 +40,14 @@
 from extensions.ext_database import db
 from extensions.ext_login import login_manager
 from libs.passport import PassportService
-from services.account_service import AccountService
-
-# DO NOT REMOVE BELOW
-from events import event_handlers
 from models import account, dataset, model, source, task, tool, tools, web
-# DO NOT REMOVE ABOVE
-
+from services.account_service import AccountService
 
 warnings.simplefilter("ignore", ResourceWarning)
 
 # fix windows platform
 if os.name == "nt":
- os.system('tzutil /s "UTC"') 
+ os.system('tzutil /s "UTC"')
 else:
  os.environ['TZ'] = 'UTC'
  time.tzset()

api/commands.py

@@ -384,14 +384,14 @@ def convert_to_agent_apps():
  # fetch first 1000 apps
  sql_query = """SELECT a.id AS id FROM apps a
  INNER JOIN app_model_configs am ON a.app_model_config_id=am.id
- WHERE a.mode = 'chat' 
- AND am.agent_mode is not null 
+ WHERE a.mode = 'chat'
+ AND am.agent_mode is not null
  AND (
- am.agent_mode like '%"strategy": "function_call"%' 
+ am.agent_mode like '%"strategy": "function_call"%'
  OR am.agent_mode like '%"strategy": "react"%'
- ) 
+ )
  AND (
- am.agent_mode like '{"enabled": true%' 
+ am.agent_mode like '{"enabled": true%'
  OR am.agent_mode like '{"max_iteration": %'
  ) ORDER BY a.created_at DESC LIMIT 1000
  """

api/config.py

@@ -321,6 +321,7 @@ def __init__(self):
 
  self.KEYWORD_DATA_SOURCE_TYPE = get_env('KEYWORD_DATA_SOURCE_TYPE')
 
+
 class CloudEditionConfig(Config):
 
  def __init__(self):

api/controllers/__init__.py

@@ -1,4 +1 @@
-# -*- coding:utf-8 -*-
-
-
 

api/controllers/console/__init__.py

@@ -1,22 +1,54 @@
 from flask import Blueprint
+
 from libs.external_api import ExternalApi
 
 bp = Blueprint('console', __name__, url_prefix='/console/api')
 api = ExternalApi(bp)
 
 # Import other controllers
-from . import admin, apikey, extension, feature, setup, version, ping
+from . import admin, apikey, extension, feature, ping, setup, version
+
 # Import app controllers
-from .app import (advanced_prompt_template, annotation, app, audio, completion, conversation, generator, message,
- model_config, site, statistic, workflow, workflow_run, workflow_app_log, workflow_statistic, agent)
+from .app import (
+ advanced_prompt_template,
+ agent,
+ annotation,
+ app,
+ audio,
+ completion,
+ conversation,
+ generator,
+ message,
+ model_config,
+ site,
+ statistic,
+ workflow,
+ workflow_app_log,
+ workflow_run,
+ workflow_statistic,
+)
+
 # Import auth controllers
 from .auth import activate, data_source_oauth, login, oauth
+
 # Import billing controllers
 from .billing import billing
+
 # Import datasets controllers
 from .datasets import data_source, datasets, datasets_document, datasets_segments, file, hit_testing
+
 # Import explore controllers
-from .explore import (audio, completion, conversation, installed_app, message, parameter, recommended_app,
- saved_message, workflow)
+from .explore import (
+ audio,
+ completion,
+ conversation,
+ installed_app,
+ message,
+ parameter,
+ recommended_app,
+ saved_message,
+ workflow,
+)
+
 # Import workspace controllers
-from .workspace import account, members, model_providers, models, tool_providers, workspace
+from .workspace import account, members, model_providers, models, tool_providers, workspace

api/controllers/console/admin.py

@@ -68,7 +68,7 @@ def post(self):
  copy_right = site.copyright if site.copyright else \
  args['copyright'] if args['copyright'] else ''
  privacy_policy = site.privacy_policy if site.privacy_policy else \
- args['privacy_policy'] if args['privacy_policy']  else ''
+ args['privacy_policy'] if args['privacy_policy'] else ''
 
  recommended_app = RecommendedApp.query.filter(RecommendedApp.app_id == args['app_id']).first()
 

api/controllers/console/app/advanced_prompt_template.py

@@ -23,4 +23,5 @@ def get(self):
 
  return AdvancedPromptTemplateService.get_prompt(args)
 
-api.add_resource(AdvancedPromptTemplateList, '/app/prompt-templates')
+
+api.add_resource(AdvancedPromptTemplateList, '/app/prompt-templates')

api/controllers/console/app/agent.py

@@ -29,4 +29,5 @@ def get(self, app_model):
  args['message_id']
  )
 
-api.add_resource(AgentLogApi, '/apps/<uuid:app_id>/agent/logs')
+
+api.add_resource(AgentLogApi, '/apps/<uuid:app_id>/agent/logs')

api/controllers/console/app/app.py

@@ -2,25 +2,24 @@
 
 from flask_login import current_user
 from flask_restful import Resource, inputs, marshal_with, reqparse
-from werkzeug.exceptions import Forbidden, BadRequest
+from werkzeug.exceptions import BadRequest, Forbidden
 
 from controllers.console import api
 from controllers.console.app.wraps import get_app_model
 from controllers.console.setup import setup_required
 from controllers.console.wraps import account_initialization_required, cloud_edition_billing_resource_check
 from core.agent.entities import AgentToolEntity
+from core.tools.tool_manager import ToolManager
+from core.tools.utils.configuration import ToolParameterConfigurationManager
 from extensions.ext_database import db
 from fields.app_fields import (
  app_detail_fields,
  app_detail_fields_with_site,
  app_pagination_fields,
 )
 from libs.login import login_required
+from models.model import App, AppMode, AppModelConfig
 from services.app_service import AppService
-from models.model import App, AppModelConfig, AppMode
-from core.tools.utils.configuration import ToolParameterConfigurationManager
-from core.tools.tool_manager import ToolManager
-
 
 ALLOW_CREATE_APP_MODES = ['chat', 'agent-chat', 'advanced-chat', 'workflow', 'completion']
 

api/controllers/console/app/statistic.py

@@ -32,7 +32,7 @@ def get(self, app_model):
 
  sql_query = '''
  SELECT date(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, count(distinct messages.conversation_id) AS conversation_count
- FROM messages where app_id = :app_id 
+ FROM messages where app_id = :app_id
  '''
  arg_dict = {'tz': account.timezone, 'app_id': app_model.id}
 
@@ -92,7 +92,7 @@ def get(self, app_model):
 
  sql_query = '''
  SELECT date(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, count(distinct messages.from_end_user_id) AS terminal_count
- FROM messages where app_id = :app_id 
+ FROM messages where app_id = :app_id
  '''
  arg_dict = {'tz': account.timezone, 'app_id': app_model.id}
 
@@ -124,7 +124,7 @@ def get(self, app_model):
  response_data = []
 
  with db.engine.begin() as conn:
- rs = conn.execute(db.text(sql_query), arg_dict) 
+ rs = conn.execute(db.text(sql_query), arg_dict)
  for i in rs:
  response_data.append({
  'date': str(i.date),
@@ -150,10 +150,10 @@ def get(self, app_model):
  args = parser.parse_args()
 
  sql_query = '''
- SELECT date(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, 
+ SELECT date(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
  (sum(messages.message_tokens) + sum(messages.answer_tokens)) as token_count,
  sum(total_price) as total_price
- FROM messages where app_id = :app_id 
+ FROM messages where app_id = :app_id
  '''
  arg_dict = {'tz': account.timezone, 'app_id': app_model.id}
 
@@ -212,7 +212,7 @@ def get(self, app_model):
  parser.add_argument('end', type=datetime_string('%Y-%m-%d %H:%M'), location='args')
  args = parser.parse_args()
 
- sql_query = """SELECT date(DATE_TRUNC('day', c.created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, 
+ sql_query = """SELECT date(DATE_TRUNC('day', c.created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
 AVG(subquery.message_count) AS interactions
 FROM (SELECT m.conversation_id, COUNT(m.id) AS message_count
  FROM conversations c
@@ -278,11 +278,11 @@ def get(self, app_model):
  args = parser.parse_args()
 
  sql_query = '''
- SELECT date(DATE_TRUNC('day', m.created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, 
- COUNT(m.id) as message_count, COUNT(mf.id) as feedback_count 
+ SELECT date(DATE_TRUNC('day', m.created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
+ COUNT(m.id) as message_count, COUNT(mf.id) as feedback_count
  FROM messages m
  LEFT JOIN message_feedbacks mf on mf.message_id=m.id
- WHERE m.app_id = :app_id 
+ WHERE m.app_id = :app_id
  '''
  arg_dict = {'tz': account.timezone, 'app_id': app_model.id}
 
@@ -340,7 +340,7 @@ def get(self, app_model):
  args = parser.parse_args()
 
  sql_query = '''
- SELECT date(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, 
+ SELECT date(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
  AVG(provider_response_latency) as latency
  FROM messages
  WHERE app_id = :app_id
@@ -375,7 +375,7 @@ def get(self, app_model):
  response_data = []
 
  with db.engine.begin() as conn:
- rs = conn.execute(db.text(sql_query), arg_dict) 
+ rs = conn.execute(db.text(sql_query), arg_dict)
  for i in rs:
  response_data.append({
  'date': str(i.date),
@@ -400,8 +400,8 @@ def get(self, app_model):
  parser.add_argument('end', type=datetime_string('%Y-%m-%d %H:%M'), location='args')
  args = parser.parse_args()
 
- sql_query = '''SELECT date(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, 
- CASE 
+ sql_query = '''SELECT date(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
+ CASE
  WHEN SUM(provider_response_latency) = 0 THEN 0
  ELSE (SUM(answer_tokens) / SUM(provider_response_latency))
  END as tokens_per_second

api/controllers/console/app/workflow_statistic.py

@@ -32,8 +32,8 @@ def get(self, app_model):
 
  sql_query = '''
  SELECT date(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, count(id) AS runs
- FROM workflow_runs 
- WHERE app_id = :app_id 
+ FROM workflow_runs
+ WHERE app_id = :app_id
  AND triggered_from = :triggered_from
  '''
  arg_dict = {'tz': account.timezone, 'app_id': app_model.id, 'triggered_from': WorkflowRunTriggeredFrom.APP_RUN.value}
@@ -77,6 +77,7 @@ def get(self, app_model):
  'data': response_data
  })
 
+
 class WorkflowDailyTerminalsStatistic(Resource):
  @setup_required
  @login_required
@@ -92,8 +93,8 @@ def get(self, app_model):
 
  sql_query = '''
  SELECT date(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, count(distinct workflow_runs.created_by) AS terminal_count
- FROM workflow_runs 
- WHERE app_id = :app_id 
+ FROM workflow_runs
+ WHERE app_id = :app_id
  AND triggered_from = :triggered_from
  '''
  arg_dict = {'tz': account.timezone, 'app_id': app_model.id, 'triggered_from': WorkflowRunTriggeredFrom.APP_RUN.value}
@@ -126,7 +127,7 @@ def get(self, app_model):
  response_data = []
 
  with db.engine.begin() as conn:
- rs = conn.execute(db.text(sql_query), arg_dict) 
+ rs = conn.execute(db.text(sql_query), arg_dict)
  for i in rs:
  response_data.append({
  'date': str(i.date),
@@ -137,6 +138,7 @@ def get(self, app_model):
  'data': response_data
  })
 
+
 class WorkflowDailyTokenCostStatistic(Resource):
  @setup_required
  @login_required
@@ -151,11 +153,11 @@ def get(self, app_model):
  args = parser.parse_args()
 
  sql_query = '''
- SELECT 
- date(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, 
+ SELECT
+ date(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
  SUM(workflow_runs.total_tokens) as token_count
- FROM workflow_runs 
- WHERE app_id = :app_id 
+ FROM workflow_runs
+ WHERE app_id = :app_id
  AND triggered_from = :triggered_from
  '''
  arg_dict = {'tz': account.timezone, 'app_id': app_model.id, 'triggered_from': WorkflowRunTriggeredFrom.APP_RUN.value}
@@ -199,6 +201,7 @@ def get(self, app_model):
  'data': response_data
  })
 
+
 class WorkflowAverageAppInteractionStatistic(Resource):
  @setup_required
  @login_required
@@ -213,12 +216,12 @@ def get(self, app_model):
  args = parser.parse_args()
 
  sql_query = """
- SELECT 
+ SELECT
  AVG(sub.interactions) as interactions,
  sub.date
  FROM
- (SELECT 
- date(DATE_TRUNC('day', c.created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, 
+ (SELECT
+ date(DATE_TRUNC('day', c.created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
  c.created_by,
  COUNT(c.id) AS interactions
  FROM workflow_runs c
@@ -272,6 +275,7 @@ def get(self, app_model):
  'data': response_data
  })
 
+
 api.add_resource(WorkflowDailyRunsStatistic, '/apps/<uuid:app_id>/workflow/statistics/daily-conversations')
 api.add_resource(WorkflowDailyTerminalsStatistic, '/apps/<uuid:app_id>/workflow/statistics/daily-terminals')
 api.add_resource(WorkflowDailyTokenCostStatistic, '/apps/<uuid:app_id>/workflow/statistics/token-costs')

api/controllers/console/auth/data_source_oauth.py

@@ -42,12 +42,10 @@ def get(self, provider: str):
  if current_app.config.get('NOTION_INTEGRATION_TYPE') == 'internal':
  internal_secret = current_app.config.get('NOTION_INTERNAL_SECRET')
  oauth_provider.save_internal_access_token(internal_secret)
- return { 'data': '' }
+ return {'data': ''}
  else:
  auth_url = oauth_provider.get_authorization_url()
- return { 'data': auth_url }, 200
-
-
+ return {'data': auth_url}, 200
 
 
 class OAuthDataSourceCallback(Resource):

api/controllers/console/auth/login.py

@@ -74,11 +74,11 @@ def get(self):
  'subject': 'Reset your Dify password',
  'html': """
  <p>Dear User,</p>
- <p>The Dify team has generated a new password for you, details as follows:</p> 
+ <p>The Dify team has generated a new password for you, details as follows:</p>
  <p><strong>{new_password}</strong></p>
  <p>Please change your password to log in as soon as possible.</p>
  <p>Regards,</p>
- <p>The Dify Team</p> 
+ <p>The Dify Team</p>
  """
  }