Merge remote-tracking branch 'upstream/main'

Author: cjavad

simplyprint_duet3d/cli/autodiscover.py

@@ -111,12 +111,10 @@ async def connect_to_duet(address: str, password: str) -> Optional[dict]:
         board = board['result']
         duet_name = await duet.rr_model(key='network.name')
         duet_name = duet_name['result']
-
         try:
             webcam_uri = await get_webcam_url(duet)
         except aiohttp.client_exceptions.ClientResponseError:
             webcam_uri = None
-
         try:
             cookie = await get_cookie(duet)
         except aiohttp.client_exceptions.ClientResponseError:

simplyprint_duet3d/duet/api.py

@@ -290,8 +290,12 @@ async def rr_upload(
 
         params['crc32'] = '{0:08x}'.format(checksum)
 
+        headers = {
+            'Content-Length': str(len(content)),
+        }
+
         response = b''
-        async with self.session.post(url, data=content, params=params) as r:
+        async with self.session.post(url, data=content, params=params, headers=headers) as r:
             response = await r.json()
         return response
 
@@ -341,12 +345,17 @@ async def file_chunk():
             total=60 * 30,  # 30 minutes
         )
 
+        headers = {
+            'Content-Length': str(filesize),
+        }
+
         response = b''
         async with self.session.post(
             url=url,
             data=file_chunk(),
             params=params,
             timeout=timeout,
+            headers=headers,
         ) as r:
             response = await r.json()
 

tests/test_api.py

@@ -82,7 +82,7 @@ async def test_rr_upload(reprapfirmware, mock_session):
     content = b'testtttttt'
     response = await reprapfirmware.rr_upload('test.txt', content)
     assert response == {'err': 0}
-    mock_session.post.assert_called_once_with('http://10.42.0.2/rr_upload', data=content, params={'name': 'test.txt', 'crc32': '075b1c7c'})
+    mock_session.post.assert_called_once_with('http://10.42.0.2/rr_upload', data=content, params={'name': 'test.txt', 'crc32': '075b1c7c'}, headers={'Content-Length': '10'})
 
 
 @pytest.mark.asyncio