opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-09-08 11:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix file name

Browse Source
This commit is contained in:
jyong 2025-09-04 17:11:13 +08:00
parent 55b936003f
commit 41b5596441
3 changed files with 129 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

262
api/commands.py
View File

@ -42,6 +42,7 @@ from services.account_service import AccountService, RegisterService, TenantServ
from services.clear_free_plan_tenant_expired_logs import ClearFreePlanTenantExpiredLogs from services.clear_free_plan_tenant_expired_logs import ClearFreePlanTenantExpiredLogs
from services.plugin.data_migration import PluginDataMigration from services.plugin.data_migration import PluginDataMigration
from services.plugin.plugin_migration import PluginMigration from services.plugin.plugin_migration import PluginMigration
from services.plugin.plugin_service import PluginService
from tasks.remove_app_and_related_data_task import delete_draft_variables_batch from tasks.remove_app_and_related_data_task import delete_draft_variables_batch
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -1426,154 +1427,135 @@ def transform_datasource_credentials():
# deal notion credentials # deal notion credentials
deal_notion_count = 0 deal_notion_count = 0
notion_credentials = db.session.query(DataSourceOauthBinding).filter_by(provider="notion").all() notion_credentials = db.session.query(DataSourceOauthBinding).filter_by(provider="notion").all()
notion_credentials_tenant_mapping: dict[str, list[DataSourceOauthBinding]] = {} if notion_credentials:
for credential in notion_credentials: notion_credentials_tenant_mapping: dict[str, list[DataSourceOauthBinding]] = {}
tenant_id = credential.tenant_id for credential in notion_credentials:
if tenant_id not in notion_credentials_tenant_mapping: tenant_id = credential.tenant_id
notion_credentials_tenant_mapping[tenant_id] = [] if tenant_id not in notion_credentials_tenant_mapping:
notion_credentials_tenant_mapping[tenant_id].append(credential) notion_credentials_tenant_mapping[tenant_id] = []
for tenant_id, credentials in notion_credentials_tenant_mapping.items(): notion_credentials_tenant_mapping[tenant_id].append(credential)
# check notion plugin is installed for tenant_id, credentials in notion_credentials_tenant_mapping.items():
installed_plugins = installer_manager.list_plugins(tenant_id) # check notion plugin is installed
installed_plugins_ids = [plugin.plugin_id for plugin in installed_plugins] installed_plugins = installer_manager.list_plugins(tenant_id)
if notion_plugin_id not in installed_plugins_ids: installed_plugins_ids = [plugin.plugin_id for plugin in installed_plugins]
if notion_plugin_unique_identifier: if notion_plugin_id not in installed_plugins_ids:
# install notion plugin if notion_plugin_unique_identifier:
installer_manager.install_from_identifiers( # install notion plugin
tenant_id, PluginService.install_from_marketplace_pkg(tenant_id, [notion_plugin_unique_identifier])
[notion_plugin_unique_identifier], auth_count = 0
PluginInstallationSource.Marketplace, for credential in credentials:
metas=[ auth_count += 1
{ # get credential oauth params
"plugin_unique_identifier": notion_plugin_unique_identifier, access_token = credential.access_token
} # notion info
], notion_info = credential.source_info
workspace_id = notion_info.get("workspace_id")
workspace_name = notion_info.get("workspace_name")
workspace_icon = notion_info.get("workspace_icon")
new_credentials = {
"integration_secret": encrypter.encrypt_token(tenant_id, access_token),
"workspace_id": workspace_id,
"workspace_name": workspace_name,
"workspace_icon": workspace_icon,
}
datasource_provider = DatasourceProvider(
provider="notion_datasource",
tenant_id=tenant_id,
plugin_id=notion_plugin_id,
auth_type=oauth_credential_type.value,
encrypted_credentials=new_credentials,
name=f"Auth {auth_count}",
avatar_url=workspace_icon or "default",
is_default=False,
) )
auth_count = 0 db.session.add(datasource_provider)
for credential in credentials: deal_notion_count += 1
auth_count += 1 db.session.commit()
# get credential oauth params
access_token = credential.access_token
# notion info
notion_info = credential.source_info
workspace_id = notion_info.get("workspace_id")
workspace_name = notion_info.get("workspace_name")
workspace_icon = notion_info.get("workspace_icon")
new_credentials = {
"integration_secret": encrypter.encrypt_token(tenant_id, access_token),
"workspace_id": workspace_id,
"workspace_name": workspace_name,
"workspace_icon": workspace_icon,
}
datasource_provider = DatasourceProvider(
provider="notion",
tenant_id=tenant_id,
plugin_id=notion_plugin_id,
auth_type=oauth_credential_type.value,
encrypted_credentials=new_credentials,
name=f"Auth {auth_count}",
avatar_url=workspace_icon or "default",
is_default=False,
)
db.session.add(datasource_provider)
deal_notion_count += 1
db.session.commit()
# deal firecrawl credentials # deal firecrawl credentials
deal_firecrawl_count = 0 deal_firecrawl_count = 0
firecrawl_credentials = db.session.query(DataSourceApiKeyAuthBinding).filter_by(provider="firecrawl").all() firecrawl_credentials = db.session.query(DataSourceApiKeyAuthBinding).filter_by(provider="firecrawl").all()
firecrawl_credentials_tenant_mapping: dict[str, list[DataSourceApiKeyAuthBinding]] = {} if firecrawl_credentials:
for credential in firecrawl_credentials: firecrawl_credentials_tenant_mapping: dict[str, list[DataSourceApiKeyAuthBinding]] = {}
tenant_id = credential.tenant_id for credential in firecrawl_credentials:
if tenant_id not in firecrawl_credentials_tenant_mapping: tenant_id = credential.tenant_id
firecrawl_credentials_tenant_mapping[tenant_id] = [] if tenant_id not in firecrawl_credentials_tenant_mapping:
firecrawl_credentials_tenant_mapping[tenant_id].append(credential) firecrawl_credentials_tenant_mapping[tenant_id] = []
for tenant_id, credentials in firecrawl_credentials_tenant_mapping.items(): firecrawl_credentials_tenant_mapping[tenant_id].append(credential)
# check firecrawl plugin is installed for tenant_id, credentials in firecrawl_credentials_tenant_mapping.items():
installed_plugins = installer_manager.list_plugins(tenant_id) # check firecrawl plugin is installed
installed_plugins_ids = [plugin.plugin_id for plugin in installed_plugins] installed_plugins = installer_manager.list_plugins(tenant_id)
if firecrawl_plugin_id not in installed_plugins_ids: installed_plugins_ids = [plugin.plugin_id for plugin in installed_plugins]
if firecrawl_plugin_unique_identifier: if firecrawl_plugin_id not in installed_plugins_ids:
# install firecrawl plugin if firecrawl_plugin_unique_identifier:
installer_manager.install_from_identifiers( # install firecrawl plugin
tenant_id, PluginService.install_from_marketplace_pkg(tenant_id, [firecrawl_plugin_unique_identifier])
[firecrawl_plugin_unique_identifier],
PluginInstallationSource.Marketplace, auth_count = 0
metas=[ for credential in credentials:
{ auth_count += 1
"plugin_unique_identifier": firecrawl_plugin_unique_identifier, # get credential api key
} credentials_json =json.loads(credential.credentials)
], api_key = credentials_json.get("config", {}).get("api_key")
base_url = credentials_json.get("config", {}).get("base_url")
new_credentials = {
"firecrawl_api_key": api_key,
"base_url": base_url,
}
datasource_provider = DatasourceProvider(
provider="firecrawl",
tenant_id=tenant_id,
plugin_id=firecrawl_plugin_id,
auth_type=api_key_credential_type.value,
encrypted_credentials=new_credentials,
name=f"Auth {auth_count}",
avatar_url="default",
is_default=False,
) )
auth_count = 0 db.session.add(datasource_provider)
for credential in credentials: deal_firecrawl_count += 1
auth_count += 1 db.session.commit()
# get credential api key
api_key = credential.credentials.get("config", {}).get("api_key")
base_url = credential.credentials.get("config", {}).get("base_url")
new_credentials = {
"firecrawl_api_key": api_key,
"base_url": base_url,
}
datasource_provider = DatasourceProvider(
provider="firecrawl",
tenant_id=tenant_id,
plugin_id=firecrawl_plugin_id,
auth_type=api_key_credential_type.value,
encrypted_credentials=new_credentials,
name=f"Auth {auth_count}",
avatar_url="default",
is_default=False,
)
db.session.add(datasource_provider)
deal_firecrawl_count += 1
db.session.commit()
# deal jina credentials # deal jina credentials
deal_jina_count = 0 deal_jina_count = 0
jina_credentials = db.session.query(DataSourceApiKeyAuthBinding).filter_by(provider="jina").all() jina_credentials = db.session.query(DataSourceApiKeyAuthBinding).filter_by(provider="jinareader").all()
jina_credentials_tenant_mapping: dict[str, list[DataSourceApiKeyAuthBinding]] = {} if jina_credentials:
for credential in jina_credentials: jina_credentials_tenant_mapping: dict[str, list[DataSourceApiKeyAuthBinding]] = {}
tenant_id = credential.tenant_id for credential in jina_credentials:
if tenant_id not in jina_credentials_tenant_mapping: tenant_id = credential.tenant_id
jina_credentials_tenant_mapping[tenant_id] = [] if tenant_id not in jina_credentials_tenant_mapping:
jina_credentials_tenant_mapping[tenant_id].append(credential) jina_credentials_tenant_mapping[tenant_id] = []
for tenant_id, credentials in jina_credentials_tenant_mapping.items(): jina_credentials_tenant_mapping[tenant_id].append(credential)
# check jina plugin is installed for tenant_id, credentials in jina_credentials_tenant_mapping.items():
installed_plugins = installer_manager.list_plugins(tenant_id) # check jina plugin is installed
installed_plugins_ids = [plugin.plugin_id for plugin in installed_plugins] installed_plugins = installer_manager.list_plugins(tenant_id)
if jina_plugin_id not in installed_plugins_ids: installed_plugins_ids = [plugin.plugin_id for plugin in installed_plugins]
if jina_plugin_unique_identifier: if jina_plugin_id not in installed_plugins_ids:
# install jina plugin if jina_plugin_unique_identifier:
installer_manager.install_from_identifiers( # install jina plugin
tenant_id, print(jina_plugin_unique_identifier)
[jina_plugin_unique_identifier], PluginService.install_from_marketplace_pkg(tenant_id, [jina_plugin_unique_identifier])
PluginInstallationSource.Marketplace,
metas=[ auth_count = 0
{ for credential in credentials:
"plugin_unique_identifier": jina_plugin_unique_identifier, auth_count += 1
} # get credential api key
], credentials_json = json.loads(credential.credentials)
api_key = credentials_json.get("config", {}).get("api_key")
new_credentials = {
"integration_secret": api_key,
}
datasource_provider = DatasourceProvider(
provider="jina",
tenant_id=tenant_id,
plugin_id=jina_plugin_id,
auth_type=api_key_credential_type.value,
encrypted_credentials=new_credentials,
name=f"Auth {auth_count}",
avatar_url="default",
is_default=False,
) )
auth_count = 0 db.session.add(datasource_provider)
for credential in credentials: deal_jina_count += 1
auth_count += 1 db.session.commit()
# get credential api key
api_key = credential.credentials.get("config", {}).get("api_key")
new_credentials = {
"integration_secret": api_key,
}
datasource_provider = DatasourceProvider(
provider="jina",
tenant_id=tenant_id,
plugin_id=jina_plugin_id,
auth_type=api_key_credential_type.value,
encrypted_credentials=new_credentials,
name=f"Auth {auth_count}",
avatar_url="default",
is_default=False,
)
db.session.add(datasource_provider)
deal_jina_count += 1
db.session.commit()
except Exception as e: except Exception as e:
click.echo(click.style(f"Error parsing client params: {str(e)}", fg="red")) click.echo(click.style(f"Error parsing client params: {str(e)}", fg="red"))
return return

