python-gitlab · nejch · Sep 8, 2021 · Jun 12, 2021 · Jun 13, 2021 · Sep 8, 2021
diff --git a/gitlab/base.py b/gitlab/base.py
@@ -150,13 +150,22 @@ def __hash__(self) -> int:
         return hash(self.get_id())
 
     def _create_managers(self) -> None:
-        managers = getattr(self, "_managers", None)
-        if managers is None:
-            return
-
-        for attr, cls_name in self._managers:
+        # NOTE(jlvillal): We are creating our managers by looking at the class
+        # annotations. If an attribute is annotated as being a *Manager type
+        # then we create the manager and assign it to the attribute.
+        for attr, annotation in sorted(self.__annotations__.items()):
+            if not isinstance(annotation, (type, str)):
+                continue
+            if isinstance(annotation, type):
+                cls_name = annotation.__name__
+            else:
+                cls_name = annotation
+            # All *Manager classes are used except for the base "RESTManager" class
+            if cls_name == "RESTManager" or not cls_name.endswith("Manager"):
+                continue
             cls = getattr(self._module, cls_name)
             manager = cls(self.manager.gitlab, parent=self)
+            # Since we have our own __setattr__ method, we can't use setattr()
             self.__dict__[attr] = manager
 
     def _update_attrs(self, new_attrs: Dict[str, Any]) -> None:

diff --git a/gitlab/v4/cli.py b/gitlab/v4/cli.py
@@ -99,7 +99,10 @@ def do_custom(self) -> Any:
     def do_project_export_download(self) -> None:
         try:
             project = self.gl.projects.get(int(self.args["project_id"]), lazy=True)
-            data = project.exports.get().download()
+            export_status = project.exports.get()
+            if TYPE_CHECKING:
+                assert export_status is not None
+            data = export_status.download()
             sys.stdout.buffer.write(data)
 
         except Exception as e:

diff --git a/gitlab/v4/objects/boards.py b/gitlab/v4/objects/boards.py
@@ -26,7 +26,7 @@ class GroupBoardListManager(CRUDMixin, RESTManager):
 
 
 class GroupBoard(SaveMixin, ObjectDeleteMixin, RESTObject):
-    _managers = (("lists", "GroupBoardListManager"),)
+    lists: GroupBoardListManager
 
 
 class GroupBoardManager(CRUDMixin, RESTManager):
@@ -49,7 +49,7 @@ class ProjectBoardListManager(CRUDMixin, RESTManager):
 
 
 class ProjectBoard(SaveMixin, ObjectDeleteMixin, RESTObject):
-    _managers = (("lists", "ProjectBoardListManager"),)
+    lists: ProjectBoardListManager
 
 
 class ProjectBoardManager(CRUDMixin, RESTManager):

diff --git a/gitlab/v4/objects/commits.py b/gitlab/v4/objects/commits.py
@@ -17,11 +17,10 @@
 
 class ProjectCommit(RESTObject):
     _short_print_attr = "title"
-    _managers = (
-        ("comments", "ProjectCommitCommentManager"),
-        ("discussions", "ProjectCommitDiscussionManager"),
-        ("statuses", "ProjectCommitStatusManager"),
-    )
+
+    comments: "ProjectCommitCommentManager"
+    discussions: ProjectCommitDiscussionManager
+    statuses: "ProjectCommitStatusManager"
 
     @cli.register_custom_action("ProjectCommit")
     @exc.on_http_error(exc.GitlabGetError)

diff --git a/gitlab/v4/objects/container_registry.py b/gitlab/v4/objects/container_registry.py
@@ -12,7 +12,7 @@
 
 
 class ProjectRegistryRepository(ObjectDeleteMixin, RESTObject):
-    _managers = (("tags", "ProjectRegistryTagManager"),)
+    tags: "ProjectRegistryTagManager"
 
 
 class ProjectRegistryRepositoryManager(DeleteMixin, ListMixin, RESTManager):

diff --git a/gitlab/v4/objects/deployments.py b/gitlab/v4/objects/deployments.py
@@ -10,7 +10,7 @@
 
 
 class ProjectDeployment(SaveMixin, RESTObject):
