github-heatmap 1.4.0__tar.gz → 2.2.0__tar.gz

{github_heatmap-1.4.0 → github_heatmap-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: github_heatmap
-Version: 1.4.0
+Version: 2.2.0
 Summary: Make everything a GitHub svg poster and Skyline!
 Home-page: https://github.com/malinkang/GitHubPoster
 Author: malinkang
@@ -31,3 +31,11 @@ Requires-Dist: stravalib; extra == "all"
 Requires-Dist: PyGithub; extra == "all"
 Requires-Dist: sdf_fork; extra == "all"
 Requires-Dist: pandas; extra == "all"
+Dynamic: author
+Dynamic: author-email
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary

{github_heatmap-1.4.0 → github_heatmap-2.2.0}/README.md

@@ -435,18 +435,18 @@ github_heatmap nike --nike_refresh_token="your nike_refresh_token" --year 2012-2
 2. 点击「New integration」添加基础信息后，创建新的 Token
 3. 提交后可以看到 `Secrets` 下的 `Internal Integration Token`
 
-获取用于生成 Poster 的 Notion 数据库 ID(database_id)，查看[官方文档](https://developers.notion.com/docs/working-with-databases#adding-pages-to-a-database)获取更多信息。
+获取用于生成 Poster 的 Notion 数据源 ID(`data_source_id`)，查看[官方文档](https://developers.notion.com/reference/query-a-data-source)获取更多信息。
 
-1. 以全屏页面打开数据库
-2. 复制页面链接，链接组成应该是 `https://www.notion.so/{workspace_name}/{database_id}?v={view_id}` 这样的
-3. 其中 `{database_id}` 部分即为数据库 ID
+1. 在 Notion 中打开对应的数据源页面
+2. 复制页面链接，链接一般类似 `https://www.notion.so/{workspace_name}/{data_source_id}?v={view_id}`
+3. 其中 `{data_source_id}` 部分即为数据源 ID
 
-注：数据库需要添加一个属性类型为 `Date` 的日期属性，该属性的值将作为生成 Poster 的日期数据使用。在生成时需将该日期属性的名称作为选项 `prop_name` 的值，默认值为 `Datetime`
+注：数据源需要至少包含一个类型为 `Date` 的属性作为日期字段，以及一个数值/公式/rollup 属性作为热力图统计值。生成时通过 `--date_prop_name` 和 `--value_prop_name` 指定字段名。
 
 ```
-python3 -m github_heatmap notion --notion_token="your notion_token" --database_id="your database_id" --prop_name="your prop_name"
+python3 -m github_heatmap notion --notion_token="your notion_token" --data_source_id="your data_source_id" --date_prop_name="your date_prop_name" --value_prop_name="your value_prop_name"
 or
-github_heatmap notion --notion_token="your notion_token" --database_id="your database_id" --prop_name="your prop_name"
+github_heatmap notion --notion_token="your notion_token" --data_source_id="your data_source_id" --date_prop_name="your date_prop_name" --value_prop_name="your value_prop_name"
 ```
 
 </details>
@@ -738,4 +738,4 @@ python3 -m github_heatmap neodb --neodb_token <token> --mark_type <complete, wis
 
 谢谢就够了
 
-Just enjoy it
+Just enjoy it

{github_heatmap-1.4.0 → github_heatmap-2.2.0}/github_heatmap/cli.py

@@ -7,21 +7,22 @@ import os
 import sys
 
 from github_heatmap.circluar_drawer import CircularDrawer
-from github_heatmap.config import TYPE_INFO_DICT
-from github_heatmap.drawer import Drawer
-from github_heatmap.err import DepNotInstalledError
-from github_heatmap.loader import LOADER_DICT
-from github_heatmap.poster import Poster
-from github_heatmap.utils import parse_years, reduce_year_list
 from github_heatmap.config import (
-    HEAD_FONT_SIZE,
-    YEAR_FONT_SIZE,
-    MONTH_FONT_SIZE,
     DOM_BOX_PADING,
     DOM_BOX_TUPLE,
+    GITHUB_LEVEL_COLORS,
+    HEAD_FONT_SIZE,
+    MARGIN_LEFT,
     MARGIN_TOP,
-    MARGIN_LEFT
+    MONTH_FONT_SIZE,
+    TYPE_INFO_DICT,
+    YEAR_FONT_SIZE,
 )
+from github_heatmap.drawer import Drawer
+from github_heatmap.err import DepNotInstalledError
+from github_heatmap.loader import LOADER_DICT
+from github_heatmap.poster import Poster
+from github_heatmap.utils import build_level_colors, parse_years, reduce_year_list
 
 OUT_FOLDER = os.path.join(os.getcwd(), "OUT_FOLDER")
 
@@ -50,16 +51,32 @@ def run():
     args = args_parser.parse_args()
     # without title
     no_title_types = ("issue", "multiple", "json")
+    base_track_color = args.track_color or args.loader.track_color or "#4DD2FF"
+    use_exact_github_colors = (
+        args.type == "github"
+        and not args.track_color
+        and not args.special_color1
+        and not args.special_color2
+    )
+    level_colors = (
+        list(GITHUB_LEVEL_COLORS)
+        if use_exact_github_colors
+        else build_level_colors(
+            base_track_color, args.special_color1, args.special_color2
+        )
+    )
 
     p.colors = {
         "background": args.background_color,
-        "track": args.track_color
-        or args.loader.track_color,  # some type has default color
-        "special": args.special_color1,
-        "special2": args.special_color2 or args.special_color,
+        "track": base_track_color,
+        "special": level_colors[2],
+        "special2": level_colors[3],
         "text": args.text_color,
         "dom": args.dom_color,
     }
+    p.level_colors = level_colors
+    p.use_github_level_mapping = not (args.special_number1 or args.special_number2)
+    p.use_raw_level = args.use_raw_level
 
     p.tooltip_template = args.tooltip_template or None
 
@@ -68,6 +85,7 @@ def run():
         p.colors["track"] = "#025DB8"
         p.colors["special"] = "#FFD100"
         p.colors["special2"] = "#FFD100"
+        p.level_colors = build_level_colors("#025DB8", "#FFD100", "#FFD100")
 
     # set animate
     p.set_with_animation(args.with_animation)
@@ -111,6 +129,7 @@ def run():
         else:
             p.units = args.loader.unit
         p.tooltip_by_date = getattr(loader, "tooltip_by_date_dict", {}) or {}
+        p.level_thresholds = getattr(loader, "level_thresholds", ())
         p.set_tracks(tracks, years, type_list)
     else:
         if args.unit:
@@ -119,6 +138,20 @@ def run():
             p.units = args.loader.unit
         p.set_tracks({}, [to_year], type_list)
         p.tooltip_by_date = {}
+        p.level_thresholds_by_type = {
+            child_loader._type: getattr(child_loader, "level_thresholds", ())
+            for child_loader in loader.loader_list
+        }
+
+    # explicit level thresholds override quartile calculation
+    if args.level_thresholds:
+        p.level_thresholds = tuple(float(v) for v in args.level_thresholds.split(","))
+        p.use_github_level_mapping = True
+
+    # explicit level colors override computed colors
+    if args.level_colors:
+        p.level_colors = [c.strip() for c in args.level_colors.split(",")]
+        p.use_github_level_mapping = True
 
     # set title
     # we don't know issue content so use name
@@ -144,7 +177,12 @@ def run():
         MARGIN_TOP
         + HEAD_FONT_SIZE
         + poster_length
-        * (YEAR_FONT_SIZE + MONTH_FONT_SIZE+DOM_BOX_PADING*3 + (DOM_BOX_PADING + DOM_BOX_TUPLE[0]) * 7)
+        * (
+            YEAR_FONT_SIZE
+            + MONTH_FONT_SIZE
+            + DOM_BOX_PADING * 3
+            + (DOM_BOX_PADING + DOM_BOX_TUPLE[0]) * 7
+        )
     )
     if not os.path.exists(OUT_FOLDER):
         os.mkdir(OUT_FOLDER)

{github_heatmap-1.4.0 → github_heatmap-2.2.0}/github_heatmap/config.py

@@ -1,4 +1,4 @@
-DOM_BOX_TUPLE = (4,4)
+DOM_BOX_TUPLE = (4, 4)
 DOM_BOX_TUPLE_LIST_FOR_TWO = ((2.6, 1.3), (2.6, 1.3))
 DOM_BOX_TUPLE_LIST_FOR_THREE = ((2.7, 0.9), (2.7, 0.9), (2.7, 0.9))
 
@@ -11,7 +11,7 @@ DOM_BOX_DICT = {
     3: {"dom": DOM_BOX_TUPLE_LIST_FOR_THREE},
 }
 MARGIN_LEFT = 10
-MARGIN_TOP  = 4
+MARGIN_TOP = 4
 HEAD_FONT_SIZE = 6
 YEAR_FONT_SIZE = 3
 MONTH_FONT_SIZE = 2.5
@@ -20,6 +20,7 @@ DOM_BOX_RADIUS = 1
 DOM_BOX_PADING = 1.4
 
 DEFAULT_DOM_COLOR = "#444444"
+GITHUB_LEVEL_COLORS = ("#9BE9A8", "#40C463", "#30A14E", "#216E39")
 MONTH_NAMES = [
     "Jan",
     "Feb",

{github_heatmap-1.4.0 → github_heatmap-2.2.0}/github_heatmap/drawer.py

@@ -7,15 +7,15 @@ from github_heatmap.config import (
     COLOR_TUPLE,
     DEFAULT_DOM_COLOR,
     DOM_BOX_DICT,
+    DOM_BOX_PADING,
+    DOM_BOX_RADIUS,
     DOM_BOX_TUPLE,
+    MONTH_FONT_SIZE,
     MONTH_NAMES,
     YEAR_FONT_SIZE,
-    MONTH_FONT_SIZE,
-    DOM_BOX_PADING,
-    DOM_BOX_RADIUS,
 )
 from github_heatmap.err import BaseDrawError
-from github_heatmap.utils import interpolate_color, make_key_times
+from github_heatmap.utils import interpolate_color, make_key_times, resolve_github_level
 
 
 class Drawer:
@@ -71,7 +71,21 @@ class Drawer:
             return f"{date_title} {value} {self.poster.units}"
         return date_title
 
-    def make_color(self, length_range, length):
+    def _resolve_level_thresholds(self, type_name=None):
+        if type_name and self.poster.level_thresholds_by_type:
+            return self.poster.level_thresholds_by_type.get(type_name, ())
+        return self.poster.level_thresholds
+
+    def _make_github_level_color(self, length, type_name=None):
+        level = resolve_github_level(length, self._resolve_level_thresholds(type_name), self.poster.use_raw_level)
+        if level == 0:
+            return self.poster.colors.get("dom")
+        return self.poster.level_colors[level - 1]
+
+    def make_color(self, length_range, length, type_name=None):
+        if self.poster.use_github_level_mapping and self.poster.level_colors:
+            return self._make_github_level_color(length, type_name)
+
         sp2 = self.poster.special_number.get("special_number2")
         sp1 = self.poster.special_number.get("special_number1")
         has_special = False
@@ -122,7 +136,10 @@ class Drawer:
         color = self.poster.colors.get("dom")
         if day_tracks:
             color = self.make_color(self.poster.length_range_by_date, day_tracks)
-            if day_tracks >= self.poster.special_number["special_number1"]:
+            if (
+                not self.poster.use_github_level_mapping
+                and day_tracks >= self.poster.special_number["special_number1"]
+            ):
                 color = self.poster.colors.get("special2") or self.poster.colors.get(
                     "special"
                 )
@@ -171,7 +188,7 @@ class Drawer:
                 if not num:
                     continue
                 dom = dom_tuple[index]
-                color = self.make_color(length_range, num)
+                color = self.make_color(length_range, num, _type)
                 rect = dr.rect(
                     (rect_x, rect_y),
                     dom,
@@ -248,7 +265,11 @@ class Drawer:
                         style=self.month_names_style,
                     )
                 )
-            if index > 0 and index < 53 and month!=MONTH_NAMES[github_rect_day.month - 1]:
+            if (
+                index > 0
+                and index < 53
+                and month != MONTH_NAMES[github_rect_day.month - 1]
+            ):
                 month = MONTH_NAMES[github_rect_day.month - 1]
                 dr.add(
                     dr.text(
@@ -308,6 +329,7 @@ class Drawer:
                     "special_number1": loader.special_number1,
                     "special_number2": loader.special_number2,
                 }
+                self.poster.level_thresholds = getattr(loader, "level_thresholds", ())
                 self.poster.tooltip_by_date = (
                     getattr(loader, "tooltip_by_date_dict", {}) or {}
                 )

{github_heatmap-1.4.0 → github_heatmap-2.2.0}/github_heatmap/loader/base_loader.py

@@ -7,6 +7,7 @@ import pendulum
 from requests.utils import cookiejar_from_dict
 
 from github_heatmap.loader.config import TIME_ZONE
+from github_heatmap.utils import make_github_level_thresholds
 
 
 class LoadError(Exception):
@@ -29,6 +30,7 @@ class BaseLoader(ABC):
         self.number_by_date_dict = defaultdict(int)
         self.special_number1 = None
         self.special_number2 = None
+        self.level_thresholds = ()
         self.number_list = []
         self.year_list = self._make_years_list()
         self.try_import_deps()
@@ -51,10 +53,10 @@ class BaseLoader(ABC):
 
     def make_special_number(self):
         """
-        This func is to make special color number for poster
-        special_number1 top 20%
-        special_number2  top 20 % - 50%
+        Keep the legacy special-number thresholds for compatibility, and
+        also compute GitHub-style quartile thresholds for five-level maps.
         """
+        self.level_thresholds = make_github_level_thresholds(self.number_list)
         # before python below 3.5 maybe need to sort
         number_list_set = sorted(list(set(self.number_list)))
         number_list_set_len = len(number_list_set)
@@ -117,8 +119,8 @@ class BaseLoader(ABC):
             dest="track_color",
             metavar="COLOR",
             type=str,
-            default="#4DD2FF",
-            help='Color of tracks (default: "#4DD2FF").',
+            default=None,
+            help="Base positive-level color (default: loader-specific color).",
         )
         group.add_argument(
             "--dom-color",
@@ -140,15 +142,15 @@ class BaseLoader(ABC):
             "--special-color1",
             dest="special_color1",
             metavar="COLOR",
-            default="yellow",
-            help='Special track color (default: "yellow").',
+            default=None,
+            help="Optional third-level color override for the five-level heatmap.",
         )
         group.add_argument(
             "--special-color2",
             dest="special_color2",
             metavar="COLOR",
-            default="red",
-            help="Secondary color of special tracks (default: red).",
+            default=None,
+            help="Optional fourth-level color override for the five-level heatmap.",
         )
         group.add_argument(
             "--special-number1",
@@ -231,6 +233,24 @@ class BaseLoader(ABC):
             action="store_true",
             help="if account is CN",
         )
+        group.add_argument(
+            "--use-raw-level",
+            dest="use_raw_level",
+            action="store_true",
+            help="Use raw value (1-4) as level directly, skip quartile calculation",
+        )
+        group.add_argument(
+            "--level-thresholds",
+            dest="level_thresholds",
+            default="",
+            help="Explicit level thresholds (comma-separated, e.g. '360,450,99999'), overrides quartile calculation",
+        )
+        group.add_argument(
+            "--level-colors",
+            dest="level_colors",
+            default="",
+            help="Explicit level colors (comma-separated hex, e.g. '#E74C3C,#F1C40F,#2ECC71,#2ECC71'), overrides computed colors",
+        )
         # special here
         group.add_argument(
             "--stand-with-ukraine",

{github_heatmap-1.4.0 → github_heatmap-2.2.0}/github_heatmap/loader/config.py

@@ -115,8 +115,8 @@ JIKE_PERSON_URL = "https://web.okjike.com/u/{user_id}"
 BBDC_API_URL = "https://learnywhere.cn/bb/dashboard/profile/search?userId={user_id}"
 
 # Notion
-NOTION_API_URL = "https://api.notion.com/v1/databases/{database_id}/query"
-NOTION_API_VERSION = "2021-08-16"
+NOTION_API_URL = "https://api.notion.com/v1/data_sources/{data_source_id}/query"
+NOTION_API_VERSION = "2026-03-11"
 
 # Weread
 WEREAD_BASE_URL = "https://weread.qq.com/"

{github_heatmap-1.4.0 → github_heatmap-2.2.0}/github_heatmap/loader/github_loader.py

@@ -1,6 +1,7 @@
-import requests
 from threading import Thread
 
+import requests
+
 from github_heatmap.html_parser import GitHubParser
 from github_heatmap.loader.base_loader import BaseLoader, LoadError
 from github_heatmap.loader.config import GITHUB_CONTRIBUCTIONS_URL

{github_heatmap-1.4.0 → github_heatmap-2.2.0}/github_heatmap/loader/gitlab_loader.py

@@ -1,7 +1,7 @@
 import time
 
 import requests
-from pendulum import parse, interval
+from pendulum import interval, parse
 
 from github_heatmap.html_parser import GitLabParser
 from github_heatmap.loader.base_loader import BaseLoader, LoadError

{github_heatmap-1.4.0 → github_heatmap-2.2.0}/github_heatmap/loader/notion_loader.py

@@ -1,10 +1,12 @@
-from datetime import datetime, timedelta
+import argparse
+import json
 import time
+import warnings
 from collections import defaultdict
+from datetime import datetime, timedelta
 
 import pendulum
 import requests
-import json
 
 from github_heatmap.loader.base_loader import BaseLoader
 from github_heatmap.loader.config import NOTION_API_URL, NOTION_API_VERSION
@@ -17,12 +19,28 @@ class NotionLoader(BaseLoader):
     def __init__(self, from_year, to_year, _type, **kwargs):
         super().__init__(from_year, to_year, _type)
         self.number_by_date_dict = self.generate_date_dict(from_year, to_year)
-        self.notion_token = kwargs.get("notion_token", "").strip()
-        self.database_id = kwargs.get("database_id", "").strip()
-        self.date_prop_name = kwargs.get("date_prop_name", "")
-        self.value_prop_name = kwargs.get("value_prop_name", "")
-        self.database_filter = kwargs.get("database_filter", "")
-        self.tooltip_prop_name = kwargs.get("tooltip_prop_name", "").strip()
+        self.notion_token = (kwargs.get("notion_token") or "").strip()
+        self.data_source_id = (kwargs.get("data_source_id") or "").strip()
+        deprecated_database_id = (kwargs.get("database_id") or "").strip()
+        if deprecated_database_id and not self.data_source_id:
+            warnings.warn(
+                "--database_id is deprecated; use --data_source_id instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            self.data_source_id = deprecated_database_id
+        self.date_prop_name = kwargs.get("date_prop_name") or ""
+        self.value_prop_name = kwargs.get("value_prop_name") or ""
+        self.data_source_filter = kwargs.get("data_source_filter") or ""
+        deprecated_database_filter = kwargs.get("database_filter") or ""
+        if deprecated_database_filter and not self.data_source_filter:
+            warnings.warn(
+                "--database_filter is deprecated; use --data_source_filter instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            self.data_source_filter = deprecated_database_filter
+        self.tooltip_prop_name = (kwargs.get("tooltip_prop_name") or "").strip()
         self.tooltip_by_date_dict = defaultdict(list)
 
     @classmethod
@@ -33,11 +51,17 @@ class NotionLoader(BaseLoader):
             type=str,
             help="The Notion internal integration token.",
         )
+        parser.add_argument(
+            "--data_source_id",
+            dest="data_source_id",
+            type=str,
+            help="The Notion data source id.",
+        )
         parser.add_argument(
             "--database_id",
             dest="database_id",
             type=str,
-            help="The Notion database id.",
+            help=argparse.SUPPRESS,
         )
         parser.add_argument(
             "--date_prop_name",
@@ -45,7 +69,7 @@ class NotionLoader(BaseLoader):
             type=str,
             default="Datetime",
             required=optional,
-            help="The database property name which stored the datetime.",
+            help="The Notion data source property name that stores the date.",
         )
         parser.add_argument(
             "--value_prop_name",
@@ -53,15 +77,23 @@ class NotionLoader(BaseLoader):
             type=str,
             default="Datetime",
             required=optional,
-            help="The database property name which stored the datetime.",
-        )        
+            help="The Notion data source property name used as the heatmap value.",
+        )
+        parser.add_argument(
+            "--data_source_filter",
+            dest="data_source_filter",
+            type=str,
+            default="",
+            required=False,
+            help="Optional Notion data source query filter in JSON format.",
+        )
         parser.add_argument(
             "--database_filter",
             dest="database_filter",
             type=str,
             default="",
             required=False,
-            help="The database property name which stored the datetime.",
+            help=argparse.SUPPRESS,
         )
         parser.add_argument(
             "--tooltip_prop_name",
@@ -90,27 +122,28 @@ class NotionLoader(BaseLoader):
                 ]
             },
         }
-        if self.database_filter:
-            payload["filter"]["and"].append(json.loads(self.database_filter))
+        if self.data_source_filter:
+            payload["filter"]["and"].append(json.loads(self.data_source_filter))
         if start_cursor:
             payload.update({"start_cursor": start_cursor})
-
+        print(payload)
         headers = {
             "Accept": "application/json",
             "Notion-Version": NOTION_API_VERSION,
             "Content-Type": "application/json",
             "Authorization": "Bearer " + self.notion_token,
         }
-
+        print(headers)
         try:
             resp = requests.post(
-                NOTION_API_URL.format(database_id=self.database_id),
+                NOTION_API_URL.format(data_source_id=self.data_source_id),
                 json=payload,
                 headers=headers,
             )
         except requests.RequestException:
+            print("Failed to connect to Notion API.")
             return data_list
-
+        print(getattr(resp, "text", ""))
         if not resp.ok:
             # Treat non-OK responses as an empty result set so we can still draw
             # a heatmap even when the Notion API yields no rows for the period.
@@ -119,6 +152,7 @@ class NotionLoader(BaseLoader):
             data = resp.json()
         except ValueError:
             return data_list
+        print(len(data.get("results", [])))
         results = data["results"]
         next_cursor = data["next_cursor"]
         data_list.extend(results)
@@ -209,7 +243,9 @@ class NotionLoader(BaseLoader):
                 [p.get("name") or p.get("id", "") for p in item.get("people", [])]
             ).strip()
         if item_type == "relation":
