fluidattacks_gitlab_sdk 3.0.0__tar.gz → 3.0.2__tar.gz

{fluidattacks_gitlab_sdk-3.0.0 → fluidattacks_gitlab_sdk-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fluidattacks_gitlab_sdk
-Version: 3.0.0
+Version: 3.0.2
 Summary: gitlab SDK
 Author-email: Product Team <development@fluidattacks.com>
 Requires-Python: >=3.11
@@ -9,5 +9,5 @@ Requires-Dist: requests-toolbelt >=1.0.0, <2.0.0
 Requires-Dist: fa-purity >=2.5.2, <3.0.0
 Requires-Dist: pure-requests >=3.0.0, <4.0.0
 Requires-Dist: python-dateutil >=2.8.0, <3.0.0
-Requires-Dist: fluidattacks-etl-utils >=4.0.0, <5.0.0
-Requires-Dist: fluidattacks-utils-logger >=3.0.0, <4.0.0
+Requires-Dist: fluidattacks-etl-utils >=4.0.0, <5.1.1
+Requires-Dist: fluidattacks-utils-logger >=3.0.2, <4.0.0

{fluidattacks_gitlab_sdk-3.0.0 → fluidattacks_gitlab_sdk-3.0.2}/fluidattacks_gitlab_sdk/__init__.py

@@ -11,7 +11,7 @@ from ._logger import (
     set_logger,
 )
 
-__version__ = "3.0.0"
+__version__ = "3.0.2"
 
 Unsafe.compute(set_logger(__name__, __version__))
 LOG = logging.getLogger(__name__)

{fluidattacks_gitlab_sdk-3.0.0 → fluidattacks_gitlab_sdk-3.0.2}/fluidattacks_gitlab_sdk/_gql_client/_handlers.py

@@ -55,7 +55,7 @@ def api_error_handler(cmd: Cmd[_T]) -> Cmd[Result[_T, ApiError]]:
             return factory.success(unwrapper.act(cmd))
         except TransportQueryError as err:  # type: ignore[misc]
             _errors = JsonValueFactory.from_any(err.errors).bind(  # type: ignore[misc]
-                lambda x: Unfolder.to_list(x),
+                Unfolder.to_list,
             )
             errors = Bug.assume_success(
                 "decode_errors",

{fluidattacks_gitlab_sdk-3.0.0 → fluidattacks_gitlab_sdk-3.0.2}/fluidattacks_gitlab_sdk/issues/_client/_get_issue.py

@@ -45,23 +45,25 @@ def _get_issue(
         endpoint,
         FrozenDict({}),
     ).map(
-        lambda r: r.alt(
-            lambda e: e.map(handle_not_found, lambda e: Coproduct.inr(cast_exception(e))),
-        )
-        .bind(lambda i: assert_single(i).alt(Coproduct.inr))
-        .bind(lambda i: decode_issue_and_id(updated_by, i).alt(Coproduct.inr))
-        .alt(
-            lambda c: right_map(
-                c,
-                lambda e: cast_exception(
-                    Bug.new(
-                        "_get_issue",
-                        inspect.currentframe(),
-                        e,
-                        (),
+        lambda r: (
+            r.alt(
+                lambda e: e.map(handle_not_found, lambda e: Coproduct.inr(cast_exception(e))),
+            )
+            .bind(lambda i: assert_single(i).alt(Coproduct.inr))
+            .bind(lambda i: decode_issue_and_id(updated_by, i).alt(Coproduct.inr))
+            .alt(
+                lambda c: right_map(
+                    c,
+                    lambda e: cast_exception(
+                        Bug.new(
+                            "_get_issue",
+                            inspect.currentframe(),
+                            e,
+                            (),
+                        ),
                     ),
                 ),
-            ),
+            )
         ),
     )
 

{fluidattacks_gitlab_sdk-3.0.0 → fluidattacks_gitlab_sdk-3.0.2}/fluidattacks_gitlab_sdk/issues/_client/_most_recent.py

@@ -91,19 +91,21 @@ def most_recent_issue(
         endpoint,
         UnfoldedFactory.from_dict(params),
     ).map(
-        lambda r: r.alt(
-            lambda e: cast_exception(
-                Bug.new(
-                    "most_recent_issue",
-                    inspect.currentframe(),
-                    e,
-                    (),
+        lambda r: (
+            r.alt(
+                lambda e: cast_exception(
+                    Bug.new(
+                        "most_recent_issue",
+                        inspect.currentframe(),
+                        e,
+                        (),
+                    ),
                 ),
-            ),
-        )
-        .bind(assert_multiple)
-        .map(NewFrozenList)
-        .map(decode_maybe_single),
+            )
+            .bind(assert_multiple)
+            .map(NewFrozenList)
+            .map(decode_maybe_single)
+        ),
     )
     get_issue: Cmd[ResultE[Maybe[tuple[IssueFullId, Issue]]]] = get_maybe_single.bind(
         lambda r: r.to_coproduct().map(

{fluidattacks_gitlab_sdk-3.0.0 → fluidattacks_gitlab_sdk-3.0.2}/fluidattacks_gitlab_sdk/issues/_client/_updated_by.py

@@ -36,7 +36,7 @@ def _nested_key(raw: JsonObj, first_key: str, next_keys: FrozenList[str]) -> Res
                 lambda v: _nested_key(v, next_keys[0], next_keys[1:]),
             ),
         )
-    return JsonUnfolder.require(raw, first_key, lambda v: Result.success(v))
+    return JsonUnfolder.require(raw, first_key, Result.success)
 
 
 def _decode_gid(raw: str) -> ResultE[UserId]:
@@ -48,14 +48,18 @@ def decode_user_obj(raw: JsonObj) -> ResultE[UserObj]:
         JsonUnfolder.require(raw, "id", DecodeUtils.to_str)
         .bind(_decode_gid)
         .bind(
-            lambda user_id: JsonUnfolder.require(raw, "username", DecodeUtils.to_str)
-            .map(User)
-            .bind(
-                lambda user: JsonUnfolder.require(raw, "name", DecodeUtils.to_str)
-                .map(UserName)
-                .map(
-                    lambda name: UserObj(user_id, user, name),
-                ),
+            lambda user_id: (
+                JsonUnfolder.require(raw, "username", DecodeUtils.to_str)
+                .map(User)
+                .bind(
+                    lambda user: (
+                        JsonUnfolder.require(raw, "name", DecodeUtils.to_str)
+                        .map(UserName)
+                        .map(
+                            lambda name: UserObj(user_id, user, name),
+                        )
+                    ),
+                )
             ),
         )
     )
@@ -78,7 +82,7 @@ def _set_not_found_if_empty(
         .alt(Coproduct[NotFound, Exception].inr)
         .bind(
             lambda m: m.to_coproduct().map(
-                lambda m: Result.success(m),
+                Result.success,
                 lambda _: Result.failure(Coproduct.inl(NotFound(ValueError("Issue not found")))),
             ),
         )
@@ -141,17 +145,19 @@ def get_updated_by(
         "issue_iid": int_to_str(issue_id.internal_id.value),
     }
     return client.get(query, FrozenTools.freeze(values)).map(
-        lambda r: r.alt(Coproduct[NotFound, Exception].inr)
-        .bind(_decode)
-        .alt(
-            lambda c: right_map(
-                c,
-                lambda e: Bug.new(
-                    "get_updated_by",
-                    inspect.currentframe(),
-                    e,
-                    (str(project), str(issue_id)),
+        lambda r: (
+            r.alt(Coproduct[NotFound, Exception].inr)
+            .bind(_decode)
+            .alt(
+                lambda c: right_map(
+                    c,
+                    lambda e: Bug.new(
+                        "get_updated_by",
+                        inspect.currentframe(),
+                        e,
+                        (str(project), str(issue_id)),
+                    ),
                 ),
-            ),
+            )
         ),
     )

{fluidattacks_gitlab_sdk-3.0.0 → fluidattacks_gitlab_sdk-3.0.2}/fluidattacks_gitlab_sdk/jobs/_client.py

@@ -40,23 +40,25 @@ def get_job(
     )
     msg = Cmd.wrap_impure(lambda: LOG.info("[API] get_job(%s, %s)", project, job_id))
     return msg + client.get(endpoint, FrozenDict({})).map(
-        lambda r: r.alt(
-            lambda e: e.map(handle_not_found, lambda e: Coproduct.inr(cast_exception(e))),
-        )
-        .bind(lambda v: assert_single(v).alt(Coproduct.inr))
-        .bind(lambda v: decode_job_obj(v).alt(Coproduct.inr))
-        .alt(
-            lambda c: right_map(
-                c,
-                lambda e: cast_exception(
-                    Bug.new(
-                        "_get_job",
-                        inspect.currentframe(),
-                        e,
-                        (),
+        lambda r: (
+            r.alt(
+                lambda e: e.map(handle_not_found, lambda e: Coproduct.inr(cast_exception(e))),
+            )
+            .bind(lambda v: assert_single(v).alt(Coproduct.inr))
+            .bind(lambda v: decode_job_obj(v).alt(Coproduct.inr))
+            .alt(
+                lambda c: right_map(
+                    c,
+                    lambda e: cast_exception(
+                        Bug.new(
+                            "_get_job",
+                            inspect.currentframe(),
+                            e,
+                            (),
+                        ),
                     ),
                 ),
-            ),
+            )
         ),
     )
 

{fluidattacks_gitlab_sdk-3.0.0 → fluidattacks_gitlab_sdk-3.0.2}/fluidattacks_gitlab_sdk/jobs/_decode.py

@@ -29,13 +29,13 @@ def _decoder_require_list(item: JsonValue) -> ResultE[FrozenList[str]]:
     return Unfolder.to_list_of(
         item,
         lambda v: Unfolder.to_primitive(v).bind(
-            lambda p: JsonPrimitiveUnfolder.to_str(p),
+            JsonPrimitiveUnfolder.to_str,
         ),
     )
 
 
 def get_float(number: JsonValue) -> ResultE[float]:
-    return Unfolder.to_primitive(number).bind(lambda v: JsonPrimitiveUnfolder.to_float(v))
+    return Unfolder.to_primitive(number).bind(JsonPrimitiveUnfolder.to_float)
 
 
 def str_to_datetime(raw: str) -> ResultE[datetime]:
@@ -46,7 +46,7 @@ def str_to_datetime(raw: str) -> ResultE[datetime]:
 
 
 def decode_str(value: JsonValue) -> ResultE[str]:
-    return Unfolder.to_primitive(value).bind(lambda p: JsonPrimitiveUnfolder.to_str(p))
+    return Unfolder.to_primitive(value).bind(JsonPrimitiveUnfolder.to_str)
 
 
 def decode_datetime(value: JsonValue) -> ResultE[datetime]:
@@ -62,12 +62,14 @@ def decode_user_id(raw: JsonObj) -> ResultE[Maybe[UserId]]:
         return JsonUnfolder.optional(
             raw,
             "id",
-            lambda v: Unfolder.to_primitive(v)
-            .bind(JsonPrimitiveUnfolder.to_int)
-            .map(lambda j: UserId(NaturalOperations.absolute(j))),
+            lambda v: (
+                Unfolder.to_primitive(v)
+                .bind(JsonPrimitiveUnfolder.to_int)
+                .map(lambda j: UserId(NaturalOperations.absolute(j)))
+            ),
         )
 
-    maybe_user_obj = JsonUnfolder.optional(raw, "user", lambda v: Unfolder.to_json(v))
+    maybe_user_obj = JsonUnfolder.optional(raw, "user", Unfolder.to_json)
     return maybe_user_obj.bind(lambda v: decode_maybe_id(v.value_or(FrozenDict({}))))
 
 
@@ -76,18 +78,20 @@ def decode_runner_id(raw: JsonObj) -> ResultE[Maybe[RunnerId]]:
         return JsonUnfolder.optional(
             raw,
             "id",
-            lambda v: Unfolder.to_primitive(v)
-            .bind(JsonPrimitiveUnfolder.to_int)
-            .map(lambda j: RunnerId(NaturalOperations.absolute(j))),
+            lambda v: (
+                Unfolder.to_primitive(v)
+                .bind(JsonPrimitiveUnfolder.to_int)
+                .map(lambda j: RunnerId(NaturalOperations.absolute(j)))
+            ),
         )
 
-    maybe_runner_obj = JsonUnfolder.optional(raw, "runner", lambda v: Unfolder.to_json(v))
+    maybe_runner_obj = JsonUnfolder.optional(raw, "runner", Unfolder.to_json)
     return maybe_runner_obj.bind(lambda v: decode_maybe_id(v.value_or(FrozenDict({}))))
 
 
 def decode_commit_properties(raw: JsonObj) -> ResultE[Commit]:
     sha_commit = JsonUnfolder.optional(raw, "id", DecodeUtils.to_opt_str).map(
-        lambda v: v.bind(lambda j: j.map(lambda p: CommitHash(p))),
+        lambda v: v.bind(lambda j: j.map(CommitHash)),
     )
     title = JsonUnfolder.optional(raw, "title", DecodeUtils.to_opt_str).map(
         lambda v: v.bind(lambda j: j),
@@ -96,7 +100,7 @@ def decode_commit_properties(raw: JsonObj) -> ResultE[Commit]:
 
 
 def decode_commit(raw: JsonObj) -> ResultE[Commit]:
-    maybe_commit_obj = JsonUnfolder.optional(raw, "commit", lambda v: Unfolder.to_json(v))
+    maybe_commit_obj = JsonUnfolder.optional(raw, "commit", Unfolder.to_json)
     return maybe_commit_obj.bind(lambda v: decode_commit_properties(v.value_or(FrozenDict({}))))
 
 

{fluidattacks_gitlab_sdk-3.0.0 → fluidattacks_gitlab_sdk-3.0.2}/fluidattacks_gitlab_sdk/merge_requests/_client.py

@@ -56,18 +56,20 @@ def get_mr(
         endpoint,
         FrozenDict({}),
     ).map(
-        lambda r: r.alt(
-            lambda e: cast_exception(
-                Bug.new(
-                    "_get_mr",
-                    inspect.currentframe(),
-                    e,
-                    (),
+        lambda r: (
+            r.alt(
+                lambda e: cast_exception(
+                    Bug.new(
+                        "_get_mr",
+                        inspect.currentframe(),
+                        e,
+                        (),
+                    ),
                 ),
-            ),
-        )
-        .bind(assert_single)
-        .bind(decode_mr_and_id),
+            )
+            .bind(assert_single)
+            .bind(decode_mr_and_id)
+        ),
     )
 
 
@@ -92,24 +94,26 @@ def most_recent_mr_until(
         endpoint,
         UnfoldedFactory.from_dict(params),
     ).map(
-        lambda r: r.alt(
-            lambda e: cast_exception(
-                Bug.new(
-                    "most_recent_mr",
-                    inspect.currentframe(),
-                    e,
-                    (),
+        lambda r: (
+            r.alt(
+                lambda e: cast_exception(
+                    Bug.new(
+                        "most_recent_mr",
+                        inspect.currentframe(),
+                        e,
+                        (),
+                    ),
+                ),
+            )
+            .bind(assert_multiple)
+            .map(NewFrozenList)
+            .map(decode_maybe_single)
+            .bind(
+                lambda m: m.to_coproduct().map(
+                    lambda r: decode_mr_and_id(r).map(Maybe.some),
+                    lambda _: Result.success(empty),
                 ),
-            ),
-        )
-        .bind(assert_multiple)
-        .map(NewFrozenList)
-        .map(decode_maybe_single)
-        .bind(
-            lambda m: m.to_coproduct().map(
-                lambda r: decode_mr_and_id(r).map(Maybe.some),
-                lambda _: Result.success(empty),
-            ),
+            )
         ),
     )
 
@@ -133,24 +137,26 @@ def most_recent_mr(
         endpoint,
         UnfoldedFactory.from_dict(params),
     ).map(
-        lambda r: r.alt(
-            lambda e: cast_exception(
-                Bug.new(
-                    "most_recent_mr",
-                    inspect.currentframe(),
-                    e,
-                    (),
+        lambda r: (
+            r.alt(
+                lambda e: cast_exception(
+                    Bug.new(
+                        "most_recent_mr",
+                        inspect.currentframe(),
+                        e,
+                        (),
+                    ),
                 ),
-            ),
-        )
-        .bind(assert_multiple)
-        .map(NewFrozenList)
-        .map(decode_maybe_single)
-        .bind(
-            lambda m: m.to_coproduct().map(
-                lambda r: decode_mr_and_id(r).map(Maybe.some),
-                lambda _: Result.success(empty),
-            ),
+            )
+            .bind(assert_multiple)
+            .map(NewFrozenList)
+            .map(decode_maybe_single)
+            .bind(
+                lambda m: m.to_coproduct().map(
+                    lambda r: decode_mr_and_id(r).map(Maybe.some),
+                    lambda _: Result.success(empty),
+                ),
+            )
         ),
     )
 
@@ -189,19 +195,21 @@ def get_updated_mrs(  # noqa: PLR0913
         endpoint,
         UnfoldedFactory.from_dict(params),
     ).map(
-        lambda r: r.alt(
-            lambda e: cast_exception(
-                Bug.new(
-                    "mr_updates",
-                    inspect.currentframe(),
-                    e,
-                    (),
+        lambda r: (
+            r.alt(
+                lambda e: cast_exception(
+                    Bug.new(
+                        "mr_updates",
+                        inspect.currentframe(),
+                        e,
+                        (),
+                    ),
                 ),
-            ),
-        )
-        .bind(assert_multiple)
-        .bind(decode_batch_mrs)
-        .bind(lambda items: validate_next_page(current_page, items)),
+            )
+            .bind(assert_multiple)
+            .bind(decode_batch_mrs)
+            .bind(lambda items: validate_next_page(current_page, items))
+        ),
     )
 
 

{fluidattacks_gitlab_sdk-3.0.0 → fluidattacks_gitlab_sdk-3.0.2}/fluidattacks_gitlab_sdk/merge_requests/_decode.py

@@ -79,7 +79,7 @@ def decode_people(raw: JsonObj) -> ResultE[MergeRequestPeople]:
                 v,
                 lambda v: Unfolder.to_json(v).bind(decode_user_obj),
             ),
-        ).map(lambda m: m.bind(lambda x: Maybe.from_optional(x))),
+        ).map(lambda m: m.bind(Maybe.from_optional)),
         JsonUnfolder.optional(
             raw,
             "closed_by",
@@ -87,7 +87,7 @@ def decode_people(raw: JsonObj) -> ResultE[MergeRequestPeople]:
                 v,
                 lambda v: Unfolder.to_json(v).bind(decode_user_obj),
             ),
-        ).map(lambda m: m.bind(lambda x: Maybe.from_optional(x))),
+        ).map(lambda m: m.bind(Maybe.from_optional)),
         JsonUnfolder.require(
             raw,
             "assignees",
@@ -230,5 +230,5 @@ def decode_batch_mrs(
     if not mrs:
         return Result.success(FrozenList[tuple[MrFullId, MergeRequest]]([]), Exception)
     return ResultTransform.all_ok(
-        PureIterFactory.from_list(mrs).map(lambda v: decode_mr_and_id(v)).to_list(),
+        PureIterFactory.from_list(mrs).map(decode_mr_and_id).to_list(),
     )

{fluidattacks_gitlab_sdk-3.0.0 → fluidattacks_gitlab_sdk-3.0.2}/fluidattacks_gitlab_sdk/milestones/_client.py

@@ -53,7 +53,7 @@ def handler_empty_two(
     item: ResultE[Maybe[tuple[MilestoneFullId, Milestone]]],
 ) -> Result[tuple[MilestoneFullId, Milestone], Coproduct[NotFound, Exception]]:
     factory: CoproductFactory[NotFound, Exception] = CoproductFactory()
-    return item.alt(lambda i: factory.inr(i)).bind(handler_empty)
+    return item.alt(factory.inr).bind(handler_empty)
 
 
 def get_milestone(
@@ -71,23 +71,25 @@ def get_milestone(
         endpoint,
         FrozenDict({}),
     ).map(
-        lambda r: r.alt(
-            lambda e: e.map(handle_not_found, lambda e: Coproduct.inr(cast_exception(e))),
-        )
-        .bind(lambda v: assert_multiple(v).alt(Coproduct.inr))
-        .bind(lambda v: handler_empty_two(decode_milestone_and_id(v)))
-        .alt(
-            lambda c: c.map(
-                Coproduct.inl,
-                lambda e: Coproduct.inr(
-                    Bug.new(
-                        "_get_milestone",
-                        inspect.currentframe(),
-                        e,
-                        (),
+        lambda r: (
+            r.alt(
+                lambda e: e.map(handle_not_found, lambda e: Coproduct.inr(cast_exception(e))),
+            )
+            .bind(lambda v: assert_multiple(v).alt(Coproduct.inr))
+            .bind(lambda v: handler_empty_two(decode_milestone_and_id(v)))
+            .alt(
+                lambda c: c.map(
+                    Coproduct.inl,
+                    lambda e: Coproduct.inr(
+                        Bug.new(
+                            "_get_milestone",
+                            inspect.currentframe(),
+                            e,
+                            (),
+                        ),
                     ),
                 ),
-            ),
+            )
         ),
     )
 
@@ -111,24 +113,26 @@ def most_recent_milestone(
         endpoint,
         UnfoldedFactory.from_dict(params),
     ).map(
-        lambda r: r.alt(
-            lambda e: cast_exception(
-                Bug.new(
-                    "most_recent_milestone",
-                    inspect.currentframe(),
-                    e,
-                    (),
+        lambda r: (
+            r.alt(
+                lambda e: cast_exception(
+                    Bug.new(
+                        "most_recent_milestone",
+                        inspect.currentframe(),
+                        e,
+                        (),
+                    ),
+                ),
+            )
+            .bind(assert_multiple)
+            .map(NewFrozenList)
+            .map(decode_maybe_single)
+            .bind(
+                lambda m: m.to_coproduct().map(
+                    lambda r: decode_milestone_and_id(FrozenList[JsonObj]((r,))),
+                    lambda _: Result.success(empty),
                 ),
-            ),
-        )
-        .bind(assert_multiple)
-        .map(NewFrozenList)
-        .map(decode_maybe_single)
-        .bind(
-            lambda m: m.to_coproduct().map(
-                lambda r: decode_milestone_and_id(FrozenList[JsonObj]((r,))),
-                lambda _: Result.success(empty),
-            ),
+            )
         ),
     )
 

{fluidattacks_gitlab_sdk-3.0.0 → fluidattacks_gitlab_sdk-3.0.2}/fluidattacks_gitlab_sdk/mr_approvals/_client.py

@@ -43,18 +43,20 @@ def _get_mr_approvals(
         endpoint,
         FrozenDict({}),
     ).map(
-        lambda r: r.alt(
-            lambda e: cast_exception(
-                Bug.new(
-                    "get_mr_approvals",
-                    inspect.currentframe(),
-                    e,
-                    (),
+        lambda r: (
+            r.alt(
+                lambda e: cast_exception(
+                    Bug.new(
+                        "get_mr_approvals",
+                        inspect.currentframe(),
+                        e,
+                        (),
+                    ),
                 ),
-            ),
-        )
-        .bind(assert_single)
-        .bind(decode_id_and_mr_approvals),
+            )
+            .bind(assert_single)
+            .bind(decode_id_and_mr_approvals)
+        ),
     )
 
 

{fluidattacks_gitlab_sdk-3.0.0 → fluidattacks_gitlab_sdk-3.0.2}/fluidattacks_gitlab_sdk/mr_approvals/_decode.py

@@ -17,11 +17,13 @@ def decode_mr_approvals(raw: JsonObj) -> ResultE[MrApprovals]:
             "approved_by",
             lambda v: Unfolder.to_list_of(
                 v,
-                lambda x: Unfolder.to_json(x)
-                .bind(lambda user_obj: JsonUnfolder.require(user_obj, "user", Unfolder.to_json))
-                .bind(decode_user_obj)
-                .map(lambda u: Approver(u)),
-            ).map(lambda approvers: tuple(approvers)),
+                lambda x: (
+                    Unfolder.to_json(x)
+                    .bind(lambda user_obj: JsonUnfolder.require(user_obj, "user", Unfolder.to_json))
+                    .bind(decode_user_obj)
+                    .map(Approver)
+                ),
+            ).map(tuple),
         ),
     ).map(lambda v: MrApprovals(v[0], v[1]))