fix: tests fix and ruff fix

Author: SoulPancake

example/example1/requirements.txt

@@ -8,4 +8,4 @@ openfga-sdk >= 0.9.7
 python-dateutil >= 2.9.0.post0
 urllib3 >= 1.26.19, != 2.0.*, != 2.1.*, != 2.2.0, != 2.2.1, < 3
 yarl >= 1.20.1
-python-dotenv >= 1, <2
+python-dotenv >= 1, <2

openfga_sdk/client/client.py

@@ -39,12 +39,6 @@
 from openfga_sdk.client.models.list_users_request import ClientListUsersRequest
 from openfga_sdk.client.models.read_changes_request import ClientReadChangesRequest
 from openfga_sdk.client.models.tuple import ClientTuple, convert_tuple_keys
-from openfga_sdk.client.models.write_conflict_opts import (
-    ClientWriteRequestOnDuplicateWrites,
-    ClientWriteRequestOnMissingDeletes,
-    ConflictOptions,
-)
-from openfga_sdk.client.models.write_options import ClientWriteOptions
 from openfga_sdk.client.models.write_request import ClientWriteRequest
 from openfga_sdk.client.models.write_response import ClientWriteResponse
 from openfga_sdk.client.models.write_single_response import (

openfga_sdk/models/write_request_deletes.py

@@ -106,9 +106,7 @@ def on_missing(self, on_missing):
             and on_missing not in allowed_values
         ):
             raise ValueError(
-                "Invalid value for `on_missing` ({0}), must be one of {1}".format(
-                    on_missing, allowed_values
-                )
+                f"Invalid value for `on_missing` ({on_missing}), must be one of {allowed_values}"
             )
 
         self._on_missing = on_missing

openfga_sdk/models/write_request_writes.py

@@ -106,9 +106,7 @@ def on_duplicate(self, on_duplicate):
             and on_duplicate not in allowed_values
         ):
             raise ValueError(
-                "Invalid value for `on_duplicate` ({0}), must be one of {1}".format(
-                    on_duplicate, allowed_values
-                )
+                f"Invalid value for `on_duplicate` ({on_duplicate}), must be one of {allowed_values}"
             )
 
         self._on_duplicate = on_duplicate

openfga_sdk/sync/client/client.py

@@ -38,12 +38,6 @@
 from openfga_sdk.client.models.list_users_request import ClientListUsersRequest
 from openfga_sdk.client.models.read_changes_request import ClientReadChangesRequest
 from openfga_sdk.client.models.tuple import ClientTuple, convert_tuple_keys
-from openfga_sdk.client.models.write_conflict_opts import (
-    ClientWriteRequestOnDuplicateWrites,
-    ClientWriteRequestOnMissingDeletes,
-    ConflictOptions,
-)
-from openfga_sdk.client.models.write_options import ClientWriteOptions
 from openfga_sdk.client.models.write_request import ClientWriteRequest
 from openfga_sdk.client.models.write_response import ClientWriteResponse
 from openfga_sdk.client.models.write_single_response import (

test/client/client_test.py

@@ -3901,17 +3901,9 @@ def client_configuration():
     )
 
 
-class TestClientConfigurationHeaders(IsolatedAsyncioTestCase):
+class TestClientConfigurationHeaders:
     """Tests for ClientConfiguration headers parameter"""
 
-    def setUp(self):
-        self.configuration = ClientConfiguration(
-            api_url="http://api.fga.example",
-        )
-
-    def tearDown(self):
-        pass
-
     def test_client_configuration_headers_default_none(self, client_configuration):
         """Test that headers default to an empty dict in ClientConfiguration"""
         assert client_configuration.headers == {}
@@ -3975,6 +3967,7 @@ def test_client_configuration_headers_deepcopy(self):
         assert "X-New" not in copied_config.headers
 
     @patch.object(rest.RESTClientObject, "request")