-            return ", ".join([r.get("id", "") for r in item.get("relation", [])]).strip()
+            return ", ".join(
+                [r.get("id", "") for r in item.get("relation", [])]
+            ).strip()
         if item_type == "date":
             return cls._format_date(item.get("date", {}))
         if item_type in ("url", "email", "phone_number"):
@@ -272,7 +308,9 @@ class NotionLoader(BaseLoader):
         if prop_type == "date":
             return cls._format_date(prop.get("date", {}))
         if prop_type == "relation":
-            return ", ".join([r.get("id", "") for r in prop.get("relation", [])]).strip()
+            return ", ".join(
+                [r.get("id", "") for r in prop.get("relation", [])]
+            ).strip()
         if prop_type == "files":
             texts = []
             for file_obj in prop.get("files", []):
@@ -308,7 +346,9 @@ class NotionLoader(BaseLoader):
             if rollup_type == "date":
                 return cls._format_date(rollup.get("date", {}))
             if rollup_type == "array":
-                texts = [cls._extract_rollup_item(item) for item in rollup.get("array", [])]
+                texts = [
+                    cls._extract_rollup_item(item) for item in rollup.get("array", [])
+                ]
                 texts = [text for text in texts if text]
                 return ", ".join(texts)
         return ""

{github_heatmap-1.4.0 → github_heatmap-2.2.0}/github_heatmap/loader/weread_loader.py

