day2 0.2.0.dev1__tar.gz → 0.2.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: day2
-Version: 0.2.0.dev1
+Version: 0.2.2
 Summary: MontyCloud DAY2 SDK for Python
 Author-email: MontyCloud <info@montycloud.com>
 Requires-Python: >=3.11
@@ -152,7 +152,7 @@ The SDK supports authentication with both an API key and an API secret key. You
 1. Directly in code:
    ```python
    # Simplified API
-   session = day2.Session(api_key="your-api-key")
+   session = day2.Session(api_key="your-api-key", api_secret_key="your-secret-key")
 
    # With API secret key
    session = day2.Session(
@@ -191,7 +191,7 @@ The SDK supports multi-tenant operations through session-based tenant context:
 
 ```python
 # Create a session
-session = day2.Session(api_key="your-api-key")
+session = day2.Session(api_key="your-api-key", api_secret_key="your-secret-key")
 
 # Set tenant context
 session.set_tenant("org-123")
@@ -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.2}/README.md

@@ -114,7 +114,7 @@ The SDK supports authentication with both an API key and an API secret key. You
 1. Directly in code:
    ```python
    # Simplified API
-   session = day2.Session(api_key="your-api-key")
+   session = day2.Session(api_key="your-api-key", api_secret_key="your-secret-key")
 
    # With API secret key
    session = day2.Session(
@@ -153,7 +153,7 @@ The SDK supports multi-tenant operations through session-based tenant context:
 
 ```python
 # Create a session
-session = day2.Session(api_key="your-api-key")
+session = day2.Session(api_key="your-api-key", api_secret_key="your-secret-key")
 
 # Set tenant context
 session.set_tenant("org-123")
@@ -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.2}/day2/__init__.py

@@ -12,6 +12,7 @@ from day2.session import Session
 
 if TYPE_CHECKING:
     from day2.resources.assessment import AssessmentClient
+    from day2.resources.cost import CostClient
     from day2.resources.tenant import TenantClient
 
 
@@ -54,4 +55,20 @@ def assessment() -> "AssessmentClient":
     return get_default_session().assessment
 
 
-__all__ = ["Session", "__version__", "tenant", "assessment", "get_default_session"]
+def cost() -> "CostClient":
+    """Get a cost client using the default session.
+
+    Returns:
+        CostClient: A client for interacting with cost resources
+    """
+    return get_default_session().cost
+
+
+__all__ = [
+    "Session",
+    "__version__",
+    "tenant",
+    "assessment",
+    "cost",
+    "get_default_session",
+]

{day2-0.2.0.dev1 → day2-0.2.2}/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.2}/day2/client/config.py

