Skip to content

Commit 7f32698

Browse files
committed
update logs + remove extra line
1 parent d4f0cb8 commit 7f32698

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

azure/functions/decorators/durable_functions.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ def get_durable_package():
3030
try:
3131
import azure.durable_functions as durable_functions
3232
using_legacy = True
33-
_logger.warning("`azure-functions-durable` is deprecated. " \
34-
"Please migrate to the new `durabletask-azurefunctions` package. " \
33+
_logger.warning("`durabletask-azurefunctions` is available now! " \
3534
"See <AKA.MS LINK HERE> for more details.")
3635
except ImportError:
3736
_logger.info("`azure-functions-durable` package not found.")
@@ -47,7 +46,10 @@ def get_durable_package():
4746
# Both packages are installed; prefer `durabletask-azurefunctions`.
4847
_logger.warning("Both `azure-functions-durable` and " \
4948
"`durabletask-azurefunctions` packages are installed. " \
50-
"The `durabletask-azurefunctions` package will be used.")
49+
"This may lead to unexpected behavior. Please resolve this " \
50+
"conflict by removing one of these packages from the Python " \
51+
"environment. Decorators from `durabletask-azurefunctions` will " \
52+
"be used.")
5153

5254
if not using_durable_task and not using_legacy:
5355
return None

azure/functions/decorators/function_app.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,6 @@ def _get_durable_blueprint(self):
362362
"Durable Functions."
363363
raise Exception(error_message)
364364

365-
366365
@property
367366
def app_script_file(self) -> str:
368367
"""Name of function app script file in which all the functions

azure/functions/durable_functions.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,11 @@ def has_trigger_support(cls) -> bool:
331331

332332
@classmethod
333333
def check_input_type_annotation(cls, pytype: type) -> bool:
334+
try:
335+
import azure.durable_functions as adf
336+
return issubclass(pytype, (str, bytes, adf.DurableFunctionsClient))
337+
except ImportError:
338+
pass
334339
return issubclass(pytype, (str, bytes))
335340

336341
@classmethod

0 commit comments

Comments
 (0)