vortex-cli 4.16.3__tar.gz → 4.17.1__tar.gz

{vortex_cli-4.16.3 → vortex_cli-4.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortex_cli
-Version: 4.16.3
+Version: 4.17.1
 Home-page: https://github.com/jordanamos/vortex-cli
 Author: Jordan Amos
 Author-email: jordan.amos@gmail.com

{vortex_cli-4.16.3 → vortex_cli-4.17.1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = vortex_cli
-version = 4.16.3
+version = 4.17.1
 long_description = file: README.md
 long_description_content_type = text/markdown
 url = https://github.com/jordanamos/vortex-cli

{vortex_cli-4.16.3 → vortex_cli-4.17.1}/vortex/cli.py

@@ -274,6 +274,45 @@ def add_clone_parser(
     return clone_parser
 
 
+def add_export_parser(
+    command_parser: _SubParsersAction[ArgumentParser],
+) -> ArgumentParser:
+    export_parser = command_parser.add_parser(
+        "export",
+        help="Export Puakma Applications as a .pmx file",
+    )
+    export_parser.add_argument(
+        "app_ids",
+        nargs="+",
+        metavar="APP_ID",
+        help="The ID(s) of the Puakma Application(s) to export",
+        type=int,
+    )
+    export_parser.add_argument(
+        "--out-dir",
+        "-o",
+        metavar="DIR",
+        dest="export_dir",
+        help="The destination folder. Default is 'exports' within the workspace.",
+        type=Path,
+    )
+    export_parser.add_argument(
+        "--timeout",
+        "-t",
+        type=int,
+        default=100,
+        help="Set the timeout duration in seconds. Default is %(default)s.",
+    )
+    export_parser.add_argument(
+        "--exclude-source",
+        action="store_false",
+        help="Exclude the .java source files",
+        dest="include_source",
+    )
+    _add_server_option(export_parser)
+    return export_parser
+
+
 def add_watch_parser(command_parser: _SubParsersAction[ArgumentParser]) -> None:
     watch_parser = command_parser.add_parser(
         "watch",

{vortex_cli-4.16.3 → vortex_cli-4.17.1}/vortex/commands/clone.py

@@ -1,11 +1,8 @@
 from __future__ import annotations
 
 import asyncio
-import datetime
 import logging
 import xml.etree.ElementTree as ET
-import zipfile
-from io import BytesIO
 from pathlib import Path
 from typing import Any
 
@@ -23,64 +20,6 @@ from vortex.workspace import Workspace
 logger = logging.getLogger("vortex")
 
 
-async def _aexport_pmx(
-    server: PuakmaServer,
-    app_ids: list[int],
-    output_dir: Path,
-    timeout: int,  # noqa: ASYNC109
-) -> int:
-    tasks = []
-
-    async with server as s:
-        await s.server_designer.ainitiate_connection()
-        for app_id in app_ids:
-            task = asyncio.create_task(
-                _aexport_app_pmx(server, app_id, output_dir, timeout)
-            )
-            tasks.append(task)
-
-        ret = 0
-        for done in asyncio.as_completed(tasks):
-            try:
-                ret |= await done
-            except (KeyboardInterrupt, Exception):
-                for task in tasks:
-                    task.cancel()
-                raise
-            except asyncio.CancelledError:
-                logger.error("Operation Cancelled")
-                for task in tasks:
-                    task.cancel()
-                ret = 1
-                break
-    return ret
-
-
-async def _aexport_app_pmx(
-    server: PuakmaServer,
-    app_id: int,
-    output_dir: Path,
-    timeout: int,  # noqa: ASYNC109
-) -> int:
-    ret_bytes = await server.download_designer.adownload_pmx(app_id, True, timeout)
-    with zipfile.ZipFile(BytesIO(ret_bytes)) as zip_file:
-        fname = zip_file.namelist()[0].replace(".pma", "")
-        try:
-            _, group, app_name = fname.split("~")
-        except ValueError:
-            # no group
-            logger.warning(f"app has no group {fname}")
-            _, app_name = fname.split("~")
-            group = ""
-
-    now = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
-    export_name = f"{server.host}~{group}~{app_name}~{app_id}~{now}.pmx"
-    output_path = output_dir / export_name
-    await asyncio.to_thread(_save_bytes, ret_bytes, output_path)
-    logger.info(f"Successfully exported {group}/{app_name} [{app_id}] to {output_dir}")
-    return 0
-
-
 def _save_objs(
     workspace: Workspace, objs: list[DesignObject], save_resources: bool
 ) -> None:
@@ -205,11 +144,6 @@ def _match_and_validate_design_objs(
     return new_objects
 
 
-def _save_bytes(data: bytes, output_path: Path) -> None:
-    with open(output_path, "wb") as f:
-        f.write(data)
-
-
 async def _aclone_app(
     workspace: Workspace,
     server: PuakmaServer,
@@ -292,31 +226,17 @@ def clone(
     server: PuakmaServer,
     app_ids: list[int],
     *,
-    timeout: int,
     get_resources: bool = False,
     open_urls: bool = False,
     reclone: bool = False,
-    export_path: Path | None = None,
 ) -> int:
     if reclone:
         app_ids.extend(app.id for app in workspace.listapps(server))
 
-    action = "Cloning" if export_path is None else "Exporting"
-
     with (
         workspace.exclusive_lock(),
-        Spinner(f"{action} {len(app_ids)} application(s)..."),
+        Spinner(f"Cloning{len(app_ids)} application(s)..."),
     ):
-        if export_path is not None:
-            if export_path == Path():
-                export_path = workspace.exports_dir
-                export_path.mkdir(exist_ok=True)
-            elif not export_path.is_dir():
-                logger.error(f"'{export_path}' is not a directory.")
-                return 1
-            ret = asyncio.run(_aexport_pmx(server, app_ids, export_path, timeout))
-        else:
-            ret = asyncio.run(
-                _aclone_apps(workspace, server, app_ids, get_resources, open_urls)
-            )
-        return ret
+        return asyncio.run(
+            _aclone_apps(workspace, server, app_ids, get_resources, open_urls)
+        )

vortex_cli-4.17.1/vortex/commands/export.py

@@ -0,0 +1,105 @@
+from __future__ import annotations
+
+import asyncio
+import datetime
+import logging
+import zipfile
+from io import BytesIO
+from pathlib import Path
+
+from vortex.models import PuakmaServer
+from vortex.spinner import Spinner
+from vortex.workspace import Workspace
+
+logger = logging.getLogger("vortex")
+
+
+def _save_bytes(data: bytes, output_path: Path) -> None:
+    with open(output_path, "wb") as f:
+        f.write(data)
+
+
+async def _aexport(
+    server: PuakmaServer,
+    app_ids: list[int],
+    output_dir: Path,
+    timeout: int,
+    include_source: bool,
+) -> int:
+    tasks = []
+
+    async with server as s:
+        await s.server_designer.ainitiate_connection()
+        for app_id in app_ids:
+            task = asyncio.create_task(
+                _aexport_app_pmx(server, app_id, output_dir, timeout, include_source)
+            )
+            tasks.append(task)
+
+        ret = 0
+        for done in asyncio.as_completed(tasks):
+            try:
+                ret |= await done
+            except (KeyboardInterrupt, Exception):
+                for task in tasks:
+                    task.cancel()
+                raise
+            except asyncio.CancelledError:
+                logger.error("Operation Cancelled")
+                for task in tasks:
+                    task.cancel()
+                ret = 1
+                break
+    return ret
+
+
+async def _aexport_app_pmx(
+    server: PuakmaServer,
+    app_id: int,
+    output_dir: Path,
+    timeout: int,  # noqa: ASYNC109
+    include_source: bool,
+) -> int:
+    ret_bytes = await server.download_designer.adownload_pmx(
+        app_id, include_source, timeout
+    )
+    with zipfile.ZipFile(BytesIO(ret_bytes)) as zip_file:
+        fname = zip_file.namelist()[0].replace(".pma", "")
+        try:
+            _, group, app_name = fname.split("~")
+        except ValueError:
+            # no group
+            _, app_name = fname.split("~")
+            group = ""
+
+    now = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+    name = f"{group}~{app_name}" if group else app_name
+    export_name = f"{server.host}~{name}~{app_id}~{now}.pmx"
+    output_path = output_dir / export_name
+    await asyncio.to_thread(_save_bytes, ret_bytes, output_path)
+    logger.info(
+        f"Successfully exported {group}/{app_name} [{app_id}] to {output_dir.resolve()}"
+    )
+    return 0
+
+
+def export(
+    workspace: Workspace,
+    server: PuakmaServer,
+    app_ids: list[int],
+    *,
+    timeout: int,
+    include_source: bool,
+    export_dir: Path | None = None,
+) -> int:
+    with (
+        workspace.exclusive_lock(),
+        Spinner(f"Exoprting {len(app_ids)} application(s)..."),
+    ):
+        if export_dir is None:
+            export_dir = workspace.exports_dir
+        export_dir.mkdir(exist_ok=True)
+        ret = asyncio.run(
+            _aexport(server, app_ids, export_dir, timeout, include_source)
+        )
+        return ret

{vortex_cli-4.16.3 → vortex_cli-4.17.1}/vortex/commands/new.py

@@ -181,7 +181,6 @@ def _validate_update_objs(
     design_obj_ids: list[int],
     **kwargs: Any,
 ) -> tuple[tuple[DesignObject, ...], bool]:
-
     _universal_keys = ("name", "design_type", "comment", "inherit_from")
     objs = []
     rows = []
@@ -228,7 +227,6 @@ def _update_objects(
     design_obj_ids: list[int],
     **kwargs: Any,
 ) -> int:
-
     try:
         updated_objs, recreate_params = _validate_update_objs(
             workspace, server, design_obj_ids, **kwargs

{vortex_cli-4.16.3 → vortex_cli-4.17.1}/vortex/main.py

@@ -21,6 +21,7 @@ from vortex.commands.db import db
 from vortex.commands.delete import delete
 from vortex.commands.docs import docs
 from vortex.commands.execute import execute
+from vortex.commands.export import export
 from vortex.commands.find import find
 from vortex.commands.grep import grep
 from vortex.commands.list import list_
@@ -94,6 +95,7 @@ def main(argv: Sequence[str] | None = None) -> int:
     cli.add_watch_parser(command_parser)
     cli.add_docs_parser(command_parser)
     cli.add_execute_parser(command_parser)
+    cli.add_export_parser(command_parser)
     clone_parser = cli.add_clone_parser(command_parser)
     code_parser = cli.add_code_parser(command_parser)
     db_parser = cli.add_db_parser(command_parser)
@@ -187,8 +189,15 @@ def main(argv: Sequence[str] | None = None) -> int:
                 get_resources=args.get_resources,
                 open_urls=args.open_urls,
                 reclone=args.reclone,
-                export_path=args.export_path,
+            )
+        elif args.command == "export":
+            return export(
+                workspace,
+                server,
+                args.app_ids,
                 timeout=args.timeout,
+                export_dir=args.export_dir,
+                include_source=args.include_source,
             )
         elif args.command == "watch":
             return watch(workspace, server)

{vortex_cli-4.16.3 → vortex_cli-4.17.1}/vortex/models.py

@@ -15,7 +15,6 @@ from io import StringIO
 from pathlib import Path
 from types import TracebackType
 from typing import Any
-from typing import Literal
 from typing import NamedTuple
 from typing import TYPE_CHECKING
 
@@ -196,18 +195,22 @@ class PuakmaServer:
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: TracebackType | None = None,
-    ) -> Literal[False]:
-        await self._aclient.aclose()
-        return False
+    ) -> None:
+        try:
+            await asyncio.wait_for(
+                asyncio.shield(self._aclient.aclose()),
+                timeout=10.0,
+            )
+        except asyncio.TimeoutError:
+            logger.error("Timeout occurred while closing the client.")
 
     def __exit__(
         self,
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: TracebackType | None = None,
-    ) -> Literal[False]:
+    ) -> None:
         self._client.close()
-        return False
 
     def fetch_all_apps(
         self,

{vortex_cli-4.16.3 → vortex_cli-4.17.1}/vortex_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortex_cli
-Version: 4.16.3
+Version: 4.17.1
 Home-page: https://github.com/jordanamos/vortex-cli
 Author: Jordan Amos
 Author-email: jordan.amos@gmail.com

{vortex_cli-4.16.3 → vortex_cli-4.17.1}/vortex_cli.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ vortex/commands/db.py
 vortex/commands/delete.py
 vortex/commands/docs.py
 vortex/commands/execute.py
+vortex/commands/export.py
 vortex/commands/find.py
 vortex/commands/grep.py
 vortex/commands/list.py