@@ -1,22 +1,25 @@
 import json
+import os
+
 import pendulum
 import requests
-import os
 
 from github_heatmap.loader.base_loader import BaseLoader
 from github_heatmap.loader.config import WEREAD_BASE_URL, WEREAD_HISTORY_URL
 
 headers = {
-    'User-Agent': "WeRead/8.2.5 WRBrand/xiaomi Dalvik/2.1.0 (Linux; U; Android 12; Redmi Note 7 Pro Build/SQ3A.220705.004)",
-    'Connection': "Keep-Alive",
-    'Accept-Encoding': "gzip",
-    'baseapi': "32",
-    'appver': "8.2.5.10163885",
-    'osver': "12",
-    'channelId': "11",
-    'basever': "8.2.5.10163885",
-    'Content-Type': "application/json; charset=UTF-8"
+    "User-Agent": "WeRead/8.2.5 WRBrand/xiaomi Dalvik/2.1.0 (Linux; U; Android 12; Redmi Note 7 Pro Build/SQ3A.220705.004)",
+    "Connection": "Keep-Alive",
+    "Accept-Encoding": "gzip",
+    "baseapi": "32",
+    "appver": "8.2.5.10163885",
+    "osver": "12",
+    "channelId": "11",
+    "basever": "8.2.5.10163885",
+    "Content-Type": "application/json; charset=UTF-8",
 }
