@champpaba/gslide 0.1.3 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@champpaba/gslide",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "CLI tool for automating Google Slides 'Help me visualize' feature via browser automation",
   "bin": {
     "gslide": "./bin/gslide.mjs"

package/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "gslide"
-version = "0.1.3"
+version = "0.1.5"
 description = "CLI tool for automating Google Slides 'Help me visualize' feature via browser automation"
 requires-python = ">=3.10"
 dependencies = [

package/src/gslide/__init__.py

@@ -1,3 +1,4 @@
-"""gslide — CLI for automating Google Slides 'Help me visualize' feature."""
+"""gslide — CLI for automating Google Slides 'Help me visualise' feature."""
 
-__version__ = "0.1.3"
+__version__ = "0.1.5"
+__all__ = ["__version__"]

package/src/gslide/auth.py

@@ -1,39 +1,32 @@
 """Authentication session management — file I/O and browser operations."""
 
-import json
 import sys
 from pathlib import Path
-from typing import Any
 
 import click
 
-
 SLIDES_URL = "https://docs.google.com/presentation/"
 
 
 def get_storage_path() -> Path:
-    """Return the path to the storage state file."""
     return Path.home() / ".gslide" / "storage_state.json"
 
 
 def is_logged_in() -> bool:
-    """Check if a storage state file exists."""
     return get_storage_path().exists()
 
 
-def save_storage_state(data: dict[str, Any]) -> None:
-    """Save storage state data to disk, creating directories as needed."""
-    path = get_storage_path()
-    path.parent.mkdir(parents=True, exist_ok=True)
-    path.write_text(json.dumps(data, indent=2))
+def require_login() -> Path:
+    """Return storage path or exit if not logged in."""
+    storage_path = get_storage_path()
+    if not storage_path.exists():
+        click.echo("Not logged in. Run: gslide auth login", err=True)
+        sys.exit(1)
+    return storage_path
 
 
 def delete_storage_state() -> None:
-    """Delete the storage state file. No error if missing."""
-    try:
-        get_storage_path().unlink()
-    except FileNotFoundError:
-        pass
+    get_storage_path().unlink(missing_ok=True)
 
 
 def login() -> None:
@@ -64,11 +57,7 @@ def login() -> None:
 
 def status() -> None:
     """Check if saved session is still valid."""
-    path = get_storage_path()
-
-    if not path.exists():
-        click.echo("Not logged in. Run: gslide auth login")
-        sys.exit(1)
+    path = require_login()
 
     from gslide.browser import BrowserSession
 

package/src/gslide/browser.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 from typing import Any
 
-from playwright.sync_api import sync_playwright, BrowserContext, Playwright
+from playwright.sync_api import BrowserContext, Playwright, sync_playwright
 
 
 class BrowserSession:
@@ -32,7 +32,6 @@ class BrowserSession:
             self._context.browser.close()
         if self._pw:
             self._pw.stop()
-        return None
 
 
 def save_session(context: BrowserContext, path: Path) -> None:

package/src/gslide/gen.py

@@ -16,11 +16,10 @@ import time
 import click
 from playwright.sync_api import Page, TimeoutError as PwTimeout
 
-from gslide.auth import get_storage_path
+from gslide.auth import require_login
 from gslide.browser import BrowserSession
 from gslide.prompts import PromptsData
 
-
 PRESENTATION_URL = "https://docs.google.com/presentation/d/{id}/edit"
 DEFAULT_TIMEOUT_MS = 120_000  # 120s — generation can take 30-60s
 PANEL_LOAD_TIMEOUT_MS = 10_000
@@ -53,8 +52,8 @@ def navigate_to_presentation(page: Page, presentation_id: str) -> None:
         page.wait_for_selector(
             '[aria-label="filmstrip"]', timeout=SLIDES_LOAD_TIMEOUT_MS
         )
-    except PwTimeout:
-        raise GenerationError("Google Slides UI did not load in time")
+    except PwTimeout as e:
+        raise GenerationError("Google Slides UI did not load in time") from e
 
 
 def open_panel(page: Page) -> None:
@@ -71,16 +70,10 @@ def open_panel(page: Page) -> None:
 
 
 def _reopen_panel(page: Page, retries: int = 2) -> None:
-    """Reopen the HMV panel after insert overlay is dismissed.
-
-    After inserting a slide, the panel may close. This clicks the HMV icon
-    and waits for tabs to reappear, with retry logic.
-    """
+    """Reopen the HMV panel after insert overlay is dismissed."""
     for attempt in range(retries + 1):
         try:
-            hmv = page.locator('div[aria-label="Help me visualize"]')
-            hmv.click()
-            page.wait_for_selector('[role="tab"]', timeout=PANEL_LOAD_TIMEOUT_MS)
+            open_panel(page)
             return
         except (PwTimeout, Exception):
             if attempt < retries:
@@ -97,12 +90,9 @@ def select_tab(page: Page, tab_name: str) -> None:
 
 
 def _find_visible_textarea(page: Page) -> object:
-    """Find the first visible textarea in the panel."""
-    textareas = page.locator("textarea")
-    for i in range(textareas.count()):
-        ta = textareas.nth(i)
-        if ta.is_visible():
-            return ta
+    ta = page.locator("textarea").first
+    if ta.is_visible():
+        return ta
     raise GenerationError("No visible text input found in panel")
 
 
@@ -179,12 +169,7 @@ def fill_and_create(
 
 
 def _click_preview_image(page: Page) -> None:
-    """Click the generated preview image to open the insert overlay.
-
-    Validated flow: after generation, the preview appears as an img hosted on
-    googleusercontent.com. Clicking it opens a fullscreen preview with
-    "Insert on new slide" button.
-    """
+    """Click the generated preview image to open the insert overlay."""
     preview = page.locator('img[src*="googleusercontent.com"]')
     for i in range(preview.count()):
         try:
@@ -203,73 +188,48 @@ def _click_preview_image(page: Page) -> None:
     raise GenerationError("Generated preview image not found")
 
 
-def insert_infographic(page: Page) -> None:
-    """Click preview → 'Insert on new slide' for infographic tab."""
-    _click_preview_image(page)
-
-    btn = page.get_by_text("Insert on new slide")
+def _click_insert_button(page: Page, text: str) -> None:
+    """Click an insert button by text, raising GenerationError if not found."""
+    btn = page.get_by_text(text)
     if btn.count() > 0 and btn.first.is_visible():
         btn.first.click()
     else:
-        raise GenerationError("'Insert on new slide' button not found after clicking preview")
-    _wait_for_new_slide(page)
+        raise GenerationError(f"'{text}' button not found after clicking preview")
 
 
-def insert_slide(page: Page) -> None:
-    """Click preview → 'Insert on new slide' for slide tab."""
+def _insert_on_new_slide(page: Page) -> None:
+    """Click preview then 'Insert on new slide' (used by both infographic and slide tabs)."""
     _click_preview_image(page)
-
-    # Slide tab uses same "Insert on new slide" button after clicking preview
-    btn = page.get_by_text("Insert on new slide")
-    if btn.count() > 0 and btn.first.is_visible():
-        btn.first.click()
-    else:
-        raise GenerationError("'Insert on new slide' button not found for slide tab")
-    _wait_for_new_slide(page)
+    _click_insert_button(page, "Insert on new slide")
+    page.wait_for_timeout(2000)
 
 
 def insert_image(page: Page, insert_as: str = "image") -> None:
-    """Click preview → insert as image or background."""
+    """Click preview then insert as image or background."""
     _click_preview_image(page)
 
-    # Image tab may show different insert options via dropdown
-    if insert_as == "background":
-        option_text = "Insert as background"
-    else:
-        option_text = "Insert as image"
+    option_text = "Insert as background" if insert_as == "background" else "Insert as image"
 
-    btn = page.get_by_text(option_text)
-    if btn.count() > 0 and btn.first.is_visible():
-        btn.first.click()
-    else:
-        # Fallback: try "Insert on new slide" or dropdown
-        fallback = page.get_by_text("Insert on new slide")
-        if fallback.count() > 0 and fallback.first.is_visible():
-            fallback.first.click()
-        else:
-            raise GenerationError(f"'{option_text}' button not found")
+    try:
+        _click_insert_button(page, option_text)
+    except GenerationError:
+        # Fallback: try "Insert on new slide"
+        _click_insert_button(page, "Insert on new slide")
 
     page.wait_for_timeout(2000)
 
 
-
 def check_url(page: Page, presentation_id: str) -> None:
-    """Verify browser URL still contains the target presentation ID."""
     if presentation_id not in page.url:
         raise GenerationError("Browser navigated away from target presentation")
 
 
-def _wait_for_new_slide(page: Page) -> None:
-    """Wait for new slide to appear in filmstrip."""
-    page.wait_for_timeout(2000)
-
-
 # --- Orchestration ---
 
 
 _INSERT_FN = {
-    "infographic": lambda page, **_: insert_infographic(page),
-    "slide": lambda page, **_: insert_slide(page),
+    "infographic": lambda page, **_: _insert_on_new_slide(page),
+    "slide": lambda page, **_: _insert_on_new_slide(page),
     "image": lambda page, **opts: insert_image(page, opts.get("insert_as", "image")),
 }
 
@@ -284,11 +244,7 @@ def gen_single(
     insert_as: str = "image",
 ) -> None:
     """Generate a single slide/infographic/image via browser automation."""
-    storage_path = get_storage_path()
-    if not storage_path.exists():
-        click.echo("Not logged in. Run: gslide auth login", err=True)
-        sys.exit(1)
-
+    storage_path = require_login()
     timeout_ms = timeout * 1000
 
     with BrowserSession(storage_state=storage_path) as context:
@@ -296,7 +252,6 @@ def gen_single(
 
         try:
             navigate_to_presentation(page, presentation_id)
-            check_url(page, presentation_id)
 
             if tab == "image" and slide_index is not None:
                 _navigate_to_slide(page, slide_index)
@@ -315,7 +270,6 @@ def gen_single(
 
         except GenerationError as e:
             click.echo(f"Error: {e}", err=True)
-            # Take screenshot for debugging
             try:
                 page.screenshot(path="/tmp/gslide_error.png")
                 click.echo("Debug screenshot saved to /tmp/gslide_error.png")
@@ -344,11 +298,7 @@ def gen_batch(
     timeout: int = 120,
 ) -> None:
     """Generate all slides from prompts data in a single browser session."""
-    storage_path = get_storage_path()
-    if not storage_path.exists():
-        click.echo("Not logged in. Run: gslide auth login", err=True)
-        sys.exit(1)
-
+    storage_path = require_login()
     timeout_ms = timeout * 1000
     total_slides = len(prompts_data.slides)
     total_images = len(prompts_data.images)
@@ -397,7 +347,7 @@ def gen_batch(
                 page.wait_for_timeout(500)
                 _reopen_panel(page)
 
-            except (GenerationError, PwTimeout, Exception) as e:
+            except Exception as e:
                 errors.append((i, slide.tab, str(e)))
                 click.echo(f"  {label} FAILED: {e}")
                 if not continue_on_error:
@@ -412,7 +362,7 @@ def gen_batch(
                 check_url(page, prompts_data.presentation_id)
                 _navigate_to_slide(page, img.target_slide)
 
-                if "image" != current_tab:
+                if current_tab != "image":
                     select_tab(page, "Image")
                     current_tab = "image"
 
@@ -423,13 +373,12 @@ def gen_batch(
                 elapsed = time.monotonic() - t0
                 click.echo(f"  {label} done ({elapsed:.1f}s)")
 
-            except (GenerationError, PwTimeout, Exception) as e:
+            except Exception as e:
                 errors.append((total_slides + i, "image", str(e)))
                 click.echo(f"  {label} FAILED: {e}")
                 if not continue_on_error:
                     break
 
-
     # Summary
     total_elapsed = time.monotonic() - start_time
     total_ops = total_slides + total_images
@@ -442,5 +391,5 @@ def gen_batch(
         for idx, tab, err in errors:
             click.echo(f"  #{idx} ({tab}): {err}")
     click.echo(
-        f"Presentation: https://docs.google.com/presentation/d/{prompts_data.presentation_id}/edit"
+        f"Presentation: {PRESENTATION_URL.format(id=prompts_data.presentation_id)}"
     )

package/src/gslide/prompts.py

@@ -33,9 +33,7 @@ class PromptsData:
 
 
 def load_prompts(path: Path) -> PromptsData:
-    """Load and validate a prompts.json file."""
-    with open(path) as f:
-        raw = json.load(f)
+    raw = json.loads(path.read_text())
 
     if not isinstance(raw, dict):
         raise ValidationError("Prompts file must be a JSON object")