Commit fe34ae8
authored
fix: avoid eagerly copying uploaded files into memory (#6174)
* fix: avoid eagerly copying uploaded files into memory
Previously the upload handler read every file into a BytesIO buffer
before passing it to the event handler, doubling peak memory for large
uploads. Now the original Starlette temp files are passed through
directly and form_data.close() is deferred until the streaming response
completes.
- Pass file.file directly instead of copying into BytesIO
- Defer form_data.close() to finally block in streaming generator
- Close form_data on error path to prevent resource leaks
- Replace mock form data in tests with real Starlette FormData
- Add test verifying files are not read before handler runs
* test: improve upload tests with streaming assertions and deduplication
- Extract _FileUploadMixin to eliminate duplicated fields and methods
across FileUploadState, ChildFileUploadState, and GrandChildFileUploadState
- Fix shared BytesIO bug where both UploadFile instances shared one
buffer, causing the second file to write empty content
- Use app.modify_state to set _tmp_path on the state instance instead
of setting class attributes directly
- Assert incremental delta updates during streaming (yield per file)
- Verify both BinaryIO handles remain open during streaming and close
after form_data.close()
- Verify uploaded files are written to tmp dir with correct content
- Remove dead state._tmp_path assignments from error-case tests
* fix: prevent temp file leaks on upload cancellation
Replace `except Exception` with `try/finally` + `event is None` guard so
that `asyncio.CancelledError` (a BaseException) also triggers form_data
cleanup.
Add idempotent `_close_form_data()` helper to safely deduplicate cleanup
across three paths: event creation failure, generator completion, and
ASGI response teardown.
Introduce `_UploadStreamingResponse` (module-level) that wraps
`__call__` in try/finally as a safety net for the case where the
response is cancelled before the generator is ever entered.
Add tests verifying form_data.close() is called on:
- CancelledError during event creation (get_state cancelled)
- CancelledError during ASGI send (before generator iteration)
* refactor: remove redundant try/finally in upload generator
* test: use full ASGI lifecycle in upload form close test1 parent 7607fa3 commit fe34ae8
3 files changed
+335
-197
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
13 | 12 | | |
14 | 13 | | |
15 | 14 | | |
| |||
19 | 18 | | |
20 | 19 | | |
21 | 20 | | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
1891 | 1891 | | |
1892 | 1892 | | |
1893 | 1893 | | |
| 1894 | + | |
| 1895 | + | |
| 1896 | + | |
| 1897 | + | |
| 1898 | + | |
| 1899 | + | |
| 1900 | + | |
| 1901 | + | |
| 1902 | + | |
| 1903 | + | |
| 1904 | + | |
| 1905 | + | |
| 1906 | + | |
| 1907 | + | |
| 1908 | + | |
| 1909 | + | |
| 1910 | + | |
| 1911 | + | |
| 1912 | + | |
| 1913 | + | |
| 1914 | + | |
1894 | 1915 | | |
1895 | 1916 | | |
1896 | 1917 | | |
| |||
1920 | 1941 | | |
1921 | 1942 | | |
1922 | 1943 | | |
1923 | | - | |
| 1944 | + | |
1924 | 1945 | | |
1925 | 1946 | | |
1926 | | - | |
1927 | | - | |
1928 | | - | |
1929 | | - | |
1930 | | - | |
1931 | | - | |
1932 | | - | |
1933 | | - | |
1934 | | - | |
1935 | | - | |
1936 | | - | |
1937 | | - | |
1938 | | - | |
1939 | 1947 | | |
1940 | | - | |
1941 | | - | |
1942 | | - | |
| 1948 | + | |
1943 | 1949 | | |
1944 | | - | |
| 1950 | + | |
| 1951 | + | |
| 1952 | + | |
| 1953 | + | |
| 1954 | + | |
| 1955 | + | |
| 1956 | + | |
1945 | 1957 | | |
1946 | | - | |
| 1958 | + | |
| 1959 | + | |
1947 | 1960 | | |
1948 | | - | |
1949 | | - | |
1950 | | - | |
1951 | | - | |
1952 | | - | |
1953 | | - | |
1954 | | - | |
1955 | | - | |
1956 | | - | |
1957 | | - | |
1958 | | - | |
1959 | | - | |
1960 | | - | |
| 1961 | + | |
| 1962 | + | |
| 1963 | + | |
| 1964 | + | |
| 1965 | + | |
| 1966 | + | |
| 1967 | + | |
| 1968 | + | |
| 1969 | + | |
| 1970 | + | |
| 1971 | + | |
| 1972 | + | |
| 1973 | + | |
| 1974 | + | |
| 1975 | + | |
| 1976 | + | |
1961 | 1977 | | |
1962 | | - | |
1963 | | - | |
1964 | | - | |
1965 | | - | |
1966 | | - | |
1967 | | - | |
1968 | | - | |
1969 | | - | |
1970 | | - | |
1971 | | - | |
1972 | | - | |
1973 | | - | |
1974 | | - | |
1975 | | - | |
1976 | | - | |
1977 | | - | |
1978 | | - | |
| 1978 | + | |
| 1979 | + | |
| 1980 | + | |
| 1981 | + | |
| 1982 | + | |
| 1983 | + | |
| 1984 | + | |
| 1985 | + | |
| 1986 | + | |
| 1987 | + | |
| 1988 | + | |
| 1989 | + | |
| 1990 | + | |
| 1991 | + | |
| 1992 | + | |
| 1993 | + | |
| 1994 | + | |
| 1995 | + | |
| 1996 | + | |
| 1997 | + | |
| 1998 | + | |
| 1999 | + | |
| 2000 | + | |
| 2001 | + | |
| 2002 | + | |
| 2003 | + | |
1979 | 2004 | | |
1980 | | - | |
1981 | | - | |
1982 | | - | |
1983 | | - | |
1984 | | - | |
1985 | | - | |
1986 | | - | |
1987 | | - | |
1988 | | - | |
| 2005 | + | |
| 2006 | + | |
| 2007 | + | |
| 2008 | + | |
| 2009 | + | |
| 2010 | + | |
| 2011 | + | |
| 2012 | + | |
| 2013 | + | |
| 2014 | + | |
| 2015 | + | |
| 2016 | + | |
| 2017 | + | |
| 2018 | + | |
| 2019 | + | |
| 2020 | + | |
| 2021 | + | |
1989 | 2022 | | |
1990 | | - | |
1991 | 2023 | | |
1992 | | - | |
1993 | | - | |
1994 | | - | |
1995 | | - | |
1996 | | - | |
1997 | | - | |
| 2024 | + | |
| 2025 | + | |
| 2026 | + | |
| 2027 | + | |
| 2028 | + | |
1998 | 2029 | | |
1999 | | - | |
2000 | | - | |
2001 | | - | |
2002 | | - | |
2003 | | - | |
| 2030 | + | |
| 2031 | + | |
| 2032 | + | |
| 2033 | + | |
| 2034 | + | |
| 2035 | + | |
2004 | 2036 | | |
2005 | 2037 | | |
2006 | 2038 | | |
| |||
2018 | 2050 | | |
2019 | 2051 | | |
2020 | 2052 | | |
2021 | | - | |
| 2053 | + | |
2022 | 2054 | | |
2023 | 2055 | | |
| 2056 | + | |
2024 | 2057 | | |
2025 | 2058 | | |
2026 | 2059 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
5 | 4 | | |
6 | 5 | | |
7 | 6 | | |
| |||
35 | 34 | | |
36 | 35 | | |
37 | 36 | | |
38 | | - | |
39 | | - | |
| 37 | + | |
| 38 | + | |
40 | 39 | | |
41 | 40 | | |
42 | | - | |
| 41 | + | |
43 | 42 | | |
44 | 43 | | |
45 | 44 | | |
| |||
64 | 63 | | |
65 | 64 | | |
66 | 65 | | |
| 66 | + | |
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
| |||
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
77 | 81 | | |
78 | 82 | | |
79 | 83 | | |
80 | 84 | | |
81 | | - | |
| 85 | + | |
82 | 86 | | |
83 | 87 | | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | 88 | | |
120 | 89 | | |
121 | 90 | | |
122 | 91 | | |
123 | 92 | | |
124 | | - | |
| 93 | + | |
125 | 94 | | |
126 | | - | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | | - | |
136 | | - | |
137 | | - | |
138 | | - | |
139 | | - | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | | - | |
148 | | - | |
149 | | - | |
150 | | - | |
151 | | - | |
152 | | - | |
153 | | - | |
154 | | - | |
155 | | - | |
156 | | - | |
157 | | - | |
158 | | - | |
159 | | - | |
160 | | - | |
0 commit comments