day2 0.2.0.dev1__tar.gz → 0.2.1__tar.gz

{day2-0.2.0.dev1 → day2-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: day2
-Version: 0.2.0.dev1
+Version: 0.2.1
 Summary: MontyCloud DAY2 SDK for Python
 Author-email: MontyCloud <info@montycloud.com>
 Requires-Python: >=3.11
@@ -276,14 +276,6 @@ except Exception as e:
     print(f"Unexpected error: {e}")
 ```
 
-## Development
-
-Refer to [DEVELOPER.md](DEVELOPER.md) for development instructions.
-
-## Release
-
-Refer to [RELEASE.md](RELEASE.md) for release instructions.
-
 ## License
 
 This project is licensed under the MIT License - see the LICENSE file for details.

{day2-0.2.0.dev1 → day2-0.2.1}/README.md

@@ -238,14 +238,6 @@ except Exception as e:
     print(f"Unexpected error: {e}")
 ```
 
-## Development
-
-Refer to [DEVELOPER.md](DEVELOPER.md) for development instructions.
-
-## Release
-
-Refer to [RELEASE.md](RELEASE.md) for release instructions.
-
 ## License
 
 This project is licensed under the MIT License - see the LICENSE file for details.

{day2-0.2.0.dev1 → day2-0.2.1}/day2/client/base.py

@@ -84,12 +84,6 @@ class BaseClient:
         if self.session.tenant_id:
             headers["x-tenant-id"] = str(self.session.tenant_id)
 
-        # Add any additional headers from config
-        if self._config.additional_headers:
-            # Ensure all header values are strings
-            for key, value in self._config.additional_headers.items():
-                headers[key] = str(value)
-
         return headers
 
     def _handle_response(self, response: requests.Response) -> Dict[str, Any]:
@@ -112,10 +106,10 @@ class BaseClient:
 
         try:
             data: Dict[str, Any] = response.json()
-            logger.info("Response data: %s", json.dumps(data, indent=2)[:1000])
+            logger.debug("Response data: %s", json.dumps(data, indent=2)[:1000])
         except ValueError:
             data = {"Message": response.text}
-            logger.info("Response text: %s", response.text[:1000])
+            logger.debug("Response text: %s", response.text[:1000])
 
         if 400 <= response.status_code < 500:
             message = data.get("Message", "Client error")
@@ -134,63 +128,75 @@ class BaseClient:
 
         return dict(data)
 
-    @retry(
-        stop=stop_after_attempt(3),
-        wait=wait_exponential(multiplier=1, min=2, max=10),
-        retry=retry_if_exception_type(ServerError),
-        reraise=True,
-    )
     def _request_with_retry(
         self, method: str, url: str, **kwargs: Any
     ) -> Dict[str, Any]:
-        """Make an API request with retry logic.
+        """Make an API request with retry logic based on configuration.
 
         Args:
-            method: HTTP method (GET, POST, PUT, DELETE, etc.).
-            url: Full URL for the request.
-            **kwargs: Additional arguments to pass to requests.
+            method: HTTP method (GET, POST, etc.)
+            url: URL to request
+            **kwargs: Additional arguments to pass to requests.request
 
         Returns:
-            Response data as dictionary.
+            Dict containing the parsed response
 
         Raises:
-            ClientError: For client errors (4xx).
-            ServerError: For server errors (5xx).
+            ClientError: For client errors (4xx)
+            ServerError: For server errors (5xx)
         """
-        headers = self._get_headers()
-
-        # Update headers with any provided in kwargs
-        if "headers" in kwargs:
-            headers.update(kwargs.pop("headers"))
-
-        # Log request details
-        logger.debug(
-            "Making %s request to %s with headers %s and kwargs %s",
-            method,
-            url,
-            headers,
-            kwargs,
-        )
 
-        try:
-            response = requests.request(
+        # Define the actual request function to retry
+        def _do_request() -> Dict[str, Any]:
+            headers = self._get_headers()
+
+            # Update headers with any provided in kwargs
+            request_kwargs = kwargs.copy()
+            if "headers" in request_kwargs:
+                headers.update(request_kwargs.pop("headers"))
+
+            # Log request details
+            logger.debug(
+                "Making %s request to %s with headers %s and kwargs %s",
                 method,
                 url,
-                headers=headers,
-                timeout=self._config.timeout,
-                **kwargs,
+                headers,
+                request_kwargs,
             )
 
-            # Log response details
-            logger.info("Received response with status %s", response.status_code)
-            logger.debug("Response headers: %s", response.headers)
-            logger.debug("Response content: %s", response.text[:1000])
-
-            return self._handle_response(response)
+            try:
+                response = requests.request(
+                    method,
+                    url,
+                    headers=headers,
+                    timeout=self._config.timeout,
+                    **request_kwargs,
+                )
+
+                # Log response details
+                logger.debug("Received response with status %s", response.status_code)
+                logger.debug("Response headers: %s", response.headers)
+                logger.debug("Response content: %s", response.text[:1000])
+
+                return self._handle_response(response)
+            except requests.RequestException as e:
+                logger.error("Request failed: %s", str(e))
+                raise ServerError(str(e), 0, None) from e
+
+        # Create a retry object with config values
+        r = retry(
+            stop=stop_after_attempt(self._config.max_retries),
+            wait=wait_exponential(
+                multiplier=self._config.retry_backoff_factor,
+                min=self._config.retry_min_delay,
+                max=self._config.retry_max_delay,
+            ),
+            retry=retry_if_exception_type(ServerError),
+            reraise=True,
+        )
 
-        except requests.RequestException as e:
-            logger.error("Request failed: %s", e)
-            raise ServerError(str(e), 0) from e
+        # Apply retry to our request function and call it
+        return r(_do_request)()
 
     def _make_request(
         self, method: str, endpoint: str, **kwargs: Any
@@ -210,6 +216,6 @@ class BaseClient:
             kwargs["json"] = kwargs.pop("json_data")
 
         url = self._get_endpoint_url(endpoint)
-        logger.info("Making request to %s %s", method, url)
+        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.2.0.dev1 → day2-0.2.1}/day2/client/config.py

@@ -1,7 +1,7 @@
 """Configuration for the MontyCloud SDK."""
 
 import configparser
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Dict, Optional
 
@@ -11,7 +11,7 @@ class Config:
     """Configuration for the MontyCloud SDK."""
 
     # Base URL for the MontyCloud API
-    base_url: str = "https://stg1-api.montycloud.com/day2/api"
+    base_url: str = "https://api.montycloud.com/day2/api"
 
     # API version
     api_version: str = "v1"
@@ -34,12 +34,6 @@ class Config:
     # Maximum retry delay in seconds
     retry_max_delay: float = 10.0
 
-    # Status codes to retry on
-    retry_status_codes: tuple = (500, 502, 503, 504)
-
-    # Additional headers to include in all requests
-    additional_headers: Dict[str, str] = field(default_factory=dict)
-
     # CLI output format (table or json)
     output_format: str = "table"
 
@@ -67,10 +61,6 @@ class Config:
             "tenant_id": self.tenant_id,
             "retry_min_delay": self.retry_min_delay,
             "retry_max_delay": self.retry_max_delay,
-            "retry_status_codes": ",".join(
-                str(code) for code in self.retry_status_codes
-            ),
-            "additional_headers": self.additional_headers,
             "output_format": self.output_format,
         }
 
@@ -84,16 +74,6 @@ class Config:
         Returns:
             Config object initialized with values from dictionary.
         """
-        # Handle special case for retry_status_codes if it's a string
-        if "retry_status_codes" in config_dict and isinstance(
-            config_dict["retry_status_codes"], str
-        ):
-            config_dict["retry_status_codes"] = tuple(
-                int(code)
-                for code in config_dict["retry_status_codes"].split(",")
-                if code.strip().isdigit()
-            )
-
         return cls(**config_dict)
 
     @classmethod
@@ -150,17 +130,6 @@ class Config:
                             fallback=str(cls.retry_max_delay),
                         )
                     ),