4
api/extensions/ext_commands.py
View File

@ -13,6 +13,7 @@ def init_app(app: DifyApp):
extract_unique_plugins, extract_unique_plugins,
fix_app_site_missing, fix_app_site_missing,
install_plugins, install_plugins,
install_rag_pipeline_plugins,
migrate_data_for_plugin, migrate_data_for_plugin,
old_metadata_migration, old_metadata_migration,
remove_orphaned_files_on_storage, remove_orphaned_files_on_storage,
@ -21,6 +22,7 @@ def init_app(app: DifyApp):
reset_password, reset_password,
setup_datasource_oauth_client, setup_datasource_oauth_client,
setup_system_tool_oauth_client, setup_system_tool_oauth_client,
transform_datasource_credentials,
upgrade_db, upgrade_db,
vdb_migrate, vdb_migrate,
) )
@ -46,6 +48,8 @@ def init_app(app: DifyApp):
setup_system_tool_oauth_client, setup_system_tool_oauth_client,
cleanup_orphaned_draft_variables, cleanup_orphaned_draft_variables,
setup_datasource_oauth_client, setup_datasource_oauth_client,
transform_datasource_credentials,
install_rag_pipeline_plugins,
] ]
for cmd in cmds_to_register: for cmd in cmds_to_register:
app.cli.add_command(cmd) app.cli.add_command(cmd)

