bt-ghcli 0.3.0__tar.gz → 0.4.0__tar.gz

{bt_ghcli-0.3.0 → bt_ghcli-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bt-ghcli
-Version: 0.3.0
+Version: 0.4.0
 Summary: CLI for interacting with the GitHub API
 Author-email: Bert Tejeda <berttejeda@gmail.com>
 Requires-Python: >=3.9

{bt_ghcli-0.3.0 → bt_ghcli-0.4.0}/README.md

@@ -205,6 +205,81 @@ commits:
   stats: true
 ```
 
+## Library Usage
+
+Both `ghpr` and `ghsearch` can be imported and used directly from Python scripts.
+
+### ghpr — Pull Request operations
+
+```python
+from ghpr import (
+    resolve_auth_token,
+    resolve_api_base,
+    build_headers,
+    make_request,
+    get_proxies,
+    GitHubAPIError,
+)
+
+# Resolve token from env/keyring
+token = resolve_auth_token(cli_token=None, config_token=None)
+
+# Build request
+api_base = resolve_api_base(cli_api_base=None, config_api_base=None)
+headers = build_headers(token)
+proxies = get_proxies(proxy=None)
+
+# Create a PR
+url = f"{api_base}/repos/owner/repo/pulls"
+payload = {"title": "My PR", "head": "feature", "base": "main"}
+try:
+    response = make_request("POST", url, headers, json_data=payload, proxies=proxies)
+    print(response.json())
+except GitHubAPIError as e:
+    print(f"Failed: {e}")
+```
+
+### ghsearch — Repository, code, and commit search
+
+```python
+import asyncio
+from ghsearch import (
+    resolve_auth_token,
+    resolve_api_base,
+    build_headers,
+    search_repositories,
+    simplify_repos,
+    apply_filters,
+    apply_sorting,
+    search_code_async,
+    simplify_code_results,
+    search_commits_async,
+    simplify_commits_results,
+    aggregate_commits_by_repo,
+)
+
+token = resolve_auth_token(cli_token=None, config_token=None)
+api_base = resolve_api_base(cli_api_base=None, config_api_base=None)
+headers = build_headers(token)
+
+# Search repositories
+raw = search_repositories(api_base, headers, query="topic:python", per_page=10, max_pages=1)
+repos = simplify_repos(raw["items"])
+repos = apply_filters(repos, min_stars=50)
+repos = apply_sorting(repos, sort_by="stars", sort_direction="desc")
+for repo in repos:
+    print(f"{repo['full_name']} ⭐ {repo['stars']}")
+
+# Search code (async)
+raw = asyncio.run(search_code_async(api_base, headers, query="import typer", repo="owner/repo"))
+results = simplify_code_results(raw["items"])
+
+# Search commits (async)
+raw = asyncio.run(search_commits_async(api_base, headers, query="fix bug", author="username"))
+commits = simplify_commits_results(raw["items"])
+stats = aggregate_commits_by_repo(commits)
+```
+
 ## Running Tests
 
 ```bash

{bt_ghcli-0.3.0 → bt_ghcli-0.4.0}/bt_ghcli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bt-ghcli
-Version: 0.3.0
+Version: 0.4.0
 Summary: CLI for interacting with the GitHub API
 Author-email: Bert Tejeda <berttejeda@gmail.com>
 Requires-Python: >=3.9

{bt_ghcli-0.3.0 → bt_ghcli-0.4.0}/ghpr/__init__.py

@@ -1,9 +1,30 @@
 """
-ghpr provides a GitHub/GitHub Enterprise Pull Request management CLI.
+ghpr — GitHub/GitHub Enterprise Pull Request management CLI and library.
 """
-from .cli import app
+from .cli import (
+    app,
+    GitHubAPIError,
+    resolve_auth_token,
+    resolve_api_base,
+    build_headers,
+    load_config,
+    merge_config_cli,
+    get_proxies,
+    make_request,
+)
 
-__all__ = ["app", "__version__"]
+__all__ = [
+    "app",
+    "__version__",
+    "GitHubAPIError",
+    "resolve_auth_token",
+    "resolve_api_base",
+    "build_headers",
+    "load_config",
+    "merge_config_cli",
+    "get_proxies",
+    "make_request",
+]
 
 try:
     from importlib.metadata import version, PackageNotFoundError

{bt_ghcli-0.3.0 → bt_ghcli-0.4.0}/ghpr/cli.py

@@ -14,7 +14,8 @@ import typer
 try:
     from bt_credmgr import CredentialManager as _CredentialManager
     _credential_manager = _CredentialManager()
-except Exception:
+except Exception as _e:
+    print(f"[ghpr] Warning: bt-credmgr not available, OS keyring disabled ({_e})", file=sys.stderr)
     _credential_manager = None
 
 # Import version - avoid circular import by importing directly
@@ -46,6 +47,14 @@ except (PackageNotFoundError, Exception):
     else:
         __version__ = "0.0.0"
 
+class GitHubAPIError(Exception):
+    """Raised when a GitHub API request fails."""
+    def __init__(self, message: str, status_code: Optional[int] = None, response_text: Optional[str] = None):
+        super().__init__(message)
+        self.status_code = status_code
+        self.response_text = response_text
+
+
 app = typer.Typer(help="GitHub / GitHub Enterprise Pull Request management CLI tool")
 
 
@@ -155,14 +164,20 @@ def resolve_auth_token(
         return env_token
     # Fallback: OS keyring via bt-credmgr
     if _credential_manager is not None:
+        print(f"[ghpr] Attempting to read token from OS password manager (key: {password_manager_key})...", file=sys.stderr)
         try:
             value = _credential_manager.resolve_credential(
                 name=password_manager_key, keyring_name=password_manager_key, required=False,
             )
             if value:
+                print(f"[ghpr] Successfully retrieved token from OS password manager.", file=sys.stderr)
                 return value
-        except Exception:
-            pass
+            else:
+                print(f"[ghpr] No credential found in OS password manager for key: {password_manager_key}", file=sys.stderr)
+        except Exception as e:
+            print(f"[ghpr] Failed to retrieve credential from OS password manager: {e}", file=sys.stderr)
+    else:
+        print(f"[ghpr] OS password manager not available, skipping keyring lookup.", file=sys.stderr)
     return None
 
 
@@ -276,6 +291,9 @@ def make_request(
 ) -> requests.Response:
     """
     Make an HTTP request with error handling.
+
+    Raises:
+        GitHubAPIError: On proxy, connection, HTTP, or other request errors.
     """
     proxies = proxies or {}
     if debug:
@@ -293,24 +311,25 @@ def make_request(
         response.raise_for_status()
         return response
     except requests.exceptions.ProxyError as e:
-        print(f"[ghpr] Error: Could not connect to proxy. Ensure PySocks is installed and the proxy is running.", file=sys.stderr)
-        print(f"[ghpr] Details: {e}", file=sys.stderr)
-        raise typer.Exit(code=1)
+        raise GitHubAPIError(
+            f"Could not connect to proxy. Ensure PySocks is installed and the proxy is running. Details: {e}"
+        ) from e
     except requests.exceptions.ConnectionError as e:
-        print(f"[ghpr] Error: Could not connect to the GitHub API at {url}.", file=sys.stderr)
-        print(f"[ghpr] Details: {e}", file=sys.stderr)
-        raise typer.Exit(code=1)
+        raise GitHubAPIError(
+            f"Could not connect to the GitHub API at {url}. Details: {e}"
+        ) from e
     except requests.exceptions.HTTPError as e:
-        if response is not None:
-            print(f"[ghpr] Error: HTTP request failed with status code {response.status_code}.", file=sys.stderr)
-            print(f"[ghpr] Response: {response.text[:500]}", file=sys.stderr)
-        else:
-            print(f"[ghpr] Error: HTTP request failed.", file=sys.stderr)
-        print(f"[ghpr] Details: {e}", file=sys.stderr)
-        raise typer.Exit(code=1)
+        status_code = response.status_code if response is not None else None
+        response_text = response.text[:500] if response is not None else None
+        raise GitHubAPIError(
+            f"HTTP request failed with status code {status_code}. Details: {e}",
+            status_code=status_code,
+            response_text=response_text,
+        ) from e
     except requests.exceptions.RequestException as e:
-        print(f"[ghpr] An unexpected error occurred during the request: {e}", file=sys.stderr)
-        raise typer.Exit(code=1)
+        raise GitHubAPIError(
+            f"An unexpected error occurred during the request: {e}"
+        ) from e
 
 
 @app.command(
@@ -380,7 +399,11 @@ def create_command(
         payload["labels"] = label
     
     typer.echo(f"Creating PR: {title} ({head} -> {base})")
-    response = make_request("POST", api_url, headers, json_data=payload, proxies=proxies, verify=merged["verify_tls"], debug=debug)
+    try:
+        response = make_request("POST", api_url, headers, json_data=payload, proxies=proxies, verify=merged["verify_tls"], debug=debug)
+    except GitHubAPIError as e:
+        typer.echo(f"[ghpr] Error: {e}", err=True)
+        raise typer.Exit(code=1)
     
     result = response.json()
     typer.echo(f"✓ Pull Request created successfully!")
@@ -443,7 +466,11 @@ def approve_command(
         payload["body"] = comment
     
     typer.echo(f"Approving PR #{pr_number} in {merged['owner']}/{merged['repo']}...")
-    response = make_request("POST", api_url, headers, json_data=payload, proxies=proxies, verify=merged["verify_tls"], debug=debug)
+    try:
+        response = make_request("POST", api_url, headers, json_data=payload, proxies=proxies, verify=merged["verify_tls"], debug=debug)
+    except GitHubAPIError as e:
+        typer.echo(f"[ghpr] Error: {e}", err=True)
+        raise typer.Exit(code=1)
     
     result = response.json()
     typer.echo(f"✓ Pull Request approved successfully!")
@@ -514,7 +541,11 @@ def comment_command(
         comment_label = "comment"
     
     typer.echo(f"Adding {comment_label} to PR #{pr_number} in {merged['owner']}/{merged['repo']}...")
-    response = make_request("POST", api_url, headers, json_data=payload, proxies=proxies, verify=merged["verify_tls"], debug=debug)
+    try:
+        response = make_request("POST", api_url, headers, json_data=payload, proxies=proxies, verify=merged["verify_tls"], debug=debug)
+    except GitHubAPIError as e:
+        typer.echo(f"[ghpr] Error: {e}", err=True)
+        raise typer.Exit(code=1)
     
     result = response.json()
     typer.echo(f"✓ {comment_label.capitalize()} added successfully!")
@@ -522,6 +553,7 @@ def comment_command(
     typer.echo(f"  URL: {result.get('html_url')}")
 
 
+
 @app.callback(invoke_without_command=True)
 def callback(
     ctx: typer.Context,

bt_ghcli-0.4.0/ghsearch/__init__.py

@@ -0,0 +1,82 @@
+"""
+ghsearch — GitHub/GitHub Enterprise search CLI and library.
+"""
+from .cli import (
+    app,
+    resolve_auth_token,
+    resolve_api_base,
+    build_headers,
+    load_config,
+    merge_repos_config_cli,
+    merge_code_config_cli,
+    merge_commits_config_cli,
+    search_repositories,
+    simplify_repos,
+    apply_filters,
+    apply_sorting,
+    group_by_language,
+    search_code_async,
+    search_commits_async,
+    simplify_code_results,
+    simplify_commits_results,
+    aggregate_commits_by_repo,
+    build_repos_report,
+    build_code_report,
+    build_commits_report,
+)
+
+__all__ = [
+    "app",
+    "__version__",
+    "resolve_auth_token",
+    "resolve_api_base",
+    "build_headers",
+    "load_config",
+    "merge_repos_config_cli",
+    "merge_code_config_cli",
+    "merge_commits_config_cli",
+    "search_repositories",
+    "simplify_repos",
+    "apply_filters",
+    "apply_sorting",
+    "group_by_language",
+    "search_code_async",
+    "search_commits_async",
+    "simplify_code_results",
+    "simplify_commits_results",
+    "aggregate_commits_by_repo",
+    "build_repos_report",
+    "build_code_report",
+    "build_commits_report",
+]
+
+try:
+    from importlib.metadata import version, PackageNotFoundError
+except ImportError:
+    # Python < 3.8
+    try:
+        from importlib_metadata import version, PackageNotFoundError
+    except ImportError:
+        PackageNotFoundError = Exception
+        def version(package_name):
+            raise PackageNotFoundError
+
+try:
+    __version__ = version("bt-ghcli")
+except (PackageNotFoundError, Exception):
+    # Package not installed, fall back to reading from pyproject.toml
+    import re
+    from pathlib import Path
+    
+    pyproject_path = Path(__file__).parent.parent / "pyproject.toml"
+    if pyproject_path.exists():
+        content = pyproject_path.read_text(encoding="utf-8")
+        match = re.search(r'version\s*=\s*["\']([^"\']+)["\']', content)
+        if match:
+            __version__ = match.group(1)
+        else:
+            __version__ = "0.0.0"
+    else:
+        __version__ = "0.0.0"
+
+

{bt_ghcli-0.3.0 → bt_ghcli-0.4.0}/ghsearch/cli.py

@@ -17,7 +17,8 @@ import yaml
 try:
     from bt_credmgr import CredentialManager as _CredentialManager
     _credential_manager = _CredentialManager()
-except Exception:
+except Exception as _e:
+    print(f"[ghsearch] Warning: bt-credmgr not available, OS keyring disabled ({_e})", file=sys.stderr)
     _credential_manager = None
 
 # Import version - avoid circular import by importing directly
@@ -155,14 +156,20 @@ def resolve_auth_token(
         return env_token
     # Fallback: OS keyring via bt-credmgr
     if _credential_manager is not None:
+        print(f"[ghsearch] Attempting to read token from OS password manager (key: {password_manager_key})...", file=sys.stderr)
         try:
             value = _credential_manager.resolve_credential(
                 name=password_manager_key, keyring_name=password_manager_key, required=False,
             )
             if value:
+                print(f"[ghsearch] Successfully retrieved token from OS password manager.", file=sys.stderr)
                 return value
-        except Exception:
-            pass
+            else:
+                print(f"[ghsearch] No credential found in OS password manager for key: {password_manager_key}", file=sys.stderr)
+        except Exception as e:
+            print(f"[ghsearch] Failed to retrieve credential from OS password manager: {e}", file=sys.stderr)
+    else:
+        print(f"[ghsearch] OS password manager not available, skipping keyring lookup.", file=sys.stderr)
     return None
 
 

{bt_ghcli-0.3.0 → bt_ghcli-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "bt-ghcli"
-version = "0.3.0"
+version = "0.4.0"
 description = "CLI for interacting with the GitHub API"
 requires-python = ">=3.9"
 authors = [{ name = "Bert Tejeda", email = "berttejeda@gmail.com" }]

bt_ghcli-0.3.0/ghsearch/__init__.py

@@ -1,37 +0,0 @@
-"""
-ghsearch provides a GitHub/GitHub Enterprise search CLI with repo and code reports.
-"""
-from .cli import app
-
-__all__ = ["app", "__version__"]
-
-try:
-    from importlib.metadata import version, PackageNotFoundError
-except ImportError:
-    # Python < 3.8
-    try:
-        from importlib_metadata import version, PackageNotFoundError
-    except ImportError:
-        PackageNotFoundError = Exception
-        def version(package_name):
-            raise PackageNotFoundError
-
-try:
-    __version__ = version("bt-ghcli")
-except (PackageNotFoundError, Exception):
-    # Package not installed, fall back to reading from pyproject.toml
-    import re
-    from pathlib import Path
-    
-    pyproject_path = Path(__file__).parent.parent / "pyproject.toml"
-    if pyproject_path.exists():
-        content = pyproject_path.read_text(encoding="utf-8")
-        match = re.search(r'version\s*=\s*["\']([^"\']+)["\']', content)
-        if match:
-            __version__ = match.group(1)
-        else:
-            __version__ = "0.0.0"
-    else:
-        __version__ = "0.0.0"
-
-