ctrl f replace

api/core/app/apps/advanced_chat/app_runner.py

@@ -72,7 +72,7 @@ class AdvancedChatAppRunner(WorkflowBasedAppRunner):
         app_config = self.application_generate_entity.app_config
         app_config = cast(AdvancedChatAppConfig, app_config)
 
-        app_record = db.session.query(App).filter(App.id == app_config.app_id).first()
+        app_record = db.session.query(App).where(App.id == app_config.app_id).first()
         if not app_record:
             raise ValueError("App not found")
 

api/tests/unit_tests/core/helper/test_encrypter.py

@@ -44,7 +44,6 @@ class TestEncryptToken:
         """Test successful token encryption"""
         mock_tenant = MagicMock()
         mock_tenant.encrypt_public_key = "mock_public_key"
-        mock_query.return_value.filter.return_value.first.return_value = mock_tenant
         mock_query.return_value.where.return_value.first.return_value = mock_tenant
         mock_encrypt.return_value = b"encrypted_data"
 
@@ -56,7 +55,7 @@ class TestEncryptToken:
     @patch("models.engine.db.session.query")
     def test_tenant_not_found(self, mock_query):
         """Test error when tenant doesn't exist"""
-        mock_query.return_value.filter.return_value.first.return_value = None
+        mock_query.return_value.where.return_value.first.return_value = None
 
         with pytest.raises(ValueError) as exc_info:
             encrypt_token("invalid-tenant", "test_token")
@@ -128,7 +127,7 @@ class TestEncryptDecryptIntegration:
         # Setup mock tenant
         mock_tenant = MagicMock()
         mock_tenant.encrypt_public_key = "mock_public_key"
-        mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+        mock_query.return_value.where.return_value.first.return_value = mock_tenant
 
         # Setup mock encryption/decryption
         original_token = "test_token_123"
@@ -154,7 +153,7 @@ class TestSecurity:
         # Setup mock tenant
         mock_tenant = MagicMock()
         mock_tenant.encrypt_public_key = "tenant1_public_key"
-        mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+        mock_query.return_value.where.return_value.first.return_value = mock_tenant
         mock_encrypt.return_value = b"encrypted_for_tenant1"
 
         # Encrypt token for tenant1
@@ -187,7 +186,7 @@ class TestSecurity:
     def test_encryption_randomness(self, mock_encrypt, mock_query):
         """Ensure same plaintext produces different ciphertext"""
         mock_tenant = MagicMock(encrypt_public_key="key")
-        mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+        mock_query.return_value.where.return_value.first.return_value = mock_tenant
 
         # Different outputs for same input
         mock_encrypt.side_effect = [b"enc1", b"enc2", b"enc3"]
@@ -212,7 +211,7 @@ class TestEdgeCases:
         """Test encryption of empty token"""
         mock_tenant = MagicMock()
         mock_tenant.encrypt_public_key = "mock_public_key"
-        mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+        mock_query.return_value.where.return_value.first.return_value = mock_tenant
         mock_encrypt.return_value = b"encrypted_empty"
 
         result = encrypt_token("tenant-123", "")
@@ -226,7 +225,7 @@ class TestEdgeCases:
         """Test tokens containing special/unicode characters"""
         mock_tenant = MagicMock()
         mock_tenant.encrypt_public_key = "mock_public_key"
-        mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+        mock_query.return_value.where.return_value.first.return_value = mock_tenant
         mock_encrypt.return_value = b"encrypted_special"
 
         # Test various special characters
@@ -249,7 +248,7 @@ class TestEdgeCases:
         """Test behavior when token exceeds RSA encryption limits"""
         mock_tenant = MagicMock()
         mock_tenant.encrypt_public_key = "mock_public_key"
-        mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+        mock_query.return_value.where.return_value.first.return_value = mock_tenant
 
         # RSA 2048-bit can only encrypt ~245 bytes
         # The actual limit depends on padding scheme

api/tests/unit_tests/factories/test_build_from_mapping.py

@@ -58,8 +58,8 @@ def mock_tool_file():
         patch("factories.file_factory.db.session.query") as mock_query,
         patch("factories.file_factory.db.session.scalar") as mock_query1,
     ):
