github api fixes

Author: cyberc001

GitHubRepoAPI.py

@@ -8,19 +8,21 @@
     WikiPage,
     Branch,
     IRepositoryAPI,
+    User,
+    Comment
 )
 from github import Github
 
 
 class GitHubRepoAPI(IRepositoryAPI):
 
     def __init__(self, client):
-        self.client = client
+        self.client = Github(client)
 
     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=User(login=repo.owner.login,username=repo.owner.name,email=repo.owner.email))
         except Exception as e:
             logging.error(f"Failed to get repository {id} from GitHub: {e}")
             return None
@@ -36,6 +38,10 @@ def get_commits(self, repo: Repository) -> list[Commit]:
                         c.author.login if c.author else "unknown", c.commit.author.email
                     ),
                     date=c.commit.author.date,
+                    files=[
+                        f.filename
+                            for f in c.files
+                    ]
                 )
                 for c in commits
             ]
@@ -62,8 +68,17 @@ def get_issues(self, repo: Repository) -> list[Issue]:
                 Issue(
                     _id=i.number,
                     title=i.title,
-                    author=Contributor(i.user.login, i.user.email or ""),
                     state=i.state,
+                    created_at=i.created_at,
+                    closed_at=i.closed_at,
+                    closed_by=User(login=i.closed_by.login,username=i.closed_by.name,email=i.closed_by.email) if i.closed_by else None,
+                    body=i.body,
+                    user=User(login=i.user.login,username=i.user.name,email=i.user.email),
+                    labels= [
+                        l.name
+                        for l in i.labels
+                    ],
+                    milestone=i.milestone.title if i.milestone else None
                 )
                 for i in issues
             ]
@@ -78,8 +93,24 @@ def get_pull_requests(self, repo: Repository) -> list[PullRequest]:
                 PullRequest(
                     _id=p.number,
                     title=p.title,
-                    author=Contributor(p.user.login, p.user.email or ""),
+                    author=User(login=p.user.login, username=p.user.name, email=p.user.email),
                     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=User(login=p.merged_by.login, username=p.merged_by.name, email=p.merged_by.email) if p.merged_by else None,
+                    files=[
+                        f.filename
+                            for f in p.get_files()
+                    ],
+                    issue_url=p.issue_url,
+                    labels= [
+                        l.name
+                        for l in p.labels
+                    ],
+                    milestone=p.milestone.title if p.milestone else None
                 )
                 for p in pulls
             ]
@@ -122,7 +153,39 @@ def get_branches(self, repo: Repository) -> list[Branch]:
             return []
 
     def get_wiki_pages(self, repo: Repository) -> list[WikiPage]:
-        pass
+        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():
+            result.append(Repository(_id=repo.full_name, name=repo.name, url=repo.html_url))
+        return result
+
+    def get_comments(self, repo, obj) -> list[Comment]:
+        result = []
+        if type(obj) == Issue:
+            # TODO оптимизировать
+            issues = self.client.get_repo(repo._id).get_issues(state='all')
+            issue = None
+            for i in issues:
+                if i.number == obj._id:
+                    issue = i
+                    break
+            for c in issue.get_comments():
+                result.append(Comment(body=c.body,created_at=c.created_at,author=User(login=c.user.login,username=c.user.name,email=c.user.email)))
+        elif type(obj) == PullRequest:
+            # TODO оптимизировать
+            pulls = self.client.get_repo(repo._id).get_pulls(state='all')
+            pull = None
+            for p in pulls:
+                if p.number == obj._id:
+                    pull = p
+                    break
+            for c in pull.get_comments():
+                result.append(Comment(body=c.body,created_at=c.created_at,author=User(login=c.user.login,username=c.user.name,email=c.user.email)))
+
+        return result
 
 
 # Точка входа для тестирования

commits_parser.py

@@ -1,8 +1,7 @@
 from utils import logger
 import pytz
 from time import sleep
-from github import Github, Repository
-import GitHubRepoAPI  # Импортируем обёртку
+from interface_wrapper import IRepositoryAPI
 
 EMPTY_FIELD = 'Empty field'
 TIMEDELTA = 0.05
