Forráskód Böngészése

chore: use DEBUG in dify_config instead of parsing raw system environment variable in place (#10437)

Bowen Liang 5 hónapja
szülő
commit
0ebe198ff1

+ 1 - 1
api/app.py

@@ -2,7 +2,7 @@ import os
 
 
 from configs import dify_config
 from configs import dify_config
 
 
-if os.environ.get("DEBUG", "false").lower() != "true":
+if dify_config.DEBUG:
     from gevent import monkey
     from gevent import monkey
 
 
     monkey.patch_all()
     monkey.patch_all()

+ 3 - 1
api/app_factory.py

@@ -1,6 +1,8 @@
 import os
 import os
 
 
-if os.environ.get("DEBUG", "false").lower() != "true":
+from configs import dify_config
+
+if dify_config.DEBUG:
     from gevent import monkey
     from gevent import monkey
 
 
     monkey.patch_all()
     monkey.patch_all()

+ 2 - 2
api/core/app/apps/advanced_chat/app_generator.py

@@ -1,6 +1,5 @@
 import contextvars
 import contextvars
 import logging
 import logging
-import os
 import threading
 import threading
 import uuid
 import uuid
 from collections.abc import Generator
 from collections.abc import Generator
@@ -10,6 +9,7 @@ from flask import Flask, current_app
 from pydantic import ValidationError
 from pydantic import ValidationError
 
 
 import contexts
 import contexts
+from configs import dify_config
 from constants import UUID_NIL
 from constants import UUID_NIL
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
 from core.app.apps.advanced_chat.app_config_manager import AdvancedChatAppConfigManager
 from core.app.apps.advanced_chat.app_config_manager import AdvancedChatAppConfigManager
@@ -317,7 +317,7 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
                 logger.exception("Validation Error when generating")
                 logger.exception("Validation Error when generating")
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
             except (ValueError, InvokeError) as e:
             except (ValueError, InvokeError) as e:
-                if os.environ.get("DEBUG", "false").lower() == "true":
+                if dify_config.DEBUG:
                     logger.exception("Error when generating")
                     logger.exception("Error when generating")
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
             except Exception as e:
             except Exception as e:

+ 2 - 2
api/core/app/apps/agent_chat/app_generator.py

@@ -1,5 +1,4 @@
 import logging
 import logging
-import os
 import threading
 import threading
 import uuid
 import uuid
 from collections.abc import Generator
 from collections.abc import Generator
@@ -8,6 +7,7 @@ from typing import Any, Literal, Union, overload
 from flask import Flask, current_app
 from flask import Flask, current_app
 from pydantic import ValidationError
 from pydantic import ValidationError
 
 
+from configs import dify_config
 from constants import UUID_NIL
 from constants import UUID_NIL
 from core.app.app_config.easy_ui_based_app.model_config.converter import ModelConfigConverter
 from core.app.app_config.easy_ui_based_app.model_config.converter import ModelConfigConverter
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
@@ -230,7 +230,7 @@ class AgentChatAppGenerator(MessageBasedAppGenerator):
                 logger.exception("Validation Error when generating")
                 logger.exception("Validation Error when generating")
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
             except (ValueError, InvokeError) as e:
             except (ValueError, InvokeError) as e:
-                if os.environ.get("DEBUG") and os.environ.get("DEBUG").lower() == "true":
+                if dify_config.DEBUG:
                     logger.exception("Error when generating")
                     logger.exception("Error when generating")
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
             except Exception as e:
             except Exception as e:

+ 2 - 2
api/core/app/apps/chat/app_generator.py

@@ -1,5 +1,4 @@
 import logging
 import logging
-import os
 import threading
 import threading
 import uuid
 import uuid
 from collections.abc import Generator
 from collections.abc import Generator
@@ -8,6 +7,7 @@ from typing import Any, Literal, Union, overload
 from flask import Flask, current_app
 from flask import Flask, current_app
 from pydantic import ValidationError
 from pydantic import ValidationError
 
 
+from configs import dify_config
 from constants import UUID_NIL
 from constants import UUID_NIL
 from core.app.app_config.easy_ui_based_app.model_config.converter import ModelConfigConverter
 from core.app.app_config.easy_ui_based_app.model_config.converter import ModelConfigConverter
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
@@ -227,7 +227,7 @@ class ChatAppGenerator(MessageBasedAppGenerator):
                 logger.exception("Validation Error when generating")
                 logger.exception("Validation Error when generating")
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
             except (ValueError, InvokeError) as e:
             except (ValueError, InvokeError) as e:
-                if os.environ.get("DEBUG") and os.environ.get("DEBUG").lower() == "true":
+                if dify_config.DEBUG:
                     logger.exception("Error when generating")
                     logger.exception("Error when generating")
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
             except Exception as e:
             except Exception as e:

+ 2 - 2
api/core/app/apps/completion/app_generator.py

@@ -1,5 +1,4 @@
 import logging
 import logging
-import os
 import threading
 import threading
 import uuid
 import uuid
 from collections.abc import Generator
 from collections.abc import Generator
@@ -8,6 +7,7 @@ from typing import Any, Literal, Union, overload
 from flask import Flask, current_app
 from flask import Flask, current_app
 from pydantic import ValidationError
 from pydantic import ValidationError
 
 
+from configs import dify_config
 from core.app.app_config.easy_ui_based_app.model_config.converter import ModelConfigConverter
 from core.app.app_config.easy_ui_based_app.model_config.converter import ModelConfigConverter
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
 from core.app.apps.base_app_queue_manager import AppQueueManager, GenerateTaskStoppedError, PublishFrom
 from core.app.apps.base_app_queue_manager import AppQueueManager, GenerateTaskStoppedError, PublishFrom
@@ -203,7 +203,7 @@ class CompletionAppGenerator(MessageBasedAppGenerator):
                 logger.exception("Validation Error when generating")
                 logger.exception("Validation Error when generating")
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
             except (ValueError, InvokeError) as e:
             except (ValueError, InvokeError) as e:
-                if os.environ.get("DEBUG") and os.environ.get("DEBUG").lower() == "true":
+                if dify_config.DEBUG:
                     logger.exception("Error when generating")
                     logger.exception("Error when generating")
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
             except Exception as e:
             except Exception as e:

+ 2 - 2
api/core/app/apps/workflow/app_generator.py

@@ -1,6 +1,5 @@
 import contextvars
 import contextvars
 import logging
 import logging
-import os
 import threading
 import threading
 import uuid
 import uuid
 from collections.abc import Generator, Mapping, Sequence
 from collections.abc import Generator, Mapping, Sequence
@@ -10,6 +9,7 @@ from flask import Flask, current_app
 from pydantic import ValidationError
 from pydantic import ValidationError
 
 
 import contexts
 import contexts
+from configs import dify_config
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
 from core.app.apps.base_app_generator import BaseAppGenerator
 from core.app.apps.base_app_generator import BaseAppGenerator
 from core.app.apps.base_app_queue_manager import AppQueueManager, GenerateTaskStoppedError, PublishFrom
 from core.app.apps.base_app_queue_manager import AppQueueManager, GenerateTaskStoppedError, PublishFrom
@@ -261,7 +261,7 @@ class WorkflowAppGenerator(BaseAppGenerator):
                 logger.exception("Validation Error when generating")
                 logger.exception("Validation Error when generating")
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
             except (ValueError, InvokeError) as e:
             except (ValueError, InvokeError) as e:
-                if os.environ.get("DEBUG") and os.environ.get("DEBUG", "false").lower() == "true":
+                if dify_config.DEBUG:
                     logger.exception("Error when generating")
                     logger.exception("Error when generating")
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
                 queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER)
             except Exception as e:
             except Exception as e:

+ 2 - 2
api/core/model_manager.py

@@ -1,8 +1,8 @@
 import logging
 import logging
-import os
 from collections.abc import Callable, Generator, Iterable, Sequence
 from collections.abc import Callable, Generator, Iterable, Sequence
 from typing import IO, Any, Optional, Union, cast
 from typing import IO, Any, Optional, Union, cast
 
 
+from configs import dify_config
 from core.entities.embedding_type import EmbeddingInputType
 from core.entities.embedding_type import EmbeddingInputType
 from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
 from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
 from core.entities.provider_entities import ModelLoadBalancingConfiguration
 from core.entities.provider_entities import ModelLoadBalancingConfiguration
@@ -473,7 +473,7 @@ class LBModelManager:
 
 
                 continue
                 continue
 
 
-            if bool(os.environ.get("DEBUG", "False").lower() == "true"):
+            if dify_config.DEBUG:
                 logger.info(
                 logger.info(
                     f"Model LB\nid: {config.id}\nname:{config.name}\n"
                     f"Model LB\nid: {config.id}\nname:{config.name}\n"
                     f"tenant_id: {self._tenant_id}\nprovider: {self._provider}\n"
                     f"tenant_id: {self._tenant_id}\nprovider: {self._provider}\n"