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

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

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

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

@@ -176,14 +176,18 @@ class TogglTrackWrapper(Protocol):
             if isinstance(times_json, list):
                 times = {}
                 for t in times_json:
-                    pid = t["pid"]
-                    seconds = t["duration"]
-                    hours = seconds / 60 / 60
-                    if pid not in times:
-                        times[pid] = hours
-                    else:
-                        times[pid] += hours
-                return times
+                    if "pid" in t:
+                        pid = t["pid"]
+                        seconds = t["duration"]
+                        hours = seconds / 60 / 60
+                        if pid not in times:
+                            times[pid] = hours
+                        else:
+                            times[pid] += hours
+                if times:
+                    return times
+                else:
+                    return None
             else:
                 warnings.warn(times_json)
                 return None
@@ -419,7 +423,11 @@ class NotionWrapper(Protocol):
             t = b["type"]
             if t not in ALLOWED:
                 continue
-            minimal = { "type": t, t: b[t] }
+            block_data = {
+                k: v for k, v in b[t].items()
+                if v is not None and not (k == "color" and v == "default")
+            }
+            minimal = {"type": t, t: block_data}
             if b.get("has_children"):
                 child_raw = self._fetch_template_blocks(b["id"])
                 minimal["children"] = self._clean_blocks(child_raw)

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

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

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

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

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

@@ -51,6 +51,7 @@ def main():
         # Get tracked hours and tracked project IDs/names
 
         tracked_hours = toggl.get_user_hours(start_time=start_time, end_time=end_time)
+        print(tracked_hours)
         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]
 
@@ -69,4 +70,4 @@ def main():
         warnings.warn("Start time must not be more than 3 months ago!")
 
 if __name__ == "__main__":
-    main()
+    main()

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

@@ -74,7 +74,8 @@ def main():
         logger = setup_logger(True, "WARNING", None)
 
     start_time = pendulum.parse(args.start).to_rfc3339_string()
-    end_time = pendulum.now().to_rfc3339_string() if not args.end else pendulum.parse(args.end).to_rfc3339_string()
+    # Toggl's end_date is exclusive, so add a day to include entries on the end date itself.
+    end_time = pendulum.now().to_rfc3339_string() if not args.end else pendulum.parse(args.end).add(days=1).to_rfc3339_string()
 
     if pendulum.now() < pendulum.parse(args.start).add(months=3):
         toggl_workspace = config["TOGGL_TRACK_WORKSPACE"]
@@ -101,8 +102,10 @@ 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)
+            print(hours_dict)
 
             for project_id, hours in hours_dict.items():
                 hours = float(hours)
@@ -117,18 +120,22 @@ def main():
                         project_id,
                         workorders_db_id=config["NOTION_WORKORDERS_DB"]
                     )
-                    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)
+                    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 = ""
                 else:
                     project_name = project_id
 
@@ -145,8 +152,55 @@ def main():
                     f"{project_id}: {project_name}",
                 ]
 
-        df.to_csv(output, sep="\t", index=False)
-        logger.warning(f"{len(df)} journal entries successfully written to {output}")
+        output_path = Path(output).expanduser()
+        itemised_path = output_path.with_name(f"{output_path.stem}-itemised{output_path.suffix}")
+        totals_path = output_path.with_name(f"{output_path.stem}-totals{output_path.suffix}")
+        da_path = output_path.with_name(f"{output_path.stem}-DA{output_path.suffix}")
+        di_path = output_path.with_name(f"{output_path.stem}-DI{output_path.suffix}")
+
+        df.to_csv(itemised_path, sep="\t", index=False)
+
+        totals_df = df.drop(columns=["person"]).groupby("project_id", as_index=False).agg(
+            {
+                "workorder": "first",
+                "payment_type": "first",
+                "costing_rate": "first",
+                "hourly_rate": "first",
+                "hours": "sum",
+                "cost": "sum",
+                "description": "first",
+                "agresso_description": "first",
+            }
+        )
+        totals_df = totals_df[
+            [
+                "workorder",
+                "project_id",
+                "payment_type",
+                "costing_rate",
+                "hourly_rate",
+                "hours",
+                "cost",
+                "description",
+                "agresso_description",
+            ]
+        ]
+        totals_df.to_csv(totals_path, sep="\t", index=False)
+
+        da_df = totals_df[totals_df["payment_type"] == "DA"]
+        if len(da_df):
+            da_df.to_csv(da_path, sep="\t", index=False)
+
+        di_df = totals_df[totals_df["payment_type"] == "DI"]
+        if len(di_df):
+            di_df.to_csv(di_path, sep="\t", index=False)
+
+        logger.warning(f"{len(df)} journal entries successfully written to {itemised_path}")
+        logger.warning(f"{len(totals_df)} project totals successfully written to {totals_path}")
+        if len(da_df):
+            logger.warning(f"{len(da_df)} DA totals successfully written to {da_path}")
+        if len(di_df):
+            logger.warning(f"{len(di_df)} DI totals successfully written to {di_path}")
     else:
         logger.warning("Start time must not be more than 3 months ago!")