pingera-cli 0.1.8__tar.gz → 0.1.10__tar.gz

{pingera_cli-0.1.8/pingera_cli.egg-info → pingera_cli-0.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pingera-cli
-Version: 0.1.8
+Version: 0.1.10
 Summary: A beautiful Python CLI tool built with typer and rich, distributed via pip and based on Pingera SDK
 Home-page: https://github.com/pingera/pingera-cli
 Author: PingeraCLI Team
@@ -31,7 +31,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: typer[all]>=0.9.0
 Requires-Dist: rich>=13.0.0
-Requires-Dist: pingera-sdk>=1.0.6
+Requires-Dist: pingera-sdk>=1.0.7
 Requires-Dist: click>=8.0.0
 Provides-Extra: dev
 Requires-Dist: pytest>=6.0; extra == "dev"

{pingera_cli-0.1.8 → pingera_cli-0.1.10}/docs/cli-commands.md

@@ -348,15 +348,18 @@ pngr checks create --from-file check-config.json --name "Override Name"
 
 ### Run on-demand checks
 ```bash
-# From command line options
-pngr checks run custom --url https://example.com --type web --wait-for-result
+# From command line options (waits for result by default)
+pngr checks run custom --url https://example.com --type web
 
-# From configuration file
-pngr checks run custom --from-file check-config.json --wait-for-result
-pngr checks run custom --from-file check-config.yaml --wait-for-result
+# Just queue without waiting for results
+pngr checks run custom --url https://example.com --type web --no-wait
+
+# From configuration file (waits for result by default)
+pngr checks run custom --from-file check-config.json
+pngr checks run custom --from-file check-config.yaml
 
 # Combine file and command line (command line options override file values)
-pngr checks run custom --from-file check-config.json --name "Override Name" --wait-for-result
+pngr checks run custom --from-file check-config.json --name "Override Name"
 ```
 
 ## 🔐 Secrets Management

{pingera_cli-0.1.8 → pingera_cli-0.1.10}/pingera_cli/__init__.py

@@ -2,7 +2,7 @@
 Pingera CLI - A beautiful CLI tool for Pingera Platform
 """
 
-__version__ = "0.1.8"
+__version__ = "0.1.10"
 __author__ = "Pingera Team"
 __description__ = "A beautiful Python CLI tool built with typer and rich, distributed via pip and based on Pingera SDK"
 

{pingera_cli-0.1.8 → pingera_cli-0.1.10}/pingera_cli/commands/checks.py

@@ -390,45 +390,17 @@ class ChecksCommand(BaseCommand):
             raise typer.Exit(1)
 
     def _parse_check_file(self, file_path: str) -> dict:
-        """Parse check configuration from JSON or YAML file"""
-        import json
-        import os
-        
-        if not os.path.exists(file_path):
-            self.display_error(f"Check file not found: {file_path}")
-            raise typer.Exit(1)
+        """Parse check configuration from JSON or YAML file (local or URL)"""
+        from ..utils.file_utils import load_check_file, is_url
         
         try:
-            with open(file_path, 'r', encoding='utf-8') as f:
-                content = f.read().strip()
-            
-            if not content:
-                self.display_error(f"Check file is empty: {file_path}")
-                raise typer.Exit(1)
+            if is_url(file_path):
+                self.display_info(f"Downloading check configuration from: {file_path}")
             
-            # Try to determine format from file extension or content
-            file_ext = os.path.splitext(file_path)[1].lower()
+            return load_check_file(file_path)
             
-            if file_ext in ['.yaml', '.yml']:
-                try:
-                    import yaml
-                    return yaml.safe_load(content)
-                except ImportError:
-                    self.display_error("YAML support not available. Install with: pip install pyyaml")
-                    raise typer.Exit(1)
-                except yaml.YAMLError as e:
-                    self.display_error(f"Invalid YAML in file {file_path}: {str(e)}")
-                    raise typer.Exit(1)
-            else:
-                # Default to JSON
-                try:
-                    return json.loads(content)
-                except json.JSONDecodeError as e:
-                    self.display_error(f"Invalid JSON in file {file_path}: {str(e)}")
-                    raise typer.Exit(1)
-                    
-        except IOError as e:
-            self.display_error(f"Failed to read check file: {str(e)}")
+        except Exception as e:
+            self.display_error(str(e))
             raise typer.Exit(1)
 
     def create_check(self, name: str, check_type: str, url: Optional[str] = None, host: Optional[str] = None, port: Optional[int] = None, interval: int = 300, timeout: int = 30, parameters: Optional[str] = None, pw_script_file: Optional[str] = None, from_file: Optional[str] = None):
@@ -489,6 +461,10 @@ class ChecksCommand(BaseCommand):
                     # Use file parameters if no command line parameters
                     parameters = json.dumps(file_parameters) if isinstance(file_parameters, dict) else file_parameters
                 
+                # Handle secrets from file
+                if filtered_file_data.get("secrets"):
+                    check_data["secrets"] = filtered_file_data["secrets"]
+                
                 # Handle pw_script_file from file (this is CLI-specific, not sent to SDK)
                 if pw_script_file is None and file_data.get("pw_script_file"):
                     pw_script_file = file_data["pw_script_file"]
@@ -1191,7 +1167,7 @@ def create_check(
     timeout: int = typer.Option(30, "--timeout", help="Timeout in seconds"),
     parameters: Optional[str] = typer.Option(None, "--parameters", help="JSON string with check parameters (e.g., '{\"regions\": [\"US\", \"EU\"]}')"),
     pw_script_file: Optional[str] = typer.Option(None, "--pw-script-file", help="Path to file containing Playwright script for synthetic/multistep checks"),
-    from_file: Optional[str] = typer.Option(None, "--from-file", help="Path to JSON or YAML file containing check configuration")
+    from_file: Optional[str] = typer.Option(None, "--from-file", "-f", help="Path to JSON or YAML file containing check configuration")
 ):
     """Create a new monitoring check. Can be created from command line options or from a JSON/YAML file.
     

{pingera_cli-0.1.8 → pingera_cli-0.1.10}/pingera_cli/commands/on_demand_checks.py

@@ -23,45 +23,17 @@ class OnDemandChecksCommand(BaseCommand):
         super().__init__(output_format)
     
     def _parse_check_file(self, file_path: str) -> dict:
-        """Parse check configuration from JSON or YAML file"""
-        import json
-        import os
-        
-        if not os.path.exists(file_path):
-            self.display_error(f"Check file not found: {file_path}")
-            raise typer.Exit(1)
+        """Parse check configuration from JSON or YAML file (local or URL)"""
+        from ..utils.file_utils import load_check_file, is_url
         
         try:
-            with open(file_path, 'r', encoding='utf-8') as f:
-                content = f.read().strip()
-            
-            if not content:
-                self.display_error(f"Check file is empty: {file_path}")
-                raise typer.Exit(1)
+            if is_url(file_path):
+                self.display_info(f"Downloading check configuration from: {file_path}")
             
-            # Try to determine format from file extension or content
-            file_ext = os.path.splitext(file_path)[1].lower()
+            return load_check_file(file_path)
             
-            if file_ext in ['.yaml', '.yml']:
-                try:
-                    import yaml
-                    return yaml.safe_load(content)
-                except ImportError:
-                    self.display_error("YAML support not available. Install with: pip install pyyaml")
-                    raise typer.Exit(1)
-                except yaml.YAMLError as e:
-                    self.display_error(f"Invalid YAML in file {file_path}: {str(e)}")
-                    raise typer.Exit(1)
-            else:
-                # Default to JSON
-                try:
-                    return json.loads(content)
-                except json.JSONDecodeError as e:
-                    self.display_error(f"Invalid JSON in file {file_path}: {str(e)}")
-                    raise typer.Exit(1)
-                    
-        except IOError as e:
-            self.display_error(f"Failed to read check file: {str(e)}")
+        except Exception as e:
+            self.display_error(str(e))
             raise typer.Exit(1)
         
     def get_client(self):
@@ -90,7 +62,7 @@ class OnDemandChecksCommand(BaseCommand):
             self.display_error(f"Failed to initialize client: {str(e)}")
             raise typer.Exit(1)
 
-    def execute_custom_check(self, url: Optional[str] = None, check_type: str = "web", host: Optional[str] = None, port: Optional[int] = None, timeout: int = 30, name: str = "On-demand check", parameters: Optional[str] = None, pw_script_file: Optional[str] = None, from_file: Optional[str] = None, wait_for_result: bool = False):
+    def execute_custom_check(self, url: Optional[str] = None, check_type: str = "web", host: Optional[str] = None, port: Optional[int] = None, timeout: int = 30, name: str = "On-demand check", parameters: Optional[str] = None, pw_script_file: Optional[str] = None, from_file: Optional[str] = None, wait_for_result: bool = True):
         """Execute custom on-demand check"""
         try:
             import json
@@ -150,6 +122,10 @@ class OnDemandChecksCommand(BaseCommand):
                     # Use file parameters if no command line parameters
                     parameters = json.dumps(file_parameters) if isinstance(file_parameters, dict) else file_parameters
                 
+                # Handle secrets from file
+                if filtered_file_data.get("secrets"):
+                    check_data["secrets"] = filtered_file_data["secrets"]
+                
                 # Handle pw_script_file from file (this is CLI-specific, not sent to SDK)
                 if pw_script_file is None and file_data.get("pw_script_file"):
                     pw_script_file = file_data["pw_script_file"]
@@ -270,7 +246,7 @@ class OnDemandChecksCommand(BaseCommand):
                     })
                 else:
                     self.display_success(
-                        f"On-demand check queued successfully!\n" + "\n".join(success_details) + f"\n\nUse 'pngr checks jobs result {job_id}' to check status.",
+                        f"On-demand check queued successfully!\n" + "\n".join(success_details) + f"\n\nUse 'pngr checks jobs result {job_id}' to check status.\n\n💡 Tip: Remove --no-wait to see results immediately.",
                         "✅ Check Queued"
                     )
             
