qwen-claude 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

qwen_claude/cli.py

@@ -45,8 +45,11 @@ def which(cmd: str) -> Optional[str]:
     return shutil.which(cmd)
 
 
-# ------------------- DEPENDENCY & SCHEMA CHECKS -------------------
+# ------------------- NEW: DEPENDENCY CHECKS -------------------
 def verify_required_tools() -> None:
+    """
+    Ensure required global CLIs are installed before continuing.
+    """
     requirements = [
         {
             "name": "qwen",
@@ -64,14 +67,20 @@ def verify_required_tools() -> None:
             "install": "npm install -g @anthropic-ai/claude-code",
         },
     ]
+
     for req in requirements:
         path = which(req["binary"])
         if not path:
             print(
-                f"[ERR] Required package '{req['name']}' is not installed.\n      Install: {req['install']}"
+                f"[ERR] Required package '{req['name']}' is not installed or not in PATH."
             )
+            print(f"      Install it with:\n      {req['install']}")
             raise SystemExit(1)
-        print(f"[OK] Found {req['name']} → {path}")
+        else:
+            print(f"[OK] Found {req['name']} → {path}")
+
+
+# -------------------------------------------------------------
 
 
 def schema_validation() -> None:
@@ -102,10 +111,10 @@ def schema_validation() -> None:
 
     needs_reset = False
     if not qwen_provider:
-        print("[INFO] 'qwen' provider block missing in config.")
+        print("[INFO] 'qwen' provider block missing in 'ccr' config.")
         needs_reset = True
     elif "api_base_url" not in qwen_provider:
-        print("[INFO] 'api_base_url' missing in qwen provider config.")
+        print("[INFO] 'api_base_url' missing in 'ccr' config.")
         needs_reset = True
     elif qwen_provider.get("api_base_url") != target_url:
         print(f"[INFO] URL mismatch. Found: {qwen_provider.get('api_base_url')}")
@@ -122,6 +131,12 @@ def schema_validation() -> None:
 
 
 def run_windows_cmd(exe_path: str, args: list[str], quiet: bool = True) -> int:
+    """
+    Windows-safe runner:
+      - .ps1 => powershell -File
+      - .cmd/.bat => cmd.exe /c <properly quoted>
+      - else => direct execute
+    """
     exe_lower = exe_path.lower()
     stdout = subprocess.DEVNULL if quiet else None
     stderr = subprocess.DEVNULL if quiet else None
@@ -136,27 +151,46 @@ def run_windows_cmd(exe_path: str, args: list[str], quiet: bool = True) -> int:
             exe_path,
             *args,
         ]
-        return subprocess.run(cmd, check=False, stdout=stdout, stderr=stderr).returncode
+        p = subprocess.run(cmd, check=False, stdout=stdout, stderr=stderr)
+        return p.returncode
+
     if exe_lower.endswith(".cmd") or exe_lower.endswith(".bat"):
         cmdline = subprocess.list2cmdline([exe_path, *args])
-        return subprocess.run(
+        p = subprocess.run(
             ["cmd.exe", "/d", "/s", "/c", cmdline],
             check=False,
             stdout=stdout,
             stderr=stderr,
-        ).returncode
-    return subprocess.run(
-        [exe_path, *args], check=False, stdout=stdout, stderr=stderr
-    ).returncode
+        )
+        return p.returncode
+
+    p = subprocess.run([exe_path, *args], check=False, stdout=stdout, stderr=stderr)
+    return p.returncode
 
 
 def force_qwen_refresh(qwen_path: str) -> None:
-    run_windows_cmd(qwen_path, ["--version"], quiet=True)
+    """
+    Trigger Qwen so it refreshes credentials if refresh_token is valid.
+    """
+    candidates = [
+        ["--version"],
+        ["--help"],
+        ["-h"],
+        ["-p", "ping"],
+        ["hi"],
+    ]
+    for args in candidates:
+        rc = run_windows_cmd(qwen_path, args, quiet=True)
+        if rc == 0:
+            break
 
 
 def update_ccr_api_key(ccr_config: Path, new_token: str) -> bool:
     cfg = load_json(ccr_config)
     providers = cfg.get("Providers", [])
+    if not isinstance(providers, list) or not providers:
+        raise RuntimeError("CCR config has no Providers[] array.")
+
     changed = False
     for p in providers:
         if isinstance(p, dict) and p.get("name") == "qwen":
@@ -165,72 +199,166 @@ def update_ccr_api_key(ccr_config: Path, new_token: str) -> bool:
                 changed = True
 
     if changed:
