clean up for v2 afd design

Author: hallvictoria

azure/functions/__init__.py

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

azure/functions/decorators/durable_functions.py

@@ -20,30 +20,26 @@ def get_durable_package():
     If neither package is installed, we return None.
     """
     _logger.info("Attempting to import Durable Functions package.")
-    using_legacy = False
-    using_durable_task = False
     global df
     if df:
         _logger.info("Durable Functions package already loaded. DF: %s", df)
         return df
 
+    # Check for azure-functions-durable package
     try:
-        import durabletask  # noqa
-        using_durable_task = True
-        _logger.info("`durabletask` package found.")
-    except ImportError:
-        _logger.info("`durabletask` package not found.")
-        pass
-    try:
-        import azure.durable_functions  as durable_functions # noqa
+        import azure.durable_functions as durable_functions # noqa
         _logger.info("`azure.durable_functions` package found.")
     except ImportError:
         _logger.info("`azure.durable_functions` package not found.")
-        pass
-
-    if not using_durable_task and not using_legacy:
         return None
 
+    # Check version of azure-functions-durable package
+    try:
+        if hasattr(durable_functions, 'version') and durable_functions.version.startswith("2."):
+            _logger.info("Using `azure.durable_functions` v2.x package.")
+    except Exception:
+        _logger.info("Using `azure.durable_functions` v1.x package.")
+
     df = durable_functions
 
-    return durable_functions
+    return df

azure/functions/decorators/function_app.py

@@ -358,8 +358,8 @@ def _get_durable_blueprint(self):
         else:
             error_message = \
                 "Attempted to use a Durable Functions decorator, " \
-                "but the `durabletask-azurefunctions` SDK package could not be " \
-                "found. Please install `durabletask-azurefunctions` to use " \
+                "but the `azure-functions-durable` SDK package could not be " \
+                "found. Please install `azure-functions-durable` to use " \
                 "Durable Functions."
             raise Exception(error_message)
 

azure/functions/durable_functions.py

@@ -387,17 +387,18 @@ def register_durable_converters():
     meta._ConverterMeta._bindings.pop("activityTrigger", None)
     meta._ConverterMeta._bindings.pop("durableClient", None)
 
-    if pkg.__name__ == "azure.durable_functions":
+    if not hasattr(pkg, 'version'):
         _logger.info("Registering Legacy Durable Functions converters.")
         meta._ConverterMeta._bindings["orchestrationTrigger"] = LegacyOrchestrationTriggerConverter
         meta._ConverterMeta._bindings["entityTrigger"] = LegacyEnitityTriggerConverter
         meta._ConverterMeta._bindings["activityTrigger"] = LegacyActivityTriggerConverter
         meta._ConverterMeta._bindings["durableClient"] = LegacyDurableClientConverter
-    else:
+    elif hasattr(pkg, 'version') and pkg.version.startswith("2."):
         _logger.info("Registering Durable Task Durable Functions converters.")
         meta._ConverterMeta._bindings["orchestrationTrigger"] = OrchestrationTriggerConverter
         meta._ConverterMeta._bindings["entityTrigger"] = EnitityTriggerConverter
         meta._ConverterMeta._bindings["activityTrigger"] = ActivityTriggerConverter
         meta._ConverterMeta._bindings["durableClient"] = DurableClientConverter
+
     _logger.info("Durable Functions converters registered.")
     _logger.info("Current bindings after registration: %s", meta._ConverterMeta._bindings)