-    _managers = (("mergerequests", "ProjectDeploymentMergeRequestManager"),)
+    mergerequests: ProjectDeploymentMergeRequestManager
 
 
 class ProjectDeploymentManager(RetrieveMixin, CreateMixin, UpdateMixin, RESTManager):

diff --git a/gitlab/v4/objects/discussions.py b/gitlab/v4/objects/discussions.py
@@ -21,7 +21,7 @@
 
 
 class ProjectCommitDiscussion(RESTObject):
-    _managers = (("notes", "ProjectCommitDiscussionNoteManager"),)
+    notes: ProjectCommitDiscussionNoteManager
 
 
 class ProjectCommitDiscussionManager(RetrieveMixin, CreateMixin, RESTManager):
@@ -32,7 +32,7 @@ class ProjectCommitDiscussionManager(RetrieveMixin, CreateMixin, RESTManager):
 
 
 class ProjectIssueDiscussion(RESTObject):
-    _managers = (("notes", "ProjectIssueDiscussionNoteManager"),)
+    notes: ProjectIssueDiscussionNoteManager
 
 
 class ProjectIssueDiscussionManager(RetrieveMixin, CreateMixin, RESTManager):
@@ -43,7 +43,7 @@ class ProjectIssueDiscussionManager(RetrieveMixin, CreateMixin, RESTManager):
 
 
 class ProjectMergeRequestDiscussion(SaveMixin, RESTObject):
