Atualiza a geração de imagens e adiciona novos arquivos de configuração. Modificações incluem a correção na extração de dados de commits, PRs e issues, além da inclusão de um novo arquivo principal e um arquivo de configuração do projeto.

AxelPCG · AxelPCG · commit 3fc543b7a935 · 2025-07-04T14:47:53.000-03:00
diff --git a/generate_images.py b/generate_images.py
@@ -41,10 +41,9 @@ async def generate_overview(s: Stats) -> None:
     output = re.sub("{{ contributions }}", f"{await s.total_contributions:,}", output)
     output = re.sub("{{ views }}", f"{await s.views:,}", output)
     output = re.sub("{{ repos }}", f"{len(await s.repos):,}", output)
-    commits = await s.total_commits()
-    print(f"Total commits: {commits}")
-    output = re.sub("{{ commits }}", f"{commits:,}", output)  # Adicionado
-    output = re.sub("{{ prs }}", f"{await s.total_prs():,}", output)  # Adicionado
+    output = re.sub("{{ commits }}", f"{await s.total_commits:,}", output)
+    output = re.sub("{{ prs }}", f"{await s.prs:,}", output)
+    output = re.sub("{{ issues }}", f"{await s.issues:,}", output)
 
     generate_output_folder()
     with open("generated/overview.svg", "w") as f:
@@ -124,7 +123,7 @@ async def main() -> None:
     )
     emails = os.getenv("GIT_EMAILS")
     email_list = (
-        {x.strip() for x in emails.split(",")} if emails else None
+        list({x.strip() for x in emails.split(",")}) if emails else None
     )
     
     async with aiohttp.ClientSession() as session:
@@ -135,8 +134,8 @@ async def main() -> None:
             exclude_repos=excluded_repos,
             exclude_langs=excluded_langs,
             ignore_forked_repos=ignore_forked_repos,
+            emails=email_list,
         )
-        s._emails = email_list  # Add this line
         await asyncio.gather(generate_languages(s), generate_overview(s))
 
 
diff --git a/github_stats.py b/github_stats.py
@@ -51,7 +51,7 @@ async def query(self, generated_query: str) -> Dict:
             result = await r_async.json()
             if result is not None:
                 return result
-        except:
+        except Exception:
             print("aiohttp failed for GraphQL query")
             # Fall back on non-async requests
             async with self.semaphore:
@@ -97,7 +97,7 @@ async def query_rest(self, path: str, params: Optional[Dict] = None) -> Dict:
                 result = await r_async.json()
                 if result is not None:
                     return result
-            except:
+            except Exception:
                 print("aiohttp failed for rest query")
                 # Fall back on non-async requests
                 async with self.semaphore:
@@ -111,11 +111,47 @@ async def query_rest(self, path: str, params: Optional[Dict] = None) -> Dict:
                         await asyncio.sleep(2)
                         continue
                     elif r_requests.status_code == 200:
-                        return r_requests.json()
+                        result_json = r_requests.json()
+                        if result_json is not None:
+                            return result_json
         # print(f"There were too many 202s. Data for {path} will be incomplete.")
         print("There were too many 202s. Data for this repository will be incomplete.")
         return dict()
 