+
+
 class WereadLoader(BaseLoader):
     track_color = "#2EA8F7"
     unit = "mins"
@@ -45,7 +48,11 @@ class WereadLoader(BaseLoader):
         # )
 
     def refresh_token(self):
-        body = {"deviceId":self.device_id ,"refreshToken":self.token,"activationCode":self.activation_code}
+        body = {
+            "deviceId": self.device_id,
+            "refreshToken": self.token,
+            "activationCode": self.activation_code,
+        }
         r = self.session.post(
             "https://api.notionhub.app/refresh-weread-token", json=body
         )
@@ -54,13 +61,14 @@ class WereadLoader(BaseLoader):
             vid = response_data.get("vid")
             accessToken = response_data.get("accessToken")
             if vid and accessToken:
-                self.session.headers.update({"vid": str(vid), "accessToken": accessToken})
+                self.session.headers.update(
+                    {"vid": str(vid), "accessToken": accessToken}
+                )
             else:
                 print("Failed to refresh token")
         else:
             print("Failed to refresh token")
-       
-    
+
     def get_api_data(self):
         r = self.session.get(WEREAD_HISTORY_URL)
         if not r.ok:
@@ -75,7 +83,7 @@ class WereadLoader(BaseLoader):
 
     def make_track_dict(self):
         api_data = self.get_api_data()
