Merge remote-tracking branch 'origin/main' into feat/queue-based-graph-engine

api/tests/test_containers_integration_tests/services/test_account_service.py

@@ -91,6 +91,28 @@ class TestAccountService:
         assert account.password is None
         assert account.password_salt is None
 
+    def test_create_account_password_invalid_new_password(
+        self, db_session_with_containers, mock_external_service_dependencies
+    ):
+        """
+        Test account create with invalid new password format.
+        """
+        fake = Faker()
+        email = fake.email()
+        name = fake.name()
+        # Setup mocks
+        mock_external_service_dependencies["feature_service"].get_system_features.return_value.is_allow_register = True
+        mock_external_service_dependencies["billing_service"].is_email_in_freeze.return_value = False
+
+        # Test with too short password (assuming minimum length validation)
+        with pytest.raises(ValueError):  # Password validation error
+            AccountService.create_account(
+                email=email,
+                name=name,
+                interface_language="en-US",
+                password="invalid_new_password",
+            )
+
     def test_create_account_registration_disabled(self, db_session_with_containers, mock_external_service_dependencies):
         """
         Test account creation when registration is disabled.
@@ -940,7 +962,8 @@ class TestAccountService:
         Test getting user through non-existent email.
         """
         fake = Faker()
-        non_existent_email = fake.email()
+        domain = f"test-{fake.random_letters(10)}.com"
+        non_existent_email = fake.email(domain=domain)
         found_user = AccountService.get_user_through_email(non_existent_email)
         assert found_user is None
 

api/tests/test_containers_integration_tests/services/test_model_load_balancing_service.py

@@ -2,6 +2,7 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 from faker import Faker
+from sqlalchemy import select
 
 from models.account import TenantAccountJoin, TenantAccountRole
 from models.model import Account, Tenant
@@ -468,7 +469,7 @@ class TestModelLoadBalancingService:
         assert load_balancing_config.id is not None
 
         # Verify inherit config was created in database
-        inherit_configs = (
-            db.session.query(LoadBalancingModelConfig).where(LoadBalancingModelConfig.name == "__inherit__").all()
-        )
+        inherit_configs = db.session.scalars(
+            select(LoadBalancingModelConfig).where(LoadBalancingModelConfig.name == "__inherit__")
+        ).all()
         assert len(inherit_configs) == 1

api/tests/test_containers_integration_tests/services/test_tag_service.py

@@ -2,6 +2,7 @@ from unittest.mock import create_autospec, patch
 
 import pytest
 from faker import Faker
+from sqlalchemy import select
 from werkzeug.exceptions import NotFound
 
 from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
@@ -954,7 +955,9 @@ class TestTagService:
         from extensions.ext_database import db
 
         # Verify only one binding exists
-        bindings = db.session.query(TagBinding).where(TagBinding.tag_id == tag.id, TagBinding.target_id == app.id).all()
+        bindings = db.session.scalars(
+            select(TagBinding).where(TagBinding.tag_id == tag.id, TagBinding.target_id == app.id)
+        ).all()
         assert len(bindings) == 1
 
     def test_save_tag_binding_invalid_target_type(self, db_session_with_containers, mock_external_service_dependencies):
@@ -1064,7 +1067,9 @@ class TestTagService:
         # No error should be raised, and database state should remain unchanged
         from extensions.ext_database import db
 
-        bindings = db.session.query(TagBinding).where(TagBinding.tag_id == tag.id, TagBinding.target_id == app.id).all()
+        bindings = db.session.scalars(
+            select(TagBinding).where(TagBinding.tag_id == tag.id, TagBinding.target_id == app.id)
+        ).all()
         assert len(bindings) == 0
 
     def test_check_target_exists_knowledge_success(

api/tests/test_containers_integration_tests/services/test_web_conversation_service.py

@@ -2,6 +2,7 @@ from unittest.mock import patch
 
 import pytest
 from faker import Faker
+from sqlalchemy import select
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from models.account import Account
@@ -354,16 +355,14 @@ class TestWebConversationService:
         # Verify only one pinned conversation record exists
         from extensions.ext_database import db
 
-        pinned_conversations = (
-            db.session.query(PinnedConversation)
-            .where(
+        pinned_conversations = db.session.scalars(
+            select(PinnedConversation).where(
                 PinnedConversation.app_id == app.id,
                 PinnedConversation.conversation_id == conversation.id,
                 PinnedConversation.created_by_role == "account",
                 PinnedConversation.created_by == account.id,
             )
-            .all()
-        )
+        ).all()
 
         assert len(pinned_conversations) == 1