partcad-cli 0.3.70__tar.gz → 0.3.82__tar.gz

{partcad-cli-0.3.70 → partcad-cli-0.3.82}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: partcad-cli
-Version: 0.3.70
+Version: 0.3.82
 Summary: Command-line interface to PartCAD
 Author-email: Roman Kuzmenko <openvmp@proton.me>
 Maintainer-email: Roman Kuzmenko <openvmp@proton.me>
@@ -12,7 +12,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: partcad==0.3.70
+Requires-Dist: partcad==0.3.82
 Requires-Dist: pycairo
 Requires-Dist: renderlab
 Requires-Dist: rlPyCairo

{partcad-cli-0.3.70 → partcad-cli-0.3.82}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "partcad-cli"
-version = "0.3.70"
+version = "0.3.82"
 description = "Command-line interface to PartCAD"
 readme = "README.md"
 keywords = ["cadquery", "build123d", "cad", "design", "openscad", "step", "stl"]

{partcad-cli-0.3.70 → partcad-cli-0.3.82}/requirements.txt

@@ -1,4 +1,4 @@
-partcad==0.3.70
+partcad==0.3.82
 pycairo
 renderlab
 rlPyCairo

{partcad-cli-0.3.70 → partcad-cli-0.3.82}/src/partcad_cli/__init__.py

@@ -4,4 +4,4 @@ __all__ = [
     "main_cli",
 ]
 
-__version__: str = "0.3.70"
+__version__: str = "0.3.82"

{partcad-cli-0.3.70 → partcad-cli-0.3.82}/src/partcad_cli/cli.py

@@ -15,6 +15,7 @@ import partcad as pc
 
 from .cli_add import *
 from .cli_init import *
+from .cli_info import *
 from .cli_install import *
 from .cli_list import *
 from .cli_render import *
@@ -29,6 +30,13 @@ def main():
     parser = argparse.ArgumentParser(
         description="PartCAD command line tool",
     )