-        if("readTimes" in api_data):
+        if "readTimes" in api_data:
             readTimes = dict(sorted(api_data["readTimes"].items(), reverse=True))
             for k, v in readTimes.items():
                 k = pendulum.from_timestamp(int(k), tz=self.time_zone)

{github_heatmap-1.4.0 → github_heatmap-2.2.0}/github_heatmap/poster.py

@@ -1,14 +1,12 @@
 """Create a poster from track data."""
+
 from collections import defaultdict
 
 import svgwrite
 
+from github_heatmap.config import HEAD_FONT_SIZE, MARGIN_LEFT, MARGIN_TOP
 from github_heatmap.structures import XY, ValueRange
-from github_heatmap.config import (
-    HEAD_FONT_SIZE,
-    MARGIN_LEFT,
-    MARGIN_TOP
-)
+
 
 class Poster:
     def __init__(self):
@@ -28,7 +26,7 @@ class Poster:
         self.width = 400
         self.height = 300
         self.years = None
-        self.offset = XY(MARGIN_LEFT,MARGIN_TOP)
+        self.offset = XY(MARGIN_LEFT, MARGIN_TOP)
         # maybe support more type
         self.tracks_drawer = None
         self.trans = None
@@ -36,6 +34,11 @@ class Poster:
         self.animation_time = 10
         self.year_tracks_date_count_dict = defaultdict(int)
         self.year_tracks_type_dict = defaultdict(dict)
