clear-skies-gitlab 2.0.1__py3-none-any.whl → 2.0.3__py3-none-any.whl

clearskies_gitlab/{models/rest → rest/models}/gitlab_rest_current_user.py

@@ -1,18 +1,21 @@
 from __future__ import annotations
 
-from collections import OrderedDict
-from typing import Any, Self
+from typing import Self
 
+from clearskies import Model
 from clearskies.columns import Boolean, Datetime, Email, Integer, Json, String
 
-from clearskies_gitlab.models import gitlab_rest_model
+from clearskies_gitlab.rest.backends import GitlabRestBackend
 
 
 class GitlabRestCurrentUser(
-    gitlab_rest_model.GitlabRestModel,
+    Model,
 ):
     """Model for current user."""
 
+    id_column_name = "id"
+    backend = GitlabRestBackend()
+
     @classmethod
     def destination_name(cls: type[Self]) -> str:
         """Return the slug of the api endpoint for this model."""

clearskies_gitlab/rest/models/gitlab_rest_group.py

@@ -0,0 +1,48 @@
+from __future__ import annotations
+
+from typing import Self
+
+from clearskies.columns import (
+    HasMany,
+)
+
+from clearskies_gitlab.rest.models import (
+    gitlab_rest_group_access_token_reference,
+    gitlab_rest_group_base,
+    gitlab_rest_group_member_reference,
+    gitlab_rest_group_project_reference,
+    gitlab_rest_group_subgroup_reference,
+    gitlab_rest_group_variable_reference,
+)
+
+
+class GitlabRestGroup(
+    gitlab_rest_group_base.GitlabRestGroupBase,
+):
+    """Model for groups."""
+
+    @classmethod
+    def destination_name(cls: type[Self]) -> str:
+        """Return the slug of the api endpoint for this model."""
+        return "groups"
+
+    projects = HasMany(
+        gitlab_rest_group_project_reference.GitlabRestGroupProjectReference,
+        foreign_column_name="group_id",
+    )
+    access_tokens = HasMany(
+        gitlab_rest_group_access_token_reference.GitlabRestGroupAccessTokenReference,
+        foreign_column_name="group_id",
+    )
+    variables = HasMany(
+        gitlab_rest_group_variable_reference.GitlabRestGroupVariableReference,
+        foreign_column_name="group_id",
+    )
+    subgroups = HasMany(
+        gitlab_rest_group_subgroup_reference.GitlabRestGroupSubgroupReference,
+        foreign_column_name="group_id",
+    )
+    members = HasMany(
+        gitlab_rest_group_member_reference.GitlabRestGroupMemberReference,
+        foreign_column_name="group_id",
+    )

clearskies_gitlab/{models/rest → rest/models}/gitlab_rest_group_access_token.py

@@ -1,19 +1,21 @@
 from __future__ import annotations
 
-from collections import OrderedDict
-from typing import Any, Self
+from typing import Self
 
-from clearskies.columns import BelongsToId, BelongsToModel, Boolean, Datetime, Integer, Json, String
+from clearskies import Model
+from clearskies.columns import Boolean, Datetime, Integer, Json, String
 
-from clearskies_gitlab.models import gitlab_rest_model
-from clearskies_gitlab.models.rest import gitlab_rest_group
+from clearskies_gitlab.rest.backends import GitlabRestBackend
 
 
 class GitlabRestGroupAccessToken(
-    gitlab_rest_model.GitlabRestModel,
+    Model,
 ):
     """Model for groups access tokens."""
 
+    id_column_name = "id"
+    backend = GitlabRestBackend()
+
     @classmethod
     def destination_name(cls: type[Self]) -> str:
         """Return the slug of the api endpoint for this model."""

clearskies_gitlab/rest/models/gitlab_rest_group_access_token_reference.py

@@ -0,0 +1,8 @@
+class GitlabRestGroupAccessTokenReference:
+    """Reference to GitlabRestGroupAccessToken model."""
+
+    def get_model_class(self) -> type:
+        """Return the model class this reference points to."""
+        from clearskies_gitlab.rest.models import gitlab_rest_group_access_token
+
+        return gitlab_rest_group_access_token.GitlabRestGroupAccessToken

