upscaler-cli 0.2.3.dev6696__tar.gz → 0.2.3.dev6699__tar.gz

{upscaler_cli-0.2.3.dev6696 → upscaler_cli-0.2.3.dev6699}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: upscaler-cli
-Version: 0.2.3.dev6696
+Version: 0.2.3.dev6699
 Summary: Upscaler CLI - search, retrieve, and manage documents, records, and workflows
 Requires-Python: >=3.10
 Requires-Dist: click>=8.0

{upscaler_cli-0.2.3.dev6696 → upscaler_cli-0.2.3.dev6699}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "upscaler-cli"
-version = "0.2.3.dev6696"
+version = "0.2.3.dev6699"
 description = "Upscaler CLI - search, retrieve, and manage documents, records, and workflows"
 requires-python = ">=3.10"
 dependencies = [

{upscaler_cli-0.2.3.dev6696 → upscaler_cli-0.2.3.dev6699}/src/auth/oauth.py

@@ -477,7 +477,11 @@ class OAuthFlow:
             expires_at=time.time() + data.get("expires_in", 86400),
             client_id=token_data.client_id,
             client_secret=token_data.client_secret,
-            organization_id=token_data.organization_id,
+            # Read org from the refresh response (matching the login path) so a
+            # refreshed session reflects the token's real scope. Fall back to the
+            # existing value when the endpoint omits it, to avoid nulling a
+            # previously-valid org.
+            organization_id=data.get("organization_id") or token_data.organization_id,
             token_endpoint=token_data.token_endpoint,
         )
 

{upscaler_cli-0.2.3.dev6696 → upscaler_cli-0.2.3.dev6699}/src/cli/asset.py

@@ -79,14 +79,29 @@ def asset_find(ctx, title, description, asset_type, limit, offset):
         returned = metadata.get("returned_count", len(data))
         if total > returned:
             click.echo(f"Showing {returned} of {total} results (use --offset to paginate)\n")
-        click.echo(format_table(
-            data,
-            columns=["asset_id", "title", "asset_type", "description"],
-        ))
+        click.echo(
+            format_table(
+                data,
+                columns=["asset_id", "title", "asset_type", "description"],
+            )
+        )
 
 
 @asset_group.command("create")
