fixes to fully migrate to repository API wrapper

Author: cyberc001

ForgejoRepoAPI.py

@@ -13,7 +13,9 @@
     Invite
 )
 import base64
+import sys
 from pyforgejo import PyforgejoApi
+import isodate
 
 
 class ForgejoRepoAPI(IRepositoryAPI):
@@ -62,7 +64,7 @@ def get_collaborator_permission(self, repo: Repository, user: User) -> str:
             return permission.permission
 
         except Exception as e:
-            if "403" in str(e):
+            if ("401" in str(e)) or ("403" in str(e)):
                 logging.error(
                     f"Permission error: Only admins or repo admins can view permissions for others in {repo.name}.")
                 return f"Permission error: Only admins or repo admins can view permissions for others in {repo.name}."
@@ -77,7 +79,7 @@ def get_commits(self, repo: Repository, files: bool = True) -> list[Commit]:
                     _id=c.sha,
                     message=c.commit.message,
                     author=self.get_user_data(c.author),
-                    date=c.commit.author.date,
+                    date=isodate.parse_datetime(c.commit.author.date),
                     files=[f.filename for f in getattr(c, "files", [])] if files else None
                 )
                 for c in commits
@@ -122,7 +124,6 @@ def get_issues(self, repo: Repository) -> list[Issue]:
     def get_pull_requests(self, repo: Repository) -> list[PullRequest]:
         try:
             pulls = self.client.repository.repo_list_pull_requests(repo.owner.login, repo.name)
-
             return [
                 PullRequest(
                     _id=p.number,
@@ -135,8 +136,8 @@ def get_pull_requests(self, repo: Repository) -> list[PullRequest]:
                     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.files],
-                    issue_url=p.issue_url,
+                    files=[], #TODO если возможно
+                    issue_url=None, #TODO если возможно
                     labels=[label.name for label in p.labels] if p.labels else [],
                     milestone=p.milestone.title if p.milestone else None,
                 )
@@ -258,6 +259,9 @@ def get_comments(self, repo, obj) -> list[Comment]:
     def get_invites(self, repo: Repository) -> list[Invite]:
         return []
 
+    def get_rate_limiting(self) -> tuple[int, int]:
+        return sys.maxsize, sys.maxsize
+
 
 # Точка входа для тестирования
 if __name__ == "__main__":

GitHubRepoAPI.py

@@ -40,12 +40,7 @@ def get_repository(self, id: str) -> Repository | None:
                 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,
-                    html_url=repo.owner.html_url,
-                ),
+                owner=self.get_user_data(repo.owner),
             )
         except Exception as e:
             logging.error(f"Failed to get repository {id} from GitHub: {e}")
@@ -232,6 +227,9 @@ def get_invites(self, repo: Repository) -> list[Invite]:
             )
             return []
 
+    def get_rate_limiting(self) -> tuple[int, int]:
+        return self.client.rate_limiting
+
 
 # Точка входа для тестирования
 if __name__ == "__main__":

git_logger.py

@@ -1,26 +1,18 @@
-from github import Github, GithubException, PullRequest
 from interface_wrapper import (
     RepositoryFactory,
     Repository,
     Branch,
+    IRepositoryAPI
 )
 from time import sleep
 
 TIMEDELTA = 0.05
 TIMEZONE = 'Europe/Moscow'
 
 
-def login(token):
-    client = Github(login_or_token=token)
-
-    try:
-        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 login(source, token, base_url):
+    client = RepositoryFactory.create_api(source, token, base_url)
+    return client
 
 
 def get_tokens_from_file(tokens_path: str) -> list[str]:
@@ -30,24 +22,22 @@ def get_tokens_from_file(tokens_path: str) -> list[str]:
     return tokens
 
 
-class GithubClients:
-    def __init__(self, tokens: list[str]):
-        self.clients = self._init_clients(tokens)
+class GitClients:
+    def __init__(self, source: str, tokens: list[str], base_url: str | None = None):
+        self.clients = self._init_clients(source, tokens, base_url)
         self.cur_client = None
 
-    def _init_clients(self, tokens: list[str]) -> list[dict]:
-        clients = [{"client": login(token), "token": token} for token in tokens]
-        for c in clients:
-            c["api"] = RepositoryFactory.create_api("github", c["client"])
+    def _init_clients(self, source: str, tokens: list[str], base_url: str | None) -> list[dict]:
+        clients = [{"client": login(source, token, base_url), "token": token} for token in tokens]
 
         return clients
 
-    def get_next_client(self) -> Github:
+    def get_next_client(self) -> IRepositoryAPI:
         client = None
         max_remaining_limit = -1
 
         for client_tmp in self.clients:
