Skip to content

Avoid redundant pyproject parsing #20076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charliermarsh merged 1 commit into from
Jul 1, 2026
+16 −28
Merged

Avoid redundant pyproject parsing #20076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 15 additions & 27 deletions crates/uv-workspace/src/pyproject.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,24 +94,21 @@ impl PyProjectToml {
/// Parse a `PyProjectToml` from a raw TOML string.
#[instrument("toml::from_str workspace", skip_all, fields(path = %_path.as_ref().display()))]
pub fn from_string(raw: String, _path: impl AsRef<Path>) -> Result<Self, PyprojectTomlError> {
let sources_wire =
toml::from_str::<PyProjectTomlSourcesWire>(&raw).map_err(PyprojectTomlError::Toml)?;
let sources = sources_wire
.tool
.and_then(|tool| tool.uv)
.and_then(|uv| uv.sources)
.map(ToolUvSources::try_from)
.transpose()?;

let mut pyproject: Self = toml::from_str(&raw).map_err(PyprojectTomlError::Toml)?;
if let Some(sources) = sources {
let tool_uv = pyproject
.tool
.as_mut()
.and_then(|tool| tool.uv.as_mut())
.expect("tool.uv must exist when tool.uv.sources is present");
tool_uv.sources = Some(sources);
}
let pyproject: Self = match toml::from_str(&raw) {
Ok(pyproject) => pyproject,
Err(error) => {
// Preserve the more specific source error if both parses would fail.
let sources = toml::from_str::<PyProjectTomlSourcesWire>(&raw)
.map_err(PyprojectTomlError::Toml)?
.tool
.and_then(|tool| tool.uv)
.and_then(|uv| uv.sources);
if let Some(sources) = sources {
ToolUvSources::try_from(sources)?;
}
return Err(PyprojectTomlError::Toml(error));
}
};

Ok(Self { raw, ..pyproject })
}
Expand Down Expand Up @@ -316,7 +313,6 @@ pub struct ToolUv {
pydantic = { path = "/path/to/pydantic", editable = true }
"#
)]
#[serde(default, deserialize_with = "ignore_tool_uv_sources")]
pub sources: Option<ToolUvSources>,

/// The indexes to use when resolving dependencies.
Expand Down Expand Up @@ -712,14 +708,6 @@ pub struct ToolUv {
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct ToolUvSources(BTreeMap<PackageName, Sources>);

fn ignore_tool_uv_sources<'de, D>(deserializer: D) -> Result<Option<ToolUvSources>, D::Error>
where
D: Deserializer<'de>,
{
serde::de::IgnoredAny::deserialize(deserializer)?;
Ok(None)
}

#[derive(Deserialize, Debug)]
#[serde(rename_all = "kebab-case")]
struct PyProjectTomlSourcesWire {
Expand Down
2 changes: 1 addition & 1 deletion crates/uv/tests/lock/lock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24750,7 +24750,7 @@ fn lock_multiple_sources_conflict() -> Result<()> {
name = "project"
version = "0.1.0"
requires-python = ">=3.12"
dependencies = ["iniconfig"]
dependencies = 1

[tool.uv.sources]
iniconfig = [
Expand Down
Loading