@@ -1,17 +1,29 @@
 """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
 
 
 @dataclass
 class Config:
-    """Configuration for the MontyCloud SDK."""
+    """Configuration for the MontyCloud SDK.
+
+    Attributes:
+        base_url: Base URL for the MontyCloud API
+        api_version: API version to use
+        timeout: Request timeout in seconds
+        max_retries: Maximum number of retries for failed requests
+        retry_backoff_factor: Exponential backoff factor for retries
+        tenant_id: Default tenant ID for operations
+        retry_min_delay: Minimum delay between retries in seconds
+        retry_max_delay: Maximum delay between retries in seconds
+        output_format: Output format for CLI commands (table or json)
+    """
 
     # 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 +46,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 +73,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 +86,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 +142,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.0.dev1 → day2-0.2.2}/day2/models/__init__.py

@@ -7,6 +7,7 @@ from day2.models.assessment import (
     GetAssessmentOutput,
     ListAssessmentsOutput,
 )
+from day2.models.cost import GetCostByChargeTypeOutput
 from day2.models.tenant import ListTenantsOutput, TenantDetails
 
 __all__ = [
@@ -17,4 +18,5 @@ __all__ = [
     "CreateAssessmentInput",
     "CreateAssessmentOutput",
     "GetAssessmentOutput",
+    "GetCostByChargeTypeOutput",
 ]

{day2-0.2.0.dev1 → day2-0.2.2}/day2/models/assessment.py

@@ -5,7 +5,20 @@ from pydantic import BaseModel, ConfigDict, Field
 
 
 class Assessment(BaseModel):
-    """Details of an assessment."""
+    """Details of an assessment.
+
+    Attributes:
+        id: Assessment identifier
+        name: Name of the assessment
+        description: Description of the assessment
+        status: Current status of the assessment
+        assessment_arn: AWS ARN of the assessment
+        lenses: List of lens identifiers used in the assessment
+        total_questions: Total number of questions in the assessment
+        answered_questions: Number of questions that have been answered
+        created_at: Timestamp when the assessment was created
+        updated_at: Timestamp when the assessment was last updated
+    """
 
     id: str = Field(alias="AssessmentId")
     name: str = Field(alias="AssessmentName")
@@ -23,13 +36,15 @@ class Assessment(BaseModel):
 
 
 class ListAssessmentsOutput(BaseModel):
-    """Output of list_assessments operation."""
+    """Output of list_assessments operation.
+
+    Attributes:
+        assessments: List of assessment details
+        next_page_token: Token for fetching the next page of results
+    """
 
     assessments: List[Assessment] = Field(alias="Assessments")
     next_page_token: Optional[str] = Field(None, alias="NextPageToken")
-    # Keep these fields for backward compatibility
-    page_number: Optional[int] = Field(None, alias="PageNumber")
-    has_more: Optional[bool] = Field(None, alias="HasMore")
 
     # Allow extra fields
     model_config = ConfigDict(extra="allow")
@@ -38,16 +53,48 @@ class ListAssessmentsOutput(BaseModel):
 class CreateAssessmentInput(BaseModel):
     """Input for creating an assessment.
 
-    According to the server-side schema, Scope can be one of two formats:
-    1. ScopeAcc: {"Project": {}, "Accounts": [{"AccountNumber": "123", "Regions": ["us-east-1"]}]}
-    2. ScopeProj: {"Project": {"ProjectId": "123", "Applications": ["app1"]}, "Accounts": ["123"]}
+    The scope parameter can be in one of two formats:
+
+    1. Account-based scope:
+       ```python
+       {
+           "Project": {},
+           "Accounts": [
+               {"AccountNumber": "123456789012", "Regions": ["us-east-1", "us-west-2"]}
+           ]
+       }
+       ```
+
+    2. Project-based scope:
+       ```python
+       {
+           "Project": {"ProjectId": "proj-123", "Applications": ["app1", "app2"]},
+           "Accounts": ["123456789012"]
+       }
+       ```
+
+    Attributes:
+        name: Name of the assessment
+        description: Description of the assessment
+        review_owner: Email or identifier of the review owner
+        scope: Scope configuration (see formats above)
+        lenses: List of lens aliases to use (defaults to ["AWS Well-Architected Framework"] only "AWS Well-Architected Framework" is supported)
+        tags: Key-value pairs for tagging the assessment
+        region_code: AWS region code where the assessment is created
+        environment: Environment type (e.g., PRODUCTION, DEVELOPMENT)
+        hosted_account_number: Optional AWS account number for hosting
+        diagram_url: Optional URL to architecture diagram
+        industry_type: Optional industry type classification
+        industry: Optional industry specification
     """
 
     name: str = Field(alias="AssessmentName")
     description: str = Field(alias="Description")
     review_owner: str = Field(alias="ReviewOwner")
     scope: Dict[str, Any] = Field(alias="Scope")
-    lenses: Optional[List[str]] = Field(default=[], alias="Lenses")
+    lenses: List[str] = Field(
+        default=["AWS Well-Architected Framework"], alias="Lenses"
+    )
     tags: Optional[Dict[str, Any]] = Field(default={}, alias="Tags")
     region_code: str = Field(alias="RegionCode")
     environment: str = Field(alias="Environment")
@@ -63,7 +110,38 @@ class CreateAssessmentInput(BaseModel):
 
 
 class GetAssessmentOutput(BaseModel):
-    """Output of get_assessment operation."""
+    """Output of get_assessment operation.
+
+    Attributes:
+        id: Assessment identifier
+        name: Name of the assessment
+        description: Description of the assessment
+        status: Current status of the assessment
+        assessment_arn: AWS ARN of the assessment
+        created_at: Timestamp when the assessment was created
+        updated_at: Timestamp when the assessment was last updated
+        answered_questions: Number of questions that have been answered
+        total_questions: Total number of questions in the assessment
+        lenses: List of lens identifiers used in the assessment
+        owner: Owner of the assessment
+        diagram_url: URL to architecture diagram (if provided)
+        environment: Environment type
+        improvement_status: Status of improvement plan
+        in_sync: Synchronization status indicator
+        industry: Industry specification
+        industry_type: Industry type classification
+        region_code: AWS region code
+        scope: Scope configuration
+        risk_counts: Dictionary of risk counts by severity
+        lens_alias: Primary lens alias
+        lens_arn: AWS ARN of the lens
+        lens_version: Version of the lens
+        lens_name: Name of the lens
+        lens_status: Status of the lens
+        aws_updated_at: Timestamp of  the last AWS update
+        last_run_at: Timestamp of the last execution run (if completed)
+        execution_id: ID of the last execution run (if completed)
+    """
 
     id: str = Field(alias="AssessmentId")
     name: str = Field(alias="AssessmentName")
@@ -93,6 +171,12 @@ class GetAssessmentOutput(BaseModel):
     aws_updated_at: str = Field(
         alias="AWSUpdatedAt"
     )  # Changed to str to handle timezone format
+    last_run_at: Optional[datetime] = Field(
+        None, alias="LastRunAt"
+    )  # Optional since it will be present only when the execution run is completed for the assessment
+    execution_id: Optional[str] = Field(
+        None, alias="ExecutionId"
+    )  # Optional since it will be present only when the execution run is completed for the assessment
 
     # Allow extra fields
     model_config = ConfigDict(extra="allow")
@@ -101,7 +185,12 @@ class GetAssessmentOutput(BaseModel):
 class CreateAssessmentOutput(BaseModel):
     """Output of create_assessment operation.
 