+        try:
+            shutil.copy2(ccr_config, ccr_config.with_suffix(".json.bak"))
+        except Exception:
+            pass
         save_json_atomic(ccr_config, cfg)
+
     return changed
 
 
 def print_install_info():
-    print("[INFO] qwen-claude installed at:")
     for p in site.getsitepackages():
         if "qwen_claude" in p:
             print("   ", p)
 
-    print("[INFO] Executable location:")
-    print("   ", Path(sys.executable).parent)
+    print(f"[INFO] Executable Path: '{Path(sys.executable).parent}'")
 
 
 def main() -> int:
     print_install_info()
+    # 🔒 NEW: Verify required tools first
     verify_required_tools()
+    # 🔒 NEW: Validate the schema first
     schema_validation()
 
     qwen_path = which("qwen")
     ccr_path = which("ccr")
 
-    # Auth logic
     if not QWEN_OAUTH.exists():
+        print(f"[WARN] Qwen oauth file not found: {QWEN_OAUTH}")
         print("[INFO] Launching Qwen for authentication...")
-        proc = subprocess.Popen([qwen_path])
-        while not QWEN_OAUTH.exists():
+
+        # Launch qwen interactively
+        proc = subprocess.Popen(
+            [qwen_path], creationflags=subprocess.CREATE_NEW_PROCESS_GROUP
+        )
+
+        # Wait for oauth file to appear
+        print("[INFO] Waiting for Qwen authentication to complete...")
+        while True:
+            if QWEN_OAUTH.exists():
+                print("[OK] Qwen authentication completed.")
+                break
+
+            # If user closed Qwen without authenticating
             if proc.poll() is not None:
+                print("[ERR] Qwen exited before authentication completed.")
                 return 6
+
             time.sleep(1)
-        proc.terminate()
+
+        # Stop qwen after successful auth
+        try:
+            subprocess.run(
+                ["taskkill", "/PID", str(proc.pid), "/T", "/F"],
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+                check=False,
+            )
+            print("[INFO] Qwen CLI is Terminated...")
+        except Exception:
+            pass
+
+    # print(f"[WARN] Qwen Oauth file not found: {QWEN_OAUTH}")
+    # print("[INFO] Launching Qwen for authentication...")
+    # run_windows_cmd(qwen_path, [], quiet=False)
+    # return 0
+
+    if not CCR_CONFIG.exists():
+        print(f"[ERR] CCR config file not found: {CCR_CONFIG}")
+        print("      Edit CCR_CONFIG in the script to the correct location.")
+        return 5
 
     oauth = load_json(QWEN_OAUTH)
+
     if is_expiring_soon(oauth, REFRESH_BUFFER_SECONDS):
+        print("[INFO] Token expired/near expiry → triggering Qwen refresh...")
         force_qwen_refresh(qwen_path)
         oauth = load_json(QWEN_OAUTH)
 
     access_token = oauth.get("access_token")
-    changed = update_ccr_api_key(CCR_CONFIG, access_token)
+    if not access_token:
+        print("[WARN] Silent refresh failed. Interactive login required.")
+
+        # Launch qwen interactively
+        proc = subprocess.Popen(
+            [qwen_path], creationflags=subprocess.CREATE_NEW_PROCESS_GROUP
+        )
+
+        # Wait for oauth file to appear
+        print("[INFO] Waiting for Qwen authentication to complete...")
+        while True:
+            if QWEN_OAUTH.exists():
+                print("[OK] Qwen authentication completed.")
+                break
+
+            # If user closed Qwen without authenticating
+            if proc.poll() is not None:
+                print("[ERR] Qwen exited before authentication completed.")
+                return 6
 
-    # RESTART LOGIC FIX: Only restart once
-    ccr_needs_restart = changed and RESTART_CCR_ON_CHANGE
+            time.sleep(1)
 
