partcad-cli 0.6.37__tar.gz → 0.7.2__tar.gz

{partcad_cli-0.6.37 → partcad_cli-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: partcad-cli
-Version: 0.6.37
+Version: 0.7.2
 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.10
 Description-Content-Type: text/markdown
-Requires-Dist: partcad==0.6.37
+Requires-Dist: partcad==0.7.2
 Requires-Dist: renderlab
 Requires-Dist: rlPyCairo
 Requires-Dist: svglib
@@ -40,11 +40,14 @@ And all of that is supercharged by the ultimate versioning and collaboration fea
 
 PartCAD features include:
 
-- 3D part models using STEP, STL and 3MF files
-- 3D part models using CadQuery, build123d and OpenSCAD scripting languages (including AI-generated: Gemini and GPT)
-- 2D blueprints using DXF, build123d and SVG files
-- Fully featured object-oriented approach to maintain part interfaces and mating information (with multiple class inheritance etc)
+- 3D part models using [CadQuery](https://cadquery.readthedocs.io/), [build123d](https://build123d.readthedocs.io/) and [OpenSCAD](https://openscad.org/) scripting languages
+- 3D part models using legacy STEP, STL and 3MF files
+- Generate 3D models using LLM/GenAI: Google AI (Gemini), OpenAI (ChatGPT) or any model published to [Ollama](https://ollama.com/) (Llama 3.1, DeepSeek-Coder-V2, CodeGemma, Code Llama etc)
+- 2D blueprints using [build123d](https://build123d.readthedocs.io/), or legacy DXF and SVG files
+- Fully featured object-oriented approach to maintaining part interfaces and mating information (with multiple class inheritance etc)
 - Live preview of 3D models while coding in VS Code
+- Render models to SVG, PNG and export to STEP, STL, 3MF, ThreeJS and OBJ
+- Render Markdown documentation files
 
 Find [more documentation here](https://partcad.readthedocs.io/en/latest/?badge=latest) and visit [our website](https://partcad.org/).
 
@@ -84,8 +87,8 @@ On Ubuntu, try `apt install libcairo2-dev` if `pip install` fails to install `ca
 
 ## Tools for Mechanical Engineering
 
-Here is an overview of the open-source tools to maintain
-mechanical projects. It demonstrates where this framework fits
+Here is an overview of open source tools to maintain
+mechanical projects. It demonstrates where PartCAD fits
 in the modern mechanical development workflows.
 
 ```mermaid

{partcad_cli-0.6.37 → partcad_cli-0.7.2}/README.md

@@ -20,11 +20,14 @@ And all of that is supercharged by the ultimate versioning and collaboration fea
 
 PartCAD features include:
 
-- 3D part models using STEP, STL and 3MF files
-- 3D part models using CadQuery, build123d and OpenSCAD scripting languages (including AI-generated: Gemini and GPT)
-- 2D blueprints using DXF, build123d and SVG files
-- Fully featured object-oriented approach to maintain part interfaces and mating information (with multiple class inheritance etc)
+- 3D part models using [CadQuery](https://cadquery.readthedocs.io/), [build123d](https://build123d.readthedocs.io/) and [OpenSCAD](https://openscad.org/) scripting languages
+- 3D part models using legacy STEP, STL and 3MF files
+- Generate 3D models using LLM/GenAI: Google AI (Gemini), OpenAI (ChatGPT) or any model published to [Ollama](https://ollama.com/) (Llama 3.1, DeepSeek-Coder-V2, CodeGemma, Code Llama etc)
+- 2D blueprints using [build123d](https://build123d.readthedocs.io/), or legacy DXF and SVG files
+- Fully featured object-oriented approach to maintaining part interfaces and mating information (with multiple class inheritance etc)
 - Live preview of 3D models while coding in VS Code
+- Render models to SVG, PNG and export to STEP, STL, 3MF, ThreeJS and OBJ
+- Render Markdown documentation files
 
 Find [more documentation here](https://partcad.readthedocs.io/en/latest/?badge=latest) and visit [our website](https://partcad.org/).
 
@@ -64,8 +67,8 @@ On Ubuntu, try `apt install libcairo2-dev` if `pip install` fails to install `ca
 
 ## Tools for Mechanical Engineering
 
-Here is an overview of the open-source tools to maintain
-mechanical projects. It demonstrates where this framework fits
+Here is an overview of open source tools to maintain
+mechanical projects. It demonstrates where PartCAD fits
 in the modern mechanical development workflows.
 
 ```mermaid

{partcad_cli-0.6.37 → partcad_cli-0.7.2}/pyproject.toml

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

{partcad_cli-0.6.37 → partcad_cli-0.7.2}/requirements.txt

@@ -1,4 +1,4 @@
-partcad==0.6.37
+partcad==0.7.2
 renderlab
 rlPyCairo
 svglib

{partcad_cli-0.6.37 → partcad_cli-0.7.2}/src/partcad_cli/__init__.py

@@ -4,4 +4,4 @@ __all__ = [
     "main_cli",
 ]
 
-__version__: str = "0.6.37"
+__version__: str = "0.7.2"

{partcad_cli-0.6.37 → partcad_cli-0.7.2}/src/partcad_cli/cli.py

@@ -24,6 +24,10 @@ from .cli_list import *
 from .cli_render import *
 from .cli_inspect import *
 from .cli_status import *
+from .cli_supply_find import *
+from .cli_supply_caps import *
+from .cli_supply_order import *
+from .cli_supply_quote import *
 
 
 # Initialize plugins that are not enabled by default
@@ -62,6 +66,8 @@ def main():
         dest="config_path",
     )
     # TODO(clairbee): add a config option to change logging mechanism and level
+
+    # Top level commands
     subparsers = parser.add_subparsers(dest="command")
     subparsers.add_parser(
         "version",
@@ -76,6 +82,20 @@ def main():
     cli_help_inspect(subparsers)
     cli_help_status(subparsers)
 
+    # Supply subcommands
+    parser_supply = subparsers.add_parser(
+        "supply",
+        help="Supplier related commands",
+    )
+    supply_subparsers = parser_supply.add_subparsers(
+        dest="supply_command",
+        required=True,
+    )
+    cli_help_supply_find(supply_subparsers)
+    cli_help_supply_caps(supply_subparsers)
+    cli_help_supply_quote(supply_subparsers)
+    cli_help_supply_order(supply_subparsers)
+
     args = parser.parse_args()
 
     # Configure logging
@@ -85,7 +105,7 @@ def main():
         logging.basicConfig()
 
     if args.quiet > 0:
-        pc.logging.setLevel(logging.ERROR)
+        pc.logging.setLevel(logging.CRITICAL + 1)
     else:
         if args.verbosity > 0:
             pc.logging.setLevel(logging.DEBUG)
@@ -172,6 +192,23 @@ def main():
             with pc_logging.Process("inspect", "this"):
                 cli_inspect(args, ctx)
 
+        elif args.command == "supply":
+            if args.supply_command == "find":
+                with pc_logging.Process("SupplyFind", "this"):
+                    cli_supply_find(args, ctx)
+            elif args.supply_command == "caps":
+                with pc_logging.Process("SupplyCaps", "this"):
+                    cli_supply_caps(args, ctx)
+            elif args.supply_command == "quote":
+                with pc_logging.Process("SupplyQuote", "this"):
+                    cli_supply_quote(args, ctx)
+            elif args.supply_command == "order":
+                with pc_logging.Process("SupplyOrder", "this"):
+                    cli_supply_order(args, ctx)
+            else:
+                print("Unknown supply command.\n")
+                parser.print_help()
+
         else:
             print("Unknown command.\n")
             parser.print_help()

partcad_cli-0.7.2/src/partcad_cli/cli_supply_caps.py

@@ -0,0 +1,35 @@
+#
+# OpenVMP, 2024
+#
+# Author: Roman Kuzmenko
+# Created: 2024-09-07
+#
+# Licensed under Apache License, Version 2.0.
+#
+
+import asyncio
+import json
+import partcad as pc
+
+from partcad.provider_request_caps import ProviderRequestCaps
+
+
+def cli_help_supply_caps(subparsers):
+    parser = subparsers.add_parser(
+        "caps",
+        help="Get capabilities of the provider",
+    )
+    parser.add_argument(
+        "providers",
+        metavar="provider[;key=value]",
+        help="Providers to query for capabilities",
+        nargs="+",
+    )
+
+
+def cli_supply_caps(args, ctx):
+    for provider_spec in args.providers:
+        provider = ctx.get_provider(provider_spec)
+        req = ProviderRequestCaps()
+        caps = asyncio.run(provider.query_caps(req))
+        pc.logging.info(f"{provider_spec}: {json.dumps(caps, indent=4)}")

partcad_cli-0.7.2/src/partcad_cli/cli_supply_find.py

@@ -0,0 +1,81 @@
+#
+# OpenVMP, 2024
+#
+# Author: Roman Kuzmenko
+# Created: 2024-09-07
+#
+# Licensed under Apache License, Version 2.0.
+#
+
+import asyncio
+from partcad.provider_data_cart import ProviderCart
+import partcad as pc
+import json
+
+
+def cli_help_supply_find(subparsers):
+    parser = subparsers.add_parser(
+        "find",
+        help="Find suppliers",
+    )
+    parser.add_argument(
+        "-j",
+        "--json",
+        help="Produce JSON output",
+        dest="json",
+        action="store_true",
+    )
+    parser.add_argument(
+        "-q",
+        "--qos",
+        help="Requested quality of service",
+        dest="qos",
+    )
+    parser.add_argument(
+        "--provider",
+        help="Provider to use",
+        dest="provider",
+    )
+    parser.add_argument(
+        "specs",
+        metavar="object[[,material],count]",
+        help="Part (default) or assembly to quote, with options",
+        nargs="+",
+    )
+
+
+def cli_supply_find(args, ctx):
+    cart = ProviderCart()
+    asyncio.run(cart.add_objects(ctx, args.specs))
+
+    suppliers = {}
+    if args.provider:
+        provider = ctx.get_provider(args.provider)
+        if not provider.is_qos_available(args.qos):
+            pc.logging.error(
+                f"Provider {provider.name} cannot provide qos: {args.qos}."
+            )
+        asyncio.run(provider.load(cart))
+        for part_spec in cart.parts.values():
+            suppliers[str(part_spec)] = []
+            if not asyncio.run(provider.is_part_available(part_spec)):
+                pc.logging.error(
+                    f"Provider {provider.name} cannot provide {part_spec.name}."
+                )
+                return
+            suppliers[str(part_spec)].append(provider.name)
+    else:
+        suppliers = asyncio.run(ctx.find_suppliers(cart, args.qos))
+        pc.logging.debug("Suppliers: %s" % str(suppliers))
+
+    if args.json:
+        print(json.dumps(suppliers))
+    else:
+        pc.logging.info(
+            "The requested parts are available through the following suppliers:"
+        )
+        for spec_str, suppliers in suppliers.items():
+            suppliers_str = ""
+            for supplier in suppliers:
+                suppliers_str += "\n\t\t" + str(supplier)
+            pc.logging.info(f"{spec_str}:{suppliers_str}")

partcad_cli-0.7.2/src/partcad_cli/cli_supply_order.py

@@ -0,0 +1,19 @@
+#
+# OpenVMP, 2024
+#
+# Author: Roman Kuzmenko
+# Created: 2024-09-07
+#
+# Licensed under Apache License, Version 2.0.
+#
+
+
+def cli_help_supply_order(subparsers):
+    parser = subparsers.add_parser(
+        "order",
+        help="Order from suppliers",
+    )
+
+
+def cli_supply_order(args, ctx):
+    pass

partcad_cli-0.7.2/src/partcad_cli/cli_supply_quote.py

@@ -0,0 +1,120 @@
+#
+# OpenVMP, 2024
+#
+# Author: Roman Kuzmenko
+# Created: 2024-09-07
+#
+# Licensed under Apache License, Version 2.0.
+#
+
+import asyncio
+import copy
+from partcad.provider_data_cart import *
+from partcad.provider_request_quote import *
+from partcad.utils import resolve_resource_path
+import partcad as pc
+import json
+import sys
+
+
+def cli_help_supply_quote(subparsers):
+    parser = subparsers.add_parser(
+        "quote",
+        help="Get a quote from suppliers",
+    )
+    parser.add_argument(
+        "-j",
+        "--json",
+        help="Produce JSON output",
+        dest="json",
+        action="store_true",
+    )
+    parser.add_argument(
+        "-q",
+        "--qos",
+        help="Requested quality of service",
+        dest="qos",
+    )
+    parser.add_argument(
+        "--provider",
+        help="Provider to use",
+        dest="provider",
+    )
+    parser.add_argument(
+        "specs",
+        metavar="object[[,material],count]",
+        help="Part (default) or assembly to quote, with options",
+        nargs="+",
+    )
+
+
+def cli_supply_quote(args, ctx):
+    cart = ProviderCart(qos=args.qos)
+    asyncio.run(cart.add_objects(ctx, args.specs))
+    pc.logging.debug("Cart: %s" % str(cart.parts))
+
+    if args.provider:
+        provider = ctx.get_provider(args.provider)
+        preferred_suppliers = asyncio.run(ctx.select_supplier(provider, cart))
+        pc.logging.debug("Selected suppliers: %s" % str(preferred_suppliers))
+    else:
+        suppliers = asyncio.run(ctx.find_suppliers(cart))
+        pc.logging.debug("Suppliers: %s" % str(suppliers))
+        preferred_suppliers = ctx.select_preferred_suppliers(suppliers)
+        pc.logging.debug("Preferred suppliers: %s" % str(preferred_suppliers))
+
+    supplier_carts = asyncio.run(
+        ctx.prepare_supplier_carts(preferred_suppliers)
+    )
+    quotes = asyncio.run(ctx.supplier_carts_to_quotes(supplier_carts))
+    pc.logging.debug("Quotes: %s" % str(quotes))
+
+    if args.json:
+
+        def scrub(x):
+            # Handle ProviderRequestQuote
+            if isinstance(x, ProviderRequestQuote):
+                x = x.compose()
+
+            ret = copy.deepcopy(x)
+            # Handle dictionaries. Scrub all values
+            if isinstance(x, dict):
+                for k, v in copy.copy(list(ret.items())):
+                    if k == "binary":
+                        del ret[k]
+                    else:
+                        ret[k] = scrub(v)
+            elif isinstance(x, list):
+                # Handle lists. Scrub all values
+                for i, v in enumerate(ret):
+                    ret[i] = scrub(v)
+
+            # Finished scrubbing
+            return ret
+
+        ret = json.dumps(scrub(quotes), indent=4)
+        sys.stdout.write(ret + "\n")
+        sys.stdout.flush()
+    else:
+        pc.logging.info("The following quotes are received:")
+        for supplier in sorted(quotes.keys(), reverse=True):
+            quote = quotes[supplier]
+            if supplier:
+                if not quote.result:
+                    pc.logging.info(f"\t\t{supplier}: No quote received")
+                    continue
+                price = quote.result["price"]
+                cart_id = quote.result["cartId"]
+                pc.logging.info(
+                    "\t\t%s: %s: $%0.2f"
+                    % (
+                        supplier,
+                        cart_id,
+                        price,
+                    )
+                )
+            else:
+                pc.logging.info(f"\t\tNo provider found:")
+
+            for part in quote.cart.parts.values():
+                pc.logging.info(f"\t\t\t{part.name}#{part.count}")

{partcad_cli-0.6.37 → partcad_cli-0.7.2}/src/partcad_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: partcad-cli
-Version: 0.6.37
+Version: 0.7.2
 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.10
 Description-Content-Type: text/markdown
-Requires-Dist: partcad==0.6.37
+Requires-Dist: partcad==0.7.2
 Requires-Dist: renderlab
 Requires-Dist: rlPyCairo
 Requires-Dist: svglib
@@ -40,11 +40,14 @@ And all of that is supercharged by the ultimate versioning and collaboration fea
 
 PartCAD features include:
 
-- 3D part models using STEP, STL and 3MF files
-- 3D part models using CadQuery, build123d and OpenSCAD scripting languages (including AI-generated: Gemini and GPT)
-- 2D blueprints using DXF, build123d and SVG files
-- Fully featured object-oriented approach to maintain part interfaces and mating information (with multiple class inheritance etc)
+- 3D part models using [CadQuery](https://cadquery.readthedocs.io/), [build123d](https://build123d.readthedocs.io/) and [OpenSCAD](https://openscad.org/) scripting languages
+- 3D part models using legacy STEP, STL and 3MF files
+- Generate 3D models using LLM/GenAI: Google AI (Gemini), OpenAI (ChatGPT) or any model published to [Ollama](https://ollama.com/) (Llama 3.1, DeepSeek-Coder-V2, CodeGemma, Code Llama etc)
+- 2D blueprints using [build123d](https://build123d.readthedocs.io/), or legacy DXF and SVG files
+- Fully featured object-oriented approach to maintaining part interfaces and mating information (with multiple class inheritance etc)
 - Live preview of 3D models while coding in VS Code
+- Render models to SVG, PNG and export to STEP, STL, 3MF, ThreeJS and OBJ
+- Render Markdown documentation files
 
 Find [more documentation here](https://partcad.readthedocs.io/en/latest/?badge=latest) and visit [our website](https://partcad.org/).
 
@@ -84,8 +87,8 @@ On Ubuntu, try `apt install libcairo2-dev` if `pip install` fails to install `ca
 
 ## Tools for Mechanical Engineering
 
-Here is an overview of the open-source tools to maintain
-mechanical projects. It demonstrates where this framework fits
+Here is an overview of open source tools to maintain
+mechanical projects. It demonstrates where PartCAD fits
 in the modern mechanical development workflows.
 
 ```mermaid

{partcad_cli-0.6.37 → partcad_cli-0.7.2}/src/partcad_cli.egg-info/SOURCES.txt

@@ -11,6 +11,10 @@ src/partcad_cli/cli_install.py
 src/partcad_cli/cli_list.py
 src/partcad_cli/cli_render.py
 src/partcad_cli/cli_status.py
+src/partcad_cli/cli_supply_caps.py
+src/partcad_cli/cli_supply_find.py
+src/partcad_cli/cli_supply_order.py
+src/partcad_cli/cli_supply_quote.py
 src/partcad_cli.egg-info/PKG-INFO
 src/partcad_cli.egg-info/SOURCES.txt
 src/partcad_cli.egg-info/dependency_links.txt

{partcad_cli-0.6.37 → partcad_cli-0.7.2}/src/partcad_cli.egg-info/requires.txt

@@ -1,4 +1,4 @@
-partcad==0.6.37
+partcad==0.7.2
 renderlab
 rlPyCairo
 svglib