flyshell 1.2.9__tar.gz → 1.2.11__tar.gz

{flyshell-1.2.9/src/flyshell.egg-info → flyshell-1.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flyshell
-Version: 1.2.9
+Version: 1.2.11
 Summary: A modular, zero-dependency command-line environment in Python.
 License: MIT
 Requires-Python: >=3.10

{flyshell-1.2.9 → flyshell-1.2.11}/src/flyshell/constants.py

@@ -5,8 +5,8 @@ import os
 import platform
 import time
 
-BUILD = 134
-VERSION = "1.2.9"
+BUILD = 136
+VERSION = "1.2.11"
 
 
 def _resolve_app_dir() -> Path:

{flyshell-1.2.9 → flyshell-1.2.11}/src/flyshell/core/env.py

@@ -39,7 +39,6 @@ def read_env_file() -> dict[str, str]:
 
 
 def _resolve_plugin_dir_name(target_name: str) -> tuple[str, object | None]:
-    """Resolves an identifier, display name, or dir name to (dir_name, plugin_instance)."""
     target_lower = target_name.strip().lower()
     if hasattr(c, "PLUGINS"):
         if target_lower in c.PLUGINS:
@@ -85,7 +84,6 @@ def get_plugin_api_keys(plugin_name_or_dir: str) -> dict[str, str]:
 
 
 def get_all_keys() -> tuple[int, str]:
-    """Retrieve and display all configured API keys in the environment."""
     env_path = get_env_path()
     if not env_path.exists():
         return (1, f"File Config Error: Environment file not found at '{env_path}'.")

{flyshell-1.2.9 → flyshell-1.2.11}/src/flyshell/core/loader.py

@@ -58,7 +58,10 @@ def scan_plugins(plugin_folder=None):
                     ctx = build_context(resolved_name, default_name, file_path)
                     required_keys = getattr(obj, "api_keys", [])
                     found_keys = ctx["api_keys"]
-                    missing_keys = [k for k in required_keys if k not in found_keys]
+                    found_keys_lower = {k.lower(): v for k, v in found_keys.items()}
+                    missing_keys = [
+                        k for k in required_keys if k.lower() not in found_keys_lower
+                    ]
                     if missing_keys:
                         env_file = ctx["env_path"]
                         print(
@@ -67,7 +70,7 @@ def scan_plugins(plugin_folder=None):
                         print(f"Please define them in: {env_file} as:")
                         for mk in missing_keys:
                             print(f"{default_name}_{mk}=<your_key>")
-                        break
+                        print("You can do this once Flyshell has booted.")
                     instance = obj(ctx)
                     candidates.setdefault(resolved_name, []).append(
                         (instance, file_path)
@@ -114,3 +117,34 @@ def build_context(plugin_name, default_name, file_path=None):
         "storage": plugin_storage,
     }
     return context
+
+
+def check_plugin_api_keys():
+    if not c.PLUGINS:
+        return
+    print("\nFlyshell will now check plugin API keys.")
+    has_keys_to_report = False
+    for identifier, plugin in c.PLUGINS.items():
+        required_keys = getattr(plugin, "api_keys", [])
+        configured_keys = getattr(plugin, "api_keys_data", {})
+        dir_name = plugin.context.get("plugin_dir_name", identifier)
+        if not required_keys and not configured_keys:
+            continue
+        has_keys_to_report = True
+        configured_lookup = {k.lower(): (k, v) for k, v in configured_keys.items()}
+        seen_keys = set()
+        print(f"\nPlugin: {plugin.name} ({identifier})")
+        for req in required_keys:
+            req_lower = req.lower()
+            seen_keys.add(req_lower)
+            if req_lower in configured_lookup:
+                orig_k, _ = configured_lookup[req_lower]
+                print(f"✅ {orig_k} - Key found [Required]")
+            else:
+                print(f"⚠️ {req} - KEY NOT FOUND [Required]")
+                print(f"Please define in the .env file as: {dir_name}_{req}=<your_key>")
+        for k_lower, (orig_k, _) in sorted(configured_lookup.items()):
+            if k_lower not in seen_keys:
+                print(f"✅ {orig_k} - Key found [Optional/Extra]")
+    if not has_keys_to_report:
+        print("✅ No API keys required for any loaded plugins.")

{flyshell-1.2.9 → flyshell-1.2.11}/src/flyshell/main.py

@@ -82,6 +82,7 @@ def main():
                 print(f"\nYour OS '{c.HOST_OS}' is compatible with Flyshell.")
                 print("Flyshell will now boot.")
                 loader.scan_plugins()
+                loader.check_plugin_api_keys()
                 if auth.login_flow():
                     console.boot()
                 else:

{flyshell-1.2.9 → flyshell-1.2.11/src/flyshell.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flyshell
-Version: 1.2.9
+Version: 1.2.11
 Summary: A modular, zero-dependency command-line environment in Python.
 License: MIT
 Requires-Python: >=3.10

{flyshell-1.2.9 → flyshell-1.2.11}/tests/test_env_keys.py

@@ -82,7 +82,6 @@ def test_loader_rejects_plugin_with_missing_keys(
     )
     monkeypatch.setattr(c, "USER_PLUGIN_DIR", tmp_path)
     loader.scan_plugins(plugin_folder=tmp_path)
-    assert "needkey" not in c.PLUGINS
     out = capsys.readouterr().out
     assert "API Key Error" in out
     assert "second" in out