Fix Rust 1.82 compilation errors by upgrading PyO3 from 0.18 to 0.20

codegen-server/python/src/main/kotlin/software/amazon/smithy/rust/codegen/server/python/smithy/PythonServerCargoDependency.kt

@@ -15,9 +15,9 @@ import software.amazon.smithy.rust.codegen.core.smithy.RuntimeConfig
  * For a dependency that is used in the client, or in both the client and the server, use [CargoDependency] directly.
  */
 object PythonServerCargoDependency {
-    val PyO3: CargoDependency = CargoDependency("pyo3", CratesIo("0.18"))
+    val PyO3: CargoDependency = CargoDependency("pyo3", CratesIo("0.20"))
     val PyO3Asyncio: CargoDependency =
-        CargoDependency("pyo3-asyncio", CratesIo("0.18"), features = setOf("attributes", "tokio-runtime"))
+        CargoDependency("pyo3-asyncio", CratesIo("0.20"), features = setOf("attributes", "tokio-runtime"))
     val Tokio: CargoDependency = CargoDependency("tokio", CratesIo("1.20.1"), features = setOf("full"))
     val TokioStream: CargoDependency = CargoDependency("tokio-stream", CratesIo("0.1.12"))
     val Tracing: CargoDependency = CargoDependency("tracing", CratesIo("0.1"))

codegen-server/python/src/main/kotlin/software/amazon/smithy/rust/codegen/server/python/smithy/generators/PythonServerModuleGenerator.kt

@@ -41,7 +41,7 @@ class PythonServerModuleGenerator(
             rustBlockTemplate(
                 """
                 ##[#{pyo3}::pymodule]
-                ##[#{pyo3}(name = "$libName")]
+                ##[pyo3(name = "$libName")]
                 pub fn python_library(py: #{pyo3}::Python<'_>, m: &#{pyo3}::types::PyModule) -> #{pyo3}::PyResult<()>
                 """,
                 *codegenScope,

codegen-server/python/src/main/kotlin/software/amazon/smithy/rust/codegen/server/python/smithy/generators/PythonServerStructureGenerator.kt

@@ -19,6 +19,7 @@ import software.amazon.smithy.rust.codegen.core.rustlang.rustInlineTemplate
 import software.amazon.smithy.rust.codegen.core.rustlang.rustTemplate
 import software.amazon.smithy.rust.codegen.core.rustlang.writable
 import software.amazon.smithy.rust.codegen.core.smithy.generators.StructureGenerator
+import software.amazon.smithy.rust.codegen.core.smithy.isOptional
 import software.amazon.smithy.rust.codegen.core.smithy.rustType
 import software.amazon.smithy.rust.codegen.core.util.hasTrait
 import software.amazon.smithy.rust.codegen.core.util.isEventStream
@@ -125,24 +126,32 @@ class PythonServerStructureGenerator(
         )
     }
 
+    // Python function parameters require that all required parameters appear before optional ones.
+    // This function sorts the member fields to ensure required fields precede optional fields.
+    private fun sortedMembers() =
+        members.sortedBy { member ->
+            val memberSymbol = symbolProvider.toSymbol(member)
+            memberSymbol.isOptional()
+        }
+
     private fun renderStructSignatureMembers(): Writable =
         writable {
-            forEachMember(members) { _, memberName, memberSymbol ->
+            forEachMember(sortedMembers()) { _, memberName, memberSymbol ->
                 val memberType = memberSymbol.rustType()
                 rust("$memberName: ${memberType.render()},")
             }
         }
 
     private fun renderStructBodyMembers(): Writable =
         writable {
-            forEachMember(members) { _, memberName, _ ->
+            forEachMember(sortedMembers()) { _, memberName, _ ->
                 rust("$memberName,")
             }
         }
 
     private fun renderConstructorSignature(): Writable =
         writable {
-            forEachMember(members) { member, memberName, memberSymbol ->
+            forEachMember(sortedMembers()) { member, memberName, memberSymbol ->
                 val memberType = memberPythonType(member, memberSymbol)
                 rust("/// :param $memberName ${memberType.renderAsDocstring()}:")
             }

codegen-server/python/src/test/kotlin/software/amazon/smithy/rust/codegen/server/python/smithy/generators/PythonServerRequiredPrecedeOptionalTest.kt

@@ -0,0 +1,226 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package software.amazon.smithy.rust.codegen.server.python.smithy.generators
+
+import org.junit.jupiter.api.Test
+import software.amazon.smithy.rust.codegen.core.rustlang.RustWriter
+import software.amazon.smithy.rust.codegen.core.rustlang.rust
+import software.amazon.smithy.rust.codegen.core.rustlang.rustTemplate
+import software.amazon.smithy.rust.codegen.core.rustlang.writable
+import software.amazon.smithy.rust.codegen.core.testutil.asSmithyModel
+import software.amazon.smithy.rust.codegen.core.testutil.unitTest
+import software.amazon.smithy.rust.codegen.server.python.smithy.PythonServerCargoDependency
+import software.amazon.smithy.rust.codegen.server.python.smithy.testutil.cargoTest
+import software.amazon.smithy.rust.codegen.server.python.smithy.testutil.executePythonServerCodegenVisitor
+import software.amazon.smithy.rust.codegen.server.python.smithy.testutil.generatePythonServerPluginContext
+import kotlin.io.path.appendText
+
+internal class PythonServerRequiredPrecedeOptionalTest {
+    @Test
+    fun `mandatory fields are reordered to be before optional`() {
+        val model =
+            """
+            namespace test
+
+            use aws.protocols#restJson1
+            use smithy.framework#ValidationException
+
+            @restJson1
+            service SampleService {
+                operations: [
+                    OpWithIncorrectOrder, OpWithCorrectOrder, OpWithDefaults
+                ],
+            }
+
+            @http(method: "POST", uri: "/opIncorrect")
+            operation OpWithIncorrectOrder {
+                input:= {
+                    a: String
+                    @required
+                    b: String
+                    c: String
+                    @required
+                    d: String
+                }
+                output:= {
+                    a: String
+                    @required
+                    b: String
+                    c: String
+                    @required
+                    d: String
+                }
+                errors: [ValidationException]
+            }
+
+            @http(method: "POST", uri: "/opCorrect")
+            operation OpWithCorrectOrder {
+                input:= {
+                    @required
+                    b: String
+                    @required
+                    d: String
+                    a: String
+                    c: String
+                }
+                output:= {
+                    @required
+                    b: String
+                    @required
+                    d: String
+                    a: String
+                    c: String
+                }
+                errors: [ValidationException]
+            }
+
+            @http(method: "POST", uri: "/opWithDefaults")
+            operation OpWithDefaults {
+                input:= {
+                    a: String,
+                    b: String = "hi"
+                }
+                output:= {
+                    a: String,
+                    b: String = "hi"
+                }
+            }
+            """.asSmithyModel(smithyVersion = "2")
+
+        val (pluginCtx, testDir) = generatePythonServerPluginContext(model)
+        executePythonServerCodegenVisitor(pluginCtx)
+
+        val writer = RustWriter.forModule("service")
+        writer.unitTest("test_required_fields") {
+            fun createInstanceWithRequiredFieldsOnly(
+                module: String,
+                typeName: String,
+            ) = writable {
+                rustTemplate(
+                    """
+                    py.run(
+                        "data = $typeName(\"b\", \"d\")",
+                        Some(globals),
+                        Some(locals),
+                    ).unwrap();
+
+                    // Python should have been able to construct input.
+                    let data = locals
+                        .get_item("data")
+                        .expect("Python exception occurred during dictionary lookup")
+                        .unwrap()
+                        .extract::<$module::$typeName>()
+                        .unwrap();
+                    assert_eq!(data.b, "b");
+                    assert_eq!(data.d, "d");
+                    """,
+                )
+            }
+
+            fun createInstance(
+                module: String,
+                typeName: String,
+            ) = writable {
+                rustTemplate(
+                    """
+                    py.run(
+                        "data = $typeName(\"b\", \"d\", a = \"a\", c = \"c\")",
+                        Some(globals),
+                        Some(locals),
+                    ).unwrap();
+
+                    // Python should have been able to construct input.
+                    let data = locals
+                        .get_item("data")
+                        .expect("Python exception occurred during dictionary lookup")
+                        .unwrap()
+                        .extract::<$module::$typeName>()
+                        .unwrap();
+                    assert_eq!(data.b, "b");
+                    assert_eq!(data.d, "d");
+                    assert_eq!(data.a, Some("a".to_string()));
+                    assert_eq!(data.c, Some("c".to_string()));
+                    """,
+                )
+            }
+
+            fun createDefaultInstance(
+                module: String,
+                typeName: String,
+            ) = writable {
+                rustTemplate(
+                    """
+                    // Default values are not exported from Rust. However, they
+                    // are marked as non-optional.
+                    py.run(
+                        "data = $typeName(\"b\", \"a\")",
+                        Some(globals),
+                        Some(locals),
+                    ).unwrap();
+
+                    // Python should have been able to construct input.
+                    let data = locals
+                        .get_item("data")
+                        .expect("Python exception occurred during dictionary lookup")
+                        .unwrap()
+                        .extract::<$module::$typeName>()
+                        .unwrap();
+                    assert_eq!(data.a, Some("a".to_string()));
+                    assert_eq!(data.b, "b");
+                    """,
+                )
+            }
+
+            rustTemplate(
+                """
+                use crate::{input, output};
+                use #{pyo3}::{types::IntoPyDict, Python};
+
+                pyo3::prepare_freethreaded_python();
+                Python::with_gil(|py| {
+                    let globals = [
+                        ("OpWithIncorrectOrderInput", py.get_type::<input::OpWithIncorrectOrderInput>()),
+                        ("OpWithCorrectOrderInput", py.get_type::<input::OpWithCorrectOrderInput>()),
+                        ("OpWithDefaultsInput", py.get_type::<input::OpWithDefaultsInput>()),
+                        ("OpWithIncorrectOrderOutput", py.get_type::<output::OpWithIncorrectOrderOutput>()),
+                        ("OpWithCorrectOrderOutput", py.get_type::<output::OpWithCorrectOrderOutput>()),
+                        ("OpWithDefaultsOutput", py.get_type::<output::OpWithDefaultsOutput>())
+                        ]
+                        .into_py_dict(py);
+
+                    let locals = [("OpWithIncorrectOrderInput", py.get_type::<input::OpWithIncorrectOrderInput>())].into_py_dict(py);
+
+                    #{IncorrectOrderInputRequiredOnly}
+                    #{CorrectOrderInputRequiredOnly}
+                    #{IncorrectOrderOutputRequiredOnly}
+                    #{CorrectOrderOutputRequiredOnly}
+                    #{IncorrectOrderInput}
+                    #{CorrectOrderInput}
+                    #{IncorrectOrderOutput}
+                    #{CorrectOrderOutput}
+                    #{DefaultsInput}
+                    #{DefaultsOutput}
+                });
+                """,
+                "pyo3" to PythonServerCargoDependency.PyO3.toDevDependency().toType(),
+                "IncorrectOrderInputRequiredOnly" to createInstanceWithRequiredFieldsOnly("input", "OpWithIncorrectOrderInput"),
+                "CorrectOrderInputRequiredOnly" to createInstanceWithRequiredFieldsOnly("input", "OpWithCorrectOrderInput"),
+                "IncorrectOrderOutputRequiredOnly" to createInstanceWithRequiredFieldsOnly("output", "OpWithIncorrectOrderOutput"),
+                "CorrectOrderOutputRequiredOnly" to createInstanceWithRequiredFieldsOnly("output", "OpWithCorrectOrderOutput"),
+                "IncorrectOrderInput" to createInstance("input", "OpWithIncorrectOrderInput"),
+                "CorrectOrderInput" to createInstance("input", "OpWithCorrectOrderInput"),
+                "IncorrectOrderOutput" to createInstance("output", "OpWithIncorrectOrderOutput"),
+                "CorrectOrderOutput" to createInstance("output", "OpWithCorrectOrderOutput"),
+                "DefaultsInput" to createDefaultInstance("input", "OpWithDefaultsInput"),
+                "DefaultsOutput" to createDefaultInstance("output", "OpWithDefaultsOutput"),
+            )
+        }
+
+        testDir.resolve("src/service.rs").appendText(writer.toString())
+
+        cargoTest(testDir)
+    }
+}

codegen-server/python/src/test/kotlin/software/amazon/smithy/rust/codegen/server/python/smithy/generators/PythonServerTypesTest.kt

@@ -119,6 +119,7 @@ internal class PythonServerTypesTest {
 
                                 locals
                                     .get_item("output")
+                                    .expect("Python exception occurred during dictionary lookup")
                                     .unwrap()
                                     .extract::<output::EchoOutput>()
                                     .unwrap()
@@ -212,6 +213,7 @@ internal class PythonServerTypesTest {
 
                             locals
                                 .get_item("output")
+                                .expect("Python exception occurred during dictionary lookup")
                                 .unwrap()
                                 .extract::<output::EchoOutput>()
                                 .unwrap()

rust-runtime/aws-smithy-http-server-python/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aws-smithy-http-server-python"
-version = "0.65.1"
+version = "0.66.0"
 authors = ["Smithy Rust Server <smithy-rs-server@amazon.com>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -29,8 +29,8 @@ lambda_http = { version = "0.8.3" }
 num_cpus = "1.13.1"
 parking_lot = "0.12.1"
 pin-project-lite = "0.2.14"
-pyo3 = "0.18.2"
-pyo3-asyncio = { version = "0.18.0", features = ["tokio-runtime"] }
+pyo3 = "0.20"
+pyo3-asyncio = { version = "0.20.0", features = ["tokio-runtime"] }
 signal-hook = { version = "0.3.14", features = ["extended-siginfo"] }
 socket2 = { version = "0.5.5", features = ["all"] }
 thiserror = "2"
@@ -46,7 +46,7 @@ pretty_assertions = "1"
 futures-util = { version = "0.3.29", default-features = false }
 tower-test = "0.4"
 tokio-test = "0.4"
-pyo3-asyncio = { version = "0.18.0", features = ["testing", "attributes", "tokio-runtime", "unstable-streams"] }
+pyo3-asyncio = { version = "0.20.0", features = ["testing", "attributes", "tokio-runtime", "unstable-streams"] }
 rcgen = "0.10.0"
 hyper-rustls = { version = "0.24", features = ["http2"] }
 

rust-runtime/aws-smithy-http-server-python/src/context/layer.rs

@@ -107,8 +107,16 @@ counter = ctx.counter
                     .unwrap();
 
                     (
-                        locals.get_item("req_id").unwrap().to_string(),
-                        locals.get_item("counter").unwrap().to_string(),
+                        locals
+                            .get_item("req_id")
+                            .expect("Python exception occurred during dictionary lookup")
+                            .unwrap()
+                            .to_string(),
+                        locals
+                            .get_item("counter")
+                            .expect("Python exception occurred during dictionary lookup")
+                            .unwrap()
+                            .to_string(),
                     )
                 });
                 Ok::<_, Infallible>(Response::new((req_id, counter)))

rust-runtime/aws-smithy-http-server-python/src/context/testing.rs

@@ -25,6 +25,7 @@ pub fn get_context(code: &str) -> PyContext {
         py.run(code, Some(globals), Some(locals))?;
         let context = locals
             .get_item("ctx")
+            .expect("Python exception occurred during dictionary lookup")
             .expect("you should assing your context class to `ctx` variable")
             .into_py(py);
         Ok::<_, PyErr>(context)

rust-runtime/aws-smithy-http-server-python/src/error.rs

@@ -44,7 +44,6 @@ impl From<PyError> for PyErr {
 /// :param status_code typing.Optional\[int\]:
 /// :rtype None:
 #[pyclass(name = "MiddlewareException", extends = BasePyException)]
-#[pyo3(text_signature = "($self, message, status_code=None)")]
 #[derive(Debug, Clone)]
 pub struct PyMiddlewareException {
     /// :type str:
@@ -59,6 +58,7 @@ pub struct PyMiddlewareException {
 #[pymethods]
 impl PyMiddlewareException {
     /// Create a new [PyMiddlewareException].
+    #[pyo3(text_signature = "($self, message, status_code=None)")]
     #[new]
     fn newpy(message: String, status_code: Option<u16>) -> Self {
         Self {

rust-runtime/aws-smithy-http-server-python/src/logging.rs

@@ -127,14 +127,14 @@ fn setup_tracing_subscriber(
 /// :param format typing.Optional\[typing.Literal\['compact', 'pretty', 'json'\]\]:
 /// :rtype None:
 #[pyclass(name = "TracingHandler")]
-#[pyo3(text_signature = "($self, level=None, logfile=None, format=None)")]
 #[derive(Debug)]
 pub struct PyTracingHandler {
     _guard: Option<WorkerGuard>,
 }
 
 #[pymethods]
 impl PyTracingHandler {
+    #[pyo3(text_signature = "($self, level=None, logfile=None, format=None)")]
     #[new]
     fn newpy(
         py: Python,