stackit-cost 0.1.0__tar.gz → 0.2.0__tar.gz

{stackit_cost-0.1.0 → stackit_cost-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stackit-cost
-Version: 0.1.0
+Version: 0.2.0
 Summary: STACKIT Cost API
 Project-URL: Homepage, https://github.com/stackitcloud/stackit-sdk-python
 Project-URL: Issues, https://github.com/stackitcloud/stackit-sdk-python/issues

{stackit_cost-0.1.0 → stackit_cost-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "stackit-cost"
-version = "v0.1.0"
+version = "v0.2.0"
 description = "STACKIT Cost API"
 authors = [{name = "STACKIT Developer Tools", email = "developer-tools@stackit.cloud"}]
 requires-python = ">=3.9,<4.0"

{stackit_cost-0.1.0 → stackit_cost-0.2.0}/src/stackit/cost/api_client.py

@@ -66,6 +66,7 @@ class ApiClient:
         "date": datetime.date,
         "datetime": datetime.datetime,
         "decimal": decimal.Decimal,
+        "UUID": uuid.UUID,
         "object": object,
     }
     _pool = None
@@ -265,7 +266,7 @@ class ApiClient:
         response_text = None
         return_data = None
         try:
-            if response_type == "bytearray":
+            if response_type in ("bytearray", "bytes"):
                 return_data = response_data.data
             elif response_type == "file":
                 return_data = self.__deserialize_file(response_data)
@@ -326,25 +327,20 @@ class ApiClient:
             return obj.isoformat()
         elif isinstance(obj, decimal.Decimal):
             return str(obj)
-
         elif isinstance(obj, dict):
-            obj_dict = obj
+            return {key: self.sanitize_for_serialization(val) for key, val in obj.items()}
+
+        # Convert model obj to dict except
+        # attributes `openapi_types`, `attribute_map`
+        # and attributes which value is not None.
+        # Convert attribute name to json key in
+        # model definition for request.
+        if hasattr(obj, "to_dict") and callable(getattr(obj, "to_dict")):  # noqa: B009
+            obj_dict = obj.to_dict()
         else:
-            # Convert model obj to dict except
-            # attributes `openapi_types`, `attribute_map`
-            # and attributes which value is not None.
-            # Convert attribute name to json key in
-            # model definition for request.
-            if hasattr(obj, "to_dict") and callable(getattr(obj, "to_dict")):  # noqa: B009
-                obj_dict = obj.to_dict()
-            else:
-                obj_dict = obj.__dict__
-
-        if isinstance(obj_dict, list):
-            # here we handle instances that can either be a list or something else, and only became a real list by calling to_dict() # noqa: E501
-            return self.sanitize_for_serialization(obj_dict)
+            obj_dict = obj.__dict__
 
-        return {key: self.sanitize_for_serialization(val) for key, val in obj_dict.items()}
+        return self.sanitize_for_serialization(obj_dict)
 
     def deserialize(self, response_text: str, response_type: str, content_type: Optional[str]):
         """Deserializes response into an object.
@@ -417,6 +413,8 @@ class ApiClient:
             return self.__deserialize_datetime(data)
         elif klass is decimal.Decimal:
             return decimal.Decimal(data)
+        elif klass is uuid.UUID:
+            return uuid.UUID(data)
         elif issubclass(klass, Enum):
             return self.__deserialize_enum(data, klass)
         else:

{stackit_cost-0.1.0 → stackit_cost-0.2.0}/src/stackit/cost/models/auth_error_response.py

@@ -20,6 +20,7 @@ from datetime import datetime
 from typing import Any, ClassVar, Dict, List, Optional, Set
 
 from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -49,7 +50,8 @@ class AuthErrorResponse(BaseModel):
         return value
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -60,8 +62,7 @@ class AuthErrorResponse(BaseModel):
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
-        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
-        return json.dumps(self.to_dict())
+        return json.dumps(to_jsonable_python(self.to_dict()))
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:

{stackit_cost-0.1.0 → stackit_cost-0.2.0}/src/stackit/cost/models/detailed_service_cost.py

@@ -24,6 +24,7 @@ from pydantic import (
     StrictFloat,
     StrictInt,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Annotated, Self
 
 from stackit.cost.models.report_data import ReportData
@@ -70,7 +71,8 @@ class DetailedServiceCost(BaseModel):
     ]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -81,8 +83,7 @@ class DetailedServiceCost(BaseModel):
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
-        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
-        return json.dumps(self.to_dict())
+        return json.dumps(to_jsonable_python(self.to_dict()))
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:

{stackit_cost-0.1.0 → stackit_cost-0.2.0}/src/stackit/cost/models/error_response.py

@@ -18,6 +18,7 @@ import pprint
 from typing import Any, ClassVar, Dict, List, Optional, Set
 
 from pydantic import BaseModel, ConfigDict, StrictStr
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -30,7 +31,8 @@ class ErrorResponse(BaseModel):
     __properties: ClassVar[List[str]] = ["msg"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -41,8 +43,7 @@ class ErrorResponse(BaseModel):
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
-        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
-        return json.dumps(self.to_dict())
+        return json.dumps(to_jsonable_python(self.to_dict()))
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:

{stackit_cost-0.1.0 → stackit_cost-0.2.0}/src/stackit/cost/models/project_cost_with_detailed_services.py

@@ -26,6 +26,7 @@ from pydantic import (
     StrictInt,
     StrictStr,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 from stackit.cost.models.detailed_service_cost import DetailedServiceCost
@@ -61,7 +62,8 @@ class ProjectCostWithDetailedServices(BaseModel):
     ]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -72,8 +74,7 @@ class ProjectCostWithDetailedServices(BaseModel):
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
-        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
-        return json.dumps(self.to_dict())
+        return json.dumps(to_jsonable_python(self.to_dict()))
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:

{stackit_cost-0.1.0 → stackit_cost-0.2.0}/src/stackit/cost/models/project_cost_with_reports.py

@@ -26,6 +26,7 @@ from pydantic import (
     StrictInt,
     StrictStr,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 from stackit.cost.models.report_data import ReportData
@@ -62,7 +63,8 @@ class ProjectCostWithReports(BaseModel):
     ]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -73,8 +75,7 @@ class ProjectCostWithReports(BaseModel):
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
-        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
-        return json.dumps(self.to_dict())
+        return json.dumps(to_jsonable_python(self.to_dict()))
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:

{stackit_cost-0.1.0 → stackit_cost-0.2.0}/src/stackit/cost/models/project_cost_with_summarized_services.py

@@ -26,6 +26,7 @@ from pydantic import (
     StrictInt,
     StrictStr,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 from stackit.cost.models.summarized_service_cost import SummarizedServiceCost
@@ -58,7 +59,8 @@ class ProjectCostWithSummarizedServices(BaseModel):
     ]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -69,8 +71,7 @@ class ProjectCostWithSummarizedServices(BaseModel):
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
-        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
-        return json.dumps(self.to_dict())
+        return json.dumps(to_jsonable_python(self.to_dict()))
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:

{stackit_cost-0.1.0 → stackit_cost-0.2.0}/src/stackit/cost/models/report_data.py

@@ -24,6 +24,7 @@ from pydantic import (
     StrictFloat,
     StrictInt,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 from stackit.cost.models.report_data_time_period import ReportDataTimePeriod
@@ -41,7 +42,8 @@ class ReportData(BaseModel):
     __properties: ClassVar[List[str]] = ["charge", "discount", "quantity", "timePeriod"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -52,8 +54,7 @@ class ReportData(BaseModel):
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
-        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
-        return json.dumps(self.to_dict())
+        return json.dumps(to_jsonable_python(self.to_dict()))
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:

{stackit_cost-0.1.0 → stackit_cost-0.2.0}/src/stackit/cost/models/report_data_time_period.py

@@ -19,6 +19,7 @@ from datetime import date
 from typing import Any, ClassVar, Dict, List, Optional, Set
 
 from pydantic import BaseModel, ConfigDict
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -32,7 +33,8 @@ class ReportDataTimePeriod(BaseModel):
     __properties: ClassVar[List[str]] = ["end", "start"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -43,8 +45,7 @@ class ReportDataTimePeriod(BaseModel):
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
-        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
-        return json.dumps(self.to_dict())
+        return json.dumps(to_jsonable_python(self.to_dict()))
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:

{stackit_cost-0.1.0 → stackit_cost-0.2.0}/src/stackit/cost/models/summarized_project_cost.py

@@ -26,6 +26,7 @@ from pydantic import (
     StrictInt,
     StrictStr,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -54,7 +55,8 @@ class SummarizedProjectCost(BaseModel):
     ]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -65,8 +67,7 @@ class SummarizedProjectCost(BaseModel):
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
-        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
-        return json.dumps(self.to_dict())
+        return json.dumps(to_jsonable_python(self.to_dict()))
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:

{stackit_cost-0.1.0 → stackit_cost-0.2.0}/src/stackit/cost/models/summarized_service_cost.py

@@ -26,6 +26,7 @@ from pydantic import (
     StrictInt,
     StrictStr,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -54,7 +55,8 @@ class SummarizedServiceCost(BaseModel):
     ]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -65,8 +67,7 @@ class SummarizedServiceCost(BaseModel):
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
-        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
-        return json.dumps(self.to_dict())
+        return json.dumps(to_jsonable_python(self.to_dict()))
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]: