Show constraint sources in dependency solver errors #10524

9999years · 2024-11-04T19:51:27Z

Before:

[__0] rejecting: memory-0.18.0 (constraint from user target requires ==0.17.0)

After:

[__0] rejecting: memory-0.18.0
  (constraint from cabal.project requires ==0.17.0)

First shot at #10519. Seems unavoidably large.

Builds off of #9578.

Future work: Propagate line numbers into these constraints!

Implementation strategy:

Propagate provenance (ProjectConfigPath/ConstraintSource) into project config types (Distribution.Client.ProjectConfig, D.C.ProjectConfig.Legacy)
Extract and attach that information in D.C.ProjectConfig.findProjectPackages
Attach that information to ProjectPackageLocation (returned from findProjectPackages). Note: Might be worth unifying that with PackageLocation, would make the new type PackageLocationProvenance.
Use that information to write better ConstraintSources into the solver; this is mostly implemented.

Overall it seems like all the information exists, but it takes a lot of work to propagate it into the right parts of the system.

We have a lot of `showType` functions that are effectively a `Pretty` instance but less composable. Let's make them proper `Pretty` instances. Split off of haskell#10524

cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-test-sute.out

cabal-testsuite/PackageTests/ConstraintSource/SourceRepositoryPackage/cabal.out

ulysses4ever · 2024-11-09T18:56:40Z

@jasagredo just a heads-up: on the last Cabal meeting @9999years asked to not comment on their PRs while a PR is in the draft mode. I remember it because I’m guilty in it more than many!

9999years · 2024-11-18T20:37:38Z

Needs a release note.

9999years · 2024-11-19T20:55:10Z

Added a release note and tests, addressed comments. Should be ready to go!

geekosaur

It's a pity 3.14.1.0 is breathing down our necks; it would be nice to see this go in, seems like it'd be a big UX improvement.

cabal-install/cabal-install.cabal

jasagredo · 2024-11-20T10:32:36Z

cabal-install-solver/src/Distribution/Solver/Types/WithConstraintSource.hs

+import Text.PrettyPrint
+
+-- | A package bundled with a `ConstraintSource`.
+data WithConstraintSource pkg =


I see this type being used as WithContraintSource UserConstraint so I think pkg is not actually a pkg? i.e. constraintPackage is misnamed?

Yeah, constraintPackage is often (but not always) a package. I wasn't sure of a better name for it. constraintInner, maybe? constraintConstraint is also somewhat misleadying, as it's a constraint source and not a UserConstraint itself...

I renamed them, how do these look?

constraintPackage → constraintInner

constraintConstraint → constraintSource

cabal-install/src/Distribution/Client/CmdBuild.hs

grayjay

I started reviewing this PR, but I had a question. It looks like a lot of the changes relate to adding ConstraintSources to targets in v2 commands. Why do the build targets need ConstraintSources? I had thought that targets for most commands only specified the subset of the project to build and didn't affect solving. The only exception I can think of is v2-install, which can solve for packages outside of the project (e.g., "cabal install text-2.0"), but then I would expect all targets to be able to use the same ConstraintSource (ConstraintSourceUserTarget), which I think is the current behavior on master.

cabal-install-solver/src/Distribution/Solver/Types/ConstraintSource.hs

cabal-install-solver/src/Distribution/Solver/Types/WithConstraintSource.hs

cabal-install-solver/src/Distribution/Solver/Types/SourcePackage.hs

grayjay · 2024-11-25T21:43:57Z

cabal-install/src/Distribution/Client/CmdBench.hs

+      =<< readTargetSelectors
+        (localPackages baseCtx)
+        (Just BenchKind)
+        (map (\target -> WithConstraintSource{constraintInner = target, constraintSource = ConstraintSourceCommandlineFlag}) targetStrings)


Why does this line use ConstraintSourceCommandlineFlag as the ConstraintSource? If I understand correctly, targetStrings is a list of targets provided to the bench command, so ConstraintSourceUserTarget seems like a better match. This comment also applies to many of the other commands.

I'll change it if you want. I think it's really unclear which is supposed to be which, and I have no clue what Cabal means when it tells me a constraint comes from a 'user target'. What is ConstraintSourceCommandlineFlag for, if not command line arguments?

grayjay · 2024-11-26T04:48:23Z

cabal-install/tests/UnitTests/Distribution/Solver/Modular/DSL.hs

