Merge branch 'main' into v1.5535.0

Author: jremy42

.github/workflows/checks.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Install dependencies and library
         run: poetry install
       - name: Check format
-        run: poetry run ruff format -q
+        run: poetry run ruff format --check
 
   typing:
     runs-on: ubuntu-latest

scaleway-async/pyproject.toml

@@ -35,5 +35,5 @@ mypy = "^1.5.1"
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
-[tool.ruff]
+[tool.ruff.lint]
 ignore = ["E501"]

scaleway-core/pyproject.toml

@@ -37,5 +37,5 @@ mypy = "^1.5.1"
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
-[tool.ruff]
+[tool.ruff.lint]
 ignore = ["E501"]

scaleway-core/scaleway_core/bridge/__init__.py

@@ -22,6 +22,9 @@
 from .timeseries import unmarshal_TimeSeriesPoint
 from .timeseries import marshal_TimeSeriesPoint
 
+from .decimal import unmarshal_Decimal
+from .decimal import marshal_Decimal
+
 __all__ = [
     "Money",
     "unmarshal_Money",
@@ -42,4 +45,6 @@
     "marshal_TimeSeries",
     "unmarshal_TimeSeriesPoint",
     "marshal_TimeSeriesPoint",
+    "unmarshal_Decimal",
+    "marshal_Decimal",
 ]

scaleway-core/scaleway_core/bridge/decimal.py

@@ -0,0 +1,28 @@
+from decimal import Decimal
+from typing import Any, Dict
+
+
+def unmarshal_Decimal(data: Any) -> Decimal:
+    """
+    Unmarshal an instance of Decimal from the given data.
+    """
+    if not isinstance(data, dict):
+        raise TypeError(
+            "Unmarshalling the type 'Decimal' failed as data isn't a dictionary."
+        )
+
+    if "value" not in data:
+        raise TypeError(
+            "Unmarshalling the type 'Decimal' failed as data does not contain a 'value' key."
+        )
+
+    return Decimal(data["value"])
+
+
+def marshal_Decimal(data: Decimal) -> Dict[str, Any]:
+    """
+    Marshal an instance of Decimal into google.protobuf.Decimal JSON representation.
+    """
+    return {
+        "value": str(data),
+    }

scaleway-core/tests/test_bridge_marshal.py

@@ -0,0 +1,14 @@
+import unittest
+from decimal import Decimal
+
+from scaleway_core.bridge import unmarshal_Decimal, marshal_Decimal
+
+
+class TestBridgeMarshal(unittest.TestCase):
+    def test_decimal_marshal(self):
+        decimal = Decimal("1.2")
+        self.assertEqual(marshal_Decimal(decimal), {"value": "1.2"})
+
+    def test_decimal_unmarshal(self):
+        decimal = Decimal("1.2")
+        self.assertEqual(unmarshal_Decimal({"value": "1.2"}), decimal)

scaleway/pyproject.toml

@@ -35,5 +35,5 @@ mypy = "^1.5.1"
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
-[tool.ruff]
+[tool.ruff.lint]
 ignore = ["E501"]

scaleway/tests/test_total_count_legacy.py

@@ -11,13 +11,10 @@
 
 
 class TestTotalCountLegacy(unittest.TestCase):
-
     def setUp(self) -> None:
         self.client = Client()
         self.instance_api = InstanceV1API(self.client, bypass_validation=True)
 
     def test_list_servers_type(self):
         list_server_type = self.instance_api.list_servers_types(zone="fr-par-1")
         self.assertIsNotNone(list_server_type.total_count)
-
-