opensees-cli 0.2.0__tar.gz → 0.2.1__tar.gz

{opensees_cli-0.2.0 → opensees_cli-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opensees_cli
-Version: 0.2.0
+Version: 0.2.1
 Summary: Run OpenSees simulations in the cloud from the command line.
 Author: Minjie Zhu
 License: Proprietary

{opensees_cli-0.2.0 → opensees_cli-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "opensees_cli"
-version = "0.2.0"
+version = "0.2.1"
 description = "Run OpenSees simulations in the cloud from the command line."
 readme = "README.md"
 requires-python = ">=3.9"

{opensees_cli-0.2.0 → opensees_cli-0.2.1}/src/opensees_cli/__init__.py

@@ -1,3 +1,3 @@
 """OpenSees CLI — run structural simulations in the cloud."""
 
-__version__ = "0.2.0"
+__version__ = "0.2.1"

{opensees_cli-0.2.0 → opensees_cli-0.2.1}/src/opensees_cli/files.py

@@ -28,14 +28,35 @@ def _files_callback(ctx: typer.Context) -> None:
         raise typer.Exit(0)
 
 
-def _files_list_items() -> list[dict]:
-    """All files in the user file system."""
-    r = api.get("/files/list")
+def _files_list_items(folder: Optional[str] = None) -> list[dict]:
+    """List files in the user file system, optionally under ``folder``."""
+    params = {}
+    if folder:
+        params["folder"] = folder.strip().strip("/")
+    r = api.get("/files/list", params=params or None)
     return list(r.get("files", []))
 
 
+def _filter_under_folder(items: list[dict], folder: str) -> list[dict]:
+    """Keep files at or under ``folder`` (client-side fallback)."""
+    root = folder.strip().strip("/")
+    if not root:
+        return items
+    prefix = root + "/"
+    out = []
+    for f in items:
+        path = str(f.get("path", ""))
+        if path == root or path.startswith(prefix):
+            out.append(f)
+    return out
+
+
 @app.command("list")
 def list_files(
+    folder: Optional[str] = typer.Argument(
+        None,
+        help="Only list files in this folder (and its subfolders), e.g. truss or examples/dambreak",
+    ),
     as_json: bool = typer.Option(
         False,
         "--json",
@@ -44,9 +65,12 @@ def list_files(
         is_flag=True,
     ),
 ):
-    """List files. Prints nothing on stdout when there are no files (non-JSON)."""
+    """List files. With FOLDER, only show files under that path. Prints nothing when empty (non-JSON)."""
     try:
-        items = _files_list_items()
+        items = _files_list_items(folder)
+        # Older APIs ignore ?folder= — filter locally so the CLI still works.
+        if folder:
+            items = _filter_under_folder(items, folder)
     except api.ApiError as e:
         console.print(f"[red]{e.message}[/red]")
         raise typer.Exit(1)
@@ -66,6 +90,8 @@ def list_files(
             "file_count": len(rows),
             "total_size": total,
         }
+        if folder:
+            obj["folder"] = folder.strip().strip("/")
         typer.echo(json.dumps(obj, indent=2).rstrip("\n"))
         return
 

{opensees_cli-0.2.0 → opensees_cli-0.2.1}/src/opensees_cli/run.py

@@ -1093,32 +1093,39 @@ def _week_range(week: int) -> tuple[datetime, datetime]:
     return start.astimezone(timezone.utc), end.astimezone(timezone.utc)
 
 
-def _fmt_date_span(after_dt: datetime, before_dt: datetime | None) -> str:
+def _fmt_date_span(after_dt: datetime, before_dt: Optional[datetime]) -> str:
     """Return a compact human-readable date span string in local time.
 
     ``before_dt`` is exclusive (the day after the last day), so we display
     ``before_dt - 1 day`` as the end date.  If ``before_dt`` is ``None`` the
     end is displayed as "today".
     Example: "Jan 5 – Mar 8, 2026" or "May 4–10, 2026" (same year/month).
+
+    Avoids ``%-d`` / ``%#d`` strftime flags (Unix vs Windows) by formatting
+    the day with ``dt.day`` instead.
     """
+    def _md(dt: datetime, *, year: bool = False) -> str:
+        s = f"{dt.strftime('%b')} {dt.day}"
+        return f"{s}, {dt.year}" if year else s
+
     local = datetime.now().astimezone().tzinfo
     start = after_dt.astimezone(local)
 
     if before_dt is None:
         end = datetime.now().astimezone(local)
-        end_str = f"{end.strftime('%b %-d, %Y')}"
+        end_str = _md(end, year=True)
         if start.year == end.year:
             if start.month == end.month:
-                return f"{start.strftime('%b %-d')}–{end.strftime('%-d, %Y')}"
-            return f"{start.strftime('%b %-d')} – {end_str}"
-        return f"{start.strftime('%b %-d, %Y')} – {end_str}"
+                return f"{_md(start)}–{end.day}, {end.year}"
+            return f"{_md(start)} – {end_str}"
+        return f"{_md(start, year=True)} – {end_str}"
 
     end = (before_dt - timedelta(seconds=1)).astimezone(local)
     if start.year == end.year:
         if start.month == end.month:
-            return f"{start.strftime('%b %-d')}–{end.strftime('%-d, %Y')}"
-        return f"{start.strftime('%b %-d')} – {end.strftime('%b %-d, %Y')}"
-    return f"{start.strftime('%b %-d, %Y')} – {end.strftime('%b %-d, %Y')}"
+            return f"{_md(start)}–{end.day}, {end.year}"
+        return f"{_md(start)} – {_md(end, year=True)}"
+    return f"{_md(start, year=True)} – {_md(end, year=True)}"
 
 
 def _week_span_range(w1: int, w2: int) -> tuple[datetime, datetime]:

{opensees_cli-0.2.0 → opensees_cli-0.2.1}/src/opensees_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opensees_cli
-Version: 0.2.0
+Version: 0.2.1
 Summary: Run OpenSees simulations in the cloud from the command line.
 Author: Minjie Zhu
 License: Proprietary

{opensees_cli-0.2.0 → opensees_cli-0.2.1}/tests/test_files_commands.py

@@ -27,6 +27,20 @@ class TestFilesList:
         assert "model.py" in result.output
         assert "data.csv" in result.output
 
+    def test_list_folder_filters(self, cli_runner, logged_in_creds, patch_httpx, mock_router):
+        mock_router.add("GET", "/prod/files/list", json={
+            "files": [
+                {"path": "truss/Truss.py", "size": 100, "last_modified": "2025-01-01T00:00:00Z"},
+                {"path": "truss/data.csv", "size": 200, "last_modified": "2025-01-01T00:00:00Z"},
+                {"path": "other/model.py", "size": 300, "last_modified": "2025-01-01T00:00:00Z"},
+            ]
+        })
+        result = cli_runner.invoke(app, ["files", "list", "truss"])
+        assert result.exit_code == 0
+        assert "truss/Truss.py" in result.output
+        assert "truss/data.csv" in result.output
+        assert "other/model.py" not in result.output
+
 
 class TestFilesUpload:
     def test_upload_single_file(self, cli_runner, logged_in_creds, patch_httpx, mock_router, tmp_file):