update to dev2

Author: hallvictoria

azure/functions/__init__.py

@@ -110,4 +110,4 @@
     'McpPropertyType'
 )
 
-__version__ = '1.25.0b3.dev1'
+__version__ = '1.25.0b3.dev2'

azure/functions/decorators/durable_functions.py

@@ -28,29 +28,19 @@ def get_durable_package():
         return df
 
     try:
-        import azure.durable_functions as durable_functions
-        using_legacy = True
-        _logger.warning("`durabletask-azurefunctions` is available now! "
-                        "See <AKA.MS LINK HERE> for more details.")
+        import durabletask  # noqa
+        using_durable_task = True
+        _logger.info("`durabletask` package found.")
     except ImportError:
-        _logger.info("`azure-functions-durable` package not found.")
+        _logger.info("`durabletask` package not found.")
         pass
     try:
-        import durabletask.azurefunctions as durable_functions  # noqa
-        using_durable_task = True
+        import azure.durable_functions  as durable_functions # noqa
+        _logger.info("`azure.durable_functions` package found.")
     except ImportError:
-        _logger.info("`durabletask-azurefunctions` package not found.")
+        _logger.info("`azure.durable_functions` package not found.")
         pass
 
-    if using_durable_task and using_legacy:
-        # Both packages are installed; prefer `durabletask-azurefunctions`.
-        _logger.warning("Both `azure-functions-durable` and "
-                        "`durabletask-azurefunctions` packages are installed. "
-                        "This may lead to unexpected behavior. Please resolve this "
-                        "conflict by removing one of these packages from the Python "
-                        "environment. Decorators from `durabletask-azurefunctions` will "
-                        "be used.")
-
     if not using_durable_task and not using_legacy:
         return None
 

azure/functions/durable_functions.py

@@ -332,7 +332,7 @@ def has_trigger_support(cls) -> bool:
 
     @classmethod
     def check_input_type_annotation(cls, pytype: type) -> bool:
-        import durabletask.azurefunctions as adf
+        import azure.durable_functions as adf
         return issubclass(pytype, (str, bytes, adf.DurableFunctionsClient))
 
     @classmethod
@@ -364,8 +364,8 @@ def encode(cls, obj: typing.Any, *,
 
     @classmethod
     def decode(cls, data: meta.Datum, *, trigger_metadata) -> typing.Any:
-        from durabletask.azurefunctions.client import DurableFunctionsClient
-        return DurableFunctionsClient(data.value)
+        import azure.durable_functions as adf
+        return adf.DurableFunctionsClient(data.value)
 
 
 def register_durable_converters():