@@ -278,7 +254,7 @@ class OnDemandChecksCommand(BaseCommand):
             self.display_error(f"Failed to execute custom check: {str(e)}")
             raise typer.Exit(1)
 
-    def execute_existing_check(self, check_id: str, wait_for_result: bool = False):
+    def execute_existing_check(self, check_id: str, wait_for_result: bool = True):
         """Execute existing check on demand"""
         try:
             checks_api = self.get_client()
@@ -300,7 +276,7 @@ class OnDemandChecksCommand(BaseCommand):
                     })
                 else:
                     self.display_success(
-                        f"Existing check executed successfully!\nJob ID: {job_id}\nCheck ID: {check_id}\n\nUse 'pngr checks jobs result {job_id}' to check status.",
+                        f"Existing check executed successfully!\nJob ID: {job_id}\nCheck ID: {check_id}\n\nUse 'pngr checks jobs result {job_id}' to check status.\n\n💡 Tip: Remove --no-wait to see results immediately.",
                         "✅ Check Executed"
                     )
             
@@ -713,11 +689,14 @@ def run_custom_check(
     name: str = typer.Option("On-demand check", "--name", "-n", help="Check name"),
     parameters: Optional[str] = typer.Option(None, "--parameters", help="JSON string with check parameters (e.g., '{\"regions\": [\"US\", \"EU\"]}')"),
     pw_script_file: Optional[str] = typer.Option(None, "--pw-script-file", help="Path to file containing Playwright script for synthetic/multistep checks"),
-    from_file: Optional[str] = typer.Option(None, "--from-file", help="Path to JSON or YAML file containing check configuration"),
-    wait_for_result: bool = typer.Option(False, "--wait-for-result", help="Wait for job completion and show result immediately (max 5 minutes)"),
+    from_file: Optional[str] = typer.Option(None, "--from-file", "-f", help="Path to JSON or YAML file containing check configuration"),
+    no_wait: bool = typer.Option(False, "--no-wait", help="Don't wait for job completion, just queue the check and return job ID"),
 ):
     """Execute custom on-demand check. Can be executed from command line options or from a JSON/YAML file.
     
+    By default, waits for job completion and shows result immediately (max 5 minutes).
+    Use --no-wait to just queue the check and return the job ID.
+    
     When using --from-file:
     - Command line options override file values
     - File should contain check configuration in JSON or YAML format
@@ -728,17 +707,17 @@ def run_custom_check(
     - ssl: --url or --host required
     - synthetic/multistep: --pw-script-file or --parameters with pw_script required"""
     on_demand_cmd = OnDemandChecksCommand(get_output_format())
