vortex-cli 4.16.0__tar.gz → 4.16.2__tar.gz

{vortex_cli-4.16.0 → vortex_cli-4.16.2}/PKG-INFO

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

{vortex_cli-4.16.0 → vortex_cli-4.16.2}/setup.cfg

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

{vortex_cli-4.16.0 → vortex_cli-4.16.2}/vortex/cli.py

@@ -52,6 +52,7 @@ def _add_design_type_option(
     parser: ArgumentParser | _MutuallyExclusiveGroup | _ArgumentGroup,
     nargs: str | None = "*",
     required: bool = False,
+    help_suffix: str | None = None,
 ) -> None:
     parser.add_argument(
         "--type",
@@ -63,6 +64,7 @@ def _add_design_type_option(
         metavar="DESIGN_TYPE",
         help=(
             f"Choices: {[t.name.lower() for t in DesignType if t != DesignType.ERROR]}"
+            f"{help_suffix or ''}"
         ),
     )
 
@@ -74,15 +76,15 @@ def validate_args(
     db_parser: ArgumentParser,
 ) -> None:
     if args.command == "new" and args.subcommand == "object":
-        missing_required_fields = not args.update_id and not (
+        missing_required_fields = not args.update_ids and not (
             args.name and args.app_id and args.design_type
         )
         missing_content_type = (
             args.design_type in (DesignType.RESOURCE, DesignType.DOCUMENTATION)
             and not args.content_type
         )
-        update_arg_contains_app_id = args.update_id and args.app_id
-        update_is_missing_args = args.update_id and not (
+        update_arg_contains_app_id = args.update_ids and args.app_id
+        update_is_missing_args = args.update_ids and not (
             args.name
             or args.app_id
             or args.design_type
@@ -376,12 +378,21 @@ def add_log_parser(command_parser: _SubParsersAction[ArgumentParser]) -> None:
 def add_find_parser(command_parser: _SubParsersAction[ArgumentParser]) -> None:
     find_parser = command_parser.add_parser(
         "find",
-        help="Find Design Objects of cloned applications by name",
-        usage="%(prog)s [options] name",
+        help="Search Design Objects of cloned applications",
+        usage="%(prog)s [options] query",
+    )
+    find_parser.add_argument(
+        "query", help="The query to search Design Objects. Default is search by name."
     )
-    find_parser.add_argument("name", help="The name of Design Objects to find")
     find_parser.add_argument("--app-id", type=int, nargs="*", dest="app_ids")
     find_parser.add_argument("--strict", "-z", action="store_true")
+    query_mutex = find_parser.add_mutually_exclusive_group()
+    query_mutex.add_argument(
+        "--inherits-from", action="store_true", help="Search by inherits from instead"
+    )
+    query_mutex.add_argument(
+        "--parent-page", action="store_true", help="Search by parent page instead"
+    )
     find_parser.add_argument(
         "--ids-only",
         "-x",
@@ -433,6 +444,17 @@ def add_new_parser(
             raise ArgumentTypeError(f"Invalid '.pmx' file {path}")
         return path
 
+    def _add_update_option(parser: ArgumentParser) -> None:
+        parser.add_argument(
+            "--update",
+            "-u",
+            type=int,
+            nargs="*",
+            metavar="ID",
+            dest="update_ids",
+            help="Update a Design Object with the given ID instead",
+        )
+
     new_parser = command_parser.add_parser(
         "new",
         help="Create new Design Objects, Applications or Keywords",
@@ -441,8 +463,9 @@ def add_new_parser(
         "--update",
         "-u",
         type=int,
+        nargs="*",
         metavar="ID",
-        dest="update_id",
+        dest="update_ids",
         help="Update a Design Object with the given ID instead",
     )
     _add_server_option(new_parser)
@@ -451,15 +474,22 @@ def add_new_parser(
 
     # Object parser
     object_parser = sub_parser.add_parser("object", help="Create a new Design Object")
-    obj_required_no_update_group = object_parser.add_argument_group(
-        "Required When Creating (no --update)"
+    obj_optional_group = object_parser.add_argument_group("Design Object Options")
+    _add_design_type_option(
+        obj_optional_group,
+        nargs=None,
+        help_suffix=". Required when creating a new object.",
+    )
+    obj_optional_group.add_argument(
+        "--app-id",
+        type=int,
+        help="Required when creating a new object.",
+    )
+    obj_optional_group.add_argument(
+        "--name",
+        "-n",
+        help="Required when creating a new object.",
     )
-
-    obj_required_no_update_group.add_argument("--app-id", type=int)
-    obj_required_no_update_group.add_argument("--name", "-n")
-    _add_design_type_option(obj_required_no_update_group, nargs=None)
-
-    obj_optional_group = object_parser.add_argument_group("Optional Arguments")
     obj_optional_group.add_argument("--comment")
     obj_optional_group.add_argument("--inherit-from")
     obj_optional_group.add_argument("--open-action")
@@ -497,6 +527,10 @@ def add_new_parser(
     keyword_parser.add_argument("--name", "-n", help="The keyword name", required=True)
     keyword_parser.add_argument("--values", nargs="*", required=True)
 
+    _add_update_option(object_parser)
+    _add_update_option(app_parser)
+    _add_update_option(keyword_parser)
+
     return new_parser
 
 

{vortex_cli-4.16.0 → vortex_cli-4.16.2}/vortex/commands/clone.py

@@ -107,6 +107,8 @@ def _aparse_design_objs(
                 obj["ctype"],
                 obj["data"],
                 obj["src"],
+                inherit_from=obj["inherit"],
+                comment=obj["comment"],
             )
         )
     return ret
@@ -130,7 +132,6 @@ def _parse_app_xml(
             db_ele.attrib["userName"],
             db_ele.attrib["pwd"],
         )
-        # print(db_ele.attrib)
         db_connections.append(db_conn)
 
     java_version_ele = app_xml.find('.//sysProp[@name="java.class.version"]')

{vortex_cli-4.16.0 → vortex_cli-4.16.2}/vortex/commands/find.py

@@ -9,29 +9,34 @@ from vortex.workspace import Workspace
 def find(
     workspace: Workspace,
     server: PuakmaServer,
-    name: str,
+    query: str,
     *,
     app_ids: list[int] | None = None,
     design_types: list[DesignType] | None = None,
     show_params: bool = False,
     show_ids_only: bool = False,
     strict_search: bool = False,
+    search_parent_page: bool = False,
+    search_inherits_from: bool = False,
 ) -> int:
     if app_ids:
         apps = [workspace.lookup_app(server, id) for id in app_ids]
     else:
         apps = workspace.listapps(server)
 
-    matches = [
-        obj
-        for app in apps
-        for obj in app.design_objects
-        if (
-            (not strict_search and (name.lower() in obj.name.lower()))
-            or (name == obj.name)
-        )
-        and (not design_types or obj.design_type in design_types)
-    ]
+    matches = []
+    for app in apps:
+        for obj in app.design_objects:
+            value_to_search = obj.name
+            if search_inherits_from:
+                value_to_search = obj.inherit_from or ""
+            elif search_parent_page:
+                value_to_search = obj.parent_page or ""
+            if (
+                (not strict_search and (query.lower() in value_to_search.lower()))
+                or (query == value_to_search)
+            ) and (not design_types or obj.design_type in design_types):
+                matches.append(obj)
 
     if show_ids_only:
         for obj in matches:

{vortex_cli-4.16.0 → vortex_cli-4.16.2}/vortex/commands/new.py

@@ -5,6 +5,7 @@ import asyncio
 import base64
 import logging
 import mimetypes
+from collections.abc import Iterable
 from pathlib import Path
 from typing import Any
 
@@ -152,7 +153,7 @@ async def _acreate_or_update_obj(
 async def _acreate_or_update_objects(
     workspace: Workspace,
     server: PuakmaServer,
-    objs: list[DesignObject],
+    objs: Iterable[DesignObject],
     recreate_params: bool,
 ) -> int:
     async with server as s:
@@ -174,56 +175,79 @@ async def _acreate_or_update_objects(
         return ret
 
 
-def _update_object(
+def _validate_update_objs(
     workspace: Workspace,
     server: PuakmaServer,
-    design_obj_id: int,
+    design_obj_ids: list[int],
     **kwargs: Any,
-) -> int:
-    try:
-        _, obj = workspace.lookup_design_obj(server, design_obj_id)
-    except (DesignObjectNotFound, DesignObjectAmbiguousError) as e:
-        logger.error(e)
-        return 1
+) -> tuple[tuple[DesignObject, ...], bool]:
 
     _universal_keys = ("name", "design_type", "comment", "inherit_from")
-    non_universal_kwargs = dict(kwargs)
-    for k in _universal_keys:
-        non_universal_kwargs.pop(k)
-    if not _validate_args_for_type(obj.design_type, **non_universal_kwargs):
-        return 1
-
-    row_headers = ["ID", "Application", "Name"]
-    row = [str(obj.id), str(obj.app), obj.name]
-    param_name_map = {
-        "open_action": "OpenAction",
-        "save_action": "SaveAction",
-        "parent_page": "ParentPage",
-    }
-    recreate_params = False
-
-    for key, value in kwargs.items():
-        if hasattr(obj, key) and value is not None:
-            row_headers.append(Colour.colour(f"new_{key}", Colour.YELLOW))
-            row.append(f"{getattr(obj, key)} -> {value}")
-            if key in param_name_map:
-                param = DesignObjectParam(param_name_map[key], value)
-                obj.update_or_append_param(param)
-                recreate_params = True
-            else:
-                setattr(obj, key, value)
+    objs = []
+    rows = []
+    for obj_id in design_obj_ids:
+        _, obj = workspace.lookup_design_obj(server, obj_id)
+        non_universal_kwargs = dict(kwargs)
+        for k in _universal_keys:
+            non_universal_kwargs.pop(k)
+        if not _validate_args_for_type(obj.design_type, **non_universal_kwargs):
+            exit(1)
+        row_headers = ["ID", "Application", "Name"]
+        row = [str(obj.id), str(obj.app), obj.name]
+        param_name_map = {
+            "open_action": "OpenAction",
+            "save_action": "SaveAction",
+            "parent_page": "ParentPage",
+        }
+        recreate_params = False
+        for key, value in kwargs.items():
+            if hasattr(obj, key) and value is not None:
+                row_headers.append(Colour.colour(f"new_{key}", Colour.YELLOW))
+                row.append(f"{getattr(obj, key)} -> {value}")
+                if key in param_name_map:
+                    param = DesignObjectParam(param_name_map[key], value)
+                    obj.update_or_append_param(param)
+                    recreate_params = True
+                else:
+                    setattr(obj, key, value)
+        rows.append(row)
+        objs.append(obj)
 
     _updated = Colour.colour("UPDATED", Colour.GREEN)
     print(f"The following Design Object(s) will be {_updated}:\n")
-    print(tabulate.tabulate([row], headers=row_headers))
+    print(tabulate.tabulate(rows, headers=row_headers))
     if input("\n[Y/y] to continue:") not in ["Y", "y"]:
+        exit(1)
+
+    return tuple(objs), recreate_params
+
+
+def _update_objects(
+    workspace: Workspace,
+    server: PuakmaServer,
+    design_obj_ids: list[int],
+    **kwargs: Any,
+) -> int:
+
+    try:
+        updated_objs, recreate_params = _validate_update_objs(
+            workspace, server, design_obj_ids, **kwargs
+        )
+    except (DesignObjectNotFound, DesignObjectAmbiguousError) as e:
+        logger.error(e)
         return 1
 
     with workspace.exclusive_lock():
         ret = asyncio.run(
-            _acreate_or_update_objects(workspace, server, [obj], recreate_params)
+            _acreate_or_update_objects(workspace, server, updated_objs, recreate_params)
         )
-        workspace.mkdir(obj.app)
+        apps = {obj.app for obj in updated_objs}
+        for app in apps:
+            new_app_objs = [obj for obj in updated_objs if obj.app == app]
+            for new_obj in new_app_objs:
+                idx, _ = app.lookup_design_obj(new_obj.name)
+                app.design_objects[idx] = new_obj
+            workspace.mkdir(app)
         return ret
 
 
@@ -340,11 +364,11 @@ def _new_keyword(
 
 def new(workspace: Workspace, server: PuakmaServer, args: argparse.Namespace) -> int:
     if args.subcommand == "object":
-        if args.update_id:
-            return _update_object(
+        if args.update_ids:
+            return _update_objects(
                 workspace,
                 server,
-                args.update_id,
+                args.update_ids,
                 name=args.name,
                 design_type=args.design_type,
                 content_type=args.content_type,

{vortex_cli-4.16.0 → vortex_cli-4.16.2}/vortex/main.py

@@ -196,12 +196,14 @@ def main(argv: Sequence[str] | None = None) -> int:
             return find(
                 workspace,
                 server,
-                args.name,
+                args.query,
                 app_ids=args.app_ids,
                 design_types=args.design_type,
                 show_params=args.show_params,
                 show_ids_only=args.show_ids_only,
                 strict_search=args.strict,
+                search_parent_page=args.parent_page,
+                search_inherits_from=args.inherits_from,
             )
         elif args.command == "grep":
             return grep(
@@ -215,6 +217,10 @@ def main(argv: Sequence[str] | None = None) -> int:
                 include_resources=args.include_resources,
             )
         elif args.command == "new":
+            if args.subcommand not in ["object", "app", "keyword"]:
+                new_parser.error(
+                    "'new' command requires a sub command 'object', 'app' or 'keyword'"
+                )
             return new(workspace, server, args)
         elif args.command == "delete":
             return delete(workspace, server, args.obj_ids)

{vortex_cli-4.16.0 → vortex_cli-4.16.2}/vortex/models.py

@@ -51,6 +51,8 @@ SELECT designbucketid AS id
     , contenttype AS ctype
     , designdata AS data
     , designsource AS src
+    , inheritfrom AS inherit
+    , comment
 FROM designbucket
 WHERE appid = %d
 """

{vortex_cli-4.16.0 → vortex_cli-4.16.2}/vortex/util.py

@@ -139,24 +139,28 @@ def render_objects(
     *,
     show_params: bool = False,
 ) -> None:
-    row_headers = ["ID", "Name", "Type", "Application"]
+    row_headers = ["ID", "Name", "Type", "Application", "Inherit"]
     row_data = []
     if show_params:
         row_headers.append("Content Type")
         row_headers.append("Open Action")
         row_headers.append("Save Action")
         row_headers.append("Parent Page")
-        row_headers.append("Inherit From")
         row_headers.append("Comment")
 
     for obj in sorted(objs, key=lambda obj: obj.name.casefold()):
-        row = [obj.id, obj.name, obj.design_type.name, str(obj.app)]
+        row = [
+            obj.id,
+            obj.name,
+            obj.design_type.name,
+            str(obj.app),
+            obj.inherit_from or "",
+        ]
         if show_params:
             row.append(obj.content_type or "")
             row.append(obj.open_action or "")
             row.append(obj.save_action or "")
             row.append(obj.parent_page or "")
-            row.append(obj.inherit_from or "")
             row.append(obj.comment or "")
         row_data.append(row)
 

{vortex_cli-4.16.0 → vortex_cli-4.16.2}/vortex/workspace.py

@@ -314,8 +314,14 @@ class Workspace:
 
         # Java project settings
         settings: dict[str, Any] = workspace_settings.get("settings", {})
-        puakma_path = os.path.join(os.path.dirname(__file__), "lib", "puakma.jar")
+        # Get the packaged puakma-*.jar file
+        # Assumes only 1 file in the /lib directory
+        lib_dir = os.path.join(os.path.dirname(__file__), "lib")
+        puakma_jar = os.listdir(lib_dir)[0]
+        puakma_path = os.path.join(lib_dir, puakma_jar)
+
         referenced_libs = [puakma_path, os.path.join("zlib", "**", "*.jar")]
+        # Java runtimes
         java_runtimes: list[dict[str, Any]] = [{}]
         if server is not None:
             config = configparser.ConfigParser()

{vortex_cli-4.16.0 → vortex_cli-4.16.2}/vortex_cli.egg-info/PKG-INFO

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