-    According to the OpenAPI specification, this only returns the AssessmentId and AssessmentArn.
+    Note:
+        According to the OpenAPI specification, this only returns the AssessmentId and AssessmentArn.
+
+    Attributes:
+        id: Newly created assessment identifier
+        assessment_arn: AWS ARN of the newly created assessment
     """
 
     # Fields from the OpenAPI spec
@@ -113,7 +202,21 @@ class CreateAssessmentOutput(BaseModel):
 
 
 class Question(BaseModel):
-    """Details of an assessment question."""
+    """Details of an assessment question.
+
+    Attributes:
+        id: Question identifier
+        title: Title of the question
+        pillar_id: ID of the pillar this question belongs to
+        risk: Current risk level (HIGH, MEDIUM, LOW, or UNANSWERED)
+        reason: Reason for the current answer (if applicable)
+        description: Detailed description of the question
+        pillar_name: Name of the pillar this question belongs to
+        is_answered: Whether the question has been answered
+        choices: Available choices for the question
+        selected_choices: Currently selected choice IDs
+        notes: Additional notes for the answer
+    """
 
     id: str = Field(alias="QuestionId")
     title: str = Field(alias="QuestionTitle")
@@ -135,7 +238,15 @@ class Question(BaseModel):
 
 
 class ListQuestionsOutput(BaseModel):
-    """Output of list_questions operation."""
+    """Output of list_questions operation.
+
+    Attributes:
+        questions: List of question details
+        total_questions: Total number of questions
+        answered_questions: Number of questions that have been answered
+        pillar_id: ID of the pillar (if filtered by pillar)
+        pillar_name: Name of the pillar (if filtered by pillar)
+    """
 
     questions: List[Question] = Field(alias="Questions")
 
@@ -171,7 +282,25 @@ class ListQuestionsOutput(BaseModel):
 
 
 class GetQuestionOutput(BaseModel):
-    """Output of get_question operation."""
+    """Output of get_question operation.
+
+    Attributes:
+        title: Title of the question
+        description: Detailed description of the question
+        pillar_id: ID of the pillar this question belongs to
+        choices: Available choices for answering the question
+        is_applicable: Whether the question is applicable
+        risk: Current risk level (if answered)
+        reason: Reason for marking as not applicable
+        helpful_resource_url: URL to helpful resources
+        improvement_plan_url: URL to improvement plan
+        choice_answers: Currently selected choice answers
+        id: Question identifier
+        pillar_name: Name of the pillar
+        notes: Additional notes
+        is_answered: Whether the question has been answered
+        selected_choices: List of selected choice IDs
+    """
 
     # Fields directly from the API response
     title: str = Field(alias="QuestionTitle")
@@ -228,7 +357,11 @@ class GetQuestionOutput(BaseModel):
 
 
 class ChoiceStatus(BaseModel):
-    """Status of a choice in an answer."""
+    """Status of a choice in an answer.
+
+    Attributes:
+        status: Status of the choice (SELECTED or UNSELECTED)
+    """
 
     status: str = Field("SELECTED", alias="Status")
 
@@ -236,7 +369,18 @@ class ChoiceStatus(BaseModel):
 
 
 class AnswerQuestionInput(BaseModel):
-    """Input for answering a question."""
+    """Input for answering a question.
+
+    Attributes:
+        lens_alias: Alias of the lens (defaults to 'wellarchitected')
+        choice_updates: Dictionary mapping choice IDs to their status
+        notes: Additional notes about the answer
+        is_applicable: Whether the question is applicable (defaults to True)
+        reason: Reason if not applicable (OUT_OF_SCOPE, BUSINESS_PRIORITIES,
+            ARCHITECTURE_CONSTRAINTS, OTHER, or NONE)
+        selected_choices: List of selected choice IDs (deprecated, use choice_updates)
+        risk: Risk level (deprecated, automatically calculated)
+    """
 
     lens_alias: str = Field("wellarchitected", alias="LensAlias")
     choice_updates: Dict[str, ChoiceStatus] = Field(
@@ -275,7 +419,13 @@ class AnswerQuestionInput(BaseModel):
 class AnswerQuestionOutput(BaseModel):
     """Output of answer_question operation.
 
