diff --git a/api.md b/api.md index aa30c66255c..7425f2f0d4d 100644 --- a/api.md +++ b/api.md @@ -38,7 +38,7 @@ Methods: Types: ```python -from cloudflare.types.accounts import Role, RoleWithID, RoleListResponse, RoleGetResponse +from cloudflare.types.accounts import RoleListResponse, RoleGetResponse ``` Methods: diff --git a/src/cloudflare/types/accounts/__init__.py b/src/cloudflare/types/accounts/__init__.py index cf5c06afe55..ae564dbd9f7 100644 --- a/src/cloudflare/types/accounts/__init__.py +++ b/src/cloudflare/types/accounts/__init__.py @@ -2,7 +2,6 @@ from __future__ import annotations -from .role import Role as Role from .account_member import AccountMember as AccountMember from .role_get_response import RoleGetResponse as RoleGetResponse from .member_list_params import MemberListParams as MemberListParams diff --git a/src/cloudflare/types/accounts/member_list_response.py b/src/cloudflare/types/accounts/member_list_response.py index df87849baa3..ff7262a31db 100644 --- a/src/cloudflare/types/accounts/member_list_response.py +++ b/src/cloudflare/types/accounts/member_list_response.py @@ -3,10 +3,23 @@ from typing import List, Optional from typing_extensions import Literal -from .role import Role from ..._models import BaseModel -__all__ = ["MemberListResponse"] +__all__ = ["MemberListResponse", "Role"] + + +class Role(BaseModel): + id: str + """Role identifier tag.""" + + description: str + """Description of role's permissions.""" + + name: str + """Role Name.""" + + permissions: List[str] + """Access permissions for this User.""" class MemberListResponse(BaseModel): diff --git a/src/cloudflare/types/accounts/role.py b/src/cloudflare/types/accounts/role.py deleted file mode 100644 index 9d9bf4dc0d2..00000000000 --- a/src/cloudflare/types/accounts/role.py +++ /dev/null @@ -1,21 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. - -from typing import List - -from ..._models import BaseModel - -__all__ = ["Role"] - - -class Role(BaseModel): - id: str - """Role identifier tag.""" - - description: str - """Description of role's permissions.""" - - name: str - """Role Name.""" - - permissions: List[str] - """Access permissions for this User.""" diff --git a/src/cloudflare/types/accounts/role_list_response.py b/src/cloudflare/types/accounts/role_list_response.py index 30df421e4ae..d48603b575a 100644 --- a/src/cloudflare/types/accounts/role_list_response.py +++ b/src/cloudflare/types/accounts/role_list_response.py @@ -2,8 +2,23 @@ from typing import List -from .role import Role +from ..._models import BaseModel -__all__ = ["RoleListResponse"] +__all__ = ["RoleListResponse", "RoleListResponseItem"] -RoleListResponse = List[Role] + +class RoleListResponseItem(BaseModel): + id: str + """Role identifier tag.""" + + description: str + """Description of role's permissions.""" + + name: str + """Role Name.""" + + permissions: List[str] + """Access permissions for this User.""" + + +RoleListResponse = List[RoleListResponseItem] diff --git a/src/cloudflare/types/user/invite_list_response.py b/src/cloudflare/types/user/invite_list_response.py index 861fcc5409e..c492bc936f3 100644 --- a/src/cloudflare/types/user/invite_list_response.py +++ b/src/cloudflare/types/user/invite_list_response.py @@ -5,9 +5,22 @@ from typing_extensions import Literal from ..._models import BaseModel -from ..accounts import Role -__all__ = ["InviteListResponse", "InviteListResponseItem"] +__all__ = ["InviteListResponse", "InviteListResponseItem", "InviteListResponseItemRole"] + + +class InviteListResponseItemRole(BaseModel): + id: str + """Role identifier tag.""" + + description: str + """Description of role's permissions.""" + + name: str + """Role Name.""" + + permissions: List[str] + """Access permissions for this User.""" class InviteListResponseItem(BaseModel): @@ -35,7 +48,7 @@ class InviteListResponseItem(BaseModel): organization_name: Optional[str] = None """Organization name.""" - roles: Optional[List[Role]] = None + roles: Optional[List[InviteListResponseItemRole]] = None """Roles to be assigned to this user.""" status: Optional[Literal["pending", "accepted", "rejected", "expired"]] = None