clearskies_gitlab/{models/gitlab_group.py → rest/models/gitlab_rest_group_base.py}

@@ -1,17 +1,36 @@
 from __future__ import annotations
 
-from collections import OrderedDict
-from typing import Any
+from typing import Self
 
 from clearskies import Model
-from clearskies.columns import Boolean, Datetime, Integer, Json, String
+from clearskies.columns import (
+    BelongsToModel,
+    BelongsToSelf,
+    Boolean,
+    Datetime,
+    Integer,
+    Json,
+    Select,
+    String,
+)
 
+from clearskies_gitlab.rest.backends import GitlabRestBackend
 
-class GitlabGroup(Model):
-    """Base model for groups."""
+
+class GitlabRestGroupBase(
+    Model,
+):
+    """Model for groups."""
+
+    @classmethod
+    def destination_name(cls: type[Self]) -> str:
+        """Return the slug of the api endpoint for this model."""
+        return "groups"
 
     id_column_name = "id"
 
+    backend = GitlabRestBackend()
+
     id = String()
     web_url = String()
     name = String()
@@ -67,3 +86,19 @@ class GitlabGroup(Model):
     unique_project_download_limit_interval_in_seconds = Integer()
     unique_project_download_limit_alertlist = Json()
     auto_ban_user_on_excessive_projects_download = Boolean()
+
+    parent_id = BelongsToSelf()
+    parent = BelongsToModel("parent_id")
+    ### Search params
+    skip_groups = Json()
+    all_available = Boolean()
+    search = String()
+    order_by = String()
+    sort = String()
+    visibility = Select(allowed_values=["public", "internal", "private"])
+    with_custom_attributes = Boolean()
+    owned = Boolean()
+    min_access_level = Integer()
+    top_level_only = Boolean()
+    repository_storage = String()
+    marked_for_deletion_on = Datetime(date_format="%Y-%m-%d")

clearskies_gitlab/{models/rest → rest/models}/gitlab_rest_group_member.py

@@ -1,20 +1,21 @@
 from __future__ import annotations
 
-from collections import OrderedDict
-from typing import Any, Self
+from typing import Self
 
-from clearskies.columns import BelongsToId, BelongsToModel, Boolean, Json, String
+from clearskies.columns import Boolean, Json, String
 
-from clearskies_gitlab.models import gitlab_member, gitlab_rest_model
-from clearskies_gitlab.models.rest import gitlab_rest_group
+from clearskies_gitlab.rest import gitlab_member
+from clearskies_gitlab.rest.backends import GitlabRestBackend
 
 
 class GitlabRestGroupMember(
-    gitlab_rest_model.GitlabRestModel,
     gitlab_member.GitlabMember,
 ):
     """Model for group members."""
 
+    id_column_name = "id"
+    backend = GitlabRestBackend()
+
     @classmethod
     def destination_name(cls: type[Self]) -> str:
         """Return the slug of the api endpoint for this model."""

clearskies_gitlab/rest/models/gitlab_rest_group_member_reference.py

@@ -0,0 +1,8 @@
+class GitlabRestGroupMemberReference:
+    """Reference to GitlabRestGroupMember model."""
+
+    def get_model_class(self) -> type:
+        """Return the model class this reference points to."""
+        from clearskies_gitlab.rest.models import gitlab_rest_group_member
+
+        return gitlab_rest_group_member.GitlabRestGroupMember

clearskies_gitlab/rest/models/gitlab_rest_group_project.py

@@ -0,0 +1,16 @@
+from __future__ import annotations
+
+from typing import Self
+
+from clearskies_gitlab.rest.models import gitlab_rest_project
+
+
+class GitlabRestGroupProject(
+    gitlab_rest_project.GitlabRestProject,
+):
+    """Model for groups projects."""
+
+    @classmethod
+    def destination_name(cls: type[Self]) -> str:
+        """Return the slug of the api endpoint for this model."""
+        return "groups/:group_id/projects"

clearskies_gitlab/rest/models/gitlab_rest_group_project_reference.py

