Revert "79 changed calls" (#90)

Author: thehighestmath

.DS_Store

@@ -8,21 +8,19 @@
     WikiPage,
     Branch,
     IRepositoryAPI,
-    User,
-    Comment
 )
 from github import Github
 
 
 class GitHubRepoAPI(IRepositoryAPI):
 
     def __init__(self, client):
-        self.client = Github(client)
+        self.client = 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, default_branch=Branch(name=repo.default_branch, last_commit=None), owner=User(login=repo.owner.login,username=repo.owner.name,email=repo.owner.email))
+            return Repository(_id=repo.full_name, name=repo.name, url=repo.html_url)
         except Exception as e:
             logging.error(f"Failed to get repository {id} from GitHub: {e}")
             return None
@@ -38,10 +36,6 @@ 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
             ]
@@ -68,17 +62,8 @@ 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
             ]
@@ -93,24 +78,8 @@ def get_pull_requests(self, repo: Repository) -> list[PullRequest]:
                 PullRequest(
                     _id=p.number,
                     title=p.title,
-                    author=User(login=p.user.login, username=p.user.name, email=p.user.email),
+                    author=Contributor(p.user.login, p.user.email or ""),
                     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
             ]
@@ -153,39 +122,7 @@ def get_branches(self, repo: Repository) -> list[Branch]:
             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():
-            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
+        pass
 
 
 # Точка входа для тестирования

GitHubRepoAPI.py

@@ -1,7 +1,7 @@
 from utils import logger
 import pytz
 from time import sleep
-from interface_wrapper import IRepositoryAPI
+from github import Github, Repository, GithubException, PullRequest
 
 EMPTY_FIELD = 'Empty field'
 TIMEDELTA = 0.05
@@ -17,12 +17,12 @@
     'branch',
 )
 
-def log_repository_commits(client: IRepositoryAPI, repository, csv_name, start, finish, branch):
+
+def log_repository_commits(repository: Repository, csv_name, start, finish, branch):
     branches = []
     match branch:
         case 'all':
-            branches = client.get_branches(repository)
-            for branch in branches:
+            for branch in repository.get_branches():
                 branches.append(branch.name)
         case None:
             branches.append(repository.default_branch)
@@ -31,44 +31,46 @@ def log_repository_commits(client: IRepositoryAPI, repository, csv_name, start,
 
     for branch in branches:
         print(f'Processing branch {branch}')
-        # Используем обёртку для получения коммитов
-        commits = client.get_commits(repository)
-        for commit in commits:
+        # TODO add support of since and until in https://pygithub.readthedocs.io/en/stable/github_objects/Repository.html#github.Repository.Repository.get_commits
+        for commit in repository.get_commits(sha=branch):
             if (
-                commit.date.astimezone(pytz.timezone(TIMEZONE)) < start
-                or commit.date.astimezone(pytz.timezone(TIMEZONE)) > finish
+                commit.commit.author.date.astimezone(pytz.timezone(TIMEZONE)) < start
+                or commit.commit.author.date.astimezone(pytz.timezone(TIMEZONE))
+                > finish
             ):
                 continue
-            commit_data = [
-                repository.name,
-                commit.author.username,
-                commit.author.email or EMPTY_FIELD,
-                commit.date,
-                '; '.join([file for file in commit.files]),
-                commit._id,
-                branch,
-            ]
-            info = dict(zip(FIELDNAMES, commit_data))
+            if commit.commit is not None:
+                nvl = lambda val: val or EMPTY_FIELD
+                commit_data = [
+                    repository.full_name,
+                    commit.commit.author.name,
+                    nvl(commit.author.login if commit.author else None),
+                    nvl(commit.commit.author.email),
+                    commit.commit.author.date,
+                    '; '.join([file.filename for file in commit.files]),
+                    commit.commit.sha,
+                    branch,
+                ]
+                info = dict(zip(FIELDNAMES, commit_data))
 
-            logger.log_to_csv(csv_name, FIELDNAMES, info)
-            logger.log_to_stdout(info)
+                logger.log_to_csv(csv_name, FIELDNAMES, info)
+                logger.log_to_stdout(info)
+
+                sleep(TIMEDELTA)
 
-            sleep(TIMEDELTA)
 
 def log_commits(
-        client: IRepositoryAPI, working_repos, csv_name, start, finish, branch, fork_flag
+    client: Github, working_repos, csv_name, start, finish, branch, fork_flag
 ):
     logger.log_to_csv(csv_name, FIELDNAMES)
 
     for repo in working_repos:
         try:
-            logger.log_title(repo.name)
-            log_repository_commits(client, repo, csv_name, start, finish, branch)
+            logger.log_title(repo.full_name)
+            log_repository_commits(repo, csv_name, start, finish, branch)
             if fork_flag:
-                # TODO
-                forked_repos = client.get_forks(repo)
-                for forked_repo in forked_repos:
-                    logger.log_title("FORKED:", forked_repo.name)
+                for forked_repo in repo.get_forks():
+                    logger.log_title("FORKED:", forked_repo.full_name)
                     log_repository_commits(forked_repo, csv_name, start, finish, branch)
                     sleep(TIMEDELTA)
             sleep(TIMEDELTA)

commits_parser.py

@@ -1,7 +1,7 @@
 from utils import logger
 from time import sleep
 from typing import Generator
-from interface_wrapper import IRepositoryAPI, Repository
+from github import Github, Repository, GithubException
 
 EMPTY_FIELD = 'Empty field'
 TIMEDELTA = 0.05
@@ -21,8 +21,9 @@
     'site_admin',
 )
 