+    @pytest.mark.asyncio
     async def test_write_with_conflict_options_ignore_duplicates(self, mock_request):
         """Test case for write with conflict options - ignore duplicates"""
         from openfga_sdk.client.models.write_conflict_opts import (
@@ -3984,6 +3977,9 @@ async def test_write_with_conflict_options_ignore_duplicates(self, mock_request)
 
         response_body = "{}"
         mock_request.return_value = mock_response(response_body, 200)
+        self.configuration = ClientConfiguration(
+            api_url="http://api.fga.example",
+        )
         configuration = self.configuration
         configuration.store_id = store_id
         async with OpenFgaClient(configuration) as api_client:
@@ -4029,6 +4025,7 @@ async def test_write_with_conflict_options_ignore_duplicates(self, mock_request)
             )
 
     @patch.object(rest.RESTClientObject, "request")
+    @pytest.mark.asyncio
     async def test_write_with_conflict_options_ignore_missing_deletes(
         self, mock_request
     ):
@@ -4040,6 +4037,9 @@ async def test_write_with_conflict_options_ignore_missing_deletes(
 
         response_body = "{}"
         mock_request.return_value = mock_response(response_body, 200)
+        self.configuration = ClientConfiguration(
+            api_url="http://api.fga.example",
+        )
         configuration = self.configuration
         configuration.store_id = store_id
         async with OpenFgaClient(configuration) as api_client:
@@ -4085,6 +4085,7 @@ async def test_write_with_conflict_options_ignore_missing_deletes(
             )
 
     @patch.object(rest.RESTClientObject, "request")
+    @pytest.mark.asyncio
     async def test_write_with_conflict_options_both(self, mock_request):
         """Test case for write with both conflict options"""
         from openfga_sdk.client.models.write_conflict_opts import (
@@ -4095,6 +4096,9 @@ async def test_write_with_conflict_options_both(self, mock_request):
 
         response_body = "{}"
         mock_request.return_value = mock_response(response_body, 200)
+        self.configuration = ClientConfiguration(
+            api_url="http://api.fga.example",
+        )
         configuration = self.configuration
         configuration.store_id = store_id
         async with OpenFgaClient(configuration) as api_client:

test/sync/client/client_test.py

@@ -3880,17 +3880,9 @@ def client_configuration():
     )
 
 
-class TestSyncClientConfigurationHeaders(IsolatedAsyncioTestCase):
+class TestSyncClientConfigurationHeaders:
     """Tests for ClientConfiguration headers parameter in sync client"""
 
-    def setUp(self):
-        self.configuration = ClientConfiguration(
-            api_url="http://api.fga.example",
-        )
-
-    def tearDown(self):
-        pass
-
     def test_sync_client_configuration_headers_default_none(self, client_configuration):
         """Test that headers default to an empty dict in ClientConfiguration"""
         assert client_configuration.headers == {}
@@ -3971,7 +3963,9 @@ def test_sync_write_with_conflict_options_ignore_duplicates(self, mock_request):
 
         response_body = "{}"
         mock_request.return_value = mock_response(response_body, 200)
-        configuration = self.configuration
+        configuration = ClientConfiguration(
+            api_url="http://api.fga.example",
+        )
         configuration.store_id = store_id
         with OpenFgaClient(configuration) as api_client:
             body = ClientWriteRequest(
@@ -4027,7 +4021,9 @@ def test_sync_write_with_conflict_options_ignore_missing_deletes(
 
         response_body = "{}"
         mock_request.return_value = mock_response(response_body, 200)
-        configuration = self.configuration
+        configuration = ClientConfiguration(
+            api_url="http://api.fga.example",
+        )
         configuration.store_id = store_id
         with OpenFgaClient(configuration) as api_client:
             body = ClientWriteRequest(
@@ -4082,7 +4078,9 @@ def test_sync_write_with_conflict_options_both(self, mock_request):
 
         response_body = "{}"
         mock_request.return_value = mock_response(response_body, 200)
-        configuration = self.configuration
+        configuration = ClientConfiguration(
+            api_url="http://api.fga.example",
+        )
         configuration.store_id = store_id
         with OpenFgaClient(configuration) as api_client:
             body = ClientWriteRequest(