-                    # Status codes need special handling as they're a tuple in code
-                    retry_status_codes=tuple(
-                        int(code)
-                        for code in config_parser.get(
-                            "DEFAULT", "retry_status_codes", fallback=""
-                        ).split(",")
-                        if code.strip().isdigit()
-                    )
-                    or cls.retry_status_codes,
-                    # Headers would need to be serialized/deserialized specially
-                    additional_headers={},
                     # Output format
                     output_format=config_parser.get(
                         "DEFAULT", "output_format", fallback=cls.output_format

day2-0.2.1/day2/models/cost.py

@@ -0,0 +1,54 @@
+import re
+from typing import Any, Dict, Optional
+
+from pydantic import BaseModel, ConfigDict, Field, root_validator
+
+
+# Utility function to convert camelCase or PascalCase to snake_case
+def to_snake_case(name: str) -> str:
+    return re.sub(r"(?<!^)(?=[A-Z])", "_", name).lower()
+
+
+class GetCostByChargeTypeOutput(BaseModel):
+    """Details of cost breakdown by charge type."""
+
+    total_cost: Optional[float] = Field(None, alias="TotalCost")
+    usage: Optional[float] = Field(None, alias="Usage")
+    bundled_discount: Optional[float] = Field(None, alias="BundledDiscount")
+    credit: Optional[float] = Field(None, alias="Credit")
+    discount: Optional[float] = Field(None, alias="Discount")
+    discounted_usage: Optional[float] = Field(None, alias="DiscountedUsage")
+    fee: Optional[float] = Field(None, alias="Fee")
+    refund: Optional[float] = Field(None, alias="Refund")
+    ri_fee: Optional[float] = Field(None, alias="RIFee")
+    tax: Optional[float] = Field(None, alias="Tax")
+    savings_plan_upfront_fee: Optional[float] = Field(
+        None, alias="SavingsPlanUpfrontFee"
+    )
+    savings_plan_recurring_fee: Optional[float] = Field(
+        None, alias="SavingsPlanRecurringFee"
+    )
+    savings_plan_covered_usage: Optional[float] = Field(
+        None, alias="SavingsPlanCoveredUsage"
+    )
+    savings_plan_negation: Optional[float] = Field(None, alias="SavingsPlanNegation")
+    spp_discount: Optional[float] = Field(None, alias="SPPDiscount")
+    distributor_discount: Optional[float] = Field(None, alias="DistributorDiscount")
+
+    # Allow extra fields
+    model_config = ConfigDict(extra="allow")
+
+    @root_validator(pre=True)
+    @classmethod
+    def handle_dynamic_extra_fields(cls, values: Dict[str, Any]) -> Dict[str, Any]:
+        """Handle dynamic extra fields by converting them to snake_case."""
+        known_fields = {
+            field.alias or field_name for field_name, field in cls.model_fields.items()
+        }
+        # Dynamically handle all extra fields
+        for key in list(values.keys()):
+            if key not in known_fields:
+                # Convert the extra field to snake_case and map it
+                snake_case_key = to_snake_case(key)
+                values[snake_case_key] = values.pop(key)
+        return values

{day2-0.2.0.dev1 → day2-0.2.1}/day2/models/tenant.py

@@ -31,11 +31,6 @@ class ListTenantsOutput(BaseModel):
 
     tenants: List[TenantDetails] = Field(alias="Tenants", default=[])
     next_page_token: Optional[str] = Field(None, alias="NextPageToken")
-    # Keep these fields for backward compatibility
-    has_more: Optional[bool] = Field(None, alias="HasMore")
-    page_number: Optional[int] = Field(None, alias="PageNumber")
-    page_size: Optional[int] = Field(None, alias="PageSize")
-    total_count: Optional[int] = Field(None, alias="TotalCount")
 
     # Allow extra fields
     model_config = ConfigDict(extra="allow")
@@ -43,3 +38,28 @@ class ListTenantsOutput(BaseModel):
 
 class GetTenantOutput(TenantDetails):
     """Output of get_tenant operation."""
+
+
+class Account(BaseModel):
+    """Details of an account."""
+
+    number: str = Field(alias="Number")
+    name: str = Field(alias="Name")
+    status: str = Field(alias="Status")
+    type: str = Field(alias="Type")
+    permission_model: str = Field(alias="PermissionModel")
+    onboarded_date: str = Field(alias="OnboardedDate")
+
+    # Allow extra fields
+    model_config = ConfigDict(extra="allow")
+
+
+class ListAccountsOutput(BaseModel):
+    """Output of list_accounts operation."""
+
+    accounts: List[Account] = Field(alias="Accounts", default=[])
+    has_more: bool = Field(alias="HasMore", default=False)
+    page_number: int = Field(alias="PageNumber")
+
+    # Allow extra fields
+    model_config = ConfigDict(extra="allow")

day2-0.2.1/day2/resources/cost.py

@@ -0,0 +1,62 @@
+from typing import Dict
+
+from day2.client.base import BaseClient
+from day2.models.cost import GetCostByChargeTypeOutput
+from day2.session import Session
+
+
+class CostClient(BaseClient):
+    """Client for interacting with the Cost service."""
+
+    def __init__(self, session: Session) -> None:
+        """Initialize a new CostClient.
+
+        Args:
+            session: MontyCloud session.
+        """
+        super().__init__(session, "cost")
+
+    def get_cost_by_charge_type(
+        self,
+        tenant_id: str,
+        cloud_provider: str,
+        start_date: str,
+        end_date: str,
+    ) -> GetCostByChargeTypeOutput:
+        """Get cost breakdown by charge type for a tenant.
+
+        Args:
+            tenant_id: The ID of the tenant to fetch cost data for.
+            cloud_provider: The cloud provider (e.g., "AWS", "Azure").
+            start_date: Start date in YYYY-MM-DD format.
+            end_date: End date in YYYY-MM-DD format.
+
+        Returns:
+            GetCostByChargeTypeOutput: Object containing cost breakdown by charge type.
+
+        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")
+            >>> client = session.cost
+            >>> response = client.get_cost_by_charge_type(
+            ...     tenant_id="tenant-123",
+            ...     cloud_provider="AWS",
+            ...     start_date="2023-01-01",
+            ...     end_date="2023-01-31"
+            ... )
+            >>> print(f"Total Cost: {response.total_cost}")
+            >>> print(f"Bundled Discount: {response.bundled_discount}")
+        """
+        params: Dict[str, str] = {
+            "CloudProvider": cloud_provider,
+            "StartDate": start_date,
+            "EndDate": end_date,
+        }
+        response = self._make_request(
+            "GET", f"tenants/{tenant_id}/cost/cost-by-charge-type", params=params
+        )
+        return GetCostByChargeTypeOutput.model_validate(response)

{day2-0.2.0.dev1 → day2-0.2.1}/day2/resources/tenant.py

@@ -3,7 +3,7 @@
 from typing import Optional
 
 from day2.client.base import BaseClient
-from day2.models.tenant import GetTenantOutput, ListTenantsOutput
+from day2.models.tenant import GetTenantOutput, ListAccountsOutput, ListTenantsOutput
 from day2.session import Session
 
 
@@ -79,3 +79,39 @@ class TenantClient(BaseClient):
         # The endpoint for getting tenant details is directly using the tenant ID in the path
         response = self._make_request("GET", f"tenants/{tenant_id}")
         return GetTenantOutput.model_validate(response)
+
+    def list_accounts(
+        self, tenant_id: str, page_size: int = 10, page_number: int = 1
+    ) -> ListAccountsOutput:
+        """List accounts associated with a specific tenant.
+
+        Args:
+            tenant_id: ID of the tenant to list accounts for.
+            page_size: Number of accounts to be fetched in a page (default: 10).
+            page_number: Page number for pagination (default: 1).
+
+        Returns:
+            ListAccountsOutput: Object containing list of accounts and pagination info.
+
+        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")
+            >>> client = session.tenant
+            >>> response = client.list_accounts("tenant-123", page_size=10)
+            >>> for account in response.accounts:
+            ...     print(f"{account.number}: {account.name}")
+        """
+        params: dict[str, object] = {
+            "PageSize": page_size,
+            "PageNumber": page_number,
+        }
+
+        response = self._make_request(
+            "GET", f"tenants/{tenant_id}/accounts", params=params
+        )
+        return ListAccountsOutput.model_validate(response)

{day2-0.2.0.dev1 → day2-0.2.1}/day2/session.py

@@ -8,6 +8,7 @@ from day2.client.config import Config
 
 if TYPE_CHECKING:
     from day2.resources.assessment import AssessmentClient
+    from day2.resources.cost import CostClient
     from day2.resources.tenant import TenantClient
 
 T = TypeVar("T")
@@ -101,6 +102,15 @@ class Session:
         """
         return cast("AssessmentClient", self.client("assessment"))
 
+    @property
+    def cost(self) -> "CostClient":
+        """Get the cost client.
+
+        Returns:
+            CostClient: The cost client.
+        """
+        return cast("CostClient", self.client("cost"))
+
     def _create_client(self, service_name: str) -> Any:
         """Create a client for the specified service.
 
@@ -115,11 +125,13 @@ class Session:
         """
         # Import the actual classes at runtime to avoid circular imports
         from day2.resources.assessment import AssessmentClient
+        from day2.resources.cost import CostClient
         from day2.resources.tenant import TenantClient
 
         service_map = {
             "tenant": TenantClient,
             "assessment": AssessmentClient,
+            "cost": CostClient,
         }
 
         if service_name not in service_map:

{day2-0.2.0.dev1 → day2-0.2.1}/day2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: day2
-Version: 0.2.0.dev1
+Version: 0.2.1
 Summary: MontyCloud DAY2 SDK for Python
 Author-email: MontyCloud <info@montycloud.com>
 Requires-Python: >=3.11
@@ -276,14 +276,6 @@ except Exception as e:
     print(f"Unexpected error: {e}")
 ```
 
-## Development
-
-Refer to [DEVELOPER.md](DEVELOPER.md) for development instructions.
-
-## Release
-
-Refer to [RELEASE.md](RELEASE.md) for release instructions.
-
 ## License
 
 This project is licensed under the MIT License - see the LICENSE file for details.

{day2-0.2.0.dev1 → day2-0.2.1}/day2.egg-info/SOURCES.txt

@@ -18,9 +18,11 @@ day2/client/base.py
 day2/client/config.py
 day2/models/__init__.py
 day2/models/assessment.py
+day2/models/cost.py
 day2/models/tenant.py
 day2/resources/__init__.py
 day2/resources/assessment.py
+day2/resources/cost.py
 day2/resources/tenant.py
 day2_cli/__init__.py
 day2_cli/cli.py
@@ -28,6 +30,7 @@ day2_cli/commands/__init__.py
 day2_cli/commands/assessment.py
 day2_cli/commands/auth.py
 day2_cli/commands/config.py
+day2_cli/commands/cost.py
 day2_cli/commands/tenant.py
 day2_cli/utils/__init__.py
 day2_cli/utils/config.py
@@ -35,9 +38,12 @@ day2_cli/utils/formatters.py
 day2_cli/utils/output_formatter.py
 tests/test_cli_auth.py
 tests/test_cli_config.py
+tests/test_client_base.py
 tests/test_config.py
 tests/test_models_assessment.py
+tests/test_models_cost.py
 tests/test_models_tenant.py
 tests/test_resources_assessment.py
+tests/test_resources_cost.py
 tests/test_resources_tenant.py
 tests/test_session.py

{day2-0.2.0.dev1 → day2-0.2.1}/day2_cli/cli.py

@@ -13,6 +13,7 @@ from day2_cli.commands.assessment import assessment
 # Import from day2_cli package
 from day2_cli.commands.auth import auth
 from day2_cli.commands.config import config
+from day2_cli.commands.cost import cost
 from day2_cli.commands.tenant import tenant
 from day2_cli.utils.formatters import format_error
 
@@ -41,6 +42,7 @@ cli.add_command(auth)
 cli.add_command(config)
 cli.add_command(tenant)
 cli.add_command(assessment)
+cli.add_command(cost)
 
 
 def main() -> None:

{day2-0.2.0.dev1 → day2-0.2.1}/day2_cli/commands/assessment.py

@@ -38,7 +38,7 @@ def get_tenant_id(session: Session, tenant_id: Optional[str]) -> Optional[str]:
             "[red]Error: No tenant ID provided and no default tenant configured.[/red]"
         )
         console.print(
-            "[yellow]Tip: Configure a default tenant with 'day2 auth configure --tenant-id YOUR_TENANT_ID'[/yellow]"
+            "[yellow]Tip: Configure a default tenant with 'day2 config set tenant-id YOUR_TENANT_ID'[/yellow]"
         )
         return None
 
@@ -71,7 +71,7 @@ def list_assessments(
 ) -> None:
     """List assessments for a tenant.
 
-    If --tenant-id is not provided, uses the default tenant configured with 'auth configure'.
+    If --tenant-id is not provided, uses the default tenant configured with 'day2 config set tenant-id YOUR_TENANT_ID'.
     """
     try:
         # Get output format from context if set via global option
@@ -267,8 +267,11 @@ def create_assessment(
 
         try:
             scope_data = json.loads(scope)
-            if not isinstance(scope_data, list):
-                scope_data = [scope_data]
+            if not isinstance(scope_data, dict):
+                console.print(
+                    "[red]Error: Scope must be a JSON object (dictionary), not a list or primitive value[/red]"
+                )
+                return
         except json.JSONDecodeError:
             console.print("[red]Error: Scope must be a valid JSON string[/red]")
             return