Multimethod changes and type checking #1969

adam-urbanczyk · 2026-01-15T07:28:49Z

Quite some scope creep, but IMO this is very important

Enable type checking of mutlimethod and multidispatch
Fix detected mypy issues (hence some changes in Sketch and Workplane)
Rework geom to use multidispatch
Rework shapes to partially use multidispatch. NB: the goal is to use it everywhere eventually.

codecov · 2026-01-16T08:04:59Z

Codecov Report

❌ Patch coverage is 97.91667% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 96.00%. Comparing base (f3c5536) to head (5f4c5e3).
⚠️ Report is 3 commits behind head on master.

Files with missing lines	Patch %	Lines
cadquery/occ_impl/shapes.py	97.47%	2 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #1969      +/-   ##
==========================================
+ Coverage   95.86%   96.00%   +0.14%     
==========================================
  Files          29       29              
  Lines        7949     9355    +1406     
  Branches     1194     1592     +398     
==========================================
+ Hits         7620     8981    +1361     
- Misses        191      216      +25     
- Partials      138      158      +20

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

…into cone-func-fix

jmwright

Thanks @adam-urbanczyk

I made a few comments, but otherwise it looks good.

jmwright · 2026-01-21T19:47:58Z

cadquery/occ_impl/shapes.py

+
+            wire_lists = [[w] for w in _get_wires(el)]
+
+            # if not faces and vertices were detected return an empty list


Suggested change

# if not faces and vertices were detected return an empty list

# if no faces and vertices were detected return an empty list

jmwright · 2026-01-21T19:49:32Z

cadquery/occ_impl/shapes.py

+
+            face_lists = [[f] for f in el.Faces()]
+
+            # if not faces were detected return an empty list


Suggested change

# if not faces were detected return an empty list

# if no faces were detected return an empty list

jmwright · 2026-01-21T19:57:58Z

cadquery/utils.py


-class cqmultimethod(multimethod):
-    def __call__(self, *args, **kwargs):
+# class cqmultimethod(multimethod):


Why is this left commented?

jmwright · 2026-01-21T19:58:24Z

cadquery/utils.py

-            return super().__call__(*args, **kwargs)
-        except DispatchError:
-            return next(iter(self.values()))(*args, **kwargs)
+#         try:


Same as above. Wondering why the block was left in but commented.

lorenzncode

LGTM other than a few minor typo and lint check items. Thanks @adam-urbanczyk !

lorenzncode · 2026-01-24T16:38:53Z

tests/test_sketch.py


    assert s3.map(lambda x: f).subtract().reset().val().Area() == approx(0.9)

+    # check that adding without selection does not raise


typo in comment; adding -> subtract

# check that subtract without selection does not raise

lorenzncode · 2026-01-24T16:59:27Z

cadquery/occ_impl/shapes.py

+
+    wire_lists: List[List[Wire]] = []
+
+    ix_last = len(s) - 1


Local variable ix_last is assigned to but never used

lorenzncode · 2026-01-24T17:00:05Z

cadquery/occ_impl/shapes.py

+
+    face_lists: List[List[Face]] = []
+
+    ix_last = len(s) - 1


Local variable ix_last is assigned to but never used

lorenzncode · 2026-01-24T17:10:43Z

cadquery/utils.py

-from multimethod import multimethod, DispatchError
+from multimethod import (
+    multidispatch as _multidispatch,
+    DispatchError,


multimethod.DispatchError imported but unused

lorenzncode · 2026-01-24T17:14:38Z

cadquery/occ_impl/geom.py

-
 from ..types import Real
-from ..utils import multimethod
+from ..utils import multimethod, multidispatch


..utils.multimethod imported but unused

lorenzncode · 2026-01-24T17:19:24Z

tests/test_utils.py


    assert A().f(a=0, c="s") == 1

-    with raises(TypeError):


pytest.raises imported but unused

Fix free func cone dispatching

c96665c

adam-urbanczyk added the free func label Jan 15, 2026

Expose multidispatch via utils

3ec2623

adam-urbanczyk mentioned this pull request Jan 15, 2026

2.7 release? #1968

Open

6 tasks

adam-urbanczyk and others added 3 commits January 15, 2026 08:43

Fix import

548cb1a

Fix formatting

e6e2078

Another black fix

6ee424a

adam-urbanczyk and others added 9 commits January 16, 2026 10:35

Use a custom multidispatch implementation

9928b93

Disable no impl error code

0edf04f

Switch Plane to the new implementation

309cebe

Convert rest of geom to multidispatch

b269a7f

Convert even more methods/funcs and fix issues

02c3f4b

Typo fix

589f60f

Merge branch 'master' into cone-func-fix

a5b22db

Coverge tweaks

e8ff23d

Merge branch 'cone-func-fix' of https://github.com/CadQuery/cadquery …

d73dc54

…into cone-func-fix

adam-urbanczyk marked this pull request as draft January 19, 2026 20:38

adam-urbanczyk added 4 commits January 19, 2026 21:41

Enable typechecking of multimethods

630b7e8

Fix shapes

232c305

Fix sketch

b9bad81

Fix Workplane

5f4c5e3

adam-urbanczyk changed the title ~~Fix free func cone dispatching~~ Multimethod changes and type checkingdispatching Jan 21, 2026

adam-urbanczyk changed the title ~~Multimethod changes and type checkingdispatching~~ Multimethod changes and type checking Jan 21, 2026

adam-urbanczyk marked this pull request as ready for review January 21, 2026 18:45

adam-urbanczyk requested review from jmwright and lorenzncode January 21, 2026 18:45

jmwright approved these changes Jan 21, 2026

View reviewed changes

lorenzncode approved these changes Jan 24, 2026

View reviewed changes


		wire_lists = [[w] for w in _get_wires(el)]

		# if not faces and vertices were detected return an empty list

	# if not faces and vertices were detected return an empty list
	# if no faces and vertices were detected return an empty list


		face_lists = [[f] for f in el.Faces()]

		# if not faces were detected return an empty list

	# if not faces were detected return an empty list
	# if no faces were detected return an empty list


		assert s3.map(lambda x: f).subtract().reset().val().Area() == approx(0.9)

		# check that adding without selection does not raise

Multimethod changes and type checking #1969

Are you sure you want to change the base?

Multimethod changes and type checking #1969

Uh oh!

Conversation

adam-urbanczyk commented Jan 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Jan 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

jmwright left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lorenzncode left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

adam-urbanczyk commented Jan 15, 2026 •

edited

Loading

codecov bot commented Jan 16, 2026 •

edited

Loading