-        mock_query.return_value.filter.return_value.first.return_value = mock
-        mock_query1.return_value.filter.return_value.first.return_value = mock
+        mock_query.return_value.where.return_value.first.return_value = mock
+        mock_query1.return_value.where.return_value.first.return_value = mock
         yield mock
 
 
@@ -158,7 +158,7 @@ def test_build_from_remote_url(mock_http_head):
 def test_tool_file_not_found():
     """Test ToolFile not found in database."""
     with patch("factories.file_factory.db.session.query") as mock_query:
-        mock_query.return_value.filter.return_value.first.return_value = None
+        mock_query.return_value.where.return_value.first.return_value = None
         mapping = tool_file_mapping()
         with pytest.raises(ValueError, match=f"ToolFile {TEST_TOOL_FILE_ID} not found"):
             build_from_mapping(mapping=mapping, tenant_id=TEST_TENANT_ID)

api/tests/unit_tests/services/auth/test_api_key_auth_service.py

@@ -28,7 +28,7 @@ class TestApiKeyAuthService:
         mock_binding.provider = self.provider
         mock_binding.disabled = False
 
-        mock_session.query.return_value.filter.return_value.all.return_value = [mock_binding]
+        mock_session.query.return_value.where.return_value.all.return_value = [mock_binding]
 
         result = ApiKeyAuthService.get_provider_auth_list(self.tenant_id)
 
@@ -39,7 +39,7 @@ class TestApiKeyAuthService:
     @patch("services.auth.api_key_auth_service.db.session")
     def test_get_provider_auth_list_empty(self, mock_session):
         """Test get provider auth list - empty result"""
-        mock_session.query.return_value.filter.return_value.all.return_value = []
+        mock_session.query.return_value.where.return_value.all.return_value = []
 
         result = ApiKeyAuthService.get_provider_auth_list(self.tenant_id)
 
@@ -48,7 +48,7 @@ class TestApiKeyAuthService:
     @patch("services.auth.api_key_auth_service.db.session")
     def test_get_provider_auth_list_filters_disabled(self, mock_session):
         """Test get provider auth list - filters disabled items"""
-        mock_session.query.return_value.filter.return_value.all.return_value = []
+        mock_session.query.return_value.where.return_value.all.return_value = []
 
         ApiKeyAuthService.get_provider_auth_list(self.tenant_id)
 
@@ -138,7 +138,7 @@ class TestApiKeyAuthService:
         # Mock database query result
         mock_binding = Mock()
         mock_binding.credentials = json.dumps(self.mock_credentials)
-        mock_session.query.return_value.filter.return_value.first.return_value = mock_binding
+        mock_session.query.return_value.where.return_value.first.return_value = mock_binding
         mock_session.query.return_value.where.return_value.first.return_value = mock_binding
 
         result = ApiKeyAuthService.get_auth_credentials(self.tenant_id, self.category, self.provider)
@@ -149,7 +149,7 @@ class TestApiKeyAuthService:
     @patch("services.auth.api_key_auth_service.db.session")
     def test_get_auth_credentials_not_found(self, mock_session):
         """Test get auth credentials - not found"""
-        mock_session.query.return_value.filter.return_value.first.return_value = None
+        mock_session.query.return_value.where.return_value.first.return_value = None
 
         result = ApiKeyAuthService.get_auth_credentials(self.tenant_id, self.category, self.provider)
 
@@ -158,7 +158,7 @@ class TestApiKeyAuthService:
     @patch("services.auth.api_key_auth_service.db.session")
     def test_get_auth_credentials_filters_correctly(self, mock_session):
         """Test get auth credentials - applies correct filters"""
-        mock_session.query.return_value.filter.return_value.first.return_value = None
+        mock_session.query.return_value.where.return_value.first.return_value = None
 
         ApiKeyAuthService.get_auth_credentials(self.tenant_id, self.category, self.provider)
 
@@ -174,7 +174,7 @@ class TestApiKeyAuthService:
 
         mock_binding = Mock()
         mock_binding.credentials = json.dumps(special_credentials, ensure_ascii=False)
-        mock_session.query.return_value.filter.return_value.first.return_value = mock_binding
+        mock_session.query.return_value.where.return_value.first.return_value = mock_binding
 
         result = ApiKeyAuthService.get_auth_credentials(self.tenant_id, self.category, self.provider)
 
@@ -186,7 +186,7 @@ class TestApiKeyAuthService:
         """Test delete provider auth - success scenario"""
         # Mock database query result
         mock_binding = Mock()
