papi-projects 0.4.0__tar.gz → 0.4.1__tar.gz

{papi_projects-0.4.0 → papi_projects-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: papi-projects
-Version: 0.4.0
+Version: 0.4.1
 Summary: PAPI is an API for managing projects
 Author-email: sandyjmacdonald <sandyjmacdonald@gmail.com>
 License-Expression: MIT
@@ -11,6 +11,7 @@ Requires-Dist: httpx>=0.27.2
 Requires-Dist: tinydb>=4.8.0
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: pyperclip>=1.9.0
+Requires-Dist: pandas>=2.3.3
 
 PAPI is an API for managing projects.
 

{papi_projects-0.4.0 → papi_projects-0.4.1}/papi/wrappers.py

@@ -799,7 +799,6 @@ class NotionWrapper(Protocol):
                 payment_type=payment_type,
                 notion_page_id=notion_page_id,
             )
-            print(workorder)
         if len(workorders):
             logger.info(f"{len(workorders)} Notion workorders found")
         else:
@@ -974,7 +973,6 @@ class NotionWrapper(Protocol):
             project_owner =[owner["name"] for owner in p["properties"]["Owner"]["people"]]
             project_status = p["properties"]["Status"]["status"]["name"]
             project_priority = p["properties"]["Priority"]["select"]["name"]
-            print(p["properties"])
             notion_page_id = p["id"]
             if "TEMPLATE" not in project_name:
                 user_id = p["properties"]["PI Code"]["rollup"]["array"][0]["rich_text"][0][

{papi_projects-0.4.0 → papi_projects-0.4.1}/papi_projects.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: papi-projects
-Version: 0.4.0
+Version: 0.4.1
 Summary: PAPI is an API for managing projects
 Author-email: sandyjmacdonald <sandyjmacdonald@gmail.com>
 License-Expression: MIT
@@ -11,6 +11,7 @@ Requires-Dist: httpx>=0.27.2
 Requires-Dist: tinydb>=4.8.0
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: pyperclip>=1.9.0
+Requires-Dist: pandas>=2.3.3
 
 PAPI is an API for managing projects.
 

{papi_projects-0.4.0 → papi_projects-0.4.1}/papi_projects.egg-info/requires.txt

@@ -3,3 +3,4 @@ httpx>=0.27.2
 tinydb>=4.8.0
 python-dotenv>=1.0.0
 pyperclip>=1.9.0
+pandas>=2.3.3

{papi_projects-0.4.0 → papi_projects-0.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "papi-projects"
-version = "0.4.0"
+version = "0.4.1"
 description = "PAPI is an API for managing projects"
 authors = [{ name = "sandyjmacdonald", email = "sandyjmacdonald@gmail.com" }]
 license = "MIT"
@@ -13,6 +13,7 @@ dependencies = [
     "tinydb>=4.8.0",
     "python-dotenv>=1.0.0",
     "pyperclip>=1.9.0",
+    "pandas>=2.3.3",
 ]
 
 [project.scripts]

{papi_projects-0.4.0 → papi_projects-0.4.1}/scripts/generate_timesheet.py

@@ -2,10 +2,10 @@ import argparse
 import pendulum
 import warnings
 from papi.wrappers import TogglTrackWrapper, NotionWrapper
-from papi import config
+from papi import config, setup_logger
 from papi.project import get_project_ids, check_project_id
-
 from decimal import Decimal, ROUND_UP
+import pandas as pd
 
 def initialise_toggl(toggl_api_key, toggl_workspace):
     """Initialises the TogglTrackWrapper.
@@ -65,7 +65,6 @@ def get_toggl_hours(start_time, end_time, toggl):
 
 def main():
     """Main function of generate-timesheet script"""
-
     # Set up argparse
     parser = argparse.ArgumentParser()
     parser.add_argument(
@@ -74,15 +73,24 @@ def main():
     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(
+        "--disable-logging",
+        action="store_true",
+        help="disable logging output for the papi library",
+    )
     parser.add_argument(
         "-o",
         "--output",
         type=str,
-        help="output TSV filename, omit to write to stdout",
+        help="output TSV filename",
         default=False,
+        required=True
     )
     args = parser.parse_args()
 
+    if not args.disable_logging:
+        logger = setup_logger(True, "WARNING", None)
+
     # Set up start/end date
     start_date = args.start
     start_time = pendulum.parse(start_date).to_rfc3339_string()
@@ -105,29 +113,82 @@ def main():
         notion_projects_db = config["NOTION_PROJECTS_DB"]
         notion_workorders_db = config["NOTION_WORKORDERS_DB"]
         notion = NotionWrapper(notion_api_secret)
-
         project_ids = hours_dict.keys()
+        output = args.output
+        df = pd.DataFrame(
+            columns=[
+                "workorder",
+                "project_id",
+                "payment_type",
+                "costing_rate",
+                "hourly_rate",
+                "hours",
+                "cost",
+                "description",
+                "agresso_description",
+            ]
+        )
+
         for project_id in project_ids:
+            hours = float(hours_dict[project_id])
+            payment_type = ""
+            costing_rate = ""
+            hourly_rate = ""
+            cost = 0.0
+            chargeable = False
+            workorder_id = ""
             if check_project_id(project_id):
-                project = notion.get_project(notion_projects_db, project_id, workorders_db_id=notion_workorders_db)
+                project = notion.get_project(
+                    notion_projects_db,
+                    project_id,
+                    workorders_db_id=notion_workorders_db
+                )
+                project_name = project.name
                 workorder_id = project.workorder
                 if workorder_id is not None:
-                    workorder = notion.get_workorder(workorders_db_id=notion_workorders_db, workorder_id=workorder_id)
+                    workorder = notion.get_workorder(
+                        workorders_db_id=notion_workorders_db,
+                        workorder_id=workorder_id
+                    )
                     if workorder.is_complete():
-                        hours = float(hours_dict[project_id])
-                        print(
-                            f"{workorder.id}\t"
-                            f"{project_id}\t"
-                            f"{workorder.payment_type}\t"
-                            f"{workorder.costing_rate}\t"
-                            f"{workorder.hourly_rate}\t"
-                            f"{hours}\t"
-                            f"{calculate_cost(hours, workorder.hourly_rate)}\t"
-                            f"{project.name}\t"
-                            f"{project.id}: {project.name}"
+                        payment_type = workorder.payment_type
+                        costing_rate = workorder.costing_rate
+                        hourly_rate = workorder.hourly_rate
+                        cost = calculate_cost(hours, workorder.hourly_rate)
+                        chargeable = True
+                        logger.warning(
+                            f"Project: {project_id}: Has complete data and is chargeable"
+                        )
+                    else:
+                        logger.warning(
+                            f"Project {project_id}: Workorder {workorder.id} has incomplete data!"
                         )
+                else:
+                    workorder_id = ""
+                    logger.warning(f"Project {project_id}: Workorder is missing!")
+            else:
+                logger.warning(f"Project {project_id}: Not a valid project ID!")
+                project_name = project_id
+
+            agresso_description = f"{project_id}: {project_name}"
+            description = project_name
+
+            df.loc[len(df)] = [
+                workorder_id,
+                project_id,
+                payment_type,
+                costing_rate,
+                hourly_rate,
+                hours,
+                cost,
+                description,
+                agresso_description,
+            ]
+
+        df.to_csv(output, sep="\t", index=False)
+        logger.warning(f"{len(df)} journal entries successfully written to {output}")
     else:
-        warnings.warn("Start time must not be more than 3 months ago!")
+        logger.warning("Start time must not be more than 3 months ago!")
 
 if __name__ == "__main__":
     main()