f

Author: thehighestmath

commits_parser.py

@@ -1,7 +1,7 @@
 from utils import logger
 import pytz
 from time import sleep
-from interface_wrapper import IRepositoryAPI
+from interface_wrapper import IRepositoryAPI, IClients
 
 EMPTY_FIELD = 'Empty field'
 TIMEDELTA = 0.05
@@ -60,12 +60,13 @@ def log_repository_commits(
 
 
 def log_commits(
-    client: IRepositoryAPI, working_repos, csv_name, start, finish, branch, fork_flag
+    clients: IClients, working_repos, csv_name, start, finish, branch, fork_flag
 ):
     logger.log_to_csv(csv_name, FIELDNAMES)
 
-    for repo, token in working_repos:
+    for repo in working_repos:
         try:
+            client = clients.get_next_client()
             logger.log_title(repo.name)
             log_repository_commits(client, repo, csv_name, start, finish, branch)
             if fork_flag:

contributors_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 interface_wrapper import IRepositoryAPI, Repository, IClients
 
 EMPTY_FIELD = 'Empty field'
 TIMEDELTA = 0.05
@@ -78,12 +78,13 @@ def get_contributors_stats(client: IRepositoryAPI, repository: Repository) -> di
 
 
 def log_contributors(
-    client: IRepositoryAPI, working_repos: Generator, csv_name: str, fork_flag: bool
+    clients: IClients, working_repos: Generator, csv_name: str, fork_flag: bool
 ):
     logger.log_to_csv(csv_name, FIELDNAMES)
 
-    for repo, token in working_repos:
+    for repo in working_repos:
         try:
+            client = clients.get_next_client()
             logger.log_title(repo.full_name)
             log_repository_contributors(repo, csv_name)
 
@@ -93,6 +94,6 @@ def log_contributors(
                     log_repository_contributors(client, forked_repo, csv_name)
                     sleep(TIMEDELTA)
 
-        except e:
+        except Exception as e:
             print(e)
             exit(1)

git_logger.py

@@ -1,18 +1,18 @@
 from time import sleep
-from interface_wrapper import IRepositoryAPI, RepositoryFactory
+from interface_wrapper import IRepositoryAPI, RepositoryFactory, IClients
 
 TIMEDELTA = 0.05
 TIMEZONE = 'Europe/Moscow'
 
 
 def login(token):
-    try:
+    if 1:
         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:
+    # 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
 
 
@@ -23,10 +23,11 @@ def get_tokens_from_file(tokens_path: str) -> list[str]:
     return tokens
 
 
-class GithubClients:
+class GithubClients(IClients):
     def __init__(self, tokens: list[str]):
         self.clients = self._init_clients(tokens)
         self.cur_client = None
+        self.last_client = -1
 
     def _init_clients(self, tokens: list[str]) -> list[dict]:
         clients = [{"client": login(token), "token": token} for token in tokens]
@@ -35,44 +36,30 @@ def _init_clients(self, tokens: list[str]) -> list[dict]:
         return clients
 
     def get_next_client(self):
-        client = None
-        max_remaining_limit = -1
-
-        for client_tmp in self.clients:
-            remaining_limit, limit = client_tmp["client"].rate_limiting
-
-            # можно добавить вывод износа токена
-            # можно дополнительно проверять на 403 и временно пропускать эти токены,
-            # либо завести константу "минимальный коэффициент износа" и не трогать "изношенные" токены
-
-            if remaining_limit > max_remaining_limit:
-                client = client_tmp
-                max_remaining_limit = remaining_limit
-
-            sleep(TIMEDELTA)
-
-        if client is None:
+        if not self.clients:
             raise Exception("No github-clients available")
 
-        self.cur_client = client
-        return client
+        self.last_client = (self.last_client + 1) % len(self.clients)
+        self.cur_client = self.clients[self.last_client]
+        return self.cur_client
+
 
 
-def get_next_repo(client: IRepositoryAPI, repositories):
+def get_next_repo(clients: IClients, 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:
+        if 1:
             cur_client = clients.get_next_client()
             repo = cur_client['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}')
-            print(f'Github: Connect: failed to load repository "{repo_name}"')
-            exit(1)
-        else:
+        # 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
 
 

interface_wrapper.py

@@ -95,6 +95,11 @@ class WikiPage:
     content: str
 
 
+class IClients(ABC):
+    @abstractmethod
+    def get_next_client(self): ...
+
+
 # Интерфейс API
 class IRepositoryAPI(ABC):
 

main.py

@@ -151,7 +151,7 @@ def main():
 
         if args.commits:
             commits_parser.log_commits(
-                working_repos, csv_name, start, finish, args.branch, fork_flag
+                clients, working_repos, csv_name, start, finish, args.branch, fork_flag
             )
         if args.pull_requests:
             pull_requests_parser.log_pull_requests(
@@ -163,13 +163,13 @@ def main():
                 log_pr_comments,
             )
         if args.issues:
-            issues_parser.log_issues(working_repos, csv_name, start, finish, fork_flag)
+            issues_parser.log_issues(clients, working_repos, csv_name, start, finish, fork_flag)
         if args.invites:
-            invites_parser.log_invitations(working_repos, csv_name)
+            invites_parser.log_invitations(clients, working_repos, csv_name)
         if args.wikis:
             wikipars.wikiparser(clients, repositories, path_drepo, csv_name)
         if args.contributors:
-            contributors_parser.log_contributors(working_repos, csv_name, fork_flag)
+            contributors_parser.log_contributors(clients, working_repos, csv_name, fork_flag)
         if args.export_google_sheets:
             export_sheets.write_data_to_table(
                 csv_name, args.google_token, args.table_id, args.sheet_id

wikipars.py

@@ -22,7 +22,7 @@ def log_wiki_to_csv(info, csv_name):
         writer.writerow(info)
 
 
-def wikiparser(client, repositories, path_drepo, csv_name):
+def wikiparser(clients, repositories, path_drepo, csv_name):
     with open(csv_name, 'w', newline='') as file:
         writer = csv.writer(file)
         writer.writerow(WIKI_FIELDNAMES)