pluralize ApiKeyModule, ApiKey and AsyncApiKey

Author: denizs

workos/_base_client.py

@@ -1,22 +1,21 @@
-from abc import abstractmethod
 import os
+from abc import abstractmethod
 from typing import Optional
-from workos.__about__ import __version__
+
 from workos._client_configuration import ClientConfiguration
-from workos.fga import FGAModule
-from workos.utils._base_http_client import DEFAULT_REQUEST_TIMEOUT
-from workos.utils.http_client import HTTPClient
-from workos.api_key import ApiKeyModule
+from workos.api_keys import ApiKeysModule
 from workos.audit_logs import AuditLogsModule
 from workos.directory_sync import DirectorySyncModule
 from workos.events import EventsModule
+from workos.fga import FGAModule
 from workos.mfa import MFAModule
-from workos.organizations import OrganizationsModule
 from workos.organization_domains import OrganizationDomainsModule
+from workos.organizations import OrganizationsModule
 from workos.passwordless import PasswordlessModule
 from workos.portal import PortalModule
 from workos.sso import SSOModule
 from workos.user_management import UserManagementModule
+from workos.utils._base_http_client import DEFAULT_REQUEST_TIMEOUT
 from workos.webhooks import WebhooksModule
 
 
@@ -68,7 +67,7 @@ def __init__(
 
     @property
     @abstractmethod
-    def api_keys(self) -> ApiKeyModule: ...
+    def api_keys(self) -> ApiKeysModule: ...
 
     @property
     @abstractmethod

workos/api_keys.py

@@ -6,7 +6,8 @@
 from workos.utils.request_helper import REQUEST_METHOD_POST
 
 
-class ApiKeyModule(Protocol):
+
+class ApiKeysModule(Protocol):
     def validate_api_key(self) -> SyncOrAsync[ApiKey]:
         """Validates the configured API key.
 
@@ -24,7 +25,7 @@ def validate_api_key(self) -> SyncOrAsync[ApiKey]:
         ...
 
 
-class ApiKey(ApiKeyModule):
+class ApiKeys(ApiKeysModule):
     _http_client: SyncHTTPClient
 
     def __init__(self, http_client: SyncHTTPClient):
@@ -39,7 +40,7 @@ def validate_api_key(self) -> ApiKey:
         return ApiKey.model_validate(response)
 
 
-class AsyncApiKey(ApiKeyModule):
+class AsyncApiKeys(ApiKeysModule):
     _http_client: AsyncHTTPClient
 
     def __init__(self, http_client: AsyncHTTPClient):

workos/async_client.py

@@ -1,7 +1,7 @@
 from typing import Optional
 from workos.__about__ import __version__
 from workos._base_client import BaseClient
-from workos.api_key import AsyncApiKey
+from workos.api_keys import AsyncApiKeys
 from workos.audit_logs import AuditLogsModule
 from workos.directory_sync import AsyncDirectorySync
 from workos.events import AsyncEvents
@@ -47,9 +47,9 @@ def __init__(
         )
 
     @property
-    def api_keys(self) -> AsyncApiKey:
+    def api_keys(self) -> AsyncApiKeys:
         if not getattr(self, "_api_keys", None):
-            self._api_keys = AsyncApiKey(self._http_client)
+            self._api_keys = AsyncApiKeys(self._http_client)
         return self._api_keys
 
     @property

workos/client.py

@@ -1,7 +1,7 @@
 from typing import Optional
 from workos.__about__ import __version__
 from workos._base_client import BaseClient
-from workos.api_key import ApiKey
+from workos.api_keys import ApiKeys
 from workos.audit_logs import AuditLogs
 from workos.directory_sync import DirectorySync
 from workos.fga import FGA
@@ -47,9 +47,9 @@ def __init__(
         )
 
     @property
-    def api_keys(self) -> ApiKey:
+    def api_keys(self) -> ApiKeys:
         if not getattr(self, "_api_keys", None):
-            self._api_keys = ApiKey(self._http_client)
+            self._api_keys = ApiKeys(self._http_client)
         return self._api_keys
 
     @property