Remove config.ini configuration. Rely on .env files. Make shorter flags.

Author: armiiller

.env.example

@@ -0,0 +1,3 @@
+PAGERTREE_API_KEY=your_api_key_here
+# PAGERTREE_BASE_URL=https://api.pagertree.com/api/v4
+# PAGERTREE_VERBOSE=true

README.md

@@ -63,22 +63,16 @@ export PAGERTREE_API_KEY=your_api_key_here
 Add it to your shell profile (e.g., `~/.bashrc`, `~/.zshrc`) for persistence.
 
 ### Option 2: Configuration File
-Create a `config.ini` file:
-```ini
-[DEFAULT]
-API_KEY = your_api_key_here
+Create a `.env` file in the current working directory or specify a custom path:
+
+```env
+PAGERTREE_API_KEY = your_api_key_here
 ```
+
 Specify the config file when running commands:
 ```bash
-pagertree --config config.ini alerts list
-```
-
-### Option 3: .env File
-Create a `.env` file in the working directory:
-```env
-PAGERTREE_API_KEY=your_api_key_here
+pagertree --config ../other/path/.env alerts list
 ```
-The CLI automatically loads the `.env` file.
 
 ## Usage
 

api.py

@@ -1,21 +1,19 @@
+import click
 import requests
 import os
 import configparser
 from typing import Optional, List, Dict, Any
 
 class PagerTreeClient:
-    def __init__(self, config_file: Optional[str] = None):
+    def __init__(self):
         """Initialize PagerTree client with configuration."""
-        # Load configuration
-        self.config = self._load_config(config_file)
-
         # Set up base URL and API key
-        self.base_url = self.config.get('DEFAULT', 'BASE_URL', fallback=os.getenv('PAGERTREE_BASE_URL', 'https://api.pagertree.com/api/v4'))
-        self.api_key = self.config.get('DEFAULT', 'API_KEY',  fallback=os.getenv('PAGERTREE_API_KEY'))
+        self.base_url = os.getenv('PAGERTREE_BASE_URL', 'https://api.pagertree.com/api/v4')
+        self.api_key = os.getenv('PAGERTREE_API_KEY')
         self.user_agent = "PagerTree-Python-CLI-Client/1.0"
 
         if not self.api_key:
-            raise ValueError("API_KEY must be provided via environment variable or config file")
+            raise click.UsageError("API_KEY must be provided via environment variable or .env config file")
 
         # Set up default headers
         self.default_headers = {
@@ -28,13 +26,6 @@ def __init__(self, config_file: Optional[str] = None):
         self.session = requests.Session()
         self.session.headers.update(self.default_headers)
 
-    def _load_config(self, config_file: Optional[str]) -> configparser.ConfigParser:
-        """Load configuration from file or return empty config."""
-        config = configparser.ConfigParser()
-        if config_file and os.path.exists(config_file):
-            config.read(config_file)
-        return config
-
     # ALERTS
     # =======
 

commands/alerts.py

@@ -1,4 +1,5 @@
 import click
+import json
 from utils import display_paginated_results, handle_api_error, format_item_details
 
 @click.group()
@@ -17,7 +18,7 @@ def alerts():
 def create_alert_cmd(ctx, title, description, team_ids, urgency, tags, alias):
     """Create a new alert in PagerTree."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         result = client.create_alert(
             title=title,
             description=description,
@@ -39,15 +40,19 @@ def create_alert_cmd(ctx, title, description, team_ids, urgency, tags, alias):
 def list_alerts_cmd(ctx, limit, offset, status, search):
     """List alerts in PagerTree with pagination."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
+        logger = ctx.obj.logger  # Get logger from context
+        logger.debug(f"Listing alerts with limit={limit}, offset={offset}, status={status}, search={search}")
         result = client.list_alerts(limit=limit, offset=offset, status=status, search=search)
+        logger.debug(f"Full response: {json.dumps(result, indent=2)}")
         alerts_list = result["data"]
         total = result["total"]
         # Prepare table data
         headers = ["ID", "Title", "Status"]
         table_data = [[alert.get("id"), alert.get("title"), alert.get("status")] for alert in alerts_list]
         display_paginated_results(alerts_list, total, limit, offset, "alert", headers, table_data)
     except Exception as e:
+        logger.error(f"Error listing alerts: {str(e)}")
         handle_api_error(e, action="listing alerts")
 
 @alerts.command(name="show")
@@ -56,7 +61,7 @@ def list_alerts_cmd(ctx, limit, offset, status, search):
 def show_alert_cmd(ctx, alert_id):
     """Show details of a specific alert in PagerTree."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         alert = client.show_alert(alert_id)
         fields = {
             "id": "ID",
@@ -85,7 +90,7 @@ def delete_alert_cmd(ctx, alert_id, force):
         click.echo("Deletion cancelled.")
         return
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         result = client.delete_alert(alert_id)
         click.echo(f"Alert deleted successfully: {alert_id}")
     except Exception as e:
@@ -98,7 +103,7 @@ def delete_alert_cmd(ctx, alert_id, force):
 def acknowledge_alert_cmd(ctx, alert_id, alias):
     """Acknowledge an alert in PagerTree."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
 
         # Ensure at least one of alert_id or alias is provided
         if not alert_id and not alias:
@@ -130,7 +135,7 @@ def acknowledge_alert_cmd(ctx, alert_id, alias):
 def reject_alert_cmd(ctx, alert_id, alias):
     """Reject an alert in PagerTree."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
 
         # Ensure at least one of alert_id or alias is provided
         if not alert_id and not alias:
@@ -162,7 +167,7 @@ def reject_alert_cmd(ctx, alert_id, alias):
 def resolve_alert_cmd(ctx, alert_id, alias):
     """Resolve an alert in PagerTree."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
 
         # Ensure at least one of alert_id or alias is provided
         if not alert_id and not alias:
@@ -196,7 +201,7 @@ def resolve_alert_cmd(ctx, alert_id, alias):
 def list_alert_comment_cmd(ctx, alert_id, alias, limit, offset):
     """List an alert's comments in PagerTree."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
 
         # Ensure at least one of alert_id or alias is provided
         if not alert_id and not alias:
@@ -234,7 +239,7 @@ def list_alert_comment_cmd(ctx, alert_id, alias, limit, offset):
 def create_alert_comment_cmd(ctx, alert_id, alias, comment):
     """Add a comment to an alert in PagerTree."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
 
         # Ensure at least one of alert_id or alias is provided
         if not alert_id and not alias:

commands/broadcasts.py

@@ -18,7 +18,7 @@ def create_broadcast_cmd(
 ):
     """Create a new broadcast in PagerTree."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         result = client.create_broadcast(
             title=title,
             description=description,
@@ -36,7 +36,7 @@ def create_broadcast_cmd(
 def list_broadcasts_cmd(ctx, limit, offset):
     """List broadcasts in PagerTree with pagination."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         result = client.list_broadcasts(limit=limit, offset=offset)
         broadcasts_list = result["data"]
         total = result["total"]
@@ -61,7 +61,7 @@ def list_broadcasts_cmd(ctx, limit, offset):
 def show_broadcast_cmd(ctx, broadcast_id):
     """Show details of a specific broadcast in PagerTree."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         broadcast = client.show_broadcast(broadcast_id)
         fields = {
             "id": "Broadcast ID",
@@ -89,7 +89,7 @@ def delete_broadcast_cmd(ctx, broadcast_id, force):
         click.echo("Deletion cancelled.")
         return
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         result = client.delete_broadcast(broadcast_id)
         click.echo(f"Broadcast deleted successfully: {broadcast_id}")
     except Exception as e:

commands/teams.py

@@ -16,7 +16,7 @@ def teams():
 def create_team_cmd(ctx, name, notes, member_ids, admin_ids):
     """Create a new team in PagerTree."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         result = client.create_team(
             name=name,
             notes=notes,
@@ -35,7 +35,7 @@ def create_team_cmd(ctx, name, notes, member_ids, admin_ids):
 def list_teams_cmd(ctx, limit, offset, search):
     """List teams in PagerTree with pagination."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         result = client.list_teams(limit=limit, offset=offset, search=search)
         teams_list = result["data"]
         total = result["total"]
@@ -58,7 +58,7 @@ def list_teams_cmd(ctx, limit, offset, search):
 def show_team_cmd(ctx, team_id):
     """Show details of a specific team in PagerTree."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         team = client.show_team(team_id)
 
         # Display team details
@@ -164,7 +164,7 @@ def show_team_cmd(ctx, team_id):
 def update_team_cmd(ctx, team_id, name, notes, member_ids, admin_ids):
     """Update a team in PagerTree."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         result = client.update_team(
             team_id=team_id,
             name=name,
@@ -186,7 +186,7 @@ def delete_team_cmd(ctx, team_id, force):
         click.echo("Deletion cancelled.")
         return
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         result = client.delete_team(team_id)
         click.echo(f"Team deleted successfully: {team_id}")
     except Exception as e:
@@ -198,7 +198,7 @@ def delete_team_cmd(ctx, team_id, force):
 def current_oncall_cmd(ctx, team_id):
     """Show current on-call users for a specific team in PagerTree."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         result = client.get_team_current_oncall(team_id)
         if not result:
             click.echo(f"No one schedule oncall for team {team_id}")
@@ -258,7 +258,7 @@ def current_oncall_cmd(ctx, team_id):
 def team_alerts_cmd(ctx, team_id, limit, offset):
     """List alerts for a specific team in PagerTree."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         result = client.get_team_alerts(team_id, limit=limit, offset=offset)
         alerts_list = result["data"]
         total = result["total"]

commands/users.py

@@ -15,7 +15,7 @@ def users():
 def create_user_cmd(ctx, name, email, role, team_ids):
     """Create a new account user in PagerTree."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         roles = {r: True for r in role} if role else {}
         result = client.create_user(name=name, email=email, roles=roles, team_ids=list(team_ids))
         click.echo(f"User created successfully: {result.get('id')}")
@@ -30,7 +30,7 @@ def create_user_cmd(ctx, name, email, role, team_ids):
 def list_users_cmd(ctx, limit, offset, search):
     """List users in PagerTree with pagination."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         result = client.list_users(limit=limit, offset=offset, search=search)
         users_list = result["data"]
         total = result["total"]
@@ -58,7 +58,7 @@ def list_users_cmd(ctx, limit, offset, search):
 def show_user_cmd(ctx, user_id):
     """Show details of a specific user in PagerTree."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         user = client.show_user(user_id)
         fields = {
             "user.id": "User ID",
@@ -95,7 +95,7 @@ def show_user_cmd(ctx, user_id):
 def update_user_cmd(ctx, user_id, name):
     """Update an account user in PagerTree."""
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         result = client.update_user(user_id=user_id, name=name)
         click.echo(f"User updated successfully: {result.get('id')}")
     except Exception as e:
@@ -111,7 +111,7 @@ def delete_user_cmd(ctx, user_id, force):
         click.echo("Deletion cancelled.")
         return
     try:
-        client = ctx.obj  # Get PagerTreeClient from context
+        client = ctx.obj.client  # Get PagerTreeClient from context
         result = client.delete_user(user_id)
         click.echo(f"User deleted successfully: {user_id}")
     except Exception as e:

config.ini

@@ -4,23 +4,55 @@
 import os
 import importlib
 import pkgutil
+import logging
 from dotenv import load_dotenv
 from api import PagerTreeClient
 
-load_dotenv()
+# Set up logging
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
+logger = logging.getLogger(__name__)
+
+class ContextObject:
+    """Context object to hold client and configuration."""
+    def __init__(self, client, logger, verbose=False):
+        self.client = client
+        self.logger = logger
+        self.verbose = verbose
 
 @click.group()
 @click.option(
-    "--config",
+    "--config", "-c",
     type=click.Path(exists=True, dir_okay=False, readable=True),
-    help="Path to configuration file (e.g., config.ini)",
+    help="Path to .env file",
     envvar="PAGERTREE_CONFIG",
 )
+@click.option(
+    "--verbose", "-v",
+    is_flag=True,
+    help="Enable verbose output"
+)
 @click.pass_context
-def cli(ctx, config):
+def cli(ctx, config, verbose):
     """PagerTree CLI Tool - Manage alerts from the command line."""
-    # Initialize PagerTreeClient and store it in the context
-    ctx.obj = PagerTreeClient(config_file=config)
+
+    # Load .env file if provided or check for default .env
+    config = config or ('.env' if os.path.exists('.env') else None)
+    logger.info(f"Loading .env from {config}" if config else "No .env file provided; relying on system environment variables")
+    load_dotenv(dotenv_path=config, verbose=True)
+
+    # Determine verbose setting: command-line flag takes precedence over env var
+    env_verbose = os.getenv("PAGERTREE_VERBOSE", "false").lower() in ("true", "1", "t")
+    verbose = verbose or env_verbose
+
+    # Set logging level based on verbose setting
+    logger.setLevel(logging.DEBUG if verbose else logging.INFO)
+    logger.debug("Verbose mode enabled")
+
+    # Initialize PagerTreeClient
+    client = PagerTreeClient()
+    
+    # Store context object
+    ctx.obj = ContextObject(client=client, logger=logger, verbose=verbose)
 
 # Dynamically register all command groups from the 'commands' package
 commands_dir = os.path.join(os.path.dirname(__file__), "commands")