+    @staticmethod
+    def summary_query() -> str:
+        """
+        :return: GraphQL query with summary of user stats
+        """
+        return f"""query {{
+  viewer {{
+    login
+    name
+    repositories(first: 100, ownerAffiliations: OWNER, isFork: false) {{
+      totalCount
+      edges {{
+        node {{
+          stargazers {{
+            totalCount
+          }}
+          forkCount
+        }}
+      }}
+    }}
+    pullRequests(first: 1) {{
+      totalCount
+    }}
+    issues(first: 1) {{
+        totalCount
+    }}
+    contributionsCollection {{
+      totalCommitContributions
+      restrictedContributionsCount
+    }}
+  }}
+}}
+"""
+
     @staticmethod
     def repos_overview(
         contrib_cursor: Optional[str] = None, owned_cursor: Optional[str] = None
@@ -125,8 +161,8 @@ def repos_overview(
         """
         return f"""{{
   viewer {{
-    login,
-    name,
+    login
+    name
     repositories(
         first: 100,
         orderBy: {{
@@ -258,22 +294,26 @@ def __init__(
         exclude_repos: Optional[Set] = None,
         exclude_langs: Optional[Set] = None,
         ignore_forked_repos: bool = False,
+        emails: Optional[List[str]] = None,
     ):
         self.username = username
         self._ignore_forked_repos = ignore_forked_repos
         self._exclude_repos = set() if exclude_repos is None else exclude_repos
         self._exclude_langs = set() if exclude_langs is None else exclude_langs
         self.queries = Queries(username, access_token, session)
+        self._emails = emails
 
         self._name: Optional[str] = None
         self._stargazers: Optional[int] = None
         self._forks: Optional[int] = None
         self._total_contributions: Optional[int] = None
+        self._total_commits: Optional[int] = None
+        self._prs: Optional[int] = None
+        self._issues: Optional[int] = None
         self._languages: Optional[Dict[str, Any]] = None
         self._repos: Optional[Set[str]] = None
         self._lines_changed: Optional[Tuple[int, int]] = None
         self._views: Optional[int] = None
-        self._emails: Optional[Set[str]] = None  # Add this line
 
     async def to_str(self) -> str:
         """
@@ -296,6 +336,36 @@ async def to_str(self) -> str:
 Languages:
   - {formatted_languages}"""
 
+    async def get_summary_stats(self) -> None:
+        """
+        Get lots of summary statistics using one big query. Sets many attributes
+        """
+        raw_results = await self.queries.query(self.queries.summary_query())
+        if raw_results is None:
+            return
+        viewer = raw_results.get("data", {}).get("viewer", {})
+        if not viewer:
+            return
+
+        self._name = viewer.get("name") or viewer.get("login", "No Name")
+        self._stargazers = sum(
+            [
+                repo["node"]["stargazers"]["totalCount"]
+                for repo in viewer["repositories"]["edges"]
+            ]
+        )
+        self._forks = sum(
+            [repo["node"]["forkCount"] for repo in viewer["repositories"]["edges"]]
+        )
+
+        self._prs = viewer.get("pullRequests", {}).get("totalCount", 0)
+        self._issues = viewer.get("issues", {}).get("totalCount", 0)
+        contributions = viewer.get("contributionsCollection", {})
+        self._total_commits = (
+            contributions.get("totalCommitContributions", 0)
+            + contributions.get("restrictedContributionsCount", 0)
+        )
+
     async def get_stats(self) -> None:
         """
         Get lots of summary statistics using one big query. Sets many attributes
@@ -345,8 +415,8 @@ async def get_stats(self) -> None:
                 if name in self._repos or name in self._exclude_repos:
                     continue
                 self._repos.add(name)
-                self._stargazers += repo.get("stargazers").get("totalCount", 0)
-                self._forks += repo.get("forkCount", 0)
+                # self._stargazers += repo.get("stargazers").get("totalCount", 0)
+                # self._forks += repo.get("forkCount", 0)
 
                 for lang in repo.get("languages", {}).get("edges", []):
                     name = lang.get("node", {}).get("name", "Other")
@@ -375,11 +445,9 @@ async def get_stats(self) -> None:
             else:
                 break
 
-        # TODO: Improve languages to scale by number of contributions to
-        #       specific filetypes
         langs_total = sum([v.get("size", 0) for v in self._languages.values()])
         for k, v in self._languages.items():
-            v["prop"] = 100 * (v.get("size", 0) / langs_total)
+            v["prop"] = 100 * (v.get("size", 0) / langs_total) if langs_total > 0 else 0
 
     @property
     async def name(self) -> str:
@@ -388,7 +456,7 @@ async def name(self) -> str:
         """
         if self._name is not None:
             return self._name
-        await self.get_stats()
+        await self.get_summary_stats()
         assert self._name is not None
         return self._name
 
@@ -399,7 +467,7 @@ async def stargazers(self) -> int:
         """
         if self._stargazers is not None:
             return self._stargazers
-        await self.get_stats()
+        await self.get_summary_stats()
         assert self._stargazers is not None
         return self._stargazers
 
@@ -410,7 +478,7 @@ async def forks(self) -> int:
         """
         if self._forks is not None:
             return self._forks
-        await self.get_stats()
+        await self.get_summary_stats()
         assert self._forks is not None
         return self._forks
 
@@ -493,7 +561,7 @@ async def lines_changed(self) -> Tuple[int, int]:
                 ):
                     continue
                 author = author_obj.get("author", {}).get("login", "")
-                if author != self.username:
+                if author.lower() != self.username.lower():
                     continue
 
                 for week in author_obj.get("weeks", []):
@@ -520,62 +588,39 @@ async def views(self) -> int:
 
         self._views = total
         return total
-        
+
+    @property
     async def total_commits(self) -> int:
         """
         Get the total number of commits made by the user.
         """
+        if self._total_commits is not None:
+            return self._total_commits
+        await self.get_summary_stats()
+        assert self._total_commits is not None
+        return self._total_commits
 
-        total_commits = 0
-        for email in self._emails:
-            query = """
-            query {
-              user(login: "%s") {
-                contributionsCollection {
-                  totalCommitContributions
-                }
-              }
-            }
-            """ % self.username
-            print(f"Running query for email: {email}")
-            response = await self.queries.query(query)
-            print(f"Response for email {email}: {response}")
-            if 'data' in response and 'user' in response['data']:
-                total_commits += response['data']['user']['contributionsCollection']['totalCommitContributions']
-            else:
-                print(f"Error: 'data' or 'user' not found in response for email {email}")
-                print(response)
-        print(f"Total commits: {total_commits}")
-        return total_commits
-
-        query = """
-        query {
-          user(login: "%s") {
-            contributionsCollection {
-              totalCommitContributions
-            }
-          }
-        }
-        """ % self.username
-        response = await self.queries.query(query)
-        return response["data"]["user"]["contributionsCollection"]["totalCommitContributions"]
-
-
-    async def total_prs(self) -> int:
+    @property
+    async def prs(self) -> int:
         """
         Get the total number of pull requests made by the user.
         """
-        query = """
-        query {
-          user(login: "%s") {
-            pullRequests {
-              totalCount
-            }
-          }
-        }
-        """ % self.username
-        response = await self.queries.query(query)
-        return response["data"]["user"]["pullRequests"]["totalCount"]
+        if self._prs is not None:
+            return self._prs
+        await self.get_summary_stats()
+        assert self._prs is not None
+        return self._prs
+
+    @property
+    async def issues(self) -> int:
+        """
+        Get the total number of issues opened by the user.
+        """
+        if self._issues is not None:
+            return self._issues
+        await self.get_summary_stats()
+        assert self._issues is not None
+        return self._issues
 
 ###############################################################################
 # Main Function
diff --git a/main.py b/main.py
@@ -0,0 +1,6 @@
+def main():
+    print("Hello from stats!")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,10 @@
+[project]
+name = "stats"
+version = "0.1.0"
+description = "Add your description here"
+readme = "README.md"
+requires-python = ">=3.11"
+dependencies = [
+    "aiohttp>=3.12.13",
+    "requests>=2.32.4",
+]
diff --git a/uv.lock b/uv.lock
