stackit-stackitmarketplace 1.9.0__tar.gz → 1.10.0__tar.gz

{stackit_stackitmarketplace-1.9.0 → stackit_stackitmarketplace-1.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: stackit-stackitmarketplace
-Version: 1.9.0
+Version: 1.10.0
 Summary: STACKIT Marketplace API
 Author: STACKIT Developer Tools
 Author-email: developer-tools@stackit.cloud

{stackit_stackitmarketplace-1.9.0 → stackit_stackitmarketplace-1.10.0}/pyproject.toml

@@ -3,7 +3,7 @@ name = "stackit-stackitmarketplace"
 
 [tool.poetry]
 name = "stackit-stackitmarketplace"
-version = "v1.9.0"
+version = "v1.10.0"
 authors = [
     "STACKIT Developer Tools <developer-tools@stackit.cloud>",
 ]

{stackit_stackitmarketplace-1.9.0 → stackit_stackitmarketplace-1.10.0}/src/stackit/stackitmarketplace/models/catalog_product_pricing_option.py

@@ -16,10 +16,11 @@ from __future__ import annotations
 
 import json
 import pprint
+import re  # noqa: F401
 from typing import Any, ClassVar, Dict, List, Optional, Set
 
-from pydantic import BaseModel, ConfigDict, Field, StrictStr
-from typing_extensions import Self
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from typing_extensions import Annotated, Self
 
 from stackit.stackitmarketplace.models.catalog_pricing_option_highlight import (
     CatalogPricingOptionHighlight,
@@ -38,6 +39,9 @@ class CatalogProductPricingOption(BaseModel):
     highlights: List[CatalogPricingOptionHighlight] = Field(description="The list of highlights.")
     name: StrictStr = Field(description="The pricing option name.")
     notice_period: Optional[NoticePeriod] = Field(default=None, alias="noticePeriod")
+    plan_id: Annotated[str, Field(min_length=10, strict=True, max_length=29)] = Field(
+        description="The user-readable plan ID of a pricing option.", alias="planId"
+    )
     price_type: Optional[PriceType] = Field(default=None, alias="priceType")
     pricing_plan: Optional[StrictStr] = Field(
         default=None, description="Additional price type information.", alias="pricingPlan"
@@ -54,6 +58,7 @@ class CatalogProductPricingOption(BaseModel):
         "highlights",
         "name",
         "noticePeriod",
+        "planId",
         "priceType",
         "pricingPlan",
         "rate",
@@ -63,6 +68,13 @@ class CatalogProductPricingOption(BaseModel):
         "unit",
     ]
 
+    @field_validator("plan_id")
+    def plan_id_validate_regular_expression(cls, value):
+        """Validates the regular expression"""
+        if not re.match(r"^[a-z0-9-]{1,20}-[0-9a-f]{8}$", value):
+            raise ValueError(r"must validate the regular expression /^[a-z0-9-]{1,20}-[0-9a-f]{8}$/")
+        return value
+
     model_config = ConfigDict(
         populate_by_name=True,
         validate_assignment=True,
@@ -133,6 +145,7 @@ class CatalogProductPricingOption(BaseModel):
                 "noticePeriod": (
                     NoticePeriod.from_dict(obj["noticePeriod"]) if obj.get("noticePeriod") is not None else None
                 ),
+                "planId": obj.get("planId"),
                 "priceType": obj.get("priceType"),
                 "pricingPlan": obj.get("pricingPlan"),
                 "rate": obj.get("rate"),

{stackit_stackitmarketplace-1.9.0 → stackit_stackitmarketplace-1.10.0}/src/stackit/stackitmarketplace/models/subscription_product.py

@@ -38,6 +38,9 @@ class SubscriptionProduct(BaseModel):
     assets: Optional[Assets] = None
     delivery_method: DeliveryMethod = Field(alias="deliveryMethod")
     lifecycle_state: ProductLifecycleState = Field(alias="lifecycleState")
+    plan_id: Annotated[str, Field(min_length=10, strict=True, max_length=29)] = Field(
+        description="The user-readable plan ID of a pricing option.", alias="planId"
+    )
     price_type: PriceType = Field(alias="priceType")
     pricing_plan: StrictStr = Field(description="Additional price type information.", alias="pricingPlan")
     product_id: Annotated[str, Field(min_length=10, strict=True, max_length=29)] = Field(
@@ -62,6 +65,7 @@ class SubscriptionProduct(BaseModel):
         "assets",
         "deliveryMethod",
         "lifecycleState",
+        "planId",
         "priceType",
         "pricingPlan",
         "productId",
@@ -72,6 +76,13 @@ class SubscriptionProduct(BaseModel):
         "vendorWebsiteUrl",
     ]
 
+    @field_validator("plan_id")
+    def plan_id_validate_regular_expression(cls, value):
+        """Validates the regular expression"""
+        if not re.match(r"^[a-z0-9-]{1,20}-[0-9a-f]{8}$", value):
+            raise ValueError(r"must validate the regular expression /^[a-z0-9-]{1,20}-[0-9a-f]{8}$/")
+        return value
+
     @field_validator("product_id")
     def product_id_validate_regular_expression(cls, value):
         """Validates the regular expression"""
@@ -178,6 +189,7 @@ class SubscriptionProduct(BaseModel):
                 "assets": Assets.from_dict(obj["assets"]) if obj.get("assets") is not None else None,
                 "deliveryMethod": obj.get("deliveryMethod"),
                 "lifecycleState": obj.get("lifecycleState"),
+                "planId": obj.get("planId"),
                 "priceType": obj.get("priceType"),
                 "pricingPlan": obj.get("pricingPlan"),
                 "productId": obj.get("productId"),