crowdtime-cli 0.18.0__tar.gz → 0.20.0__tar.gz

{crowdtime_cli-0.18.0 → crowdtime_cli-0.20.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crowdtime-cli
-Version: 0.18.0
+Version: 0.20.0
 Summary: AI-powered time tracking CLI — a modern, developer-friendly alternative to Harvest
 Project-URL: Homepage, https://crowdtime.lat
 Project-URL: Documentation, https://crowdtime.lat/docs

{crowdtime_cli-0.18.0 → crowdtime_cli-0.20.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "crowdtime-cli"
-version = "0.18.0"
+version = "0.20.0"
 description = "AI-powered time tracking CLI — a modern, developer-friendly alternative to Harvest"
 readme = "README.md"
 license = {text = "Proprietary"}

{crowdtime_cli-0.18.0 → crowdtime_cli-0.20.0}/src/crowdtime_cli/__init__.py

@@ -1,3 +1,3 @@
 """CrowdTime CLI - AI-powered time tracking from the command line."""
 
-__version__ = "0.18.0"
+__version__ = "0.20.0"

{crowdtime_cli-0.18.0 → crowdtime_cli-0.20.0}/src/crowdtime_cli/client.py

@@ -133,6 +133,25 @@ class CrowdTimeClient:
         response = self._request("DELETE", url)
         return response
 
+    def current_user_id(self) -> str | None:
+        """The authenticated user's id, cached in the config after the first lookup.
+
+        ``ct auth login`` refreshes the cache and ``ct auth logout`` clears it,
+        so the cached id always belongs to the stored token.
+        """
+        cached = self.config.get("user.id")
+        if cached:
+            return str(cached)
+        try:
+            me = self.get("/auth/me/", org_scoped=False)
+        except APIError:
+            return None
+        user_id = me.get("id") if isinstance(me, dict) else None
+        if not user_id:
+            return None
+        self.config.set("user.id", str(user_id))
+        return str(user_id)
+
     def _request(self, method: str, url: str, **kwargs: Any) -> Any:
         """Execute an HTTP request with error handling."""
         if _DEBUG:

{crowdtime_cli-0.18.0 → crowdtime_cli-0.20.0}/src/crowdtime_cli/commands/auth_cmd.py

@@ -59,6 +59,7 @@ def _login_with_token(token: str, output_json: bool) -> None:
         client = CrowdTimeClient(require_auth=True, require_org=False)
         data = client.get("/api/v1/auth/me/", org_scoped=False)
         user = User(**data)
+        get_config().set("user.id", user.id)  # read back by current_user_id()
 
         if output_json:
             print_json(user)
@@ -118,6 +119,7 @@ def _login_with_browser(output_json: bool) -> None:
         client = CrowdTimeClient(require_auth=True, require_org=False)
         data = client.get("/api/v1/auth/me/", org_scoped=False)
         user = User(**data)
+        config.set("user.id", user.id)  # read back by current_user_id()
 
         if output_json:
             print_json(user)
@@ -140,6 +142,7 @@ def logout() -> None:
         return
 
     clear_token()
+    get_config().set("user.id", "")
     format_success("Logged out. Token removed.")
 
 

{crowdtime_cli-0.18.0 → crowdtime_cli-0.20.0}/src/crowdtime_cli/commands/clients_cmd.py

@@ -84,7 +84,9 @@ def list_clients(
             for c in clients_list:
                 client_id = str(c.get("id", ""))
                 name = c.get("name", "")
-                contact = c.get("contact_name", "") or "-"
+                # The primary contact record; contact_name is a legacy field (CRO-83).
+                primary = c.get("primary_contact") or {}
+                contact = primary.get("name") or c.get("contact_name", "") or "-"
                 project_count = str(c.get("project_count", 0))
                 is_archived = c.get("is_archived", False)
                 status = "[red]Archived[/red]" if is_archived else "[green]Active[/green]"
@@ -117,11 +119,30 @@ def show(
             console.print(f"\n[bold]{data.get('name')}[/bold]")
             console.print(f"  ID:       {data.get('id')}")
             console.print(f"  Currency: {data.get('currency', '-')}")
-            console.print(f"  Contact:  {data.get('contact_name', '-')}")
-            if data.get("contact_email"):
-                console.print(f"  Email:    {data['contact_email']}")
-            if data.get("contact_phone"):
-                console.print(f"  Phone:    {data['contact_phone']}")
+            contacts = data.get("contacts") or []
+            if contacts:
+                for contact in contacts:
+                    line = f"  Contact:  {contact.get('name', '')}"
+                    if contact.get("email"):
+                        line += f" <{contact['email']}>"
+                    if contact.get("phone"):
+                        line += f" {contact['phone']}"
+                    if contact.get("role"):
+                        line += f" — {contact['role']}"
+                    flags = [
+                        label for key, label in (("is_primary", "primary"), ("receives_invoices", "invoices"))
+                        if contact.get(key)
+                    ]
+                    if flags:
+                        line += f" [dim]({', '.join(flags)})[/dim]"
+                    console.print(line)
+            else:
+                # Legacy contact fields, only on clients that never got a contact record.
+                console.print(f"  Contact:  {data.get('contact_name') or '-'}")
+                if data.get("contact_email"):
+                    console.print(f"  Email:    {data['contact_email']}")
+                if data.get("contact_phone"):
+                    console.print(f"  Phone:    {data['contact_phone']}")
             if data.get("address"):
                 console.print(f"  Address:  {data['address']}")
             status = "Archived" if data.get("is_archived") else "Active"
@@ -149,7 +170,7 @@ def create(
     country: Optional[str] = typer.Option(None, "--country", help="Country."),
     output_json: bool = typer.Option(False, "--json", help="Output as JSON."),
 ) -> None:
-    """Create a new client.
+    """Create a new client. --contact/--email add its primary contact.
 
     Examples:
         ct clients create "Acme Corp"
@@ -157,13 +178,13 @@ def create(
     """
     api_client = CrowdTimeClient(require_auth=True, require_org=True)
 
+    if contact_email and not contact_name:
+        format_error("--email needs --contact (the contact's name).")
+        raise typer.Exit(1)
+
     payload: dict = {"name": name}
     if currency:
         payload["currency"] = currency
-    if contact_name:
-        payload["contact_name"] = contact_name
-    if contact_email:
-        payload["contact_email"] = contact_email
     if address_line1:
         payload["address_line1"] = address_line1
     if address_line2:
@@ -180,10 +201,22 @@ def create(
     try:
         data = api_client.post("/clients/", data=payload)
 
+        # Contacts are records of their own, shown on the client page and used
+        # for invoicing — not the legacy contact_* fields on the client (CRO-83).
+        if contact_name:
+            contact = api_client.post(f"/clients/{data.get('id')}/contacts/", data={
+                "name": contact_name,
+                "email": contact_email or "",
+                "is_primary": True,
+            })
+            data["contacts"] = [contact]
+
         if output_json:
             print_json(data)
         else:
             format_success(f"Client '{data.get('name')}' created (ID: {data.get('id')})")
+            if contact_name:
+                console.print(f"  Primary contact: {contact_name}" + (f" <{contact_email}>" if contact_email else ""))
     except APIError as e:
         format_error(e.message)
         raise typer.Exit(1)
@@ -203,7 +236,7 @@ def edit(
     country: Optional[str] = typer.Option(None, "--country", help="Country."),
     output_json: bool = typer.Option(False, "--json", help="Output as JSON."),
 ) -> None:
-    """Edit an existing client.
+    """Edit an existing client. --contact/--email update its primary contact.
 
     Examples:
         ct clients edit <client-id> --name "New Name"
@@ -216,10 +249,6 @@ def edit(
         payload["name"] = name
     if currency is not None:
         payload["currency"] = currency
-    if contact_name is not None:
-        payload["contact_name"] = contact_name
-    if contact_email is not None:
-        payload["contact_email"] = contact_email
     if address_line1 is not None:
         payload["address_line1"] = address_line1
     if city is not None:
@@ -231,12 +260,35 @@ def edit(
     if country is not None:
         payload["country"] = country
 
-    if not payload:
+    contact_payload: dict = {}
+    if contact_name is not None:
+        contact_payload["name"] = contact_name
+    if contact_email is not None:
+        contact_payload["email"] = contact_email
+
+    if not payload and not contact_payload:
         format_error("No changes specified. Use --name, --currency, --contact, etc.")
         raise typer.Exit(1)
 
     try:
-        data = api_client.patch(f"/clients/{client_id}/", data=payload)
+        if payload:
+            data = api_client.patch(f"/clients/{client_id}/", data=payload)
+        else:
+            data = api_client.get(f"/clients/{client_id}/")
+
+        # Contacts are records of their own, shown on the client page and used
+        # for invoicing (CRO-83): update the primary one, or create it.
+        if contact_payload:
+            contacts = extract_results(api_client.get(f"/clients/{client_id}/contacts/"))
+            primary = next((c for c in contacts if c.get("is_primary")), contacts[0] if contacts else None)
+            if primary:
+                api_client.patch(f"/clients/{client_id}/contacts/{primary['id']}/", data=contact_payload)
+            elif contact_payload.get("name"):
+                api_client.post(f"/clients/{client_id}/contacts/", data={**contact_payload, "is_primary": True})
+            else:
+                format_error("This client has no contact yet — pass --contact (the contact's name) with --email.")
+                raise typer.Exit(1)
+            data = api_client.get(f"/clients/{client_id}/")
 
         if output_json:
             print_json(data)

{crowdtime_cli-0.18.0 → crowdtime_cli-0.20.0}/src/crowdtime_cli/commands/log_cmd.py

@@ -381,11 +381,23 @@ def list_entries(
     task: Optional[str] = typer.Option(None, "--task", "-t", help="Filter by task name or ID."),
     billable: Optional[bool] = typer.Option(None, "--billable/--no-billable", "-b/-B",
                                             help="Filter by billable status."),
-    user: Optional[str] = typer.Option(None, "--user", "-u", help="Filter by user ID (manager+ only)."),
+    user: Optional[str] = typer.Option(
+        None, "--user", "-u",
+        help="Filter by user ID. Only people whose time you can see: yourself, your direct "
+             "reports (manager), and anyone on projects you manage (project manager).",
+    ),
+    mine: bool = typer.Option(
+        False, "--mine",
+        help="Only your own entries. Managers and project managers otherwise also see "
+             "the time of the people and projects they manage.",
+    ),
     format_output: str = typer.Option("table", "--format", help="Output format: table, json, csv."),
     output_json: bool = typer.Option(False, "--json", help="Output as JSON."),
 ) -> None:
-    """List time entries with optional filters."""
+    """List time entries with optional filters.
+
+    The table and CSV show a User column whenever an entry isn't yours.
+    """
     effective_date = date
     if today_flag:
         effective_date = "today"
@@ -402,6 +414,7 @@ def list_entries(
         task=task,
         billable=billable,
         user=user,
+        mine=mine,
         format_output=format_output,
         output_json=output_json,
     )
@@ -417,6 +430,7 @@ def _list_entries(
     task: str | None = None,
     billable: bool | None = None,
     user: str | None = None,
+    mine: bool = False,
     format_output: str = "table",
     output_json: bool = False,
 ) -> None:
@@ -425,6 +439,14 @@ def _list_entries(
 
     client = CrowdTimeClient(require_auth=True, require_org=True)
 
+    # Known up front so other people's entries can be told apart (CRO-85).
+    me = client.current_user_id()
+    if mine:
+        if not me:
+            format_error("Could not resolve your user id. Run ct auth login again.")
+            raise typer.Exit(1)
+        user = me
+
     params: dict = {}
 
     if date_str:
@@ -484,7 +506,10 @@ def _list_entries(
         elif format_output == "csv":
             _print_csv(entries)
         else:
-            format_entries_table(entries, show_date=True)
+            # Someone else's entry with no owner column looks like your own;
+            # the column appears as soon as the list holds one (CRO-85).
+            foreign = any(e.user and e.user != me for e in entries)
+            format_entries_table(entries, show_date=True, show_user=bool(user) or foreign)
     except APIError as e:
         format_error(e.message)
         raise typer.Exit(1)
@@ -492,13 +517,14 @@ def _list_entries(
 
 def _print_csv(entries: list[TimeEntry]) -> None:
     """Print entries as CSV (plain output, safe for piping)."""
-    print("id,date,project,task,description,duration,billable,hourly_rate,billable_amount")
+    print("id,date,user,project,task,description,duration,billable,hourly_rate,billable_amount")
     for e in entries:
         desc = (e.description or "").replace('"', '""')
+        user_name = (e.user_name or "").replace('"', '""')
         rate = getattr(e, "hourly_rate", None) or ""
         amount = getattr(e, "billable_amount", None) or ""
         print(
-            f'{e.id},{e.date or ""},'
+            f'{e.id},{e.date or ""},"{user_name}",'
             f'{e.project_name or ""},{e.task_name or ""},'
             f'"{desc}",{e.duration or 0},'
             f'{"yes" if e.is_billable else "no"},'

{crowdtime_cli-0.18.0 → crowdtime_cli-0.20.0}/src/crowdtime_cli/commands/pto_cmd.py

@@ -46,7 +46,11 @@ from ..models import (
 )
 from ..utils import format_date, format_duration, parse_date, parse_date_range
 
-app = typer.Typer(name="pto", help="Manage PTO (paid time off) requests.")
+app = typer.Typer(name="pto", help="Manage time off requests.")
+# Hidden from help: nothing may tell someone without paid time off that it
+# exists (CRO-84). Admins and people who have it know where to look.
+allowance_app = typer.Typer(name="allowance", help="Paid time off allowances (admin+).")
+app.add_typer(allowance_app, name="allowance", hidden=True)
 console = Console()
 
 
@@ -258,12 +262,6 @@ def add_cmd(
         help="Decimal hours per day. Omit for full-day from membership.",
     ),
     notes: Optional[str] = typer.Option(None, "--notes", "-n", help="Optional free-text notes."),
-    paid: Optional[bool] = typer.Option(
-        None, "--paid/--unpaid",
-        help="Whether these hours are paid. Omit to follow the organization's "
-             "policy for this kind. Account managers and above only — the API "
-             "rejects the request from anyone below, it is not ignored.",
-    ),
     output_json: bool = typer.Option(False, "--json", help="Output as JSON."),
 ) -> None:
     """On-behalf PTO entry, auto-approved. Project manager+, within their scope."""
@@ -289,18 +287,13 @@ def add_cmd(
         payload["hours_per_day"] = str(hpd)
     if notes is not None:
         payload["notes"] = notes
-    # Declared since the flag was added but never sent, so --unpaid silently
-    # booked paid leave. The backend defaults every kind to paid, so the
-    # omission was not neutral.
-    if paid is not None:
-        payload["is_paid"] = paid
 
     try:
         data = client.post("/time-off/", data=payload)
     except APIError as e:
         # Surface the rejection as a friendly error — the backend refuses
         # `user` values outside the caller's visible set, refuses it entirely
-        # below project manager, and refuses `is_paid` below account manager.
+        # below project manager.
         format_error(e.message)
         raise typer.Exit(1)
 
@@ -721,3 +714,119 @@ def summary_cmd(
 
     summary = TimeOffSummary(**data)
     console.print(format_timeoff_summary_panel(summary))
+
+
+# ── Paid time off (CRO-84) ──────────────────────────────────────────────
+# Whether someone is paid for leave follows the allowance an admin gave them;
+# nobody flags a request as paid. The API answers 404 to anyone who may not
+# know, so these commands print the same thing for "none" and "not allowed".
+
+
+def _print_balance(data: dict) -> None:
+    b = data.get("balance")
+    name = data.get("name") or data.get("email")
+    days = data.get("paid_time_off_days_per_year")
+    if not b:
+        console.print(f"[bold]{name}[/bold]: no paid time off — their leave is unpaid.")
+        return
+    console.print(
+        f"[bold]{name}[/bold]: {b['remaining_days']} of {b['allowance_days']} paid days left "
+        f"({b['year_start']} → {b['year_end']})"
+    )
+    console.print(
+        f"  used {b['used_days']} · requested {b['pending_days']} · unpaid {b['unpaid_days']}"
+        f"   [dim]{days} days/year from {data.get('paid_time_off_start_date')}[/dim]"
+    )
+
+
+@app.command("balance", hidden=True)
+def balance_cmd(
+    user: Optional[str] = typer.Option(None, "--user", "-u", help="Someone whose leave you approve (email or UUID). Default: you."),
+    output_json: bool = typer.Option(False, "--json", help="Output as JSON."),
+) -> None:
+    """Your paid time off balance, or that of someone whose leave you approve."""
+    client = CrowdTimeClient(require_auth=True, require_org=True)
+    try:
+        user_id = _resolve_user_to_uuid(client, user) if user else client.current_user_id()
+        data = client.get(f"/members/{user_id}/paid-time-off/")
+    except APIError as e:
+        if e.status_code == 404:
+            console.print("[dim]No balance to show.[/dim]")
+            return
+        format_error(e.message)
+        raise typer.Exit(1)
+    if output_json:
+        print_json(data)
+        return
+    _print_balance(data)
+
+
+@allowance_app.command("list")
+def allowance_list_cmd(
+    output_json: bool = typer.Option(False, "--json", help="Output as JSON."),
+) -> None:
+    """Every member's paid time off allowance and remaining days. Admin+."""
+    client = CrowdTimeClient(require_auth=True, require_org=True)
+    try:
+        rows = client.get("/members/paid-time-off/").get("results", [])
+    except APIError as e:
+        format_error("Only admins can list allowances." if e.status_code == 404 else e.message)
+        raise typer.Exit(1)
+    if output_json:
+        print_json(rows)
+        return
+    from rich.table import Table
+
+    table = Table(show_header=True, header_style="bold")
+    table.add_column("User ID", style="dim")
+    table.add_column("Name")
+    table.add_column("Days/year", justify="right")
+    table.add_column("Counting from")
+    table.add_column("Left this year", justify="right")
+    for r in rows:
+        b = r.get("balance")
+        table.add_row(
+            r["user_id"], r.get("name") or r.get("email"),
+            str(r["paid_time_off_days_per_year"]) if r.get("paid_time_off_days_per_year") else "—",
+            str(r.get("paid_time_off_start_date") or "—"),
+            str(b["remaining_days"]) if b else "—",
+        )
+    console.print(table)
+
+
+@allowance_app.command("set")
+def allowance_set_cmd(
+    user: str = typer.Argument(..., help="Member (email or UUID)."),
+    days: str = typer.Option(..., "--days", help="Paid days per allowance year; 0 for none."),
+    start: Optional[str] = typer.Option(
+        None, "--from",
+        help="When the allowance starts counting (YYYY-MM-DD): the day they joined, or the day "
+             "this arrangement started. Defaults to the day they joined.",
+    ),
+    output_json: bool = typer.Option(False, "--json", help="Output as JSON."),
+) -> None:
+    """Set someone's paid time off. Admin+, never your own.
+
+    Applies to leave approved from now on; leave already approved keeps what it was paid.
+    """
+    try:
+        value = Decimal(days)
+    except InvalidOperation:
+        format_error(f"--days must be a number, got '{days}'.")
+        raise typer.Exit(1)
+    payload: dict = {"paid_time_off_days_per_year": str(value)}
+    if start:
+        payload["paid_time_off_start_date"] = format_date(_parse_date_or_exit(start))
+
+    client = CrowdTimeClient(require_auth=True, require_org=True)
+    try:
+        user_id = _resolve_user_to_uuid(client, user)
+        data = client.patch(f"/members/{user_id}/paid-time-off/", data=payload)
+    except APIError as e:
+        format_error("Member not found." if e.status_code == 404 else e.message)
+        raise typer.Exit(1)
+    if output_json:
+        print_json(data)
+        return
+    format_success("Paid time off updated.")
+    _print_balance(data)