draftwright 0.1.0__tar.gz → 0.1.2__tar.gz

{draftwright-0.1.0 → draftwright-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: draftwright
-Version: 0.1.0
+Version: 0.1.2
 Summary: Automated technical-drawing generation for build123d
 Project-URL: Homepage, https://github.com/pzfreo/draftwright
 Project-URL: Repository, https://github.com/pzfreo/draftwright
@@ -683,6 +683,8 @@ Requires-Python: >=3.10
 Requires-Dist: build123d-drafting-helpers>=0.10.0
 Requires-Dist: build123d>=0.9.0
 Requires-Dist: kiwisolver<2,>=1.4
+Provides-Extra: pdf
+Requires-Dist: cairosvg>=2.7; extra == 'pdf'
 Description-Content-Type: text/markdown
 
 # draftwright

{draftwright-0.1.0 → draftwright-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "draftwright"
-version = "0.1.0"
+version = "0.1.2"
 description = "Automated technical-drawing generation for build123d"
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -28,6 +28,9 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
 ]
 
+[project.optional-dependencies]
+pdf = ["cairosvg>=2.7"]
+
 [project.scripts]
 draftwright = "draftwright.make_drawing:_cli"
 

{draftwright-0.1.0 → draftwright-0.1.2}/src/draftwright/make_drawing.py

@@ -1142,6 +1142,27 @@ class Drawing:
         self.dxf_path = dxf_path
         return svg_path, dxf_path
 
+    def export_pdf(self, out=None) -> str:
+        """Write a PDF rendered from the SVG.  Requires ``cairosvg`` (install with
+        ``pip install draftwright[pdf]``).  Calls :meth:`export` first if the SVG
+        hasn't been written yet.  Returns the PDF path."""
+        try:
+            import cairosvg
+        except ImportError as exc:
+            raise ImportError(
+                "PDF export requires cairosvg. Install it with:  pip install draftwright[pdf]"
+            ) from exc
+
+        svg_path: str
+        if not hasattr(self, "svg_path") or self.svg_path is None:
+            svg_path, _ = self.export(out=out)
+        else:
+            svg_path = self.svg_path
+        pdf_path = svg_path[:-4] + ".pdf" if svg_path.endswith(".svg") else svg_path + ".pdf"
+        cairosvg.svg2pdf(url=svg_path, write_to=pdf_path)
+        _log.info("PDF → %s", pdf_path)
+        return pdf_path
+
     def _add_shapes(self, exporter):
         """Add every view layer and annotation to *exporter* with error context."""
         for name, (vis, hid) in self.views.items():
@@ -1233,15 +1254,14 @@ def _auto_annotate(dwg, a):
         return a.PV_Y + (y - a.cy) * a.SCALE
 
     # Tighten right-strip outer_limits to the actual iso view left edge now
-    # that the iso has been projected and fitted.  Guard: only apply if the
-    # limit is above the strip cursor — an overflowing iso can produce
-    # _iso_x_limit < cursor, which would silence every right-strip allocation.
+    # that the iso has been projected and fitted.  Always apply so that any
+    # future allocations are bounded; warn when the cursor has already passed
+    # the limit (dims already placed may overlap the iso view).
     _iso_x0, _, _, _ = _iso_bbox(dwg)
     _iso_x_limit = _iso_x0 - 4
     for _rs in (a.fv_zones.right, a.pv_zones.right, a.sv_zones.right):
-        if _iso_x_limit > _rs._cursor:
-            _rs.outer_limit = min(_rs.outer_limit, _iso_x_limit)
-        else:
+        _rs.outer_limit = min(_rs.outer_limit, _iso_x_limit)
+        if _rs._cursor >= _iso_x_limit:
             _log.warning(
                 "right-strip cursor %.1f >= iso_x limit %.1f: right-strip dims"
                 " may overlap iso view (iso view overflows into annotation zone)",
@@ -2672,7 +2692,10 @@ def _fit_iso_view(dwg, a):
         if extent > 0
     ]
     needed = min(ratios, default=1.0)
-    factor = next((f for f in _ISO_SHRINK_FACTORS if f <= needed), _ISO_SHRINK_FACTORS[-1])
+    # Apply a 2 % safety margin and floor to 4 decimal places to avoid
+    # floating-point creep past the region boundary.  The iso is NTS so
+    # there is no need to constrain to "clean" fractions.
+    factor = math.floor(needed * 0.98 * 10000) / 10000
     _project_iso(dwg, a, a.SCALE * factor)
     bb = _iso_bbox(dwg)
     if not _bbox_within(bb, region):
@@ -2960,7 +2983,6 @@ def generate_script(
 
 
 def _cli():
-    logging.basicConfig(level=logging.INFO, format="%(message)s")
     ap = argparse.ArgumentParser(
         description="Zero-AI STEP → technical drawing (SVG + DXF, or editable .py script)",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
@@ -2997,13 +3019,29 @@ def _cli():
             "'annotate' — add PMI-derived dimensions to the drawing"
         ),
     )
+    ap.add_argument(
+        "--pdf",
+        action="store_true",
+        help="Also write a PDF (requires draftwright[pdf] / cairosvg)",
+    )
+    ap.add_argument(
+        "-v",
+        "--verbose",
+        action="store_true",
+        help="Show detailed progress (default: warnings and errors only)",
+    )
     args = ap.parse_args()
 
+    logging.basicConfig(
+        level=logging.INFO if args.verbose else logging.WARNING,
+        format="%(message)s",
+    )
+
     if args.script and (args.scale is not None or args.page is not None):
         ap.error("--scale/--page only apply to direct output; edit the generated script instead")
 
     if args.script:
-        generate_script(
+        py_path = generate_script(
             step_file=args.step_file,
             out=args.out,
             title=args.title,
@@ -3012,8 +3050,9 @@ def _cli():
             drawn_by=args.drawn_by,
             pmi=args.pmi,
         )
+        print(py_path)
     else:
-        make_drawing(
+        dwg = build_drawing(
             step_file=args.step_file,
             out=args.out,
             title=args.title,
@@ -3024,6 +3063,11 @@ def _cli():
             page=args.page,
             pmi=args.pmi,
         )
+        svg_path, dxf_path = dwg.export()
+        print(svg_path)
+        print(dxf_path)
+        if args.pdf:
+            print(dwg.export_pdf())
 
 
 if __name__ == "__main__":

{draftwright-0.1.0 → draftwright-0.1.2}/tests/test_make_drawing.py

@@ -1167,10 +1167,13 @@ def test_shrunk_iso_keeps_world_to_page_mapping(shrunk_iso_drawing):
     vis, _hid = dwg.views["iso"]
     bb = vis.bounding_box()
     assert bb.min.X < centre[0] < bb.max.X and bb.min.Y < centre[1] < bb.max.Y
-    # This fixture shrinks the iso to 1/2 sheet scale (see the NTS test above).
-    # World +Z maps to page +Y; the offset must use the shrunk view scale.
+    # World +Z maps to page +Y; the offset must use the shrunk view scale (not
+    # the sheet scale).  Derive the actual shrunk scale from _coords so the
+    # test does not depend on a specific discretised shrink factor.
+    shrunk_scale = dwg._coords["iso"]._scale
+    assert shrunk_scale < dwg.scale, "iso should be shrunk below sheet scale"
     raised = dwg.at("iso", cx, cy, cz + 100)
-    assert raised[1] - centre[1] == pytest.approx(100 * dwg.scale * 0.5)
+    assert raised[1] - centre[1] == pytest.approx(100 * shrunk_scale)
 
 
 @pytest.mark.timeout(60)