-            remaining_limit, limit = client_tmp["client"].rate_limiting
+            remaining_limit, limit = client_tmp["client"].get_rate_limiting()
 
             # можно добавить вывод износа токена
             # можно дополнительно проверять на 403 и временно пропускать эти токены,
@@ -60,41 +50,36 @@ def get_next_client(self) -> Github:
             sleep(TIMEDELTA)
 
         if client is None:
-            raise Exception("No github-clients available")
+            raise Exception("No git clients available")
 
         self.cur_client = client
         return client
 
 
-def get_next_repo(clients: GithubClients, repositories):
+def get_next_repo(clients: GitClients, 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:
             cur_client = clients.get_next_client()
-            repo = cur_client['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}"')
+            repo = cur_client['client'].get_repository(repo_name)
+        except Exception as err:
+            print(f'get_next_repo(): error {err}')
+            print(f'get_next_repo(): failed to load repository "{repo_name}"')
             exit(1)
         else:
             print(cur_client['token'])
-            yield Repository(
-                _id=repo.full_name,
-                name=repo.name,
-                url=repo.html_url,
-                default_branch=Branch(name=repo.default_branch, last_commit=None),
-                owner=cur_client['api'].get_user_data(repo.owner),
-            ), cur_client['token']
+            yield repo, cur_client['token']
 
 
-def get_assignee_story(github_object):
+def get_assignee_story(git_object):
     # TODO
     return ""
+
     assignee_result = ""
     events = (
-        github_object.get_issue_events()
+        git_object.get_issue_events()
         if type(github_object) is PullRequest.PullRequest
         else github_object.get_events()
     )

interface_wrapper.py

@@ -3,6 +3,9 @@
 from dataclasses import dataclass
 import logging
 
+from github import Github
+from pyforgejo import PyforgejoApi
+
 # Настройка логирования
 logging.basicConfig(
     level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s"
@@ -164,20 +167,24 @@ def get_comments(self, obj) -> list[Comment]:
     def get_invites(self, repo: Repository) -> list[Invite]:
         pass
 
+    @abstractmethod
+    def get_rate_limiting(self) -> tuple[int, int]:
+        pass
+
 
 # Фабрика для создания API
 class RepositoryFactory:
     @staticmethod
-    def create_api(source: str, client) -> IRepositoryAPI:
+    def create_api(source: str, token: str, base_url: str | None = None) -> IRepositoryAPI:
         from GitHubRepoAPI import GitHubRepoAPI
         from ForgejoRepoAPI import ForgejoRepoAPI
 
-        if client is None:
-            raise ValueError("Client cannot be None")
         if source == 'github':
-            return GitHubRepoAPI(client)
+            return GitHubRepoAPI(Github(token))
         elif source == 'forgejo':
-            return ForgejoRepoAPI(client)
+            if not isinstance(base_url, str):
+                raise ValueError(f"base_url for PyforgejoApi should be str, got {type(base_url)}")
+            return ForgejoRepoAPI(PyforgejoApi(api_key=token, base_url=base_url))
         else:
             raise ValueError(f"Unsupported source: {source}")
 

main.py

@@ -1,6 +1,8 @@
 import argparse
 from datetime import datetime
 import pytz
+import traceback
+
 
 import git_logger
 import export_sheets
@@ -34,7 +36,7 @@ def parse_args():
     )
 
     token = parser.add_mutually_exclusive_group(required=True)
-    token.add_argument('-t', '--token', type=str, help='token github account')
+    token.add_argument('-t', '--token', type=str, help='account access token')
     token.add_argument('--tokens', type=str, help='path to your tokens')
 
     parser.add_argument(
@@ -150,11 +152,12 @@ def main():
     log_pr_comments = args.pr_comments
 
     try:
-        clients = git_logger.GithubClients(tokens)
+        clients = git_logger.GitClients("github", tokens)
     except Exception as e:
         print(e)
+        print(traceback.print_exc())
     else:
-        client = RepositoryFactory.create_api("github", git_logger.login(tokens[0]))
+        client = RepositoryFactory.create_api("github", tokens[0])
         working_repos = git_logger.get_next_repo(clients, repositories)
         start = parse_time(args.start.split('-'))
         finish = parse_time(args.finish.split('-'))

requirements.txt

@@ -4,4 +4,5 @@ pygsheets==2.0.6
 pandas==2.2.3
 pytz==2024.2
 requests==2.32.3
-pyforgejo==2.0.0
+pyforgejo==2.0.0
+isodate==0.7.2