pyrefly 0.39.0__tar.gz → 0.39.1__tar.gz

{pyrefly-0.39.0 → pyrefly-0.39.1}/Cargo.lock

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

{pyrefly-0.39.0 → pyrefly-0.39.1}/PKG-INFO

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

{pyrefly-0.39.0 → pyrefly-0.39.1}/crates/pyrefly_build/Cargo.toml

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

{pyrefly-0.39.0 → pyrefly-0.39.1}/crates/pyrefly_bundled/Cargo.toml

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

{pyrefly-0.39.0 → pyrefly-0.39.1}/crates/pyrefly_config/Cargo.toml

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

{pyrefly-0.39.0 → pyrefly-0.39.1}/crates/pyrefly_derive/Cargo.toml

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

{pyrefly-0.39.0 → pyrefly-0.39.1}/crates/pyrefly_python/Cargo.toml

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

{pyrefly-0.39.0 → pyrefly-0.39.1}/crates/pyrefly_python/src/module_path.rs

@@ -225,6 +225,10 @@ impl ModulePath {
         self.style() == ModuleStyle::Interface
     }
 
+    pub fn is_notebook(&self) -> bool {
+        self.as_path().extension() == Some("ipynb".as_ref())
+    }
+
     /// Attempt to match the given [`ModuleName`]'s components to this `ModulePath`,
     /// returning the directory that is the import root for the `ModuleName`, if
     /// *all* module components could be matched to directories. `ModulePath`s

{pyrefly-0.39.0 → pyrefly-0.39.1}/crates/pyrefly_types/Cargo.toml

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

{pyrefly-0.39.0 → pyrefly-0.39.1}/crates/pyrefly_util/Cargo.toml

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

{pyrefly-0.39.0 → pyrefly-0.39.1}/crates/tsp_types/Cargo.toml

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

{pyrefly-0.39.0 → pyrefly-0.39.1}/pyrefly/Cargo.toml

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

{pyrefly-0.39.0 → pyrefly-0.39.1}/pyrefly/lib/alt/call.rs

@@ -60,6 +60,14 @@ pub enum CallStyle<'a> {
     FreeForm,
 }
 
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum ConstructorKind {
+    // `MyClass`
+    BareClassName,
+    // `type[MyClass]` or `type[Self]`
+    TypeOfClass,
+}
+
 /// A thing that can be called (see as_call_target and call_infer).
 /// Note that a single "call" may invoke multiple functions under the hood,
 /// e.g., `__new__` followed by `__init__` for Class.
@@ -72,7 +80,7 @@ pub enum CallTarget {
     /// Method of a class. The `Type` is the self/cls argument.
     BoundMethod(Type, TargetWithTParams<Function>),
     /// A class object.
-    Class(ClassType),
+    Class(ClassType, ConstructorKind),
     /// A TypedDict.
     TypedDict(TypedDict),
     /// An overloaded function.
@@ -140,15 +148,21 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                     _ => None,
                 }
             }
-            Type::ClassDef(cls) => {
-                self.as_call_target_impl(Type::type_form(self.instantiate(&cls)), quantified)
-            }
+            Type::ClassDef(cls) => match self.instantiate(&cls) {
+                // `instantiate` can only return `ClassType` or `TypedDict`
+                Type::ClassType(cls) => {
+                    Some(CallTarget::Class(cls, ConstructorKind::BareClassName))
+                }
+                Type::TypedDict(typed_dict) => Some(CallTarget::TypedDict(typed_dict)),
+                _ => unreachable!(),
+            },
             Type::Type(box Type::ClassType(cls)) | Type::Type(box Type::SelfType(cls)) => {
-                Some(CallTarget::Class(cls))
-            }
-            Type::Type(box Type::Tuple(tuple)) => {
-                Some(CallTarget::Class(self.erase_tuple_type(tuple)))
+                Some(CallTarget::Class(cls, ConstructorKind::TypeOfClass))
             }