@@ -18,12 +17,11 @@
     'branch',
 )
 
-def log_repository_commits(client: Github, repository, csv_name, start, finish, branch):
+def log_repository_commits(client: IRepositoryAPI, repository, csv_name, start, finish, branch):
     branches = []
     match branch:
         case 'all':
-            api = GitHubRepoAPI.GitHubRepoAPI(client)
-            branches = api.get_branches(repository)
+            branches = client.get_branches(repository)
             for branch in branches:
                 branches.append(branch.name)
         case None:
@@ -34,20 +32,19 @@ def log_repository_commits(client: Github, repository, csv_name, start, finish,
     for branch in branches:
         print(f'Processing branch {branch}')
         # Используем обёртку для получения коммитов
-        api = GitHubRepoAPI.GitHubRepoAPI(client)
-        commits = api.get_commits(repository)
+        commits = client.get_commits(repository)
         for commit in commits:
             if (
                 commit.date.astimezone(pytz.timezone(TIMEZONE)) < start
                 or commit.date.astimezone(pytz.timezone(TIMEZONE)) > finish
             ):
                 continue
             commit_data = [
-                repository.full_name,
+                repository.name,
                 commit.author.username,
                 commit.author.email or EMPTY_FIELD,
                 commit.date,
-                '; '.join([file.filename for file in commit.files]),
+                '; '.join([file for file in commit.files]),
                 commit._id,
                 branch,
             ]
@@ -59,27 +56,19 @@ def log_repository_commits(client: Github, repository, csv_name, start, finish,
             sleep(TIMEDELTA)
 
 def log_commits(
-    client, working_repos, csv_name, start, finish, branch, fork_flag
+        client: IRepositoryAPI, working_repos, csv_name, start, finish, branch, fork_flag
 ):
     logger.log_to_csv(csv_name, FIELDNAMES)
 
-    api = GitHubRepoAPI.GitHubRepoAPI(client)  # Используем обёртку
-
-    for repo_name in working_repos:
+    for repo in working_repos:
         try:
-            # Получаем репозиторий через обёртку
-            repo = api.get_repository(repo_name)
-            if not repo:
-                print(f"Repository {repo_name} not found or access denied.")
-                continue
-
             logger.log_title(repo.name)
-            log_repository_commits(repo, csv_name, start, finish, branch)
+            log_repository_commits(client, repo, csv_name, start, finish, branch)
             if fork_flag:
-                # Получаем форки через оригинальный метод, так как его нет в обёртке(Нужно добавить)
-                forked_repos = client.get_repo(repo._id).get_forks()
+                # TODO
+                forked_repos = client.get_forks(repo)
                 for forked_repo in forked_repos:
-                    logger.log_title("FORKED:", forked_repo.full_name)
+                    logger.log_title("FORKED:", forked_repo.name)
                     log_repository_commits(forked_repo, csv_name, start, finish, branch)
                     sleep(TIMEDELTA)
             sleep(TIMEDELTA)

contributors_parser.py

@@ -1,8 +1,7 @@
 from utils import logger
 from time import sleep
 from typing import Generator
-from github import Github, Repository, GithubException
-import GitHubRepoAPI  # Импортируем обёртку
+from interface_wrapper import IRepositoryAPI, Repository
 
 EMPTY_FIELD = 'Empty field'
 TIMEDELTA = 0.05
@@ -22,15 +21,13 @@
     'site_admin',
 )
 
-def log_repository_contributors(repository: Repository, csv_name: str):
-    #Нужно добавить
-    contributors_stats = get_contributors_stats(repository)
+def log_repository_contributors(client: IRepositoryAPI, repository: Repository, csv_name: str):
+    contributors_stats = get_contributors_stats(client, repository)
 
     nvl = lambda val: val or EMPTY_FIELD
 
     for contributor_stat in contributors_stats.values():
         contributor = contributor_stat["contributor_object"]
-        #Нужно добавить
         contributor_permissons = repository.get_collaborator_permission(contributor)
 
         info_tmp = {
@@ -53,12 +50,11 @@ def log_repository_contributors(repository: Repository, csv_name: str):
 
         sleep(TIMEDELTA)
 
-def get_contributors_stats(repository: Repository) -> dict:
+def get_contributors_stats(client: IRepositoryAPI, repository: Repository) -> dict:
     contributors_stats = dict()
 
     # Используем обёртку для получения коммитов
-    api = GitHubRepoAPI.GitHubRepoAPI(repository._github)
-    commits = api.get_commits(repository)
+    commits = client.get_commits(repository)
 
     for commit in commits:
         contributor = commit.author
@@ -77,24 +73,21 @@ def get_contributors_stats(repository: Repository) -> dict:
     return contributors_stats
 
 def log_contributors(
-    client: Github, working_repos: Generator, csv_name: str, fork_flag: bool
+    client: IRepositoryAPI, working_repos: Generator, csv_name: str, fork_flag: bool
 ):
     logger.log_to_csv(csv_name, FIELDNAMES)
 
-    api = GitHubRepoAPI.GitHubRepoAPI(client)  # Используем обёртку
-
     for repo in working_repos:
         try:
             logger.log_title(repo.full_name)
             log_repository_contributors(repo, csv_name)
 
             if fork_flag:
-                #Нужно добавить
-                for forked_repo in repo.get_forks():
-                    logger.log_title("FORKED:", forked_repo.full_name)
-                    log_repository_contributors(forked_repo, csv_name)
+                for forked_repo in client.get_forks():
+                    logger.log_title("FORKED:", forked_repo.name)
+                    log_repository_contributors(client, forked_repo, csv_name)
                     sleep(TIMEDELTA)
 
-        except GithubException as e:
+        except e:
             print(e)
-            exit(1)
+            exit(1)

git_logger.py

@@ -1,45 +1,40 @@
 from time import sleep
-from github import Github, GithubException, PullRequest
-import GitHubRepoAPI  # Импортируем обёртку
+from interface_wrapper import IRepositoryAPI, RepositoryFactory
 
 TIMEDELTA = 0.05
 TIMEZONE = 'Europe/Moscow'
 
 def login(token):
-    client = Github(login_or_token=token)
-
     try:
-        # Проверяем аутентификацию через оригинальный метод(Нужно добавить)
-        user_login = client.get_user().login
-    except GithubException as err:
-        print(f'Github: Connect: error {err.data}')
+        client = RepositoryFactory.create_api("github", token)
+    except Exception as err:
+        print(f'Github: Connect: error {err}')
         print('Github: Connect: user could not be authenticated please try again.')
         exit(1)
     else:
         return client
 
-def get_next_repo(client: Github, repositories):
-    api = GitHubRepoAPI.GitHubRepoAPI(client)  # Используем обёртку
+def get_next_repo(client: IRepositoryAPI, repositories):
     with open(repositories, 'r') as file:
         list_repos = [x for x in file.read().split('\n') if x]
     print(list_repos)
     for repo_name in list_repos:
         try:
-            # Получаем репозиторий через обёртку
-            repo = api.get_repository(repo_name)
+            repo = client.get_repository(repo_name)
             if not repo:
-                raise GithubException(status=404, data={"message": f"Repository {repo_name} not found."})
-        except GithubException as err:
-            print(f'Github: Connect: error {err.data}')
+                raise Exception(f"Repository {repo_name} not found.")
+        except Exception as err:
+            print(f'Github: Connect: error {err}')
             print(f'Github: Connect: failed to load repository "{repo_name}"')
             exit(1)
         else:
             yield repo
 
 def get_assignee_story(github_object):
+    #TODO
+    return ""
     assignee_result = ""
     events = (
-        #Нужно добавить
         github_object.get_issue_events()
         if type(github_object) is PullRequest.PullRequest
         else github_object.get_events()
@@ -54,4 +49,4 @@ def get_assignee_story(github_object):
                 assignee_result += "/"
             assignee_result += f"> {assignee}; "
         sleep(TIMEDELTA)
-    return assignee_result
+    return assignee_result