-        mock_session.query.return_value.filter.return_value.first.return_value = mock_binding
+        mock_session.query.return_value.where.return_value.first.return_value = mock_binding
 
         ApiKeyAuthService.delete_provider_auth(self.tenant_id, self.binding_id)
 
@@ -197,7 +197,7 @@ class TestApiKeyAuthService:
     @patch("services.auth.api_key_auth_service.db.session")
     def test_delete_provider_auth_not_found(self, mock_session):
         """Test delete provider auth - not found"""
-        mock_session.query.return_value.filter.return_value.first.return_value = None
+        mock_session.query.return_value.where.return_value.first.return_value = None
 
         ApiKeyAuthService.delete_provider_auth(self.tenant_id, self.binding_id)
 
@@ -208,7 +208,7 @@ class TestApiKeyAuthService:
     @patch("services.auth.api_key_auth_service.db.session")
     def test_delete_provider_auth_filters_by_tenant(self, mock_session):
         """Test delete provider auth - filters by tenant"""
-        mock_session.query.return_value.filter.return_value.first.return_value = None
+        mock_session.query.return_value.where.return_value.first.return_value = None
 
         ApiKeyAuthService.delete_provider_auth(self.tenant_id, self.binding_id)
 
@@ -337,7 +337,7 @@ class TestApiKeyAuthService:
         # Mock database returning invalid JSON
         mock_binding = Mock()
         mock_binding.credentials = "invalid json content"
-        mock_session.query.return_value.filter.return_value.first.return_value = mock_binding
+        mock_session.query.return_value.where.return_value.first.return_value = mock_binding
 
         with pytest.raises(json.JSONDecodeError):
             ApiKeyAuthService.get_auth_credentials(self.tenant_id, self.category, self.provider)

api/tests/unit_tests/services/test_account_service.py

@@ -1384,7 +1384,7 @@ class TestRegisterService:
             mock_query1.filter.return_value.first.return_value = mock_tenant
 
             mock_query2 = MagicMock()
-            mock_query2.join.return_value.filter.return_value.first.return_value = (mock_account, "normal")
+            mock_query2.join.return_value.where.return_value.first.return_value = (mock_account, "normal")
 
             mock_db_dependencies["db"].session.query.side_effect = [mock_query1, mock_query2]
 
@@ -1449,7 +1449,7 @@ class TestRegisterService:
         mock_query1.filter.return_value.first.return_value = mock_tenant
 
         mock_query2 = MagicMock()
-        mock_query2.join.return_value.filter.return_value.first.return_value = None  # No account found
+        mock_query2.join.return_value.where.return_value.first.return_value = None  # No account found
 
         mock_db_dependencies["db"].session.query.side_effect = [mock_query1, mock_query2]
 
@@ -1482,7 +1482,7 @@ class TestRegisterService:
         mock_query1.filter.return_value.first.return_value = mock_tenant
 
         mock_query2 = MagicMock()
-        mock_query2.join.return_value.filter.return_value.first.return_value = (mock_account, "normal")
+        mock_query2.join.return_value.where.return_value.first.return_value = (mock_account, "normal")
 
         mock_db_dependencies["db"].session.query.side_effect = [mock_query1, mock_query2]
 

api/tests/unit_tests/services/workflow/test_workflow_deletion.py

@@ -43,7 +43,7 @@ def test_delete_workflow_success(workflow_setup):
     # Setup mocks
 
     # Mock the tool provider query to return None (not published as a tool)
-    workflow_setup["session"].query.return_value.filter.return_value.first.return_value = None
+    workflow_setup["session"].query.return_value.where.return_value.first.return_value = None
 
     workflow_setup["session"].scalar = MagicMock(
         side_effect=[workflow_setup["workflow"], None]
@@ -106,7 +106,7 @@ def test_delete_workflow_published_as_tool_error(workflow_setup):
 
     # Mock the tool provider query
     mock_tool_provider = MagicMock(spec=WorkflowToolProvider)
-    workflow_setup["session"].query.return_value.filter.return_value.first.return_value = mock_tool_provider
+    workflow_setup["session"].query.return_value.where.return_value.first.return_value = mock_tool_provider
 
     workflow_setup["session"].scalar = MagicMock(
         side_effect=[workflow_setup["workflow"], None]