pyrefly 0.31.1__tar.gz → 0.32.0__tar.gz

{pyrefly-0.31.1 → pyrefly-0.32.0}/Cargo.lock

@@ -299,7 +299,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
 dependencies = [
  "memchr",
- "regex-automata 0.4.9",
+ "regex-automata",
  "serde",
 ]
 
@@ -1050,7 +1050,7 @@ dependencies = [
  "aho-corasick",
  "bstr",
  "log",
- "regex-automata 0.4.9",
+ "regex-automata",
  "regex-syntax 0.8.5",
 ]
 
@@ -1288,7 +1288,7 @@ dependencies = [
  "globset",
  "log",
  "memchr",
- "regex-automata 0.4.9",
+ "regex-automata",
  "same-file",
  "walkdir",
  "winapi-util",
@@ -1619,11 +1619,11 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
 [[package]]
 name = "matchers"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
 dependencies = [
- "regex-automata 0.1.9",
+ "regex-automata",
 ]
 
 [[package]]
@@ -1713,12 +1713,11 @@ dependencies = [
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.46.0"
+version = "0.50.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
 dependencies = [
- "overload",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1795,12 +1794,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "parking_lot"
 version = "0.11.2"
@@ -2064,7 +2057,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly"
-version = "0.31.1"
+version = "0.32.0"
 dependencies = [
  "anstream",
  "anyhow",
@@ -2113,7 +2106,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_build"
-version = "0.31.1"
+version = "0.32.0"
 dependencies = [
  "anyhow",
  "dupe",
@@ -2129,7 +2122,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_bundled"
-version = "0.31.1"
+version = "0.32.0"
 dependencies = [
  "anyhow",
  "starlark_map",
@@ -2139,7 +2132,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_config"
-version = "0.31.1"
+version = "0.32.0"
 dependencies = [
  "anyhow",
  "clap",
@@ -2173,7 +2166,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_derive"
-version = "0.31.1"
+version = "0.32.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2182,7 +2175,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_python"
-version = "0.31.1"
+version = "0.32.0"
 dependencies = [
  "anyhow",
  "dupe",
@@ -2205,7 +2198,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_types"
-version = "0.31.1"
+version = "0.32.0"
 dependencies = [
  "compact_str 0.8.0",
  "dupe",
@@ -2225,7 +2218,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_util"
-version = "0.31.1"
+version = "0.32.0"
 dependencies = [
  "anstream",
  "anyhow",
@@ -2410,20 +2403,10 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.9",
+ "regex-automata",
  "regex-syntax 0.8.5",
 ]
 
-[[package]]
-name = "regex-automata"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
-dependencies = [
- "byteorder",
- "regex-syntax 0.6.27",
-]
-
 [[package]]
 name = "regex-automata"
 version = "0.4.9"
@@ -2435,12 +2418,6 @@ dependencies = [
  "regex-syntax 0.8.5",
 ]
 
-[[package]]
-name = "regex-syntax"
-version = "0.6.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
-
 [[package]]
 name = "regex-syntax"
 version = "0.7.5"
@@ -3237,16 +3214,16 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
 dependencies = [
  "chrono",
  "matchers",
  "nu-ansi-term",
  "once_cell",
  "parking_lot 0.12.3",
- "regex",
+ "regex-automata",
  "serde",
  "serde_json",
  "sharded-slab",

{pyrefly-0.31.1 → pyrefly-0.32.0}/PKG-INFO

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

{pyrefly-0.31.1 → pyrefly-0.32.0}/crates/pyrefly_build/Cargo.toml

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

{pyrefly-0.31.1 → pyrefly-0.32.0}/crates/pyrefly_bundled/Cargo.toml

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

{pyrefly-0.31.1 → pyrefly-0.32.0}/crates/pyrefly_config/Cargo.toml

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

{pyrefly-0.31.1 → pyrefly-0.32.0}/crates/pyrefly_derive/Cargo.toml

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

{pyrefly-0.31.1 → pyrefly-0.32.0}/crates/pyrefly_python/Cargo.toml

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

{pyrefly-0.31.1 → pyrefly-0.32.0}/crates/pyrefly_types/Cargo.toml

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

{pyrefly-0.31.1 → pyrefly-0.32.0}/crates/pyrefly_util/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_util"
-version = "0.31.1"
+version = "0.32.0"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"
@@ -36,7 +36,7 @@ serde = { version = "1.0.219", features = ["derive", "rc"] }
 serde_json = { version = "1.0.140", features = ["alloc", "float_roundtrip", "raw_value", "unbounded_depth"] }
 starlark_map = "0.13.0"
 tracing = { version = "0.1.41", features = ["attributes", "valuable"] }
-tracing-subscriber = { version = "0.3.19", features = ["chrono", "env-filter", "json", "local-time", "parking_lot", "registry"] }
+tracing-subscriber = { version = "0.3.20", features = ["chrono", "env-filter", "json", "local-time", "parking_lot", "registry"] }
 vec1 = { version = "1", features = ["serde"] }
 yansi = { version = "1.0.0-rc.1", features = ["hyperlink"] }
 

{pyrefly-0.31.1 → pyrefly-0.32.0}/pyrefly/Cargo.toml

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

{pyrefly-0.31.1 → pyrefly-0.32.0}/pyrefly/lib/alt/class/class_field.rs

@@ -2276,12 +2276,27 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 *should_narrow = false;
             }
             ClassAttribute::ReadOnly(_, reason) => {
-                let msg = vec1![
-                    format!("Cannot set field `{attr_name}`"),
-                    reason.error_message()
-                ];
-                errors.add(range, ErrorInfo::Kind(ErrorKind::ReadOnly), msg);
-                *should_narrow = false;
+                // In pydantic, if a non-frozen model inherits from a frozen model,
+                // attributes of the frozen model are no longer readonly.
+                let should_raise_error = if let Some(instance_class) = instance_class {
+                    let class = instance_class.class_object();
+                    let metadata = self.get_metadata_for_class(class);
+                    !(metadata.is_pydantic_base_model()
+                        && metadata
+                            .dataclass_metadata()
+                            .is_some_and(|dm| !dm.kws.frozen))
+                } else {
+                    true
+                };
+
+                if should_raise_error {
+                    let msg = vec1![
+                        format!("Cannot set field `{attr_name}`"),
+                        reason.error_message()
+                    ];
+                    errors.add(range, ErrorInfo::Kind(ErrorKind::ReadOnly), msg);
+                    *should_narrow = false;
+                }
             }
             ClassAttribute::ReadWrite(attr_ty) => {
                 // If the attribute has a converter, then `want` should be the type expected by the converter.

{pyrefly-0.31.1 → pyrefly-0.32.0}/pyrefly/lib/alt/class/class_metadata.rs

@@ -47,6 +47,7 @@ use crate::binding::base_class::BaseClassGenericKind;
 use crate::binding::binding::Key;
 use crate::binding::pydantic::FROZEN_DEFAULT;
 use crate::binding::pydantic::PydanticMetadataBinding;
+use crate::binding::pydantic::VALIDATE_BY_NAME;
 use crate::binding::pydantic::VALIDATION_ALIAS;
 use crate::config::error_kind::ErrorKind;
 use crate::error::collector::ErrorCollector;
@@ -446,18 +447,28 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
             PydanticModelKind::BaseModel
         };
 
+        let PydanticMetadataBinding {
+            frozen,
+            extra,
+            validate_by_name,
+        } = pydantic_metadata_binding;
+
+        // TODO: support ConfigDict validate_by_alias.
+        // Note: class keywords take precedence over ConfigDict keywords.
+        // But another design choice is to error if there is a conflict. We can consider this design for v2.
         // Extract validate_by_alias & validate_by_name
         let class_validate_by_alias = keywords
             .iter()
             .find(|(name, _)| name.as_str() == "validate_by_alias")
             .is_none_or(|(_, ann)| ann.get_type().as_bool().unwrap_or(true));
 
+        // TODO Zeina: Rename this variable to just validate_by_name
         let class_validate_by_name = keywords
             .iter()
-            .find(|(name, _)| name.as_str() == "validate_by_name")
-            .is_some_and(|(_, ann)| ann.get_type().as_bool().unwrap_or(false));
-
-        let PydanticMetadataBinding { frozen, extra } = pydantic_metadata_binding;
+            .find(|(name, _)| name == &VALIDATE_BY_NAME)
+            .map_or(*validate_by_name, |(_, ann)| {
+                ann.get_type().as_bool().unwrap_or(*validate_by_name)
+            });
 
         // Here, "ignore" and "allow" translate to true, while "forbid" translates to false.
         // With no keyword, the default is "true" and I default to "false" on a wrong keyword.

{pyrefly-0.31.1 → pyrefly-0.32.0}/pyrefly/lib/binding/class.rs

@@ -129,6 +129,7 @@ impl<'a> BindingsBuilder<'a> {
         let (mut class_object, class_indices) = self.class_object_and_indices(&x.name);
         let mut pydantic_frozen = None;
         let mut pydantic_config_dict_extra = None;
+        let mut pydantic_validate_by_name = false;
         let docstring_range = Docstring::range_from_stmts(x.body.as_slice());
         let body = mem::take(&mut x.body);
         let decorators_with_ranges = self.ensure_and_bind_decorators_with_ranges(
@@ -263,6 +264,7 @@ impl<'a> BindingsBuilder<'a> {
                                     name,
                                     &mut pydantic_frozen,
                                     &mut pydantic_config_dict_extra,
+                                    &mut pydantic_validate_by_name,
                                 );
                                 (
                                     ClassFieldDefinition::AssignedInBody {
@@ -404,8 +406,11 @@ impl<'a> BindingsBuilder<'a> {
                 keywords: keywords.into_boxed_slice(),
                 decorators: decorators_with_ranges.clone().into_boxed_slice(),
                 is_new_type: false,
-                pydantic_metadata: self
-                    .make_pydantic_metadata(pydantic_frozen, pydantic_config_dict_extra),
+                pydantic_metadata: self.make_pydantic_metadata(
+                    pydantic_frozen,
+                    pydantic_config_dict_extra,
+                    pydantic_validate_by_name,
+                ),
             },
         );
     }

{pyrefly-0.31.1 → pyrefly-0.32.0}/pyrefly/lib/binding/function.rs

@@ -327,17 +327,14 @@ impl<'a> BindingsBuilder<'a> {
     }
 
     /// Handles both checking yield / return expressions and binding the return type.
-    ///
-    /// The `implicit_return_if_inferring_return_type` argument should be None when
-    /// return type inference is disabled; it must be `Some(implicit_return_key)` to
-    /// get return type inference.
     fn analyze_return_type(
         &mut self,
         func_name: &Identifier,
         is_async: bool,
         yields_and_returns: YieldsAndReturns,
         return_ann_with_range: Option<(TextRange, Idx<KeyAnnotation>)>,
-        implicit_return_if_inferring_return_type: Option<Idx<Key>>,
+        implicit_return: Option<Idx<Key>>,
+        should_infer_return_type: bool,
         stub_or_impl: FunctionStubOrImpl,
         decorators: Box<[(Idx<Key>, TextRange)]>,
     ) {
@@ -377,10 +374,7 @@ impl<'a> BindingsBuilder<'a> {
             .into_boxed_slice();
 
         let return_type_binding = {
-            let kind = match (
-                return_ann_with_range,
-                implicit_return_if_inferring_return_type,
-            ) {
+            let kind = match (return_ann_with_range, implicit_return) {
                 (Some((range, annotation)), Some(implicit_return)) => {
                     // We have an explicit return annotation and we want to validate it.
                     ReturnTypeKind::ShouldValidateAnnotation {
@@ -400,7 +394,7 @@ impl<'a> BindingsBuilder<'a> {
                         is_generator: !(yield_keys.is_empty() && yield_from_keys.is_empty()),
                     }
                 }
-                (None, Some(implicit_return)) => {
+                (None, Some(implicit_return)) if should_infer_return_type => {
                     // We don't have an explicit return annotation, but we want to infer it.
                     ReturnTypeKind::ShouldInferType {
                         returns: return_keys,
@@ -409,8 +403,9 @@ impl<'a> BindingsBuilder<'a> {
                         yield_froms: yield_from_keys,
                     }
                 }
-                (None, None) => {
-                    // We don't have an explicit return annotation, and we want to just treat it as returning `Any`.
+                (None, _) => {
+                    // We don't have an explicit return annotation, or we don't want to infer return type.
+                    // Just treat the return type as `Any`.
                     ReturnTypeKind::ShouldReturnAny {
                         is_generator: !(yield_keys.is_empty() && yield_from_keys.is_empty()),
                     }
@@ -494,8 +489,7 @@ impl<'a> BindingsBuilder<'a> {
             )
         } else {
             match self.untyped_def_behavior {
-                UntypedDefBehavior::SkipAndInferReturnAny
-                | UntypedDefBehavior::CheckAndInferReturnAny => {
+                UntypedDefBehavior::SkipAndInferReturnAny => {
                     let (yields_and_returns, self_assignments) = self.function_body_scope(
                         parameters,
                         body,
@@ -510,7 +504,31 @@ impl<'a> BindingsBuilder<'a> {
                         is_async,
                         yields_and_returns,
                         return_ann_with_range,
-                        None, // this disables return type inference
+                        None,
+                        false, // this disables return type inference
+                        stub_or_impl,
+                        decorators.decorators.clone(),
+                    );
+                    self_assignments
+                }
+                UntypedDefBehavior::CheckAndInferReturnAny => {
+                    let implicit_return = self.implicit_return(&body, func_name);
+                    let (yields_and_returns, self_assignments) = self.function_body_scope(
+                        parameters,
+                        body,
+                        range,
+                        func_name,
+                        undecorated_idx,
+                        class_key,
+                        is_async,
+                    );
+                    self.analyze_return_type(
+                        func_name,
+                        is_async,
+                        yields_and_returns,
+                        return_ann_with_range,
+                        Some(implicit_return),
+                        false, // this disables return type inference
                         stub_or_impl,
                         decorators.decorators.clone(),
                     );
@@ -533,6 +551,7 @@ impl<'a> BindingsBuilder<'a> {
                         yields_and_returns,
                         return_ann_with_range,
                         Some(implicit_return),
+                        true,
                         stub_or_impl,
                         decorators.decorators.clone(),
                     );

{pyrefly-0.31.1 → pyrefly-0.32.0}/pyrefly/lib/binding/pydantic.rs

@@ -15,6 +15,7 @@ use crate::export::special::SpecialExport;
 // special pydantic constants
 pub const FROZEN_DEFAULT: bool = false;
 pub const VALIDATION_ALIAS: Name = Name::new_static("validation_alias");
+pub const VALIDATE_BY_NAME: Name = Name::new_static("validate_by_name");
 pub const GT: Name = Name::new_static("gt");
 pub const LT: Name = Name::new_static("lt");
 pub const ROOT: Name = Name::new_static("root");
@@ -31,6 +32,7 @@ const EXTRA: Name = Name::new_static("extra");
 pub struct PydanticMetadataBinding {
     pub frozen: Option<bool>,
     pub extra: Option<bool>,
+    pub validate_by_name: bool,
 }
 
 impl<'a> BindingsBuilder<'a> {
@@ -43,6 +45,7 @@ impl<'a> BindingsBuilder<'a> {
         name: Hashed<&Name>,
         pydantic_frozen: &mut Option<bool>,
         pydantic_extra: &mut Option<bool>,
+        pydantic_validate_by_name: &mut bool,
     ) {
         if name.as_str() == "model_config"
             && let Some(call) = e.as_call_expr()
@@ -76,6 +79,13 @@ impl<'a> BindingsBuilder<'a> {
                         None => None,
                     };
                 }
+
+                if let Some(arg_name) = &kw.arg
+                    && arg_name.id == VALIDATE_BY_NAME
+                    && let Expr::BooleanLiteral(bl) = &kw.value
+                {
+                    *pydantic_validate_by_name = bl.value;
+                }
             }
         }
     }
@@ -84,7 +94,12 @@ impl<'a> BindingsBuilder<'a> {
         &self,
         frozen: Option<bool>,
         extra: Option<bool>,
+        validate_by_name: bool,
     ) -> PydanticMetadataBinding {
-        PydanticMetadataBinding { frozen, extra }
+        PydanticMetadataBinding {
+            frozen,
+            extra,
+            validate_by_name,
+        }
     }
 }

{pyrefly-0.31.1 → pyrefly-0.32.0}/pyrefly/lib/test/pydantic/aliases.rs

@@ -115,7 +115,7 @@ from pydantic import BaseModel, Field, ConfigDict
 class Model(BaseModel):
     x: str = Field(..., alias="y")
     model_config = ConfigDict(validate_by_name=True)
-Model(y="y")
-Model(x="y")  # E: Missing argument `y`
+Model(y="123")
+Model(x="123")  
     "#,
 );

{pyrefly-0.31.1 → pyrefly-0.32.0}/pyrefly/lib/test/pydantic/config.rs

@@ -112,7 +112,6 @@ m.x = 10
 );
 
 testcase!(
-    bug = "Non-frozen model should override the existing field readonlyness",
     test_frozen_model_subclass,
     pydantic_env(),
     r#"
@@ -126,7 +125,7 @@ class Model2(Model):
     model_config = ConfigDict(frozen=False)
 
 m = Model2()
-m.x = 10 # E: Cannot set field `x`
+m.x = 10
 "#,
 );
 

{pyrefly-0.31.1 → pyrefly-0.32.0}/pyrefly/lib/test/untyped_def_behaviors.rs

@@ -131,6 +131,9 @@ from typing import assert_type, Any, Callable, Coroutine, Generator, AsyncGenera
 def simple_return() -> int:
     return "oops"  # E: Returned type `Literal['oops']` is not assignable to declared return type `int`
 
+def simple_implicit_return() -> int:  # E: missing an explicit `return`
+    pass
+
 def generator_with_return() -> Generator[int, Any, str]:
     # TODO(stroxler): this yield error message needs some wordsmithing!
     yield "oops"  # E: Type of yielded value `Literal['oops']` is not assignable to declared return type `int`