From 6e502d247d15714967431fc983b1113274cfe919 Mon Sep 17 00:00:00 2001 From: pseusys Date: Sun, 26 Feb 2023 18:38:51 +0100 Subject: [PATCH 1/8] graph redrawn --- sources/graphics_chart_drawer.py | 19 +++++++++++-------- sources/main.py | 2 +- sources/yearly_commit_calculator.py | 9 +++++---- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/sources/graphics_chart_drawer.py b/sources/graphics_chart_drawer.py index 786091e..c8b0112 100644 --- a/sources/graphics_chart_drawer.py +++ b/sources/graphics_chart_drawer.py @@ -1,6 +1,6 @@ from typing import Dict -from numpy import arange, array, add, amax +from numpy import arange, array, add, amax, zeros import matplotlib.patches as mpatches import matplotlib.pyplot as plt @@ -9,6 +9,7 @@ from manager_download import DownloadManager as DM MAX_LANGUAGES = 5 # Number of top languages to add to chart, for each year quarter GRAPH_PATH = "assets/bar_graph.png" # Chart saving path. +GRAPH_Y_ZOOM = 1.3 async def create_loc_graph(yearly_data: Dict, save_path: str): @@ -27,26 +28,28 @@ async def create_loc_graph(yearly_data: Dict, save_path: str): languages_all_loc = dict() for i, y in enumerate(sorted(yearly_data.keys())): for q in yearly_data[y].keys(): - langs = sorted(yearly_data[y][q].keys(), key=lambda n: yearly_data[y][q][n], reverse=True)[0:MAX_LANGUAGES] + langs = sorted(yearly_data[y][q].keys(), key=lambda n: yearly_data[y][q][n]["add"] + yearly_data[y][q][n]["del"], reverse=True)[0:MAX_LANGUAGES] for lang in langs: if lang not in languages_all_loc: - languages_all_loc[lang] = array([[0] * years] * 4) - languages_all_loc[lang][q - 1][i] = yearly_data[y][q][lang] + languages_all_loc[lang] = zeros((years, 4, 2), dtype=int) + languages_all_loc[lang][i][q - 1] = array([yearly_data[y][q][lang]["add"], yearly_data[y][q][lang]["del"]]) fig = plt.figure() ax = fig.add_axes([0, 0, 1.5, 1]) language_handles = [] - cumulative = array([[0] * years] * 4) + cumulative = zeros((years, 4, 2), dtype=int) for key, value in languages_all_loc.items(): color = colors[key]["color"] if colors[key]["color"] is not None else "w" language_handles += [mpatches.Patch(color=color, label=key)] for quarter in range(4): - ax.bar(year_indexes + quarter * 0.21, value[quarter], 0.2, bottom=cumulative[quarter], color=color) - cumulative[quarter] = add(cumulative[quarter], value[quarter]) + ax.bar(year_indexes + quarter * 0.21, value[:, quarter][:, 0], 0.2, bottom=cumulative[:, quarter][:, 0], color=color) + ax.bar(year_indexes + quarter * 0.21, -value[:, quarter][:, 1], 0.2, bottom=-cumulative[:, quarter][:, 1], color=color) + cumulative[:, quarter] = add(cumulative[:, quarter], value[:, quarter]) + ax.axhline(y=0.5, lw=0.5, snap=True, color="k") ax.set_ylabel("LOC added", fontdict=dict(weight="bold")) ax.set_xticks(array([arange(i, i + 0.84, step=0.21) for i in year_indexes]).flatten(), labels=["Q1", "Q2", "Q3", "Q4"] * years) @@ -62,6 +65,6 @@ async def create_loc_graph(yearly_data: Dict, save_path: str): ax.spines["top"].set_visible(False) ax.spines["right"].set_visible(False) - plt.ylim(0, 1.05 * amax(cumulative)) + plt.ylim(top=GRAPH_Y_ZOOM * amax(cumulative[:, 0]), bottom=-GRAPH_Y_ZOOM * amax(cumulative[:, 1])) plt.savefig(save_path, bbox_inches="tight") plt.close(fig) diff --git a/sources/main.py b/sources/main.py index 9b474d8..030725c 100644 --- a/sources/main.py +++ b/sources/main.py @@ -148,7 +148,7 @@ async def get_stats() -> str: if EM.SHOW_LINES_OF_CODE: DBM.i("Adding lines of code info...") - total_loc = sum([yearly_data[y][q][d] for y in yearly_data.keys() for q in yearly_data[y].keys() for d in yearly_data[y][q].keys()]) + total_loc = sum([yearly_data[y][q][d]["add"] for y in yearly_data.keys() for q in yearly_data[y].keys() for d in yearly_data[y][q].keys()]) data = f"{intword(total_loc)} {LM.t('Lines of code')}" stats += f"![Lines of code](https://img.shields.io/badge/{quote(LM.t('From Hello World I have written'))}-{quote(data)}-blue)\n\n" diff --git a/sources/yearly_commit_calculator.py b/sources/yearly_commit_calculator.py index 49bce72..5b6bb80 100644 --- a/sources/yearly_commit_calculator.py +++ b/sources/yearly_commit_calculator.py @@ -11,7 +11,7 @@ from manager_debug import DebugManager as DBM async def calculate_yearly_commit_data(repositories: Dict) -> Dict: """ Calculate commit data by years. - Commit data includes difference between contribution additions and deletions in each quarter of each recorded year. + Commit data includes contribution additions and deletions in each quarter of each recorded year. :param repositories: user repositories info dictionary. :returns: Commit quarter yearly data dictionary. @@ -21,7 +21,7 @@ async def calculate_yearly_commit_data(repositories: Dict) -> Dict: total = len(repositories["data"]["user"]["repositories"]["nodes"]) for ind, repo in enumerate(repositories["data"]["user"]["repositories"]["nodes"]): if repo["name"] not in EM.IGNORED_REPOS: - repo_name = "private" if repo["isPrivate"] else f"{repo['owner']['login']}/{repo['name']}" + repo_name = "[private]" if repo["isPrivate"] else f"{repo['owner']['login']}/{repo['name']}" DBM.i(f"\t{ind + 1}/{total} Retrieving repo: {repo_name}") await update_yearly_data_with_commit_stats(repo, yearly_data) DBM.g("Yearly commit data calculated!") @@ -55,5 +55,6 @@ async def update_yearly_data_with_commit_stats(repo_details: Dict, yearly_data: if quarter not in yearly_data[curr_year]: yearly_data[curr_year][quarter] = dict() if repo_details["primaryLanguage"]["name"] not in yearly_data[curr_year][quarter]: - yearly_data[curr_year][quarter][repo_details["primaryLanguage"]["name"]] = 0 - yearly_data[curr_year][quarter][repo_details["primaryLanguage"]["name"]] += commit["additions"] - commit["deletions"] + yearly_data[curr_year][quarter][repo_details["primaryLanguage"]["name"]] = {"add": 0, "del": 0} + yearly_data[curr_year][quarter][repo_details["primaryLanguage"]["name"]]["add"] += commit["additions"] + yearly_data[curr_year][quarter][repo_details["primaryLanguage"]["name"]]["del"] += commit["deletions"] From 812d0477c5713923ae82ac13307c7b7e21f7566d Mon Sep 17 00:00:00 2001 From: pseusys Date: Sun, 26 Feb 2023 18:48:37 +0100 Subject: [PATCH 2/8] y_lim adjusted --- sources/graphics_chart_drawer.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sources/graphics_chart_drawer.py b/sources/graphics_chart_drawer.py index c8b0112..d408ae7 100644 --- a/sources/graphics_chart_drawer.py +++ b/sources/graphics_chart_drawer.py @@ -9,7 +9,6 @@ from manager_download import DownloadManager as DM MAX_LANGUAGES = 5 # Number of top languages to add to chart, for each year quarter GRAPH_PATH = "assets/bar_graph.png" # Chart saving path. -GRAPH_Y_ZOOM = 1.3 async def create_loc_graph(yearly_data: Dict, save_path: str): @@ -65,6 +64,6 @@ async def create_loc_graph(yearly_data: Dict, save_path: str): ax.spines["top"].set_visible(False) ax.spines["right"].set_visible(False) - plt.ylim(top=GRAPH_Y_ZOOM * amax(cumulative[:, 0]), bottom=-GRAPH_Y_ZOOM * amax(cumulative[:, 1])) + plt.ylim(top=1.1 * amax(cumulative[:, 0]), bottom=-1.5 * amax(cumulative[:, 1])) plt.savefig(save_path, bbox_inches="tight") plt.close(fig) From 9b17f20ed221653a933c9ed9914a91b7a3dbb0ae Mon Sep 17 00:00:00 2001 From: pseusys Date: Mon, 27 Feb 2023 22:20:12 +0100 Subject: [PATCH 3/8] file manager renamed --- sources/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/main.py b/sources/main.py index a0bfe78..7bab6ab 100644 --- a/sources/main.py +++ b/sources/main.py @@ -149,8 +149,8 @@ async def get_stats() -> str: if EM.SHOW_LINES_OF_CODE: DBM.i("Adding lines of code info...") total_loc = sum([yearly_data[y][q][d]["add"] for y in yearly_data.keys() for q in yearly_data[y].keys() for d in yearly_data[y][q].keys()]) - data = f"{intword(total_loc)} {LM.t('Lines of code')}" - stats += f"![Lines of code](https://img.shields.io/badge/{quote(LM.t('From Hello World I have written'))}-{quote(data)}-blue)\n\n" + data = f"{intword(total_loc)} {FM.t('Lines of code')}" + stats += f"![Lines of code](https://img.shields.io/badge/{quote(FM.t('From Hello World I have written'))}-{quote(data)}-blue)\n\n" if EM.SHOW_SHORT_INFO: stats += await get_short_github_info() From e563addad94bd64be46f50dafa024bad27bf28c6 Mon Sep 17 00:00:00 2001 From: pseusys Date: Tue, 28 Feb 2023 00:28:51 +0100 Subject: [PATCH 4/8] graph height fixed, local yearly data caching added --- sources/graphics_chart_drawer.py | 4 +++- sources/main.py | 4 ++-- sources/manager_file.py | 33 +++++++++++++++++++++++++---- sources/manager_github.py | 6 ++++-- sources/yearly_commit_calculator.py | 11 +++++++++- 5 files changed, 48 insertions(+), 10 deletions(-) diff --git a/sources/graphics_chart_drawer.py b/sources/graphics_chart_drawer.py index d408ae7..a8d9562 100644 --- a/sources/graphics_chart_drawer.py +++ b/sources/graphics_chart_drawer.py @@ -64,6 +64,8 @@ async def create_loc_graph(yearly_data: Dict, save_path: str): ax.spines["top"].set_visible(False) ax.spines["right"].set_visible(False) - plt.ylim(top=1.1 * amax(cumulative[:, 0]), bottom=-1.5 * amax(cumulative[:, 1])) + joined = cumulative.reshape(-1, cumulative.shape[-1]) + plt.ylim(top=1.05 * amax(joined[:, 0]), bottom=-1.05 * amax(joined[:, 1])) + plt.savefig(save_path, bbox_inches="tight") plt.close(fig) diff --git a/sources/main.py b/sources/main.py index 7bab6ab..ff571ee 100644 --- a/sources/main.py +++ b/sources/main.py @@ -188,8 +188,8 @@ async def main(): if GHM.update_readme(stats): DBM.g("Readme updated!") else: - GHM.set_github_output(stats) - DBM.g("Debug run, readme not updated. Check the latest comment for the generated stats.") + if GHM.set_github_output(stats): + DBM.g("Debug run, readme not updated. Check the latest comment for the generated stats.") await DM.close_remote_resources() diff --git a/sources/manager_file.py b/sources/manager_file.py index 741b681..4ffe203 100644 --- a/sources/manager_file.py +++ b/sources/manager_file.py @@ -1,6 +1,7 @@ -from json import load -from os.path import join -from typing import Dict +from os.path import join, isfile +from pickle import load as load_pickle, dump as dump_pickle +from json import load as load_json +from typing import Dict, Optional from manager_environment import EnvironmentManager as EM @@ -29,7 +30,7 @@ class FileManager: :param file: Localization file path, related to current file (in sources root). """ with open(join("sources", file), encoding="utf-8") as config_file: - data = load(config_file) + data = load_json(config_file) FileManager._LOCALIZATION = data[EM.LOCALE] @staticmethod @@ -55,3 +56,27 @@ class FileManager: name = join("assets", name) if assets else name with open(name, "a" if append else "w", encoding="utf-8") as file: file.write(content) + + @staticmethod + def cache_binary(name: str, content: Optional[Dict] = None, assets: bool = False) -> Optional[Dict]: + """ + Save binary output file if provided or read if content is None. + + :param name: File name. + :param content: File content (utf-8 string) or None. + :param assets: True for saving to 'assets' directory, false otherwise. + :returns: File cache contents if content is None, None otherwise. + """ + name = join("assets", name) if assets else name + if content is None and not isfile(name): + return None + + with open(name, "rb" if content is None else "wb") as file: + if content is None: + try: + return load_pickle(file) + except Exception: + return None + else: + dump_pickle(content, file) + return None diff --git a/sources/manager_github.py b/sources/manager_github.py index 8bff82a..ba68cd3 100644 --- a/sources/manager_github.py +++ b/sources/manager_github.py @@ -106,7 +106,7 @@ class GitHubManager: return False @staticmethod - def set_github_output(stats: str): + def set_github_output(stats: str) -> bool: """ Outputs readme data as current action output instead of committing it. @@ -114,13 +114,15 @@ class GitHubManager: """ DBM.i("Setting README contents as action output...") if "GITHUB_OUTPUT" not in environ.keys(): - raise Exception("Not in GitHub environment ('GITHUB_OUTPUT' not defined)!") + DBM.p("Not in GitHub environment, not setting action output!") + return False prefix = "README stats current output:" eol = "".join(choice(ascii_letters) for _ in range(10)) FM.write_file(environ["GITHUB_OUTPUT"], f"README_CONTENT<<{eol}\n{prefix}\n\n{stats}\n{eol}\n", append=True) DBM.g("Action output set!") + return True @staticmethod def update_chart(chart_path: str) -> str: diff --git a/sources/yearly_commit_calculator.py b/sources/yearly_commit_calculator.py index 9fd528c..fb714da 100644 --- a/sources/yearly_commit_calculator.py +++ b/sources/yearly_commit_calculator.py @@ -19,9 +19,16 @@ async def calculate_yearly_commit_data(repositories: Dict) -> Dict: :returns: Commit quarter yearly data dictionary. """ DBM.i("Calculating yearly commit data...") + if EM.DEBUG_RUN: + content = FM.cache_binary("yearly_data.pick", assets=True) + if content is not None: + DBM.g("Yearly data restored from cache!") + return content + else: + DBM.w("No cached yearly data found, recalculating...") + yearly_data = dict() total = len(repositories["data"]["user"]["repositories"]["nodes"]) - for ind, repo in enumerate(repositories["data"]["user"]["repositories"]["nodes"]): if repo["name"] not in EM.IGNORED_REPOS: repo_name = "[private]" if repo["isPrivate"] else f"{repo['owner']['login']}/{repo['name']}" @@ -30,7 +37,9 @@ async def calculate_yearly_commit_data(repositories: Dict) -> Dict: DBM.g("Yearly commit data calculated!") if EM.DEBUG_RUN: + FM.cache_binary("yearly_data.pick", yearly_data, assets=True) FM.write_file("yearly_data.json", dumps(yearly_data), assets=True) + DBM.g("Yearly data saved to cache!") return yearly_data From d43cbe81b233d4fb3f52aaef46bc3371f35b4cb3 Mon Sep 17 00:00:00 2001 From: pseusys Date: Tue, 28 Feb 2023 00:41:52 +0100 Subject: [PATCH 5/8] equal offsets on top and on bottom --- sources/graphics_chart_drawer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/graphics_chart_drawer.py b/sources/graphics_chart_drawer.py index a8d9562..f49a9da 100644 --- a/sources/graphics_chart_drawer.py +++ b/sources/graphics_chart_drawer.py @@ -64,8 +64,8 @@ async def create_loc_graph(yearly_data: Dict, save_path: str): ax.spines["top"].set_visible(False) ax.spines["right"].set_visible(False) - joined = cumulative.reshape(-1, cumulative.shape[-1]) - plt.ylim(top=1.05 * amax(joined[:, 0]), bottom=-1.05 * amax(joined[:, 1])) + max_value = amax(cumulative.flatten()) + plt.ylim(top=1.05 * max_value, bottom=-1.05 * max_value) plt.savefig(save_path, bbox_inches="tight") plt.close(fig) From 2d576ee38025acff1485c6226d84b1d158b0827a Mon Sep 17 00:00:00 2001 From: pseusys Date: Tue, 28 Feb 2023 00:42:26 +0100 Subject: [PATCH 6/8] multiplication exported --- sources/graphics_chart_drawer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/graphics_chart_drawer.py b/sources/graphics_chart_drawer.py index f49a9da..d287408 100644 --- a/sources/graphics_chart_drawer.py +++ b/sources/graphics_chart_drawer.py @@ -64,8 +64,8 @@ async def create_loc_graph(yearly_data: Dict, save_path: str): ax.spines["top"].set_visible(False) ax.spines["right"].set_visible(False) - max_value = amax(cumulative.flatten()) - plt.ylim(top=1.05 * max_value, bottom=-1.05 * max_value) + max_offset = 1.05 * amax(cumulative.flatten()) + plt.ylim(top=max_offset, bottom=-max_offset) plt.savefig(save_path, bbox_inches="tight") plt.close(fig) From 991e714082af0dea691af28e126770e3460dc2b5 Mon Sep 17 00:00:00 2001 From: pseusys Date: Tue, 28 Feb 2023 01:05:09 +0100 Subject: [PATCH 7/8] height offset, equalized --- sources/graphics_chart_drawer.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sources/graphics_chart_drawer.py b/sources/graphics_chart_drawer.py index d287408..70806d3 100644 --- a/sources/graphics_chart_drawer.py +++ b/sources/graphics_chart_drawer.py @@ -64,8 +64,11 @@ async def create_loc_graph(yearly_data: Dict, save_path: str): ax.spines["top"].set_visible(False) ax.spines["right"].set_visible(False) - max_offset = 1.05 * amax(cumulative.flatten()) - plt.ylim(top=max_offset, bottom=-max_offset) + max_offset = 0.05 * amax(cumulative.flatten()) + joined = cumulative.reshape(-1, cumulative.shape[-1]) + max_additions = amax(joined[:, 0]) + max_deletions = amax(joined[:, 1]) + plt.ylim(top=max_additions + max_offset, bottom=-max_deletions - max_offset) plt.savefig(save_path, bbox_inches="tight") plt.close(fig) From c4880d8c4fd5c461edd615166f11c6c4da88b625 Mon Sep 17 00:00:00 2001 From: pseusys Date: Tue, 28 Feb 2023 23:04:22 +0100 Subject: [PATCH 8/8] merge error fixed --- sources/manager_file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/manager_file.py b/sources/manager_file.py index 5469eb9..28041b6 100644 --- a/sources/manager_file.py +++ b/sources/manager_file.py @@ -30,7 +30,7 @@ class FileManager: :param file: Localization file path, related to current file (in sources root). """ with open(join(dirname(__file__), file), encoding="utf-8") as config_file: - data = load(config_file) + data = load_json(config_file) FileManager._LOCALIZATION = data[EM.LOCALE] @staticmethod