-    on_demand_cmd.execute_custom_check(url, check_type, host, port, timeout, name, parameters, pw_script_file, from_file, wait_for_result)
+    on_demand_cmd.execute_custom_check(url, check_type, host, port, timeout, name, parameters, pw_script_file, from_file, not no_wait)
 
 
 @run_app.command("existing")
 def run_existing_check(
     check_id: str = typer.Argument(..., help="Existing check ID to execute"),
-    wait_for_result: bool = typer.Option(False, "--wait-for-result", help="Wait for job completion and show result immediately (max 5 minutes)"),
+    no_wait: bool = typer.Option(False, "--no-wait", help="Don't wait for job completion, just queue the check and return job ID"),
 ):
-    """Execute existing check on demand"""
+    """Execute existing check on demand. By default, waits for job completion and shows result immediately (max 5 minutes). Use --no-wait to just queue the check."""
     on_demand_cmd = OnDemandChecksCommand(get_output_format())
-    on_demand_cmd.execute_existing_check(check_id, wait_for_result)
+    on_demand_cmd.execute_existing_check(check_id, not no_wait)
 
 
 @jobs_app.command("list")

pingera_cli-0.1.10/pingera_cli/utils/file_utils.py

@@ -0,0 +1,91 @@
+
+"""
+File utilities for PingeraCLI
+"""
+
+import os
+import json
+from typing import Dict, Any
+from urllib.parse import urlparse
+from urllib.request import urlopen, Request
+from urllib.error import URLError, HTTPError
+import typer
+
+
+def is_url(file_path: str) -> bool:
+    """Check if the file path is a URL"""
+    try:
+        result = urlparse(file_path)
+        return all([result.scheme, result.netloc])
+    except Exception:
+        return False
+
+
+def download_file_content(url: str) -> str:
+    """Download content from a URL"""
+    try:
+        # Add a user agent to avoid being blocked by some servers
+        req = Request(url, headers={'User-Agent': 'PingeraCLI/1.0'})
+        
+        with urlopen(req, timeout=30) as response:
+            if response.status != 200:
+                raise Exception(f"HTTP {response.status}: {response.reason}")
+            
+            content = response.read().decode('utf-8')
+            return content
+            
+    except HTTPError as e:
+        raise Exception(f"HTTP error {e.code}: {e.reason}")
+    except URLError as e:
+        raise Exception(f"URL error: {e.reason}")
+    except Exception as e:
+        raise Exception(f"Failed to download file: {str(e)}")
+
+
+def parse_file_content(content: str, file_path: str) -> Dict[Any, Any]:
+    """Parse file content as JSON or YAML"""
+    if not content.strip():
+        raise Exception(f"File content is empty: {file_path}")
+    
+    # Try to determine format from file extension or content
+    file_ext = os.path.splitext(file_path)[1].lower()
+    
+    if file_ext in ['.yaml', '.yml']:
+        try:
+            import yaml
+            return yaml.safe_load(content)
+        except ImportError:
+            raise Exception("YAML support not available. Install with: pip install pyyaml")
+        except yaml.YAMLError as e:
+            raise Exception(f"Invalid YAML in file {file_path}: {str(e)}")
+    else:
+        # Default to JSON
+        try:
+            return json.loads(content)
+        except json.JSONDecodeError as e:
+            raise Exception(f"Invalid JSON in file {file_path}: {str(e)}")
+
+
+def load_check_file(file_path: str) -> Dict[Any, Any]:
+    """Load check configuration from local file or URL"""
+    try:
+        if is_url(file_path):
+            # Download from URL
+            content = download_file_content(file_path)
+            return parse_file_content(content, file_path)
+        else:
+            # Load from local file
+            if not os.path.exists(file_path):
+                raise Exception(f"Check file not found: {file_path}")
+            
+            with open(file_path, 'r', encoding='utf-8') as f:
+                content = f.read()
+            
+            return parse_file_content(content, file_path)
+            
+    except Exception as e:
+        # Re-raise with a more specific error message
+        if "Check file not found" in str(e) or "File content is empty" in str(e) or "Invalid JSON" in str(e) or "Invalid YAML" in str(e):
+            raise typer.Exit(1) from e
+        else:
+            raise Exception(f"Failed to load check file: {str(e)}") from e