-def log_repository_contributors(client: IRepositoryAPI, repository: Repository, csv_name: str):
-    contributors_stats = get_contributors_stats(client, repository)
+
+def log_repository_contributors(repository: Repository, csv_name: str):
+    contributors_stats = get_contributors_stats(repository)
 
     nvl = lambda val: val or EMPTY_FIELD
 
@@ -50,13 +51,11 @@ def log_repository_contributors(client: IRepositoryAPI, repository: Repository,
 
         sleep(TIMEDELTA)
 
-def get_contributors_stats(client: IRepositoryAPI, repository: Repository) -> dict:
-    contributors_stats = dict()
 
-    # Используем обёртку для получения коммитов
-    commits = client.get_commits(repository)
+def get_contributors_stats(repository: Repository) -> dict:
+    contributors_stats = dict()
 
-    for commit in commits:
+    for commit in repository.get_commits():
         contributor = commit.author
 
         if not contributor.login in contributors_stats:
@@ -72,8 +71,9 @@ def get_contributors_stats(client: IRepositoryAPI, repository: Repository) -> di
 
     return contributors_stats
 
+
 def log_contributors(
-    client: IRepositoryAPI, working_repos: Generator, csv_name: str, fork_flag: bool
+    client: Github, working_repos: Generator, csv_name: str, fork_flag: bool
 ):
     logger.log_to_csv(csv_name, FIELDNAMES)
 
@@ -83,11 +83,11 @@ def log_contributors(
             log_repository_contributors(repo, csv_name)
 
             if fork_flag:
-                for forked_repo in client.get_forks():
-                    logger.log_title("FORKED:", forked_repo.name)
-                    log_repository_contributors(client, forked_repo, csv_name)
+                for forked_repo in repo.get_forks():
+                    logger.log_title("FORKED:", forked_repo.full_name)
+                    log_repository_contributors(forked_repo, csv_name)
                     sleep(TIMEDELTA)
 
-        except e:
+        except GithubException as e:
             print(e)
             exit(1)

contributors_parser.py

@@ -1,38 +1,39 @@
+from github import Github, GithubException, PullRequest
 from time import sleep
-from interface_wrapper import IRepositoryAPI, RepositoryFactory
 
 TIMEDELTA = 0.05
 TIMEZONE = 'Europe/Moscow'
 
+
 def login(token):
+    client = Github(login_or_token=token)
+
     try:
-        client = RepositoryFactory.create_api("github", token)
-    except Exception as err:
-        print(f'Github: Connect: error {err}')
+        client.get_user().login
+    except GithubException as err:
+        print(f'Github: Connect: error {err.data}')
         print('Github: Connect: user could not be authenticated please try again.')
         exit(1)
     else:
         return client
 
-def get_next_repo(client: IRepositoryAPI, repositories):
+
+def get_next_repo(client: Github, 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 = client.get_repository(repo_name)
-            if not repo:
-                raise Exception(f"Repository {repo_name} not found.")
-        except Exception as err:
-            print(f'Github: Connect: error {err}')
+            repo = client.get_repo(repo_name)
+        except GithubException as err:
+            print(f'Github: Connect: error {err.data}')
             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()