From 9e1b07451f45f00c02a2ccb42081da0c77204ba0 Mon Sep 17 00:00:00 2001 From: Shuchang Zheng Date: Thu, 16 May 2024 17:11:49 -0700 Subject: [PATCH] update pre-commit (#330) --- .pre-commit-config.yaml | 12 +++++----- ...4_03_01_0537-99423c1dec60_create_tables.py | 1 + ...dd_title_error_code_mapping_and_errors_.py | 1 + ...10-ffe2f57bd288_create_output_parameter.py | 1 + ..._create_bitwarden_credential_parameter_.py | 1 + ...e24d0bc8e_add_orgs_max_retries_per_step.py | 1 + ...d7fecef9_add_new_indices_to_tasks_table.py | 1 + ...669a7_add_domain_to_organizations_table.py | 1 + ...20-68d78072fdb5_add_org_task_step_index.py | 1 + ...5e69_add_org_task_index_for_steps_table.py | 1 + ...2454ce498_add_max_steps_per_run_to_task.py | 1 + ..._add_workflow_permanent_id_and_version_.py | 1 + ...7_add_workflow_permanent_id_constraint_.py | 1 + ...dd_proxy_location_and_webhook_callback_.py | 1 + pyproject.toml | 1 - .../forge/sdk/api/llm/api_handler_factory.py | 8 ++++--- skyvern/forge/sdk/api/llm/models.py | 3 +-- skyvern/forge/sdk/workflow/service.py | 24 +++++++++++-------- skyvern/webeye/browser_factory.py | 3 +-- 19 files changed, 40 insertions(+), 24 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0307b32e..6242c417 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ default_language_version: python: python3.11 repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v4.6.0 hooks: - id: check-added-large-files args: ['--maxkb=5000'] @@ -15,13 +15,13 @@ repos: - id: detect-private-key - repo: https://github.com/pycqa/isort - rev: 5.12.0 + rev: 5.13.2 hooks: - id: isort language_version: python3.11 - repo: https://github.com/psf/black - rev: 23.11.0 + rev: 24.4.2 hooks: - id: black language_version: python3.11 @@ -35,7 +35,7 @@ repos: - id: python-use-type-annotations - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.7.0 + rev: v1.10.0 hooks: - id: mypy args: [--show-error-codes, --warn-unused-configs, --disallow-untyped-calls, --disallow-untyped-defs, --disallow-incomplete-defs, --check-untyped-defs, --python-version=3.11] @@ -54,7 +54,7 @@ repos: ) - repo: https://github.com/PyCQA/autoflake - rev: v2.2.1 + rev: v2.3.1 hooks: - id: autoflake name: autoflake @@ -69,7 +69,7 @@ repos: # pass_filenames: false # always_run: true - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v3.1.0" # Use the sha or tag you want to point at + rev: "v4.0.0-alpha.8" # Use the sha or tag you want to point at hooks: - id: prettier types: [javascript] diff --git a/alembic/versions/2024_03_01_0537-99423c1dec60_create_tables.py b/alembic/versions/2024_03_01_0537-99423c1dec60_create_tables.py index 9e3826e5..d12658cc 100644 --- a/alembic/versions/2024_03_01_0537-99423c1dec60_create_tables.py +++ b/alembic/versions/2024_03_01_0537-99423c1dec60_create_tables.py @@ -5,6 +5,7 @@ Revises: Create Date: 2024-03-01 05:37:31.862957+00:00 """ + from typing import Sequence, Union import sqlalchemy as sa diff --git a/alembic/versions/2024_03_13_0518-82a0c686152d_add_title_error_code_mapping_and_errors_.py b/alembic/versions/2024_03_13_0518-82a0c686152d_add_title_error_code_mapping_and_errors_.py index bef14419..7a008382 100644 --- a/alembic/versions/2024_03_13_0518-82a0c686152d_add_title_error_code_mapping_and_errors_.py +++ b/alembic/versions/2024_03_13_0518-82a0c686152d_add_title_error_code_mapping_and_errors_.py @@ -5,6 +5,7 @@ Revises: 99423c1dec60 Create Date: 2024-03-13 05:18:52.674264+00:00 """ + from typing import Sequence, Union import sqlalchemy as sa diff --git a/alembic/versions/2024_03_22_0010-ffe2f57bd288_create_output_parameter.py b/alembic/versions/2024_03_22_0010-ffe2f57bd288_create_output_parameter.py index 51b40501..054070c7 100644 --- a/alembic/versions/2024_03_22_0010-ffe2f57bd288_create_output_parameter.py +++ b/alembic/versions/2024_03_22_0010-ffe2f57bd288_create_output_parameter.py @@ -5,6 +5,7 @@ Revises: 82a0c686152d Create Date: 2024-03-22 00:10:16.225454+00:00 """ + from typing import Sequence, Union import sqlalchemy as sa diff --git a/alembic/versions/2024_04_03_2257-4630ab8c198e_create_bitwarden_credential_parameter_.py b/alembic/versions/2024_04_03_2257-4630ab8c198e_create_bitwarden_credential_parameter_.py index 62762e3d..70cff2f2 100644 --- a/alembic/versions/2024_04_03_2257-4630ab8c198e_create_bitwarden_credential_parameter_.py +++ b/alembic/versions/2024_04_03_2257-4630ab8c198e_create_bitwarden_credential_parameter_.py @@ -5,6 +5,7 @@ Revises: ffe2f57bd288 Create Date: 2024-04-03 22:57:03.231654+00:00 """ + from typing import Sequence, Union import sqlalchemy as sa diff --git a/alembic/versions/2024_04_08_2347-ea8e24d0bc8e_add_orgs_max_retries_per_step.py b/alembic/versions/2024_04_08_2347-ea8e24d0bc8e_add_orgs_max_retries_per_step.py index 5d984c6b..1a6602b9 100644 --- a/alembic/versions/2024_04_08_2347-ea8e24d0bc8e_add_orgs_max_retries_per_step.py +++ b/alembic/versions/2024_04_08_2347-ea8e24d0bc8e_add_orgs_max_retries_per_step.py @@ -5,6 +5,7 @@ Revises: 4630ab8c198e Create Date: 2024-04-08 23:47:46.306300+00:00 """ + from typing import Sequence, Union import sqlalchemy as sa diff --git a/alembic/versions/2024_04_09_0058-8335d7fecef9_add_new_indices_to_tasks_table.py b/alembic/versions/2024_04_09_0058-8335d7fecef9_add_new_indices_to_tasks_table.py index 964a9c84..825af6e4 100644 --- a/alembic/versions/2024_04_09_0058-8335d7fecef9_add_new_indices_to_tasks_table.py +++ b/alembic/versions/2024_04_09_0058-8335d7fecef9_add_new_indices_to_tasks_table.py @@ -5,6 +5,7 @@ Revises: ea8e24d0bc8e Create Date: 2024-04-09 00:58:53.060477+00:00 """ + from typing import Sequence, Union from alembic import op diff --git a/alembic/versions/2024_04_23_2153-24303f1669a7_add_domain_to_organizations_table.py b/alembic/versions/2024_04_23_2153-24303f1669a7_add_domain_to_organizations_table.py index 55497827..521457cb 100644 --- a/alembic/versions/2024_04_23_2153-24303f1669a7_add_domain_to_organizations_table.py +++ b/alembic/versions/2024_04_23_2153-24303f1669a7_add_domain_to_organizations_table.py @@ -5,6 +5,7 @@ Revises: 8335d7fecef9 Create Date: 2024-04-23 21:53:45.475199+00:00 """ + from typing import Sequence, Union import sqlalchemy as sa diff --git a/alembic/versions/2024_04_28_2320-68d78072fdb5_add_org_task_step_index.py b/alembic/versions/2024_04_28_2320-68d78072fdb5_add_org_task_step_index.py index 45ec8385..b4f00cbd 100644 --- a/alembic/versions/2024_04_28_2320-68d78072fdb5_add_org_task_step_index.py +++ b/alembic/versions/2024_04_28_2320-68d78072fdb5_add_org_task_step_index.py @@ -5,6 +5,7 @@ Revises: 24303f1669a7 Create Date: 2024-04-28 23:20:28.953686+00:00 """ + from typing import Sequence, Union from alembic import op diff --git a/alembic/versions/2024_05_05_0249-c4dca14a5e69_add_org_task_index_for_steps_table.py b/alembic/versions/2024_05_05_0249-c4dca14a5e69_add_org_task_index_for_steps_table.py index f3fc9f5b..0b95ebd7 100644 --- a/alembic/versions/2024_05_05_0249-c4dca14a5e69_add_org_task_index_for_steps_table.py +++ b/alembic/versions/2024_05_05_0249-c4dca14a5e69_add_org_task_index_for_steps_table.py @@ -5,6 +5,7 @@ Revises: 68d78072fdb5 Create Date: 2024-05-05 02:49:34.719311+00:00 """ + from typing import Sequence, Union from alembic import op diff --git a/alembic/versions/2024_05_11_2104-8792454ce498_add_max_steps_per_run_to_task.py b/alembic/versions/2024_05_11_2104-8792454ce498_add_max_steps_per_run_to_task.py index ed3eb185..3c9f9fa1 100644 --- a/alembic/versions/2024_05_11_2104-8792454ce498_add_max_steps_per_run_to_task.py +++ b/alembic/versions/2024_05_11_2104-8792454ce498_add_max_steps_per_run_to_task.py @@ -5,6 +5,7 @@ Revises: c4dca14a5e69 Create Date: 2024-05-11 21:04:38.384261+00:00 """ + from typing import Sequence, Union import sqlalchemy as sa diff --git a/alembic/versions/2024_05_14_0114-bf561125112f_add_workflow_permanent_id_and_version_.py b/alembic/versions/2024_05_14_0114-bf561125112f_add_workflow_permanent_id_and_version_.py index 6d4d27d0..859dad21 100644 --- a/alembic/versions/2024_05_14_0114-bf561125112f_add_workflow_permanent_id_and_version_.py +++ b/alembic/versions/2024_05_14_0114-bf561125112f_add_workflow_permanent_id_and_version_.py @@ -5,6 +5,7 @@ Revises: 8792454ce498 Create Date: 2024-05-14 01:14:15.024575+00:00 """ + from typing import Sequence, Union import sqlalchemy as sa diff --git a/alembic/versions/2024_05_14_0245-baec12642d77_add_workflow_permanent_id_constraint_.py b/alembic/versions/2024_05_14_0245-baec12642d77_add_workflow_permanent_id_constraint_.py index ecd13a0d..77785ca6 100644 --- a/alembic/versions/2024_05_14_0245-baec12642d77_add_workflow_permanent_id_constraint_.py +++ b/alembic/versions/2024_05_14_0245-baec12642d77_add_workflow_permanent_id_constraint_.py @@ -5,6 +5,7 @@ Revises: bf561125112f Create Date: 2024-05-14 02:45:11.284376+00:00 """ + from typing import Sequence, Union import sqlalchemy as sa diff --git a/alembic/versions/2024_05_16_1729-04bf06540db6_add_proxy_location_and_webhook_callback_.py b/alembic/versions/2024_05_16_1729-04bf06540db6_add_proxy_location_and_webhook_callback_.py index ea15052a..21fbfd61 100644 --- a/alembic/versions/2024_05_16_1729-04bf06540db6_add_proxy_location_and_webhook_callback_.py +++ b/alembic/versions/2024_05_16_1729-04bf06540db6_add_proxy_location_and_webhook_callback_.py @@ -5,6 +5,7 @@ Revises: baec12642d77 Create Date: 2024-05-16 17:29:55.083124+00:00 """ + from typing import Sequence, Union import sqlalchemy as sa diff --git a/pyproject.toml b/pyproject.toml index 4ca63469..93fa913d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -88,7 +88,6 @@ build-backend = "poetry.core.masonry.api" line-length = 120 target-version = ['py311'] include = '\.pyi?$' -packages = [] extend-exclude = '(/dist|/.venv|/venv|/build)/' [tool.isort] diff --git a/skyvern/forge/sdk/api/llm/api_handler_factory.py b/skyvern/forge/sdk/api/llm/api_handler_factory.py index 390cc4b4..e69b2c58 100644 --- a/skyvern/forge/sdk/api/llm/api_handler_factory.py +++ b/skyvern/forge/sdk/api/llm/api_handler_factory.py @@ -37,9 +37,11 @@ class LLMAPIHandlerFactory: redis_port=llm_config.redis_port, redis_password=llm_config.redis_password, routing_strategy=llm_config.routing_strategy, - fallbacks=[{llm_config.main_model_group: llm_config.fallback_model_group}] - if llm_config.fallback_model_group - else [], + fallbacks=( + [{llm_config.main_model_group: llm_config.fallback_model_group}] + if llm_config.fallback_model_group + else [] + ), num_retries=llm_config.num_retries, retry_after=llm_config.retry_delay_seconds, set_verbose=False if SettingsManager.get_settings().is_cloud_environment() else llm_config.set_verbose, diff --git a/skyvern/forge/sdk/api/llm/models.py b/skyvern/forge/sdk/api/llm/models.py index 940b0330..fc8c6909 100644 --- a/skyvern/forge/sdk/api/llm/models.py +++ b/skyvern/forge/sdk/api/llm/models.py @@ -59,5 +59,4 @@ class LLMAPIHandler(Protocol): step: Step | None = None, screenshots: list[bytes] | None = None, parameters: dict[str, Any] | None = None, - ) -> Awaitable[dict[str, Any]]: - ... + ) -> Awaitable[dict[str, Any]]: ... diff --git a/skyvern/forge/sdk/workflow/service.py b/skyvern/forge/sdk/workflow/service.py index c7b96889..c9c886e1 100644 --- a/skyvern/forge/sdk/workflow/service.py +++ b/skyvern/forge/sdk/workflow/service.py @@ -548,10 +548,10 @@ class WorkflowService: workflow_parameter_tuples = await app.DATABASE.get_workflow_run_parameters(workflow_run_id=workflow_run_id) parameters_with_value = {wfp.key: wfrp.value for wfp, wfrp in workflow_parameter_tuples} - output_parameter_tuples: list[ - tuple[OutputParameter, WorkflowRunOutputParameter] - ] = await self.get_output_parameter_workflow_run_output_parameter_tuples( - workflow_id=workflow_id, workflow_run_id=workflow_run_id + output_parameter_tuples: list[tuple[OutputParameter, WorkflowRunOutputParameter]] = ( + await self.get_output_parameter_workflow_run_output_parameter_tuples( + workflow_id=workflow_id, workflow_run_id=workflow_run_id + ) ) if output_parameter_tuples: outputs = {output_parameter.key: output.value for output_parameter, output in output_parameter_tuples} @@ -938,9 +938,11 @@ class WorkflowService: return CodeBlock( label=block_yaml.label, code=block_yaml.code, - parameters=[parameters[parameter_key] for parameter_key in block_yaml.parameter_keys] - if block_yaml.parameter_keys - else [], + parameters=( + [parameters[parameter_key] for parameter_key in block_yaml.parameter_keys] + if block_yaml.parameter_keys + else [] + ), output_parameter=output_parameter, ) elif block_yaml.block_type == BlockType.TEXT_PROMPT: @@ -948,9 +950,11 @@ class WorkflowService: label=block_yaml.label, llm_key=block_yaml.llm_key, prompt=block_yaml.prompt, - parameters=[parameters[parameter_key] for parameter_key in block_yaml.parameter_keys] - if block_yaml.parameter_keys - else [], + parameters=( + [parameters[parameter_key] for parameter_key in block_yaml.parameter_keys] + if block_yaml.parameter_keys + else [] + ), json_schema=block_yaml.json_schema, output_parameter=output_parameter, ) diff --git a/skyvern/webeye/browser_factory.py b/skyvern/webeye/browser_factory.py index 85edb750..e083050b 100644 --- a/skyvern/webeye/browser_factory.py +++ b/skyvern/webeye/browser_factory.py @@ -29,8 +29,7 @@ LOG = structlog.get_logger() class BrowserContextCreator(Protocol): def __call__( self, playwright: Playwright, **kwargs: dict[str, Any] - ) -> Awaitable[tuple[BrowserContext, BrowserArtifacts]]: - ... + ) -> Awaitable[tuple[BrowserContext, BrowserArtifacts]]: ... class BrowserContextFactory: