Merge branch 'dev' into hallvictoria/cosmosdb-types

Author: hallvictoria

.azuredevops/dependabot.yml

@@ -0,0 +1,4 @@
+# Mirrored repository. We use dependabot via GitHub, not Azure DevOps.
+version: 2
+enable-security-updates: false
+enable-campaigned-updates: false

.flake8

@@ -3,3 +3,6 @@ ignore = W503,E402,E731
 exclude =
     .git, __pycache__, build, dist, .eggs, .github, .local,
     Samples, azure/functions/_thirdparty, docs/, .venv*/, .env*/, .vscode/, venv*, pyvenv*
+max-line-length = 100
+extend-ignore = D401, D101, D105, D400, D205, D102, D100, D107, DAR401, DAR101, DAR201
+strictness = short

README.md

@@ -7,16 +7,15 @@
 
 ## Overview
 
-Python support for Azure Functions is based on Python 3.8, 3.9, 3.10, 3.11, and 3.12 serverless hosting on Linux, and the Functions 2.x ([EOL](https://learn.microsoft.com/azure/azure-functions/functions-versions?#retired-versions)), 3.x ([EOL](https://learn.microsoft.com/azure/azure-functions/functions-versions?#retired-versions)) and 4.0 runtime.
+Python support for Azure Functions is based on Python 3.10, 3.11, 3.12, and 3.13 serverless hosting on Linux, and the Functions 2.x ([EOL](https://learn.microsoft.com/azure/azure-functions/functions-versions?#retired-versions)), 3.x ([EOL](https://learn.microsoft.com/azure/azure-functions/functions-versions?#retired-versions)) and 4.0 runtime.
 
 Here is the current status of Python in Azure Functions:
 
 _What are the supported Python versions?_
 
-| Azure Functions Runtime | Python 3.8                                                                           | Python 3.9                                                                           | Python 3.10 | Python 3.11 | Python 3.12 |
-|-------------------------|--------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|-------------|-------------|-------------|
-| Azure Functions 3.0     | [EOL](https://learn.microsoft.com/azure/azure-functions/migrate-version-3-version-4) | [EOL](https://learn.microsoft.com/azure/azure-functions/migrate-version-3-version-4) | -           | -           | -           |
-| Azure Functions 4.0     | ✓                                                                             | ✓                                                                             | ✓    | ✓    | ✓    |
+| Azure Functions Runtime          | Python 3.10 | Python 3.11 | Python 3.12 | Python 3.13 |
+|----------------------------------|------------|------------|-------------|-------------|
+| Azure Functions 4.0              | ✔          | ✔          | ✔           | ✔           |                                                                              | ✓    | ✓    | ✓    |
 
 _What's available?_
 - Build, test, debug and publish using Azure Functions Core Tools (CLI) or Visual Studio Code

azure/functions/__init__.py

@@ -102,4 +102,4 @@
     'BlobSource'
 )
 
-__version__ = '1.22.0b4'
+__version__ = '1.25.0b1'

azure/functions/_abc.py

@@ -7,7 +7,7 @@
 import threading
 import typing
 
-from azure.functions._thirdparty.werkzeug.datastructures import Headers
+from werkzeug.datastructures import Headers
 
 T = typing.TypeVar('T')
 

azure/functions/_cosmosdb.py

@@ -2,9 +2,9 @@
 # Licensed under the MIT License.
 
 import collections
-import json
 
 from . import _abc
+from ._jsonutils import json
 
 
 class Document(_abc.Document, collections.UserDict):

azure/functions/_http.py

@@ -4,15 +4,16 @@
 import collections.abc
 import http
 import io
-import json
 import types
 import typing
 
+from ._jsonutils import json
+from werkzeug import formparser as _wk_parser
+from werkzeug import http as _wk_http
+from werkzeug.datastructures import (Headers, FileStorage, MultiDict,
+                                     ImmutableMultiDict)
+
 from . import _abc
-from ._thirdparty.werkzeug import datastructures as _wk_datastructures
-from ._thirdparty.werkzeug import formparser as _wk_parser
-from ._thirdparty.werkzeug import http as _wk_http
-from ._thirdparty.werkzeug.datastructures import Headers
 
 
 class BaseHeaders(collections.abc.Mapping):
@@ -174,8 +175,8 @@ def __init__(self,
         self.__route_params = types.MappingProxyType(route_params or {})
         self.__body_bytes = body
         self.__form_parsed = False
-        self.__form = None
-        self.__files = None
+        self.__form: MultiDict[str, str]
+        self.__files: MultiDict[str, FileStorage]
 
     @property
     def url(self):
@@ -222,12 +223,9 @@ def _parse_form_data(self):
         content_length = len(body)
         mimetype, options = _wk_http.parse_options_header(content_type)
         parser = _wk_parser.FormDataParser(
-            _wk_parser.default_stream_factory,
-            options.get('charset') or 'utf-8',
-            'replace',
-            None,
-            None,
-            _wk_datastructures.ImmutableMultiDict,
+            _wk_parser.default_stream_factory, max_form_memory_size=None,
+            max_content_length=None,
+            cls=ImmutableMultiDict
         )
 
         body_stream = io.BytesIO(body)

azure/functions/_http_wsgi.py

@@ -1,15 +1,18 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
-from typing import Dict, List, Optional, Any
 import logging
 from io import BytesIO, StringIO
 from os import linesep
+from typing import Dict, List, Optional, Any
 from urllib.parse import ParseResult, urlparse, unquote_to_bytes
 from wsgiref.headers import Headers
 
 from ._abc import Context
 from ._http import HttpRequest, HttpResponse
-from ._thirdparty.werkzeug._compat import string_types, wsgi_encoding_dance
+
+
+def wsgi_encoding_dance(value):
+    return value.encode().decode("latin1")
 
 
 class WsgiRequest:
@@ -98,7 +101,7 @@ def to_environ(self, errors_buffer: StringIO) -> Dict[str, Any]:
 
         # Ensure WSGI string fits in IOS-8859-1 code points
         for k, v in environ.items():
-            if isinstance(v, string_types):
+            if isinstance(v, (str,)):
                 environ[k] = wsgi_encoding_dance(v)
 
         # Remove None values

azure/functions/_jsonutils.py

@@ -0,0 +1,78 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from abc import ABC, abstractmethod
+from typing import Any, Union
+from types import SimpleNamespace
+
+
+"""
+Azure Functions JSON utilities.
+This module provides a JSON interface that can be used to serialize and
+deserialize objects to and from JSON format. It supports both the `orjson`
+and the standard `json` libraries, falling back to the standard library
+if `orjson` is not available (installed).
+"""
+
+
+try:
+    import orjson as _orjson
+except ImportError:
+    _orjson = None
+
+# Standard library is always present
+import json as _std_json
+
+
+class JsonInterface(ABC):
+    @abstractmethod
+    def dumps(self, obj: Any) -> str:
+        pass
+
+    @abstractmethod
+    def loads(self, s: Union[str, bytes, bytearray]) -> Any:
+        pass
+
+
+class OrJsonAdapter(JsonInterface):
+    def __init__(self):
+        assert _orjson is not None
+        self.orjson = _orjson
+
+    def dumps(self, obj: Any) -> str:
+        # orjson.dumps returns bytes, decode to str
+        return self.orjson.dumps(obj).decode("utf-8")
+
+    def loads(self, s: Union[str, bytes, bytearray]) -> Any:
+        return self.orjson.loads(s)
+
+
+class StdJsonAdapter(JsonInterface):
+    def __init__(self):
+        self.json = _std_json
+
+    def dumps(self, obj: Any) -> str:
+        return self.json.dumps(obj)
+
+    def loads(self, s: Union[str, bytes, bytearray]) -> Any:
+        return self.json.loads(s)
+
+
+if _orjson is not None:
+    json_impl = OrJsonAdapter()
+else:
+    json_impl = StdJsonAdapter()
+
+
+def dumps(obj: Any) -> str:
+    return json_impl.dumps(obj)
+
+
+def loads(s: Union[str, bytes, bytearray]) -> Any:
+    return json_impl.loads(s)
+
+
+json = SimpleNamespace(
+    dumps=dumps,
+    loads=loads
+)

azure/functions/_mysql.py

@@ -2,7 +2,8 @@
 # Licensed under the MIT License.
 import abc
 import collections
-import json
+
+from ._jsonutils import json
 
 
 class BaseMySqlRow(abc.ABC):