google-adk-extras 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

google_adk_extras/__init__.py

@@ -28,4 +28,4 @@ __all__ = [
     "CustomAgentLoader",
 ]
 
-__version__ = "0.3.0"
+__version__ = "0.3.1"

google_adk_extras/adk_builder.py

@@ -683,6 +683,7 @@ class AdkBuilder:
             eval_storage_uri=self._eval_storage_uri,
             allow_origins=self._allow_origins,
             web=self._web_ui,
+            # Expose future override via builder when needed
             a2a=self._a2a,
             programmatic_a2a=self._a2a_expose_programmatic,
             programmatic_a2a_mount_base=self._a2a_programmatic_mount_base,

google_adk_extras/auth/attach.py

@@ -9,7 +9,7 @@ from starlette.middleware.base import BaseHTTPMiddleware
 
 from .config import AuthConfig, JwtIssuerConfig, JwtValidatorConfig
 from .jwt_utils import decode_jwt, encode_jwt, now_ts
-from .sql_store import AuthStore
+from typing import Any
 
 
 def attach_auth(app: FastAPI, cfg: Optional[AuthConfig]) -> None:
@@ -25,9 +25,14 @@ def attach_auth(app: FastAPI, cfg: Optional[AuthConfig]) -> None:
     issuer_cfg = cfg.jwt_issuer
     api_keys = set(cfg.api_keys or [])
     basic_users = cfg.basic_users or {}
-    auth_store: Optional[AuthStore] = None
+    auth_store: Optional[Any] = None
     if issuer_cfg and issuer_cfg.database_url:
-        auth_store = AuthStore(issuer_cfg.database_url)
+        try:
+            from .sql_store import AuthStore  # type: ignore
+            auth_store = AuthStore(issuer_cfg.database_url)
+        except Exception:
+            # SQL store not available; API key issuance and password grants will be unavailable.
+            auth_store = None
 
     # Security helpers
     api_key_header = APIKeyHeader(name="X-API-Key", auto_error=False)

google_adk_extras/auth/jwt_utils.py

@@ -5,8 +5,16 @@ import json
 import time
 from typing import Any, Dict, Optional
 
-import jwt
-from jwt import PyJWKClient
+# Lazy import PyJWT to keep this optional when auth is not used.
+def _import_pyjwt():
+    try:
+        import jwt  # type: ignore
+        from jwt import PyJWKClient  # type: ignore
+        return jwt, PyJWKClient
+    except Exception as e:
+        raise ImportError(
+            "PyJWT is required for JWT encode/decode. Install with: pip install PyJWT"
+        ) from e
 
 
 def _b64url(data: bytes) -> str:
@@ -14,11 +22,13 @@ def _b64url(data: bytes) -> str:
 
 
 def encode_jwt(payload: Dict[str, Any], *, algorithm: str, key: str, headers: Optional[Dict[str, Any]] = None) -> str:
+    jwt, _PyJWKClient = _import_pyjwt()
     return jwt.encode(payload, key, algorithm=algorithm, headers=headers)
 
 
 def decode_jwt(token: str, *, issuer: Optional[str] = None, audience: Optional[str] = None,
                jwks_url: Optional[str] = None, hs256_secret: Optional[str] = None) -> Dict[str, Any]:
+    jwt, PyJWKClient = _import_pyjwt()
     options = {"verify_signature": True, "verify_exp": True, "verify_nbf": True}
     if jwks_url:
         jwk_client = PyJWKClient(jwks_url)