{pingera_cli-0.1.8 → pingera_cli-0.1.10/pingera_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pingera-cli
-Version: 0.1.8
+Version: 0.1.10
 Summary: A beautiful Python CLI tool built with typer and rich, distributed via pip and based on Pingera SDK
 Home-page: https://github.com/pingera/pingera-cli
 Author: PingeraCLI Team
@@ -31,7 +31,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: typer[all]>=0.9.0
 Requires-Dist: rich>=13.0.0
-Requires-Dist: pingera-sdk>=1.0.6
+Requires-Dist: pingera-sdk>=1.0.7
 Requires-Dist: click>=8.0.0
 Provides-Extra: dev
 Requires-Dist: pytest>=6.0; extra == "dev"

{pingera_cli-0.1.8 → pingera_cli-0.1.10}/pingera_cli.egg-info/SOURCES.txt

@@ -39,6 +39,7 @@ pingera_cli/formatters/web_formatter.py
 pingera_cli/utils/__init__.py
 pingera_cli/utils/config.py
 pingera_cli/utils/console.py
+pingera_cli/utils/file_utils.py
 tests/__init__.py
 tests/conftest.py
 tests/requirements.txt

{pingera_cli-0.1.8 → pingera_cli-0.1.10}/pingera_cli.egg-info/requires.txt

@@ -1,6 +1,6 @@
 typer[all]>=0.9.0
 rich>=13.0.0
-pingera-sdk>=1.0.6
+pingera-sdk>=1.0.7
 click>=8.0.0
 
 [dev]

{pingera_cli-0.1.8 → pingera_cli-0.1.10}/pyproject.toml

@@ -35,7 +35,7 @@ requires-python = ">=3.7"
 dependencies = [
     "typer[all]>=0.9.0",
     "rich>=13.0.0",
-    "pingera-sdk>=1.0.6",
+    "pingera-sdk>=1.0.7",
     "click>=8.0.0",
 ]
 

{pingera_cli-0.1.8 → pingera_cli-0.1.10}/tests/test_on_demand_checks.py

@@ -259,8 +259,7 @@ class TestOnDemandChecksCommand:
                 'checks', 'run', 'custom',
                 '--url', 'https://example.com',
                 '--type', 'web',
-                '--name', 'Test Wait Check',
-                '--wait-for-result'
+                '--name', 'Test Wait Check'
             ])
         
         assert result.exit_code == 0
@@ -290,8 +289,7 @@ class TestOnDemandChecksCommand:
         
         with patch('time.sleep'):  # Speed up the test
             result = cli_runner.invoke(app, [
-                'checks', 'run', 'existing', 'check_123',
-                '--wait-for-result'
+                'checks', 'run', 'existing', 'check_123'
             ])
         
         assert result.exit_code == 0
@@ -321,8 +319,7 @@ class TestOnDemandChecksCommand:
             result = cli_runner.invoke(app, [
                 'checks', 'run', 'custom',
                 '--url', 'https://example.com',
-                '--type', 'web',
-                '--wait-for-result'
+                '--type', 'web'
             ])
         
         # The command should still succeed (exit code 0) even with timeout