Skip to content

Commit

Permalink
lint + revert durable
Browse files Browse the repository at this point in the history
  • Loading branch information
Victoria Hall committed Jan 23, 2025
1 parent a58122c commit a03d950
Show file tree
Hide file tree
Showing 14 changed files with 36 additions and 31 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import azure.functions as func


async def main(req: func.HttpRequest, starter_snake: str) -> func.HttpResponse:
client = df.DurableOrchestrationClient(starter_snake)
async def main(req: func.HttpRequest, starter: str) -> func.HttpResponse:
client = df.DurableOrchestrationClient(starter)
instance_id = await client.start_new(req.route_params["functionName"], None,
None)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"direction": "out"
},
{
"name": "starter_snake",
"name": "starter",
"type": "durableClient",
"direction": "in"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
import azure.durable_functions as df


def orchestrator_function(context_snake: df.DurableOrchestrationContext):
result1 = yield context_snake.call_activity('Hello', "Tokyo")
result2 = yield context_snake.call_activity('Hello', "Seattle")
result3 = yield context_snake.call_activity('Hello', "London")
def orchestrator_function(context: df.DurableOrchestrationContext):
result1 = yield context.call_activity('Hello', "Tokyo")
result2 = yield context.call_activity('Hello', "Seattle")
result3 = yield context.call_activity('Hello', "London")
return [result1, result2, result3]


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"scriptFile": "__init__.py",
"bindings": [
{
"name": "context_snake",
"name": "context",
"type": "orchestrationTrigger",
"direction": "in"
}
Expand Down
4 changes: 2 additions & 2 deletions tests/endtoend/durable_functions/Hello/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
# - add azure-functions-durable to requirements.txt
# - run pip install -r requirements.txt

def main(name_snake: str) -> str:
return f"Hello {name_snake}!"
def main(name: str) -> str:
return f"Hello {name}!"
2 changes: 1 addition & 1 deletion tests/endtoend/durable_functions/Hello/function.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"scriptFile": "__init__.py",
"bindings": [
{
"name": "name_snake",
"name": "name",
"type": "activityTrigger",
"direction": "in"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@
app = df.DFApp()


@app.orchestration_trigger(context_name="context_snake")
def durablefunctionsorchestrator(context_snake):
result1 = yield context_snake.call_activity('Hello', "Tokyo")
result2 = yield context_snake.call_activity('Hello', "Seattle")
result3 = yield context_snake.call_activity('Hello', "London")
@app.orchestration_trigger(context_name="context")
def durablefunctionsorchestrator(context):
result1 = yield context.call_activity('Hello', "Tokyo")
result2 = yield context.call_activity('Hello', "Seattle")
result3 = yield context.call_activity('Hello', "London")
return [result1, result2, result3]


@app.route(route="orchestrators/{functionName}",
auth_level=func.AuthLevel.ANONYMOUS)
@app.durable_client_input(client_name="client_snake")
async def durable_client(req: func.HttpRequest, client_snake) -> func.HttpResponse:
instance_id = await client_snake.start_new(req.route_params["functionName"], None,
None)
@app.durable_client_input(client_name="client")
async def durable_client(req: func.HttpRequest, client) -> func.HttpResponse:
instance_id = await client.start_new(req.route_params["functionName"], None,
None)
logging.info(f"Started orchestration with ID = '{instance_id}'.")
return client_snake.create_check_status_response(req, instance_id)
return client.create_check_status_response(req, instance_id)


@app.activity_trigger(input_name="name_snake")
def hello(name_snake: str) -> str:
return f"Hello {name_snake}!"
@app.activity_trigger(input_name="name")
def hello(name: str) -> str:
return f"Hello {name}!"
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
@app.route(route="double_underscore", trigger_arg_name="req__snake")
def double_underscore(req__snake: func.HttpRequest) -> func.HttpResponse:
name = req__snake.params.get('name')
return func.HttpResponse(f"Hello, {name}.")
return func.HttpResponse(f"Hello, {name}.")
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
@app.route(route="double_underscore_prefix", trigger_arg_name="__req")
def classic_double_underscore(__req: func.HttpRequest) -> func.HttpResponse:
name = __req.params.get('name')
return func.HttpResponse(f"Hello, {name}.")
return func.HttpResponse(f"Hello, {name}.")
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
@app.route(route="double_underscore_suffix", trigger_arg_name="req__")
def double_underscore_suffix(req__: func.HttpRequest) -> func.HttpResponse:
name = req__.params.get('name')
return func.HttpResponse(f"Hello, {name}.")
return func.HttpResponse(f"Hello, {name}.")
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
@app.route(route="jsut_double_underscore", trigger_arg_name="__")
def jsut_double_underscore(__: func.HttpRequest) -> func.HttpResponse:
name = __.params.get('name')
return func.HttpResponse(f"Hello, {name}.")
return func.HttpResponse(f"Hello, {name}.")
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
@app.route(route="python_main_keyword", trigger_arg_name="__main__")
def python_main_keyword(__main__: func.HttpRequest) -> func.HttpResponse:
name = __main__.params.get('name')
return func.HttpResponse(f"Hello, {name}.")
return func.HttpResponse(f"Hello, {name}.")
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,24 @@


@app.route(route="classic_snake_case", trigger_arg_name="req_snake_snake_snake_snake")
def classic_snake_case(req_snake_snake_snake_snake: func.HttpRequest) -> func.HttpResponse:
def classic_snake_case(req_snake_snake_snake_snake: func.HttpRequest)\
-> func.HttpResponse:
name = req_snake_snake_snake_snake.params.get('name')
return func.HttpResponse(f"Hello, {name}.")


@app.route(route="single_underscore", trigger_arg_name="_")
def single_underscore(_: func.HttpRequest) -> func.HttpResponse:
name = _.params.get('name')
return func.HttpResponse(f"Hello, {name}.")


@app.route(route="underscore_prefix", trigger_arg_name="_req")
def underscore_prefix(_req: func.HttpRequest) -> func.HttpResponse:
name = _req.params.get('name')
return func.HttpResponse(f"Hello, {name}.")


@app.route(route="underscore_suffix", trigger_arg_name="req_")
def underscore_suffix(req_: func.HttpRequest) -> func.HttpResponse:
name = req_.params.get('name')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ def sql_input2(req: func.HttpRequest, products: func.SqlRowList) -> func.HttpRes
@app.sql_output(arg_name="r_snake",
command_text="[dbo].[Products]",
connection_string_setting="AzureWebJobsSqlConnectionString")
def sql_output(req: func.HttpRequest, r_snake: func.Out[func.SqlRow]) -> func.HttpResponse:
def sql_output(req: func.HttpRequest, r_snake: func.Out[func.SqlRow])\
-> func.HttpResponse:
body = json.loads(req.get_body())
row = func.SqlRow.from_dict(body)
r_snake.set(row)
Expand Down

0 comments on commit a03d950

Please sign in to comment.