youtrack-cli 0.3.4__tar.gz → 0.3.6__tar.gz

{youtrack_cli-0.3.4 → youtrack_cli-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: youtrack-cli
-Version: 0.3.4
+Version: 0.3.6
 Summary: YouTrack CLI - Command line interface for JetBrains YouTrack issue tracking system
 Project-URL: Homepage, https://github.com/ryan-murphy/yt-cli
 Project-URL: Documentation, https://yt-cli.readthedocs.io/

{youtrack_cli-0.3.4 → youtrack_cli-0.3.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "youtrack-cli"
-version = "0.3.4"
+version = "0.3.6"
 description = "YouTrack CLI - Command line interface for JetBrains YouTrack issue tracking system"
 readme = "README.md"
 requires-python = ">=3.9, <3.14"

{youtrack_cli-0.3.4 → youtrack_cli-0.3.6}/uv.lock

@@ -1751,7 +1751,7 @@ wheels = [
 
 [[package]]
 name = "youtrack-cli"
-version = "0.3.4"
+version = "0.3.6"
 source = { editable = "." }
 dependencies = [
     { name = "click" },

{youtrack_cli-0.3.4 → youtrack_cli-0.3.6}/youtrack_cli/admin.py

@@ -5,7 +5,6 @@ from typing import Any, Optional
 import httpx
 from rich.console import Console
 from rich.table import Table
-from rich.text import Text
 
 from .auth import AuthManager
 
@@ -201,7 +200,7 @@ class AdminManager:
         async with httpx.AsyncClient() as client:
             try:
                 response = await client.get(
-                    f"{credentials.base_url.rstrip('/')}/api/admin/globalSettings/license/usage",
+                    f"{credentials.base_url.rstrip('/')}/api/admin/globalSettings/license?fields=id,username,license,error",
                     headers=headers,
                     timeout=10.0,
                 )
@@ -242,8 +241,8 @@ class AdminManager:
 
         # List of endpoints to try, in order of preference
         endpoints = [
+            "/api/admin/globalSettings/systemSettings?fields=baseUrl,isApplicationReadOnly,maxUploadFileSize,maxExportItems,allowStatisticsCollection",
             "/api/admin/globalSettings/systemSettings",
-            "/api/admin/globalSettings/systemSettings?fields=baseUrl,isApplicationReadOnly,maxUploadFileSize,maxExportItems",
         ]
 
         async with httpx.AsyncClient() as client:
@@ -370,7 +369,7 @@ class AdminManager:
         async with httpx.AsyncClient() as client:
             try:
                 response = await client.get(
-                    f"{credentials.base_url.rstrip('/')}/api/rest/usergroups",
+                    f"{credentials.base_url.rstrip('/')}/hub/api/rest/usergroups",
                     headers=headers,
                     params=params,
                     timeout=10.0,
@@ -540,19 +539,32 @@ class AdminManager:
             license_info: License information dictionary
         """
         self.console.print("\n[bold blue]License Information[/bold blue]")
-        self.console.print(f"[cyan]License Type:[/cyan] {license_info.get('type', 'N/A')}")
-        self.console.print(f"[cyan]Licensed To:[/cyan] {license_info.get('licensedTo', 'N/A')}")
 
-        if license_info.get("expirationDate"):
-            self.console.print(f"[cyan]Expires:[/cyan] {license_info['expirationDate']}")
+        # Display username (maps to "Licensed To")
+        username = license_info.get("username", "N/A")
+        self.console.print(f"[cyan]Licensed To:[/cyan] {username}")
 
-        if license_info.get("maxUsers"):
-            self.console.print(f"[cyan]Max Users:[/cyan] {license_info['maxUsers']}")
+        # Display license key (truncated for security)
+        license_key = license_info.get("license", "N/A")
+        if license_key != "N/A" and len(license_key) > 20:
+            # Show only first 20 characters for security
+            license_display = f"{license_key[:20]}..."
+        else:
+            license_display = license_key
+        self.console.print(f"[cyan]License Key:[/cyan] {license_display}")
+
+        # Display error status if present
+        error = license_info.get("error")
+        if error:
+            self.console.print(f"[cyan]Error:[/cyan] [red]{error}[/red]")
+            status_color = "red"
+            status_text = "Error"
+        else:
+            # If no error and license key exists, assume active
+            is_active = license_key != "N/A" and license_key is not None
+            status_color = "green" if is_active else "red"
+            status_text = "Active" if is_active else "No License"
 
-        # Display active status
-        is_active = license_info.get("isActive", False)
-        status_color = "green" if is_active else "red"
-        status_text = "Active" if is_active else "Inactive"
         self.console.print(f"[cyan]Status:[/cyan] [{status_color}]{status_text}[/{status_color}]")
 
     def display_system_health(self, health_info: dict[str, Any]) -> None:
@@ -561,31 +573,41 @@ class AdminManager:
         Args:
             health_info: Health information dictionary
         """
-        self.console.print("\n[bold blue]System Health[/bold blue]")
-
-        # Overall status
-        overall_status = health_info.get("status", "unknown")
-        status_color = "green" if overall_status == "healthy" else "red"
-        self.console.print(f"[cyan]Overall Status:[/cyan] [{status_color}]{overall_status.title()}[/{status_color}]")
-
-        # Individual checks
-        checks = health_info.get("checks", [])
-        if checks:
-            table = Table(title="Health Checks")
-            table.add_column("Check", style="cyan")
-            table.add_column("Status", style="magenta")
-            table.add_column("Message", style="dim")
-
-            for check in checks:
-                status = check.get("status", "unknown")
-                color = "green" if status == "healthy" else "red"
-                table.add_row(
-                    check.get("name", "Unknown"),
-                    Text(status.title(), style=color),
-                    check.get("message", ""),
-                )
-
-            self.console.print(table)
+        self.console.print("\n[bold blue]System Settings[/bold blue]")
+
+        # Display system settings information
+        base_url = health_info.get("baseUrl", "N/A")
+        self.console.print(f"[cyan]Base URL:[/cyan] {base_url}")
+
+        # Display read-only status
+        is_read_only = health_info.get("isApplicationReadOnly", False)
+        read_only_color = "red" if is_read_only else "green"
+        read_only_text = "Read-Only" if is_read_only else "Read-Write"
+        self.console.print(f"[cyan]Application Mode:[/cyan] [{read_only_color}]{read_only_text}[/{read_only_color}]")
+
+        # Display file upload settings
+        max_upload_size = health_info.get("maxUploadFileSize", "N/A")
+        if max_upload_size != "N/A":
+            # Convert bytes to MB for readability
+            max_upload_mb = max_upload_size / (1024 * 1024)
+            self.console.print(f"[cyan]Max Upload Size:[/cyan] {max_upload_mb:.1f} MB")
+        else:
+            self.console.print(f"[cyan]Max Upload Size:[/cyan] {max_upload_size}")
+
+        # Display export settings
+        max_export_items = health_info.get("maxExportItems", "N/A")
+        self.console.print(f"[cyan]Max Export Items:[/cyan] {max_export_items}")
+
+        # Display statistics collection status
+        stats_collection = health_info.get("allowStatisticsCollection", False)
+        stats_color = "green" if stats_collection else "yellow"
+        stats_text = "Enabled" if stats_collection else "Disabled"
+        self.console.print(f"[cyan]Statistics Collection:[/cyan] [{stats_color}]{stats_text}[/{stats_color}]")
+
+        # Overall system status based on read-only mode
+        overall_status = "Healthy" if not is_read_only else "Read-Only Mode"
+        status_color = "green" if not is_read_only else "yellow"
+        self.console.print(f"[cyan]Overall Status:[/cyan] [{status_color}]{overall_status}[/{status_color}]")
 
     def display_user_groups(self, groups: list[dict[str, Any]]) -> None:
         """Display user groups in a formatted table.

{youtrack_cli-0.3.4 → youtrack_cli-0.3.6}/youtrack_cli/main.py

@@ -1044,11 +1044,15 @@ def usage(ctx: click.Context) -> None:
             console.print(f"[red]Error:[/red] {result['message']}")
             return
 
-        usage_data = result["data"]
-        console.print("[bold]License Usage Statistics:[/bold]")
-        console.print(f"Total Users: {usage_data.get('totalUsers', 'N/A')}")
-        console.print(f"Active Users: {usage_data.get('activeUsers', 'N/A')}")
-        console.print(f"Remaining Users: {usage_data.get('remainingUsers', 'N/A')}")
+        license_data = result["data"]
+        console.print("[bold]License Information:[/bold]")
+        console.print(f"License ID: {license_data.get('id', 'N/A')}")
+        console.print(f"Username: {license_data.get('username', 'N/A')}")
+        console.print(f"License Key: {license_data.get('license', 'N/A')}")
+        if license_data.get("error"):
+            console.print(f"[red]Error:[/red] {license_data['error']}")
+        else:
+            console.print("[green]Status: Valid[/green]")
 
     asyncio.run(run_license_usage())