refactor: remove unused imports of UTC and datetime across multiple files

api/controllers/console/app/conversation.py

@@ -1,4 +1,4 @@
-from datetime import UTC, datetime
+from datetime import datetime
 
 import pytz  # pip install pytz
 from flask_login import current_user

api/controllers/console/app/site.py

@@ -1,5 +1,3 @@
-from datetime import UTC, datetime
-
 from flask_login import current_user
 from flask_restful import Resource, marshal_with, reqparse
 from werkzeug.exceptions import Forbidden, NotFound

api/controllers/console/auth/activate.py

@@ -1,5 +1,3 @@
-import datetime
-
 from flask import request
 from flask_restful import Resource, reqparse
 

api/controllers/console/auth/oauth.py

@@ -1,5 +1,4 @@
 import logging
-from datetime import UTC, datetime
 from typing import Optional
 
 import requests

api/controllers/console/datasets/data_source.py

@@ -1,4 +1,3 @@
-import datetime
 import json
 
 from flask import request

api/controllers/console/datasets/datasets_document.py

@@ -1,6 +1,5 @@
 import logging
 from argparse import ArgumentTypeError
-from datetime import UTC, datetime
 from typing import cast
 
 from flask import request

api/controllers/console/explore/completion.py

@@ -1,5 +1,4 @@
 import logging
-from datetime import UTC, datetime
 
 from flask_login import current_user
 from flask_restful import reqparse
@@ -18,7 +17,6 @@ from controllers.console.explore.error import NotChatAppError, NotCompletionAppE
 from controllers.console.explore.wraps import InstalledAppResource
 from controllers.web.error import InvokeRateLimitError as InvokeRateLimitHttpError
 from core.app.apps.base_app_queue_manager import AppQueueManager