-@click.option("--type", "asset_type", required=True, help="Asset type to create.")
+@click.option(
+    "--type",
+    "asset_type",
+    required=True,
+    type=click.Choice(
+        [
+            "document_definition",
+            "register_definition",
+            "record_definition",
+            "course_definition",
+        ]
+    ),
+    help="Asset type to create.",
+)
 @click.option("--data", "data_input", required=True, help="JSON data (value, - for stdin, @file).")
 @click.option(
     "--values-type",
@@ -179,7 +194,13 @@ def asset_update(ctx, asset_id, data_input, dry_run):
 @click.option("--dry-run", is_flag=True, help="Preview without updating.")
 @pass_context
 def asset_update_content(
-    ctx, asset_id, data_input, values_type, file_pairs, content_types, dry_run,
+    ctx,
+    asset_id,
+    data_input,
+    values_type,
+    file_pairs,
+    content_types,
+    dry_run,
 ):
     """Update asset content (Slate JSON or markdown), optionally uploading files.
 
@@ -228,7 +249,9 @@ def asset_update_content(
 @asset_group.command("upload-file")
 @click.option("--asset-id", required=True, help="Document ID to upload into.")
 @click.option(
-    "--field", "field_name", required=True,
+    "--field",
+    "field_name",
+    required=True,
     help="File-block name (options.name) on the Slate tree.",
 )
 @click.option(
@@ -361,7 +384,11 @@ def asset_add_task(ctx, asset_id, title, description, dry_run):
         data["description"] = description
 
     _execute_asset(
-        ctx, "add_task_definition", asset_id=asset_id, data=data, dry_run=dry_run,
+        ctx,
+        "add_task_definition",
+        asset_id=asset_id,
+        data=data,
+        dry_run=dry_run,
     )
 
 
@@ -379,7 +406,8 @@ def asset_add_task(ctx, asset_id, title, description, dry_run):
     "values_file",
     default=None,
     type=click.Path(exists=True, dir_okay=False),
-    help="Path to a markdown (or Slate JSON) file. Packed as the 'values' field.",
+    help="Path to the body file. With --values-type markdown the file is sent "
+         "as a raw string; otherwise it is parsed as a Slate JSON array.",
 )
 @click.option(
     "--values-type",
@@ -390,7 +418,13 @@ def asset_add_task(ctx, asset_id, title, description, dry_run):
 @click.option("--dry-run", is_flag=True, help="Preview without updating.")
 @pass_context
 def asset_set_task_values(
-    ctx, asset_id, task_definition_id, data_input, values_file, values_type, dry_run,
+    ctx,
+    asset_id,
+    task_definition_id,
+    data_input,
+    values_file,
+    values_type,
+    dry_run,
 ):
     """Set the body of a single task definition (markdown or SlateJS).
 
@@ -403,30 +437,9 @@ def asset_set_task_values(
         upscaler asset set-task-values --asset-id rd_abc --task-id td_xyz \\
             --data '{"values": "## Header\\n..."}' --values-type markdown
     """
-    from src.cli.helpers import parse_data
+    from src.cli.helpers import build_values_payload
 
-    if not data_input and not values_file:
-        click.echo("Provide either --data or --values-file.", err=True)
-        sys.exit(1)
-        return
-    if data_input and values_file:
-        click.echo("--data and --values-file are mutually exclusive.", err=True)
-        sys.exit(1)
-        return
-
-    if values_file:
-        data = {"values": Path(values_file).read_text()}
-    else:
-        try:
-            data = parse_data(data_input)
-        except Exception as e:
-            click.echo(str(e), err=True)
-            sys.exit(1)
-            return
-        if "values" not in data:
-            click.echo("--data must include a 'values' key.", err=True)
-            sys.exit(1)
-            return
+    data = build_values_payload(data_input, values_file, values_type)
 
     data["taskDefinitionId"] = task_definition_id
     if values_type:
@@ -488,10 +501,164 @@ def asset_set_task_condition(ctx, asset_id, task_definition_id, data_input, dry_
     )
 
 
+@asset_group.command("add-lesson")
+@click.option("--asset-id", required=True, help="Course definition ID (cd_...).")
+@click.option("--title", required=True, help="Lesson title.")
+@click.option("--description", default=None, help="Lesson description (optional).")
+@click.option("--dry-run", is_flag=True, help="Preview without creating.")
+@pass_context
+def asset_add_lesson(ctx, asset_id, title, description, dry_run):
+    """Append a new lesson definition to a course_definition.
+
+    Returns the assigned lesson definition ID (cl_...) which is needed to set
+    the lesson's body via `set-lesson-values`, rename it, or reorder it.
+
+    Example:
+        upscaler asset add-lesson --asset-id cd_abc --title "Phishing Basics"
+    """
+    data = {"title": title}
+    if description:
+        data["description"] = description
+
+    _execute_asset(
+        ctx,
+        "add_lesson_definition",
+        asset_id=asset_id,
+        data=data,
+        dry_run=dry_run,
+    )
+
+
+@asset_group.command("set-lesson-title")
+@click.option("--asset-id", required=True, help="Course definition ID (cd_...).")
+@click.option("--lesson-id", "lesson_definition_id", required=True, help="Lesson ID (cl_...).")
+@click.option("--title", required=True, help="New lesson title.")
+@click.option("--dry-run", is_flag=True, help="Preview without updating.")
+@pass_context
+def asset_set_lesson_title(ctx, asset_id, lesson_definition_id, title, dry_run):
+    """Rename a single lesson definition."""
+    _execute_asset(
+        ctx,
+        "set_lesson_definition_title",
+        asset_id=asset_id,
+        data={"lessonDefinitionId": lesson_definition_id, "title": title},
+        dry_run=dry_run,
+    )
+
+
+@asset_group.command("set-lesson-description")
+@click.option("--asset-id", required=True, help="Course definition ID (cd_...).")
+@click.option("--lesson-id", "lesson_definition_id", required=True, help="Lesson ID (cl_...).")
+@click.option("--description", required=True, help="New lesson description.")
+@click.option("--dry-run", is_flag=True, help="Preview without updating.")
+@pass_context
+def asset_set_lesson_description(ctx, asset_id, lesson_definition_id, description, dry_run):
+    """Set the description of a single lesson definition."""
+    _execute_asset(
+        ctx,
+        "set_lesson_definition_description",
+        asset_id=asset_id,
+        data={"lessonDefinitionId": lesson_definition_id, "description": description},
+        dry_run=dry_run,
+    )
+
+
+@asset_group.command("set-lesson-values")
+@click.option("--asset-id", required=True, help="Course definition ID (cd_...).")
+@click.option("--lesson-id", "lesson_definition_id", required=True, help="Lesson ID (cl_...).")
+@click.option(
+    "--data",
+    "data_input",
+    default=None,
+    help="JSON object with 'values' key. Mutually exclusive with --values-file.",
+)
+@click.option(
+    "--values-file",
+    "values_file",
+    default=None,
+    type=click.Path(exists=True, dir_okay=False),
+    help="Path to the body file. With --values-type markdown the file is sent "
+         "as a raw string; otherwise it is parsed as a Slate JSON array.",
+)
+@click.option(
+    "--values-type",
+    type=click.Choice(["markdown", "slateJson"]),
+    default=None,
+    help="Content format: 'markdown' or 'slateJson' (default: slateJson).",
+)
+@click.option("--dry-run", is_flag=True, help="Preview without updating.")
+@pass_context
+def asset_set_lesson_values(
+    ctx,
+    asset_id,
+    lesson_definition_id,
+    data_input,
+    values_file,
+    values_type,
+    dry_run,
+):
+    """Set the body of a single lesson definition (markdown or SlateJS).
+
+    Provide content via either --data (JSON object with 'values') or --values-file
+    (raw markdown or Slate JSON file). Pass --values-type markdown for markdown bodies.
+
+    Examples:
+        upscaler asset set-lesson-values --asset-id cd_abc --lesson-id cl_xyz \\
+            --values-file lesson1-body.md --values-type markdown
+    """
+    from src.cli.helpers import build_values_payload
+
+    data = build_values_payload(data_input, values_file, values_type)
+
+    data["lessonDefinitionId"] = lesson_definition_id
+    if values_type:
+        data["valuesType"] = values_type
+
+    _execute_asset(
+        ctx,
+        "set_lesson_definition_values",
+        asset_id=asset_id,
+        data=data,
+        dry_run=dry_run,
+    )
+
+
+@asset_group.command("remove-lesson")
+@click.option("--asset-id", required=True, help="Course definition ID (cd_...).")
+@click.option("--lesson-id", "lesson_definition_id", required=True, help="Lesson ID (cl_...).")
+@click.option("--dry-run", is_flag=True, help="Preview without removing.")
+@pass_context
+def asset_remove_lesson(ctx, asset_id, lesson_definition_id, dry_run):
+    """Remove a single lesson definition from a course_definition."""
+    _execute_asset(
+        ctx,
+        "remove_lesson_definition",
+        asset_id=asset_id,
+        data={"lessonDefinitionId": lesson_definition_id},
+        dry_run=dry_run,
+    )
+
+
+@asset_group.command("move-lesson")
+@click.option("--asset-id", required=True, help="Course definition ID (cd_...).")
+@click.option("--from-id", "from_id", required=True, help="Lesson ID to move (cl_...).")
+@click.option("--to-id", "to_id", required=True, help="Target sibling lesson ID (cl_...).")
+@click.option("--dry-run", is_flag=True, help="Preview without reordering.")
+@pass_context
+def asset_move_lesson(ctx, asset_id, from_id, to_id, dry_run):
+    """Reorder a lesson definition within a course_definition."""
+    _execute_asset(
+        ctx,
+        "move_lesson_definition",
+        asset_id=asset_id,
+        data={"fromId": from_id, "toId": to_id},
+        dry_run=dry_run,
+    )
+
+
 def _execute_asset(ctx, operation, asset_id=None, asset_type=None, data=None, dry_run=False):
     """Execute an asset operation."""
-    from src.cli.helpers import make_client
-    from src.formatters.json_fmt import format_json
+    from src.cli.helpers import emit_action_result, emit_dry_run, make_client
 
     payload = {"operation": operation}
     if asset_id:
@@ -502,11 +669,11 @@ def _execute_asset(ctx, operation, asset_id=None, asset_type=None, data=None, dr
         payload["data"] = data
 
     if dry_run:
-        if ctx.json_mode:
-            click.echo(format_json({"dry_run": True, "payload": payload}, compact=True))
-        else:
-            click.echo(f"[dry-run] Would {operation} asset:")
-            click.echo(format_json(payload))
+        emit_dry_run(
+            ctx,
+            summary=f"would {operation} {asset_type or asset_id or 'asset'}",
+            payload=payload,
+        )
         return
 
     client = make_client(ctx)
@@ -517,11 +684,9 @@ def _execute_asset(ctx, operation, asset_id=None, asset_type=None, data=None, dr
         handle_error(ctx, e)
         return
 
-    if ctx.json_mode:
-        click.echo(format_json(result, compact=True))
-    else:
-        d = result.get("data", {})
-        click.echo(f"Asset {operation}: {d.get('assetId', d.get('asset_id', ''))}")
+    emit_action_result(
+        ctx, result, label=f"Asset {operation}", id_keys=("assetId", "asset_id", "id")
+    )
 
 
 # File-upload flow for Pattern A (Documents). Documents persist `values` as
@@ -678,9 +843,7 @@ def _dry_run_asset_with_files(ctx, asset_id, files, data):
     if ctx.json_mode:
         click.echo(format_json({"dry_run": True, "payload": dry_payload}, compact=True))
     else:
-        click.echo(
-            f"[dry-run] Would upload {len(files)} file(s) and update-content asset:"
-        )
+        click.echo(f"[dry-run] Would upload {len(files)} file(s) and update-content asset:")
         click.echo(format_json(dry_payload))
 
 

{upscaler_cli-0.2.3.dev6696 → upscaler_cli-0.2.3.dev6699}/src/cli/auth.py

@@ -388,6 +388,7 @@ def status(ctx):
         return
 
     mode = "device" if token_data.client_id == "device" else "oauth"
+    refresh_present = bool(token_data.refresh_token)
 
     if ctx.json_mode:
         expires_in = int(token_data.expires_at - time.time())
@@ -397,11 +398,21 @@ def status(ctx):
             "expires_in": max(0, expires_in),
             "organization_id": token_data.organization_id,
             "mode": mode,
+            "refresh_token_present": refresh_present,
         }))
     else:
+        expires_in = int(token_data.expires_at - time.time())
         click.echo(f"Status: Authenticated ({mode})")
         if token_data.organization_id:
             click.echo(f"Organization: {token_data.organization_id}")
+        if expires_in <= 0:
+            click.echo("Token: expired (run: upscaler refresh)")
+        else:
+            click.echo(f"Expires in: {_format_duration(expires_in)}")
+        if refresh_present:
+            click.echo("Refresh token: present")
+        else:
+            click.echo("Refresh token: missing (re-login required on expiry)")
 
 
 @click.command()

{upscaler_cli-0.2.3.dev6696 → upscaler_cli-0.2.3.dev6699}/src/cli/context.py

@@ -12,6 +12,7 @@ class Context:
 
     def __init__(self):
         self.json_mode: bool = False
+        self.quiet_mode: bool = False
         self.verbose: bool = False
         self.server_url: Optional[str] = None
         self.profile: str = DEFAULT_PROFILE