Chore/unify configurations (#319)

* refactor: update PluginManager to use configuration for various configurations

- Replaced hardcoded values in PluginManager methods with values from the configuration.
- Updated serverless plugin launch timeout and working paths to utilize the new configuration structure.
- Enhanced local plugin runtime initialization to pull settings from the configuration, improving maintainability and flexibility.

* refactor: clean up PluginManager by removing unused fields and updating platform check

- Removed commented-out fields from PluginManager to enhance code clarity.
- Updated platform check to utilize the configuration structure instead of a direct field reference, improving maintainability.

Author: Yeuoly

internal/core/plugin_manager/install_to_serverless.go

@@ -35,7 +35,7 @@ func (p *PluginManager) InstallToAWSFromPkg(
 	}
 
 	// serverless.LaunchPlugin will check if the plugin has already been launched, if so, it returns directly
-	response, err := serverless.LaunchPlugin(originalPackager, decoder, p.serverlessConnectorLaunchTimeout, false)
+	response, err := serverless.LaunchPlugin(originalPackager, decoder, p.config.DifyPluginServerlessConnectorLaunchTimeout, false)
 	if err != nil {
 		return nil, err
 	}
@@ -158,7 +158,7 @@ func (p *PluginManager) ReinstallToAWSFromPkg(
 	response, err := serverless.LaunchPlugin(
 		originalPackager,
 		decoder,
-		p.serverlessConnectorLaunchTimeout,
+		p.config.DifyPluginServerlessConnectorLaunchTimeout,
 		true, // ignoreIdempotent, true means always reinstall
 	)
 	if err != nil {

internal/core/plugin_manager/launcher.go

@@ -48,7 +48,7 @@ func (p *PluginManager) getLocalPluginRuntime(pluginUniqueIdentifier plugin_enti
 
 	identity := manifest.Identity()
 	identity = strings.ReplaceAll(identity, ":", "-")
-	pluginWorkingPath := path.Join(p.workingDirectory, fmt.Sprintf("%s@%s", identity, checksum))
+	pluginWorkingPath := path.Join(p.config.PluginWorkingPath, fmt.Sprintf("%s@%s", identity, checksum))
 	return &pluginRuntimeWithDecoder{
 		runtime: plugin_entities.PluginRuntime{
 			Config: manifest,
@@ -130,18 +130,18 @@ func (p *PluginManager) launchLocal(pluginUniqueIdentifier plugin_entities.Plugi
 	}
 
 	localPluginRuntime := local_runtime.NewLocalPluginRuntime(local_runtime.LocalPluginRuntimeConfig{
-		PythonInterpreterPath:     p.pythonInterpreterPath,
-		UvPath:                    p.uvPath,
-		PythonEnvInitTimeout:      p.pythonEnvInitTimeout,
-		PythonCompileAllExtraArgs: p.pythonCompileAllExtraArgs,
-		HttpProxy:                 p.HttpProxy,
-		HttpsProxy:                p.HttpsProxy,
-		NoProxy:                   p.NoProxy,
-		PipMirrorUrl:              p.pipMirrorUrl,
-		PipPreferBinary:           p.pipPreferBinary,
-		PipExtraArgs:              p.pipExtraArgs,
-		StdoutBufferSize:          p.pluginStdioBufferSize,
-		StdoutMaxBufferSize:       p.pluginStdioMaxBufferSize,
+		PythonInterpreterPath:     p.config.PythonInterpreterPath,
+		UvPath:                    p.config.UvPath,
+		PythonEnvInitTimeout:      p.config.PythonEnvInitTimeout,
+		PythonCompileAllExtraArgs: p.config.PythonCompileAllExtraArgs,
+		HttpProxy:                 p.config.HttpProxy,
+		HttpsProxy:                p.config.HttpsProxy,
+		NoProxy:                   p.config.NoProxy,
+		PipMirrorUrl:              p.config.PipMirrorUrl,
+		PipPreferBinary:           *p.config.PipPreferBinary,
+		PipExtraArgs:              p.config.PipExtraArgs,
+		StdoutBufferSize:          p.config.PluginStdioBufferSize,
+		StdoutMaxBufferSize:       p.config.PluginStdioMaxBufferSize,
 	})
 	localPluginRuntime.PluginRuntime = plugin.runtime
 	localPluginRuntime.BasicChecksum = basic_runtime.BasicChecksum{

internal/core/plugin_manager/manager.go

@@ -27,15 +27,6 @@ import (
 type PluginManager struct {
 	m mapping.Map[string, plugin_entities.PluginLifetime]
 
-	// max size of a plugin package
-	maxPluginPackageSize int64
-
-	// where the plugin finally running
-	workingDirectory string
-
-	// where the plugin finally installed but not running
-	pluginStoragePath string
-
 	// mediaBucket is used to manage media files like plugin icons, images, etc.
 	mediaBucket *media_transport.MediaBucket
 
@@ -54,52 +45,13 @@ type PluginManager struct {
 	// backwardsInvocation is a handle to invoke dify
 	backwardsInvocation dify_invocation.BackwardsInvocation
 
-	// python interpreter path
-	pythonInterpreterPath string
-
-	// uv path
-	uvPath string
-
-	// python env init timeout
-	pythonEnvInitTimeout int
-
-	// proxy settings
-	HttpProxy  string
-	HttpsProxy string
-	NoProxy    string
-
-	// pip mirror url
-	pipMirrorUrl string
-
-	// pip prefer binary
-	pipPreferBinary bool
-
-	// pip verbose
-	pipVerbose bool
-
-	// pip extra args
-	pipExtraArgs string
-
-	// python compileall extra args
-	pythonCompileAllExtraArgs string
+	config *app.Config
 
 	// remote plugin server
 	remotePluginServer debugging_runtime.RemotePluginServerInterface
 
 	// max launching lock to prevent too many plugins launching at the same time
 	maxLaunchingLock chan bool
-
-	// platform, local or serverless
-	platform app.PlatformType
-
-	// serverless connector launch timeout
-	serverlessConnectorLaunchTimeout int
-
-	pluginMaxExecutionTimeout int
-
-	// plugin stdio buffer size
-	pluginStdioBufferSize    int
-	pluginStdioMaxBufferSize int
 }
 
 var (
@@ -108,9 +60,6 @@ var (
 
 func InitGlobalManager(oss oss.OSS, configuration *app.Config) *PluginManager {
 	manager = &PluginManager{
-		maxPluginPackageSize: configuration.MaxPluginPackageSize,
-		pluginStoragePath:    configuration.PluginInstalledPath,
-		workingDirectory:     configuration.PluginWorkingPath,
 		mediaBucket: media_transport.NewAssetsBucket(
 			oss,
 			configuration.PluginMediaCachePath,
@@ -124,24 +73,9 @@ func InitGlobalManager(oss oss.OSS, configuration *app.Config) *PluginManager {
 			oss,
 			configuration.PluginInstalledPath,
 		),
-		localPluginLaunchingLock:         lock.NewGranularityLock(),
-		maxLaunchingLock:                 make(chan bool, 2), // by default, we allow 2 plugins launching at the same time
-		pythonInterpreterPath:            configuration.PythonInterpreterPath,
-		uvPath:                           configuration.UvPath,
-		pythonEnvInitTimeout:             configuration.PythonEnvInitTimeout,
-		pythonCompileAllExtraArgs:        configuration.PythonCompileAllExtraArgs,
-		platform:                         configuration.Platform,
-		HttpProxy:                        configuration.HttpProxy,
-		HttpsProxy:                       configuration.HttpsProxy,
-		NoProxy:                          configuration.NoProxy,
-		pipMirrorUrl:                     configuration.PipMirrorUrl,
-		pipPreferBinary:                  *configuration.PipPreferBinary,
-		pipVerbose:                       *configuration.PipVerbose,
-		pipExtraArgs:                     configuration.PipExtraArgs,
-		serverlessConnectorLaunchTimeout: configuration.DifyPluginServerlessConnectorLaunchTimeout,
-		pluginStdioBufferSize:            configuration.PluginStdioBufferSize,
-		pluginStdioMaxBufferSize:         configuration.PluginStdioMaxBufferSize,
-		pluginMaxExecutionTimeout:        configuration.PluginMaxExecutionTimeout,
+		localPluginLaunchingLock: lock.NewGranularityLock(),
+		maxLaunchingLock:         make(chan bool, 2), // by default, we allow 2 plugins launching at the same time
+		config:                   configuration,
 	}
 
 	return manager
@@ -154,7 +88,7 @@ func Manager() *PluginManager {
 func (p *PluginManager) Get(
 	identity plugin_entities.PluginUniqueIdentifier,
 ) (plugin_entities.PluginLifetime, error) {
-	if identity.RemoteLike() || p.platform == app.PLATFORM_LOCAL {
+	if identity.RemoteLike() || p.config.Platform == app.PLATFORM_LOCAL {
 		// check if it's a debugging plugin or a local plugin
 		if v, ok := p.m.Load(identity.String()); ok {
 			return v, nil

internal/core/plugin_manager/serverless.go

@@ -52,7 +52,7 @@ func (p *PluginManager) getServerlessPluginRuntime(
 		PluginRuntime:             runtimeEntity,
 		LambdaURL:                 model.FunctionURL,
 		LambdaName:                model.FunctionName,
-		PluginMaxExecutionTimeout: p.pluginMaxExecutionTimeout,
+		PluginMaxExecutionTimeout: p.config.PluginMaxExecutionTimeout,
 	}
 
 	if err := pluginRuntime.InitEnvironment(); err != nil {

internal/core/plugin_manager/watcher.go

@@ -13,7 +13,7 @@ import (
 
 func (p *PluginManager) startLocalWatcher() {
 	go func() {
-		log.Info("start to handle new plugins in path: %s", p.pluginStoragePath)
+		log.Info("start to handle new plugins in path: %s", p.config.PluginInstalledPath)
 		p.handleNewLocalPlugins()
 		for range time.NewTicker(time.Second * 30).C {
 			p.handleNewLocalPlugins()