-from libs.datetime_utils import naive_utc_now
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.errors.error import (
     ModelCurrentlyNotSupportError,
@@ -28,6 +26,7 @@ from core.errors.error import (
 from core.model_runtime.errors.invoke import InvokeError
 from extensions.ext_database import db
 from libs import helper
+from libs.datetime_utils import naive_utc_now
 from libs.helper import uuid_value
 from models.model import AppMode
 from services.app_generate_service import AppGenerateService

api/controllers/console/explore/installed_app.py

@@ -1,5 +1,4 @@
 import logging
-from datetime import UTC, datetime
 from typing import Any
 
 from flask import request

api/controllers/console/workspace/account.py

@@ -1,5 +1,3 @@
-import datetime
-
 import pytz
 from flask import request
 from flask_login import current_user

api/controllers/service_api/wraps.py

@@ -1,6 +1,6 @@
 import time
 from collections.abc import Callable
-from datetime import UTC, datetime, timedelta
+from datetime import timedelta
 from enum import Enum
 from functools import wraps
 from typing import Optional

api/core/app/apps/common/workflow_response_converter.py

@@ -7,7 +7,6 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, WorkflowAppGenerateEntity
-from libs.datetime_utils import naive_utc_now
 from core.app.entities.queue_entities import (
     QueueAgentLogEvent,
     QueueIterationCompletedEvent,

api/core/app/apps/message_based_app_generator.py

@@ -1,7 +1,6 @@
 import json
 import logging
 from collections.abc import Generator
-from datetime import UTC, datetime
 from typing import Optional, Union, cast
 
 from core.app.app_config.entities import EasyUIBasedAppConfig, EasyUIBasedAppModelConfigFrom

api/core/workflow/entities/workflow_execution.py

@@ -13,8 +13,6 @@ from typing import Any, Optional
 from pydantic import BaseModel, Field
 
 
-
-
 class WorkflowType(StrEnum):
     """
     Workflow Type Enum for domain layer

api/core/workflow/graph_engine/entities/runtime_route_state.py

@@ -6,7 +6,6 @@ from typing import Optional
 from pydantic import BaseModel, Field
 
 from core.workflow.entities.node_entities import NodeRunResult
-from libs.datetime_utils import naive_utc_now
 from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
 
 

api/core/workflow/graph_engine/graph_engine.py

@@ -12,7 +12,6 @@ from typing import Any, Optional, cast
 from flask import Flask, current_app
 
 from configs import dify_config
-from libs.datetime_utils import naive_utc_now
 from core.app.apps.exc import GenerateTaskStoppedError
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.workflow.entities.node_entities import AgentNodeStrategyInit, NodeRunResult

api/core/workflow/nodes/iteration/iteration_node.py

@@ -11,7 +11,6 @@ from typing import TYPE_CHECKING, Any, Optional, cast
 from flask import Flask, current_app
 
 from configs import dify_config
-from libs.datetime_utils import naive_utc_now
 from core.variables import ArrayVariable, IntegerVariable, NoneVariable
 from core.variables.segments import ArrayAnySegment, ArraySegment
 from core.workflow.entities.node_entities import (

api/core/workflow/nodes/loop/loop_node.py

@@ -11,7 +11,6 @@ from core.variables import (
     Segment,
     SegmentType,
 )
-from libs.datetime_utils import naive_utc_now
 from core.workflow.entities.node_entities import NodeRunResult
 from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
 from core.workflow.graph_engine.entities.event import (

api/core/workflow/workflow_cycle_manager.py

@@ -1,6 +1,6 @@
 from collections.abc import Mapping
 from dataclasses import dataclass
-from datetime import UTC, datetime
+from datetime import datetime
 from typing import Any, Optional, Union
 from uuid import uuid4
 

api/events/event_handlers/create_document_index.py

@@ -1,4 +1,3 @@
-import datetime
 import logging
 import time
 

api/extensions/storage/azure_blob_storage.py

@@ -1,5 +1,5 @@
 from collections.abc import Generator
-from datetime import UTC, datetime, timedelta
+from datetime import timedelta
 from typing import Optional
 
 from azure.identity import ChainedTokenCredential, DefaultAzureCredential

api/libs/oauth_data_source.py

@@ -1,4 +1,3 @@
-import datetime
 import urllib.parse
 from typing import Any
 

api/models/task.py

@@ -1,5 +1,3 @@
-from datetime import UTC, datetime
-
 from celery import states  # type: ignore
 
 from libs.datetime_utils import naive_utc_now

api/models/workflow.py

@@ -1,7 +1,7 @@
 import json
 import logging
 from collections.abc import Mapping, Sequence
-from datetime import UTC, datetime
+from datetime import datetime
 from enum import Enum, StrEnum
 from typing import TYPE_CHECKING, Any, Optional, Union
 from uuid import uuid4

api/services/app_service.py

@@ -1,6 +1,5 @@
 import json
 import logging
-from datetime import UTC, datetime
 from typing import Optional, cast
 
 from flask_login import current_user

api/services/conversation_service.py

@@ -1,5 +1,4 @@
 from collections.abc import Callable, Sequence
-from datetime import UTC, datetime
 from typing import Optional, Union
 
 from sqlalchemy import asc, desc, func, or_, select

api/services/external_knowledge_service.py

@@ -1,6 +1,5 @@
 import json
 from copy import deepcopy
-from datetime import UTC, datetime
 from typing import Any, Optional, Union, cast
 from urllib.parse import urlparse
 

api/services/workflow_service.py

@@ -2,7 +2,6 @@ import json
 import time
 import uuid
 from collections.abc import Callable, Generator, Mapping, Sequence
-from datetime import UTC, datetime
 from typing import Any, Optional, cast
 from uuid import uuid4
 

api/tasks/document_indexing_task.py

@@ -1,4 +1,3 @@
-import datetime
 import logging
 import time
 

api/tests/unit_tests/core/workflow/nodes/answer/test_answer_stream_processor.py

@@ -9,7 +9,6 @@ from core.workflow.graph_engine.entities.event import (
     NodeRunStreamChunkEvent,
     NodeRunSucceededEvent,
 )
-from libs.datetime_utils import naive_utc_now
 from core.workflow.graph_engine.entities.graph import Graph
 from core.workflow.graph_engine.entities.runtime_route_state import RouteNodeState
 from core.workflow.nodes.answer.answer_stream_processor import AnswerStreamProcessor

api/tests/unit_tests/core/workflow/test_workflow_cycle_manager.py

@@ -23,7 +23,6 @@ from core.workflow.repositories.workflow_execution_repository import WorkflowExe
 from core.workflow.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
 from core.workflow.system_variable import SystemVariable
 from core.workflow.workflow_cycle_manager import CycleManagerWorkflowInfo, WorkflowCycleManager
-from libs.datetime_utils import naive_utc_now
 from models.enums import CreatorUserRole
 from models.model import AppMode
 from models.workflow import Workflow, WorkflowRun

api/tests/unit_tests/services/test_dataset_service_update_dataset.py

@@ -102,17 +102,16 @@ class TestDatasetServiceUpdateDataset:
             patch("services.dataset_service.DatasetService.get_dataset") as mock_get_dataset,
             patch("services.dataset_service.DatasetService.check_dataset_permission") as mock_check_perm,
             patch("extensions.ext_database.db.session") as mock_db,
-            patch("services.dataset_service.datetime") as mock_datetime,
+            patch("services.dataset_service.naive_utc_now") as mock_naive_utc_now,
         ):
             current_time = datetime.datetime(2023, 1, 1, 12, 0, 0)
-            mock_datetime.datetime.now.return_value = current_time
+            mock_naive_utc_now.return_value = current_time
-            mock_datetime.UTC = datetime.UTC
 
             yield {
                 "get_dataset": mock_get_dataset,
                 "check_permission": mock_check_perm,
                 "db_session": mock_db,
-                "datetime": mock_datetime,
+                "naive_utc_now": mock_naive_utc_now,
                 "current_time": current_time,
             }
 
@@ -292,7 +291,7 @@ class TestDatasetServiceUpdateDataset:
             "embedding_model_provider": "openai",
             "embedding_model": "text-embedding-ada-002",
             "updated_by": user.id,
-            "updated_at": mock_dataset_service_dependencies["current_time"].replace(tzinfo=None),
+            "updated_at": mock_dataset_service_dependencies["current_time"],
         }
 
         self._assert_database_update_called(
@@ -327,7 +326,7 @@ class TestDatasetServiceUpdateDataset:
             "indexing_technique": "high_quality",
             "retrieval_model": "new_model",
             "updated_by": user.id,
-            "updated_at": mock_dataset_service_dependencies["current_time"].replace(tzinfo=None),
+            "updated_at": mock_dataset_service_dependencies["current_time"],
         }
 
         actual_call_args = mock_dataset_service_dependencies[
@@ -365,7 +364,7 @@ class TestDatasetServiceUpdateDataset:
             "collection_binding_id": None,
             "retrieval_model": "new_model",
             "updated_by": user.id,
-            "updated_at": mock_dataset_service_dependencies["current_time"].replace(tzinfo=None),
+            "updated_at": mock_dataset_service_dependencies["current_time"],
         }
 
         self._assert_database_update_called(
@@ -422,7 +421,7 @@ class TestDatasetServiceUpdateDataset:
             "collection_binding_id": "binding-456",
             "retrieval_model": "new_model",
             "updated_by": user.id,
-            "updated_at": mock_dataset_service_dependencies["current_time"].replace(tzinfo=None),
+            "updated_at": mock_dataset_service_dependencies["current_time"],
         }
 
         self._assert_database_update_called(
@@ -463,7 +462,7 @@ class TestDatasetServiceUpdateDataset:
             "collection_binding_id": "binding-123",
             "retrieval_model": "new_model",
             "updated_by": user.id,
-            "updated_at": mock_dataset_service_dependencies["current_time"].replace(tzinfo=None),
+            "updated_at": mock_dataset_service_dependencies["current_time"],
         }
 
         self._assert_database_update_called(
@@ -525,7 +524,7 @@ class TestDatasetServiceUpdateDataset:
             "collection_binding_id": "binding-789",
             "retrieval_model": "new_model",
             "updated_by": user.id,
-            "updated_at": mock_dataset_service_dependencies["current_time"].replace(tzinfo=None),
+            "updated_at": mock_dataset_service_dependencies["current_time"],
         }
 
         self._assert_database_update_called(
@@ -568,7 +567,7 @@ class TestDatasetServiceUpdateDataset:
             "collection_binding_id": "binding-123",
             "retrieval_model": "new_model",
             "updated_by": user.id,
-            "updated_at": mock_dataset_service_dependencies["current_time"].replace(tzinfo=None),
+            "updated_at": mock_dataset_service_dependencies["current_time"],
         }
 
         self._assert_database_update_called(