Skip to content

Commit 3fe8ff1

Browse files
committed
lint + use DF logger
1 parent 6a78221 commit 3fe8ff1

4 files changed

Lines changed: 31 additions & 25 deletions

File tree

azure/functions/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,4 @@
110110
'McpPropertyType'
111111
)
112112

113-
__version__ = '1.25.0b2'
113+
__version__ = '1.25.0b3dev1'

azure/functions/decorators/durable_functions.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def get_durable_package():
1717
If both the legacy and current packages are installed,
1818
we log a warning and prefer the current package.
1919
20-
If neither package is installed, we return None.
20+
If neither package is installed, we return None.
2121
"""
2222
_logger.info("Attempting to import Durable Functions package.")
2323
using_legacy = False
@@ -30,27 +30,27 @@ def get_durable_package():
3030
try:
3131
import azure.durable_functions as durable_functions
3232
using_legacy = True
33-
_logger.warning("`durabletask-azurefunctions` is available now! " \
34-
"See <AKA.MS LINK HERE> for more details.")
33+
_logger.warning("`durabletask-azurefunctions` is available now! "
34+
"See <AKA.MS LINK HERE> for more details.")
3535
except ImportError:
3636
_logger.info("`azure-functions-durable` package not found.")
3737
pass
3838
try:
39-
import durabletask.azurefunctions as durable_functions
39+
import durabletask.azurefunctions as durable_functions # noqa
4040
using_durable_task = True
4141
except ImportError:
4242
_logger.info("`durabletask-azurefunctions` package not found.")
4343
pass
4444

4545
if using_durable_task and using_legacy:
4646
# Both packages are installed; prefer `durabletask-azurefunctions`.
47-
_logger.warning("Both `azure-functions-durable` and " \
48-
"`durabletask-azurefunctions` packages are installed. " \
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.")
53-
47+
_logger.warning("Both `azure-functions-durable` and "
48+
"`durabletask-azurefunctions` packages are installed. "
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.")
53+
5454
if not using_durable_task and not using_legacy:
5555
return None
5656

azure/functions/decorators/function_app.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@
5858
from azure.functions.decorators.mysql import MySqlInput, MySqlOutput, \
5959
MySqlTrigger
6060

61-
_logger = logging.getLogger('azure.functions.AsgiMiddleware')
61+
_logger = logging.getLogger('azure.functions.DurableFunctions')
62+
6263

6364
class Function(object):
6465
"""

azure/functions/durable_functions.py

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
from . import meta
1010

1111
import logging
12-
_logger = logging.getLogger('azure.functions.AsgiMiddleware')
12+
_logger = logging.getLogger('azure.functions.DurableFunctions')
13+
1314

1415
# ---------------- Legacy Durable Functions Converters ---------------- #
1516
# Legacy Durable Function Orchestration Trigger
1617
class LegacyOrchestrationTriggerConverter(meta.InConverter,
17-
meta.OutConverter,
18-
binding=None,
19-
trigger=True):
18+
meta.OutConverter,
19+
binding=None,
20+
trigger=True):
2021
@classmethod
2122
def check_input_type_annotation(cls, pytype):
2223
return issubclass(pytype, _durable_functions.OrchestrationContext)
@@ -45,9 +46,9 @@ def has_implicit_output(cls) -> bool:
4546

4647
# Legacy Durable Function Entity Trigger
4748
class LegacyEnitityTriggerConverter(meta.InConverter,
48-
meta.OutConverter,
49-
binding=None,
50-
trigger=True):
49+
meta.OutConverter,
50+
binding=None,
51+
trigger=True):
5152
@classmethod
5253
def check_input_type_annotation(cls, pytype):
5354
return issubclass(pytype, _durable_functions.EntityContext)
@@ -76,9 +77,9 @@ def has_implicit_output(cls) -> bool:
7677

7778
# Legacy Durable Function Activity Trigger
7879
class LegacyActivityTriggerConverter(meta.InConverter,
79-
meta.OutConverter,
80-
binding=None,
81-
trigger=True):
80+
meta.OutConverter,
81+
binding=None,
82+
trigger=True):
8283
@classmethod
8384
def check_input_type_annotation(cls, pytype):
8485
# Activity Trigger's arguments should accept any types
@@ -133,8 +134,8 @@ def has_implicit_output(cls) -> bool:
133134

134135
# Legacy Durable Functions Durable Client Bindings
135136
class LegacyDurableClientConverter(meta.InConverter,
136-
meta.OutConverter,
137-
binding=None):
137+
meta.OutConverter,
138+
binding=None):
138139
@classmethod
139140
def has_implicit_output(cls) -> bool:
140141
return False
@@ -368,6 +369,10 @@ def decode(cls, data: meta.Datum, *, trigger_metadata) -> typing.Any:
368369

369370

370371
def register_durable_converters():
372+
"""
373+
Registers the appropriate Durable Functions converters based on the
374+
installed Durable Functions package.
375+
"""
371376
_logger.info("Registering Durable Functions converters based on ")
372377
pkg = get_durable_package()
373378
if pkg is None:

0 commit comments

Comments
 (0)