PyPI - oauth-cli-kit - Versions diffs - 0.1.1__tar.gz → 0.1.5__tar.gz - Mend

oauth-cli-kit 0.1.1tar.gz → 0.1.5tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

oauth_cli_kit-0.1.5/.gitignore ADDED Viewed

@@ -0,0 +1,20 @@
+# Python
+__pycache__/
+*.py[cod]
+*.pyd
+# Test / coverage
+.pytest_cache/
+.coverage
+htmlcov/
+# Build artifacts
+dist/
+build/
+*.egg-info/
+# Envs
+.venv/
+.env
+uv.lock

{oauth_cli_kit-0.1.1 → oauth_cli_kit-0.1.5}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oauth-cli-kit
-Version: 0.1.1
+Version: 0.1.5
 Summary: Reusable OAuth 2.0 + PKCE helpers for CLI applications
 Author: nanobot contributors
 License: MIT
@@ -12,5 +12,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.11
-Requires-Dist: httpx>=0.25.0
+Requires-Dist: httpx>=0.26.0
 Requires-Dist: platformdirs>=4.0.0
+Provides-Extra: dev
+Requires-Dist: pytest>=8.0.0; extra == 'dev'

{oauth_cli_kit-0.1.1 → oauth_cli_kit-0.1.5}/oauth_cli_kit/__init__.py RENAMED Viewed

@@ -1,8 +1,8 @@
 """oauth-cli-kit public API."""
-from oauth_cli_kit.constants import OPENAI_CODEX_PROVIDER
 from oauth_cli_kit.flow import get_token, login_oauth_interactive
 from oauth_cli_kit.models import OAuthProviderConfig, OAuthToken
