@vercel/python 4.4.1 → 4.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "4.4.1",
+  "version": "4.5.1",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",

package/vc_init.py

@@ -43,6 +43,49 @@ if 'VERCEL_IPC_FD' in os.environ:
     send_message = lambda message: sock.sendall((json.dumps(message) + '\0').encode())
     storage = contextvars.ContextVar('storage', default=None)
 
+    # Override urlopen from urllib3 (& requests) to send Request Metrics
+    try:
+        import urllib3
+        from urllib.parse import urlparse
+
+        def timed_request(func):
+            fetchId = 0
+            @functools.wraps(func)
+            def wrapper(self, method, url, *args, **kwargs):
+                nonlocal fetchId
+                fetchId += 1
+                start_time = int(time.time() * 1000)
+                result = func(self, method, url, *args, **kwargs)
+                elapsed_time = int(time.time() * 1000) - start_time
+                parsed_url = urlparse(url)
+                context = storage.get()
+                if context is not None:
+                    send_message({
+                        "type": "metric",
+                        "payload": {
+                            "context": {
+                                "invocationId": context['invocationId'],
+                                "requestId": context['requestId'],
+                            },
+                            "type": "fetch-metric",
+                            "payload": {
+                                "pathname": parsed_url.path,
+                                "search": parsed_url.query,
+                                "start": start_time,
+                                "duration": elapsed_time,
+                                "host": parsed_url.hostname or self.host,
+                                "statusCode": result.status,
+                                "method": method,
+                                "id": fetchId
+                            }
+                        }
+                    })
+                return result
+            return wrapper
+        urllib3.connectionpool.HTTPConnectionPool.urlopen = timed_request(urllib3.connectionpool.HTTPConnectionPool.urlopen)
+    except:
+        pass
+
     # Override sys.stdout and sys.stderr to map logs to the correct request
     class StreamWrapper:
         def __init__(self, stream, stream_name):
@@ -276,21 +319,23 @@ if 'VERCEL_IPC_FD' in os.environ:
                         'raw_path': url.path.encode(),
                     }
 
+                    if 'content-length' in self.headers:
+                        content_length = int(self.headers['content-length'])
+                        body = self.rfile.read(content_length)
+                    else:
+                        body = b''
+
+                    if _use_legacy_asyncio:
+                        loop = asyncio.new_event_loop()
+                        app_queue = asyncio.Queue(loop=loop)
+                    else:
+                        app_queue = asyncio.Queue()
+                    app_queue.put_nowait({'type': 'http.request', 'body': body, 'more_body': False})
+
                     # Prepare ASGI receive function
                     async def receive():
-                        if 'content-length' in self.headers:
-                            content_length = int(self.headers['content-length'])
-                            body = self.rfile.read(content_length)
-                            return {
-                                'type': 'http.request',
-                                'body': body,
-                                'more_body': False,
-                            }
-                        return {
-                            'type': 'http.request',
-                            'body': b'',
-                            'more_body': False,
-                        }
+                        message = await app_queue.get()
+                        return message
 
                     # Prepare ASGI send function
                     response_started = False
@@ -309,7 +354,12 @@ if 'VERCEL_IPC_FD' in os.environ:
                                 self.wfile.flush()
 
                     # Run the ASGI application
-                    asyncio.run(app(scope, receive, send))
+                    asgi_instance = app(scope, receive, send)
+                    if _use_legacy_asyncio:
+                        asgi_task = loop.create_task(asgi_instance)
+                        loop.run_until_complete(asgi_task)
+                    else:
+                        asyncio.run(asgi_instance)
 
     if 'Handler' in locals():
         server = ThreadingHTTPServer(('127.0.0.1', 0), Handler)