Skip to content

feat(product_catalog): add benchmarks for Managed Inference models #1447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scaleway-bot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(product_catalog): add benchmarks for Managed Inference models #1447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions scaleway-async/scaleway_async/product_catalog/v2alpha1/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@
from .types import PublicCatalogProductPropertiesGenerativeApis
from .types import PublicCatalogProductPropertiesHardware
from .types import PublicCatalogProductPropertiesInstance
from .types import PublicCatalogProductPropertiesKeyManager
from .types import PublicCatalogProductPropertiesLoadBalancer
from .types import PublicCatalogProductPropertiesManagedInference
from .types import PublicCatalogProductPropertiesObjectStorage
from .types import PublicCatalogProductPropertiesSecretManager
from .types import PublicCatalogProductEnvironmentalImpactEstimation
from .types import PublicCatalogProductLocality
from .types import PublicCatalogProductPrice
Expand Down Expand Up @@ -56,9 +58,11 @@
"PublicCatalogProductPropertiesGenerativeApis",
"PublicCatalogProductPropertiesHardware",
"PublicCatalogProductPropertiesInstance",
"PublicCatalogProductPropertiesKeyManager",
"PublicCatalogProductPropertiesLoadBalancer",
"PublicCatalogProductPropertiesManagedInference",
"PublicCatalogProductPropertiesObjectStorage",
"PublicCatalogProductPropertiesSecretManager",
"PublicCatalogProductEnvironmentalImpactEstimation",
"PublicCatalogProductLocality",
"PublicCatalogProductPrice",
Expand Down
42 changes: 42 additions & 0 deletions scaleway-async/scaleway_async/product_catalog/v2alpha1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@
PublicCatalogProductPropertiesGenerativeApis,
PublicCatalogProductPropertiesHardware,
PublicCatalogProductPropertiesInstance,
PublicCatalogProductPropertiesKeyManager,
PublicCatalogProductPropertiesLoadBalancer,
PublicCatalogProductPropertiesManagedInference,
PublicCatalogProductPropertiesObjectStorage,
PublicCatalogProductPropertiesSecretManager,
PublicCatalogProductEnvironmentalImpactEstimation,
PublicCatalogProductLocality,
PublicCatalogProductPrice,
Expand Down Expand Up @@ -482,6 +484,19 @@ def unmarshal_PublicCatalogProductPropertiesInstance(
return PublicCatalogProductPropertiesInstance(**args)


def unmarshal_PublicCatalogProductPropertiesKeyManager(
data: Any,
) -> PublicCatalogProductPropertiesKeyManager:
if not isinstance(data, dict):
raise TypeError(
"Unmarshalling the type 'PublicCatalogProductPropertiesKeyManager' failed as data isn't a dictionary."
)

args: dict[str, Any] = {}

return PublicCatalogProductPropertiesKeyManager(**args)


def unmarshal_PublicCatalogProductPropertiesLoadBalancer(
data: Any,
) -> PublicCatalogProductPropertiesLoadBalancer:
Expand Down Expand Up @@ -527,6 +542,19 @@ def unmarshal_PublicCatalogProductPropertiesObjectStorage(
return PublicCatalogProductPropertiesObjectStorage(**args)


def unmarshal_PublicCatalogProductPropertiesSecretManager(
data: Any,
) -> PublicCatalogProductPropertiesSecretManager:
if not isinstance(data, dict):
raise TypeError(
"Unmarshalling the type 'PublicCatalogProductPropertiesSecretManager' failed as data isn't a dictionary."
)

args: dict[str, Any] = {}

return PublicCatalogProductPropertiesSecretManager(**args)


def unmarshal_PublicCatalogProductEnvironmentalImpactEstimation(
data: Any,
) -> PublicCatalogProductEnvironmentalImpactEstimation:
Expand Down Expand Up @@ -688,6 +716,20 @@ def unmarshal_PublicCatalogProductProperties(
else:
args["load_balancer"] = None

field = data.get("secret_manager", None)
if field is not None:
args["secret_manager"] = unmarshal_PublicCatalogProductPropertiesSecretManager(
field
)
else:
args["secret_manager"] = None

field = data.get("key_manager", None)
if field is not None:
args["key_manager"] = unmarshal_PublicCatalogProductPropertiesKeyManager(field)
else:
args["key_manager"] = None

return PublicCatalogProductProperties(**args)


Expand Down
16 changes: 16 additions & 0 deletions scaleway-async/scaleway_async/product_catalog/v2alpha1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ class ListPublicCatalogProductsRequestProductType(str, Enum, metaclass=StrEnumMe
MANAGED_INFERENCE = "managed_inference"
GENERATIVE_APIS = "generative_apis"
LOAD_BALANCER = "load_balancer"
SECRET_MANAGER = "secret_manager"
KEY_MANAGER = "key_manager"

def __str__(self) -> str:
return str(self.value)
Expand Down Expand Up @@ -376,6 +378,11 @@ class PublicCatalogProductPropertiesInstance:
"""


@dataclass
class PublicCatalogProductPropertiesKeyManager:
pass


@dataclass
class PublicCatalogProductPropertiesLoadBalancer:
pass
Expand All @@ -394,6 +401,11 @@ class PublicCatalogProductPropertiesObjectStorage:
pass


@dataclass
class PublicCatalogProductPropertiesSecretManager:
pass


@dataclass
class PublicCatalogProductEnvironmentalImpactEstimation:
kg_co2_equivalent: Optional[float] = None
Expand Down Expand Up @@ -444,6 +456,10 @@ class PublicCatalogProductProperties:

load_balancer: Optional[PublicCatalogProductPropertiesLoadBalancer] = None

secret_manager: Optional[PublicCatalogProductPropertiesSecretManager] = None

key_manager: Optional[PublicCatalogProductPropertiesKeyManager] = None


@dataclass
class PublicCatalogProductUnitOfMeasure:
Expand Down
4 changes: 4 additions & 0 deletions scaleway/scaleway/product_catalog/v2alpha1/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@
from .types import PublicCatalogProductPropertiesGenerativeApis
from .types import PublicCatalogProductPropertiesHardware
from .types import PublicCatalogProductPropertiesInstance
from .types import PublicCatalogProductPropertiesKeyManager
from .types import PublicCatalogProductPropertiesLoadBalancer
from .types import PublicCatalogProductPropertiesManagedInference
from .types import PublicCatalogProductPropertiesObjectStorage
from .types import PublicCatalogProductPropertiesSecretManager
from .types import PublicCatalogProductEnvironmentalImpactEstimation
from .types import PublicCatalogProductLocality
from .types import PublicCatalogProductPrice
Expand Down Expand Up @@ -56,9 +58,11 @@
"PublicCatalogProductPropertiesGenerativeApis",
"PublicCatalogProductPropertiesHardware",
"PublicCatalogProductPropertiesInstance",
"PublicCatalogProductPropertiesKeyManager",
"PublicCatalogProductPropertiesLoadBalancer",
"PublicCatalogProductPropertiesManagedInference",
"PublicCatalogProductPropertiesObjectStorage",
"PublicCatalogProductPropertiesSecretManager",
"PublicCatalogProductEnvironmentalImpactEstimation",
"PublicCatalogProductLocality",
"PublicCatalogProductPrice",
Expand Down
42 changes: 42 additions & 0 deletions scaleway/scaleway/product_catalog/v2alpha1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@
PublicCatalogProductPropertiesGenerativeApis,
PublicCatalogProductPropertiesHardware,
PublicCatalogProductPropertiesInstance,
PublicCatalogProductPropertiesKeyManager,
PublicCatalogProductPropertiesLoadBalancer,
PublicCatalogProductPropertiesManagedInference,
PublicCatalogProductPropertiesObjectStorage,
PublicCatalogProductPropertiesSecretManager,
PublicCatalogProductEnvironmentalImpactEstimation,
PublicCatalogProductLocality,
PublicCatalogProductPrice,
Expand Down Expand Up @@ -482,6 +484,19 @@ def unmarshal_PublicCatalogProductPropertiesInstance(
return PublicCatalogProductPropertiesInstance(**args)


def unmarshal_PublicCatalogProductPropertiesKeyManager(
data: Any,
) -> PublicCatalogProductPropertiesKeyManager:
if not isinstance(data, dict):
raise TypeError(
"Unmarshalling the type 'PublicCatalogProductPropertiesKeyManager' failed as data isn't a dictionary."
)

args: dict[str, Any] = {}

return PublicCatalogProductPropertiesKeyManager(**args)


def unmarshal_PublicCatalogProductPropertiesLoadBalancer(
data: Any,
) -> PublicCatalogProductPropertiesLoadBalancer:
Expand Down Expand Up @@ -527,6 +542,19 @@ def unmarshal_PublicCatalogProductPropertiesObjectStorage(
return PublicCatalogProductPropertiesObjectStorage(**args)


def unmarshal_PublicCatalogProductPropertiesSecretManager(
data: Any,
) -> PublicCatalogProductPropertiesSecretManager:
if not isinstance(data, dict):
raise TypeError(
"Unmarshalling the type 'PublicCatalogProductPropertiesSecretManager' failed as data isn't a dictionary."
)

args: dict[str, Any] = {}

return PublicCatalogProductPropertiesSecretManager(**args)


def unmarshal_PublicCatalogProductEnvironmentalImpactEstimation(
data: Any,
) -> PublicCatalogProductEnvironmentalImpactEstimation:
Expand Down Expand Up @@ -688,6 +716,20 @@ def unmarshal_PublicCatalogProductProperties(
else:
args["load_balancer"] = None

field = data.get("secret_manager", None)
if field is not None:
args["secret_manager"] = unmarshal_PublicCatalogProductPropertiesSecretManager(
field
)
else:
args["secret_manager"] = None

field = data.get("key_manager", None)
if field is not None:
args["key_manager"] = unmarshal_PublicCatalogProductPropertiesKeyManager(field)
else:
args["key_manager"] = None

return PublicCatalogProductProperties(**args)


Expand Down
16 changes: 16 additions & 0 deletions scaleway/scaleway/product_catalog/v2alpha1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ class ListPublicCatalogProductsRequestProductType(str, Enum, metaclass=StrEnumMe
MANAGED_INFERENCE = "managed_inference"
GENERATIVE_APIS = "generative_apis"
LOAD_BALANCER = "load_balancer"
SECRET_MANAGER = "secret_manager"
KEY_MANAGER = "key_manager"

def __str__(self) -> str:
return str(self.value)
Expand Down Expand Up @@ -376,6 +378,11 @@ class PublicCatalogProductPropertiesInstance:
"""


@dataclass
class PublicCatalogProductPropertiesKeyManager:
pass


@dataclass
class PublicCatalogProductPropertiesLoadBalancer:
pass
Expand All @@ -394,6 +401,11 @@ class PublicCatalogProductPropertiesObjectStorage:
pass


@dataclass
class PublicCatalogProductPropertiesSecretManager:
pass


@dataclass
class PublicCatalogProductEnvironmentalImpactEstimation:
kg_co2_equivalent: Optional[float] = None
Expand Down Expand Up @@ -444,6 +456,10 @@ class PublicCatalogProductProperties:

load_balancer: Optional[PublicCatalogProductPropertiesLoadBalancer] = None

secret_manager: Optional[PublicCatalogProductPropertiesSecretManager] = None

key_manager: Optional[PublicCatalogProductPropertiesKeyManager] = None


@dataclass
class PublicCatalogProductUnitOfMeasure:
Expand Down