pyrefly 0.36.1__tar.gz → 0.36.2__tar.gz

{pyrefly-0.36.1 → pyrefly-0.36.2}/Cargo.lock

@@ -2079,7 +2079,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly"
-version = "0.36.1"
+version = "0.36.2"
 dependencies = [
  "anstream",
  "anyhow",
@@ -2130,7 +2130,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_build"
-version = "0.36.1"
+version = "0.36.2"
 dependencies = [
  "anyhow",
  "dupe",
@@ -2148,7 +2148,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_bundled"
-version = "0.36.1"
+version = "0.36.2"
 dependencies = [
  "anyhow",
  "starlark_map",
@@ -2158,7 +2158,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_config"
-version = "0.36.1"
+version = "0.36.2"
 dependencies = [
  "anyhow",
  "clap",
@@ -2193,7 +2193,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_derive"
-version = "0.36.1"
+version = "0.36.2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2202,7 +2202,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_python"
-version = "0.36.1"
+version = "0.36.2"
 dependencies = [
  "anyhow",
  "dupe",
@@ -2226,7 +2226,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_types"
-version = "0.36.1"
+version = "0.36.2"
 dependencies = [
  "compact_str 0.8.0",
  "dupe",
@@ -2246,7 +2246,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_util"
-version = "0.36.1"
+version = "0.36.2"
 dependencies = [
  "anstream",
  "anyhow",
@@ -3309,7 +3309,7 @@ dependencies = [
 
 [[package]]
 name = "tsp_types"
-version = "0.36.1"
+version = "0.36.2"
 dependencies = [
  "lsp-server",
  "lsp-types",

{pyrefly-0.36.1 → pyrefly-0.36.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrefly
-Version: 0.36.1
+Version: 0.36.2
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pyrefly-0.36.1 → pyrefly-0.36.2}/crates/pyrefly_build/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_build"
-version = "0.36.1"
+version = "0.36.2"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.36.1 → pyrefly-0.36.2}/crates/pyrefly_build/src/source_db/buck_check.rs

@@ -25,6 +25,7 @@ use vec1::Vec1;
 
 use crate::handle::Handle;
 use crate::source_db::SourceDatabase;
+use crate::source_db::Target;
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 struct ManifestItem {
@@ -169,6 +170,10 @@ impl SourceDatabase for BuckCheckSourceDatabase {
     fn get_critical_files(&self) -> SmallSet<PathBuf> {
         SmallSet::new()
     }
+
+    fn get_target(&self, _: Option<&Path>) -> Option<Target> {
+        None
+    }
 }
 
 impl BuckCheckSourceDatabase {

{pyrefly-0.36.1 → pyrefly-0.36.2}/crates/pyrefly_build/src/source_db/map_db.rs

@@ -21,6 +21,7 @@ use vec1::Vec1;
 
 use crate::handle::Handle;
 use crate::source_db::SourceDatabase;
+use crate::source_db::Target;
 
 /// A simple [`SourceDatabase`] that can be used for easy setup and testing.
 #[derive(Debug, PartialEq, Eq)]
@@ -97,4 +98,8 @@ impl SourceDatabase for MapDatabase {
             .map(|p| p.as_path().to_path_buf())
             .collect()
     }
+
+    fn get_target(&self, _: Option<&Path>) -> Option<Target> {
+        None
+    }
 }

{pyrefly-0.36.1 → pyrefly-0.36.2}/crates/pyrefly_build/src/source_db/mod.rs

@@ -35,7 +35,7 @@ pub(crate) mod query_source_db;
 static TARGET_INTERNER: Interner<String> = Interner::new();
 
 #[derive(Debug, Clone, Dupe, Copy, Hash, PartialEq, Eq, PartialOrd, Ord)]
-pub(crate) struct Target(Intern<String>);
+pub struct Target(Intern<String>);
 impl Serialize for Target {
     fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
         serializer.serialize_str(&self.0)
@@ -92,4 +92,6 @@ pub trait SourceDatabase: Send + Sync + fmt::Debug {
     /// changes on. Changes to one of these returned watchfiles should force
     /// a sourcedb rebuild.
     fn get_critical_files(&self) -> SmallSet<PathBuf>;
+    /// Get the target for the given [`ModulePath`], if one exists.
+    fn get_target(&self, origin: Option<&Path>) -> Option<Target>;
 }

{pyrefly-0.36.1 → pyrefly-0.36.2}/crates/pyrefly_build/src/source_db/query_source_db.rs

@@ -114,7 +114,7 @@ impl SourceDatabase for QuerySourceDatabase {
     ) -> Option<ModulePath> {
         let origin = origin?;
         let read = self.inner.read();
-        let start_target = read.path_lookup.get(&origin.to_path_buf())?;
+        let start_target = read.path_lookup.get(origin)?;
         let mut queue = VecDeque::new();
         let mut visited = SmallSet::new();
         queue.push_front(start_target);
@@ -193,6 +193,12 @@ impl SourceDatabase for QuerySourceDatabase {
             )
             .collect()
     }
+
+    fn get_target(&self, origin: Option<&Path>) -> Option<Target> {
+        let origin = origin?;
+        let read = self.inner.read();
+        read.path_lookup.get(origin).copied()
+    }
 }
 
 #[cfg(test)]

{pyrefly-0.36.1 → pyrefly-0.36.2}/crates/pyrefly_bundled/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_bundled"
-version = "0.36.1"
+version = "0.36.2"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.36.1 → pyrefly-0.36.2}/crates/pyrefly_config/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_config"
-version = "0.36.1"
+version = "0.36.2"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.36.1 → pyrefly-0.36.2}/crates/pyrefly_config/src/args.rs

@@ -66,11 +66,20 @@ pub struct ConfigOverrideArgs {
     #[arg(long, group = "env_source")]
     conda_environment: Option<String>,
 
-    /// The Python executable that will be queried for `python_version`
-    /// `python_platform`, or `site_package_path` if any of the values are missing.
+    /// The path to a Python executable that will be queried for `python-version`
+    /// `python-platform`, or `site-package-path` if any of the values are missing.
     #[arg(long, value_name = "EXE_PATH", group = "env_source")]
     python_interpreter: Option<PathBuf>,
 
+    /// The Python executable name available on your PATH that will be queried for your
+    /// `python-version`, `python-platform`, or `site-package-path` if any of the values
+    /// are missing. We execute `which <COMMAND>` to fill in your `python-interpreter`,
+    /// which is useful if you don't know where the Python executable will be on a given
+    /// machine, but want to use one other than the default.
+    /// When this and `python-interpreter` are unset, we query for `python3` and `python`.
+    #[arg(long, value_name = "COMMAND", group = "env_source")]
+    python_interpreter_command: Option<String>,
+
     /// Skip doing any automatic querying for `python-interpreter` or `conda-environment`
     #[arg(long, group = "env_source")]
     skip_interpreter_query: bool,
@@ -177,20 +186,28 @@ impl ConfigOverrideArgs {
         if self.skip_interpreter_query || config.interpreters.skip_interpreter_query {
             config.interpreters.skip_interpreter_query = true;
             config.interpreters.python_interpreter = None;
+            config.interpreters.python_interpreter_command = None;
+            config.interpreters.conda_environment = None;
+        }
+        if let Some(x) = &self.python_interpreter {
+            config.interpreters.python_interpreter = Some(ConfigOrigin::cli(x.clone()));
+            config.interpreters.python_interpreter_command = None;
+            config.interpreters.conda_environment = None;
+        }
+        if let Some(x) = &self.python_interpreter_command {
+            config.interpreters.python_interpreter_command = Some(ConfigOrigin::cli(x.clone()));
+            config.interpreters.python_interpreter = None;
             config.interpreters.conda_environment = None;
         }
         if let Some(conda_environment) = &self.conda_environment {
             config.interpreters.conda_environment =
                 Some(ConfigOrigin::cli(conda_environment.clone()));
             config.interpreters.python_interpreter = None;
+            config.interpreters.python_interpreter_command = None;
         }
         if let Some(x) = &self.typeshed_path {
             config.typeshed_path = Some(x.clone());
         }
-        if let Some(x) = &self.python_interpreter {
-            config.interpreters.python_interpreter = Some(ConfigOrigin::cli(x.clone()));
-            config.interpreters.conda_environment = None;
-        }
         if let Some(x) = &self.use_ignore_files {
             config.use_ignore_files = *x;
         }

{pyrefly-0.36.1 → pyrefly-0.36.2}/crates/pyrefly_config/src/config.rs

@@ -21,6 +21,7 @@ use itertools::Itertools;
 use pyrefly_build::BuildSystem;
 use pyrefly_build::handle::Handle;
 use pyrefly_build::source_db::SourceDatabase;
+use pyrefly_build::source_db::Target;
 use pyrefly_python::COMPILED_FILE_SUFFIXES;
 use pyrefly_python::PYTHON_EXTENSIONS;
 use pyrefly_python::module_name::ModuleName;
@@ -142,6 +143,7 @@ pub enum ImportLookupPathPart<'a> {
     FallbackSearchPath(&'a [PathBuf]),
     SitePackagePath(&'a [PathBuf]),
     InterpreterSitePackagePath(&'a [PathBuf]),
+    BuildSystem(Option<Target>),
 }
 
 impl Display for ImportLookupPathPart<'_> {
@@ -167,6 +169,13 @@ impl Display for ImportLookupPathPart<'_> {
             Self::InterpreterSitePackagePath(paths) => {
                 write!(f, "Site package path queried from interpreter: {paths:?}")
             }
+            Self::BuildSystem(target) => {
+                write!(f, "Build system source database")?;
+                if let Some(target) = target {
+                    write!(f, ": target sources and dependencies for {target}")?;
+                }
+                Ok(())
+            }
         }
     }
 }
@@ -180,6 +189,7 @@ impl ImportLookupPathPart<'_> {
             | Self::SitePackagePath(paths)
             | Self::InterpreterSitePackagePath(paths) => paths.is_empty(),
             Self::ImportRoot(root) => root.is_none(),
+            Self::BuildSystem(_) => false,
         }
     }
 }
@@ -326,6 +336,7 @@ impl Default for ConfigFile {
             project_excludes: Default::default(),
             interpreters: Interpreters {
                 python_interpreter: None,
+                python_interpreter_command: None,
                 conda_environment: None,
                 skip_interpreter_query: false,
             },
@@ -459,11 +470,22 @@ impl ConfigFile {
     }
 
     /// Gets the full, ordered path used for import lookup. Used for pretty-printing.
-    pub fn structured_import_lookup_path(&self) -> Vec<ImportLookupPathPart<'_>> {
-        let mut result = vec![
-            ImportLookupPathPart::SearchPathFromArgs(&self.search_path_from_args),
-            ImportLookupPathPart::SearchPathFromFile(&self.search_path_from_file),
-        ];
+    pub fn structured_import_lookup_path(
+        &self,
+        origin: Option<&Path>,
+    ) -> Vec<ImportLookupPathPart<'_>> {
+        let mut result = vec![];
+        if let Some(source_db) = &self.source_db {
+            result.push(ImportLookupPathPart::BuildSystem(
+                source_db.get_target(origin),
+            ));
+        }
+        result.push(ImportLookupPathPart::SearchPathFromArgs(
+            &self.search_path_from_args,
+        ));
+        result.push(ImportLookupPathPart::SearchPathFromFile(
+            &self.search_path_from_file,
+        ));
         if !self.disable_search_path_heuristics {
             result.push(ImportLookupPathPart::ImportRoot(self.import_root.as_ref()));
             result.push(ImportLookupPathPart::FallbackSearchPath(
@@ -652,6 +674,13 @@ impl ConfigFile {
         if self.interpreters.skip_interpreter_query {
             self.python_environment.set_empty_to_default();
         } else {
+            if self.interpreters.python_interpreter.is_some()
+                && self.interpreters.python_interpreter_command.is_some()
+            {
+                configure_errors.push(anyhow::anyhow!(
+                        "`python-interpreter` and `python-interpreter-command` both set, but only one can be used."
+                ));
+            }
             match self.interpreters.find_interpreter(self.source.root()) {
                 Ok(interpreter) => {
                     let (env, error) = PythonEnvironment::get_interpreter_env(&interpreter);
@@ -663,7 +692,7 @@ impl ConfigFile {
                 }
                 Err(error) => {
                     self.python_environment.set_empty_to_default();
-                    configure_errors.push(error.context("While finding Python interpreter."));
+                    configure_errors.push(error.context("While finding Python interpreter"));
                 }
             }
         }
@@ -976,6 +1005,7 @@ mod tests {
                 },
                 interpreters: Interpreters {
                     python_interpreter: Some(ConfigOrigin::config(PathBuf::from("venv/my/python"))),
+                    python_interpreter_command: None,
                     conda_environment: None,
                     skip_interpreter_query: false,
                 },
@@ -1224,6 +1254,7 @@ mod tests {
             python_environment: python_environment.clone(),
             interpreters: Interpreters {
                 python_interpreter: Some(ConfigOrigin::config(PathBuf::from(interpreter.clone()))),
+                python_interpreter_command: None,
                 conda_environment: None,
                 skip_interpreter_query: false,
             },
@@ -1272,6 +1303,7 @@ mod tests {
             project_excludes: Globs::new(project_excludes_vec).unwrap(),
             interpreters: Interpreters {
                 python_interpreter: Some(ConfigOrigin::config(test_path.join(interpreter))),
+                python_interpreter_command: None,
                 conda_environment: None,
                 skip_interpreter_query: false,
             },
@@ -1328,9 +1360,10 @@ mod tests {
 
         let ignore_keys: Vec<String> = vec![
             // top level configs, where null values (if possible), should be allowed
-            "project_includes",
-            "project_excludes",
-            "python_interpreter",
+            "project-includes",
+            "project-excludes",
+            "python-interpreter",
+            "python-interpreter-command",
             // values we won't be getting
             "extras",
             // values that must be Some (if flattened, their contents will be checked)
@@ -1575,6 +1608,7 @@ mod tests {
         let mut config = ConfigFile {
             interpreters: Interpreters {
                 python_interpreter: Some(ConfigOrigin::config(PathBuf::new())),
+                python_interpreter_command: None,
                 conda_environment: Some(ConfigOrigin::config("".to_owned())),
                 skip_interpreter_query: false,
             },
@@ -1610,6 +1644,7 @@ mod tests {
         let mut config = ConfigFile {
             interpreters: Interpreters {
                 python_interpreter: Some(ConfigOrigin::config(PathBuf::from("abcd"))),
+                python_interpreter_command: None,
                 conda_environment: None,
                 skip_interpreter_query: false,
             },

{pyrefly-0.36.1 → pyrefly-0.36.2}/crates/pyrefly_config/src/environment/interpreters.rs

@@ -35,6 +35,10 @@ pub struct Interpreters {
             )]
     pub(crate) python_interpreter: Option<ConfigOrigin<PathBuf>>,
 
+    /// Should we turn a generic command into a `python_interpreter` path?
+    #[serde(default)]
+    pub(crate) python_interpreter_command: Option<ConfigOrigin<String>>,
+
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub(crate) conda_environment: Option<ConfigOrigin<String>>,
 
@@ -63,6 +67,15 @@ impl Display for Interpreters {
                 "conda environment {conda} with interpreter at {}",
                 path.display()
             ),
+            Self {
+                python_interpreter_command: Some(cmd),
+                python_interpreter: Some(path),
+                ..
+            } => write!(
+                f,
+                "interpreter at path {} (from `which {cmd}`)",
+                path.display(),
+            ),
             Self {
                 python_interpreter: Some(path),
                 ..
@@ -98,12 +111,13 @@ impl Interpreters {
         &self,
         path: Option<&Path>,
     ) -> anyhow::Result<ConfigOrigin<PathBuf>> {
-        if let Some(interpreter @ ConfigOrigin::CommandLine(_)) = &self.python_interpreter {
-            return Ok(interpreter.clone());
+        let python_interpreter = self.interpreter_path_or_cmd()?;
+        if let Some(interpreter @ ConfigOrigin::CommandLine(_)) = python_interpreter {
+            return Ok(interpreter);
         }
 
-        if let Some(interpreter @ ConfigOrigin::Lsp(_)) = &self.python_interpreter {
-            return Ok(interpreter.clone());
+        if let Some(interpreter @ ConfigOrigin::Lsp(_)) = python_interpreter {
+            return Ok(interpreter);
         }
 
         if let Some(conda_env @ ConfigOrigin::CommandLine(_)) = &self.conda_environment {
@@ -117,8 +131,8 @@ impl Interpreters {
             return Ok(ConfigOrigin::auto(active_env));
         }
 
-        if let Some(interpreter) = &self.python_interpreter {
-            return Ok(interpreter.clone());
+        if let Some(interpreter) = python_interpreter {
+            return Ok(interpreter);
         }
 
         if let Some(conda_env) = &self.conda_environment {
@@ -145,6 +159,20 @@ impl Interpreters {
         ))
     }
 
+    fn interpreter_path_or_cmd(&self) -> anyhow::Result<Option<ConfigOrigin<PathBuf>>> {
+        if self.python_interpreter.is_some() {
+            return Ok(self.python_interpreter.clone());
+        }
+        #[cfg(not(target_arch = "wasm32"))]
+        if let Some(cmd) = &self.python_interpreter_command {
+            fn which_to_anyhow_err(cmd: &String) -> anyhow::Result<PathBuf> {
+                Ok(which(cmd)?)
+            }
+            return Ok(Some(cmd.as_ref().map(which_to_anyhow_err).transpose_err()?));
+        }
+        Ok(self.python_interpreter.clone())
+    }
+
     /// Get the first interpreter available on the path by using `which`
     /// and querying for [`Self::DEFAULT_INTERPRETERS`] in order.
     pub(crate) fn get_default_interpreter() -> Option<&'static Path> {

{pyrefly-0.36.1 → pyrefly-0.36.2}/crates/pyrefly_config/src/util.rs

@@ -146,7 +146,7 @@ impl<T> ConfigOrigin<T> {
         }
     }
 
-    fn as_ref(&self) -> ConfigOrigin<&T> {
+    pub fn as_ref(&self) -> ConfigOrigin<&T> {
         match *self {
             ConfigOrigin::ConfigFile(ref value) => ConfigOrigin::ConfigFile(value),
             ConfigOrigin::CommandLine(ref value) => ConfigOrigin::CommandLine(value),

{pyrefly-0.36.1 → pyrefly-0.36.2}/crates/pyrefly_derive/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_derive"
-version = "0.36.1"
+version = "0.36.2"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.36.1 → pyrefly-0.36.2}/crates/pyrefly_python/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_python"
-version = "0.36.1"
+version = "0.36.2"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.36.1 → pyrefly-0.36.2}/crates/pyrefly_python/src/ast.rs

@@ -16,6 +16,7 @@ use ruff_python_ast::Expr;
 use ruff_python_ast::ExprBooleanLiteral;
 use ruff_python_ast::ExprName;
 use ruff_python_ast::ExprNoneLiteral;
+use ruff_python_ast::ExprStringLiteral;
 use ruff_python_ast::Identifier;
 use ruff_python_ast::ModModule;
 use ruff_python_ast::Parameter;
@@ -30,6 +31,8 @@ use ruff_python_ast::Stmt;
 use ruff_python_ast::StmtIf;
 use ruff_python_ast::StringFlags;
 use ruff_python_ast::StringLiteral;
+use ruff_python_ast::StringLiteralFlags;
+use ruff_python_ast::StringLiteralValue;
 use ruff_python_ast::visitor::source_order::SourceOrderVisitor;
 use ruff_python_ast::visitor::source_order::TraversalSignal;
 use ruff_python_parser::ParseError;
@@ -309,4 +312,17 @@ impl Ast {
         covering_nodes.reverse();
         covering_nodes
     }
+
+    pub fn str_expr(s: &str, range: TextRange) -> Expr {
+        Expr::StringLiteral(ExprStringLiteral {
+            node_index: AtomicNodeIndex::dummy(),
+            range,
+            value: StringLiteralValue::single(StringLiteral {
+                node_index: AtomicNodeIndex::dummy(),
+                range,
+                value: s.into(),
+                flags: StringLiteralFlags::empty(),
+            }),
+        })
+    }
 }

{pyrefly-0.36.1 → pyrefly-0.36.2}/crates/pyrefly_python/src/module_name.rs

@@ -164,6 +164,14 @@ impl ModuleName {
         Self::from_str("django.db.models.base")
     }
 
+    pub fn django_models_fields() -> Self {
+        Self::from_str("django.db.models.fields")
+    }
+
+    pub fn django_utils_functional() -> Self {
+        Self::from_str("django.utils.functional")
+    }
+
     /// The "unknown" module name, which corresponds to `__unknown__`.
     /// Used for files directly opened or passed on the command line which aren't on the search path.
     pub fn unknown() -> Self {

{pyrefly-0.36.1 → pyrefly-0.36.2}/crates/pyrefly_types/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_types"
-version = "0.36.1"
+version = "0.36.2"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"