+    parser.add_argument(
+        "-v",
+        help="Increase the level of verbosity",
+        dest="verbosity",
+        action="count",
+        default=0,
+    )
     parser.add_argument(
         "-p",
         help="Package path (a YAML file or a directory with 'partcad.yaml')",
@@ -40,6 +48,7 @@ def main():
     subparsers = parser.add_subparsers(dest="command")
     cli_help_add(subparsers)
     cli_help_init(subparsers)
+    cli_help_info(subparsers)
     cli_help_install(subparsers)
     cli_help_list(subparsers)
     cli_help_render(subparsers)
@@ -47,14 +56,26 @@ def main():
 
     args = parser.parse_args()
 
-    logging.basicConfig(level=logging.INFO)
+    if args.verbosity > 0:
+        logging.basicConfig(level=logging.DEBUG)
+    else:
+        logging.basicConfig(level=logging.INFO)
 
     if args.command == "add":
         cli_add(args)
 
+    elif args.command == "add-part":
+        cli_add_part(args)
+
+    elif args.command == "add-assembly":
+        cli_add_assembly(args)
+
     elif args.command == "init":
         cli_init(args)
 
+    elif args.command == "info":
+        cli_info(args)
+
     elif args.command == "install":
         cli_install(args)
 

partcad-cli-0.3.82/src/partcad_cli/cli_add.py

@@ -0,0 +1,94 @@
+#
+# OpenVMP, 2023
+#
+# Author: Roman Kuzmenko
+# Created: 2023-12-23
+#
+# Licensed under Apache License, Version 2.0.
+#
+
+
+from pathlib import Path
+
+import partcad as pc
+
+
+def cli_help_add(subparsers):
+    parser_add = subparsers.add_parser(
+        "add",
+        help="Import a package",
+    )
+    parser_add.add_argument(
+        "alias",
+        help="Alias to be used to reference the package",
+        type=str,
+    )
+    parser_add.add_argument(
+        "location",
+        help="Path or URL to the package",
+        type=str,
+    )
+
+    parser_add_part = subparsers.add_parser(
+        "add-part",
+        help="Add a part",
+    )
+    parser_add_part.add_argument(
+        "kind",
+        help="Type of the part",
+        type=str,
+        choices=["cadquery", "build123d", "step", "stl", "3mf"],
+    )
+    parser_add_part.add_argument(
+        "path",
+        help="Path to the file",
+        type=str,
+    )
+
+    parser_add_assembly = subparsers.add_parser(
+        "add-assembly",
+        help="Add a assembly",
+    )
+    parser_add_assembly.add_argument(
+        "kind",
+        help="Type of the assembly",
+        type=str,
+        choices=["assy"],
+    )
+    parser_add_assembly.add_argument(
+        "path",
+        help="Path to the file",
+        type=str,
+    )
+
+
+def cli_add(args):
+    if not args.config_path is None:
+        ctx = pc.init(args.config_path)
+    else:
+        ctx = pc.init()
+
+    prj = ctx.get_project(pc.THIS)
+    prj.add_import(args.alias, args.location)
+
+
+def cli_add_part(args):
+    if not args.config_path is None:
+        ctx = pc.init(args.config_path)
+    else:
+        ctx = pc.init()
+
+    prj = ctx.get_project(pc.THIS)
+    if prj.add_part(args.kind, args.path):
+        Path(args.path).touch()
+
+
+def cli_add_assembly(args):
+    if not args.config_path is None:
+        ctx = pc.init(args.config_path)
+    else:
+        ctx = pc.init()
+
+    prj = ctx.get_project(pc.THIS)
+    if prj.add_assembly(args.kind, args.path):
+        Path(args.path).touch()

partcad-cli-0.3.82/src/partcad_cli/cli_info.py

@@ -0,0 +1,78 @@
+#
+# OpenVMP, 2023
+#
+# Author: Roman Kuzmenko
+# Created: 2024-01-23
+#
+# Licensed under Apache License, Version 2.0.
+#
+
+import logging
+from pprint import pprint
+
+import partcad as pc
+from partcad.utils import total_size
+
+
+def cli_help_info(subparsers):
+    parser_info = subparsers.add_parser(
+        "info",
+        help="Show detailed info a part, assembly or scene",
+    )
+    group_type = parser_info.add_mutually_exclusive_group(required=False)
+    group_type.add_argument(
+        "-a",
+        help="The object is an assembly",
+        dest="assembly",
+        action="store_true",
+    )
+    group_type.add_argument(
+        "-s",
+        help="The object is a scene",
+        dest="scene",
+        action="store_true",
+    )
+
+    parser_info.add_argument(
+        "object",
+        help="Part (default), assembly or scene to show",
+        type=str,
+    )
+    parser_info.add_argument(
+        "package",
+        help="Package to retrieve the object from",
+        type=str,
+        nargs="?",
+    )
+
+
+def cli_info(args):
+    if not args.config_path is None:
+        ctx = pc.init(args.config_path)
+    else:
+        ctx = pc.init()
+
+    if args.package is None:
+        package = "this"
+    else:
+        package = args.package
+
+    if args.assembly:
+        obj = ctx.get_assembly(args.object, package)
+    else:
+        obj = ctx.get_part(args.object, package)
+
+    if obj is None:
+        if args.package is None:
+            logging.error("Object %s not found" % args.object)
+        else:
+            logging.error(
+                "Object %s not found in package %s" % (args.object, args.package)
+            )
+    else:
+        print("CONFIGURATION:")
+        pprint(obj.config)
+        print()
+        print("RUNTIME PROPERTIES:")
+        obj.get_shape()
+        print("Memory: %d KB" % ((total_size(obj) + 1023) / 1024))

{partcad-cli-0.3.70 → partcad-cli-0.3.82}/src/partcad_cli/cli_init.py

@@ -9,7 +9,6 @@
 
 import logging
 import os
-import shutil
 import sys
 
 import partcad as pc
@@ -29,12 +28,6 @@ def cli_help_init(subparsers):
 
 
 def cli_init(args):
-    if args.private:
-        template_name = "init-private.yaml"
-    else:
-        template_name = "init-public.yaml"
-    src_path = os.path.join(os.path.dirname(__file__), "template", template_name)
-
     if not args.config_path is None:
         if os.path.isdir(args.config_path):
             dst_path = os.path.join(args.config_path, "partcad.yaml")
@@ -43,7 +36,6 @@ def cli_init(args):
     else:
         dst_path = "partcad.yaml"
 
-    if os.path.exists(dst_path):
-        logging.error("'%s' already exists!" % dst_path)
+    if not pc.create_package(dst_path, args.private):
+        logging.error("Failed creating '%s'!" % dst_path)
         sys.exit(1)
-    shutil.copyfile(src_path, dst_path)

{partcad-cli-0.3.70 → partcad-cli-0.3.82}/src/partcad_cli/cli_list.py

@@ -119,32 +119,21 @@ def cli_list_parts(args):
             continue
         project = ctx.projects[project_name]
 
-        if args.used_by is None:
-            if (
-                "parts" in project.config_obj
-                and project.config_obj["parts"] is not None
-            ):
-                part_names = project.config_obj["parts"].keys()
-            else:
-                part_names = []
-        else:
-            part_names = project.parts.keys()
-        for part_name in part_names:
+        for part_name, part in project.parts.items():
+            if args.used_by is not None and part.count == 0:
+                continue
+
             line = "\t"
             if args.recursive:
                 line += "%s" % project_name
-                line += " " * (36 - len(project_name))
+                line += " " + " " * (35 - len(project_name))
             line += "%s" % part_name
             if args.used_by is not None:
                 part = project.parts[part_name]
                 line += "(%d)" % part.count
                 part_count = part_count + part.count
-            line += " " * (36 - len(part_name))
-            if (
-                project.config_obj["parts"][part_name] is not None
-                and "desc" in project.config_obj["parts"][part_name]
-            ):
-                line += "%s" % project.config_obj["parts"][part_name]["desc"]
+            line += " " + " " * (35 - len(part_name))
+            line += "%s" % part.desc
             print(line)
             part_kinds = part_kinds + 1
 
@@ -167,6 +156,7 @@ def cli_list_assemblies(args):
 
     if args.used_by is not None:
         print("Instantiating %s..." % args.used_by)
+        # TODO(clairbee): do not call it twice in 'list-all'
         pc.get_assembly(args.used_by)
 
     print()
@@ -178,32 +168,21 @@ def cli_list_assemblies(args):
             continue
         project = ctx.projects[project_name]
 
-        if args.used_by is None:
-            if (
-                "assemblies" in project.config_obj
-                and project.config_obj["assemblies"] is not None
-            ):
-                assy_names = project.config_obj["assemblies"].keys()
-            else:
-                assy_names = []
-        else:
-            assy_names = project.assemblies.keys()
-        for assy_name in assy_names:
+        for assy_name, assy in project.assemblies.items():
+            if args.used_by is not None and assy.count == 0:
+                continue
+
             line = "\t"
             if args.recursive:
                 line += "%s" % project_name
-                line += " " * (36 - len(project_name))
+                line += " " + " " * (35 - len(project_name))
             line += "%s" % assy_name
             if args.used_by is not None:
                 assy = project.assemblies[assy_name]
                 line += "(%d)" % assy.count
                 assy_count = assy_count + assy.count
-            line += " " * (36 - len(assy_name))
-            if (
-                project.config_obj["assemblies"][assy_name] is not None
-                and "desc" in project.config_obj["assemblies"][assy_name]
-            ):
-                line += "%s" % project.config_obj["assemblies"][assy_name]["desc"]
+            line += " " + " " * (35 - len(assy_name))
+            line += "%s" % assy.desc
             print(line)
             assy_kinds = assy_kinds + 1
 

{partcad-cli-0.3.70 → partcad-cli-0.3.82}/src/partcad_cli/cli_show.py

@@ -7,11 +7,14 @@
 # Licensed under Apache License, Version 2.0.
 #
 
+# import argparse
 import logging
 
 import partcad as pc
 
 
+# TODO(clairbee): fix type checking here
+# def cli_help_show(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]):
 def cli_help_show(subparsers):
     parser_show = subparsers.add_parser(
         "show",
@@ -31,6 +34,15 @@ def cli_help_show(subparsers):
         action="store_true",
     )
 
+    parser_show.add_argument(
+        "-p",
+        "--param",
+        metavar="<param_name>=<param_value>",
+        help="Assign a value to the parameter",
+        dest="params",
+        action="append",
+    )
+
     parser_show.add_argument(
         "object",
         help="Part (default), assembly or scene to show",
@@ -55,10 +67,16 @@ def cli_show(args):
     else:
         package = args.package
 
+    params = {}
+    if not args.params is None:
+        for kv in args.params:
+            k, v = kv.split("=")
+            params[k] = v
+
     if args.assembly:
-        obj = ctx.get_assembly(args.object, package)
+        obj = ctx.get_assembly(args.object, package, params=params)
     else:
-        obj = ctx.get_part(args.object, package)
+        obj = ctx.get_part(args.object, package, params=params)
 
     if obj is None:
         if args.package is None:

{partcad-cli-0.3.70 → partcad-cli-0.3.82}/src/partcad_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: partcad-cli
-Version: 0.3.70
+Version: 0.3.82
 Summary: Command-line interface to PartCAD
 Author-email: Roman Kuzmenko <openvmp@proton.me>
 Maintainer-email: Roman Kuzmenko <openvmp@proton.me>
@@ -12,7 +12,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: partcad==0.3.70
+Requires-Dist: partcad==0.3.82
 Requires-Dist: pycairo
 Requires-Dist: renderlab
 Requires-Dist: rlPyCairo

{partcad-cli-0.3.70 → partcad-cli-0.3.82}/src/partcad_cli.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ requirements.txt
 src/partcad_cli/__init__.py
 src/partcad_cli/cli.py
 src/partcad_cli/cli_add.py
+src/partcad_cli/cli_info.py
 src/partcad_cli/cli_init.py
 src/partcad_cli/cli_install.py
 src/partcad_cli/cli_list.py
@@ -14,6 +15,4 @@ src/partcad_cli.egg-info/SOURCES.txt
 src/partcad_cli.egg-info/dependency_links.txt
 src/partcad_cli.egg-info/entry_points.txt
 src/partcad_cli.egg-info/requires.txt
-src/partcad_cli.egg-info/top_level.txt
-src/partcad_cli/template/init-private.yaml
-src/partcad_cli/template/init-public.yaml
+src/partcad_cli.egg-info/top_level.txt

{partcad-cli-0.3.70 → partcad-cli-0.3.82}/src/partcad_cli.egg-info/requires.txt

@@ -1,4 +1,4 @@
-partcad==0.3.70
+partcad==0.3.82
 pycairo
 renderlab
 rlPyCairo

partcad-cli-0.3.70/src/partcad_cli/cli_add.py

@@ -1,66 +0,0 @@
-#
-# OpenVMP, 2023
-#
-# Author: Roman Kuzmenko
-# Created: 2023-12-23
-#
-# Licensed under Apache License, Version 2.0.
-#
-
-import logging
-import os
-import ruamel.yaml
-import sys
-
-import partcad as pc
-
-
-def cli_help_add(subparsers):
-    parser_add = subparsers.add_parser(
-        "add",
-        help="Import a package",
-    )
-    parser_add.add_argument(
-        "alias",
-        help="Alias to be used to reference the package",
-        type=str,
-    )
-    parser_add.add_argument(
-        "location",
-        help="Path or URL to the package",
-        type=str,
-    )
-
-
-def cli_add(args):
-    if not os.path.exists("partcad.yaml"):
-        logging.error("'partcad.yaml' not found!")
-        sys.exit(1)
-
-    if ":" in args.location:
-        location_param = "url"
-        if args.location.endswith(".tar.gz"):
-            location_type = "tar"
-        else:
-            location_type = "git"
-    else:
-        location_param = "path"
-        location_type = "local"
-
-    yaml = ruamel.yaml.YAML()
-    yaml.preserve_quotes = True
-    with open("partcad.yaml") as fp:
-        config = yaml.load(fp)
-        fp.close()
-
-    for elem in config:
-        if elem == "import":
-            imports = config["import"]
-            imports[args.alias] = {
-                location_param: args.location,
-                "type": location_type,
-            }
-            break  # no need to iterate further
-    with open("partcad.yaml", "w") as fp:
-        yaml.dump(config, fp)
-        fp.close()

partcad-cli-0.3.70/src/partcad_cli/template/init-private.yaml

@@ -1,16 +0,0 @@
-import:
-  # Add dependencies here
-  #     <package-name>:
-  #         desc: <package description>               # optional
-  #         type: <local|git|tar>
-  #         path: <relative path>                     # type:local only
-  #         url: <url of the package>                 # type:git|tar only
-  #         relPath: <relative path within the repo>  # type:git|tar only
-  #         web: <package's or maintainer's url>      # optional
-  #         poc: <maintainer's email>                 # optional
-
-parts:
-  # Add parts here
-
-assemblies:
-  # Add assemblies here

partcad-cli-0.3.70/src/partcad_cli/template/init-public.yaml

@@ -1,19 +0,0 @@
-import:
-  # Add dependencies here
-  #     <package-name>:
-  #         desc: <package description>               # optional
-  #         type: <local|git|tar>
-  #         path: <relative path>                     # type:local only
-  #         url: <url of the package>                 # type:git|tar only
-  #         relPath: <relative path within the repo>  # type:git|tar only
-  #         web: <package's or maintainer's url>      # optional
-  #         poc: <maintainer's email>                 # optional
-  partcad-index:
-    type: git
-    url: https://github.com/openvmp/partcad-index.git
-
-parts:
-  # Add parts here
-
-assemblies:
-  # Add assemblies here