-    The API returns a success message with status and message fields.
+    Note:
+        The API returns a success message with status and message fields.
+
+    Attributes:
+        status: Status of the operation (e.g., 'success')
+        message: Descriptive message about the operation result
+        id: Question identifier (added for convenience)
     """
 
     # Fields directly from the API response
@@ -289,7 +439,29 @@ class AnswerQuestionOutput(BaseModel):
 
 
 class Finding(BaseModel):
-    """Details of a finding."""
+    """Details of a finding.
+
+    Attributes:
+        finding_id: Unique identifier for the finding
+        resource_id: ID of the affected resource
+        resource_type: Type of the affected resource (e.g., AWS::EC2::Instance)
+        account_number: AWS account number where the resource exists
+        region_code: AWS region where the resource exists
+        check_id: ID of the check that generated this finding
+        recommendation: Recommended action to address the finding
+        remediation: Whether remediation is available
+        created_at: Timestamp when the finding was created
+        question_id: Related assessment question ID
+        question: Related assessment question text
+        pillar_id: ID of the related pillar
+        severity: Severity level (HIGH, MEDIUM, LOW)
+        status: Current status of the finding (OPEN, RESOLVED, SUPPRESSED)
+        title: Title of the finding
+        description: Detailed description of the finding
+        best_practice_id: ID of the related best practice
+        best_practice: Description of the best practice
+        best_practice_risk: Risk level associated with not following the best practice
+    """
 
     finding_id: str = Field(alias="FindingId")
     resource_id: str = Field(alias="ResourceId")
@@ -315,7 +487,12 @@ class Finding(BaseModel):
 
 
 class ListFindingsOutput(BaseModel):
-    """Output of list_findings operation."""
+    """Output of list_findings operation.
+
+    Attributes:
+        records: List of finding details
+        next_page_token: Token for fetching the next page of results
+    """
 
     records: List[Finding] = Field(alias="Records", default=[])
     next_page_token: Optional[str] = Field(None, alias="NextPageToken")