+from oauth_cli_kit.providers import OPENAI_CODEX_PROVIDER
 __all__ = [
     "OPENAI_CODEX_PROVIDER",

oauth_cli_kit-0.1.5/oauth_cli_kit/constants.py ADDED Viewed

@@ -0,0 +1,25 @@
+"""Default provider settings and constants."""
+from __future__ import annotations
+from oauth_cli_kit.providers.openai_codex import OPENAI_CODEX_PROVIDER
+SUCCESS_HTML = (
+    "<!doctype html>"
+    "<html lang=\"en\">"
+    "<head>"
+    "<meta charset=\"utf-8\" />"
+    "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />"
+    "<title>Authentication successful</title>"
+    "</head>"
+    "<body>"
+    "<p>Authentication successful. Return to your terminal to continue.</p>"
+    "</body>"
+    "</html>"
+)
+# 兼容性：历史上从 oauth_cli_kit.constants 导入 provider。
+__all__ = [
+    "SUCCESS_HTML",
+    "OPENAI_CODEX_PROVIDER",
+]

{oauth_cli_kit-0.1.1 → oauth_cli_kit-0.1.5}/oauth_cli_kit/flow.py RENAMED Viewed

@@ -3,6 +3,7 @@
 from __future__ import annotations
 import asyncio
+import os
 import sys
 import threading
 import time
@@ -12,8 +13,8 @@ from typing import Callable
 import httpx
-from oauth_cli_kit.constants import OPENAI_CODEX_PROVIDER
 from oauth_cli_kit.models import OAuthProviderConfig, OAuthToken
+from oauth_cli_kit.providers import OPENAI_CODEX_PROVIDER
 from oauth_cli_kit.pkce import (
     _create_state,
     _decode_account_id,
@@ -25,10 +26,21 @@ from oauth_cli_kit.server import _start_local_server
 from oauth_cli_kit.storage import FileTokenStorage, TokenStorage, _FileLock
+def _httpx_client_kwargs(proxy: str | None) -> dict[str, object]:
+    return {"timeout": 30.0, "proxy": proxy, "trust_env": False} if proxy else {"timeout": 30.0}
+def _should_open_browser() -> bool:
+    if sys.platform.startswith("linux"):
+        return bool(os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY"))
+    return True
 def _exchange_code_for_token_async(
     code: str,
     verifier: str,
     provider: OAuthProviderConfig,
+    proxy: str | None = None,
 ) -> Callable[[], OAuthToken]:
     async def _run() -> OAuthToken:
         data = {
@@ -38,7 +50,7 @@ def _exchange_code_for_token_async(
             "code_verifier": verifier,
             "redirect_uri": provider.redirect_uri,
         }
-        async with httpx.AsyncClient(timeout=30.0) as client:
+        async with httpx.AsyncClient(**_httpx_client_kwargs(proxy)) as client:
             response = await client.post(
                 provider.token_url,
                 data=data,
@@ -61,13 +73,13 @@ def _exchange_code_for_token_async(
     return _run
-def _refresh_token(refresh_token: str, provider: OAuthProviderConfig) -> OAuthToken:
+def _refresh_token(refresh_token: str, provider: OAuthProviderConfig, proxy: str | None = None) -> OAuthToken:
     data = {
         "grant_type": "refresh_token",
         "refresh_token": refresh_token,
         "client_id": provider.client_id,
     }
-    with httpx.Client(timeout=30.0) as client:
+    with httpx.Client(**_httpx_client_kwargs(proxy)) as client:
         response = client.post(
             provider.token_url,
             data=data,
@@ -92,6 +104,7 @@ def get_token(
     provider: OAuthProviderConfig = OPENAI_CODEX_PROVIDER,
     storage: TokenStorage | None = None,
     min_ttl_seconds: int = 60,
+    proxy: str | None = None,
 ) -> OAuthToken:
     """Get an available token (refresh if needed)."""
     storage = storage or FileTokenStorage(token_filename=provider.token_filename)
@@ -112,7 +125,7 @@ def get_token(
         if token.expires - now_ms > min_ttl_seconds * 1000:
             return token
         try:
-            refreshed = _refresh_token(token.refresh, provider)
+            refreshed = _refresh_token(token.refresh, provider, proxy)
             storage.save(refreshed)
             return refreshed
         except Exception:
@@ -123,43 +136,14 @@ def get_token(
             raise
-async def _read_stdin_line() -> str:
-    loop = asyncio.get_running_loop()
-    if hasattr(loop, "add_reader") and sys.stdin:
-        future: asyncio.Future[str] = loop.create_future()
-        def _on_readable() -> None:
-            line = sys.stdin.readline()
-            if not future.done():
-                future.set_result(line)
-        try:
-            loop.add_reader(sys.stdin, _on_readable)
-        except Exception:
-            return await loop.run_in_executor(None, sys.stdin.readline)
-        try:
-            return await future
-        finally:
-            try:
-                loop.remove_reader(sys.stdin)
-            except Exception:
-                pass
-    return await loop.run_in_executor(None, sys.stdin.readline)
-async def _await_manual_input(print_fn: Callable[[str], None]) -> str:
-    print_fn("[cyan]Paste the authorization code (or full redirect URL), or wait for the browser callback:[/cyan]")
-    return await _read_stdin_line()
 def login_oauth_interactive(
     print_fn: Callable[[str], None],
     prompt_fn: Callable[[str], str],
     provider: OAuthProviderConfig = OPENAI_CODEX_PROVIDER,
     originator: str | None = None,
     storage: TokenStorage | None = None,
+    proxy: str | None = None,
+    open_browser: bool | None = None,
 ) -> OAuthToken:
     """Interactive login flow."""
@@ -190,12 +174,17 @@ def login_oauth_interactive(
             loop.call_soon_threadsafe(code_future.set_result, code_value)
         server, server_error = _start_local_server(state, on_code=_notify)
-        print_fn("[cyan]A browser window will open for login. If it doesn't, open this URL manually:[/cyan]")
+        should_open_browser = _should_open_browser() if open_browser is None else open_browser
+        if should_open_browser:
+            print_fn("[cyan]A browser window will open for login. If it doesn't, open this URL manually:[/cyan]")
+        else:
+            print_fn("[yellow]No graphical browser detected. Open this URL in a browser:[/yellow]")
         print_fn(url)
-        try:
-            webbrowser.open(url)
-        except Exception:
-            pass
+        if should_open_browser:
+            try:
+                webbrowser.open(url)
+            except Exception:
+                pass
         if not server and server_error:
             print_fn(
@@ -207,38 +196,25 @@ def login_oauth_interactive(
         code: str | None = None
         try:
-            if server:
+            if server and should_open_browser:
                 print_fn("[dim]Waiting for browser callback...[/dim]")
-                tasks: list[asyncio.Task[object]] = []
-                callback_task = asyncio.create_task(asyncio.wait_for(code_future, timeout=120))
-                tasks.append(callback_task)
-                manual_task = asyncio.create_task(_await_manual_input(print_fn))
-                tasks.append(manual_task)
-                done, pending = await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED)
-                for task in pending:
-                    task.cancel()
-                for task in done:
-                    try:
-                        result = task.result()
-                    except asyncio.TimeoutError:
-                        result = None
-                    if not result:
-                        continue
-                    if task is manual_task:
-                        parsed_code, parsed_state = _parse_authorization_input(result)
-                        if parsed_state and parsed_state != state:
-                            raise RuntimeError("State validation failed.")
-                        code = parsed_code
-                    else:
-                        code = result
-                    if code:
-                        break
+                try:
+                    code = await asyncio.wait_for(code_future, timeout=120)
+                except asyncio.TimeoutError:
+                    server.shutdown()
+                    server.server_close()
+                    server = None
+            elif server:
+                server.shutdown()
+                server.server_close()
+                server = None
             if not code:
-                prompt = "Please paste the callback URL or authorization code:"
+                prompt = (
+                    "Please open the URL above in a browser, then paste the full redirect URL:"
+                    if not should_open_browser
+                    else "Please paste the callback URL or authorization code:"
+                )
                 raw = await loop.run_in_executor(None, prompt_fn, prompt)
                 parsed_code, parsed_state = _parse_authorization_input(raw)
                 if parsed_state and parsed_state != state:
@@ -249,7 +225,7 @@ def login_oauth_interactive(
                 raise RuntimeError("Authorization code not found.")
             print_fn("[dim]Exchanging authorization code for tokens...[/dim]")
-            token = await _exchange_code_for_token_async(code, verifier, provider)()
+            token = await _exchange_code_for_token_async(code, verifier, provider, proxy)()
             (storage or FileTokenStorage(token_filename=provider.token_filename)).save(token)
             return token
         finally:

oauth_cli_kit-0.1.5/oauth_cli_kit/providers/__init__.py ADDED Viewed

@@ -0,0 +1,14 @@
+"""OAuth Provider 配置集合。
+设计目标：
+1) 让 codex / Claude Code 等多个 CLI 的 OAuth 配置以“providers 子包”统一管理；
+2) 保持现有对外 API（例如 oauth_cli_kit.constants.OPENAI_CODEX_PROVIDER）不变；
+3) 后续新增 provider 时，只需在本目录新增一个模块并在此处导出即可。
+"""
+from oauth_cli_kit.providers.openai_codex import OPENAI_CODEX_PROVIDER
+__all__ = [
+    "OPENAI_CODEX_PROVIDER",
+]

oauth_cli_kit-0.1.1/oauth_cli_kit/constants.py → oauth_cli_kit-0.1.5/oauth_cli_kit/providers/openai_codex.py RENAMED Viewed

@@ -1,23 +1,11 @@
-"""Default provider settings and constants."""
+"""OpenAI Codex CLI 的默认 OAuth Provider 配置。"""
 from __future__ import annotations
 from oauth_cli_kit.models import OAuthProviderConfig
-SUCCESS_HTML = (
-    "<!doctype html>"
-    "<html lang=\"en\">"
-    "<head>"
-    "<meta charset=\"utf-8\" />"
-    "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />"
-    "<title>Authentication successful</title>"
-    "</head>"
-    "<body>"
-    "<p>Authentication successful. Return to your terminal to continue.</p>"
-    "</body>"
-    "</html>"
-)
+# 注意：这里仅组织配置位置（从 constants.py 挪到 providers/），不改变任何字段/逻辑。
 OPENAI_CODEX_PROVIDER = OAuthProviderConfig(
     client_id="app_EMoamEEZ73f0CkXaXp7hrann",
     authorize_url="https://auth.openai.com/oauth/authorize",
@@ -28,4 +16,5 @@ OPENAI_CODEX_PROVIDER = OAuthProviderConfig(
     account_id_claim="chatgpt_account_id",
     default_originator="nanobot",
     token_filename="codex.json",
-)
+)

{oauth_cli_kit-0.1.1 → oauth_cli_kit-0.1.5}/pyproject.toml RENAMED Viewed

@@ -15,10 +15,16 @@ classifiers = [
 ]
 dependencies = [
-    "httpx>=0.25.0",
+    "httpx>=0.26.0",
     "platformdirs>=4.0.0",
 ]
+[project.optional-dependencies]
+# 开发/CI 使用的依赖，不影响库的运行时依赖与现有逻辑。
+dev = [
+    "pytest>=8.0.0",
+]
 [build-system]
 requires = ["hatchling", "hatch-vcs"]
 build-backend = "hatchling.build"
@@ -35,3 +41,7 @@ include = [
 [tool.hatch.version]
 source = "vcs"
+[tool.pytest.ini_options]
+addopts = "-q"
+testpaths = ["tests"]

{oauth_cli_kit-0.1.1 → oauth_cli_kit-0.1.5}/LICENSE RENAMED Viewed

File without changes

{oauth_cli_kit-0.1.1 → oauth_cli_kit-0.1.5}/README.md RENAMED Viewed

File without changes

{oauth_cli_kit-0.1.1 → oauth_cli_kit-0.1.5}/oauth_cli_kit/models.py RENAMED Viewed

File without changes

{oauth_cli_kit-0.1.1 → oauth_cli_kit-0.1.5}/oauth_cli_kit/pkce.py RENAMED Viewed

File without changes

{oauth_cli_kit-0.1.1 → oauth_cli_kit-0.1.5}/oauth_cli_kit/server.py RENAMED Viewed

File without changes

{oauth_cli_kit-0.1.1 → oauth_cli_kit-0.1.5}/oauth_cli_kit/storage.py RENAMED Viewed

File without changes

oauth-cli-kit 0.1.1__tar.gz → 0.1.5__tar.gz

oauth-cli-kit 0.1.1tar.gz → 0.1.5tar.gz