StructResult 0.9.2__tar.gz → 0.9.3__tar.gz

{structresult-0.9.2 → structresult-0.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: StructResult
-Version: 0.9.2
+Version: 0.9.3
 Summary: structural result with ExceptionGroup
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/Result_prj
@@ -11,7 +11,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Provides-Extra: dev
-Requires-Dist: mypy>=1.5.0; extra == "dev"
+Requires-Dist: mypy>=1.18.0; extra == "dev"
 Requires-Dist: ruff>=0.11; extra == "dev"
 Requires-Dist: types-requests; extra == "dev"
 

{structresult-0.9.2 → structresult-0.9.3}/pyproject.toml

@@ -9,7 +9,7 @@ where = ["src"]
 
 [project]
 name = "StructResult"
-version = "0.9.2"
+version = "0.9.3"
 requires-python = ">= 3.12"
 authors = [
     {name="Serj Kotilevski", email="youserj@outlook.com"}
@@ -34,7 +34,7 @@ Source = "https://github.com/youserj/Result_prj"
 
 [project.optional-dependencies]
 dev = [
-    "mypy>=1.5.0",
+    "mypy>=1.18.0",
     "ruff>=0.11",
     "types-requests"
 ]

{structresult-0.9.2 → structresult-0.9.3}/src/StructResult/result.py

@@ -24,6 +24,9 @@ class Result(Protocol):
     def unwrap(self) -> Any:
         """Returns value or raises exception if errors exist"""
 
+    def has(self, target_value: Any, exception_type: Optional[type[Exception]] = None) -> bool:
+        """"""
+
 
 class Ok(Result):
 
@@ -46,6 +49,9 @@ class Ok(Result):
     def err(self) -> None:  # type: ignore[override]
         return None
 
+    def has(self, target_value: Any, exception_type: Optional[type[Exception]] = None) -> bool:
+        return False
+
 
 OK = Ok()
 
@@ -99,6 +105,11 @@ class ErrorPropagator(Result, Protocol):
             self.append_err(res.err)
         return res.value if hasattr(res, "value") else NULL
 
+    def has(self, target_value: Any, exception_type: Optional[type[Exception]] = None) -> bool:
+        if self.err is None:
+            return False
+        return is_target(self.err, target_value, exception_type)
+
 
 @dataclass(slots=True)
 class Error(ErrorPropagator):
@@ -123,6 +134,9 @@ class Error(ErrorPropagator):
     def value(self) -> Null:
         return NULL
 
+    def has(self, target_value: Any, exception_type: Optional[type[Exception]] = None) -> bool:
+        return is_target(self.err, target_value, exception_type)
+
 
 @dataclass(slots=True)
 class StrictOk(ErrorPropagator):
@@ -170,6 +184,9 @@ class StrictOk(ErrorPropagator):
         return Error(self.err)
 
 
+type ValueOrError[T: Any] = T | Error
+
+
 # todo: maybe will replaced by StrictOK
 @dataclass(slots=True)
 class ErrorAccumulator(ErrorPropagator):
@@ -177,7 +194,7 @@ class ErrorAccumulator(ErrorPropagator):
     err: Optional[ExceptionGroup] = field(init=False, default=None)
 
     @property
-    def result(self) -> Ok | Error:
+    def result(self) -> ValueOrError[Ok]:
         """
         Finalize error accumulation and return simple Result.
         Converts this accumulator to either:
@@ -229,6 +246,13 @@ class Collector[T](ErrorPropagator, Protocol):
             raise self.err
         return self.value
 
+    @property
+    def result(self) -> ValueOrError[T]:
+        """Finalize Collection to Value or Error"""
+        if self.err is None:
+            return self.value
+        return Error(self.err)
+
 
 @dataclass(slots=True)
 class Simple[T](Collector[T], Result):
@@ -280,7 +304,6 @@ class List[T](Collector[list[Optional[T | Ok | Null]]], Result):
 
 type SimpleOrError[T: Any] = Simple[T] | Error
 
-
 T1 = TypeVar('T1')
 
 
@@ -330,6 +353,28 @@ class Sequence[*Ts](Collector[tuple[*Ts]], Result):
         return f"({", ".join(map(str, self.value))}){"" if not self.err else str(self.err)}"
 
 
+def is_target(exc_group: ExceptionGroup, target_value: Any, exception_type: Optional[type[Exception]] = None) -> bool:
+    """
+    has target Exception in group
+    """
+    stack = [exc_group]
+    while stack:
+        current = stack.pop()
+        for exc in current.exceptions:
+            if isinstance(exc, ExceptionGroup):
+                stack.append(exc)
+            elif (
+                (
+                    exception_type is None
+                    or isinstance(exc, exception_type)
+                )
+                and exc.args
+                and exc.args[0] == target_value
+            ):
+                return True
+    return False
+
+
 __all__ = [
     "SimpleOrError"
 ]

{structresult-0.9.2 → structresult-0.9.3}/src/StructResult.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: StructResult
-Version: 0.9.2
+Version: 0.9.3
 Summary: structural result with ExceptionGroup
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/Result_prj
@@ -11,7 +11,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Provides-Extra: dev
-Requires-Dist: mypy>=1.5.0; extra == "dev"
+Requires-Dist: mypy>=1.18.0; extra == "dev"
 Requires-Dist: ruff>=0.11; extra == "dev"
 Requires-Dist: types-requests; extra == "dev"
 

{structresult-0.9.2 → structresult-0.9.3}/src/StructResult.egg-info/requires.txt

@@ -1,5 +1,5 @@
 
 [dev]
-mypy>=1.5.0
+mypy>=1.18.0
 ruff>=0.11
 types-requests

{structresult-0.9.2 → structresult-0.9.3}/test/test_Sequence.py

@@ -231,9 +231,11 @@ class TestSequenceAdd(unittest.TestCase):
     def test_add_simple_value(self) -> None:
         """Test adding Simple value to sequence"""
         seq1: Sequence[int, str] = Sequence(1, "hello")
-        simple_val = Simple(3.14)
-
+        simple_val = Simple(3.14).append_e(ValueError(), "val error1")
         seq2 = seq1.add(simple_val)
+        res_err = Error.from_e(ValueError(), "val error2")
+        seq3 = seq2.add(res_err)
+        seq3 = seq3.add(Error.from_e(ValueError(), "val error1"))
 
         self.assertEqual(seq2.value, (1, "hello", 3.14))
         self.assertIsNone(seq2.err)

{structresult-0.9.2 → structresult-0.9.3}/test/test_result.py

@@ -1,7 +1,7 @@
 import unittest
 from unittest.mock import patch
 from typing import Any
-from src.StructResult.result import Option, Bool, Ok, OK, Error, List, SimpleOrError, Simple, Sequence, Null
+from src.StructResult.result import Option, Bool, Ok, OK, Error, List, SimpleOrError, Simple, Sequence, Null, is_target
 
 
 class TestResultSystem(unittest.TestCase):