options.store_id = store_id or options.store_id or self.configuration.store_id

Author: Evan Sims

openfga_sdk/api/open_fga_api.py

@@ -140,6 +140,7 @@ async def create_store(
         body: CreateStoreRequest,
         options: CreateStoreRequestOptions | None = None,
     ) -> CreateStoreResponse | ApiClientResponseProtocol:
+        options = options or CreateStoreRequestOptions()
         response = await self.api.create_store(body, options)
 
         if options.return_response:
@@ -149,10 +150,12 @@ async def create_store(
 
     async def get_store(
         self,
-        store_id: str,
+        store_id: str | None = None,
         options: GetStoreRequestOptions | None = None,
     ) -> GetStoreResponse | ApiClientResponseProtocol:
-        response = await self.api.get_store(store_id, options)
+        options = options or GetStoreRequestOptions()
+        options.store_id = store_id or options.store_id or self.configuration.store_id
+        response = await self.api.get_store(options)
 
         if options.return_response:
             return response
@@ -161,9 +164,11 @@ async def get_store(
 
     async def delete_store(
         self,
-        store_id: str,
+        store_id: str | None = None,
         options: DeleteStoreRequestOptions | None = None,
     ) -> None | ApiClientResponseProtocol:
+        options = options or DeleteStoreRequestOptions()
+        options.store_id = store_id or options.store_id or self.configuration.store_id
         response = await self.api.delete_store(store_id, options)
 
         if options.return_response:

openfga_sdk/client/client.py

@@ -147,10 +147,13 @@ def from_options(
         if options is None:
             return params
 
-        if options.page_size:
+        if hasattr(options, "page_size") and options.page_size is not None:
             params.add_parameter("page_size", str(options.page_size))
 
-        if options.continuation_token:
+        if (
+            hasattr(options, "continuation_token")
+            and options.continuation_token is not None
+        ):
             params.add_parameter("continuation_token", options.continuation_token)
 
         return params

openfga_sdk/common/rest.py

@@ -100,7 +100,7 @@ async def obtain_token(
             }
         )
 
-        for attempt in range(self.configuration.retry_params.max_retry + 1):
+        for attempt in range(self.configuration.retry_params.max_retries + 1):
             response = await client.request(
                 method="POST",
                 url=token_url,
@@ -110,7 +110,7 @@ async def obtain_token(
 
             if 500 <= response.status <= 599 or response.status == 429:
                 if (
-                    attempt < self.configuration.retry_params.max_retry
+                    attempt < self.configuration.retry_params.max_retries
                     and response.status != 501
                 ):
                     await asyncio.sleep(

openfga_sdk/oauth2.py

@@ -291,11 +291,6 @@ def remove_cookie(self, name: str) -> None: ...
     def items(self): ...
 
 
-@runtime_checkable
-class OAuth2ClientProtocol(Protocol):
-    pass
-
-
 @runtime_checkable
 class RestClientResponseProtocol(Protocol):
     response: (
@@ -394,6 +389,14 @@ def build_request(
     ) -> RestClientRequestProtocol: ...
 
 
+@runtime_checkable
+class OAuth2ClientProtocol(Protocol):
+    def get_authentication_header(
+        self,
+        client: RestClientProtocol,
+    ) -> HttpHeaderProtocol: ...
+
+
 @runtime_checkable
 class TelemetryAttributeProtocol(Protocol):
     # Duck type for TelemetryAttribute, as NamedTuples cannot inherit from Protocol

openfga_sdk/protocols.py

@@ -14,7 +14,6 @@
 
 from concurrent.futures import ThreadPoolExecutor
 
-from openfga_sdk.client.configuration import ClientConfiguration
 from openfga_sdk.client.models.assertion import ClientAssertion
 from openfga_sdk.client.models.batch_check_item import (
     ClientBatchCheckItem,
@@ -44,6 +43,7 @@
     construct_write_single_response,
 )
 from openfga_sdk.common.client import OpenFgaClientBase
+from openfga_sdk.common.options import WriteTransactionOptions
 from openfga_sdk.exceptions import (
     AuthenticationError,
     FgaValidationException,
@@ -342,7 +342,7 @@ def _write_single_batch(
     def _write_batches(
         self,
         tuple_keys: list[ClientTuple],
-        transaction: WriteTransactionOpts,
+        transaction: WriteTransactionOptions,
         is_write: bool,
         options: dict[str, int | str | dict[str, int | str]] | None = None,
     ):

openfga_sdk/sync/client.py

@@ -100,7 +100,7 @@ def obtain_token(
             }
         )
 
-        for attempt in range(self.configuration.retry_params.max_retry + 1):
+        for attempt in range(self.configuration.retry_params.max_retries + 1):
             response = client.request(
                 method="POST",
                 url=token_url,
@@ -110,7 +110,7 @@ def obtain_token(
 
             if 500 <= response.status <= 599 or response.status == 429:
                 if (
-                    attempt < self.configuration.retry_params.max_retry
+                    attempt < self.configuration.retry_params.max_retries
                     and response.status != 501
                 ):
                     time.sleep(

openfga_sdk/sync/oauth2.py

@@ -342,7 +342,7 @@ def check_with_http_info(self, body, **kwargs):
             attributes=telemetry_attributes,
         )
 
-        return self.api_client.call_api(
+        return self.api_client.request(
             "/stores/{store_id}/check".replace("{store_id}", store_id),
             "POST",
             path_params,
@@ -493,7 +493,7 @@ def create_store_with_http_info(self, body, **kwargs):
             attributes=telemetry_attributes,
         )
 
-        return self.api_client.call_api(
+        return self.api_client.request(
             "/stores",
             "POST",
             path_params,
@@ -625,7 +625,7 @@ def delete_store_with_http_info(self, **kwargs):
             attributes=telemetry_attributes,
         )
 
-        return self.api_client.call_api(
+        return self.api_client.request(
             "/stores/{store_id}".replace("{store_id}", store_id),
             "DELETE",
             path_params,
@@ -790,7 +790,7 @@ def expand_with_http_info(self, body, **kwargs):
             attributes=telemetry_attributes,
         )
 
-        return self.api_client.call_api(
+        return self.api_client.request(
             "/stores/{store_id}/expand".replace("{store_id}", store_id),
             "POST",
             path_params,
@@ -931,7 +931,7 @@ def get_store_with_http_info(self, **kwargs):
             attributes=telemetry_attributes,
         )
 
-        return self.api_client.call_api(
+        return self.api_client.request(
             "/stores/{store_id}".replace("{store_id}", store_id),
             "GET",
             path_params,
@@ -1096,7 +1096,7 @@ def list_objects_with_http_info(self, body, **kwargs):
             attributes=telemetry_attributes,
         )
 
-        return self.api_client.call_api(
+        return self.api_client.request(
             "/stores/{store_id}/list-objects".replace("{store_id}", store_id),
             "POST",
             path_params,
@@ -1245,7 +1245,7 @@ def list_stores_with_http_info(self, **kwargs):
             attributes=telemetry_attributes,
         )
 
-        return self.api_client.call_api(
+        return self.api_client.request(
             "/stores",
             "GET",
             path_params,
@@ -1410,7 +1410,7 @@ def list_users_with_http_info(self, body, **kwargs):
             attributes=telemetry_attributes,
         )
 
-        return self.api_client.call_api(
+        return self.api_client.request(
             "/stores/{store_id}/list-users".replace("{store_id}", store_id),
             "POST",
             path_params,
@@ -1575,7 +1575,7 @@ def read_with_http_info(self, body, **kwargs):
             attributes=telemetry_attributes,
         )
 
-        return self.api_client.call_api(
+        return self.api_client.request(
             "/stores/{store_id}/read".replace("{store_id}", store_id),
             "POST",
             path_params,
@@ -1733,7 +1733,7 @@ def read_assertions_with_http_info(self, authorization_model_id, **kwargs):
             attributes=telemetry_attributes,
         )
 
-        return self.api_client.call_api(
+        return self.api_client.request(
             "/stores/{store_id}/assertions/{authorization_model_id}".replace(
                 "{store_id}", store_id
             ),
@@ -1891,7 +1891,7 @@ def read_authorization_model_with_http_info(self, id, **kwargs):
             attributes=telemetry_attributes,
         )
 
-        return self.api_client.call_api(
+        return self.api_client.request(
             "/stores/{store_id}/authorization-models/{id}".replace(
                 "{store_id}", store_id
             ),
@@ -2048,7 +2048,7 @@ def read_authorization_models_with_http_info(self, **kwargs):
             attributes=telemetry_attributes,
         )
 
-        return self.api_client.call_api(
+        return self.api_client.request(
             "/stores/{store_id}/authorization-models".replace("{store_id}", store_id),
             "GET",
             path_params,
@@ -2215,7 +2215,7 @@ def read_changes_with_http_info(self, **kwargs):
             attributes=telemetry_attributes,
         )
 
-        return self.api_client.call_api(
+        return self.api_client.request(
             "/stores/{store_id}/changes".replace("{store_id}", store_id),
             "GET",
             path_params,
@@ -2380,7 +2380,7 @@ def streamed_list_objects_with_http_info(self, body, **kwargs):
             attributes=telemetry_attributes,
         )
 
-        return self.api_client.call_api(
+        return self.api_client.request(
             "/stores/{store_id}/streamed-list-objects".replace("{store_id}", store_id),
             "POST",
             path_params,
@@ -2545,7 +2545,7 @@ def write_with_http_info(self, body, **kwargs):
             attributes=telemetry_attributes,
         )
 
-        return self.api_client.call_api(
+        return self.api_client.request(
             "/stores/{store_id}/write".replace("{store_id}", store_id),
             "POST",
             path_params,
@@ -2720,7 +2720,7 @@ def write_assertions_with_http_info(self, authorization_model_id, body, **kwargs
             attributes=telemetry_attributes,
         )
 
-        return self.api_client.call_api(
+        return self.api_client.request(
             "/stores/{store_id}/assertions/{authorization_model_id}".replace(
                 "{store_id}", store_id
             ),
@@ -2887,7 +2887,7 @@ def write_authorization_model_with_http_info(self, body, **kwargs):
             attributes=telemetry_attributes,
         )
 
-        return self.api_client.call_api(
+        return self.api_client.request(
             "/stores/{store_id}/authorization-models".replace("{store_id}", store_id),
             "POST",
             path_params,

openfga_sdk/sync/open_fga_api.py

@@ -1275,7 +1275,7 @@ async def test_500_error(self, mock_request):
 
         configuration = self.configuration
         configuration.store_id = store_id
-        configuration.retry_params.max_retry = 0
+        configuration.retry_params.max_retries = 0
 
         async with openfga_sdk.ApiClient(configuration) as api_client:
 

test/api/open_fga_api_test.py

@@ -709,7 +709,7 @@
 #                     "page_size": 50,
 #                     "continuation_token": "eyJwayI6IkxBVEVTVF9OU0NPTkZJR19hdXRoMHN0b3JlIiwic2siOiIxem1qbXF3MWZLZExTcUoyN01MdTdqTjh0cWgifQ==",
 #                     "consistency": ConsistencyPreference.MINIMIZE_LATENCY,
-#                     "retry_params": RetryParams(max_retry=3, min_wait_in_ms=1000),
+#                     "retry_params": RetryParams(max_retries=3, min_wait_in_ms=1000),
 #                 },
 #             )
 #             self.assertIsInstance(api_response, ReadResponse)