+            Type::Type(box Type::Tuple(tuple)) => Some(CallTarget::Class(
+                self.erase_tuple_type(tuple),
+                ConstructorKind::TypeOfClass,
+            )),
             Type::Type(box Type::Quantified(quantified)) => {
                 Some(CallTarget::Callable(TargetWithTParams(
                     None,
@@ -609,7 +623,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
             }
         };
         let res = match call_target {
-            CallTarget::Class(cls) => {
+            CallTarget::Class(cls, constructor_kind) => {
                 if cls.has_qname("typing", "Any") {
                     return self.error(
                         errors,
@@ -633,7 +647,9 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                     let abstract_members = self.get_abstract_members_for_class(cls.class_object());
                     let unimplemented_abstract_methods =
                         abstract_members.unimplemented_abstract_methods();
-                    if !unimplemented_abstract_methods.is_empty() {
+                    if constructor_kind == ConstructorKind::BareClassName
+                        && !unimplemented_abstract_methods.is_empty()
+                    {
                         self.error(
                             errors,
                             range,

{pyrefly-0.39.0 → pyrefly-0.39.1}/pyrefly/lib/alt/solve.rs

@@ -284,6 +284,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
             decorators,
             is_new_type,
             pydantic_config_dict,
+            django_primary_key_field: _,
         } = binding;
         let metadata = match &self.get_idx(*k).0 {
             None => ClassMetadata::recursive(),

{pyrefly-0.39.0 → pyrefly-0.39.1}/pyrefly/lib/binding/binding.rs

@@ -102,7 +102,7 @@ assert_words!(BindingAnnotation, 15);
 assert_words!(BindingClass, 23);
 assert_words!(BindingTParams, 10);
 assert_words!(BindingClassBaseType, 3);
-assert_words!(BindingClassMetadata, 8);
+assert_words!(BindingClassMetadata, 11);
 assert_bytes!(BindingClassMro, 4);
 assert_bytes!(BindingAbstractClassCheck, 4);
 assert_words!(BindingClassField, 21);
@@ -2035,6 +2035,9 @@ pub struct BindingClassMetadata {
     /// Is this a new type? True only for synthesized classes created from a `NewType` call.
     pub is_new_type: bool,
     pub pydantic_config_dict: PydanticConfigDict,
+    /// The name of the field that has primary_key=True, if any (for Django models).
+    /// Note that we calculate this field for all classes, but it is ignored unless the class is a django model.
+    pub django_primary_key_field: Option<Name>,
 }
 
 impl DisplayWith<Bindings> for BindingClassMetadata {

{pyrefly-0.39.0 → pyrefly-0.39.1}/pyrefly/lib/binding/class.rs

@@ -233,6 +233,7 @@ impl<'a> BindingsBuilder<'a> {
         );
         let field_definitions = self.scopes.finish_class_and_get_field_definitions();
 
+        let mut django_primary_key_field: Option<Name> = None;
         let mut fields = SmallMap::with_capacity(field_definitions.len());
         for (name, (definition, range)) in field_definitions.into_iter_hashed() {
             if let ClassFieldDefinition::AssignedInBody {
@@ -241,6 +242,10 @@ impl<'a> BindingsBuilder<'a> {
             } = &definition
             {
                 self.extract_pydantic_config_dict(e, &name, &mut pydantic_config_dict);
+
+                if self.extract_django_primary_key(e) {
+                    django_primary_key_field = Some(name.clone().into_key());
+                }
             }
             let (is_initialized_on_class, is_annotated) = match &definition {
                 ClassFieldDefinition::DefinedInMethod { annotation, .. } => {
@@ -342,6 +347,7 @@ impl<'a> BindingsBuilder<'a> {
                 decorators: decorators_with_ranges.clone().into_boxed_slice(),
                 is_new_type: false,
                 pydantic_config_dict,
+                django_primary_key_field,
             },
         );
         self.insert_binding_idx(
@@ -484,6 +490,7 @@ impl<'a> BindingsBuilder<'a> {
                 decorators: Box::new([]),
                 is_new_type,
                 pydantic_config_dict: PydanticConfigDict::default(),
+                django_primary_key_field: None,
             },
         );
         self.insert_binding_idx(

pyrefly-0.39.1/pyrefly/lib/binding/django.rs

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+use ruff_python_ast::Expr;
+use ruff_python_ast::name::Name;
+
+use crate::binding::bindings::BindingsBuilder;
+
+const PRIMARY_KEY: Name = Name::new_static("primary_key");
+
+impl<'a> BindingsBuilder<'a> {
+    /// Detect if a field has `primary_key=True` set. This will be used to support Django models with custom primary keys.
+    pub fn extract_django_primary_key(&self, e: &Expr) -> bool {
+        let Some(call) = e.as_call_expr() else {
+            return false;
+        };
+        for keyword in &call.arguments.keywords {
+            if let Some(arg_name) = &keyword.arg
+                && arg_name.as_str() == PRIMARY_KEY.as_str()
+                && let Expr::BooleanLiteral(bl) = &keyword.value
+            {
+                return bl.value;
+            }
+        }
+
+        false
+    }
+}

{pyrefly-0.39.0 → pyrefly-0.39.1}/pyrefly/lib/binding/expr.rs

@@ -723,7 +723,7 @@ impl<'a> BindingsBuilder<'a> {
             }
             Expr::Await(x) => {
                 self.ensure_expr(&mut x.value, usage);
-                if !self.scopes.is_in_async_def() {
+                if !self.scopes.is_in_async_def() && !self.module_info.path().is_notebook() {
                     self.error(
                         x.range(),
                         ErrorInfo::Kind(ErrorKind::InvalidSyntax),

{pyrefly-0.39.0 → pyrefly-0.39.1}/pyrefly/lib/binding/mod.rs

@@ -9,6 +9,7 @@ pub mod base_class;
 pub mod binding;
 pub mod bindings;
 pub mod class;
+pub mod django;
 pub mod expr;
 pub mod function;
 pub mod narrow;

{pyrefly-0.39.0 → pyrefly-0.39.1}/pyrefly/lib/binding/stmt.rs

@@ -1025,7 +1025,7 @@ impl<'a> BindingsBuilder<'a> {
                         FindingOrError::Finding(finding) => (true, finding.error),
                         FindingOrError::Error(error) => (false, Some(error)),
                     };
-                    let error = error.is_some_and(|e| e.kind().is_some());
+                    let error = error.is_some_and(|e| matches!(e, FindError::NotFound(..)));
                     if error {
                         self.error(
                             x.range,

{pyrefly-0.39.0 → pyrefly-0.39.1}/pyrefly/lib/error/suppress.rs

@@ -27,23 +27,21 @@ use crate::state::errors::Errors;
 /// Combines all errors that affect one line into a single entry.
 // The current format is: `# pyrefly: ignore  # error1, error2, ...`
 fn dedup_errors(errors: &[Error]) -> SmallMap<usize, String> {
-    let mut deduped_errors = SmallMap::new();
+    let mut deduped_errors: SmallMap<usize, Vec<String>> = SmallMap::new();
     for error in errors {
-        let e: &mut String = deduped_errors
-            .entry(error.display_range().start.line.to_zero_indexed() as usize)
-            .or_default();
-        let contains_error = e.contains(error.error_kind().to_name());
-        if e.is_empty() {
-            e.push_str("# pyrefly: ignore  # ");
-        } else if !contains_error {
-            e.push_str(", ");
-        }
-
-        if !contains_error {
-            e.push_str(error.error_kind().to_name());
-        }
+        let line = error.display_range().start.line.to_zero_indexed() as usize;
+        let error_name = error.error_kind().to_name().to_owned();
+        deduped_errors.entry(line).or_default().push(error_name);
+    }
+    let mut formatted_errors = SmallMap::new();
+    for (line, error_set) in deduped_errors {
+        let mut error_codes: Vec<_> = error_set.into_iter().collect();
+        error_codes.sort();
+        let error_codes_str = error_codes.join(", ");
+        let comment = format!("# pyrefly: ignore [{}]", error_codes_str);
+        formatted_errors.insert(line, comment);
     }
-    deduped_errors
+    formatted_errors
 }
 
 // TODO: In future have this return an ast as well as the string for comparison
@@ -326,18 +324,18 @@ f(x)
 
 "#,
             r#"
-# pyrefly: ignore  # bad-assignment
+# pyrefly: ignore [bad-assignment]
 x: str = 1
 
 
 def f(y: int) -> None:
     """Doc comment"""
-    # pyrefly: ignore  # unsupported-operation
+    # pyrefly: ignore [unsupported-operation]
     x = "one" + y
     return x
 
 
-# pyrefly: ignore  # bad-argument-type
+# pyrefly: ignore [bad-argument-type]
 f(x)
 
 "#,
@@ -355,7 +353,7 @@ def foo() -> int:
             r#"
 def foo() -> int:
     # comment
-    # pyrefly: ignore  # bad-return
+    # pyrefly: ignore [bad-return]
     return ""
 "#,
         );
@@ -370,7 +368,7 @@ def foo() -> int: pass
 "#,
             r#"
 # comment
-# pyrefly: ignore  # bad-return
+# pyrefly: ignore [bad-return]
 def foo() -> int: pass
 "#,
         );
@@ -389,7 +387,7 @@ x: int = foo("Hello")
 # comment
 def foo(x: int) -> str:
     return ""
-# pyrefly: ignore  # bad-assignment, bad-argument-type
+# pyrefly: ignore [bad-argument-type, bad-assignment]
 x: int = foo("Hello")
 "#,
         );
@@ -434,7 +432,7 @@ pass
     fn test_remove_suppression_above() {
         let input = r#"
 def f() -> int:
-    # pyrefly: ignore # bad-return
+    # pyrefly: ignore [bad-return]
     return 1
 "#;
         let want = r#"
@@ -449,7 +447,7 @@ def f() -> int:
     fn test_remove_suppression_above_two() {
         let input = r#"
 def g() -> str:
-    # pyrefly: ignore # bad-return
+    # pyrefly: ignore [bad-return]
     return "hello"
 "#;
         let want = r#"
@@ -464,7 +462,7 @@ def g() -> str:
     fn test_remove_suppression_inline() {
         let input = r#"
 def g() -> str:
-    return "hello" # pyrefly: ignore # bad-return
+    return "hello" # pyrefly: ignore [bad-return]
 "#;
         let want = r#"
 def g() -> str:
@@ -477,7 +475,7 @@ def g() -> str:
     fn test_remove_suppression_multiple() {
         let input = r#"
 def g() -> str:
-    return "hello" # pyrefly: ignore # bad-return
+    return "hello" # pyrefly: ignore [bad-return]
 def f() -> int:
     # pyrefly: ignore
     return 1
@@ -507,7 +505,7 @@ def f() -> int:
             r#"
 {GENERATED_TOKEN}
 def g() -> str:
-    return "hello" # pyrefly: ignore # bad-return
+    return "hello" # pyrefly: ignore [bad-return]
 def f() -> int:
     # pyrefly: ignore
     return 1
@@ -520,7 +518,7 @@ def f() -> int:
     fn test_no_remove_suppression() {
         let input = r#"
 def g() -> int:
-    return "hello" # pyrefly: ignore # bad-return
+    return "hello" # pyrefly: ignore [bad-return]
 "#;
         assert_remove_ignores(input, input, false, 0);
     }
@@ -528,7 +526,7 @@ def g() -> int:
     fn test_remove_generic_suppression() {
         let before = r#"
 def g() -> str:
-    return "hello" # type: ignore # bad-return
+    return "hello" # type: ignore [bad-return]
 "#;
         let after = r#"
 def g() -> str:
@@ -556,7 +554,7 @@ x: str = 1
 
 "#,
             r#"
-x: str = 1 # pyrefly: ignore  # bad-assignment
+x: str = 1 # pyrefly: ignore [bad-assignment]
 
 "#,
         );