papi-projects 0.2.3__tar.gz → 0.2.4__tar.gz

{papi_projects-0.2.3 → papi_projects-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: papi-projects
-Version: 0.2.3
+Version: 0.2.4
 Summary: PAPI is an API for managing projects
 License: MIT
 Author: sandyjmacdonald

{papi_projects-0.2.3 → papi_projects-0.2.4}/papi/wrappers.py

@@ -436,7 +436,8 @@ class TogglTrackWrapper(Protocol):
         self, start_time=None, end_time=pendulum.now().to_rfc3339_string()
     ) -> dict:
         """Gets all of the Toggl Track user's tracked hours for a given
-        time period. If no end_time is given, then the current time is used.
+        time period. If no end_time is given, then the current time is used. 
+        Only works with start dates up to a maximum of three months ago.
 
         :return: A dictionary containing the Toggl Track projects and hours tracked.
         :rtype: dict
@@ -449,16 +450,20 @@ class TogglTrackWrapper(Protocol):
                 params={"start_date": start_time, "end_date": end_time},
             )
             times_json = r.json()
-            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 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
+            else:
+                warnings.warn(times_json)
+                return None
         else:
             warnings.warn("Please provide a valid start date/time in RFC3339 format!")
             return None

{papi_projects-0.2.3 → papi_projects-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "papi-projects"
-version = "0.2.3"
+version = "0.2.4"
 description = "PAPI is an API for managing projects"
 authors = ["sandyjmacdonald <sandyjmacdonald@gmail.com>"]
 license = "MIT"

papi_projects-0.2.4/scripts/collate_toggl_hours.py

@@ -0,0 +1,72 @@
+import argparse
+import pendulum
+import warnings
+from papi.wrappers import TogglTrackWrapper
+from papi import config
+
+def main():
+    """Main function of collate-toggl-hours script"""
+
+    # Set up argparse
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "-s", "--start", type=str, help="start date in YYYY-MM-DD format", required=True
+    )
+    parser.add_argument(
+        "-e", "--end", type=str, help="end date in YYYY-MM-DD format, if none supplied then end date is now", default=False
+    )
+    parser.add_argument(
+        "-o",
+        "--output",
+        type=str,
+        help="output TSV filename, omit to write to stdout",
+        default=False,
+    )
+    args = parser.parse_args()
+
+    # Set up start/end date
+    start_date = args.start
+    start_time = pendulum.parse(start_date).to_rfc3339_string()
+    end_date = args.end
+    if not end_date:
+        end_time = pendulum.now().to_rfc3339_string()
+    else:
+        end_time = pendulum.parse(end_date).to_rfc3339_string()
+
+    # Check that start time is not more than 3 months ago
+    if pendulum.now() < pendulum.parse(start_date).add(months=3):
+        # Set up Toggl Track API wrapper
+        #
+        # NOTE: you must have added Toggl Track API key and password, with
+        # variable names below to .env file in this directory
+        toggl_api_key = config["TOGGL_TRACK_API_KEY"]
+        toggl_api_password = config["TOGGL_TRACK_PASSWORD"]
+        toggl = TogglTrackWrapper(toggl_api_key, toggl_api_password)
+
+        # Tell wrapper which workspace to set as default
+        toggl_workspace = config["TOGGL_TRACK_WORKSPACE"]
+        toggl.set_default_workspace(toggl_workspace)
+        toggl.set_me()
+
+        # Get tracked hours and tracked project IDs/names
+
+        tracked_hours = toggl.get_user_hours(start_time=start_time, end_time=end_time)
+        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]
+
+        output = args.output
+
+        if output:
+            # If output filename provided, write to file
+            with open(output, "w") as out:
+                for h in sorted(hours_per_project, key=lambda x:x[1], reverse=True):
+                    out.write(f"{h[0]}\t{h[1]}\n")
+        else:
+            # Otherwise, print out project names and tracked hours to stdout
+            for h in sorted(hours_per_project, key=lambda x:x[1], reverse=True):
+                print(f"{h[0]}\t{h[1]}")
+    else:
+        warnings.warn("Start time must not be more than 3 months ago!")
+
+if __name__ == "__main__":
+    main()

papi_projects-0.2.3/scripts/collate_toggl_hours.py

@@ -1,66 +0,0 @@
-import argparse
-import pendulum
-from papi.wrappers import TogglTrackWrapper
-from papi import config
-
-def main():
-    """Main function of collate-toggl-hours script"""
-
-    # Set up argparse
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "-s", "--start", type=str, help="start date in YYYY-MM-DD format", required=True
-    )
-    parser.add_argument(
-        "-e", "--end", type=str, help="end date in YYYY-MM-DD format, if none supplied then end date is now", default=False
-    )
-    parser.add_argument(
-        "-o",
-        "--output",
-        type=str,
-        help="output TSV filename, omit to write to stdout",
-        default=False,
-    )
-    args = parser.parse_args()
-
-    # Set up start/end date
-    start_date = args.start
-    start_time = pendulum.parse(start_date).to_rfc3339_string()
-    end_date = args.end
-    if not end_date:
-        end_time = pendulum.now().to_rfc3339_string()
-    else:
-        end_time = pendulum.parse(end_date).to_rfc3339_string()
-
-    # Set up Toggl Track API wrapper
-    #
-    # NOTE: you must have added Toggl Track API key and password, with
-    # variable names below to .env file in this directory
-    toggl_api_key = config["TOGGL_TRACK_API_KEY"]
-    toggl_api_password = config["TOGGL_TRACK_PASSWORD"]
-    toggl = TogglTrackWrapper(toggl_api_key, toggl_api_password)
-
-    # Tell wrapper which workspace to set as default
-    toggl_workspace = config["TOGGL_TRACK_WORKSPACE"]
-    toggl.set_default_workspace(toggl_workspace)
-    toggl.set_me()
-
-    # Get tracked hours and tracked project IDs/names
-    tracked_hours = toggl.get_user_hours(start_time=start_time, end_time=end_time)
-    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]
-
-    output = args.output
-
-    if output:
-        # If output filename provided, write to file
-        with open(output, "w") as out:
-            for h in sorted(hours_per_project, key=lambda x:x[1], reverse=True):
-                out.write(f"{h[0]}\t{h[1]}\n")
-    else:
-        # Otherwise, print out project names and tracked hours to stdout
-        for h in sorted(hours_per_project, key=lambda x:x[1], reverse=True):
-            print(f"{h[0]}\t{h[1]}")
-
-if __name__ == "__main__":
-    main()