+        self.level_colors = []
+        self.level_thresholds = ()
+        self.level_thresholds_by_type = {}
+        self.use_github_level_mapping = True
+        self.use_raw_level = False
 
         # for year summary
         self.is_summary = False
@@ -103,10 +106,17 @@ class Poster:
     def __draw_header(self, d):
         self.offset.y += HEAD_FONT_SIZE
         text_color = self.colors["text"]
-        title_style = f"font-size:{HEAD_FONT_SIZE}px; font-family:Arial; font-weight:bold;"
-        d.add(d.text(self.title, insert=(self.offset.x, self.offset.y), fill=text_color, style=title_style))
-     
-
+        title_style = (
+            f"font-size:{HEAD_FONT_SIZE}px; font-family:Arial; font-weight:bold;"
+        )
+        d.add(
+            d.text(
+                self.title,
+                insert=(self.offset.x, self.offset.y),
+                fill=text_color,
+                style=title_style,
+            )
+        )
 
     def __draw_footer(self, d):
         self.tracks_drawer.draw_footer(d)

{github_heatmap-1.4.0 → github_heatmap-2.2.0}/github_heatmap/skyline/skyline.py

@@ -2,7 +2,7 @@ import math
 import os
 
 import numpy as np
-from pendulum import parse, interval
+from pendulum import interval, parse
 from sdf import X, Y, box, ease, measure_text, rectangle, text, union
 
 import github_heatmap.skyline

{github_heatmap-1.4.0 → github_heatmap-2.2.0}/github_heatmap/utils.py

@@ -1,3 +1,4 @@
+import math
 import re
 from itertools import count as itercount
 from itertools import takewhile
@@ -20,6 +21,21 @@ def interpolate_color(color1, color2, ratio):
     return c3.hex_l
 
 
+def build_level_colors(track_color, special_color1=None, special_color2=None):
+    """
+    Build four positive contribution shades for a five-level heatmap.
+    """
+    level1 = interpolate_color(track_color, "#ffffff", 0.35)
+    if special_color1 and special_color2:
+        level2 = interpolate_color(track_color, special_color1, 0.35)
+        return [level1, level2, special_color1, special_color2]
+
+    level2 = track_color
+    level3 = interpolate_color(track_color, "#000000", 0.18)
+    level4 = interpolate_color(track_color, "#000000", 0.35)
+    return [level1, level2, level3, level4]
+
+
 def parse_years(s):
     """Parse a plaintext range of years into a pair of years
 
@@ -59,6 +75,43 @@ def make_key_times(year_count):
     return [str(round(i, 2)) for i in s]
 
 
+def make_github_level_thresholds(number_list):
+    """
+    GitHub exposes contribution levels as NONE plus four quartiles.
+    This uses the non-zero daily values and a nearest-rank percentile.
+    """
+    positive_values = sorted(v for v in number_list if v > 0)
+    if not positive_values:
+        return ()
+
+    total = len(positive_values)
+
+    def nearest_rank(percentile):
+        index = max(0, math.ceil(total * percentile) - 1)
+        return positive_values[index]
+
+    return tuple(nearest_rank(p) for p in (0.25, 0.50, 0.75))
+
+
+def resolve_github_level(value, thresholds, use_raw_level=False):
+    if value <= 0:
+        return 0
+    if use_raw_level:
+        # 直接使用传入的值作为级别（1-4），跳过四分位数计算
+        return max(1, min(4, int(value)))
+    if not thresholds:
+        return 1
+
+    q1, q2, q3 = thresholds
+    if value <= q1:
+        return 1
+    if value <= q2:
+        return 2
+    if value <= q3:
+        return 3
+    return 4
+
+
 def reduce_year_list(year_list, tracks_dict):
     """
     format year list