-    _managers = (("notes", "ProjectMergeRequestDiscussionNoteManager"),)
+    notes: ProjectMergeRequestDiscussionNoteManager
 
 
 class ProjectMergeRequestDiscussionManager(
@@ -59,7 +59,7 @@ class ProjectMergeRequestDiscussionManager(
 
 
 class ProjectSnippetDiscussion(RESTObject):
-    _managers = (("notes", "ProjectSnippetDiscussionNoteManager"),)
+    notes: ProjectSnippetDiscussionNoteManager
 
 
 class ProjectSnippetDiscussionManager(RetrieveMixin, CreateMixin, RESTManager):

diff --git a/gitlab/v4/objects/epics.py b/gitlab/v4/objects/epics.py
@@ -23,10 +23,9 @@
 
 class GroupEpic(ObjectDeleteMixin, SaveMixin, RESTObject):
     _id_attr = "iid"
-    _managers = (
-        ("issues", "GroupEpicIssueManager"),
-        ("resourcelabelevents", "GroupEpicResourceLabelEventManager"),
-    )
+
+    issues: "GroupEpicIssueManager"
+    resourcelabelevents: GroupEpicResourceLabelEventManager
 
 
 class GroupEpicManager(CRUDMixin, RESTManager):

diff --git a/gitlab/v4/objects/groups.py b/gitlab/v4/objects/groups.py
@@ -43,35 +43,34 @@
 
 class Group(SaveMixin, ObjectDeleteMixin, RESTObject):
     _short_print_attr = "name"
-    _managers = (
-        ("accessrequests", "GroupAccessRequestManager"),
-        ("audit_events", "GroupAuditEventManager"),
-        ("badges", "GroupBadgeManager"),
-        ("billable_members", "GroupBillableMemberManager"),
-        ("boards", "GroupBoardManager"),
-        ("customattributes", "GroupCustomAttributeManager"),
-        ("descendant_groups", "GroupDescendantGroupManager"),
-        ("exports", "GroupExportManager"),
-        ("epics", "GroupEpicManager"),
-        ("hooks", "GroupHookManager"),
-        ("imports", "GroupImportManager"),
-        ("issues", "GroupIssueManager"),
-        ("issues_statistics", "GroupIssuesStatisticsManager"),
-        ("labels", "GroupLabelManager"),
-        ("members", "GroupMemberManager"),
-        ("members_all", "GroupMemberAllManager"),
-        ("mergerequests", "GroupMergeRequestManager"),
-        ("milestones", "GroupMilestoneManager"),
-        ("notificationsettings", "GroupNotificationSettingsManager"),
-        ("packages", "GroupPackageManager"),
-        ("projects", "GroupProjectManager"),
-        ("runners", "GroupRunnerManager"),
-        ("subgroups", "GroupSubgroupManager"),
-        ("variables", "GroupVariableManager"),
-        ("clusters", "GroupClusterManager"),
-        ("deploytokens", "GroupDeployTokenManager"),
-        ("wikis", "GroupWikiManager"),
-    )
+
+    accessrequests: GroupAccessRequestManager
+    audit_events: GroupAuditEventManager
+    badges: GroupBadgeManager
+    billable_members: GroupBillableMemberManager
+    boards: GroupBoardManager
+    clusters: GroupClusterManager
+    customattributes: GroupCustomAttributeManager
+    deploytokens: GroupDeployTokenManager
+    descendant_groups: "GroupDescendantGroupManager"
+    epics: GroupEpicManager
+    exports: GroupExportManager
+    hooks: GroupHookManager
+    imports: GroupImportManager
+    issues: GroupIssueManager
+    issues_statistics: GroupIssuesStatisticsManager
+    labels: GroupLabelManager
+    members: GroupMemberManager
+    members_all: GroupMemberAllManager
+    mergerequests: GroupMergeRequestManager
+    milestones: GroupMilestoneManager
+    notificationsettings: GroupNotificationSettingsManager
+    packages: GroupPackageManager
+    projects: GroupProjectManager
+    runners: GroupRunnerManager
+    subgroups: "GroupSubgroupManager"
+    variables: GroupVariableManager
+    wikis: GroupWikiManager
 
     @cli.register_custom_action("Group", ("to_project_id",))
     @exc.on_http_error(exc.GitlabTransferProjectError)

diff --git a/gitlab/v4/objects/issues.py b/gitlab/v4/objects/issues.py
@@ -105,15 +105,14 @@ class ProjectIssue(
 ):
     _short_print_attr = "title"
     _id_attr = "iid"
-    _managers = (
-        ("awardemojis", "ProjectIssueAwardEmojiManager"),
-        ("discussions", "ProjectIssueDiscussionManager"),
-        ("links", "ProjectIssueLinkManager"),
-        ("notes", "ProjectIssueNoteManager"),
-        ("resourcelabelevents", "ProjectIssueResourceLabelEventManager"),
-        ("resourcemilestoneevents", "ProjectIssueResourceMilestoneEventManager"),
-        ("resourcestateevents", "ProjectIssueResourceStateEventManager"),
-    )
+
+    awardemojis: ProjectIssueAwardEmojiManager
+    discussions: ProjectIssueDiscussionManager
+    links: "ProjectIssueLinkManager"
+    notes: ProjectIssueNoteManager
+    resourcelabelevents: ProjectIssueResourceLabelEventManager
+    resourcemilestoneevents: ProjectIssueResourceMilestoneEventManager
+    resourcestateevents: ProjectIssueResourceStateEventManager
 
     @cli.register_custom_action("ProjectIssue", ("to_project_id",))
     @exc.on_http_error(exc.GitlabUpdateError)

diff --git a/gitlab/v4/objects/members.py b/gitlab/v4/objects/members.py
@@ -43,7 +43,8 @@ class GroupMemberManager(MemberAllMixin, CRUDMixin, RESTManager):
 
 class GroupBillableMember(ObjectDeleteMixin, RESTObject):
     _short_print_attr = "username"
-    _managers = (("memberships", "GroupBillableMemberMembershipManager"),)
+
+    memberships: "GroupBillableMemberMembershipManager"
 
 
 class GroupBillableMemberManager(ListMixin, DeleteMixin, RESTManager):

diff --git a/gitlab/v4/objects/merge_requests.py b/gitlab/v4/objects/merge_requests.py
@@ -139,18 +139,16 @@ class ProjectMergeRequest(
 ):
     _id_attr = "iid"
 
-    _managers = (
-        ("approvals", "ProjectMergeRequestApprovalManager"),
-        ("approval_rules", "ProjectMergeRequestApprovalRuleManager"),
-        ("awardemojis", "ProjectMergeRequestAwardEmojiManager"),
-        ("diffs", "ProjectMergeRequestDiffManager"),
-        ("discussions", "ProjectMergeRequestDiscussionManager"),
-        ("notes", "ProjectMergeRequestNoteManager"),
-        ("pipelines", "ProjectMergeRequestPipelineManager"),
-        ("resourcelabelevents", "ProjectMergeRequestResourceLabelEventManager"),
-        ("resourcemilestoneevents", "ProjectMergeRequestResourceMilestoneEventManager"),
-        ("resourcestateevents", "ProjectMergeRequestResourceStateEventManager"),
-    )
+    approval_rules: ProjectMergeRequestApprovalRuleManager
+    approvals: ProjectMergeRequestApprovalManager
+    awardemojis: ProjectMergeRequestAwardEmojiManager
+    diffs: "ProjectMergeRequestDiffManager"
+    discussions: ProjectMergeRequestDiscussionManager
+    notes: ProjectMergeRequestNoteManager
+    pipelines: ProjectMergeRequestPipelineManager
+    resourcelabelevents: ProjectMergeRequestResourceLabelEventManager
+    resourcemilestoneevents: ProjectMergeRequestResourceMilestoneEventManager
+    resourcestateevents: ProjectMergeRequestResourceStateEventManager
 
     @cli.register_custom_action("ProjectMergeRequest")
     @exc.on_http_error(exc.GitlabMROnBuildSuccessError)

diff --git a/gitlab/v4/objects/notes.py b/gitlab/v4/objects/notes.py
@@ -71,7 +71,7 @@ class ProjectCommitDiscussionNoteManager(
 
 
 class ProjectIssueNote(SaveMixin, ObjectDeleteMixin, RESTObject):
-    _managers = (("awardemojis", "ProjectIssueNoteAwardEmojiManager"),)
+    awardemojis: ProjectIssueNoteAwardEmojiManager
 
 
 class ProjectIssueNoteManager(CRUDMixin, RESTManager):
@@ -104,7 +104,7 @@ class ProjectIssueDiscussionNoteManager(
 
 
 class ProjectMergeRequestNote(SaveMixin, ObjectDeleteMixin, RESTObject):
-    _managers = (("awardemojis", "ProjectMergeRequestNoteAwardEmojiManager"),)
+    awardemojis: ProjectMergeRequestNoteAwardEmojiManager
 
 
 class ProjectMergeRequestNoteManager(CRUDMixin, RESTManager):
@@ -137,7 +137,7 @@ class ProjectMergeRequestDiscussionNoteManager(
 
 
 class ProjectSnippetNote(SaveMixin, ObjectDeleteMixin, RESTObject):
-    _managers = (("awardemojis", "ProjectSnippetNoteAwardEmojiManager"),)
+    awardemojis: ProjectMergeRequestNoteAwardEmojiManager
 
 
 class ProjectSnippetNoteManager(CRUDMixin, RESTManager):

diff --git a/gitlab/v4/objects/packages.py b/gitlab/v4/objects/packages.py
@@ -143,7 +143,7 @@ class GroupPackageManager(ListMixin, RESTManager):
 
 
 class ProjectPackage(ObjectDeleteMixin, RESTObject):
-    _managers = (("package_files", "ProjectPackageFileManager"),)
+    package_files: "ProjectPackageFileManager"
 
 
 class ProjectPackageManager(ListMixin, GetMixin, DeleteMixin, RESTManager):

diff --git a/gitlab/v4/objects/pipelines.py b/gitlab/v4/objects/pipelines.py
@@ -74,12 +74,10 @@ def __call__(self, **kwargs):
 
 
 class ProjectPipeline(RefreshMixin, ObjectDeleteMixin, RESTObject):
-    _managers = (
-        ("jobs", "ProjectPipelineJobManager"),
-        ("bridges", "ProjectPipelineBridgeManager"),
-        ("variables", "ProjectPipelineVariableManager"),
-        ("test_report", "ProjectPipelineTestReportManager"),
-    )
+    bridges: "ProjectPipelineBridgeManager"
+    jobs: "ProjectPipelineJobManager"
+    test_report: "ProjectPipelineTestReportManager"
+    variables: "ProjectPipelineVariableManager"
 
     @cli.register_custom_action("ProjectPipeline")
     @exc.on_http_error(exc.GitlabPipelineCancelError)
@@ -199,7 +197,7 @@ class ProjectPipelineScheduleVariableManager(
 
 
 class ProjectPipelineSchedule(SaveMixin, ObjectDeleteMixin, RESTObject):
-    _managers = (("variables", "ProjectPipelineScheduleVariableManager"),)
+    variables: ProjectPipelineScheduleVariableManager
 
     @cli.register_custom_action("ProjectPipelineSchedule")
     @exc.on_http_error(exc.GitlabOwnershipError)