@@ -33,4 +43,3 @@ def decode_jwt(token: str, *, issuer: Optional[str] = None, audience: Optional[s
 def now_ts() -> int:
     return int(time.time())
 
-

google_adk_extras/enhanced_fastapi.py

@@ -10,7 +10,7 @@ import logging
 import os
 from pathlib import Path
 import shutil
-from typing import Any, Mapping, Optional, List, Callable, Dict
+from typing import Any, Mapping, Optional, List, Callable, Dict, Union
 
 import click
 from fastapi import FastAPI
@@ -57,6 +57,7 @@ def get_enhanced_fast_api_app(
     eval_storage_uri: Optional[str] = None,
     allow_origins: Optional[List[str]] = None,
     web: bool = True,
+    web_assets_dir: Optional[Union[str, Path]] = None,
     a2a: bool = False,
     programmatic_a2a: bool = False,
     programmatic_a2a_mount_base: str = "/a2a",
@@ -305,20 +306,53 @@ def get_enhanced_fast_api_app(
             tear_down_observer=tear_down_observer,
         )
 
-    if web:
+    def _auto_find_web_assets() -> Optional[Path]:
         try:
-            # Try to find ADK's web assets
-            from google.adk.cli.fast_api import BASE_DIR
-            ANGULAR_DIST_PATH = BASE_DIR / "browser"
-        except (ImportError, AttributeError):
-            # Fallback if ADK structure changes
-            BASE_DIR = Path(__file__).parent.resolve()
-            ANGULAR_DIST_PATH = BASE_DIR / "browser"
-        
-        if ANGULAR_DIST_PATH.exists():
-            extra_fast_api_args.update(web_assets_dir=ANGULAR_DIST_PATH)
+            # Prefer importlib.resources so this works across ADK versions
+            import importlib.resources as r
+            try:
+                import google.adk.cli.fast_api as fast_api_pkg  # type: ignore
+                base = r.files(fast_api_pkg)
+                candidates = [
+                    base / "browser",
+                    base / "static" / "browser",
+                ]
+            except Exception:
+                import google.adk.cli as cli_pkg  # type: ignore
+                base = r.files(cli_pkg) / "fast_api"
+                candidates = [
+                    base / "browser",
+                    base / "static" / "browser",
+                ]
+            for p in candidates:
+                if p.exists() and (p / "index.html").exists():
+                    # Convert to real filesystem Path if possible
+                    try:
+                        return Path(str(p))
+                    except Exception:
+                        continue
+        except Exception:
+            pass
+        # Fallback to local relative path (for dev builds of this package)
+        local = Path(__file__).parent / "browser"
+        if local.exists() and (local / "index.html").exists():
+            return local
+        return None
+
+    if web:
+        chosen: Optional[Path] = None
+        if web_assets_dir is not None:
+            p = Path(web_assets_dir)
+            if p.exists():
+                chosen = p
+        if chosen is None:
+            chosen = _auto_find_web_assets()
+        if chosen is not None:
+            extra_fast_api_args.update(web_assets_dir=chosen)
         else:
-            logger.warning("Web UI assets not found, web interface will not be available")
+            logger.warning(
+                "Web UI assets not found; set web_assets_dir or install an ADK build that ships fast_api/browser"
+            )
 
     # Create FastAPI app
     app = adk_web_server.get_fast_api_app(

{google_adk_extras-0.3.0.dist-info → google_adk_extras-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-adk-extras
-Version: 0.3.0
+Version: 0.3.1
 Summary: Production-ready services and FastAPI wiring for Google ADK
 Home-page: https://github.com/DeadMeme5441/google-adk-extras
 Author: DeadMeme5441

{google_adk_extras-0.3.0.dist-info → google_adk_extras-0.3.1.dist-info}/RECORD

@@ -1,8 +1,8 @@
-google_adk_extras/__init__.py,sha256=deMaothLZ-UWkfMdfIV186oMu9ueatO1pT8mpBrJnw8,851
-google_adk_extras/adk_builder.py,sha256=Ax5e_NegGZcdb_xm4t4e18gpJjcR5ICn0Zefy6VuLh4,30068
+google_adk_extras/__init__.py,sha256=GbBnzocuEjf2RphvKaL9-DoDtsq0FVz2QO0uVTe66sQ,851
+google_adk_extras/adk_builder.py,sha256=OR8ZSgaZJwjVpbfoTHOjgIisO_2sPUxegS0_ngCAco4,30129
 google_adk_extras/custom_agent_loader.py,sha256=e_sgA58RmDzCUHCySAi3Hruxumtozw3UScZV2vxlCbw,5991
 google_adk_extras/enhanced_adk_web_server.py,sha256=4QxTADlQv6oXaAEVMQc7-bpf84jCrTkN6pJC6R2jmww,5348
-google_adk_extras/enhanced_fastapi.py,sha256=xoWh9wibhxc48fEpLyQrkb2gB8Cas75_fwZzKWoRMic,28454
+google_adk_extras/enhanced_fastapi.py,sha256=8JCkGOtzUaQM68BanhPaii1xBziPelXAYIbyUeUMEO0,29748
 google_adk_extras/enhanced_runner.py,sha256=b7O1a9-4S49LduILOEDs6IxjCI4w_E39sc-Hs4y3Rys,1410
 google_adk_extras/artifacts/__init__.py,sha256=_IsKDgf6wanWR0HXvSpK9SiLa3n5URKLtazkKyH1P-o,931
 google_adk_extras/artifacts/base_custom_artifact_service.py,sha256=O9rkc250B3yDRYbyDI0EvTrCKvnih5_DQas5OF-hRMY,9721
@@ -11,9 +11,9 @@ google_adk_extras/artifacts/mongo_artifact_service.py,sha256=K46Ycl7gkzCbCweVL0G
 google_adk_extras/artifacts/s3_artifact_service.py,sha256=inIc2KL3OdIQGkCA_HYJE0ZfGFQ3YcX_SFZEFVUb0T8,15655
 google_adk_extras/artifacts/sql_artifact_service.py,sha256=OovKSzM0nib2c-pzkv7NYyiHi8kFK-k3SFOMi92U4Mk,11980
 google_adk_extras/auth/__init__.py,sha256=PQQmFAjOPrt9tAGHOtQC-_U7fpRd8Dt_vh973b2pSnc,202
-google_adk_extras/auth/attach.py,sha256=eEnT7vvsb0ZQUKQI8ijgIziTrRTiyc1aPV0LwXBWtmU,10020
+google_adk_extras/auth/attach.py,sha256=wSb2jKziGXqhRzu8XCBVuoHXyJa7T6CrGGbRhsfp_50,10235
 google_adk_extras/auth/config.py,sha256=JGJefyExVG3QFjmAkgTT-yaMivCvkOs4E7HwMlqVES0,1573
-google_adk_extras/auth/jwt_utils.py,sha256=sWIQWa1lGrottv6kzxo6cgTZFBa7J7wSa2-aJIVxfM8,1290
+google_adk_extras/auth/jwt_utils.py,sha256=B3Iyu0GRqDU0EstGxfMUKm_w58z4l6WQGRAQvlcwvYk,1701
 google_adk_extras/auth/sql_store.py,sha256=-LouLrcT4gBBGrwG4kqbMyjVo1W1BbugPCKZUUFklWs,6693
 google_adk_extras/credentials/base_custom_credential_service.py,sha256=iYHacJAsZmDfpxLOPYx4tQpbtWTbwC75tRp6hlZFoSg,4014
 google_adk_extras/memory/__init__.py,sha256=2FFJXw9CZHctKXmCuc-lrdETeQ5xqdivy3oarHJz5gs,994
@@ -30,8 +30,8 @@ google_adk_extras/sessions/sql_session_service.py,sha256=TaOeEVWnwQ_8nvDZBW7e3qh
 google_adk_extras/sessions/yaml_file_session_service.py,sha256=g65ptJWAMVN4XQmCxQ0UwnSC2GU1NJ6QRvrwfzSK_xo,11797
 google_adk_extras/streaming/__init__.py,sha256=rcjmlCJHTlvUiCrx6qNGw5ObCnEtfENkGTvzfEiGL0M,461
 google_adk_extras/streaming/streaming_controller.py,sha256=Z72k5QgvWBIU2YP8iXlc3D3oWxDYWJo9eygj_KzALYA,10489
-google_adk_extras-0.3.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-google_adk_extras-0.3.0.dist-info/METADATA,sha256=EX-DwXDezDXZVSLkGwTb36T-4pS_DWQgXRmCPDx5Gcw,12867
-google_adk_extras-0.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-google_adk_extras-0.3.0.dist-info/top_level.txt,sha256=DDWgVkz8G8ihPzznxAWyKa2jgJW3F6Fwy__qMddoKTs,18
-google_adk_extras-0.3.0.dist-info/RECORD,,
+google_adk_extras-0.3.1.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+google_adk_extras-0.3.1.dist-info/METADATA,sha256=jN02PjbEwa6Lm-2rEpLV-bCBhRmNM9U3bd7u9RpxsS8,12867
+google_adk_extras-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+google_adk_extras-0.3.1.dist-info/top_level.txt,sha256=DDWgVkz8G8ihPzznxAWyKa2jgJW3F6Fwy__qMddoKTs,18
+google_adk_extras-0.3.1.dist-info/RECORD,,