14
api/services/plugin/plugin_migration.py
View File

@ -26,6 +26,7 @@ from models.model import App, AppMode, AppModelConfig
from models.provider_ids import ModelProviderID, ToolProviderID from models.provider_ids import ModelProviderID, ToolProviderID
from models.tools import BuiltinToolProvider from models.tools import BuiltinToolProvider
from models.workflow import Workflow from models.workflow import Workflow
from services.plugin.plugin_service import PluginService
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -457,17 +458,8 @@ class PluginMigration:
for plugin_id in batch_plugin_ids for plugin_id in batch_plugin_ids
if plugin_id not in installed_plugins_ids and plugin_id in plugin_ids if plugin_id not in installed_plugins_ids and plugin_id in plugin_ids
] ]
manager.install_from_identifiers( PluginService.install_from_marketplace_pkg(tenant_id, batch_plugin_identifiers)
tenant_id,
batch_plugin_identifiers,
PluginInstallationSource.Marketplace,
metas=[
{
"plugin_unique_identifier": identifier,
}
for identifier in batch_plugin_identifiers
],
)
total_success_tenant += 1 total_success_tenant += 1
except Exception: except Exception:
logger.exception("Failed to install plugins for tenant %s", tenant_id) logger.exception("Failed to install plugins for tenant %s", tenant_id)