FIX, optimized: get_comments

Author: Wave0004

GitHubRepoAPI.py

@@ -1,99 +1,149 @@
+from github import Github, GithubException
+
 from interface_wrapper import (
-    logging,
-    Repository,
-    Contributor,
+    Branch,
+    Comment,
     Commit,
+    Contributor,
+    Invite,
+    IRepositoryAPI,
     Issue,
     PullRequest,
+    Repository,
+    User,
     WikiPage,
-    Branch,
-    IRepositoryAPI,
+    logging,
+    WorkflowRun,
 )
-from github import Github
+
 
 class GitHubRepoAPI(IRepositoryAPI):
-    
-    def __init__(self, client):
-        self.client = client
-        self._issue_cache = {}  
-        self._pull_cache = {}   
+    def __init__(self, client: Github):
+        self.client = self._client_validation(client)
+
+    @staticmethod
+    def _client_validation(client: Github) -> Github:
+        try:
+            client.get_user().login
+        except GithubException as err:
+            logging.error(f'Github: Connect: error {err.data}')
+            logging.error(
+                'Github: Connect: user could not be authenticated please try again.'
+            )
+            exit(1)
+        else:
+            return client
+
+    def get_user_data(self, user) -> User:
+        return User(
+            login=user.login,
+            username=user.name,
+            email=user.email,  # always None
+            html_url=user.html_url,
+            node_id=user.node_id,
+            type=user.type,
+            bio=user.bio,
+            site_admin=user.site_admin,
+            _id=user.id,
+        )
+
+    def get_commit_data(self, commit, files=False) -> Commit:
+        return Commit(
+            _id=commit.sha,
+            message=commit.commit.message,
+            author=self.get_user_data(commit.author),
+            date=commit.commit.author.date,
+            files=[f.filename for f in commit.files] if files else None,
+            additions=commit.stats.additions,
+            deletions=commit.stats.deletions,
+        )
 
     def get_repository(self, id: str) -> Repository | None:
         try:
             repo = self.client.get_repo(id)
-            return Repository(_id=repo.full_name, name=repo.name, url=repo.html_url)
+            return Repository(
+                _id=repo.full_name,
+                name=repo.name,
+                url=repo.html_url,
+                default_branch=Branch(name=repo.default_branch, last_commit=None),
+                owner=self.get_user_data(repo.owner),
+            )
         except Exception as e:
             logging.error(f"Failed to get repository {id} from GitHub: {e}")
             return None
 
-    def get_commits(self, repo: Repository) -> list[Commit]:
+    def get_collaborator_permission(self, repo: Repository, user: User) -> str:
+        return self.client.get_repo(repo._id).get_collaborator_permission(user.login)
+
+    def get_commits(self, repo: Repository, files: bool = True) -> list[Commit]:
         try:
             commits = self.client.get_repo(repo._id).get_commits()
-            return [
-                Commit(
-                    _id=c.sha,
-                    message=c.commit.message,
-                    author=Contributor(c.author.login if c.author else "unknown", c.commit.author.email),
-                    date=c.commit.author.date
-                ) for c in commits
-            ]
+            return [self.get_commit_data(c, files) for c in commits]
+
         except Exception as e:
-            logging.error(f"Failed to get commits from GitHub for repo {repo.name}: {e}")
+            logging.error(
+                f"Failed to get commits from GitHub for repo {repo.name}: {e}"
+            )
             return []
 
     def get_contributors(self, repo: Repository) -> list[Contributor]:
         try:
             contributors = self.client.get_repo(repo._id).get_contributors()
             return [Contributor(c.login, c.email or "") for c in contributors]
         except Exception as e:
-            logging.error(f"Failed to get contributors from GitHub for repo {repo.name}: {e}")
+            logging.error(
+                f"Failed to get contributors from GitHub for repo {repo.name}: {e}"
+            )
             return []
 
     def get_issues(self, repo: Repository) -> list[Issue]:
         try:
-            repo_obj = self.client.get_repo(repo._id)
-            issues = repo_obj.get_issues(state='all')
-
-            issue_dict = {}
-            result = []
-            for i in issues:
-                issue_obj = Issue(
+            issues = self.client.get_repo(repo._id).get_issues(state='all')
+            return [
+                Issue(
                     _id=i.number,
                     title=i.title,
-                    author=Contributor(i.user.login, i.user.email or ""),
-                    state=i.state
+                    state=i.state,
+                    created_at=i.created_at,
+                    closed_at=i.closed_at,
+                    closed_by=self.get_user_data(i.closed_by) if i.closed_by else None,
+                    body=i.body,
+                    user=self.get_user_data(i.user),
+                    labels=[label.name for label in i.labels],
+                    milestone=i.milestone.title if i.milestone else None,
                 )
-                result.append(issue_obj)
-                issue_dict[i.number] = issue_obj
-
-            self._issue_cache[repo._id] = issue_dict
-            return result
-
+                for i in issues
+            ]
         except Exception as e:
             logging.error(f"Failed to get issues from GitHub for repo {repo.name}: {e}")
             return []
 
     def get_pull_requests(self, repo: Repository) -> list[PullRequest]:
         try:
             pulls = self.client.get_repo(repo._id).get_pulls(state='all')
-
-            pull_dict = {}
-            result = []
-            for p in pulls:
-                pr_obj = PullRequest(
+            return [
+                PullRequest(
                     _id=p.number,
                     title=p.title,
-                    author=Contributor(p.user.login, p.user.email or ""),
-                    state=p.state
+                    author=self.get_user_data(p.user),
+                    state=p.state,
+                    created_at=p.created_at,
+                    head_label=p.head.label,
+                    base_label=p.base.label,
+                    head_ref=p.head.ref,
+                    base_ref=p.base.ref,
+                    merged_by=self.get_user_data(p.merged_by) if p.merged_by else None,
+                    files=[file.filename for file in p.get_files()],
+                    issue_url=p.issue_url,
+                    labels=[label.name for label in p.labels],
+                    milestone=p.milestone.title if p.milestone else None,
                 )
-                result.append(pr_obj)
-                pull_dict[p.number] = pr_obj
-
-            self._pull_cache[repo._id] = pull_dict
-            return result
-
+                for p in pulls
+            ]
         except Exception as e:
-            logging.error(f"Failed to get pull requests from GitHub for repo {repo.name}: {e}")
+            logging.error(
+                f"Failed to get pull requests from GitHub for repo {repo.name}: {e}"
+            )
             return []
 
     def get_branches(self, repo: Repository) -> list[Branch]:
@@ -105,44 +155,129 @@ def get_branches(self, repo: Repository) -> list[Branch]:
             for branch in branches:
                 commit = repo_client.get_commit(branch.commit.sha)
 
-                author = commit.author
-                contributor = Contributor(
-                    username=author.login if author else "unknown",
-                    email=commit.commit.author.email or ""
+                commit_obj = self.get_commit_data(commit)
+
+                result.append(Branch(name=branch.name, last_commit=commit_obj))
+
+            return result
+
+        except Exception as e:
+            logging.error(
+                f"Failed to get branches from GitHub for repo {repo.name}: {e}"
+            )
+            return []
+
+    def get_wiki_pages(self, repo: Repository) -> list[WikiPage]:
+        return
+
+    def get_forks(self, repo: Repository) -> list[Repository]:
+        repo_client = self.client.get_repo(repo._id)
+        result = []
+
+        for r in repo_client.get_forks():
+            default_branch = (Branch(name=r.default_branch, last_commit=None),)
+            owner = (self.get_user_data(r.owner),)
+
+            result.append(
+                Repository(
+                    _id=r.full_name,
+                    name=r.name,
+                    url=r.html_url,
+                    default_branch=default_branch,
+                    owner=owner,
                 )
+            )
+
+        return result
 
-                commit_obj = Commit(
-                    _id=commit.sha,
-                    message=commit.commit.message,
-                    author=contributor,
-                    date=commit.commit.author.date
+    def get_comments(self, repo, obj) -> list[Comment]:
+        result = []
+        repo_client = self.client.get_repo(repo._id)
+    
+        try:
+            if isinstance(obj, Issue):
+                # Получаем issue напрямую по номеру
+                issue = repo_client.get_issue(number=obj._id)
+                comments = issue.get_comments()
+            elif isinstance(obj, PullRequest):
+                # Получаем PR напрямую по номеру
+                pull = repo_client.get_pull(number=obj._id)
+                comments = pull.get_comments()
+            else:
+                return []
+        
+            # Формируем результат
+            return [
+                Comment(
+                    body=comment.body,
+                    created_at=comment.created_at,
+                    author=self.get_user_data(comment.user),
                 )
+                for comment in comments
+            ]
+        
+        except Exception as e:
+            logging.error(f"Failed to get comments for {type(obj).__name__} {obj._id}: {e}")
+            return []
 
-                result.append(
-                    Branch(
-                        name=branch.name,
-                        last_commit=commit_obj
-                    )
+    def get_invites(self, repo: Repository) -> list[Invite]:
+        try:
+            invites = self.client.get_repo(repo._id).get_pending_invitations()
+            return [
+                Invite(
+                    _id=i._id,
+                    invitee=self.get_user_data(i.invitee),
+                    created_at=i.created_at,
+                    html_url=i.html_url,
                 )
+                for i in invites
+            ]
+        except Exception as e:
+            logging.error(
+                f"Failed to get invites from GitHub for repo {repo.name}: {e}"
+            )
+            return []
 
-            return result
+    def get_rate_limiting(self) -> tuple[int, int]:
+        return self.client.rate_limiting
+
+    def get_workflow_runs(self, repo) -> list[WorkflowRun]:
+        try:
+            runs = self.client.get_repo(repo._id).get_workflow_runs()
+
+            return [
+                WorkflowRun(
+                    display_title=r.display_title,
+                    event=r.event,
+                    head_branch=r.head_branch,
+                    head_sha=r.head_sha,
+                    name=r.name,
+                    path=r.path,
+                    created_at=r.created_at,
+                    run_started_at=r.run_started_at,
+                    updated_at=r.updated_at,
+                    conclusion=r.conclusion,
+                    status=r.status,
+                    url=r.url,
+                )
+                for r in runs
+            ]
 
         except Exception as e:
-            logging.error(f"Failed to get branches from GitHub for repo {repo.name}: {e}")
+            logging.error(
+                f"Failed to get workflow runs from GitHub for repo {repo.name}: {e}"
+            )
             return []
 
-    def get_wiki_pages(self, repo: Repository) -> list[WikiPage]:
-        pass
-
 
 # Точка входа для тестирования
 if __name__ == "__main__":
     # Создайте клиент GitHub (используйте ваш токен)
-    client = Github("tocken")
-    api = GitHubRepoAPI(client)
+    #client = Github("")
+    api = GitHubRepoAPI('client')
 
-    # Укажите ваш репозиторий 
-    repo_name = "repo-name"
+    # Укажите ваш репозиторий
+    repo_name = ""
 
     # Получение репозитория
     repo = api.get_repository(repo_name)
@@ -156,8 +291,10 @@ def get_wiki_pages(self, repo: Repository) -> list[WikiPage]:
     # Получение коммитов
     commits = api.get_commits(repo)
     print(f"Total commits: {len(commits)}")
-    for commit in commits[:10]:
-        print(f"Commit: {commit._id}, Message: {commit.message}, Author: {commit.author.username}")
+    for commit in commits[:10]:  # Выведем первые 10 коммитов
+        print(
+            f"Commit: {commit._id}, Message: {commit.message}, Author: {commit.author.username}"
+        )
 
     # Получение контрибьюторов
     contributors = api.get_contributors(repo)
@@ -168,17 +305,19 @@ def get_wiki_pages(self, repo: Repository) -> list[WikiPage]:
     # Получение issues
     issues = api.get_issues(repo)
     print(f"Total issues: {len(issues)}")
-    for issue in issues[:10]:
+    for issue in issues[:10]:  # Выведем первые 10 issues
         print(f"Issue: {issue._id}, Title: {issue.title}, State: {issue.state}")
 
     # Получение pull requests
     pulls = api.get_pull_requests(repo)
     print(f"Total pull requests: {len(pulls)}")
-    for pull in pulls[:10]:
+    for pull in pulls[:10]:  # Выведем первые 10 pull requests
         print(f"Pull Request: {pull._id}, Title: {pull.title}, State: {pull.state}")
 
     # Получение веток
     branches = api.get_branches(repo)
     print(f"Total branches: {len(branches)}")
     for branch in branches:
-        print(f"Branch: {branch.name}, Last Commit: {branch.last_commit._id if branch.last_commit else 'None'}")
+        print(
+            f"Branch: {branch.name}, Last Commit: {branch.last_commit._id if branch.last_commit else 'None'}"
+        )