{github_heatmap-1.4.0 → github_heatmap-2.2.0}/github_heatmap.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: github_heatmap
-Version: 1.4.0
+Version: 2.2.0
 Summary: Make everything a GitHub svg poster and Skyline!
 Home-page: https://github.com/malinkang/GitHubPoster
 Author: malinkang
@@ -31,3 +31,11 @@ Requires-Dist: stravalib; extra == "all"
 Requires-Dist: PyGithub; extra == "all"
 Requires-Dist: sdf_fork; extra == "all"
 Requires-Dist: pandas; extra == "all"
+Dynamic: author
+Dynamic: author-email
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary

github_heatmap-2.2.0/pyproject.toml

@@ -0,0 +1,6 @@
+[build-system]
+requires = ["setuptools>=61", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[tool.isort]
+profile = "black"

{github_heatmap-1.4.0 → github_heatmap-2.2.0}/setup.py

@@ -6,7 +6,7 @@ setup(
     author_email="linkang.ma@gmail.com",
     url="https://github.com/malinkang/GitHubPoster",
     license="MIT",
-    version="1.4.0",
+    version="2.2.0",
     description="Make everything a GitHub svg poster and Skyline!",
     packages=find_packages(),
     include_package_data=True,

{github_heatmap-1.4.0 → github_heatmap-2.2.0}/tests/test_notion_loader.py

@@ -1,3 +1,4 @@
+import pytest
 import requests
 
 from github_heatmap.loader import notion_loader
@@ -10,7 +11,7 @@ def build_loader():
         2024,
         "notion",
         notion_token="token",
-        database_id="db",
+        data_source_id="ds",
         date_prop_name="Date",
         value_prop_name="Value",
         tooltip_prop_name="Tooltip",
@@ -46,10 +47,7 @@ def test_notion_loader_make_track_dict_with_tooltips():
     loader.make_track_dict()
 
     assert loader.number_by_date_dict["2024-01-01"] == 7
-    assert (
-        loader.tooltip_by_date_dict["2024-01-01"]
-        == "Study\nRead, Write"
-    )
+    assert loader.tooltip_by_date_dict["2024-01-01"] == "Study\nRead, Write"
 
 
 def test_notion_loader_extract_property_text_variants():
@@ -133,3 +131,44 @@ def test_notion_loader_handles_request_exception(monkeypatch):
     assert tracks
     assert all(value == 0 for value in tracks.values())
     assert loader.number_list
+
+
+def test_notion_loader_queries_data_source_endpoint(monkeypatch):
+    loader = build_loader()
+    captured = {}
+
+    class DummyResp:
+        ok = True
+
+        @staticmethod
+        def json():
+            return {"results": [], "next_cursor": None, "has_more": False}
+
+    def fake_post(url, json, headers):
+        captured["url"] = url
+        captured["json"] = json
+        captured["headers"] = headers
+        return DummyResp()
+
+    monkeypatch.setattr(notion_loader.requests, "post", fake_post)
+
+    loader.get_api_data()
+
+    assert captured["url"].endswith("/v1/data_sources/ds/query")
+    assert captured["headers"]["Notion-Version"] == "2026-03-11"
+    assert captured["json"]["filter"]["and"][0]["property"] == "Date"
+
+
+def test_notion_loader_accepts_deprecated_database_id():
+    with pytest.warns(DeprecationWarning, match="--database_id is deprecated"):
+        loader = NotionLoader(
+            2024,
+            2024,
+            "notion",
+            notion_token="token",
+            database_id="legacy-db",
+            date_prop_name="Date",
+            value_prop_name="Value",
+        )
+
+    assert loader.data_source_id == "legacy-db"

github_heatmap-2.2.0/tests/test_poster_utils.py

@@ -0,0 +1,91 @@
+from github_heatmap.config import GITHUB_LEVEL_COLORS
+from github_heatmap.drawer import Drawer
+from github_heatmap.poster import Poster
+from github_heatmap.utils import (
+    build_level_colors,
+    interpolate_color,
+    make_github_level_thresholds,
+    make_key_times,
+    parse_years,
+    resolve_github_level,
+)
+
+
+def test_interpolate_color():
+    assert interpolate_color("#000000", "#ffffff", 0) == "#000000"
+    assert interpolate_color("#000000", "#ffffff", 1) == "#ffffff"
+    assert interpolate_color("#000000", "#ffffff", 0.5) == "#7f7f7f"
+    assert interpolate_color("#000000", "#ffffff", -100) == "#000000"
+    assert interpolate_color("#000000", "#ffffff", 12345) == "#ffffff"
+
+
+def test_parse_years():
+    assert parse_years("2012") == (2012, 2012)
+    assert parse_years("2015-2021") == (2015, 2021)
+    assert parse_years("2021-2015") == (2015, 2021)
+
+
+def test_make_key_times():
+    assert make_key_times(5) == ["0", "0.2", "0.4", "0.6", "0.8", "1"]
+
+
+def test_make_github_level_thresholds():
+    assert make_github_level_thresholds([]) == ()
+    assert make_github_level_thresholds([0, 1, 1, 2, 3, 5, 8, 13]) == (1, 3, 8)
+
+
+def test_resolve_github_level():
+    thresholds = (2, 5, 9)
+
+    assert resolve_github_level(0, thresholds) == 0
+    assert resolve_github_level(2, thresholds) == 1
+    assert resolve_github_level(5, thresholds) == 2
+    assert resolve_github_level(9, thresholds) == 3
+    assert resolve_github_level(10, thresholds) == 4
+
+
+def test_build_level_colors_uses_exact_palette_when_provided():
+    assert list(GITHUB_LEVEL_COLORS) == [
+        "#9BE9A8",
+        "#40C463",
+        "#30A14E",
+        "#216E39",
+    ]
+    assert len(build_level_colors("#40C463")) == 4
+
+
+def test_drawer_tooltip_formatting():
+    poster = Poster()
+    poster.units = "XP"
+    drawer = Drawer(poster)
+
+    assert drawer._format_tooltip("2024-01-01", 10) == "2024-01-01 10 XP"
+    assert drawer._format_tooltip("2024-01-01") == "2024-01-01"
+
+    poster.tooltip_template = "{date}: {value}{unit}"
+    assert drawer._format_tooltip("2024-01-01", 5) == "2024-01-01: 5XP"
+    assert drawer._format_tooltip("2024-01-01") == "2024-01-01"
+
+    poster.tooltip_template = "{date} {value} for {type}"
+    assert drawer._format_tooltip("2024-01-01", 7, "run") == "2024-01-01 7 for run"
+
+    poster.tooltip_by_date = {"2024-01-01": "Custom"}
+    assert drawer._format_tooltip("2024-01-01", 5) == "Custom"
+
+    poster.tooltip_by_date = {"2024-01-02": {"run": "Run note"}}
+    assert drawer._format_tooltip("2024-01-02", 3, "run") == "Run note"
+
+
+def test_drawer_make_color_uses_github_levels():
+    poster = Poster()
+    poster.use_github_level_mapping = True
+    poster.level_colors = list(GITHUB_LEVEL_COLORS)
+    poster.level_thresholds = (2, 5, 9)
+    poster.colors["dom"] = "#ebedf0"
+    drawer = Drawer(poster)
+
+    assert drawer.make_color(poster.length_range_by_date, 0) == "#ebedf0"
+    assert drawer.make_color(poster.length_range_by_date, 2) == "#9BE9A8"
+    assert drawer.make_color(poster.length_range_by_date, 5) == "#40C463"
+    assert drawer.make_color(poster.length_range_by_date, 9) == "#30A14E"
+    assert drawer.make_color(poster.length_range_by_date, 12) == "#216E39"

github_heatmap-1.4.0/pyproject.toml

@@ -1,2 +0,0 @@
-[tool.isort]
-profile = "black"

github_heatmap-1.4.0/tests/test_poster_utils.py

@@ -1,46 +0,0 @@
-from github_heatmap.drawer import Drawer
-from github_heatmap.poster import Poster
-from github_heatmap.utils import interpolate_color, make_key_times, parse_years
-
-
-def test_interpolate_color():
-    assert interpolate_color("#000000", "#ffffff", 0) == "#000000"
-    assert interpolate_color("#000000", "#ffffff", 1) == "#ffffff"
-    assert interpolate_color("#000000", "#ffffff", 0.5) == "#7f7f7f"
-    assert interpolate_color("#000000", "#ffffff", -100) == "#000000"
-    assert interpolate_color("#000000", "#ffffff", 12345) == "#ffffff"
-
-
-def test_parse_years():
-    assert parse_years("2012") == (2012, 2012)
-    assert parse_years("2015-2021") == (2015, 2021)
-    assert parse_years("2021-2015") == (2015, 2021)
-
-
-def test_make_key_times():
-    assert make_key_times(5) == ["0", "0.2", "0.4", "0.6", "0.8", "1"]
-
-
-def test_drawer_tooltip_formatting():
-    poster = Poster()
-    poster.units = "XP"
-    drawer = Drawer(poster)
-
-    assert drawer._format_tooltip("2024-01-01", 10) == "2024-01-01 10 XP"
-    assert drawer._format_tooltip("2024-01-01") == "2024-01-01"
-
-    poster.tooltip_template = "{date}: {value}{unit}"
-    assert drawer._format_tooltip("2024-01-01", 5) == "2024-01-01: 5XP"
-    assert drawer._format_tooltip("2024-01-01") == "2024-01-01"
-
-    poster.tooltip_template = "{date} {value} for {type}"
-    assert (
-        drawer._format_tooltip("2024-01-01", 7, "run")
-        == "2024-01-01 7 for run"
-    )
-
-    poster.tooltip_by_date = {"2024-01-01": "Custom"}
-    assert drawer._format_tooltip("2024-01-01", 5) == "Custom"
-
-    poster.tooltip_by_date = {"2024-01-02": {"run": "Run note"}}
-    assert drawer._format_tooltip("2024-01-02", 3, "run") == "Run note"