papi-projects 0.4.3__tar.gz → 0.4.4__tar.gz

{papi_projects-0.4.3 → papi_projects-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: papi-projects
-Version: 0.4.3
+Version: 0.4.4
 Summary: PAPI is an API for managing projects
 Author-email: sandyjmacdonald <sandyjmacdonald@gmail.com>
 License-Expression: MIT

{papi_projects-0.4.3 → papi_projects-0.4.4}/papi/__init__.py

@@ -1,5 +1,6 @@
 import os
 import logging
+from decimal import Decimal, ROUND_UP
 from pathlib import Path
 
 try:
@@ -81,6 +82,18 @@ if missing:
     raise RuntimeError(f"Missing required config values: {', '.join(missing)}")
 
 
+def round_up_to_multiple(hours: float, multiple: float = 7.5) -> float:
+    """Round hours up to the nearest multiple of `multiple` (default 7.5).
+
+    Values that are already an exact multiple are left unchanged, e.g. 7.5 -> 7.5,
+    1 -> 7.5, 10 -> 15. Uses Decimal to avoid floating-point rounding surprises.
+    """
+    h = Decimal(str(hours))
+    m = Decimal(str(multiple))
+    multiples = (h / m).quantize(Decimal("1"), rounding=ROUND_UP)
+    return float(multiples * m)
+
+
 def setup_logger(enable_logging: bool, log_level: str = 'INFO', log_file: str = None):
     logger = logging.getLogger('papi')
     

{papi_projects-0.4.3 → papi_projects-0.4.4}/papi/wrappers.py

@@ -1077,20 +1077,23 @@ class NotionWrapper(Protocol):
 
         props = page.get("properties", {})
 
+        nid = page.get("id")
         try:
             pid = project_id or props["Project ID"]["title"][0]["plain_text"]
             name = props["Description"]["rich_text"][0]["plain_text"]
-            owner = [u["name"] for u in props["Owner"]["people"]]
+            owner = [u.get("name") for u in props["Owner"]["people"] if u.get("name")]
             status = props["Status"]["status"]["name"]
             priority = props["Priority"]["select"]["name"]
             user_id = props["PI Code"]["rollup"]["array"][0]["rich_text"][0]["plain_text"]
-            nid = page["id"]
             if len(props["Workorder"]["relation"]):
                 workorder_page_id = props["Workorder"]["relation"][0]["id"]
             else:
                 workorder_page_id = None
         except (KeyError, IndexError) as e:
-            logger.error(f"Malformed project properties on page {nid!r}: {e!r}")
+            logger.error(
+                f"Malformed project properties for Project ID={project_id!r} "
+                f"on Notion page {nid!r}: {e!r}"
+            )
             return None
 
         if workorders_db_id is not None and workorder_page_id is not None:

{papi_projects-0.4.3 → papi_projects-0.4.4}/papi_projects.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: papi-projects
-Version: 0.4.3
+Version: 0.4.4
 Summary: PAPI is an API for managing projects
 Author-email: sandyjmacdonald <sandyjmacdonald@gmail.com>
 License-Expression: MIT

{papi_projects-0.4.3 → papi_projects-0.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "papi-projects"
-version = "0.4.3"
+version = "0.4.4"
 description = "PAPI is an API for managing projects"
 authors = [{ name = "sandyjmacdonald", email = "sandyjmacdonald@gmail.com" }]
 license = "MIT"

{papi_projects-0.4.3 → papi_projects-0.4.4}/scripts/collate_toggl_hours.py

@@ -2,7 +2,7 @@ import argparse
 import pendulum
 import warnings
 from papi.wrappers import TogglTrackWrapper
-from papi import config
+from papi import config, round_up_to_multiple
 
 def main():
     """Main function of collate-toggl-hours script"""
@@ -22,6 +22,11 @@ def main():
         help="output TSV filename, omit to write to stdout",
         default=False,
     )
+    parser.add_argument(
+        "--round",
+        action="store_true",
+        help="round each project's total hours up to the nearest 7.5",
+    )
     args = parser.parse_args()
 
     # Set up start/end date
@@ -55,6 +60,9 @@ def main():
         projects = {p["id"]: p["name"] for p in toggl.get_user_projects() if p["id"] in tracked_hours}
         hours_per_project = [(projects[t], tracked_hours[t]) for t in tracked_hours]
 
+        if args.round:
+            hours_per_project = [(name, round_up_to_multiple(hours)) for name, hours in hours_per_project]
+
         output = args.output
 
         if output:

{papi_projects-0.4.3 → papi_projects-0.4.4}/scripts/generate_timesheet.py

@@ -4,7 +4,7 @@ import warnings
 import os
 from pathlib import Path
 from papi.wrappers import TogglTrackWrapper, NotionWrapper
-from papi import config, setup_logger
+from papi import config, setup_logger, round_up_to_multiple
 from papi.project import get_project_ids, check_project_id
 from decimal import Decimal, ROUND_UP
 import pandas as pd
@@ -51,6 +51,8 @@ def calculate_cost(hours: float, hourly_rate: float) -> float:
 
 def get_toggl_hours(start_time, end_time, toggl):
     tracked_hours = toggl.get_user_hours(start_time=start_time, end_time=end_time)
+    if not tracked_hours:
+        return {}
     projects = {p["id"]: p["name"] for p in toggl.get_user_projects() if p["id"] in tracked_hours}
     hours_per_project = [(projects[t], tracked_hours[t]) for t in tracked_hours]
     hours_dict = {}
@@ -67,6 +69,11 @@ def main():
     parser.add_argument("-s", "--start", type=str, required=True)
     parser.add_argument("-e", "--end", type=str, default=False)
     parser.add_argument("--disable-logging", action="store_true")
+    parser.add_argument(
+        "--round",
+        action="store_true",
+        help="round each project's total hours (across all users) up to the nearest 7.5",
+    )
     parser.add_argument("-o", "--output", type=str, required=True)
     args = parser.parse_args()
 
@@ -104,7 +111,17 @@ def main():
         for user in toggl_users:
             print(user)
             toggl = initialise_toggl(user["api_key"], toggl_workspace)
-            hours_dict = get_toggl_hours(start_time, end_time, toggl)
+            try:
+                hours_dict = get_toggl_hours(start_time, end_time, toggl)
+            except Exception:
+                logger.error(f"[Toggl] Failed fetching hours for user {user['name']!r}")
+                raise
+            if not hours_dict:
+                logger.warning(
+                    f"[Toggl] No hours tracked for user {user['name']!r} "
+                    f"in the requested period; skipping."
+                )
+                continue
             print(hours_dict)
 
             for project_id, hours in hours_dict.items():
@@ -115,27 +132,34 @@ def main():
                 cost = 0.0
                 workorder_id = ""
                 if check_project_id(project_id):
-                    project = notion.get_project(
-                        config["NOTION_PROJECTS_DB"],
-                        project_id,
-                        workorders_db_id=config["NOTION_WORKORDERS_DB"]
-                    )
-                    if project is not None:
-                        project_name = project.name
-                        workorder_id = project.workorder
-                        if workorder_id is not None:
-                            workorder = notion.get_workorder(
-                                workorders_db_id=config["NOTION_WORKORDERS_DB"],
-                                workorder_id=workorder_id
-                            )
-                            if workorder.is_complete():
-                                payment_type = workorder.payment_type
-                                costing_rate = workorder.costing_rate
-                                hourly_rate = workorder.hourly_rate
-                                cost = calculate_cost(hours, workorder.hourly_rate)
-                    else:
-                        project_name = ""
-                        workorder_id = ""
+                    try:
+                        project = notion.get_project(
+                            config["NOTION_PROJECTS_DB"],
+                            project_id,
+                            workorders_db_id=config["NOTION_WORKORDERS_DB"]
+                        )
+                        if project is not None:
+                            project_name = project.name
+                            workorder_id = project.workorder
+                            if workorder_id is not None:
+                                workorder = notion.get_workorder(
+                                    workorders_db_id=config["NOTION_WORKORDERS_DB"],
+                                    workorder_id=workorder_id
+                                )
+                                if workorder.is_complete():
+                                    payment_type = workorder.payment_type
+                                    costing_rate = workorder.costing_rate
+                                    hourly_rate = workorder.hourly_rate
+                                    cost = calculate_cost(hours, workorder.hourly_rate)
+                        else:
+                            project_name = ""
+                            workorder_id = ""
+                    except Exception:
+                        logger.error(
+                            f"[Notion] Failed processing project {project_id!r} "
+                            f"for user {user['name']!r}"
+                        )
+                        raise
                 else:
                     project_name = project_id
 
@@ -185,6 +209,16 @@ def main():
                 "agresso_description",
             ]
         ]
+
+        if args.round:
+            totals_df["hours"] = totals_df["hours"].apply(round_up_to_multiple)
+            totals_df["cost"] = totals_df.apply(
+                lambda row: calculate_cost(row["hours"], row["hourly_rate"])
+                if row["hourly_rate"] not in ("", None)
+                else row["cost"],
+                axis=1,
+            )
+
         totals_df.to_csv(totals_path, sep="\t", index=False)
 
         da_df = totals_df[totals_df["payment_type"] == "DA"]