Move Option.from_optional to option_from function.

rusty_results/prelude.py

@@ -324,13 +324,6 @@ def __validate_dict(cls, value: Dict, field: "ModelField"):
 
         return Some(valid_value)
 
-    @staticmethod
-    def from_optional(value: Optional[T]) -> "Option[T]":
-        if value is None:
-            return Empty()
-
-        return Some(value)
-
 
 @dataclass(eq=True, frozen=True)
 class Some(OptionProtocol[T]):
@@ -522,6 +515,16 @@ def __get_validators__(cls):
 Option = Union[Some[T], Empty]
 
 
+def option_from[T](value: Optional[T]) -> Option[T]:
+    """
+    :param value: Value from any type to be converted to an Option
+    :return: The value wrapped in an Option or the original Option if it is already an Option
+    """
+    if value is None:
+        return Empty()
+    return Some(value).flatten_one()
+
+
 class ResultProtocol(Generic[T, E]):
     @property
     @abstractmethod

rusty_results/tests/option/test_option.py

@@ -34,9 +34,14 @@ def test_option_iter():
     assert list(iter(Some(1))) == [1]
 
 
-def test_from_optional():
-    assert Some(0) == OptionProtocol.from_optional(0)
-    assert Empty() == OptionProtocol.from_optional(None)
+def test_option_from():
+    assert Some(0) == option_from(0)
+    assert Empty() == option_from(None)
     example_dictionary = {"data": 5}
-    assert Empty() == OptionProtocol.from_optional(example_dictionary.get("key_not_found"))
-    assert Some(5) == OptionProtocol.from_optional(example_dictionary.get("data"))
+    assert Empty() == option_from(example_dictionary.get("key_not_found"))
+    assert Some(5) == option_from(example_dictionary.get("data"))
+    opt = Some(3)
+    assert opt == option_from(opt)
+    assert Empty() == option_from(Empty())
+    nested_opt = Some(Some(Some(Some(3))))
+    assert nested_opt == option_from(nested_opt)