cuiman 0.2.0__tar.gz → 0.2.1.dev1__tar.gz

{cuiman-0.2.0 → cuiman-0.2.1.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cuiman
-Version: 0.2.0
+Version: 0.2.1.dev1
 Summary: Provides a client Python API, GUI, and CLI for servers compliant with OGC API - Processes
 Project-URL: Documentation, https://eo-tools.github.io/eozilla
 Project-URL: Repository, https://github.com/eo-tools/eozilla
@@ -27,8 +27,9 @@ Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Software Development
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
-Requires-Dist: gavicore>=0.2.0
+Requires-Dist: gavicore>=0.2.1.dev1
 Requires-Dist: httpx
+Requires-Dist: ipython
 Requires-Dist: pydantic
 Requires-Dist: pydantic-settings
 Requires-Dist: pyyaml

{cuiman-0.2.0 → cuiman-0.2.1.dev1}/cuiman/app/service.py

@@ -68,15 +68,33 @@ _AUTH_TYPE_TO_APPLICABLE_KEYS: dict[str, tuple[str, ...]] = {
 }
 
 
+def _effective_auth_type(client_config: ClientConfig) -> str:
+    """
+    Resolve the auth type to forward to the app.
+
+    ``"login"`` means the *Python* client performs a username/password login
+    to obtain a token. By the time this is called (e.g. from ``show_app()``),
+    that login has already happened and ``client_config.token`` holds a
+    resolved access token — the app doesn't need to (and can't) repeat that
+    login. Forwarding ``auth_type="login"`` verbatim makes the app treat it
+    like an interactive OAuth2/PKCE login, discarding the already-valid
+    token and forcing a redundant sign-in. Once a token is resolved, forward
+    it as ``"token"`` instead, so the app connects immediately.
+    """
+    auth_type = client_config.auth_type or "none"
+    if auth_type == "login" and client_config.token:
+        return "token"
+    return auth_type
+
+
 def _config_to_service_options(client_config: ClientConfig) -> dict[str, Any]:
     """
     Convert a ClientConfig object to a JSON-serializable dict, which includes
     only keywords applicable to the given ``auth_config.auth_type``.
     """
     auth_keys = set(AuthConfig.model_fields.keys())
-    applicable_auth_keys = _AUTH_TYPE_TO_APPLICABLE_KEYS[
-        client_config.auth_type or "none"
-    ]
+    effective_auth_type = _effective_auth_type(client_config)
+    applicable_auth_keys = _AUTH_TYPE_TO_APPLICABLE_KEYS[effective_auth_type]
     auth_config_dict = {
         k: v
         for k, v in client_config.model_dump(
@@ -85,6 +103,8 @@ def _config_to_service_options(client_config: ClientConfig) -> dict[str, Any]:
         ).items()
         if k not in auth_keys or k in applicable_auth_keys
     }
+    if "auth_type" in auth_config_dict:
+        auth_config_dict["auth_type"] = effective_auth_type
     # Additional cleanup
     if "token_header" in auth_config_dict and client_config.use_bearer:
         del auth_config_dict["token_header"]

{cuiman-0.2.0 → cuiman-0.2.1.dev1}/pyproject.toml

@@ -4,7 +4,7 @@
 
 [project]
 name = "cuiman"
-version = "0.2.0"
+version = "0.2.1.dev1"
 description = "Provides a client Python API, GUI, and CLI for servers compliant with OGC API - Processes"
 readme = "README.md"
 authors = [
@@ -40,6 +40,7 @@ classifiers = [
 ]
 requires-python = ">=3.10"
 dependencies = [
+  "ipython",
   "pydantic",
   "pydantic-settings",
   "pyyaml",
@@ -48,7 +49,7 @@ dependencies = [
   "uri-template",
   "httpx",
   # local dependency
-  "gavicore >=0.2.0",
+  "gavicore >=0.2.1.dev1",
 ]
 
 [project.scripts]