@@ -0,0 +1,8 @@
+class GitlabRestGroupProjectReference:
+    """Reference to GitlabRestGroupProject model."""
+
+    def get_model_class(self) -> type:
+        """Return the model class this reference points to."""
+        from clearskies_gitlab.rest.models import gitlab_rest_group_project
+
+        return gitlab_rest_group_project.GitlabRestGroupProject

clearskies_gitlab/rest/models/gitlab_rest_group_reference.py

@@ -0,0 +1,9 @@
+from clearskies_gitlab.rest.models import gitlab_rest_group
+
+
+class GitlabRestGroupReference:
+    """Reference to GitlabRestGroup model."""
+
+    def get_model_class(self) -> type:
+        """Return the model class this reference points to."""
+        return gitlab_rest_group.GitlabRestGroup

clearskies_gitlab/{models/rest → rest/models}/gitlab_rest_group_search.py

@@ -1,11 +1,10 @@
 from __future__ import annotations
 
-from collections import OrderedDict
-from typing import Any, Self
+from typing import Self
 
 from clearskies.columns import Integer
 
-from clearskies_gitlab.models.rest import gitlab_rest_advanced_search
+from clearskies_gitlab.rest.models import gitlab_rest_advanced_search
 
 
 class GitlabRestGroupSearch(

clearskies_gitlab/{models/rest → rest/models}/gitlab_rest_group_search_blob.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from clearskies_gitlab.models.rest import (
+from clearskies_gitlab.rest.models import (
     gitlab_rest_advanced_search_blob,
     gitlab_rest_group_search,
 )

clearskies_gitlab/rest/models/gitlab_rest_group_subgroup.py

@@ -0,0 +1,63 @@
+from __future__ import annotations
+
+from typing import Self
+
+from clearskies.columns import HasMany, HasManySelf, String
+
+from clearskies_gitlab.rest.models import (
+    gitlab_rest_group_access_token_reference,
+    gitlab_rest_group_base,
+    gitlab_rest_group_member_reference,
+    gitlab_rest_group_project_reference,
+    gitlab_rest_group_variable_reference,
+)
+
+
+class GitlabRestGroupSubgroup(
+    gitlab_rest_group_base.GitlabRestGroupBase,
+):
+    """Model for Subgroups."""
+
+    # id_column_name = "group_id"
+
+    @classmethod
+    def destination_name(cls: type[Self]) -> str:
+        """Return the slug of the api endpoint for this model."""
+        return "groups/:group_id/subgroups"
+
+    group_id = String()
+
+    projects = HasMany(
+        gitlab_rest_group_project_reference.GitlabRestGroupProjectReference,
+        foreign_column_name="group_id",
+    )
+    access_tokens = HasMany(
+        gitlab_rest_group_access_token_reference.GitlabRestGroupAccessTokenReference,
+        foreign_column_name="group_id",
+    )
+    variables = HasMany(
+        gitlab_rest_group_variable_reference.GitlabRestGroupVariableReference,
+        foreign_column_name="group_id",
+    )
+    subgroups = HasManySelf(
+        foreign_column_name="group_id",
+    )
+    members = HasMany(
+        gitlab_rest_group_member_reference.GitlabRestGroupMemberReference,
+        foreign_column_name="group_id",
+    )
+    # parent_id = BelongsToSelf()
+    # parent = BelongsToModel("parent_id")
+    # ### Search params
+    # skip_groups = Json()
+    # all_available = Boolean()
+    # search = String()
+    # order_by = String()
+    # sort = String()
+    # visibility = Select(allowed_values=["public", "internal", "private"])
+    # with_custom_attributes = Boolean()
+    # owned = Boolean()
+    # min_access_level = Integer()
+    # top_level_only = Boolean()
+    # repository_storage = String()
+    # marked_for_deletion_on = Datetime(date_format="%Y-%m-%d")

clearskies_gitlab/rest/models/gitlab_rest_group_subgroup_reference.py

@@ -0,0 +1,8 @@
+class GitlabRestGroupSubgroupReference:
+    """Reference to GitlabRestGroupSubgroup model."""
+
+    def get_model_class(self) -> type:
+        """Return the model class this reference points to."""
+        from clearskies_gitlab.rest.models import gitlab_rest_group_subgroup
+
+        return gitlab_rest_group_subgroup.GitlabRestGroupSubgroup

clearskies_gitlab/{models/rest → rest/models}/gitlab_rest_group_variable.py

@@ -1,19 +1,21 @@
 from __future__ import annotations
 
-from collections import OrderedDict
-from typing import TYPE_CHECKING, Any, Self
+from typing import Self
 
-from clearskies.columns import BelongsToId, BelongsToModel, String
+from clearskies.columns import String
 
-from clearskies_gitlab.models import gitlab_cicd_variable, gitlab_rest_model
+from clearskies_gitlab.rest import gitlab_cicd_variable
+from clearskies_gitlab.rest.backends import GitlabRestBackend
 
 
 class GitlabRestGroupVariable(
-    gitlab_rest_model.GitlabRestModel,
     gitlab_cicd_variable.GitlabCICDVariable,
 ):
     """Model for gitlab group variables."""
 
+    id_column_name = "id"
+    backend = GitlabRestBackend()
+
     @classmethod
     def destination_name(cls: type[Self]) -> str:
         """Return the slug of the api endpoint for this model."""

clearskies_gitlab/rest/models/gitlab_rest_group_variable_reference.py

@@ -0,0 +1,8 @@
+class GitlabRestGroupVariableReference:
+    """Reference to GitlabRestGroupVariable model."""
+
+    def get_model_class(self) -> type:
+        """Return the model class this reference points to."""
+        from clearskies_gitlab.rest.models import gitlab_rest_group_variable
+
+        return gitlab_rest_group_variable.GitlabRestGroupVariable

clearskies_gitlab/{models/rest → rest/models}/gitlab_rest_namespace.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
-from collections import OrderedDict
-from typing import Any, Self
+from typing import Self
 
+from clearskies import Model
 from clearskies.columns import (
-    BelongsToId,
     BelongsToModel,
     BelongsToSelf,
     Boolean,
@@ -16,8 +15,8 @@ from clearskies.columns import (
     String,
 )
 
-from clearskies_gitlab.models import gitlab_namespace, gitlab_rest_model
-from clearskies_gitlab.models.rest import (
+from clearskies_gitlab.rest.backends import GitlabRestBackend
+from clearskies_gitlab.rest.models import (
     gitlab_rest_group_access_token,
     gitlab_rest_group_subgroup_reference,
     gitlab_rest_group_variable,
@@ -25,17 +24,37 @@ from clearskies_gitlab.models.rest import (
 )
 
 
-class GitlabRestNamespace(
-    gitlab_rest_model.GitlabRestModel,
-    gitlab_namespace.GitlabNamespace,
-):
+class GitlabRestNamespace(Model):
     """Model for namespaces."""
 
+    backend = GitlabRestBackend()
+
     @classmethod
     def destination_name(cls: type[Self]) -> str:
         """Return the slug of the api endpoint for this model."""
         return "namespaces"
 
+    id_column_name = "id"
+
+    id = String()
+    name = String()
+    path = String()
+    kind = Select(allowed_values=["group", "user"])
+    full_path = String()
+    avatar_url = String()
+    web_url = String()
+    billable_members_count = Integer()
+    plan = Select(allowed_values=["free", "premium", "ultimate", "bronze", "silver", "gold"])
+    end_date = Datetime()
+    trial_ends_on = Datetime()
+    trial = Boolean()
+    root_repository_size = Integer()
+    projects_count = Integer()
+    max_seats_used = Integer()
+    max_seats_used_changed_at = Datetime()
+    seats_in_use = Integer()
+    members_counts_with_descendants = Integer()
+
     projects = HasMany(
         gitlab_rest_project_reference.GitlabRestProjectReference,
         foreign_column_name="group_id",

clearskies_gitlab/{models/gitlab_project.py → rest/models/gitlab_rest_project.py}

@@ -1,72 +1,101 @@
 from __future__ import annotations
 
-from collections import OrderedDict
-from typing import Any
+from typing import Self
 
 from clearskies import Model
-from clearskies.columns import BelongsToId, BelongsToModel, Boolean, Datetime, Integer, Json, Select, String
+from clearskies.columns import (
+    BelongsToId,
+    BelongsToModel,
+    Boolean,
+    Datetime,
+    HasMany,
+    HasOne,
+    Integer,
+    Json,
+    Select,
+    String,
+)
 
-from clearskies_gitlab.models import gitlab_group, gitlab_namespace
+from clearskies_gitlab.rest.backends import GitlabRestBackend
+from clearskies_gitlab.rest.models import (
+    gitlab_rest_group_reference,
+    gitlab_rest_namespace,
+    gitlab_rest_project_approval_config_reference,
+    gitlab_rest_project_approval_rule_reference,
+    gitlab_rest_project_protected_branch_reference,
+    gitlab_rest_project_variable_reference,
+)
 
 
-class GitlabProject(Model):
-    """Base model for projects."""
+class GitlabRestProject(Model):
+    """Model for projects."""
 
-    id_column_name = "id"
+    id_column_name: str = "id"
+
+    backend = GitlabRestBackend(
+        api_to_model_map={
+            "namespace.id": ["namespace_id", "group_id"],
+        }
+    )
+
+    @classmethod
+    def destination_name(cls: type[Self]) -> str:
+        """Return the slug of the api endpoint for this model."""
+        return "projects"
 
     id = String()
-    group_id = BelongsToId(gitlab_group.GitlabGroup)
-    group = BelongsToModel("group_id")
-    user_id = String()
-    namespace_id = BelongsToId(gitlab_namespace.GitlabNamespace)
-    namespace = BelongsToModel("namespace_id")
+
     description = String()
     description_html = String()
-    default_branch = String()
     visibility = String()
     ssh_url_to_repo = String()
     http_url_to_repo = String()
     web_url = String()
-    readme_url = String()
     topics = Json()
-    owner = Json()
     name = String()
-    name_with_namespace = String()
     path = String()
-    path_with_namespace = String()
     issues_enabled = Boolean()
     open_issues_count = Integer()
     merge_requests_enabled = Boolean()
     jobs_enabled = Boolean()
     wiki_enabled = Boolean()
     snippets_enabled = Boolean()
-    can_create_merge_request_in = Boolean()
-    resolve_outdated_diff_discussions = Boolean()
-    container_registry_access_level = Select(allowed_values=["disabled", "private", "enabled"])
-    container_security_and_compliance_access_level = Select(allowed_values=["disabled", "private", "enabled"])
-    container_expiration_policy = Json()
     created_at = Datetime()
     updated_at = Datetime()
     last_activity_at = Datetime()
+    import_status = String()
+    archived = Boolean()
+    avatar_url = String()
+    shared_runners_enabled = Boolean()
+    forks_count = Integer()
+    star_count = Integer()
+
+    group_id = BelongsToId(gitlab_rest_group_reference.GitlabRestGroupReference)
+    group = BelongsToModel("group_id")
+
+    namespace_id = BelongsToId(gitlab_rest_namespace.GitlabRestNamespace)
+    namespace = BelongsToModel("namespace_id")
+
+    allow_pipeline_trigger_approve_deployment = Boolean()
+
+    # REST-specific fields not available in GraphQL
+    default_branch = String()
     creator_id = Integer()
+    readme_url = String()
+    owner = Json()
+    resolve_outdated_diff_discussions = Boolean()
     import_url = String()
     import_type = String()
-    import_status = String()
     import_error = String()
-    permissions = Json()
-    archived = Boolean()
-    avatar_url = String()
     license_url = String()
     license = Json()
-    shared_runners_enabled = Boolean()
     group_runners_enabled = Boolean()
-    forks_count = Integer()
-    star_count = Integer()
+    container_registry_access_level = Select(allowed_values=["disabled", "private", "enabled"])
+    container_security_and_compliance_access_level = Select(allowed_values=["disabled", "private", "enabled"])
+    container_expiration_policy = Json()
     runners_token = String()
-    ci_default_git_depth = Integer()
     ci_forward_deployment_enabled = Boolean()
     ci_forward_deployment_rollback_allowed = Boolean()
-    ci_allow_fork_pipelines_to_run_in_parent_project = Boolean()
     ci_separated_caches = Boolean()
     ci_restrict_pipeline_cancellation_role = Select(allowed_values=["maintainer", "developer", "no_one"])
     ci_pipeline_variables_minimum_override_role = Select(
@@ -78,17 +107,13 @@ class GitlabProject(Model):
     repository_storage = String()
     only_allow_merge_if_pipeline_succeeds = Boolean()
     allow_merge_on_skipped_pipeline = Boolean()
-    allow_pipeline_trigger_approve_deployment = Boolean()
     restrict_user_defined_variables = Boolean()
     only_allow_merge_if_all_discussions_are_resolved = Boolean()
     remove_source_branch_after_merge = Boolean()
     printing_merge_requests_link_enabled = Boolean()
     request_access_enabled = Boolean()
-    only_allow_merge_if_pipeline_succeeds = Boolean()
     merge_method = Select(allowed_values=["merge", "rebase_merge", "ff"])
     squash_option = Select(allowed_values=["never", "always", "default_on", "default_off"])
-    auto_devops_enabled = Boolean()
-    auto_devops_deploy_strategy = Select(allowed_values=["continuous", "manual", "timed_incremental"])
     mirror = Boolean()
     mirror_user_id = Integer()
     mirror_trigger_builds = Boolean()
@@ -104,7 +129,75 @@ class GitlabProject(Model):
     merge_commit_template = String()
     squash_commit_template = String()
     issue_branch_template = String()
-    marked_for_deletion_on = Datetime()
     compliance_frameworks = Json()
     statistics = Json()
     container_registry_image_prefix = String()
+
+    can_create_merge_request_in = Boolean()
+    auto_devops_enabled = Boolean()
+    auto_devops_deploy_strategy = Select(allowed_values=["continuous", "manual", "timed_incremental"])
+    ci_allow_fork_pipelines_to_run_in_parent_project = Boolean()
+    ci_default_git_depth = Integer()
+    name_with_namespace = String()
+    path_with_namespace = String()
+    permissions = Json()
+
+    variables = HasMany(
+        gitlab_rest_project_variable_reference.GitlabRestProjectVariableReference,
+        foreign_column_name="project_id",
+    )
+
+    protected_branches = HasMany(
+        gitlab_rest_project_protected_branch_reference.GitlabRestProjectProtectedBranchReference,
+        foreign_column_name="project_id",
+    )
+
+    approval_config = HasOne(
+        gitlab_rest_project_approval_config_reference.GitlabRestProjectApprovalConfigReference,
+        foreign_column_name="project_id",
+    )
+
+    approval_rules = HasMany(
+        gitlab_rest_project_approval_rule_reference.GitlabRestProjectApprovalRuleReference,
+        foreign_column_name="project_id",
+    )
+
+    # contributors = HasMany(
+    ### Search params
+    include_hidden = Boolean()
+    include_pending_delete = Boolean()
+    last_activity_after = Datetime()
+    last_activity_before = Datetime()
+    membership = Boolean()
+    min_access_level = Integer()
+    order_by = Select(
+        allowed_values=[
+            "id",
+            "name",
+            "path",
+            "created_at",
+            "updated_at",
+            "star_count",
+            "last_activity_at",
+            "similarity",
+        ]
+    )
+    owned = Boolean()
+    repository_checksum_failed = Boolean()
+    repository_storage = String()
+    search_namespaces = Boolean()
+    search = String()
+    simple = Boolean()
+    sort = String()
+    starred = Boolean()
+    topic_id = Integer()
+    topic = String()
+    updated_after = Datetime()
+    updated_before = Datetime()
+    visibility = Select(allowed_values=["public", "internal", "private"])
+    wiki_checksum_failed = Boolean()
+    with_custom_attributes = Boolean()
+    with_issues_enabled = Boolean()
+    with_merge_requests_enabled = Boolean()
+    with_programming_language = String()
+    marked_for_deletion_on = Datetime(date_format="%Y-%m-%d")