stackit-stackitmarketplace 1.1.3__tar.gz → 1.3.0__tar.gz

{stackit_stackitmarketplace-1.1.3 → stackit_stackitmarketplace-1.3.0}/PKG-INFO

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

{stackit_stackitmarketplace-1.1.3 → stackit_stackitmarketplace-1.3.0}/pyproject.toml

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

{stackit_stackitmarketplace-1.1.3 → stackit_stackitmarketplace-1.3.0}/src/stackit/stackitmarketplace/__init__.py

@@ -47,6 +47,9 @@ from stackit.stackitmarketplace.models.catalog_product_detail import (
 from stackit.stackitmarketplace.models.catalog_product_details_vendor import (
     CatalogProductDetailsVendor,
 )
+from stackit.stackitmarketplace.models.catalog_product_facets_value_inner import (
+    CatalogProductFacetsValueInner,
+)
 from stackit.stackitmarketplace.models.catalog_product_highlight import (
     CatalogProductHighlight,
 )

{stackit_stackitmarketplace-1.1.3 → stackit_stackitmarketplace-1.3.0}/src/stackit/stackitmarketplace/models/__init__.py

@@ -28,6 +28,9 @@ from stackit.stackitmarketplace.models.catalog_product_detail import (
 from stackit.stackitmarketplace.models.catalog_product_details_vendor import (
     CatalogProductDetailsVendor,
 )
+from stackit.stackitmarketplace.models.catalog_product_facets_value_inner import (
+    CatalogProductFacetsValueInner,
+)
 from stackit.stackitmarketplace.models.catalog_product_highlight import (
     CatalogProductHighlight,
 )

{stackit_stackitmarketplace-1.1.3 → stackit_stackitmarketplace-1.3.0}/src/stackit/stackitmarketplace/models/catalog_product_details_vendor.py

@@ -38,7 +38,9 @@ class CatalogProductDetailsVendor(BaseModel):
     description: StrictStr = Field(description="The vendor description.")
     logo: Union[StrictBytes, StrictStr] = Field(description="The logo base64 encoded.")
     name: Annotated[str, Field(strict=True, max_length=512)] = Field(description="The product's vendor name.")
-    vendor_id: object = Field(alias="vendorId")
+    vendor_id: Annotated[str, Field(min_length=36, strict=True, max_length=36)] = Field(
+        description="Universally Unique Identifier (UUID).", alias="vendorId"
+    )
     video_url: Annotated[str, Field(strict=True, max_length=512)] = Field(
         description="The vendor video URL.", alias="videoUrl"
     )
@@ -54,6 +56,15 @@ class CatalogProductDetailsVendor(BaseModel):
             raise ValueError(r"must validate the regular expression /^[a-zA-ZäüöÄÜÖ0-9,.!?()@\/:=\n\t -]+$/")
         return value
 
+    @field_validator("vendor_id")
+    def vendor_id_validate_regular_expression(cls, value):
+        """Validates the regular expression"""
+        if not re.match(r"^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$", value):
+            raise ValueError(
+                r"must validate the regular expression /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/"
+            )
+        return value
+
     @field_validator("video_url")
     def video_url_validate_regular_expression(cls, value):
         """Validates the regular expression"""

stackit_stackitmarketplace-1.3.0/src/stackit/stackitmarketplace/models/catalog_product_facets_value_inner.py

@@ -0,0 +1,83 @@
+# coding: utf-8
+
+"""
+    STACKIT Marketplace API
+
+    API to manage STACKIT Marketplace.
+
+    The version of the OpenAPI document: 1
+    Contact: marketplace@stackit.cloud
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501 docstring might be too long
+
+from __future__ import annotations
+
+import json
+import pprint
+from typing import Any, ClassVar, Dict, List, Optional, Set
+
+from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr
+from typing_extensions import Self
+
+
+class CatalogProductFacetsValueInner(BaseModel):
+    """
+    CatalogProductFacetsValueInner
+    """
+
+    count: StrictInt = Field(description="The number of items associated with this facet value.")
+    value: StrictStr = Field(description="The value of the facet.")
+    __properties: ClassVar[List[str]] = ["count", "value"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    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())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of CatalogProductFacetsValueInner from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of CatalogProductFacetsValueInner from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({"count": obj.get("count"), "value": obj.get("value")})
+        return _obj

{stackit_stackitmarketplace-1.1.3 → stackit_stackitmarketplace-1.3.0}/src/stackit/stackitmarketplace/models/catalog_product_overview_vendor.py

@@ -29,7 +29,9 @@ class CatalogProductOverviewVendor(BaseModel):
     """
 
     name: Annotated[str, Field(strict=True, max_length=512)] = Field(description="The product's vendor name.")
-    vendor_id: object = Field(alias="vendorId")
+    vendor_id: Annotated[str, Field(min_length=36, strict=True, max_length=36)] = Field(
+        description="Universally Unique Identifier (UUID).", alias="vendorId"
+    )
     website_url: Annotated[str, Field(strict=True, max_length=512)] = Field(
         description="Uniform Resource Locator.", alias="websiteUrl"
     )
@@ -42,6 +44,15 @@ class CatalogProductOverviewVendor(BaseModel):
             raise ValueError(r"must validate the regular expression /^[a-zA-ZäüöÄÜÖ0-9,.!?()@\/:=\n\t -]+$/")
         return value
 
+    @field_validator("vendor_id")
+    def vendor_id_validate_regular_expression(cls, value):
+        """Validates the regular expression"""
+        if not re.match(r"^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$", value):
+            raise ValueError(
+                r"must validate the regular expression /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/"
+            )
+        return value
+
     @field_validator("website_url")
     def website_url_validate_regular_expression(cls, value):
         """Validates the regular expression"""

{stackit_stackitmarketplace-1.1.3 → stackit_stackitmarketplace-1.3.0}/src/stackit/stackitmarketplace/models/list_catalog_products_response.py

@@ -21,6 +21,9 @@ from typing import Any, ClassVar, Dict, List, Optional, Set, Union
 from pydantic import BaseModel, ConfigDict, Field, StrictStr
 from typing_extensions import Annotated, Self
 
+from stackit.stackitmarketplace.models.catalog_product_facets_value_inner import (
+    CatalogProductFacetsValueInner,
+)
 from stackit.stackitmarketplace.models.catalog_product_overview import (
     CatalogProductOverview,
 )
@@ -34,11 +37,14 @@ class ListCatalogProductsResponse(BaseModel):
     cursor: StrictStr = Field(
         description="A pagination cursor that represents a position in the dataset. If given, results will be returned from the item after the cursor. If not given, results will be returned from the beginning."
     )
+    facets: Optional[Dict[str, List[CatalogProductFacetsValueInner]]] = Field(
+        default=None, description="A collection of facets, where each key represents a facet category."
+    )
     items: List[CatalogProductOverview]
     limit: Union[
         Annotated[float, Field(le=100, strict=True, ge=0)], Annotated[int, Field(le=100, strict=True, ge=0)]
     ] = Field(description="Limit for returned Objects.")
-    __properties: ClassVar[List[str]] = ["cursor", "items", "limit"]
+    __properties: ClassVar[List[str]] = ["cursor", "facets", "items", "limit"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -77,6 +83,13 @@ class ListCatalogProductsResponse(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
+        # override the default output from pydantic by calling `to_dict()` of each value in facets (dict of array)
+        _field_dict_of_array = {}
+        if self.facets:
+            for _key in self.facets:
+                if self.facets[_key] is not None:
+                    _field_dict_of_array[_key] = [_item.to_dict() for _item in self.facets[_key]]
+            _dict["facets"] = _field_dict_of_array
         # override the default output from pydantic by calling `to_dict()` of each item in items (list)
         _items = []
         if self.items:
@@ -98,6 +111,10 @@ class ListCatalogProductsResponse(BaseModel):
         _obj = cls.model_validate(
             {
                 "cursor": obj.get("cursor"),
+                "facets": dict(
+                    (_k, [CatalogProductFacetsValueInner.from_dict(_item) for _item in _v] if _v is not None else None)
+                    for _k, _v in obj.get("facets", {}).items()
+                ),
                 "items": (
                     [CatalogProductOverview.from_dict(_item) for _item in obj["items"]]
                     if obj.get("items") is not None

{stackit_stackitmarketplace-1.1.3 → stackit_stackitmarketplace-1.3.0}/src/stackit/stackitmarketplace/models/vendor_subscription.py

@@ -16,10 +16,11 @@ from __future__ import annotations
 
 import json
 import pprint
+import re
 from typing import Any, ClassVar, Dict, List, Optional, Set
 
-from pydantic import BaseModel, ConfigDict, Field
-from typing_extensions import Self
+from pydantic import BaseModel, ConfigDict, Field, field_validator
+from typing_extensions import Annotated, Self
 
 from stackit.stackitmarketplace.models.subscription_lifecycle_state import (
     SubscriptionLifecycleState,
@@ -33,12 +34,45 @@ class VendorSubscription(BaseModel):
     """
 
     lifecycle_state: SubscriptionLifecycleState = Field(alias="lifecycleState")
-    organization_id: object = Field(alias="organizationId")
+    organization_id: Annotated[str, Field(min_length=36, strict=True, max_length=36)] = Field(
+        description="Universally Unique Identifier (UUID).", alias="organizationId"
+    )
     product: SubscriptionProduct
-    project_id: object = Field(alias="projectId")
-    subscription_id: object = Field(alias="subscriptionId")
+    project_id: Annotated[str, Field(min_length=36, strict=True, max_length=36)] = Field(
+        description="Universally Unique Identifier (UUID).", alias="projectId"
+    )
+    subscription_id: Annotated[str, Field(min_length=36, strict=True, max_length=36)] = Field(
+        description="Universally Unique Identifier (UUID).", alias="subscriptionId"
+    )
     __properties: ClassVar[List[str]] = ["lifecycleState", "organizationId", "product", "projectId", "subscriptionId"]
 
+    @field_validator("organization_id")
+    def organization_id_validate_regular_expression(cls, value):
+        """Validates the regular expression"""
+        if not re.match(r"^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$", value):
+            raise ValueError(
+                r"must validate the regular expression /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/"
+            )
+        return value
+
+    @field_validator("project_id")
+    def project_id_validate_regular_expression(cls, value):
+        """Validates the regular expression"""
+        if not re.match(r"^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$", value):
+            raise ValueError(
+                r"must validate the regular expression /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/"
+            )
+        return value
+
+    @field_validator("subscription_id")
+    def subscription_id_validate_regular_expression(cls, value):
+        """Validates the regular expression"""
+        if not re.match(r"^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$", value):
+            raise ValueError(
+                r"must validate the regular expression /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/"
+            )
+        return value
+
     model_config = ConfigDict(
         populate_by_name=True,
         validate_assignment=True,