refactor:Refactors transaction management and datetime usage

Signed-off-by: -LAN- <laipz8200@outlook.com>
pull/21468/head
-LAN- 11 months ago
parent c74ef2b438
commit b94e622786
No known key found for this signature in database
GPG Key ID: 6BA0D108DED011FF

@ -1,6 +1,6 @@
import logging import logging
import time as time_module import time as time_module
from datetime import UTC, datetime from datetime import datetime
from typing import Any, Optional from typing import Any, Optional
from pydantic import BaseModel from pydantic import BaseModel
@ -12,6 +12,7 @@ from core.entities.provider_entities import QuotaUnit, SystemConfiguration
from core.plugin.entities.plugin import ModelProviderID from core.plugin.entities.plugin import ModelProviderID
from events.message_event import message_was_created from events.message_event import message_was_created
from extensions.ext_database import db from extensions.ext_database import db
from libs import datetime_utils
from models.model import Message from models.model import Message
from models.provider import Provider, ProviderType from models.provider import Provider, ProviderType
@ -69,7 +70,7 @@ def handle(sender: Message, **kwargs):
tenant_id = application_generate_entity.app_config.tenant_id tenant_id = application_generate_entity.app_config.tenant_id
provider_name = application_generate_entity.model_conf.provider provider_name = application_generate_entity.model_conf.provider
current_time = datetime.now(UTC).replace(tzinfo=None) current_time = datetime_utils.naive_utc_now()
# Prepare updates for both scenarios # Prepare updates for both scenarios
updates_to_perform: list[_ProviderUpdateOperation] = [] updates_to_perform: list[_ProviderUpdateOperation] = []
@ -171,7 +172,7 @@ def _calculate_quota_usage(
return 1 return 1
return None return None
except Exception as e: except Exception as e:
logger.warning(f"Failed to calculate quota usage: {e}") logger.exception("Failed to calculate quota usage")
return None return None
@ -182,7 +183,6 @@ def _execute_provider_updates(updates_to_perform: list[_ProviderUpdateOperation]
# Use SQLAlchemy's context manager for transaction management # Use SQLAlchemy's context manager for transaction management
# This automatically handles commit/rollback # This automatically handles commit/rollback
try:
with db.session.begin(): with db.session.begin():
# Use a single transaction for all updates # Use a single transaction for all updates
for update_operation in updates_to_perform: for update_operation in updates_to_perform:
@ -231,8 +231,3 @@ def _execute_provider_updates(updates_to_perform: list[_ProviderUpdateOperation]
) )
logger.debug(f"Successfully processed {len(updates_to_perform)} Provider updates") logger.debug(f"Successfully processed {len(updates_to_perform)} Provider updates")
except Exception as e:
# The context manager automatically handles rollback
logger.exception("Failed to update Provider")
raise

Loading…
Cancel
Save