-    if ccr_needs_restart:
-        print("[OK] Token updated. Restarting CCR...")
-        run_windows_cmd(ccr_path, ["restart"], quiet=False)
+        # Stop qwen after successful auth
+        try:
+            subprocess.run(
+                ["taskkill", "/PID", str(proc.pid), "/T", "/F"],
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+                check=False,
+            )
+            print("[INFO] Qwen CLI is Terminated...")
+        except Exception:
+            pass
+
+        # Reload oauth after interactive login
+        oauth = load_json(QWEN_OAUTH)
+        access_token = oauth.get("access_token")
+
+        if not access_token:
+            print("[ERR] access_token still missing after interactive login.")
+            return 7
+
+        # print("[ERR] access_token missing after refresh attempt.")
+        # print("      Refresh token may be invalid; re-authenticate in Qwen.")
+        # return 6
+
+    changed = update_ccr_api_key(CCR_CONFIG, access_token)
+    if changed:
+        print("[OK] Updated CCR config with latest Qwen access_token.")
+        # if RESTART_CCR_ON_CHANGE and ccr_path:
+        #     print("[INFO] Restarting CCR...")
+        #     run_windows_cmd(ccr_path, ["restart"], quiet=False)
     else:
-        print("[OK] CCR config is up to date.")
+        print("[OK] CCR config already has the latest token.")
 
     if RUN_CCR_CODE and ccr_path:
-        # If we didn't just restart it above, we might need to restart/start it here
-        # or just run 'code'. Since you had a restart here before, I'll keep it
-        # but ensure it doesn't double-trigger if changed was true.
-        if not ccr_needs_restart:
-            print("[INFO] Starting CCR...")
-            run_windows_cmd(ccr_path, ["restart"], quiet=False)
+        print("[INFO] Restarting CCR...")
+        run_windows_cmd(ccr_path, ["restart"], quiet=False)
 
-        print("[INFO] Launching Claude Code...")
-        run_windows_cmd(ccr_path, ["code"], quiet=False)
+        print("[INFO] Launching Claude Code via CCR (ccr code)...")
+        try:
+            run_windows_cmd(ccr_path, ["code"], quiet=False)
+        except KeyboardInterrupt:
+            print("\n[INFO] CCR session interrupted by user.")
+            return 130
 
     return 0
 
 
 def run():
-    raise SystemExit(main())
+    try:
+        raise SystemExit(main())
+    except KeyboardInterrupt:
+        print("\n[INFO] Interrupted by user. Exiting...")
+        raise SystemExit(130)
 
 
 if __name__ == "__main__":
-    raise SystemExit(main())
+    try:
+        raise SystemExit(main())
+    except KeyboardInterrupt:
+        print("\n[INFO] Interrupted by user. Exiting...")
+        raise SystemExit(130)

{qwen_claude-0.1.0.dist-info → qwen_claude-0.1.1.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.3
 Name: qwen-claude
-Version: 0.1.0
+Version: 0.1.1
 Summary: Qwen + Claude Code Router bootstrapper
-Author: Saad-Kamran-2006
-Author-email: Saad-Kamran-2006 <saadkamran6ft@gmail.com>
+Author: Saad Kamran
+Author-email: Saad Kamran <saadkamran6ft@gmail.com>
 License: MIT
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown

qwen_claude-0.1.1.dist-info/RECORD

@@ -0,0 +1,7 @@
+qwen_claude/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+qwen_claude/cli.py,sha256=w_6jQ9psUWecSh3uCSaycfWE_6bk4kAcs57bMgTuu2o,11435
+qwen_claude/schema.json,sha256=ifOWG5YRSsu7o6imu8pZLYJnHlzdqrKt7LxLMFb8wok,952
+qwen_claude-0.1.1.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
+qwen_claude-0.1.1.dist-info/entry_points.txt,sha256=TOf35RaxMV8MnDInvpY1CQP35uqHwxElhtH9OKuuENo,44
+qwen_claude-0.1.1.dist-info/METADATA,sha256=fbAGCDSRyAYtJ5EhQAP3fHYtaStFDtGvyOMg-sFlmXE,253
+qwen_claude-0.1.1.dist-info/RECORD,,

qwen_claude-0.1.0.dist-info/RECORD

@@ -1,7 +0,0 @@
-qwen_claude/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qwen_claude/cli.py,sha256=PemEV1svetkWepw6lIjAJh7_x7NlfoU5CdgJlGDrNg0,7332
-qwen_claude/schema.json,sha256=ifOWG5YRSsu7o6imu8pZLYJnHlzdqrKt7LxLMFb8wok,952
-qwen_claude-0.1.0.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
-qwen_claude-0.1.0.dist-info/entry_points.txt,sha256=TOf35RaxMV8MnDInvpY1CQP35uqHwxElhtH9OKuuENo,44
-qwen_claude-0.1.0.dist-info/METADATA,sha256=sW0SiOOLc-R7O8hmxYeUtenzhMlWNVqr_jJaaafuMfA,263
-qwen_claude-0.1.0.dist-info/RECORD,,