Merge branch 'feat/optimize-current-time' into deploy/dev

api/core/completion.py

@@ -27,13 +27,13 @@ from core.orchestrator_rule_parser import OrchestratorRuleParser
 from core.prompt.prompt_builder import PromptBuilder
 from core.prompt.prompt_template import JinjaPromptTemplate
 from core.prompt.prompts import MORE_LIKE_THIS_GENERATE_PROMPT
-from models.model import App, AppModelConfig, Account, Conversation, Message
+from models.model import App, AppModelConfig, Account, Conversation, Message, EndUser
 
 
 class Completion:
     @classmethod
     def generate(cls, task_id: str, app: App, app_model_config: AppModelConfig, query: str, inputs: dict,
-                 user: Account, conversation: Optional[Conversation], streaming: bool, is_override: bool = False):
+                 user: Union[Account, EndUser], conversation: Optional[Conversation], streaming: bool, is_override: bool = False):
         """
         errors: ProviderTokenNotInitError
         """

api/core/orchestrator_rule_parser.py

@@ -250,7 +250,8 @@ class OrchestratorRuleParser:
     def to_current_datetime_tool(self) -> Optional[BaseTool]:
         tool = Tool(
             name="current_datetime",
-            description="A tool when you want to get the current date or time. ",
+            description="A tool when you want to get the current date, time, week, month or year, "
+                        "and the time zone is UTC+0000.",
             func=helper.get_current_datetime,
             callbacks=[DifyStdOutCallbackHandler()]
         )

api/libs/helper.py

@@ -158,4 +158,4 @@ def generate_text_hash(text: str) -> str:
 def get_current_datetime(type: str) -> str:
     # get current time
     current_time = datetime.utcnow()
-    return current_time.strftime("%Y-%m-%d %H:%M:%S %Z%z")
+    return current_time.strftime("%Y-%m-%d %H:%M:%S UTC+0000 %A")