lkr-dev-cli 0.0.23__py3-none-any.whl → 0.0.24__py3-none-any.whl

lkr/auth/main.py

@@ -9,27 +9,31 @@ from rich.table import Table
 
 from lkr.auth.oauth import OAuth2PKCE
 from lkr.auth_service import get_auth
-from lkr.logging import logger
+from lkr.logger import logger
 
 __all__ = ["group"]
 
 group = typer.Typer(name="auth", help="Authentication commands for LookML Repository")
 
+
 @group.callback()
 def callback(ctx: typer.Context):
     if ctx.invoked_subcommand == "whoami":
         return
-    if ctx.obj['ctx_lkr'].use_sdk == "api_key":
+    if ctx.obj["ctx_lkr"].use_sdk == "api_key":
         logger.error("API key authentication is not supported for auth commands")
         raise typer.Exit(1)
 
+
 @group.command()
 def login(
     ctx: typer.Context,
     instance_name: Annotated[
         str | None,
         typer.Option(
-            "-I", "--instance-name", help="Name of the Looker instance to login or switch to"
+            "-I",
+            "--instance-name",
+            help="Name of the Looker instance to login or switch to",
         ),
     ] = None,
 ):
@@ -38,7 +42,7 @@ def login(
     """
     auth = get_auth(ctx)
     all_instances = auth.list_auth()
-    
+
     def do_switch(instance_name: str):
         auth.set_current_instance(instance_name)
         sdk = auth.get_current_sdk()
@@ -61,17 +65,19 @@ def login(
     else:
         options: List[questionary.Choice] = []
         max_name_length = 0
-        for (name, url, current, up) in all_instances:
+        for name, url, current, up in all_instances:
             max_name_length = max(max_name_length, len(name))
         options = [
-            questionary.Choice(title=f"{name:{max_name_length}} ({url})", value=name, checked=current)
+            questionary.Choice(
+                title=f"{name:{max_name_length}} ({url})", value=name, checked=current
+            )
             for name, url, current, up in all_instances
         ]
-        options.append(questionary.Choice(title="+ Add new instance", value="_add_new_instance"))
+        options.append(
+            questionary.Choice(title="+ Add new instance", value="_add_new_instance")
+        )
         picked = questionary.select(
-            "Select instance to login/switch to",
-            choices=options,
-            pointer=">"
+            "Select instance to login/switch to", choices=options, pointer=">"
         ).ask()
         if picked != "_add_new_instance":
             do_switch(picked)
@@ -88,17 +94,19 @@ def login(
             )
             use_production = typer.confirm("Use production mode?", default=False)
             instance_name = typer.prompt(
-                "Enter a name for this Looker instance", default=f"{'dev' if not use_production else 'prod'}-{parsed_url.netloc}"
+                "Enter a name for this Looker instance",
+                default=f"{'dev' if not use_production else 'prod'}-{parsed_url.netloc}",
             )
             # Ensure instance_name is str, not None
-            assert instance_name is not None, "Instance name must be set before adding auth."
+            assert instance_name is not None, (
+                "Instance name must be set before adding auth."
+            )
 
             def auth_callback(token: Union[AuthToken, AccessToken]):
                 auth.add_auth(instance_name, origin, token, use_production)
-            
+
             oauth = OAuth2PKCE(
-                new_token_callback=auth_callback,
-                use_production=use_production
+                new_token_callback=auth_callback, use_production=use_production
             )
             logger.info(f"Opening browser for authentication at {origin + '/auth'}...")
             login_response = oauth.initiate_login(origin)
@@ -114,13 +122,16 @@ def login(
                         logger.error("Failed to exchange authorization code for tokens")
                         raise typer.Exit(1)
                 except Exception as e:
-                    logger.error(f"Failed to exchange authorization code for tokens: {str(e)}")
+                    logger.error(
+                        f"Failed to exchange authorization code for tokens: {str(e)}"
+                    )
                     raise typer.Exit(1)
             else:
                 logger.error("Failed to receive authorization code")
                 raise typer.Exit(1)
             do_switch(instance_name)
 
+
 @group.command()
 def logout(
     ctx: typer.Context,
@@ -132,9 +143,7 @@ def logout(
     ] = None,
     all: Annotated[
         bool,
-        typer.Option(
-            "--all", help="Logout from all instances"
-        ),
+        typer.Option("--all", help="Logout from all instances"),
     ] = False,
 ):
     """
@@ -156,7 +165,7 @@ def logout(
         logger.info("Logout cancelled")
         raise typer.Exit()
 
-    if instance_name:   
+    if instance_name:
         logger.info(f"Logging out from instance: {instance_name}")
         auth.delete_auth(instance_name=instance_name)
     else:
@@ -198,7 +207,12 @@ def list(ctx: typer.Context):
         raise typer.Exit(1)
     table = Table(" ", "Instance", "URL", "Production")
     for instance in all_instances:
-        table.add_row("*" if instance[2] else " ", instance[0], instance[1], "Yes" if instance[3] else "No")
+        table.add_row(
+            "*" if instance[2] else " ",
+            instance[0],
+            instance[1],
+            "Yes" if instance[3] else "No",
+        )
     console.print(table)
 
 

lkr/auth/oauth.py

@@ -10,7 +10,7 @@ import webbrowser
 from typing import Optional, TypedDict
 from urllib.parse import parse_qs
 
-from lkr.types import NewTokenCallback
+from lkr.custom_types import NewTokenCallback
 
 
 def kill_process_on_port(port: int, retries: int = 5, delay: float = 1) -> None:
@@ -117,10 +117,35 @@ class OAuth2PKCE:
         # Kill any process using port 8000
         kill_process_on_port(self.port)
 
-        # Start the local server
-        self.server = OAuthCallbackServer(("localhost", self.port))
+        # Wait until the port is actually free and we can bind the real server (up to 20 seconds)
+        server_created = False
+        last_exception = None
+        for _ in range(20):  # 20 x 1s = 20s
+            try:
+                self.server = OAuthCallbackServer(("localhost", self.port))
+                server_created = True
+                break
+            except OSError as e:
+                if getattr(e, "errno", None) == 48 or "Address already in use" in str(
+                    e
+                ):
+                    last_exception = e
+                    time.sleep(1)
+                else:
+                    raise
+        if not server_created:
+            import logging
+
+            logging.error(
+                f"Failed to bind to port {self.port} after waiting: {last_exception}"
+            )
+            raise RuntimeError(
+                f"Failed to bind to port {self.port} after waiting: {last_exception}"
+            )
 
         # Start the server in a separate thread
+        if self.server is None:
+            raise RuntimeError("Internal error: server was not created successfully.")
         self.server_thread = threading.Thread(target=self.server.serve_forever)
         self.server_thread.daemon = True
         self.server_thread.start()
@@ -139,6 +164,8 @@ class OAuth2PKCE:
         self.server_thread.join()
 
         # Get the authorization code
+        if self.server is None:
+            raise RuntimeError("Internal error: server was not created successfully.")
         return LoginResponse(
             auth_code=self.server.auth_code,
             code_verifier=self.auth_session.code_verifier,

lkr/auth_service.py

@@ -1,24 +1,26 @@
 import json
 import os
 import sqlite3
+import types
 from datetime import datetime, timedelta, timezone
 from typing import List, Self, Tuple, Union
 
+import requests
 import typer
 from looker_sdk.rtl import serialize
 from looker_sdk.rtl.api_settings import ApiSettings, SettingsConfig
 from looker_sdk.rtl.auth_session import AuthSession, CryptoHash, OAuthSession
 from looker_sdk.rtl.auth_token import AccessToken, AuthToken
 from looker_sdk.rtl.requests_transport import RequestsTransport
-from looker_sdk.rtl.transport import HttpMethod
+from looker_sdk.rtl.transport import LOOKER_API_ID, HttpMethod
 from looker_sdk.sdk.api40.methods import Looker40SDK
 from pydantic import BaseModel, Field, computed_field
 from pydash import get
 
 from lkr.classes import LkrCtxObj, LookerApiKey
 from lkr.constants import LOOKER_API_VERSION, OAUTH_CLIENT_ID, OAUTH_REDIRECT_URI
-from lkr.logging import logger
-from lkr.types import NewTokenCallback
+from lkr.custom_types import NewTokenCallback
+from lkr.logger import logger
 
 __all__ = ["get_auth", "ApiKeyAuthSession", "DbOAuthSession"]
 
@@ -43,7 +45,6 @@ class ApiKeyApiSettings(ApiSettings):
         self.api_key = api_key
         super().__init__()
         self.agent_tag = "lkr-cli-api-key"
-        self.headers = {"X-Looker-AppId": "lkr-cli"}
 
     def read_config(self) -> SettingsConfig:
         return SettingsConfig(
@@ -58,7 +59,6 @@ class OAuthApiSettings(ApiSettings):
         self.base_url = base_url
         super().__init__()
         self.agent_tag = "lkr-cli-oauth"
-        self.headers = {"X-Looker-AppId": "lkr-cli"}
 
     def read_config(self) -> SettingsConfig:
         return SettingsConfig(
@@ -151,7 +151,7 @@ def get_auth_session(
     access_token: AccessToken | None = None,
 ) -> DbOAuthSession:
     settings = OAuthApiSettings(base_url)
-    transport = RequestsTransport.configure(settings)
+    transport = MonkeyPatchTransport.configure(settings)
     auth = DbOAuthSession(
         settings=settings,
         transport=transport,
@@ -188,6 +188,29 @@ def init_api_key_sdk(api_key: LookerApiKey, use_production: bool) -> Looker40SDK
     )
 
 
+# monkey patch to remove the LOOKER_API_ID header when exchanging the code for a token
+def monkey_patch_prepare_request(session: requests.Session):
+    original_prepare_request = session.prepare_request
+
+    def prepare_request(self, request, *args, **kwargs):
+        x = original_prepare_request(request, *args, **kwargs)
+        if (
+            x.headers.get(LOOKER_API_ID)
+            and x.path_url.endswith("/api/token")
+            and request.method == "POST"
+        ):
+            x.headers.pop(LOOKER_API_ID)
+        return x
+
+    session.prepare_request = types.MethodType(prepare_request, session)
+
+
+class MonkeyPatchTransport(RequestsTransport):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        monkey_patch_prepare_request(self.session)
+
+
 def init_oauth_sdk(
     base_url: str,
     new_token_callback: NewTokenCallback,
@@ -198,7 +221,8 @@ def init_oauth_sdk(
     """Default dependency configuration"""
     settings = OAuthApiSettings(base_url)
     settings.is_configured()
-    transport = RequestsTransport.configure(settings)
+    transport = MonkeyPatchTransport.configure(settings)
+
     auth = get_auth_session(
         base_url,
         new_token_callback,
@@ -500,7 +524,7 @@ class SqlLiteAuth:
             if not token:
                 raise InvalidRefreshTokenError(current_auth.instance_name)
             else:
-                from lkr.logging import logger
+                from lkr.logger import logger
 
                 logger.info(
                     f"Successfully refreshed token for {current_auth.instance_name}"

lkr/{logging.py → logger.py}

@@ -6,16 +6,18 @@ from rich.console import Console
 from rich.logging import RichHandler
 from rich.theme import Theme
 
-from lkr.types import LogLevel
+from lkr.custom_types import LogLevel
 
 # Define a custom theme for our logging
-theme = Theme({
-    "logging.level.debug": "dim blue",
-    "logging.level.info": "bold green",
-    "logging.level.warning": "bold yellow",
-    "logging.level.error": "bold red",
-    "logging.level.critical": "bold white on red",
-})
+theme = Theme(
+    {
+        "logging.level.debug": "dim blue",
+        "logging.level.info": "bold green",
+        "logging.level.warning": "bold yellow",
+        "logging.level.error": "bold red",
+        "logging.level.critical": "bold white on red",
+    }
+)
 
 # Create a console for logging
 console = Console(theme=theme)
@@ -36,7 +38,9 @@ log_level = os.getenv("LOG_LEVEL", DEFAULT_LOG_LEVEL).upper()
 
 # Configure the root logger
 logging.basicConfig(
-    level=getattr(logging, log_level, logging.INFO),  # Fallback to INFO if invalid level
+    level=getattr(
+        logging, log_level, logging.INFO
+    ),  # Fallback to INFO if invalid level
     format="%(message)s",
     datefmt="[%X]",
     handlers=[handler],
@@ -51,9 +55,12 @@ requests_logger = logging.getLogger("looker_sdk.rtl.requests_transport")
 if log_level != "DEBUG":
     requests_logger.setLevel(logging.WARNING)
 
+
 def set_log_level(level: LogLevel):
     """Set the logging level for the application."""
     logger.setLevel(getattr(logging, level.value))
     logging.getLogger("lkr.structured").setLevel(getattr(logging, level.value))
     # Update requests_transport logger level based on the new level
-    requests_logger.setLevel(logging.DEBUG if level == LogLevel.DEBUG else logging.WARNING) 
+    requests_logger.setLevel(
+        logging.DEBUG if level == LogLevel.DEBUG else logging.WARNING
+    )

lkr/main.py

@@ -5,10 +5,10 @@ import typer
 
 from lkr.auth.main import group as auth_group
 from lkr.classes import LkrCtxObj
-from lkr.logging import logger
+from lkr.custom_types import LogLevel
+from lkr.logger import logger
 from lkr.mcp.main import group as mcp_group
 from lkr.observability.main import group as observability_group
-from lkr.types import LogLevel
 
 app = typer.Typer(
     name="lkr", help="LookML Repository CLI", add_completion=True, no_args_is_help=True
@@ -55,11 +55,11 @@ def callback(
         logger.warning("Ignoring --dev flag because OAuth token tracks dev/prod mode.")
 
     if log_level:
-        from lkr.logging import set_log_level
+        from lkr.logger import set_log_level
 
         set_log_level(log_level)
     if quiet:
-        from lkr.logging import set_log_level
+        from lkr.logger import set_log_level
 
         set_log_level(LogLevel.ERROR)
 

lkr/mcp/main.py

@@ -17,7 +17,7 @@ from pydash import get
 
 from lkr.auth_service import get_auth
 from lkr.classes import LkrCtxObj
-from lkr.logging import logger
+from lkr.logger import logger
 
 __all__ = ["group"]
 

lkr/observability/classes.py

@@ -8,7 +8,7 @@ from looker_sdk.sdk.api40.methods import LookerSDK
 from looker_sdk.sdk.api40.models import EmbedSsoParams
 from pydantic import BaseModel, ConfigDict, Field
 
-from lkr.logging import structured_logger
+from lkr.logger import structured_logger
 
 DEFAULT_PERMISSIONS = [
     "access_data",
@@ -84,14 +84,6 @@ class LogEvent(BaseModel):
     dashboard_id: str
 
 
-class EventCollector:
-    def __init__(self):
-        self.events = []
-
-    def log_event(self, event: dict[str, Any], event_type: str):
-        self.events.append(LogEvent(**event, event_type=event_type))
-
-
 class ObservabilityCtxObj(BaseModel):
     event_prefix: str = Field(
         default="lkr-observability", description="The prefix of the event", min_length=1

lkr/observability/main.py

@@ -17,7 +17,7 @@ from selenium.webdriver.remote.webdriver import WebDriver
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
 
-from lkr.logging import structured_logger
+from lkr.logger import structured_logger
 from lkr.observability.classes import (
     EmbedSDKObj,
     IframeRequestEvent,

lkr/observability/utils.py

@@ -3,10 +3,9 @@ import re
 from datetime import datetime, timezone
 from typing import Dict, List, Tuple
 
-from pydantic import BaseModel, Field
 from pydash import set_
 
-from lkr.logging import logger
+from lkr.logger import logger
 
 MAX_SESSION_LENGTH = 2592000
 
@@ -75,30 +74,6 @@ def format_attributes(
 def now():
     return datetime.now(timezone.utc)
 
+
 def ms_diff(start: datetime):
     return int((now() - start).total_seconds() * 1000)
-
-class LogEventResponse(BaseModel):
-    timestamp: datetime = Field(default_factory=now)
-    event_name: str
-    event_prefix: str
-
-    def make_previous(self):
-        return dict(
-            previous_event_name=self.event_name,
-            previous_event_timestamp=self.timestamp,
-            previous_event_duration_ms=ms_diff(self.timestamp),
-        )
-
-def log_event(event_name: str, prefix: str, **kwargs):
-    if "timestamp" not in kwargs:
-        kwargs["timestamp"] = now().isoformat()
-    logger.info(
-        f"{prefix}:{event_name}",
-        **kwargs
-    )
-    return LogEventResponse(
-        timestamp=datetime.fromisoformat(kwargs["timestamp"]), 
-        event_name=event_name, 
-        event_prefix=prefix
-    )

{lkr_dev_cli-0.0.23.dist-info → lkr_dev_cli-0.0.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lkr-dev-cli
-Version: 0.0.23
+Version: 0.0.24
 Summary: lkr: a command line interface for looker
 Author: bwebs
 License-Expression: MIT

lkr_dev_cli-0.0.24.dist-info/RECORD

@@ -0,0 +1,21 @@
+lkr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+lkr/auth_service.py,sha256=NIGlSVtzS3ajpWYx2gTJVDknuF_KxwYsJEj88Hc05dQ,19887
+lkr/classes.py,sha256=f2TJOXFta0s8LJLEXOqPdWPLg-EIIntUSDS6gDOon7M,1163
+lkr/constants.py,sha256=DdCfsV6q8wgs2iHpIQeb6oDP_2XejusEHyPvCbaM3yY,108
+lkr/custom_types.py,sha256=feJ-W2U61PJTiotMLuZJqxrotA53er95kO1O30mooy4,323
+lkr/exceptions.py,sha256=M_aR4YaCZtY4wyxhcoqJCVkxVu9z3Wwo5KgSDyOoEnI,210
+lkr/logger.py,sha256=wLEVluF-2lVMPJ228D7O4-shHaydEGXmn47j567nUgw,1887
+lkr/main.py,sha256=wpnSiCpIScEi-jmrLuwcSJrMX3tMkuaYNwlvNkVf5N8,2375
+lkr/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+lkr/auth/main.py,sha256=7tWGPWokzbBnrX1enZ9YP4rdDJqYBlGfuYe0Wg-fXT4,7532
+lkr/auth/oauth.py,sha256=n2yAcccdBZaloGVtFRTwCPBfh1cvVYNbXLsFCxmWc5M,7207
+lkr/mcp/main.py,sha256=fz7Bvbkj1CTD185lGwNdMYP7bOTDadWL1xdD4JZW8qQ,22886
+lkr/observability/classes.py,sha256=LgGuUnY-J1csPrlAKnw4PPOqOfbvaOx2cxENlQgJYcE,5816
+lkr/observability/embed_container.html,sha256=IcDG-QVsYYNGQGrkDrx9OMZ2Pmo4C8oAjRHddFQ7Tlw,2939
+lkr/observability/main.py,sha256=XbejIdqhNNUMqHVezb5EnLaJ32dO9-Bt0o5d8lc0kyw,9544
+lkr/observability/utils.py,sha256=UpaBrp_ufaXLoz4p3xG3K6lHKBpP9wBhvP8rDmeGoWg,2148
+lkr_dev_cli-0.0.24.dist-info/METADATA,sha256=PKOjKBiQqRlg4nfYzcFjbjYHSzaRNCslIlBiBGaaZPw,10663
+lkr_dev_cli-0.0.24.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+lkr_dev_cli-0.0.24.dist-info/entry_points.txt,sha256=nn2sFMGDpwUVE61ZUpbDPnQZkW7Gc08nV-tyLGo8q34,37
+lkr_dev_cli-0.0.24.dist-info/licenses/LICENSE,sha256=hKnCOORW1JRE_M2vStz8dblS5u1iR-2VpqS9xagKNa0,1063
+lkr_dev_cli-0.0.24.dist-info/RECORD,,

lkr_dev_cli-0.0.23.dist-info/RECORD

@@ -1,21 +0,0 @@
-lkr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lkr/auth_service.py,sha256=gwKbNXa2v6oSc01h7Vlhrld12uQgrFd5NkbxYnxjGS0,19140
-lkr/classes.py,sha256=f2TJOXFta0s8LJLEXOqPdWPLg-EIIntUSDS6gDOon7M,1163
-lkr/constants.py,sha256=DdCfsV6q8wgs2iHpIQeb6oDP_2XejusEHyPvCbaM3yY,108
-lkr/exceptions.py,sha256=M_aR4YaCZtY4wyxhcoqJCVkxVu9z3Wwo5KgSDyOoEnI,210
-lkr/logging.py,sha256=bBGdxkVrUidRTJAvqGHyQ5KS6IJGYDCoool5tTB_JxM,1822
-lkr/main.py,sha256=R3WSyj1AklinWE7wntuV9JSO_a6SsPhE3iOJE1nUn30,2371
-lkr/types.py,sha256=feJ-W2U61PJTiotMLuZJqxrotA53er95kO1O30mooy4,323
-lkr/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lkr/auth/main.py,sha256=ebGp-NdgULodHaDrLKspnGSFf_sOkV2Vanil1NbOJKY,7382
-lkr/auth/oauth.py,sha256=THynLg8ejAPl4RJ7q4PugEsLq4FFB0wKCHhDeNO9NDo,6106
-lkr/mcp/main.py,sha256=91LQ8Ny6VTOBRRcDI58Z1c8na9TyfgJfZ8nPjmt1n6w,22887
-lkr/observability/classes.py,sha256=5kQnHxa3pgUartrbccuG0yMClfoFqYCXY8iCTJTZvgk,6025
-lkr/observability/embed_container.html,sha256=IcDG-QVsYYNGQGrkDrx9OMZ2Pmo4C8oAjRHddFQ7Tlw,2939
-lkr/observability/main.py,sha256=1KCmJQLb6ht2-l2TXlN8Y8CCfpIP_E5TcMTy2VMaboA,9545
-lkr/observability/utils.py,sha256=Hv3g60cI03cQwyEe8QV7bUMssE6pyrZKnDyl9rxm5b8,2915
-lkr_dev_cli-0.0.23.dist-info/METADATA,sha256=M-UniLnNT-vHWfPc5xC4h09X5WzmSmjkwh5BQZrfr2o,10663
-lkr_dev_cli-0.0.23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-lkr_dev_cli-0.0.23.dist-info/entry_points.txt,sha256=nn2sFMGDpwUVE61ZUpbDPnQZkW7Gc08nV-tyLGo8q34,37
-lkr_dev_cli-0.0.23.dist-info/licenses/LICENSE,sha256=hKnCOORW1JRE_M2vStz8dblS5u1iR-2VpqS9xagKNa0,1063
-lkr_dev_cli-0.0.23.dist-info/RECORD,,