more typed orm (#28331)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-01-08 07:14:14 +00:00 · 2025-11-21 14:23:32 +09:00
parent 5f61ca5e6f
commit 3c30d0f41b
6 changed files with 167 additions and 124 deletions
--- a/api/tests/test_containers_integration_tests/services/test_api_based_extension_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_api_based_extension_service.py
@@ -69,13 +69,14 @@ class TestAPIBasedExtensionService:
        account, tenant = self._create_test_account_and_tenant(
            db_session_with_containers, mock_external_service_dependencies
        )
-
+        assert tenant is not None
        # Setup extension data
-        extension_data = APIBasedExtension()
-        extension_data.tenant_id = tenant.id
-        extension_data.name = fake.company()
-        extension_data.api_endpoint = f"https://{fake.domain_name()}/api"
-        extension_data.api_key = fake.password(length=20)
+        extension_data = APIBasedExtension(
+            tenant_id=tenant.id,
+            name=fake.company(),
+            api_endpoint=f"https://{fake.domain_name()}/api",
+            api_key=fake.password(length=20),
+        )

        # Save extension
        saved_extension = APIBasedExtensionService.save(extension_data)
@@ -105,13 +106,14 @@ class TestAPIBasedExtensionService:
        account, tenant = self._create_test_account_and_tenant(
            db_session_with_containers, mock_external_service_dependencies
        )
-
+        assert tenant is not None
        # Test empty name
-        extension_data = APIBasedExtension()
-        extension_data.tenant_id = tenant.id
-        extension_data.name = ""
-        extension_data.api_endpoint = f"https://{fake.domain_name()}/api"
-        extension_data.api_key = fake.password(length=20)
+        extension_data = APIBasedExtension(
+            tenant_id=tenant.id,
+            name="",
+            api_endpoint=f"https://{fake.domain_name()}/api",
+            api_key=fake.password(length=20),
+        )

        with pytest.raises(ValueError, match="name must not be empty"):
            APIBasedExtensionService.save(extension_data)
@@ -141,12 +143,14 @@ class TestAPIBasedExtensionService:

        # Create multiple extensions
        extensions = []
+        assert tenant is not None
        for i in range(3):
-            extension_data = APIBasedExtension()
-            extension_data.tenant_id = tenant.id
-            extension_data.name = f"Extension {i}: {fake.company()}"
-            extension_data.api_endpoint = f"https://{fake.domain_name()}/api"
-            extension_data.api_key = fake.password(length=20)
+            extension_data = APIBasedExtension(
+                tenant_id=tenant.id,
+                name=f"Extension {i}: {fake.company()}",
+                api_endpoint=f"https://{fake.domain_name()}/api",
+                api_key=fake.password(length=20),
+            )

            saved_extension = APIBasedExtensionService.save(extension_data)
            extensions.append(saved_extension)
@@ -173,13 +177,14 @@ class TestAPIBasedExtensionService:
        account, tenant = self._create_test_account_and_tenant(
            db_session_with_containers, mock_external_service_dependencies
        )
-
+        assert tenant is not None
        # Create an extension
-        extension_data = APIBasedExtension()
-        extension_data.tenant_id = tenant.id
-        extension_data.name = fake.company()
-        extension_data.api_endpoint = f"https://{fake.domain_name()}/api"
-        extension_data.api_key = fake.password(length=20)
+        extension_data = APIBasedExtension(
+            tenant_id=tenant.id,
+            name=fake.company(),
+            api_endpoint=f"https://{fake.domain_name()}/api",
+            api_key=fake.password(length=20),
+        )

        created_extension = APIBasedExtensionService.save(extension_data)

@@ -217,13 +222,14 @@ class TestAPIBasedExtensionService:
        account, tenant = self._create_test_account_and_tenant(
            db_session_with_containers, mock_external_service_dependencies
        )
-
+        assert tenant is not None
        # Create an extension first
-        extension_data = APIBasedExtension()
-        extension_data.tenant_id = tenant.id
-        extension_data.name = fake.company()
-        extension_data.api_endpoint = f"https://{fake.domain_name()}/api"
-        extension_data.api_key = fake.password(length=20)
+        extension_data = APIBasedExtension(
+            tenant_id=tenant.id,
+            name=fake.company(),
+            api_endpoint=f"https://{fake.domain_name()}/api",
+            api_key=fake.password(length=20),
+        )

        created_extension = APIBasedExtensionService.save(extension_data)
        extension_id = created_extension.id
@@ -245,22 +251,23 @@ class TestAPIBasedExtensionService:
        account, tenant = self._create_test_account_and_tenant(
            db_session_with_containers, mock_external_service_dependencies
        )
-
+        assert tenant is not None
        # Create first extension
-        extension_data1 = APIBasedExtension()
-        extension_data1.tenant_id = tenant.id
-        extension_data1.name = "Test Extension"
-        extension_data1.api_endpoint = f"https://{fake.domain_name()}/api"
-        extension_data1.api_key = fake.password(length=20)
+        extension_data1 = APIBasedExtension(
+            tenant_id=tenant.id,
+            name="Test Extension",
+            api_endpoint=f"https://{fake.domain_name()}/api",
+            api_key=fake.password(length=20),
+        )

        APIBasedExtensionService.save(extension_data1)
-
        # Try to create second extension with same name
-        extension_data2 = APIBasedExtension()
-        extension_data2.tenant_id = tenant.id
-        extension_data2.name = "Test Extension"  # Same name
-        extension_data2.api_endpoint = f"https://{fake.domain_name()}/api"
-        extension_data2.api_key = fake.password(length=20)
+        extension_data2 = APIBasedExtension(
+            tenant_id=tenant.id,
+            name="Test Extension",  # Same name
+            api_endpoint=f"https://{fake.domain_name()}/api",
+            api_key=fake.password(length=20),
+        )

        with pytest.raises(ValueError, match="name must be unique, it is already existed"):
            APIBasedExtensionService.save(extension_data2)
@@ -273,13 +280,14 @@ class TestAPIBasedExtensionService:
        account, tenant = self._create_test_account_and_tenant(
            db_session_with_containers, mock_external_service_dependencies
        )
-
+        assert tenant is not None
        # Create initial extension
-        extension_data = APIBasedExtension()
-        extension_data.tenant_id = tenant.id
-        extension_data.name = fake.company()
-        extension_data.api_endpoint = f"https://{fake.domain_name()}/api"
-        extension_data.api_key = fake.password(length=20)
+        extension_data = APIBasedExtension(
+            tenant_id=tenant.id,
+            name=fake.company(),
+            api_endpoint=f"https://{fake.domain_name()}/api",
+            api_key=fake.password(length=20),
+        )

        created_extension = APIBasedExtensionService.save(extension_data)

@@ -330,13 +338,14 @@ class TestAPIBasedExtensionService:
        mock_external_service_dependencies["requestor_instance"].request.side_effect = ValueError(
            "connection error: request timeout"
        )
-
+        assert tenant is not None
        # Setup extension data
-        extension_data = APIBasedExtension()
-        extension_data.tenant_id = tenant.id
-        extension_data.name = fake.company()
-        extension_data.api_endpoint = "https://invalid-endpoint.com/api"
-        extension_data.api_key = fake.password(length=20)
+        extension_data = APIBasedExtension(
+            tenant_id=tenant.id,
+            name=fake.company(),
+            api_endpoint="https://invalid-endpoint.com/api",
+            api_key=fake.password(length=20),
+        )

        # Try to save extension with connection error
        with pytest.raises(ValueError, match="connection error: request timeout"):
@@ -352,13 +361,14 @@ class TestAPIBasedExtensionService:
        account, tenant = self._create_test_account_and_tenant(
            db_session_with_containers, mock_external_service_dependencies
        )
-
+        assert tenant is not None
        # Setup extension data with short API key
-        extension_data = APIBasedExtension()
-        extension_data.tenant_id = tenant.id
-        extension_data.name = fake.company()
-        extension_data.api_endpoint = f"https://{fake.domain_name()}/api"
-        extension_data.api_key = "1234"  # Less than 5 characters
+        extension_data = APIBasedExtension(
+            tenant_id=tenant.id,
+            name=fake.company(),
+            api_endpoint=f"https://{fake.domain_name()}/api",
+            api_key="1234",  # Less than 5 characters
+        )

        # Try to save extension with short API key
        with pytest.raises(ValueError, match="api_key must be at least 5 characters"):
@@ -372,13 +382,14 @@ class TestAPIBasedExtensionService:
        account, tenant = self._create_test_account_and_tenant(
            db_session_with_containers, mock_external_service_dependencies
        )
-
+        assert tenant is not None
        # Test with None values
-        extension_data = APIBasedExtension()
-        extension_data.tenant_id = tenant.id
-        extension_data.name = None
-        extension_data.api_endpoint = f"https://{fake.domain_name()}/api"
-        extension_data.api_key = fake.password(length=20)
+        extension_data = APIBasedExtension(
+            tenant_id=tenant.id,
+            name=None,  # type: ignore # why str become None here???
+            api_endpoint=f"https://{fake.domain_name()}/api",
+            api_key=fake.password(length=20),
+        )

        with pytest.raises(ValueError, match="name must not be empty"):
            APIBasedExtensionService.save(extension_data)
@@ -424,13 +435,14 @@ class TestAPIBasedExtensionService:

        # Mock invalid ping response
        mock_external_service_dependencies["requestor_instance"].request.return_value = {"result": "invalid"}
-
+        assert tenant is not None
        # Setup extension data
-        extension_data = APIBasedExtension()
-        extension_data.tenant_id = tenant.id
-        extension_data.name = fake.company()
-        extension_data.api_endpoint = f"https://{fake.domain_name()}/api"
-        extension_data.api_key = fake.password(length=20)
+        extension_data = APIBasedExtension(
+            tenant_id=tenant.id,
+            name=fake.company(),
+            api_endpoint=f"https://{fake.domain_name()}/api",
+            api_key=fake.password(length=20),
+        )

        # Try to save extension with invalid ping response
        with pytest.raises(ValueError, match="{'result': 'invalid'}"):
@@ -447,13 +459,14 @@ class TestAPIBasedExtensionService:

        # Mock ping response without result field
        mock_external_service_dependencies["requestor_instance"].request.return_value = {"status": "ok"}
-
+        assert tenant is not None
        # Setup extension data
-        extension_data = APIBasedExtension()
-        extension_data.tenant_id = tenant.id
-        extension_data.name = fake.company()
-        extension_data.api_endpoint = f"https://{fake.domain_name()}/api"
-        extension_data.api_key = fake.password(length=20)
+        extension_data = APIBasedExtension(
+            tenant_id=tenant.id,
+            name=fake.company(),
+            api_endpoint=f"https://{fake.domain_name()}/api",
+            api_key=fake.password(length=20),
+        )

        # Try to save extension with missing ping result
        with pytest.raises(ValueError, match="{'status': 'ok'}"):
@@ -472,13 +485,14 @@ class TestAPIBasedExtensionService:
        account2, tenant2 = self._create_test_account_and_tenant(
            db_session_with_containers, mock_external_service_dependencies
        )
-
+        assert tenant1 is not None
        # Create extension in first tenant
-        extension_data = APIBasedExtension()
-        extension_data.tenant_id = tenant1.id
-        extension_data.name = fake.company()
-        extension_data.api_endpoint = f"https://{fake.domain_name()}/api"
-        extension_data.api_key = fake.password(length=20)
+        extension_data = APIBasedExtension(
+            tenant_id=tenant1.id,
+            name=fake.company(),
+            api_endpoint=f"https://{fake.domain_name()}/api",
+            api_key=fake.password(length=20),
+        )

        created_extension = APIBasedExtensionService.save(extension_data)