licos-dev-cli 0.2.13__tar.gz → 0.2.14__tar.gz

{licos_dev_cli-0.2.13 → licos_dev_cli-0.2.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: licos-dev-cli
-Version: 0.2.13
+Version: 0.2.14
 Summary: LICOS Dev CLI - generate files and call model capabilities
 Requires-Python: >=3.10
 Requires-Dist: click>=8.1

{licos_dev_cli-0.2.13 → licos_dev_cli-0.2.14}/pyproject.toml

@@ -4,11 +4,11 @@ build-backend = "hatchling.build"
 
 [project]
 name = "licos-dev-cli"
-version = "0.2.13"
+version = "0.2.14"
 description = "LICOS Dev CLI - generate files and call model capabilities"
 requires-python = ">=3.10"
 dependencies = [
-    "licos-dev-sdk>=0.2.14",
+    "licos-dev-sdk>=0.2.14",
     "click>=8.1",
 ]
 

{licos_dev_cli-0.2.13 → licos_dev_cli-0.2.14}/src/licos_dev_cli/main.py

@@ -2,9 +2,11 @@
 
 from __future__ import annotations
 
-import sys
-import json
-import click
+import sys
+import json
+import os
+from pathlib import Path
+import click
 
 # ── Helpers ──────────────────────────────────────────────────────────────────
 
@@ -35,13 +37,57 @@ def _json_option(value: str | None, name: str) -> dict | list | None:
         raise click.BadParameter(f"{name} must be valid JSON") from exc
 
 
-def _echo_json(value: object) -> None:
-    if hasattr(value, "to_dict"):
-        value = value.to_dict()
-    click.echo(json.dumps(value, ensure_ascii=False, indent=2))
-
-
-# ── CLI Group ────────────────────────────────────────────────────────────────
+def _echo_json(value: object) -> None:
+    if hasattr(value, "to_dict"):
+        value = value.to_dict()
+    click.echo(json.dumps(value, ensure_ascii=False, indent=2))
+
+
+def _path_to_cli_output(path: object) -> str:
+    raw = str(path)
+    if not raw:
+        return raw
+
+    normalized = raw.replace("\\", "/")
+    string_roots = [
+        os.environ.get("LICOS_PROJECT_PATH"),
+        (os.path.join(os.environ["LICOS_WORKSPACE_PATH"], "projects") if os.environ.get("LICOS_WORKSPACE_PATH") else None),
+        "/workspace/projects",
+    ]
+    for root in string_roots:
+        if not root:
+            continue
+        prefix = root.replace("\\", "/").rstrip("/")
+        if normalized == prefix:
+            return "."
+        if normalized.startswith(f"{prefix}/"):
+            return normalized[len(prefix) + 1 :]
+
+    p = Path(raw)
+    if not p.is_absolute():
+        return normalized
+
+    path_roots = [
+        os.environ.get("LICOS_PROJECT_PATH"),
+        (os.path.join(os.environ["LICOS_WORKSPACE_PATH"], "projects") if os.environ.get("LICOS_WORKSPACE_PATH") else None),
+        str(Path.cwd()),
+    ]
+    for root in path_roots:
+        if not root:
+            continue
+        try:
+            return p.resolve().relative_to(Path(root).resolve()).as_posix()
+        except (OSError, RuntimeError, ValueError):
+            continue
+
+    return normalized
+
+
+def _echo_path(path: object) -> None:
+    click.echo(_path_to_cli_output(path))
+
+
+# ── CLI Group ────────────────────────────────────────────────────────────────
 
 @click.group()
 def cli():
@@ -60,10 +106,10 @@ def cli():
 @click.option("--page-size", default="A4", help="Page size: A4|LETTER")
 def pdf(input_path, content, filename, output_dir, content_type, page_size):
     """Generate PDF from Markdown or HTML."""
-    from licos_dev_sdk import create_pdf
-    text = _read_input(input_path, content)
-    path = create_pdf(text, filename, content_type=content_type, output_dir=output_dir, page_size=page_size)
-    click.echo(path)
+    from licos_dev_sdk import create_pdf
+    text = _read_input(input_path, content)
+    path = create_pdf(text, filename, content_type=content_type, output_dir=output_dir, page_size=page_size)
+    _echo_path(path)
 
 
 # ── DOCX ─────────────────────────────────────────────────────────────────────
@@ -78,10 +124,10 @@ def pdf(input_path, content, filename, output_dir, content_type, page_size):
 @click.option("--font-size", default=11, type=int)
 def docx(input_path, content, filename, output_dir, content_type, font, font_size):
     """Generate DOCX from Markdown or HTML."""
-    from licos_dev_sdk import create_docx
-    text = _read_input(input_path, content)
-    path = create_docx(text, filename, content_type=content_type, output_dir=output_dir, font_name=font, font_size=font_size)
-    click.echo(path)
+    from licos_dev_sdk import create_docx
+    text = _read_input(input_path, content)
+    path = create_docx(text, filename, content_type=content_type, output_dir=output_dir, font_name=font, font_size=font_size)
+    _echo_path(path)
 
 
 @cli.command("docx-template")
@@ -94,10 +140,10 @@ def docx_template(template_path, input_path, data_content, filename, output_dir)
     """Generate DOCX by rendering a DOCX template with JSON data."""
     from licos_dev_sdk import create_docx_from_template
     data = _read_json(input_path, data_content)
-    if not isinstance(data, dict):
-        raise click.BadParameter("template data must be a JSON object")
-    path = create_docx_from_template(template_path, data, filename, output_dir=output_dir)
-    click.echo(path)
+    if not isinstance(data, dict):
+        raise click.BadParameter("template data must be a JSON object")
+    path = create_docx_from_template(template_path, data, filename, output_dir=output_dir)
+    _echo_path(path)
 
 
 # ── XLSX ─────────────────────────────────────────────────────────────────────
@@ -111,10 +157,10 @@ def docx_template(template_path, input_path, data_content, filename, output_dir)
 @click.option("--header-color", default="4472C4")
 def xlsx(input_path, content, filename, output_dir, sheet_name, header_color):
     """Generate XLSX from JSON data."""
-    from licos_dev_sdk import create_xlsx
-    data = _read_json(input_path, content)
-    path = create_xlsx(data, filename, output_dir=output_dir, sheet_name=sheet_name, header_color=header_color)
-    click.echo(path)
+    from licos_dev_sdk import create_xlsx
+    data = _read_json(input_path, content)
+    path = create_xlsx(data, filename, output_dir=output_dir, sheet_name=sheet_name, header_color=header_color)
+    _echo_path(path)
 
 
 @cli.command("xlsx-workbook")
@@ -134,10 +180,10 @@ def xlsx_workbook(input_path, content, filename, output_dir, header_color, freez
         filename,
         output_dir=output_dir,
         header_color=header_color,
-        freeze_header=freeze_header,
-        autofilter=autofilter,
-    )
-    click.echo(path)
+        freeze_header=freeze_header,
+        autofilter=autofilter,
+    )
+    _echo_path(path)
 
 
 # ── CSV ──────────────────────────────────────────────────────────────────────
@@ -149,10 +195,10 @@ def xlsx_workbook(input_path, content, filename, output_dir, header_color, freez
 @click.option("-o", "--output-dir", default=None)
 def csv(input_path, content, filename, output_dir):
     """Generate CSV from JSON data."""
-    from licos_dev_sdk import create_csv
-    data = _read_json(input_path, content)
-    path = create_csv(data, filename, output_dir=output_dir)
-    click.echo(path)
+    from licos_dev_sdk import create_csv
+    data = _read_json(input_path, content)
+    path = create_csv(data, filename, output_dir=output_dir)
+    _echo_path(path)
 
 
 # ── PPTX ─────────────────────────────────────────────────────────────────────
@@ -165,10 +211,10 @@ def csv(input_path, content, filename, output_dir):
 @click.option("--format", "content_type", default="markdown")
 def pptx(input_path, content, filename, output_dir, content_type):
     """Generate PPTX from Markdown."""
-    from licos_dev_sdk import create_pptx
-    text = _read_input(input_path, content)
-    path = create_pptx(text, filename, content_type=content_type, output_dir=output_dir)
-    click.echo(path)
+    from licos_dev_sdk import create_pptx
+    text = _read_input(input_path, content)
+    path = create_pptx(text, filename, content_type=content_type, output_dir=output_dir)
+    _echo_path(path)
 
 
 # ── Chart ────────────────────────────────────────────────────────────────────
@@ -185,10 +231,10 @@ def pptx(input_path, content, filename, output_dir, content_type):
 @click.option("--height", default=600, type=int)
 def chart(input_path, content, filename, output_dir, chart_type, fmt, title, width, height):
     """Generate chart image from JSON data."""
-    from licos_dev_sdk import create_chart
-    data = _read_json(input_path, content)
-    path = create_chart(chart_type, data, filename, output_dir=output_dir, format=fmt, title=title, width=width, height=height)
-    click.echo(path)
+    from licos_dev_sdk import create_chart
+    data = _read_json(input_path, content)
+    path = create_chart(chart_type, data, filename, output_dir=output_dir, format=fmt, title=title, width=width, height=height)
+    _echo_path(path)
 
 
 # ── Diagram ──────────────────────────────────────────────────────────────────
@@ -201,10 +247,10 @@ def chart(input_path, content, filename, output_dir, chart_type, fmt, title, wid
 @click.option("--format", "fmt", default="png", help="png|svg|pdf")
 def diagram(input_path, content, filename, output_dir, fmt):
     """Generate diagram from Graphviz DOT source."""
-    from licos_dev_sdk import create_diagram
-    text = _read_input(input_path, content)
-    path = create_diagram(text, filename, output_dir=output_dir, format=fmt)
-    click.echo(path)
+    from licos_dev_sdk import create_diagram
+    text = _read_input(input_path, content)
+    path = create_diagram(text, filename, output_dir=output_dir, format=fmt)
+    _echo_path(path)
 
 
 # ── QR Code ──────────────────────────────────────────────────────────────────
@@ -216,9 +262,9 @@ def diagram(input_path, content, filename, output_dir, fmt):
 @click.option("--size", default=300, type=int)
 def qrcode(data, filename, output_dir, size):
     """Generate QR code PNG image."""
-    from licos_dev_sdk import create_qrcode
-    path = create_qrcode(data, filename, output_dir=output_dir, size=size)
-    click.echo(path)
+    from licos_dev_sdk import create_qrcode
+    path = create_qrcode(data, filename, output_dir=output_dir, size=size)
+    _echo_path(path)
 
 
 # ── Barcode ──────────────────────────────────────────────────────────────────
@@ -230,9 +276,9 @@ def qrcode(data, filename, output_dir, size):
 @click.option("--type", "barcode_type", default="code128", help="code128|ean13|ean8|isbn13|upc")
 def barcode(data, filename, output_dir, barcode_type):
     """Generate barcode PNG image."""
-    from licos_dev_sdk import create_barcode
-    path = create_barcode(data, filename, output_dir=output_dir, barcode_type=barcode_type)
-    click.echo(path)
+    from licos_dev_sdk import create_barcode
+    path = create_barcode(data, filename, output_dir=output_dir, barcode_type=barcode_type)
+    _echo_path(path)
 
 
 # ── ZIP ──────────────────────────────────────────────────────────────────────
@@ -243,10 +289,10 @@ def barcode(data, filename, output_dir, barcode_type):
 @click.option("-o", "--output-dir", default=None)
 def zip_cmd(paths, filename, output_dir):
     """Create ZIP archive."""
-    from licos_dev_sdk import create_zip
-    source_paths = [p.strip() for p in paths.split(",")]
-    path = create_zip(source_paths, filename, output_dir=output_dir)
-    click.echo(path)
+    from licos_dev_sdk import create_zip
+    source_paths = [p.strip() for p in paths.split(",")]
+    path = create_zip(source_paths, filename, output_dir=output_dir)
+    _echo_path(path)
 
 
 # ── TAR.GZ ───────────────────────────────────────────────────────────────────
@@ -257,10 +303,10 @@ def zip_cmd(paths, filename, output_dir):
 @click.option("-o", "--output-dir", default=None)
 def tar_cmd(paths, filename, output_dir):
     """Create TAR.GZ archive."""
-    from licos_dev_sdk import create_tar_gz
-    source_paths = [p.strip() for p in paths.split(",")]
-    path = create_tar_gz(source_paths, filename, output_dir=output_dir)
-    click.echo(path)
+    from licos_dev_sdk import create_tar_gz
+    source_paths = [p.strip() for p in paths.split(",")]
+    path = create_tar_gz(source_paths, filename, output_dir=output_dir)
+    _echo_path(path)
 
 
 # ── JSON ─────────────────────────────────────────────────────────────────────
@@ -276,11 +322,11 @@ def json_cmd(input_path, content, filename, output_dir):
     raw = _read_input(input_path, content)
     try:
         data = json.loads(raw)
-    except json.JSONDecodeError:
-        import yaml
-        data = yaml.safe_load(raw)
-    path = create_json(data, filename, output_dir=output_dir)
-    click.echo(path)
+    except json.JSONDecodeError:
+        import yaml
+        data = yaml.safe_load(raw)
+    path = create_json(data, filename, output_dir=output_dir)
+    _echo_path(path)
 
 
 # ── YAML ─────────────────────────────────────────────────────────────────────
@@ -297,10 +343,10 @@ def yaml_cmd(input_path, content, filename, output_dir):
     raw = _read_input(input_path, content)
     try:
         data = json.loads(raw)
-    except json.JSONDecodeError:
-        data = yaml_lib.safe_load(raw)
-    path = create_yaml(data, filename, output_dir=output_dir)
-    click.echo(path)
+    except json.JSONDecodeError:
+        data = yaml_lib.safe_load(raw)
+    path = create_yaml(data, filename, output_dir=output_dir)
+    _echo_path(path)
 
 
 # ── XML ──────────────────────────────────────────────────────────────────────
@@ -313,10 +359,10 @@ def yaml_cmd(input_path, content, filename, output_dir):
 @click.option("--root-tag", default="root")
 def xml_cmd(input_path, content, filename, output_dir, root_tag):
     """Generate XML file from JSON data."""
-    from licos_dev_sdk import create_xml
-    data = _read_json(input_path, content)
-    path = create_xml(data, filename, output_dir=output_dir, root_tag=root_tag)
-    click.echo(path)
+    from licos_dev_sdk import create_xml
+    data = _read_json(input_path, content)
+    path = create_xml(data, filename, output_dir=output_dir, root_tag=root_tag)
+    _echo_path(path)
 
 
 # ── HTML ─────────────────────────────────────────────────────────────────────
@@ -329,10 +375,10 @@ def xml_cmd(input_path, content, filename, output_dir, root_tag):
 @click.option("--format", "content_type", default="markdown", help="markdown|html")
 def html_cmd(input_path, content, filename, output_dir, content_type):
     """Generate HTML file from Markdown or raw HTML."""
-    from licos_dev_sdk import create_html
-    text = _read_input(input_path, content)
-    path = create_html(text, filename, output_dir=output_dir, content_type=content_type)
-    click.echo(path)
+    from licos_dev_sdk import create_html
+    text = _read_input(input_path, content)
+    path = create_html(text, filename, output_dir=output_dir, content_type=content_type)
+    _echo_path(path)
 
 
 # ── Model Catalog ────────────────────────────────────────────────────────────

licos_dev_cli-0.2.14/tests/test_cli_output_paths.py

@@ -0,0 +1,33 @@
+import os
+from pathlib import Path
+
+from licos_dev_cli.main import _path_to_cli_output
+
+
+def test_project_absolute_path_is_printed_relative(tmp_path, monkeypatch):
+    project = tmp_path / "projects"
+    monkeypatch.setenv("LICOS_PROJECT_PATH", str(project))
+
+    assert _path_to_cli_output(project / "reports" / "demo.docx") == "reports/demo.docx"
+
+
+def test_project_root_is_printed_as_dot(tmp_path, monkeypatch):
+    project = tmp_path / "projects"
+    monkeypatch.setenv("LICOS_PROJECT_PATH", str(project))
+
+    assert _path_to_cli_output(project) == "."
+
+
+def test_external_absolute_path_is_not_trimmed(tmp_path, monkeypatch):
+    project = tmp_path / "projects"
+    external = tmp_path / "other" / "demo.docx"
+    monkeypatch.setenv("LICOS_PROJECT_PATH", str(project))
+
+    assert _path_to_cli_output(external) == external.as_posix()
+
+
+def test_agent_default_project_path_is_printed_relative(monkeypatch):
+    monkeypatch.delenv("LICOS_PROJECT_PATH", raising=False)
+    monkeypatch.delenv("LICOS_WORKSPACE_PATH", raising=False)
+
+    assert _path_to_cli_output("/workspace/projects/output/demo.docx") == "output/demo.docx"