fix: type issue

Author: Laure-di

scaleway-core/scaleway_core/utils/resolve_one_of.py

@@ -1,57 +1,51 @@
-from collections.abc import Callable
 from dataclasses import dataclass
 from typing import Any, Dict, Generic, List, Optional, TypeVar
 
-from scaleway_core.profile import ProfileDefaults
-
 T = TypeVar("T")
 
 
 @dataclass
 class OneOfPossibility(Generic[T]):
     param: str
+
     value: Optional[T]
-    default: Optional[T | ProfileDefaults] = None
-    marshal_func: Optional[Callable[[T, ProfileDefaults | None], Dict[str, Any]]] = None
+
+    default: Optional[T] = None
 
 
 def resolve_one_of(
     possibilities: List[OneOfPossibility[Any]], is_required: bool = False
-) -> dict[str, Any | None] | str | dict[Any, Any]:
+) -> Dict[str, Any]:
     """
     Resolves the ideal parameter and value amongst an optional list.
-    Uses marshal_func if provided.
     """
 
-    # Try to resolve using non-None value
+    # Get the first non-empty parameter
     for possibility in possibilities:
         if possibility.value is not None:
-            if possibility.marshal_func is not None:
-                return {
-                    possibility.param: possibility.marshal_func(
-                        possibility.value, possibility.default
-                    )
-                }
             return {possibility.param: possibility.value}
 
-    # Try to resolve using non-None default
+    # Get the first non-empty default
     for possibility in possibilities:
         if possibility.default is not None:
+<<<<<<< HEAD
             if possibility.marshal_func is not None:
                 # When no actual value, call with None as value
                 return {
                     possibility.param: possibility.marshal_func(
                         None, possibility.default
                     )
                 }
+=======
+>>>>>>> 539c303 (Revert "fix(core): management one_of")
             return {possibility.param: possibility.default}
 
-    # If required but unresolved, raise an error
+    # If required, raise an error
     if is_required:
         possibilities_keys = " or ".join(
             [possibility.param for possibility in possibilities]
         )
         raise ValueError(f"one of ${possibilities_keys} must be present")
 
-    # Else, return empty dict
+    # Else, return an empty dict
     return {}