day2 0.3.2__tar.gz → 0.3.3__tar.gz

{day2-0.3.2 → day2-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: day2
-Version: 0.3.2
+Version: 0.3.3
 Summary: MontyCloud DAY2 SDK for Python
 Author-email: MontyCloud <info@montycloud.com>
 Requires-Python: >=3.11

{day2-0.3.2 → day2-0.3.3}/day2/client/base.py

@@ -4,7 +4,7 @@ import json
 import logging
 
 # Use TYPE_CHECKING to avoid circular imports
-from typing import TYPE_CHECKING, Any, Dict
+from typing import TYPE_CHECKING, Any, Dict, Optional
 
 import requests
 from tenacity import (
@@ -43,11 +43,14 @@ class BaseClient:
         self.service_name = service_name
         self._config = session._config
 
-    def _get_endpoint_url(self, endpoint: str) -> str:
+    def _get_endpoint_url(
+        self, endpoint: str, api_version: Optional[str] = None
+    ) -> str:
         """Get the full URL for an endpoint.
 
         Args:
             endpoint: API endpoint path.
+            api_version: API version to use instead of the default.(optional)
 
         Returns:
             Full URL for the endpoint.
@@ -55,6 +58,10 @@ class BaseClient:
         if endpoint.startswith("/"):
             endpoint = endpoint[1:]
 
+        # Handle custom version if provided
+        if api_version:
+            return f"{self._config.get_api_url_with_version(api_version)}/{endpoint}"
+
         # For MontyCloud API, we don't include the service name in the URL
         return f"{self._config.api_url}/{endpoint}"
 
@@ -213,13 +220,18 @@ class BaseClient:
         return r(_do_request)()
 
     def _make_request(
-        self, method: str, endpoint: str, **kwargs: Any
+        self,
+        method: str,
+        endpoint: str,
+        api_version: Optional[str] = None,
+        **kwargs: Any,
     ) -> Dict[str, Any]:
         """Make an API request.
 
         Args:
             method: HTTP method (GET, POST, PUT, DELETE, etc.).
             endpoint: API endpoint path.
+            api_version: API version to use instead of the default (optional).
             **kwargs: Additional arguments to pass to requests.
 
         Returns:
@@ -229,7 +241,7 @@ class BaseClient:
         if "json_data" in kwargs:
             kwargs["json"] = kwargs.pop("json_data")
 
-        url = self._get_endpoint_url(endpoint)
+        url = self._get_endpoint_url(endpoint, api_version)
         logger.debug("Making request to %s %s", method, url)
         # Pass the full URL to the request method
         return self._request_with_retry(method, url, **kwargs)

{day2-0.3.2 → day2-0.3.3}/day2/client/config.py

@@ -5,6 +5,9 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Dict, Optional
 
+API_VERSION_V1 = "v1"
+API_VERSION_V2 = "v2"
+
 
 @dataclass
 class Config:
@@ -61,6 +64,26 @@ class Config:
         """
         return f"{self.base_url}/{self.api_version}"
 
+    def get_api_url_with_version(self, api_version: str) -> str:
+        """Get the full API URL with a custom version.
+
+        Args:
+            api_version: API version to use instead of the default.
+
+        Returns:
+            Full API URL with the specified version.
+
+        Raises:
+            ValueError: If the API version is not valid.
+        """
+        # Validate API version is in the list of supported versions
+        if api_version not in [API_VERSION_V1, API_VERSION_V2]:
+            raise ValueError(
+                f"Invalid API version '{api_version}'. Valid versions are: v1, v2"
+            )
+
+        return f"{self.base_url}/{api_version}"
+
     def to_dict(self) -> Dict[str, Any]:
         """Convert config to dictionary.
 

{day2-0.3.2 → day2-0.3.3}/day2/models/account.py

@@ -10,6 +10,8 @@ class GenerateOnboardingTemplateInput(BaseModel):
 
     Attributes:
         account_type: Type of AWS account to onboard: STANDALONE or MANAGEMENT
+        account_name: Name of the AWS account to onboard
+        account_number: AWS account number to onboard
         regions: List of AWS regions to onboard
     """
 
@@ -18,6 +20,16 @@ class GenerateOnboardingTemplateInput(BaseModel):
         alias="AccountType",
         description="Type of AWS account to onboard: STANDALONE or MANAGEMENT",
     )
+    account_name: str = Field(
+        ...,
+        alias="AccountName",
+        description="Name of the AWS account to onboard",
+    )
+    account_number: str = Field(
+        ...,
+        alias="AccountNumber",
+        description="AWS account number to onboard",
+    )
     regions: List[str] = Field(
         default_factory=list,
         alias="Regions",
@@ -29,6 +41,7 @@ class AccountItem(BaseModel):
     """Details of an account.
 
     Attributes:
+        account_id: Unique account identifier
         number: AWS account number
         name: Account name
         status: Current status of the account
@@ -37,6 +50,7 @@ class AccountItem(BaseModel):
         onboarded_date: Date when the account was onboarded
     """
 
+    account_id: str = Field(alias="AccountId")
     number: str = Field(alias="Number")
     name: str = Field(alias="Name")
     status: str = Field(alias="Status")
@@ -53,6 +67,7 @@ class GenerateOnboardingTemplateOutput(BaseModel):
 
     Attributes:
         account_id: The account ID for the onboarding template
+        expires_on: The expiration date and time of the onboarding template
         onboarding_template_url: URL to the generated onboarding template
     """
 
@@ -61,6 +76,11 @@ class GenerateOnboardingTemplateOutput(BaseModel):
         alias="AccountId",
         description="The account ID for the onboarding template",
     )
+    expires_on: str = Field(
+        ...,
+        alias="ExpiresOn",
+        description="The expiration date and time of the onboarding template",
+    )
     onboarding_template_url: str = Field(
         ...,
         alias="OnboardingTemplateURL",

{day2-0.3.2 → day2-0.3.3}/day2/models/tenant.py

@@ -125,6 +125,7 @@ class Account(BaseModel):
     """Details of an account.
 
     Attributes:
+        account_id: Unique account identifier
         number: AWS account number
         name: Account name
         status: Current status of the account
@@ -133,6 +134,7 @@ class Account(BaseModel):
         onboarded_date: Date when the account was onboarded
     """
 
+    account_id: str = Field(alias="AccountId")
     number: str = Field(alias="Number")
     name: str = Field(alias="Name")
     status: str = Field(alias="Status")

day2-0.3.3/day2/models/user.py

@@ -0,0 +1,74 @@
+"""User models for the MontyCloud SDK."""
+
+from typing import List, Optional
+
+from pydantic import BaseModel, ConfigDict, Field
+
+
+class User(BaseModel):
+    """Details of a user in a tenant.
+
+    Attributes:
+        name: Name of the user
+        email: Email address of the user
+        user_id: Unique identifier of the user
+    """
+
+    name: str = Field(alias="Name")
+    email: str = Field(alias="Email")
+    user_id: str = Field(alias="UserId")
+
+    # Allow extra fields
+    model_config = ConfigDict(extra="allow")
+
+
+class ListUsersOutput(BaseModel):
+    """Output model for ListUsers API.
+
+    Attributes:
+        users: List of users in the tenant
+    """
+
+    users: List[User] = Field(alias="Users", default=[])
+
+    # Allow extra fields
+    model_config = ConfigDict(extra="allow")
+
+
+class CreateUserInput(BaseModel):
+    """
+    Input model for CreateUser API.
+
+    Attributes:
+        name: Name of the user
+        email: Email address of the user
+        temporary_password: Temporary password for the user
+        role_id: Role ID for the user
+        projects: (Optional) Project(s) List of project ids for project roles. Applicable for project specific roles
+        federated_access_roles: (Optional) List of federated access roles. Applicable for admin roles
+    """
+
+    name: str = Field(alias="Name")
+    email: str = Field(alias="Email")
+    temporary_password: str = Field(alias="TemporaryPassword")
+    role_id: str = Field(alias="RoleId")
+    projects: Optional[List[str]] = Field(None, alias="Projects")
+    federated_access_roles: Optional[List[str]] = Field(
+        None, alias="FederatedAccessRoles"
+    )
+
+    # Allow extra fields
+    model_config = ConfigDict(extra="allow")
+
+
+class CreateUserOutput(BaseModel):
+    """Output model for CreateUser API.
+
+    Attributes:
+       user_id: Unique identifier of the created user
+    """
+
+    user_id: str = Field(alias="UserId")
+
+    # Allow extra fields
+    model_config = ConfigDict(extra="allow")

{day2-0.3.2 → day2-0.3.3}/day2/resources/account.py

@@ -3,6 +3,7 @@
 from typing import List, Optional
 
 from day2.client.base import BaseClient
+from day2.client.config import API_VERSION_V2
 from day2.models.account import (
     GenerateOnboardingTemplateInput,
     GenerateOnboardingTemplateOutput,
@@ -24,17 +25,24 @@ class AccountClient(BaseClient):
         super().__init__(session, "account")
 
     def get_onboarding_template(
-        self, tenant_id: str, account_type: str, regions: Optional[List[str]] = None
+        self,
+        tenant_id: str,
+        account_type: str,
+        account_name: str,
+        account_number: str,
+        regions: Optional[List[str]] = None,
     ) -> GenerateOnboardingTemplateOutput:
         """Generate an AWS onboarding template for the specified tenant.
 
         Args:
             tenant_id: The ID of the tenant to generate the onboarding template for.
             account_type: Type of AWS account to onboard: STANDALONE or MANAGEMENT.
+            account_name: Name of the AWS account to onboard.
+            account_number: AWS account number to onboard.
             regions: List of AWS regions to onboard - Required for Assessment Feature type (Audit Permissions), not supported by other feature types (AutomatedCloudOps, ContinuousVisibility).
 
         Returns:
-            GenerateOnboardingTemplateOutput: Object containing the account ID and onboarding template URL.
+            GenerateOnboardingTemplateOutput: Object containing the account ID, expiration date and time of the onboarding link and onboarding template URL.
 
         Raises:
             ClientError: If the request is invalid.
@@ -47,6 +55,8 @@ class AccountClient(BaseClient):
             >>> response = client.get_onboarding_template(
             ...     tenant_id="tenant-123",
             ...     account_type="STANDALONE",  # STANDALONE or MANAGEMENT
+            ...     account_name="AcmeAccount",
+            ...     account_number="123456789012",
             ...     regions=[
             ...         "us-east-1",
             ...         "us-west-2"
@@ -56,12 +66,16 @@ class AccountClient(BaseClient):
             >>> print(f"Onboarding URL: {response.onboarding_template_url}")
         """
         data = GenerateOnboardingTemplateInput(
-            AccountType=account_type, Regions=regions if regions is not None else []
+            AccountType=account_type,
+            AccountName=account_name,
+            AccountNumber=account_number,
+            Regions=regions if regions is not None else [],
         )
 
         response = self._make_request(
             "POST",
             f"tenants/{tenant_id}/accounts/aws/onboarding-template",
+            API_VERSION_V2,
             json=data.model_dump(by_alias=True),
         )
         return GenerateOnboardingTemplateOutput.model_validate(response)
@@ -89,7 +103,8 @@ class AccountClient(BaseClient):
             >>> client = session.account
             >>> response = client.list_accounts(tenant_id="your-tenant-id", page_size=10)
             >>> for account in response.accounts:
-            ...     print(f"{account.number}: {account.name}")
+            ...     print(f"Account ID: {account.account_id}")
+            ...     print(f"Account Name: {account.name}")
         """
         params: dict[str, object] = {
             "PageSize": page_size,
@@ -97,7 +112,7 @@ class AccountClient(BaseClient):
         }
 
         response = self._make_request(
-            "GET", f"tenants/{tenant_id}/accounts", params=params
+            "GET", f"tenants/{tenant_id}/accounts/", params=params
         )
         return ListAccountsOutput.model_validate(response)
 

day2-0.3.3/day2/resources/user.py

@@ -0,0 +1,128 @@
+"""User resource client for the MontyCloud DAY2 SDK."""
+
+import logging
+from typing import TYPE_CHECKING, Optional
+
+from day2.client.base import BaseClient
+from day2.client.user_context import UserContext
+from day2.models.user import CreateUserInput, CreateUserOutput, ListUsersOutput
+
+if TYPE_CHECKING:
+    from day2.session import Session
+
+logger = logging.getLogger(__name__)
+
+
+class UserClient(BaseClient):
+    """Client for interacting with Users."""
+
+    def __init__(self, session: "Session") -> None:
+        """Initialize a new UserClient.
+
+        Args:
+            session: MontyCloud session.
+        """
+        super().__init__(session, "user")
+
+    def get_user(self) -> Optional[UserContext]:
+        """Get information about the authenticated user.
+
+        Returns:
+            UserContext containing the user's information if successful,
+            None if the request fails.
+        """
+        try:
+            # Use _make_request instead of directly calling session.request
+            response_data = self._make_request("GET", "auth/user")
+            if response_data:
+                logger.debug("Retrieved user context: %s", response_data)
+                return UserContext.from_dict(response_data)
+            logger.warning("Failed to get user context: empty response")
+            return None
+        except Exception as e:  # pylint: disable=broad-except
+            logger.warning("Error retrieving user context: %s", e)
+            return None
+
+    def list_users(self, tenant_id: str) -> ListUsersOutput:
+        """Retrieves list of Users for a specific tenant.
+
+        Args:
+            tenant_id: ID of the tenant to list users for.
+
+        Returns:
+            ListUsersOutput: Object containing list of users.
+
+        Raises:
+            ResourceNotFoundError: If the tenant does not exist.
+            ClientError: If the request is invalid.
+            ServerError: If an internal server error occurs.
+            AuthenticationError: If authentication fails.
+
+        Examples:
+            >>> session = Session(api_key="your-api-key", api_secret_key="your-secret-key")
+            >>> client = session.user
+            >>> response = client.list_users(tenant_id="your-tenant-id")
+            >>> for user in response.users:
+            ...     print(f"{user.user_id}: {user.name} {user.email}")
+        """
+
+        response = self._make_request("GET", f"tenants/{tenant_id}/users")
+        return ListUsersOutput.model_validate(response)
+
+    def create_user(self, tenant_id: str, data: CreateUserInput) -> CreateUserOutput:
+        """Create user for a tenant.
+
+        !!! info "Federated Access Roles"
+            This operation is available only if the tenant's **FAA** feature is enabled.
+
+            - Allowed FAA roles: `AdminUser`, `PowerUser`, `ReadOnlyUser`
+            - Users with the **Business Admin** or **Cloud Admin** role may be assigned **any** FAA role.
+            - Users with the **Read Only** role can be assigned **only** the `ReadOnlyUser` FAA role.
+
+        Args:
+            tenant_id: ID of the tenant to create user for.
+            data: The user data to create.
+
+        Returns:
+            CreateUserOutput: Object containing the created user id.
+
+        Raises:
+            ClientError: If the request is invalid.
+            ServerError: If an internal server error occurs.
+            AuthenticationError: If authentication fails.
+
+        Examples:
+            >>> session = Session(api_key="your-api-key", api_secret_key="your-secret-key")
+            >>> client = session.user
+            # The payload for creating a user varies based on the role type:
+            # 1. For Cloud Admin and Business Admin roles, FederatedAccessRoles can include one or more of PowerUser, ReadOnlyUser, AdminUser, or omitted.
+            # 2. For the Read Only role, FederatedAccessRoles must be ReadOnlyUser or omitted.
+            # 3. For Project Owner, Project User, and Reports Access roles, the Projects field must include at least one project ID and FederatedAccessRoles should not be provided.
+            >>> data = CreateUserInput(
+            ...     Name="UserName",
+            ...     Email="username@example.com",
+            ...     TemporaryPassword="*********",
+            ...     RoleId="13acd9eb-6a65-41f8-a941-d4c6edb3f1c9",
+            ...     Projects = ["8e5a5792-89a4-45fc-9260-dd673015df03"],
+            ... )
+            >>> response = client.create_user(tenant_id="your-tenant-id", data=data)
+            >>> print(f"Created user with ID: {response.user_id}")
+        """
+
+        create_user_payload: dict[str, str | list[str]] = {
+            "Name": data.name,
+            "Email": data.email,
+            "TemporaryPassword": data.temporary_password,
+            "RoleId": data.role_id,
+        }
+
+        # Add optional fields if they have values
+        if data.projects:
+            create_user_payload["Projects"] = data.projects
+        if data.federated_access_roles:
+            create_user_payload["FederatedAccessRoles"] = data.federated_access_roles
+
+        response = self._make_request(
+            "POST", f"tenants/{tenant_id}/users", json=create_user_payload
+        )
+        return CreateUserOutput.model_validate(response)

{day2-0.3.2 → day2-0.3.3}/day2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: day2
-Version: 0.3.2
+Version: 0.3.3
 Summary: MontyCloud DAY2 SDK for Python
 Author-email: MontyCloud <info@montycloud.com>
 Requires-Python: >=3.11

{day2-0.3.2 → day2-0.3.3}/day2_cli/commands/account.py

@@ -26,6 +26,18 @@ def account() -> None:
     required=True,
     help="Type of AWS account to onboard: STANDALONE or MANAGEMENT",
 )
+@click.option(
+    "--account-name",
+    type=str,
+    required=True,
+    help="Name of the AWS account to onboard.",
+)
+@click.option(
+    "--account-number",
+    type=str,
+    required=True,
+    help="AWS account number to onboard.",
+)
 @click.option(
     "--regions",
     type=str,
@@ -35,6 +47,8 @@ def account() -> None:
 @with_common_options(include_tenant_id=True)
 def generate_onboarding_template(
     account_type: str,
+    account_name: str,
+    account_number: str,
     regions: str,
     output: Optional[str] = None,
     profile: Optional[str] = None,
@@ -63,12 +77,15 @@ def generate_onboarding_template(
         result = session.account.get_onboarding_template(
             tenant_id=resolved_tenant_id,
             account_type=account_type.upper(),
+            account_name=account_name,
+            account_number=account_number,
             regions=regions_list,
         )
 
         # Convert template details to dictionary for output
         template_dict = {
             "account_id": result.account_id,
+            "expires_on": result.expires_on,
             "onboarding_template_url": result.onboarding_template_url,
         }
 
@@ -130,6 +147,7 @@ def list_accounts(
         account_list = []
         for account_item in result.accounts:
             account_dict = {
+                "account_id": account_item.account_id,
                 "number": account_item.number,
                 "name": account_item.name,
                 "status": account_item.status,
@@ -141,6 +159,7 @@ def list_accounts(
 
         # Define columns for table output
         columns = {
+            "account_id": "Account ID",
             "number": "Number",
             "name": "Name",
             "status": "Status",

{day2-0.3.2 → day2-0.3.3}/day2_cli/commands/tenant.py

@@ -199,6 +199,7 @@ def list_accounts(
         account_list = []
         for account_item in result.accounts:
             account_dict = {
+                "account_id": account_item.account_id,
                 "number": account_item.number,
                 "name": account_item.name,
                 "status": account_item.status,
@@ -210,6 +211,7 @@ def list_accounts(
 
         # Define columns for table output
         columns = {
+            "account_id": "Account ID",
             "number": "Number",
             "name": "Name",
             "status": "Status",

day2-0.3.3/day2_cli/commands/user.py

@@ -0,0 +1,162 @@
+"""User commands for the MontyCloud DAY2 CLI."""
+
+from typing import Optional
+
+import click
+from rich.console import Console
+
+from day2.exceptions import Day2Error, ProfileNotFoundError
+from day2.models.user import CreateUserInput
+from day2_cli.utils.context import get_enhanced_context, with_common_options
+from day2_cli.utils.exit_codes import handle_error_with_exit
+from day2_cli.utils.output_formatter import format_item_output, format_list_output
+
+console = Console()
+
+
+@click.group()
+def user() -> None:
+    """User commands."""
+
+
+@user.command("list")
+@with_common_options(include_tenant_id=True)
+def list_users(
+    output: Optional[str] = None,
+    profile: Optional[str] = None,
+    tenant_id: Optional[str] = None,
+) -> None:
+    """List users associated with a specific tenant.
+
+    This command lists all the users in the tenant.
+    """
+    try:
+        # Get enhanced context
+        context = get_enhanced_context(
+            output=output, profile=profile, tenant_id=tenant_id, require_tenant=True
+        )
+        session = context["session"]
+        resolved_tenant_id = context["tenant_id"]
+        output_format = context["output_format"]
+
+        result = session.user.list_users(resolved_tenant_id)
+
+        if not result.users:
+            console.print("[yellow]No users found.[/yellow]")
+            return
+
+        # Convert user objects to dictionaries for output
+        user_list = []
+        for user_item in result.users:
+            user_dict = {
+                "name": user_item.name,
+                "email": user_item.email,
+                "user_id": user_item.user_id,
+            }
+            user_list.append(user_dict)
+
+        # Define columns for table output
+        columns = {
+            "name": "Name",
+            "email": "Email",
+            "user_id": "User ID",
+        }
+
+        # Format and output the user list
+        format_list_output(
+            user_list,
+            f"Users for Tenant: {resolved_tenant_id}",
+            columns,
+            output_format,
+        )
+
+    except (Day2Error, ProfileNotFoundError) as e:
+        handle_error_with_exit(e)
+
+
+@user.command("create")
+@click.option("--name", required=True, help="Name of the user")
+@click.option("--email", required=True, help="Email id of the user")
+@click.option(
+    "--temporary-password", required=True, help="Temporary password of the user"
+)
+@click.option("--role-id", required=True, help="Role ID to be assigned to the user")
+@click.option(
+    "--projects",
+    help="Comma-separated list of project ids to be assigned to the user",
+)
+@click.option(
+    "--federated-access-roles",
+    help="Comma-separated list of federated access roles to be assigned to the user",
+)
+@with_common_options(include_tenant_id=True)
+def create_user(
+    name: str,
+    email: str,
+    temporary_password: str,
+    role_id: str,
+    projects: Optional[str],
+    federated_access_roles: Optional[str],
+    output: Optional[str] = None,
+    profile: Optional[str] = None,
+    tenant_id: Optional[str] = None,
+) -> None:
+    """Create user for a tenant.
+
+    This command creates a new user for a tenant.
+
+    !!! info "Federated Access Roles"
+        This operation is available only if the tenant's **FAA** feature is enabled.
+
+        - Allowed FAA roles: `AdminUser`, `PowerUser`, `ReadOnlyUser`
+        - Users with the **Business Admin** or **Cloud Admin** role may be assigned **any** FAA role.
+        - Users with the **Read Only** role can be assigned **only** the `ReadOnlyUser` FAA role.
+    """
+    try:
+        # Get enhanced context
+        context = get_enhanced_context(
+            output=output, profile=profile, tenant_id=tenant_id, require_tenant=True
+        )
+        session = context["session"]
+        resolved_tenant_id = context["tenant_id"]
+        output_format = context["output_format"]
+
+        # Parse projects if provided
+        project_ids = (
+            [project.strip() for project in projects.split(",")] if projects else None
+        )
+
+        federated_access_roles_list = (
+            [role.strip() for role in federated_access_roles.split(",")]
+            if federated_access_roles
+            else None
+        )
+
+        # Create a CreateUserInput object
+        create_user_input = CreateUserInput(
+            Name=name,
+            Email=email,
+            TemporaryPassword=temporary_password,
+            RoleId=role_id,
+            Projects=project_ids,
+            FederatedAccessRoles=federated_access_roles_list,
+        )
+
+        result = session.user.create_user(
+            tenant_id=resolved_tenant_id, data=create_user_input
+        )
+
+        # Create user data for output
+        user_output_data = {
+            "userId": result.user_id,
+        }
+
+        # Format and output the result
+        format_item_output(
+            item=user_output_data,
+            title="User Created Successfully",
+            format_override=output_format,
+        )
+
+    except (Day2Error, ProfileNotFoundError) as e:
+        handle_error_with_exit(e)

{day2-0.3.2 → day2-0.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "day2"
-version = "0.3.2"
+version = "0.3.3"
 description = "MontyCloud DAY2 SDK for Python"
 readme = "README.md"
 requires-python = ">=3.11"

day2-0.3.2/day2/models/user.py

@@ -1,35 +0,0 @@
-"""User models for the MontyCloud SDK."""
-
-from typing import List
-
-from pydantic import BaseModel, ConfigDict, Field
-
-
-class User(BaseModel):
-    """Details of a user in a tenant.
-
-    Attributes:
-        name: Name of the user
-        email: Email address of the user
-        user_id: Unique identifier of the user
-    """
-
-    name: str = Field(alias="Name")
-    email: str = Field(alias="Email")
-    user_id: str = Field(alias="UserId")
-
-    # Allow extra fields
-    model_config = ConfigDict(extra="allow")
-
-
-class ListUsersOutput(BaseModel):
-    """Output model for ListUsers API.
-
-    Attributes:
-        users: List of users in the tenant
-    """
-
-    users: List[User] = Field(alias="Users", default=[])
-
-    # Allow extra fields
-    model_config = ConfigDict(extra="allow")

day2-0.3.2/day2/resources/user.py

@@ -1,70 +0,0 @@
-"""User resource client for the MontyCloud DAY2 SDK."""
-
-import logging
-from typing import TYPE_CHECKING, Optional
-
-from day2.client.base import BaseClient
-from day2.client.user_context import UserContext
-from day2.models.user import ListUsersOutput
-
-if TYPE_CHECKING:
-    from day2.session import Session
-
-logger = logging.getLogger(__name__)
-
-
-class UserClient(BaseClient):
-    """Client for interacting with Users."""
-
-    def __init__(self, session: "Session") -> None:
-        """Initialize a new UserClient.
-
-        Args:
-            session: MontyCloud session.
-        """
-        super().__init__(session, "user")
-
-    def get_user(self) -> Optional[UserContext]:
-        """Get information about the authenticated user.
-
-        Returns:
-            UserContext containing the user's information if successful,
-            None if the request fails.
-        """
-        try:
-            # Use _make_request instead of directly calling session.request
-            response_data = self._make_request("GET", "auth/user")
-            if response_data:
-                logger.debug("Retrieved user context: %s", response_data)
-                return UserContext.from_dict(response_data)
-            logger.warning("Failed to get user context: empty response")
-            return None
-        except Exception as e:  # pylint: disable=broad-except
-            logger.warning("Error retrieving user context: %s", e)
-            return None
-
-    def list_users(self, tenant_id: str) -> ListUsersOutput:
-        """Retrieves list of Users for a specific tenant.
-
-        Args:
-            tenant_id: ID of the tenant to list users for.
-
-        Returns:
-            ListUsersOutput: Object containing list of users.
-
-        Raises:
-            ResourceNotFoundError: If the tenant does not exist.
-            ClientError: If the request is invalid.
-            ServerError: If an internal server error occurs.
-            AuthenticationError: If authentication fails.
-
-        Examples:
-            >>> session = Session(api_key="your-api-key", api_secret_key="your-secret-key")
-            >>> client = session.user
-            >>> response = client.list_users(tenant_id="your-tenant-id")
-            >>> for user in response.users:
-            ...     print(f"{user.user_id}: {user.name} {user.email}")
-        """
-
-        response = self._make_request("GET", f"tenants/{tenant_id}/users")
-        return ListUsersOutput.model_validate(response)

day2-0.3.2/day2_cli/commands/user.py

@@ -1,73 +0,0 @@
-"""User commands for the MontyCloud DAY2 CLI."""
-
-from typing import Optional
-
-import click
-from rich.console import Console
-
-from day2.exceptions import Day2Error, ProfileNotFoundError
-from day2_cli.utils.context import get_enhanced_context, with_common_options
-from day2_cli.utils.exit_codes import handle_error_with_exit
-from day2_cli.utils.output_formatter import format_list_output
-
-console = Console()
-
-
-@click.group()
-def user() -> None:
-    """User commands."""
-
-
-@user.command("list")
-@with_common_options(include_tenant_id=True)
-def list_users(
-    output: Optional[str] = None,
-    profile: Optional[str] = None,
-    tenant_id: Optional[str] = None,
-) -> None:
-    """List users associated with a specific tenant.
-
-    This command lists all the users in the tenant.
-    """
-    try:
-        # Get enhanced context
-        context = get_enhanced_context(
-            output=output, profile=profile, tenant_id=tenant_id, require_tenant=True
-        )
-        session = context["session"]
-        resolved_tenant_id = context["tenant_id"]
-        output_format = context["output_format"]
-
-        result = session.user.list_users(resolved_tenant_id)
-
-        if not result.users:
-            console.print("[yellow]No users found.[/yellow]")
-            return
-
-        # Convert user objects to dictionaries for output
-        user_list = []
-        for user_item in result.users:
-            user_dict = {
-                "name": user_item.name,
-                "email": user_item.email,
-                "user_id": user_item.user_id,
-            }
-            user_list.append(user_dict)
-
-        # Define columns for table output
-        columns = {
-            "name": "Name",
-            "email": "Email",
-            "user_id": "User ID",
-        }
-
-        # Format and output the user list
-        format_list_output(
-            user_list,
-            f"Users for Tenant: {resolved_tenant_id}",
-            columns,
-            output_format,
-        )
-
-    except (Day2Error, ProfileNotFoundError) as e:
-        handle_error_with_exit(e)