girder 5.0.9.dev2__tar.gz → 5.0.10.dev2__tar.gz

{girder-5.0.9.dev2/girder.egg-info → girder-5.0.10.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder
-Version: 5.0.9.dev2
+Version: 5.0.10.dev2
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.

{girder-5.0.9.dev2 → girder-5.0.10.dev2}/docs/conf.py

@@ -68,6 +68,7 @@ extensions = [
     'sphinx.ext.intersphinx',
     'sphinx.ext.viewcode',
     'sphinxcontrib.jquery',
+    'sphinx_llm.txt',
 ]
 
 autodoc_mock_imports = list(_girder_imports)

{girder-5.0.9.dev2 → girder-5.0.10.dev2}/docs/requirements-docs.txt

@@ -1,5 +1,6 @@
 # See tox.ini for documentation on this file.
 Sphinx
+sphinx-llm
 sphinx_rtd_theme
 packaging
 myst-parser

{girder-5.0.9.dev2 → girder-5.0.10.dev2}/girder/asgi.py

@@ -1,5 +1,6 @@
 import asyncio
 import logging
+import queue
 import socket
 import sys
 import threading
@@ -66,7 +67,7 @@ class _WSGIBridge:
         wsock.setblocking(False)
         response_status = {}
         response_headers = []
-        response_chunks = []
+        chunk_queue = queue.Queue(maxsize=1)
         error = []
 
         def start_response(status, headers, exc_info=None):
@@ -79,7 +80,7 @@ class _WSGIBridge:
 
             def write(data):
                 if data:
-                    response_chunks.append(bytes(data))
+                    chunk_queue.put(bytes(data))
 
             return write
 
@@ -91,47 +92,80 @@ class _WSGIBridge:
                 try:
                     for chunk in result:
                         if chunk:
-                            response_chunks.append(bytes(chunk))
+                            chunk_queue.put(bytes(chunk))
                 finally:
                     if hasattr(result, 'close'):
                         result.close()
             except Exception as exc:
                 error.append(exc)
             finally:
+                chunk_queue.put(None)
                 body_file.close()
                 rsock.close()
 
         thread = threading.Thread(target=run_wsgi, daemon=True)
         thread.start()
-        try:
+
+        async def handle_request():
+            try:
+                while True:
+                    message = await receive()
+                    if message['type'] == 'http.disconnect':
+                        break
+                    body = message.get('body', b'')
+                    if body:
+                        await loop.sock_sendall(wsock, body)
+                    if not message.get('more_body', False):
+                        break
+            finally:
+                try:
+                    wsock.shutdown(socket.SHUT_WR)
+                except OSError:
+                    pass
+                wsock.close()
+
+        async def handle_response():
+            headers_sent = False
             while True:
-                message = await receive()
-                if message['type'] == 'http.disconnect':
-                    break
-                body = message.get('body', b'')
-                if body:
-                    await loop.sock_sendall(wsock, body)
-                if not message.get('more_body', False):
+                chunk = await loop.run_in_executor(None, chunk_queue.get)
+                if not headers_sent:
+                    await send({
+                        'type': 'http.response.start',
+                        'status': response_status.get('code', 500),
+                        'headers': response_headers,
+                    })
+                    headers_sent = True
+                if chunk is None:
+                    await send({
+                        'type': 'http.response.body',
+                        'body': b'',
+                        'more_body': False,
+                    })
                     break
+                await send({
+                    'type': 'http.response.body',
+                    'body': chunk,
+                    'more_body': True,
+                })
+
+        req_task = asyncio.create_task(handle_request())
+        res_task = asyncio.create_task(handle_response())
+        try:
+            await asyncio.gather(req_task, res_task)
+        except BaseException:
+            req_task.cancel()
+            res_task.cancel()
+            while thread.is_alive():
+                try:
+                    if chunk_queue.get(timeout=0.1) is None:
+                        break
+                except queue.Empty:
+                    pass
+            raise
         finally:
-            try:
-                wsock.shutdown(socket.SHUT_WR)
-            except OSError:
-                pass
-            wsock.close()
-        thread.join()
+            await loop.run_in_executor(None, thread.join)
         if error:
             raise error[0]
-        await send({
-            'type': 'http.response.start',
-            'status': response_status.get('code', 500),
-            'headers': response_headers,
-        })
-        await send({
-            'type': 'http.response.body',
-            'body': b''.join(response_chunks),
-            'more_body': False,
-        })
 
 
 @asynccontextmanager

{girder-5.0.9.dev2 → girder-5.0.10.dev2/girder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder
-Version: 5.0.9.dev2
+Version: 5.0.10.dev2
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.