+                ( WithConstraintSource
+                    { constraintInner =
+                        NamedPackage (C.mkPackageName p) []
+                    , constraintSource = ConstraintSourceUnknown


Should this be ConstraintSourceUserTarget?

I think that the targets parameter should be replaced with one that contains constraint source information. Right now, the constraint source is unknown because that information is missing. We don't know what this function is getting called with or where the targets come from.

grayjay · 2024-11-26T04:59:53Z

cabal-testsuite/PackageTests/ConstraintSource/SourceRepositoryPackage/cabal.project

+-- This is `my-lib` 0.9.
+source-repository-package
+  type: git
+  location: https://github.com/9999years/cabal-testsuite-my-lib.git
+  tag: 9a0af0aa81325c71e744def11db06265840ffb5f


Could this test use an existing package in the Haskell organization as in the postCheckoutCommand test?

cabal/cabal-testsuite/PackageTests/postCheckoutCommand/cabal.positive.project

Lines 3 to 8 in 02da008

source-repository-package

type: git

-- A Sample repo to test post-checkout-command

location: https://github.com/haskell/bytestring

post-checkout-command: true

tag: 0.10.9.0

I wanted a smaller repository so the tests would run faster; my repository is 136k vs bytestring is about 15m.

I also need a package that depends on a conflicting version of a library in the repo.

Grep for location: in this repository and you'll see we're already cloning tons of non-Haskell org repos in the tests.

grayjay · 2024-11-26T07:38:08Z

cabal-testsuite/PackageTests/ConstraintSource/SourceRepositoryPackage/cabal.out

+Could not resolve dependencies:
+[__0] next goal: my-lib (user goal)
+[__0] rejecting: my-lib; 2.0, 1.0
+      (constraint from cabal.project requires ==0.9)


Similarly to the message in use-local-version-of-package.out, I think that this message would be clearer if it explained that the constraint came from the version of a package listed in cabal.project. It could also help to mention that it is a source repository package.

cabal-install/src/Distribution/Client/Setup.hs

grayjay · 2024-11-26T23:20:30Z

cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-test-suite.test.hs

Did you mean to also change the content of this test?

No, @jasagredo asked me to rename it #10524 (comment)

Before: [__0] rejecting: memory-0.18.0 (constraint from user target requires ==0.17.0) After: [__0] rejecting: memory-0.18.0 (constraint from cabal.project requires ==0.17.0)

@grayjay

From @grayjay: > The dependency solver currently doesn't describe preferences in error > messages, so I think that it would take a lot more work to make this > useful.

...provided that nothing else changes.

We have a lot of `showType` functions that are effectively a `Pretty` instance but less composable. Let's make them proper `Pretty` instances. Split off of haskell#10524

9999years force-pushed the dependency-provenance branch 2 times, most recently from 4811a3c to 0c8471d Compare November 4, 2024 22:29

9999years mentioned this pull request Nov 4, 2024

Convert display functions into Pretty instances #10526

Merged

2 tasks

9999years force-pushed the dependency-provenance branch 9 times, most recently from 9ebbba8 to 522bec9 Compare November 9, 2024 00:25

jasagredo reviewed Nov 9, 2024

View reviewed changes

cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-test-sute.out Outdated Show resolved Hide resolved

cabal-testsuite/PackageTests/ConstraintSource/SourceRepositoryPackage/cabal.out Show resolved Hide resolved

9999years force-pushed the dependency-provenance branch from 522bec9 to e52d016 Compare November 18, 2024 19:59

9999years changed the title ~~[WIP] Show constraint sources in dependency solver errors~~ Show constraint sources in dependency solver errors Nov 18, 2024

9999years marked this pull request as ready for review November 18, 2024 19:59

9999years force-pushed the dependency-provenance branch 2 times, most recently from c10bd7d to 9854c9d Compare November 18, 2024 20:37

9999years force-pushed the dependency-provenance branch 2 times, most recently from 9492b41 to b27b413 Compare November 19, 2024 00:45

9999years requested review from jasagredo, philderbeast and ulysses4ever November 19, 2024 20:33

geekosaur approved these changes Nov 19, 2024

View reviewed changes

cabal-install/cabal-install.cabal Show resolved Hide resolved

ulysses4ever requested a review from grayjay November 20, 2024 02:42

jasagredo reviewed Nov 20, 2024

View reviewed changes

9999years mentioned this pull request Nov 25, 2024

PR template: Make it better! #10594

Open

grayjay reviewed Nov 26, 2024

View reviewed changes

grayjay added the cabal-install: solver label Dec 5, 2024

9999years added 5 commits December 5, 2024 16:46

Add ConstraintSource to local packages

29f7a6b

Before: [__0] rejecting: memory-0.18.0 (constraint from user target requires ==0.17.0) After: [__0] rejecting: memory-0.18.0 (constraint from cabal.project requires ==0.17.0)

ConstraintSourceImplicit -> ConstraintSourceImplicitTarget

7b3ac35

Remove Typeable instances

df3c90f

ConstraintSourceCommandlineFlag -> ConstraintSourceUserTarget

7375dfb

Remove ConstraintSources from preferences

0546f08

From @grayjay: > The dependency solver currently doesn't describe preferences in error > messages, so I think that it would take a lot more work to make this > useful.

9999years force-pushed the dependency-provenance branch from db60ab4 to 0546f08 Compare December 6, 2024 22:00

Prevent rebuilds when the project file changes

2844e3e

...provided that nothing else changes.

9999years force-pushed the dependency-provenance branch from e180d68 to 2844e3e Compare December 6, 2024 23:03

9999years mentioned this pull request Dec 9, 2024

"configuration changed" is way too vague #10617

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Show constraint sources in dependency solver errors #10524

Show constraint sources in dependency solver errors #10524

9999years commented Nov 4, 2024 •

edited

Loading

ulysses4ever commented Nov 9, 2024

9999years commented Nov 18, 2024

9999years commented Nov 19, 2024

geekosaur left a comment

jasagredo Nov 20, 2024

9999years Nov 20, 2024

9999years Nov 20, 2024

grayjay left a comment

grayjay Nov 25, 2024

9999years Dec 6, 2024

grayjay Nov 26, 2024

9999years Dec 6, 2024

grayjay Nov 26, 2024

9999years Dec 6, 2024 •

edited

Loading

9999years Dec 6, 2024

grayjay Nov 26, 2024

9999years Dec 6, 2024

grayjay Nov 26, 2024

9999years Dec 6, 2024

	source-repository-package
	type: git
	-- A Sample repo to test post-checkout-command
	location: https://github.com/haskell/bytestring
	post-checkout-command: true
	tag: 0.10.9.0

Show constraint sources in dependency solver errors #10524

Are you sure you want to change the base?

Show constraint sources in dependency solver errors #10524

Conversation

9999years commented Nov 4, 2024 • edited Loading

ulysses4ever commented Nov 9, 2024

9999years commented Nov 18, 2024

9999years commented Nov 19, 2024

geekosaur left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

grayjay left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

9999years Dec 6, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

9999years commented Nov 4, 2024 •

edited

Loading

9999years Dec 6, 2024 •

edited

Loading