From 2484ac2821a4e77c447f812becb07446e30b5ef6 Mon Sep 17 00:00:00 2001 From: IgorChvyrov-sm Date: Wed, 22 Oct 2025 09:02:19 +0300 Subject: [PATCH 01/17] Introduced mypy --- .pre-commit-config.yaml | 21 +++++++--- poetry.lock | 87 ++++++++++++++++++++++++++++++++++++++++- pyproject.toml | 40 +++++++++++++++++++ 3 files changed, 142 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a79f2621..79b3216c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -24,11 +24,22 @@ repos: - id: poetry-check - id: poetry-lock - # - repo: https://github.com/pre-commit/mirrors-mypy - # rev: v1.15.0 - # hooks: - # - id: mypy - # pass_filenames: false + - repo: https://github.com/pre-commit/mirrors-mypy + rev: v1.15.0 + hooks: + - id: mypy + pass_filenames: false + args: ["src/"] + additional_dependencies: + - types-six + - types-python-dateutil + - types-requests + - types-deprecated + - pydantic + - aiohttp + - aiohttp-retry + - httpx + - astor - repo: https://github.com/astral-sh/ruff-pre-commit rev: v0.12.3 diff --git a/poetry.lock b/poetry.lock index fe61b7a8..427f32ee 100644 --- a/poetry.lock +++ b/poetry.lock @@ -984,6 +984,79 @@ files = [ [package.dependencies] typing-extensions = {version = ">=4.1.0", markers = "python_version < \"3.11\""} +[[package]] +name = "mypy" +version = "1.18.2" +description = "Optional static typing for Python" +optional = false +python-versions = ">=3.9" +groups = ["dev"] +files = [ + {file = "mypy-1.18.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c1eab0cf6294dafe397c261a75f96dc2c31bffe3b944faa24db5def4e2b0f77c"}, + {file = "mypy-1.18.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:7a780ca61fc239e4865968ebc5240bb3bf610ef59ac398de9a7421b54e4a207e"}, + {file = "mypy-1.18.2-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:448acd386266989ef11662ce3c8011fd2a7b632e0ec7d61a98edd8e27472225b"}, + {file = "mypy-1.18.2-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f9e171c465ad3901dc652643ee4bffa8e9fef4d7d0eece23b428908c77a76a66"}, + {file = "mypy-1.18.2-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:592ec214750bc00741af1f80cbf96b5013d81486b7bb24cb052382c19e40b428"}, + {file = "mypy-1.18.2-cp310-cp310-win_amd64.whl", hash = "sha256:7fb95f97199ea11769ebe3638c29b550b5221e997c63b14ef93d2e971606ebed"}, + {file = "mypy-1.18.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:807d9315ab9d464125aa9fcf6d84fde6e1dc67da0b6f80e7405506b8ac72bc7f"}, + {file = "mypy-1.18.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:776bb00de1778caf4db739c6e83919c1d85a448f71979b6a0edd774ea8399341"}, + {file = "mypy-1.18.2-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1379451880512ffce14505493bd9fe469e0697543717298242574882cf8cdb8d"}, + {file = "mypy-1.18.2-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1331eb7fd110d60c24999893320967594ff84c38ac6d19e0a76c5fd809a84c86"}, + {file = "mypy-1.18.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:3ca30b50a51e7ba93b00422e486cbb124f1c56a535e20eff7b2d6ab72b3b2e37"}, + {file = "mypy-1.18.2-cp311-cp311-win_amd64.whl", hash = "sha256:664dc726e67fa54e14536f6e1224bcfce1d9e5ac02426d2326e2bb4e081d1ce8"}, + {file = "mypy-1.18.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:33eca32dd124b29400c31d7cf784e795b050ace0e1f91b8dc035672725617e34"}, + {file = "mypy-1.18.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a3c47adf30d65e89b2dcd2fa32f3aeb5e94ca970d2c15fcb25e297871c8e4764"}, + {file = "mypy-1.18.2-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5d6c838e831a062f5f29d11c9057c6009f60cb294fea33a98422688181fe2893"}, + {file = "mypy-1.18.2-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:01199871b6110a2ce984bde85acd481232d17413868c9807e95c1b0739a58914"}, + {file = "mypy-1.18.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:a2afc0fa0b0e91b4599ddfe0f91e2c26c2b5a5ab263737e998d6817874c5f7c8"}, + {file = "mypy-1.18.2-cp312-cp312-win_amd64.whl", hash = "sha256:d8068d0afe682c7c4897c0f7ce84ea77f6de953262b12d07038f4d296d547074"}, + {file = "mypy-1.18.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:07b8b0f580ca6d289e69209ec9d3911b4a26e5abfde32228a288eb79df129fcc"}, + {file = "mypy-1.18.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:ed4482847168439651d3feee5833ccedbf6657e964572706a2adb1f7fa4dfe2e"}, + {file = "mypy-1.18.2-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c3ad2afadd1e9fea5cf99a45a822346971ede8685cc581ed9cd4d42eaf940986"}, + {file = "mypy-1.18.2-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a431a6f1ef14cf8c144c6b14793a23ec4eae3db28277c358136e79d7d062f62d"}, + {file = "mypy-1.18.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:7ab28cc197f1dd77a67e1c6f35cd1f8e8b73ed2217e4fc005f9e6a504e46e7ba"}, + {file = "mypy-1.18.2-cp313-cp313-win_amd64.whl", hash = "sha256:0e2785a84b34a72ba55fb5daf079a1003a34c05b22238da94fcae2bbe46f3544"}, + {file = "mypy-1.18.2-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:62f0e1e988ad41c2a110edde6c398383a889d95b36b3e60bcf155f5164c4fdce"}, + {file = "mypy-1.18.2-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:8795a039bab805ff0c1dfdb8cd3344642c2b99b8e439d057aba30850b8d3423d"}, + {file = "mypy-1.18.2-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6ca1e64b24a700ab5ce10133f7ccd956a04715463d30498e64ea8715236f9c9c"}, + {file = "mypy-1.18.2-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d924eef3795cc89fecf6bedc6ed32b33ac13e8321344f6ddbf8ee89f706c05cb"}, + {file = "mypy-1.18.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:20c02215a080e3a2be3aa50506c67242df1c151eaba0dcbc1e4e557922a26075"}, + {file = "mypy-1.18.2-cp314-cp314-win_amd64.whl", hash = "sha256:749b5f83198f1ca64345603118a6f01a4e99ad4bf9d103ddc5a3200cc4614adf"}, + {file = "mypy-1.18.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:25a9c8fb67b00599f839cf472713f54249a62efd53a54b565eb61956a7e3296b"}, + {file = "mypy-1.18.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c2b9c7e284ee20e7598d6f42e13ca40b4928e6957ed6813d1ab6348aa3f47133"}, + {file = "mypy-1.18.2-cp39-cp39-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d6985ed057513e344e43a26cc1cd815c7a94602fb6a3130a34798625bc2f07b6"}, + {file = "mypy-1.18.2-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:22f27105f1525ec024b5c630c0b9f36d5c1cc4d447d61fe51ff4bd60633f47ac"}, + {file = "mypy-1.18.2-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:030c52d0ea8144e721e49b1f68391e39553d7451f0c3f8a7565b59e19fcb608b"}, + {file = "mypy-1.18.2-cp39-cp39-win_amd64.whl", hash = "sha256:aa5e07ac1a60a253445797e42b8b2963c9675563a94f11291ab40718b016a7a0"}, + {file = "mypy-1.18.2-py3-none-any.whl", hash = "sha256:22a1748707dd62b58d2ae53562ffc4d7f8bcc727e8ac7cbc69c053ddc874d47e"}, + {file = "mypy-1.18.2.tar.gz", hash = "sha256:06a398102a5f203d7477b2923dda3634c36727fa5c237d8f859ef90c42a9924b"}, +] + +[package.dependencies] +mypy_extensions = ">=1.0.0" +pathspec = ">=0.9.0" +tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} +typing_extensions = ">=4.6.0" + +[package.extras] +dmypy = ["psutil (>=4.0)"] +faster-cache = ["orjson"] +install-types = ["pip"] +mypyc = ["setuptools (>=50)"] +reports = ["lxml"] + +[[package]] +name = "mypy-extensions" +version = "1.1.0" +description = "Type system extensions for programs checked with the mypy type checker." +optional = false +python-versions = ">=3.8" +groups = ["dev"] +files = [ + {file = "mypy_extensions-1.1.0-py3-none-any.whl", hash = "sha256:1be4cccdb0f2482337c4743e60421de3a356cd97508abadd57d47403e94f5505"}, + {file = "mypy_extensions-1.1.0.tar.gz", hash = "sha256:52e68efc3284861e772bbcd66823fde5ae21fd2fdb51c62a211403730b916558"}, +] + [[package]] name = "nodeenv" version = "1.9.1" @@ -1008,6 +1081,18 @@ files = [ {file = "packaging-25.0.tar.gz", hash = "sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f"}, ] +[[package]] +name = "pathspec" +version = "0.12.1" +description = "Utility library for gitignore style pattern matching of file paths." +optional = false +python-versions = ">=3.8" +groups = ["dev"] +files = [ + {file = "pathspec-0.12.1-py3-none-any.whl", hash = "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08"}, + {file = "pathspec-0.12.1.tar.gz", hash = "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712"}, +] + [[package]] name = "platformdirs" version = "4.3.8" @@ -1965,4 +2050,4 @@ propcache = ">=0.2.1" [metadata] lock-version = "2.1" python-versions = ">=3.9" -content-hash = "143daf87979e591c10779700ba2910a80adb2fbd96b68ad2004d093690cb7c85" +content-hash = "726b9ad928addfb0a202e87814e891b838333b2effd5e4c04e7902af78601172" diff --git a/pyproject.toml b/pyproject.toml index 46294c4a..01919908 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,6 +49,7 @@ setuptools = "^80.9.0" pytest = "^8.4.1" pytest-mock = "^3.14.1" pytest-asyncio = "^1.1.0" +mypy = "^1.18.2" [tool.ruff] target-version = "py39" @@ -205,3 +206,42 @@ markers = [ "v5_2_6: mark test to run for version 5.2.6", "v3_21_16: mark test to run for version 3.21.16" ] + +[tool.mypy] +python_version = "3.9" +follow_imports = "silent" + +plugins = [ + "pydantic.mypy" +] + +[[tool.mypy.overrides]] +module = [ + "conductor.client.http.*", + "conductor.client.codegen.*", + "conductor.client.orkes.api.*", + "conductor.asyncio_client.http.*" +] +ignore_errors = true + +[[tool.mypy.overrides]] +module = [ + "tests.*", + "examples.*" +] +disable_error_code = [ + "attr-defined", + "no-untyped-def" +] + +[[tool.mypy.overrides]] +module = [ + "prometheus_client.*", + "shortuuid", + "dacite.*", + "aiohttp.*", + "aiohttp_retry.*", + "httpx.*", + "astor.*" +] +ignore_missing_imports = true From e6b9bd6f6bd0bb9d2b687ba425c0a41af730fe52 Mon Sep 17 00:00:00 2001 From: IgorChvyrov-sm Date: Wed, 22 Oct 2025 10:11:27 +0300 Subject: [PATCH 02/17] Fixed mypy issues for authorization and application resources --- .../adapters/api/application_resource_api.py | 35 +++++- .../adapters/api/group_resource_api.py | 13 ++- .../adapters/api/user_resource_api.py | 10 +- .../asyncio_client/automator/task_handler.py | 17 ++- .../orkes/orkes_authorization_client.py | 102 +++++++++--------- .../orkes/orkes_integration_client.py | 2 +- .../orkes/orkes_metadata_client.py | 2 +- .../orkes/orkes_prompt_client.py | 2 +- .../orkes/orkes_scheduler_client.py | 2 +- .../orkes/orkes_schema_client.py | 2 +- .../orkes/orkes_secret_client.py | 2 +- .../asyncio_client/orkes/orkes_task_client.py | 2 +- .../orkes/orkes_workflow_client.py | 2 +- .../workflow/conductor_workflow.py | 64 +++++------ .../workflow/executor/workflow_executor.py | 22 ++-- .../client/adapters/models/parser_adapter.py | 5 +- .../models/prompt_test_request_adapter.py | 2 +- .../models/proto_registry_entry_adapter.py | 2 +- .../client/configuration/configuration.py | 8 +- .../client/event/queue/queue_configuration.py | 6 +- .../client/orkes/models/access_key.py | 25 +++-- .../client/orkes/models/created_access_key.py | 21 ++-- .../workflow/task/kafka_publish_input.py | 20 ++-- .../task/llm_tasks/utils/embedding_model.py | 10 +- .../workflow/task/llm_tasks/utils/prompt.py | 16 +-- src/conductor/shared/automator/utils.py | 4 +- .../shared/event/configuration/queue.py | 6 +- 27 files changed, 225 insertions(+), 179 deletions(-) diff --git a/src/conductor/asyncio_client/adapters/api/application_resource_api.py b/src/conductor/asyncio_client/adapters/api/application_resource_api.py index d02ba2e5..50364a31 100644 --- a/src/conductor/asyncio_client/adapters/api/application_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/application_resource_api.py @@ -1,9 +1,12 @@ -from typing import List +from typing import List, Optional from pydantic import StrictStr from conductor.asyncio_client.http.api import ApplicationResourceApi -from conductor.asyncio_client.http.models import Tag +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter +from conductor.asyncio_client.adapters.models.extended_conductor_application_adapter import ( + ExtendedConductorApplicationAdapter, +) class ApplicationResourceApiAdapter(ApplicationResourceApi): @@ -58,7 +61,9 @@ async def remove_role_from_application_user( application_id, role, *args, **kwargs ) - async def get_app_by_access_key_id(self, access_key_id: StrictStr, *args, **kwargs): + async def get_app_by_access_key_id( + self, access_key_id: StrictStr, *args, **kwargs + ) -> Optional[ExtendedConductorApplicationAdapter]: # Convert empty access_key_id to None to prevent sending invalid data to server if not access_key_id: access_key_id = None @@ -86,8 +91,18 @@ async def get_tags_for_application(self, application_id: StrictStr, *args, **kwa application_id = None return await super().get_tags_for_application(application_id, *args, **kwargs) + async def put_tag_for_application( + self, id: StrictStr, tag: List[TagAdapter], *args, **kwargs + ) -> None: + # Convert empty application id and tag list to None to prevent sending invalid data to server + if not id: + id = None + if not tag: + tag = None + return await super().put_tag_for_application(id, tag, *args, **kwargs) + async def delete_tag_for_application( - self, id: StrictStr, tag: List[Tag], *args, **kwargs + self, id: StrictStr, tag: List[TagAdapter], *args, **kwargs ) -> None: # Convert empty application id and tag list to None to prevent sending invalid data to server if not id: @@ -95,3 +110,15 @@ async def delete_tag_for_application( if not tag: tag = None return await super().delete_tag_for_application(id, tag, *args, **kwargs) + + async def create_application(self, *args, **kwargs) -> ExtendedConductorApplicationAdapter: + return await super().create_application(*args, **kwargs) + + async def update_application(self, *args, **kwargs) -> ExtendedConductorApplicationAdapter: + return await super().update_application(*args, **kwargs) + + async def get_application(self, *args, **kwargs) -> ExtendedConductorApplicationAdapter: + return await super().get_application(*args, **kwargs) + + async def list_applications(self, *args, **kwargs) -> List[ExtendedConductorApplicationAdapter]: + return await super().list_applications(*args, **kwargs) diff --git a/src/conductor/asyncio_client/adapters/api/group_resource_api.py b/src/conductor/asyncio_client/adapters/api/group_resource_api.py index 4d3484e2..c176ef49 100644 --- a/src/conductor/asyncio_client/adapters/api/group_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/group_resource_api.py @@ -1,4 +1,15 @@ +from typing import List + from conductor.asyncio_client.http.api import GroupResourceApi +from conductor.asyncio_client.adapters.models.group_adapter import GroupAdapter + + +class GroupResourceApiAdapter(GroupResourceApi): + async def list_groups(self, *args, **kwargs) -> List[GroupAdapter]: + return await super().list_groups(*args, **kwargs) + async def get_group(self, *args, **kwargs) -> GroupAdapter: + return await super().get_group(*args, **kwargs) -class GroupResourceApiAdapter(GroupResourceApi): ... + async def upsert_group(self, *args, **kwargs) -> GroupAdapter: + return await super().upsert_group(*args, **kwargs) diff --git a/src/conductor/asyncio_client/adapters/api/user_resource_api.py b/src/conductor/asyncio_client/adapters/api/user_resource_api.py index 9c4167b8..a638ec4d 100644 --- a/src/conductor/asyncio_client/adapters/api/user_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/user_resource_api.py @@ -1,7 +1,10 @@ +from typing import List + from pydantic import StrictStr from conductor.asyncio_client.http.api import UserResourceApi from conductor.asyncio_client.adapters.models import UpsertUserRequestAdapter as UpsertUserRequest +from conductor.asyncio_client.adapters.models.conductor_user_adapter import ConductorUserAdapter class UserResourceApiAdapter(UserResourceApi): @@ -21,7 +24,7 @@ async def get_user( id: StrictStr, *args, **kwargs, - ) -> object: + ) -> ConductorUserAdapter: # Convert empty user id to None to prevent sending invalid data to server if not id: id = None @@ -33,12 +36,15 @@ async def upsert_user( upsert_user_request: UpsertUserRequest, *args, **kwargs, - ) -> object: + ) -> ConductorUserAdapter: # Convert empty user id to None to prevent sending invalid data to server if not id: id = None return await super().upsert_user(id, upsert_user_request, *args, **kwargs) + async def list_users(self, *args, **kwargs) -> List[ConductorUserAdapter]: + return await super().list_users(*args, **kwargs) + async def delete_user( self, id: StrictStr, diff --git a/src/conductor/asyncio_client/automator/task_handler.py b/src/conductor/asyncio_client/automator/task_handler.py index 7a29cd42..9bc7992f 100644 --- a/src/conductor/asyncio_client/automator/task_handler.py +++ b/src/conductor/asyncio_client/automator/task_handler.py @@ -51,13 +51,13 @@ def register_decorated_fn( class TaskHandler: def __init__( self, - workers: Optional[List[WorkerInterface]] = None, - configuration: Optional[Configuration] = None, - metrics_settings: Optional[MetricsSettings] = None, + workers: List[WorkerInterface], + configuration: Configuration, + metrics_settings: MetricsSettings, scan_for_annotated_workers: bool = True, - import_modules: Optional[List[str]] = None, + import_modules: List[str] = [], ): - workers = workers or [] + self.metrics_provider_process: Optional[Process] = None self.logger_process, self.queue = _setup_logging_queue(configuration) # imports @@ -68,8 +68,6 @@ def __init__( logger.debug("Loading module %s", module) importlib.import_module(module) - elif not isinstance(workers, list): - workers = [workers] if scan_for_annotated_workers is True: for (task_def_name, domain), record in _decorated_functions.items(): fn = record["func"] @@ -128,6 +126,7 @@ def __create_metrics_provider_process(self, metrics_settings: MetricsSettings) - if metrics_settings is None: self.metrics_provider_process = None return + self.metrics_provider_process = Process( target=self.coroutine_as_process_target, args=(AsyncMetricsCollector.provide_metrics, metrics_settings), @@ -140,7 +139,7 @@ def __create_task_runner_processes( configuration: Configuration, metrics_settings: MetricsSettings, ) -> None: - self.task_runner_processes = [] + self.task_runner_processes: List[Process] = [] for worker in workers: self.__create_task_runner_process(worker, configuration, metrics_settings) @@ -208,7 +207,7 @@ def __stop_process(self, process: Process): # Setup centralized logging queue def _setup_logging_queue(configuration: Configuration): - queue = Queue() + queue: Queue[Optional[logging.LogRecord]] = Queue() if configuration: configuration.apply_logging_config() log_level = configuration.log_level diff --git a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py index af3283f7..a22e8a8d 100644 --- a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py @@ -1,22 +1,22 @@ from __future__ import annotations -from typing import List +from typing import List, Dict, Any, cast, Optional from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.authorization_request_adapter import ( AuthorizationRequestAdapter as AuthorizationRequest, ) from conductor.asyncio_client.adapters.models.conductor_user_adapter import ( - ConductorUserAdapter as ConductorUser, + ConductorUserAdapter, ) from conductor.asyncio_client.adapters.models.extended_conductor_application_adapter import ( - ExtendedConductorApplicationAdapter as ExtendedConductorApplication, + ExtendedConductorApplicationAdapter, ) from conductor.asyncio_client.adapters.models.granted_access_adapter import ( GrantedAccessAdapter as GrantedAccess, ) -from conductor.asyncio_client.adapters.models.group_adapter import GroupAdapter as Group -from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter as Tag +from conductor.asyncio_client.adapters.models.group_adapter import GroupAdapter +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.adapters.models.target_ref_adapter import ( TargetRefAdapter as TargetRef, ) @@ -38,86 +38,83 @@ def __init__(self, configuration: Configuration, api_client: ApiClient): # User Operations async def create_user( self, user_id: str, upsert_user_request: UpsertUserRequest - ) -> ConductorUser: + ) -> ConductorUserAdapter: """Create a new user""" return await self.user_api.upsert_user(id=user_id, upsert_user_request=upsert_user_request) async def update_user( self, user_id: str, upsert_user_request: UpsertUserRequest - ) -> ConductorUser: + ) -> ConductorUserAdapter: """Update an existing user""" return await self.user_api.upsert_user(id=user_id, upsert_user_request=upsert_user_request) - async def get_user(self, user_id: str) -> ConductorUser: + async def get_user(self, user_id: str) -> ConductorUserAdapter: """Get user by ID""" - user = await self.user_api.get_user(id=user_id) - - return ConductorUser.from_dict(user) + return await self.user_api.get_user(id=user_id) async def delete_user(self, user_id: str) -> None: """Delete user by ID""" await self.user_api.delete_user(id=user_id) - async def list_users(self, include_apps: bool = False) -> List[ConductorUser]: + async def list_users(self, include_apps: bool = False) -> List[ConductorUserAdapter]: """List all users""" return await self.user_api.list_users(apps=include_apps) # Application Operations async def create_application( - self, application: ExtendedConductorApplication - ) -> ExtendedConductorApplication: + self, application: ExtendedConductorApplicationAdapter + ) -> ExtendedConductorApplicationAdapter: """Create a new application""" - app = await self.application_api.create_application( + return await self.application_api.create_application( create_or_update_application_request=application ) - return ExtendedConductorApplication.from_dict(app) async def update_application( - self, application_id: str, application: ExtendedConductorApplication - ) -> ExtendedConductorApplication: + self, application_id: str, application: ExtendedConductorApplicationAdapter + ) -> ExtendedConductorApplicationAdapter: """Update an existing application""" - app = await self.application_api.update_application( + return await self.application_api.update_application( id=application_id, create_or_update_application_request=application ) - return ExtendedConductorApplication.from_dict(app) - async def get_application(self, application_id: str) -> ExtendedConductorApplication: + async def get_application(self, application_id: str) -> ExtendedConductorApplicationAdapter: """Get application by ID""" - app = await self.application_api.get_application(id=application_id) - return ExtendedConductorApplication.from_dict(app) + return await self.application_api.get_application(id=application_id) async def delete_application(self, application_id: str) -> None: """Delete application by ID""" await self.application_api.delete_application(id=application_id) - async def list_applications(self) -> List[ExtendedConductorApplication]: + async def list_applications(self) -> List[ExtendedConductorApplicationAdapter]: """List all applications""" return await self.application_api.list_applications() # Group Operations - async def create_group(self, group_id: str, upsert_group_request: UpsertGroupRequest) -> Group: + async def create_group( + self, group_id: str, upsert_group_request: UpsertGroupRequest + ) -> GroupAdapter: """Create a new group""" return await self.group_api.upsert_group( id=group_id, upsert_group_request=upsert_group_request ) - async def update_group(self, group_id: str, upsert_group_request: UpsertGroupRequest) -> Group: + async def update_group( + self, group_id: str, upsert_group_request: UpsertGroupRequest + ) -> GroupAdapter: """Update an existing group""" - group = await self.group_api.upsert_group( + return await self.group_api.upsert_group( id=group_id, upsert_group_request=upsert_group_request ) - return Group.from_dict(group) - async def get_group(self, group_id: str) -> Group: + async def get_group(self, group_id: str) -> GroupAdapter: """Get group by ID""" - group = await self.group_api.get_group(id=group_id) - return Group.from_dict(group) + return await self.group_api.get_group(id=group_id) async def delete_group(self, group_id: str) -> None: """Delete group by ID""" await self.group_api.delete_group(id=group_id) - async def list_groups(self) -> List[Group]: + async def list_groups(self) -> List[GroupAdapter]: """List all groups""" return await self.group_api.list_groups() @@ -130,11 +127,11 @@ async def remove_user_from_group(self, group_id: str, user_id: str) -> object: """Remove a user from a group""" return await self.group_api.remove_user_from_group(group_id=group_id, user_id=user_id) - async def add_users_to_group(self, group_id: str, user_ids: List[str]) -> object: + async def add_users_to_group(self, group_id: str, user_ids: List[str]) -> None: """Add multiple users to a group""" return await self.group_api.add_users_to_group(group_id=group_id, request_body=user_ids) - async def remove_users_from_group(self, group_id: str, user_ids: List[str]) -> object: + async def remove_users_from_group(self, group_id: str, user_ids: List[str]) -> None: """Remove multiple users from a group""" return await self.group_api.remove_users_from_group( group_id=group_id, request_body=user_ids @@ -168,23 +165,23 @@ async def get_group_permissions(self, group_id: str) -> object: # Convenience Methods async def upsert_user( self, user_id: str, upsert_user_request: UpsertUserRequest - ) -> ConductorUser: + ) -> ConductorUserAdapter: """Alias for create_user/update_user""" - user = await self.create_user(user_id, upsert_user_request) - return ConductorUser.from_dict(user) + return await self.create_user(user_id, upsert_user_request) - async def upsert_group(self, group_id: str, upsert_group_request: UpsertGroupRequest) -> Group: + async def upsert_group( + self, group_id: str, upsert_group_request: UpsertGroupRequest + ) -> GroupAdapter: """Alias for create_group/update_group""" - group = await self.create_group(group_id, upsert_group_request) - return Group.from_dict(group) + return await self.create_group(group_id, upsert_group_request) - async def set_application_tags(self, tags: List[Tag], application_id: str): + async def set_application_tags(self, tags: List[TagAdapter], application_id: str): await self.application_api.put_tag_for_application(application_id, tags) - async def get_application_tags(self, application_id: str) -> List[Tag]: + async def get_application_tags(self, application_id: str) -> List[TagAdapter]: return await self.application_api.get_tags_for_application(application_id) - async def delete_application_tags(self, tags: List[Tag], application_id: str): + async def delete_application_tags(self, tags: List[TagAdapter], application_id: str): await self.application_api.delete_tag_for_application(application_id, tags) async def create_access_key(self, application_id: str) -> AccessKey: @@ -210,15 +207,25 @@ async def remove_role_from_application_user(self, application_id: str, role: str async def get_granted_permissions_for_group(self, group_id: str) -> List[GrantedAccess]: granted_access_obj = await self.group_api.get_granted_permissions1(group_id) + + if not granted_access_obj.granted_access: + return [] + granted_permissions = [] for ga in granted_access_obj.granted_access: + if not ga.target: + continue + target = TargetRef(type=ga.target.type, id=ga.target.id) access = ga.access granted_permissions.append(GrantedAccess(target=target, access=access)) + return granted_permissions async def get_granted_permissions_for_user(self, user_id: str) -> List[GrantedAccess]: - granted_access_obj = await self.user_api.get_granted_permissions(user_id) + granted_access_obj = cast( + Dict[str, Any], await self.user_api.get_granted_permissions(user_id) + ) granted_permissions = [] for ga in granted_access_obj["grantedAccess"]: target = TargetRef(type=ga["target"]["type"], id=ga["target"]["id"]) @@ -228,8 +235,5 @@ async def get_granted_permissions_for_user(self, user_id: str) -> List[GrantedAc async def get_app_by_access_key_id( self, access_key_id: str, *args, **kwargs - ) -> ExtendedConductorApplication: - application_access_key_obj = await self.application_api.get_app_by_access_key_id( - access_key_id, *args, **kwargs - ) - return ExtendedConductorApplication.from_dict(application_access_key_obj) + ) -> Optional[ExtendedConductorApplicationAdapter]: + return await self.application_api.get_app_by_access_key_id(access_key_id, *args, **kwargs) diff --git a/src/conductor/asyncio_client/orkes/orkes_integration_client.py b/src/conductor/asyncio_client/orkes/orkes_integration_client.py index 9753a2ba..795549d1 100644 --- a/src/conductor/asyncio_client/orkes/orkes_integration_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_integration_client.py @@ -2,7 +2,7 @@ from typing import Optional, List, Dict from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.http.configuration import Configuration +from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.adapters.models.integration_adapter import IntegrationAdapter from conductor.asyncio_client.adapters.models.integration_api_adapter import IntegrationApiAdapter from conductor.asyncio_client.adapters.models.integration_api_update_adapter import ( diff --git a/src/conductor/asyncio_client/orkes/orkes_metadata_client.py b/src/conductor/asyncio_client/orkes/orkes_metadata_client.py index 63928b4c..fa87125e 100644 --- a/src/conductor/asyncio_client/orkes/orkes_metadata_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_metadata_client.py @@ -12,7 +12,7 @@ from conductor.asyncio_client.adapters.models.workflow_def_adapter import WorkflowDefAdapter from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.http.configuration import Configuration +from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient diff --git a/src/conductor/asyncio_client/orkes/orkes_prompt_client.py b/src/conductor/asyncio_client/orkes/orkes_prompt_client.py index 20e04391..f5400fcb 100644 --- a/src/conductor/asyncio_client/orkes/orkes_prompt_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_prompt_client.py @@ -10,7 +10,7 @@ ) from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.http.configuration import Configuration +from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient diff --git a/src/conductor/asyncio_client/orkes/orkes_scheduler_client.py b/src/conductor/asyncio_client/orkes/orkes_scheduler_client.py index 3935483f..514c9b40 100644 --- a/src/conductor/asyncio_client/orkes/orkes_scheduler_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_scheduler_client.py @@ -19,7 +19,7 @@ WorkflowScheduleModelAdapter, ) from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.http.configuration import Configuration +from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient diff --git a/src/conductor/asyncio_client/orkes/orkes_schema_client.py b/src/conductor/asyncio_client/orkes/orkes_schema_client.py index 39a67ef8..649cb489 100644 --- a/src/conductor/asyncio_client/orkes/orkes_schema_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_schema_client.py @@ -4,7 +4,7 @@ from conductor.asyncio_client.adapters.models.schema_def_adapter import SchemaDefAdapter from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.http.configuration import Configuration +from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient diff --git a/src/conductor/asyncio_client/orkes/orkes_secret_client.py b/src/conductor/asyncio_client/orkes/orkes_secret_client.py index 597485b5..e4bebd75 100644 --- a/src/conductor/asyncio_client/orkes/orkes_secret_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_secret_client.py @@ -5,7 +5,7 @@ from conductor.asyncio_client.adapters.models.extended_secret_adapter import ExtendedSecretAdapter from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.http.configuration import Configuration +from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient diff --git a/src/conductor/asyncio_client/orkes/orkes_task_client.py b/src/conductor/asyncio_client/orkes/orkes_task_client.py index 683a3def..a117401a 100644 --- a/src/conductor/asyncio_client/orkes/orkes_task_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_task_client.py @@ -10,7 +10,7 @@ from conductor.asyncio_client.adapters.models.task_exec_log_adapter import TaskExecLogAdapter from conductor.asyncio_client.adapters.models.task_result_adapter import TaskResultAdapter from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.http.configuration import Configuration +from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient diff --git a/src/conductor/asyncio_client/orkes/orkes_workflow_client.py b/src/conductor/asyncio_client/orkes/orkes_workflow_client.py index ec5586c6..0bf43b2b 100644 --- a/src/conductor/asyncio_client/orkes/orkes_workflow_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_workflow_client.py @@ -28,7 +28,7 @@ WorkflowTestRequestAdapter, ) from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.http.configuration import Configuration +from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient diff --git a/src/conductor/asyncio_client/workflow/conductor_workflow.py b/src/conductor/asyncio_client/workflow/conductor_workflow.py index 9f1d1ae0..184d423a 100644 --- a/src/conductor/asyncio_client/workflow/conductor_workflow.py +++ b/src/conductor/asyncio_client/workflow/conductor_workflow.py @@ -43,22 +43,22 @@ def __init__( version: Optional[int] = None, description: Optional[str] = None, ): - self._executor = executor - self.name = name - self.version = version - self.description = description - self._tasks = [] - self._owner_email = None - self._timeout_policy = None - self._timeout_seconds = 60 - self._failure_workflow = "" - self._input_parameters = [] - self._output_parameters = {} - self._input_template = {} - self._variables = {} - self._restartable = True - self._workflow_status_listener_enabled = False - self._workflow_status_listener_sink = None + self._executor: AsyncWorkflowExecutor = executor + self.name: str = name + self._version: Optional[int] = version + self._description: Optional[str] = description + self._tasks: List[TaskInterface] = [] + self._owner_email: Optional[str] = None + self._timeout_policy: Optional[TimeoutPolicy] = None + self._timeout_seconds: int = 60 + self._failure_workflow: str = "" + self._input_parameters: List[str] = [] + self._output_parameters: Dict[str, Any] = {} + self._input_template: Dict[str, Any] = {} + self._variables: Dict[str, Any] = {} + self._restartable: bool = True + self._workflow_status_listener_enabled: bool = False + self._workflow_status_listener_sink: Optional[str] = None @property def name(self) -> str: @@ -71,7 +71,7 @@ def name(self, name: str) -> None: self._name = deepcopy(name) @property - def version(self) -> int: + def version(self) -> Union[int, None]: return self._version @version.setter @@ -81,7 +81,7 @@ def version(self, version: int) -> None: self._version = deepcopy(version) @property - def description(self) -> str: + def description(self) -> Union[str, None]: return self._description @description.setter @@ -103,7 +103,7 @@ def timeout_seconds(self, timeout_seconds: int): return self def owner_email(self, owner_email: str): - if not isinstance(owner_email, str): + if not isinstance(owner_email, str) or not owner_email: raise Exception("Invalid type") self._owner_email = deepcopy(owner_email) return self @@ -124,7 +124,9 @@ def restartable(self, restartable: bool): self._restartable = deepcopy(restartable) return self - def enable_status_listener(self, sink_name: bool): + def enable_status_listener(self, sink_name: str): + if not isinstance(sink_name, str) or not sink_name: + raise Exception("Invalid type, sink_name must be a non-empty string") self._workflow_status_listener_sink = sink_name self._workflow_status_listener_enabled = True @@ -342,22 +344,22 @@ def to_workflow_task(self): def __get_workflow_task_list(self) -> List[WorkflowTaskAdapter]: # Flatten tasks into workflow_task_list - workflow_task_list = [ - wt - for task in self._tasks - for wt in ( - task.to_workflow_task() - if isinstance(task.to_workflow_task(), list) - else [task.to_workflow_task()] - ) - ] + workflow_task_list: List[WorkflowTaskAdapter] = [] + + for task in self._tasks: + wf_task = task.to_workflow_task() + + if isinstance(wf_task, list): + workflow_task_list.extend(wf_task) + else: + workflow_task_list.append(wf_task) - updated_task_list = [] + updated_task_list: List[WorkflowTaskAdapter] = [] for current, next_task in zip(workflow_task_list, [*workflow_task_list[1:], None]): updated_task_list.append(current) if current.type == "FORK_JOIN" and next_task is not None and next_task.type != "JOIN": - join_on = [ft[-1].task_reference_name for ft in current.fork_tasks] + join_on = [ft[-1].task_reference_name for ft in (current.fork_tasks or [])] join_task = JoinTask( task_ref_name=f"join_{current.task_reference_name}", join_on=join_on ) diff --git a/src/conductor/asyncio_client/workflow/executor/workflow_executor.py b/src/conductor/asyncio_client/workflow/executor/workflow_executor.py index 2d3b4e97..3497cdcb 100644 --- a/src/conductor/asyncio_client/workflow/executor/workflow_executor.py +++ b/src/conductor/asyncio_client/workflow/executor/workflow_executor.py @@ -23,6 +23,7 @@ from conductor.asyncio_client.adapters.models.start_workflow_request_adapter import ( StartWorkflowRequestAdapter, ) +from conductor.asyncio_client.adapters.models.task_adapter import TaskAdapter from conductor.asyncio_client.adapters.models.task_result_adapter import TaskResultAdapter from conductor.asyncio_client.adapters.models.workflow_adapter import WorkflowAdapter from conductor.asyncio_client.adapters.models.workflow_run_adapter import WorkflowRunAdapter @@ -168,9 +169,9 @@ async def get_workflow_status( async def search( self, - start: Optional[int] = None, - size: Optional[int] = None, - free_text: Optional[str] = None, + start: int = 0, + size: int = 100, + free_text: str = "*", query: Optional[str] = None, skip_cache: Optional[bool] = None, ) -> ScrollableSearchResultWorkflowSummaryAdapter: @@ -187,8 +188,8 @@ async def get_by_correlation_ids( self, workflow_name: str, correlation_ids: List[str], - include_closed: Optional[bool] = None, - include_tasks: Optional[bool] = None, + include_closed: bool = False, + include_tasks: bool = False, ) -> Dict[str, List[WorkflowAdapter]]: """Lists workflows for the given correlation id list""" return await self.workflow_client.get_by_correlation_ids( @@ -201,8 +202,8 @@ async def get_by_correlation_ids( async def get_by_correlation_ids_and_names( self, batch_request: CorrelationIdsSearchRequestAdapter, - include_closed: Optional[bool] = None, - include_tasks: Optional[bool] = None, + include_closed: bool = False, + include_tasks: bool = False, ) -> Dict[str, List[WorkflowAdapter]]: """ Given the list of correlation ids and list of workflow names, find and return workflows Returns a map with @@ -265,7 +266,7 @@ async def skip_task_from_workflow( self, workflow_id: str, task_reference_name: str, - skip_task_request: SkipTaskRequestAdapter = None, + skip_task_request: SkipTaskRequestAdapter, ) -> None: """Skips a given task from a current running workflow""" return await self.workflow_client.skip_task_from_workflow( @@ -313,9 +314,10 @@ async def update_task_by_ref_name_sync( status=status, ) - async def get_task(self, task_id: str) -> str: + async def get_task(self, task_id: str) -> Optional[TaskAdapter]: """Get task by Id""" - return await self.task_client.get_task(task_id=task_id) + task = await self.task_client.get_task(task_id=task_id) + return TaskAdapter.from_dict(task.to_dict()) def __get_task_result( self, task_id: str, workflow_id: str, task_output: Dict[str, Any], status: str diff --git a/src/conductor/client/adapters/models/parser_adapter.py b/src/conductor/client/adapters/models/parser_adapter.py index d23b6f06..5b99f4a5 100644 --- a/src/conductor/client/adapters/models/parser_adapter.py +++ b/src/conductor/client/adapters/models/parser_adapter.py @@ -1,5 +1,4 @@ -from conductor.client.adapters.models.parser_adapter import ParserAdapter +from conductor.client.codegen.models.parser import Parser -Parser = ParserAdapter -__all__ = ["Parser"] +class ParserAdapter(Parser): ... diff --git a/src/conductor/client/adapters/models/prompt_test_request_adapter.py b/src/conductor/client/adapters/models/prompt_test_request_adapter.py index cf89a85a..dbf0a76c 100644 --- a/src/conductor/client/adapters/models/prompt_test_request_adapter.py +++ b/src/conductor/client/adapters/models/prompt_test_request_adapter.py @@ -1,4 +1,4 @@ -from src.conductor.client.adapters.models.prompt_template_adapter import PromptTemplate +from conductor.client.adapters.models.prompt_template_adapter import PromptTemplate class PromptTemplateRequestAdapter(PromptTemplate): diff --git a/src/conductor/client/adapters/models/proto_registry_entry_adapter.py b/src/conductor/client/adapters/models/proto_registry_entry_adapter.py index d7a5c9d9..49cbcdcb 100644 --- a/src/conductor/client/adapters/models/proto_registry_entry_adapter.py +++ b/src/conductor/client/adapters/models/proto_registry_entry_adapter.py @@ -1,4 +1,4 @@ -from src.conductor.client.codegen.models.proto_registry_entry import ProtoRegistryEntry +from conductor.client.codegen.models.proto_registry_entry import ProtoRegistryEntry class ProtoRegistryEntryAdapter(ProtoRegistryEntry): diff --git a/src/conductor/client/configuration/configuration.py b/src/conductor/client/configuration/configuration.py index a83a6280..c8fbeec7 100644 --- a/src/conductor/client/configuration/configuration.py +++ b/src/conductor/client/configuration/configuration.py @@ -72,7 +72,7 @@ def __init__( self, base_url: Optional[str] = None, debug: bool = False, - authentication_settings: AuthenticationSettings = None, + authentication_settings: Optional[AuthenticationSettings] = None, server_api_url: Optional[str] = None, auth_token_ttl_min: int = 45, proxy: Optional[str] = None, @@ -111,6 +111,8 @@ def __init__( CONDUCTOR_PROXY: Proxy URL for HTTP requests CONDUCTOR_PROXY_HEADERS: Proxy headers as JSON string or single header value """ + self.host: Optional[str] = None + if server_api_url is not None: self.host = server_api_url elif base_url is not None: @@ -166,10 +168,10 @@ def __init__( self.proxy_headers = proxy_headers if not self.proxy_headers and os.getenv("CONDUCTOR_PROXY_HEADERS"): try: - self.proxy_headers = json.loads(os.getenv("CONDUCTOR_PROXY_HEADERS")) + self.proxy_headers = json.loads(os.getenv("CONDUCTOR_PROXY_HEADERS") or "{}") except (json.JSONDecodeError, TypeError): # If JSON parsing fails, treat as a single header value - self.proxy_headers = {"Authorization": os.getenv("CONDUCTOR_PROXY_HEADERS")} + self.proxy_headers = {"Authorization": os.getenv("CONDUCTOR_PROXY_HEADERS") or ""} # Safe chars for path_param self.safe_chars_for_path_param = "" diff --git a/src/conductor/client/event/queue/queue_configuration.py b/src/conductor/client/event/queue/queue_configuration.py index a92407ca..f1ee6147 100644 --- a/src/conductor/client/event/queue/queue_configuration.py +++ b/src/conductor/client/event/queue/queue_configuration.py @@ -9,9 +9,9 @@ class QueueConfiguration(ABC): WORKER_PRODUCER_KEY: ClassVar[str] = "producer" def __init__(self, queue_name: str, queue_type: str): - self.queue_name = queue_name - self.queue_type = queue_type - self.worker_configuration = {} + self.queue_name: str = queue_name + self.queue_type: str = queue_type + self.worker_configuration: Dict[str, QueueWorkerConfiguration] = {} def add_consumer(self, worker_configuration: QueueWorkerConfiguration) -> None: self.worker_configuration[self.WORKER_CONSUMER_KEY] = worker_configuration diff --git a/src/conductor/client/orkes/models/access_key.py b/src/conductor/client/orkes/models/access_key.py index 137b8101..4d32361d 100644 --- a/src/conductor/client/orkes/models/access_key.py +++ b/src/conductor/client/orkes/models/access_key.py @@ -1,19 +1,18 @@ -from typing_extensions import Self - from conductor.client.orkes.models.access_key_status import AccessKeyStatus +from typing import Optional class AccessKey: - def __init__(self, id: str, status: AccessKeyStatus, created_at: int) -> Self: - self._id = id - self._status = status - self._created_at = created_at + def __init__(self, id: str, status: AccessKeyStatus, created_at: int) -> None: + self._id: str = id + self._status: Optional[AccessKeyStatus] = status + self._created_at: int = created_at if self._status is None: self._status = AccessKeyStatus.ACTIVE @property - def id(self): + def id(self) -> str: """Gets the id of this CreatedAccessKey. # noqa: E501 :return: The id of this CreatedAccessKey. # noqa: E501 @@ -22,7 +21,7 @@ def id(self): return self._id @id.setter - def id(self, id): + def id(self, id: str) -> None: """Sets the id of this CreatedAccessKey. :param id: The id of this CreatedAccessKey. # noqa: E501 @@ -31,7 +30,7 @@ def id(self, id): self._id = id @property - def status(self): + def status(self) -> Optional[AccessKeyStatus]: """Gets the status of this CreatedAccessKey. # noqa: E501 :return: The status of this CreatedAccessKey. # noqa: E501 @@ -40,7 +39,7 @@ def status(self): return self._status @status.setter - def status(self, status): + def status(self, status: AccessKeyStatus) -> None: """Sets the status of this CreatedAccessKey. :param id: The status of this CreatedAccessKey. # noqa: E501 @@ -49,7 +48,7 @@ def status(self, status): self._status = status @property - def created_at(self): + def created_at(self) -> int: """Gets the created_at of this CreatedAccessKey. # noqa: E501 :return: The created_at of this CreatedAccessKey. # noqa: E501 @@ -57,13 +56,13 @@ def created_at(self): """ return self._created_at - def __eq__(self, other): + def __eq__(self, other: object) -> bool: """Returns true if both objects are equal""" if not isinstance(other, AccessKey): return False return self.id == other.id and self.status == other.status - def __ne__(self, other): + def __ne__(self, other: object) -> bool: """Returns true if both objects are not equal""" return not self == other diff --git a/src/conductor/client/orkes/models/created_access_key.py b/src/conductor/client/orkes/models/created_access_key.py index c9b5e554..3eb020dc 100644 --- a/src/conductor/client/orkes/models/created_access_key.py +++ b/src/conductor/client/orkes/models/created_access_key.py @@ -1,13 +1,10 @@ -from typing_extensions import Self - - class CreatedAccessKey: - def __init__(self, id: str, secret: str) -> Self: - self._id = id - self._secret = secret + def __init__(self, id: str, secret: str) -> None: + self._id: str = id + self._secret: str = secret @property - def id(self): + def id(self) -> str: """Gets the id of this CreatedAccessKey. # noqa: E501 :return: The id of this CreatedAccessKey. # noqa: E501 @@ -16,7 +13,7 @@ def id(self): return self._id @id.setter - def id(self, id): + def id(self, id: str) -> None: """Sets the id of this CreatedAccessKey. :param id: The id of this CreatedAccessKey. # noqa: E501 @@ -25,7 +22,7 @@ def id(self, id): self._id = id @property - def secret(self): + def secret(self) -> str: """Gets the secret of this CreatedAccessKey. # noqa: E501 :return: The secret of this CreatedAccessKey. # noqa: E501 @@ -34,7 +31,7 @@ def secret(self): return self._secret @secret.setter - def secret(self, secret): + def secret(self, secret: str) -> None: """Sets the secret of this CreatedAccessKey. :param id: The secret of this CreatedAccessKey. # noqa: E501 @@ -42,13 +39,13 @@ def secret(self, secret): """ self._secret = secret - def __eq__(self, other): + def __eq__(self, other: object) -> bool: """Returns true if both objects are equal""" if not isinstance(other, CreatedAccessKey): return False return self.id == other.id and self.secret == other.secret - def __ne__(self, other): + def __ne__(self, other: object) -> bool: """Returns true if both objects are not equal""" return not self == other diff --git a/src/conductor/client/workflow/task/kafka_publish_input.py b/src/conductor/client/workflow/task/kafka_publish_input.py index c7b9365e..51839f54 100644 --- a/src/conductor/client/workflow/task/kafka_publish_input.py +++ b/src/conductor/client/workflow/task/kafka_publish_input.py @@ -2,8 +2,6 @@ from copy import deepcopy from typing import Dict, Any, Optional, ClassVar -from typing_extensions import Self - class KafkaPublishInput: swagger_types: ClassVar[Dict[str, str]] = { @@ -38,15 +36,15 @@ def __init__( max_block_ms: Optional[str] = None, headers: Optional[Dict[str, Any]] = None, topic: Optional[str] = None, - ) -> Self: - self._bootstrap_servers = deepcopy(bootstrap_servers) - self._key = deepcopy(key) - self._key_serializer = deepcopy(key_serializer) - self._value = deepcopy(value) - self._request_timeout_ms = deepcopy(request_timeout_ms) - self._max_block_ms = deepcopy(max_block_ms) - self._headers = deepcopy(headers) - self._topic = deepcopy(topic) + ) -> None: + self._bootstrap_servers: Optional[str] = deepcopy(bootstrap_servers) + self._key: Optional[str] = deepcopy(key) + self._key_serializer: Optional[str] = deepcopy(key_serializer) + self._value: Optional[str] = deepcopy(value) + self._request_timeout_ms: Optional[str] = deepcopy(request_timeout_ms) + self._max_block_ms: Optional[str] = deepcopy(max_block_ms) + self._headers: Optional[Dict[str, Any]] = deepcopy(headers) + self._topic: Optional[str] = deepcopy(topic) @property def bootstrap_servers(self) -> Optional[str]: diff --git a/src/conductor/client/workflow/task/llm_tasks/utils/embedding_model.py b/src/conductor/client/workflow/task/llm_tasks/utils/embedding_model.py index 07eda9b9..b0aaa44a 100644 --- a/src/conductor/client/workflow/task/llm_tasks/utils/embedding_model.py +++ b/src/conductor/client/workflow/task/llm_tasks/utils/embedding_model.py @@ -17,14 +17,14 @@ def __init__(self, provider: str, model: str): def provider(self) -> str: return self._provider + @provider.setter + def provider(self, provider: str) -> None: + self._provider = provider + @property def model(self) -> str: return self._model - @provider.setter - def provider(self, provider: str): - self._provider = provider - @model.setter - def model(self, model: str): + def model(self, model: str) -> None: self._model = model diff --git a/src/conductor/client/workflow/task/llm_tasks/utils/prompt.py b/src/conductor/client/workflow/task/llm_tasks/utils/prompt.py index 1964a22c..780a0c5d 100644 --- a/src/conductor/client/workflow/task/llm_tasks/utils/prompt.py +++ b/src/conductor/client/workflow/task/llm_tasks/utils/prompt.py @@ -7,21 +7,21 @@ class Prompt(object): attribute_map: ClassVar[Dict[str, str]] = {"name": "promptName", "variables": "promptVariables"} def __init__(self, name: str, variables: Dict[str, object]): - self._name = name - self._variables = variables + self._name: str = name + self._variables: Dict[str, object] = variables @property def name(self) -> str: return self._name - @property - def variables(self) -> str: - return self._variables - @name.setter - def name(self, name: str): + def name(self, name: str) -> None: self._name = name + @property + def variables(self) -> Dict[str, object]: + return self._variables + @variables.setter - def variables(self, variables: str): + def variables(self, variables: Dict[str, object]) -> None: self._variables = variables diff --git a/src/conductor/shared/automator/utils.py b/src/conductor/shared/automator/utils.py index 7c52e83e..d67a0743 100644 --- a/src/conductor/shared/automator/utils.py +++ b/src/conductor/shared/automator/utils.py @@ -5,7 +5,7 @@ import inspect import logging import typing -from typing import List +from typing import List, cast from dacite import from_dict from requests.structures import CaseInsensitiveDict @@ -28,7 +28,7 @@ def convert_from_dict_or_list(cls: type, data: typing.Union[dict, list]) -> obje converted = convert_from_dict(generic_types, val) val_list.append(converted) return val_list - return convert_from_dict(cls, data) + return convert_from_dict(cls, cast(dict, data)) def convert_from_dict(cls: type, data: dict) -> object: diff --git a/src/conductor/shared/event/configuration/queue.py b/src/conductor/shared/event/configuration/queue.py index cd87e47e..0ef9b794 100644 --- a/src/conductor/shared/event/configuration/queue.py +++ b/src/conductor/shared/event/configuration/queue.py @@ -9,9 +9,9 @@ class QueueConfiguration(ABC): WORKER_PRODUCER_KEY: ClassVar[str] = "producer" def __init__(self, queue_name: str, queue_type: str): - self.queue_name = queue_name - self.queue_type = queue_type - self.worker_configuration = {} + self.queue_name: str = queue_name + self.queue_type: str = queue_type + self.worker_configuration: Dict[str, QueueWorkerConfiguration] = {} def add_consumer(self, worker_configuration: QueueWorkerConfiguration) -> None: self.worker_configuration[self.WORKER_CONSUMER_KEY] = worker_configuration From 926d7509dc56860ee8aa251530e1512bf2f26ef2 Mon Sep 17 00:00:00 2001 From: IgorChvyrov-sm Date: Wed, 22 Oct 2025 10:32:48 +0300 Subject: [PATCH 03/17] Fixed mypy issues for schema, scheduler and prompt resources --- .../adapters/api/integration_resource_api.py | 79 ++++++++++++++++++- .../adapters/api/metadata_resource_api.py | 25 +++++- .../adapters/api/prompt_resource_api.py | 31 +++++++- .../adapters/api/scheduler_resource_api.py | 36 ++++++++- .../adapters/api/schema_resource_api.py | 13 ++- .../asyncio_client/adapters/api/tags_api.py | 18 ++++- .../orkes/orkes_prompt_client.py | 10 ++- .../orkes/orkes_scheduler_client.py | 8 +- .../orkes/orkes_schema_client.py | 36 ++++----- 9 files changed, 226 insertions(+), 30 deletions(-) diff --git a/src/conductor/asyncio_client/adapters/api/integration_resource_api.py b/src/conductor/asyncio_client/adapters/api/integration_resource_api.py index 8ef94c2d..54672434 100644 --- a/src/conductor/asyncio_client/adapters/api/integration_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/integration_resource_api.py @@ -1,4 +1,81 @@ +from typing import List, Dict + from conductor.asyncio_client.http.api import IntegrationResourceApi +from conductor.asyncio_client.adapters.models.integration_adapter import IntegrationAdapter +from conductor.asyncio_client.adapters.models.integration_api_adapter import IntegrationApiAdapter +from conductor.asyncio_client.adapters.models.integration_def_adapter import IntegrationDefAdapter +from conductor.asyncio_client.adapters.models.integration_update_adapter import ( + IntegrationUpdateAdapter, +) +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter +from conductor.asyncio_client.adapters.models.event_log_adapter import EventLogAdapter + + +class IntegrationResourceApiAdapter(IntegrationResourceApi): + async def get_integration_provider(self, *args, **kwargs) -> IntegrationDefAdapter: + return await super().get_integration_provider(*args, **kwargs) + + async def get_integration_providers(self, *args, **kwargs) -> List[IntegrationDefAdapter]: + return await super().get_integration_providers(*args, **kwargs) + + async def get_integration_provider_defs(self, *args, **kwargs) -> List[IntegrationDefAdapter]: + return await super().get_integration_provider_defs(*args, **kwargs) + + async def get_integration_api(self, *args, **kwargs) -> IntegrationApiAdapter: + return await super().get_integration_api(*args, **kwargs) + + async def get_integration_apis(self, *args, **kwargs) -> List[IntegrationApiAdapter]: + return await super().get_integration_apis(*args, **kwargs) + + async def get_integration_available_apis(self, *args, **kwargs) -> List[IntegrationApiAdapter]: + return await super().get_integration_available_apis(*args, **kwargs) + + async def save_all_integrations( + self, request_body: List[IntegrationUpdateAdapter], *args, **kwargs + ) -> None: + return await super().save_all_integrations(request_body, *args, **kwargs) + + async def get_all_integrations(self, *args, **kwargs) -> List[IntegrationAdapter]: + return await super().get_all_integrations(*args, **kwargs) + + async def get_providers_and_integrations(self, *args, **kwargs) -> Dict[str, object]: + return await super().get_providers_and_integrations(*args, **kwargs) + + async def put_tag_for_integration( + self, name, integration_name, tag: List[TagAdapter], *args, **kwargs + ) -> None: + return await super().put_tag_for_integration(name, integration_name, tag, *args, **kwargs) + + async def get_tags_for_integration(self, *args, **kwargs) -> List[TagAdapter]: + return await super().get_tags_for_integration(*args, **kwargs) + + async def delete_tag_for_integration( + self, name, integration_name, tag: List[TagAdapter], *args, **kwargs + ) -> None: + return await super().delete_tag_for_integration( + name, integration_name, tag, *args, **kwargs + ) + + async def put_tag_for_integration_provider( + self, name, tag: List[TagAdapter], *args, **kwargs + ) -> None: + return await super().put_tag_for_integration_provider(name, tag, *args, **kwargs) + + async def get_tags_for_integration_provider(self, *args, **kwargs) -> List[TagAdapter]: + return await super().get_tags_for_integration_provider(*args, **kwargs) + + async def delete_tag_for_integration_provider( + self, name, tag: List[TagAdapter], *args, **kwargs + ) -> None: + return await super().delete_tag_for_integration_provider(name, tag, *args, **kwargs) + + async def get_token_usage_for_integration_provider(self, *args, **kwargs) -> int: + return await super().get_token_usage_for_integration_provider(*args, **kwargs) + async def get_prompts_with_integration(self, *args, **kwargs) -> List[str]: + return await super().get_prompts_with_integration(*args, **kwargs) -class IntegrationResourceApiAdapter(IntegrationResourceApi): ... + async def record_event_stats( + self, type, event_log: List[EventLogAdapter], *args, **kwargs + ) -> None: + return await super().record_event_stats(type, event_log, *args, **kwargs) diff --git a/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py b/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py index 476d1d07..883eab5a 100644 --- a/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py @@ -1,4 +1,27 @@ +from typing import List + from conductor.asyncio_client.http.api import MetadataResourceApi +from conductor.asyncio_client.adapters.models.task_def_adapter import TaskDefAdapter +from conductor.asyncio_client.adapters.models.workflow_def_adapter import WorkflowDefAdapter +from conductor.asyncio_client.adapters.models.extended_workflow_def_adapter import ( + ExtendedWorkflowDefAdapter, +) + + +class MetadataResourceApiAdapter(MetadataResourceApi): + async def get_task_def(self, *args, **kwargs) -> TaskDefAdapter: + return await super().get_task_def(*args, **kwargs) + + async def get_task_defs(self, *args, **kwargs) -> List[TaskDefAdapter]: + return await super().get_task_defs(*args, **kwargs) + + async def update( + self, extended_workflow_def: List[ExtendedWorkflowDefAdapter], *args, **kwargs + ) -> object: + return await super().update(extended_workflow_def, *args, **kwargs) + async def get(self, *args, **kwargs) -> WorkflowDefAdapter: + return await super().get(*args, **kwargs) -class MetadataResourceApiAdapter(MetadataResourceApi): ... + async def get_workflow_defs(self, *args, **kwargs) -> List[WorkflowDefAdapter]: + return await super().get_workflow_defs(*args, **kwargs) diff --git a/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py b/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py index f60beba9..7668cfdf 100644 --- a/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py @@ -1,4 +1,33 @@ +from typing import List + from conductor.asyncio_client.http.api import PromptResourceApi +from conductor.asyncio_client.adapters.models.message_template_adapter import ( + MessageTemplateAdapter, +) +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter + + +class PromptResourceApiAdapter(PromptResourceApi): + async def get_message_template(self, *args, **kwargs) -> MessageTemplateAdapter: + return await super().get_message_template(*args, **kwargs) + + async def get_message_templates(self, *args, **kwargs) -> List[MessageTemplateAdapter]: + return await super().get_message_templates(*args, **kwargs) + + async def create_message_templates( + self, body: List[MessageTemplateAdapter], *args, **kwargs + ) -> None: + return await super().create_message_templates(body, *args, **kwargs) + + async def put_tag_for_prompt_template( + self, name, body: List[TagAdapter], *args, **kwargs + ) -> None: + return await super().put_tag_for_prompt_template(name, body, *args, **kwargs) + async def get_tags_for_prompt_template(self, *args, **kwargs) -> List[TagAdapter]: + return await super().get_tags_for_prompt_template(*args, **kwargs) -class PromptResourceApiAdapter(PromptResourceApi): ... + async def delete_tag_for_prompt_template( + self, name, body: List[TagAdapter], *args, **kwargs + ) -> None: + return await super().delete_tag_for_prompt_template(name, body, *args, **kwargs) diff --git a/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py b/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py index 5fe984d3..f8517f33 100644 --- a/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py @@ -1,4 +1,38 @@ +from typing import List + from conductor.asyncio_client.http.api import SchedulerResourceApi +from conductor.asyncio_client.adapters.models.workflow_schedule_adapter import ( + WorkflowScheduleAdapter, +) +from conductor.asyncio_client.adapters.models.workflow_schedule_model_adapter import ( + WorkflowScheduleModelAdapter, +) +from conductor.asyncio_client.adapters.models.search_result_workflow_schedule_execution_model_adapter import ( + SearchResultWorkflowScheduleExecutionModelAdapter, +) +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter + + +class SchedulerResourceApiAdapter(SchedulerResourceApi): + async def get_schedule(self, *args, **kwargs) -> WorkflowScheduleAdapter: + return await super().get_schedule(*args, **kwargs) + + async def get_all_schedules(self, *args, **kwargs) -> List[WorkflowScheduleModelAdapter]: + return await super().get_all_schedules(*args, **kwargs) + + async def search_v2(self, *args, **kwargs) -> SearchResultWorkflowScheduleExecutionModelAdapter: + return await super().search_v2(*args, **kwargs) + + async def get_schedules_by_tag( + self, tag_key, tag_value, *args, **kwargs + ) -> List[WorkflowScheduleModelAdapter]: + return await super().get_schedules_by_tag(tag_key, tag_value, *args, **kwargs) + + async def put_tag_for_schedule(self, name, body: List[TagAdapter], *args, **kwargs) -> None: + return await super().put_tag_for_schedule(name, body, *args, **kwargs) + async def get_tags_for_schedule(self, *args, **kwargs) -> List[TagAdapter]: + return await super().get_tags_for_schedule(*args, **kwargs) -class SchedulerResourceApiAdapter(SchedulerResourceApi): ... + async def delete_tag_for_schedule(self, name, body: List[TagAdapter], *args, **kwargs) -> None: + return await super().delete_tag_for_schedule(name, body, *args, **kwargs) diff --git a/src/conductor/asyncio_client/adapters/api/schema_resource_api.py b/src/conductor/asyncio_client/adapters/api/schema_resource_api.py index 36e6fc94..978a8322 100644 --- a/src/conductor/asyncio_client/adapters/api/schema_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/schema_resource_api.py @@ -1,4 +1,15 @@ +from typing import List + from conductor.asyncio_client.http.api import SchemaResourceApi +from conductor.asyncio_client.adapters.models.schema_def_adapter import SchemaDefAdapter + + +class SchemaResourceApiAdapter(SchemaResourceApi): + async def save(self, body: List[SchemaDefAdapter], *args, **kwargs) -> None: + return await super().save(body, *args, **kwargs) + async def get_schema_by_name_and_version(self, *args, **kwargs) -> SchemaDefAdapter: + return await super().get_schema_by_name_and_version(*args, **kwargs) -class SchemaResourceApiAdapter(SchemaResourceApi): ... + async def get_all_schemas(self, *args, **kwargs) -> List[SchemaDefAdapter]: + return await super().get_all_schemas(*args, **kwargs) diff --git a/src/conductor/asyncio_client/adapters/api/tags_api.py b/src/conductor/asyncio_client/adapters/api/tags_api.py index ed6afe28..eadc9734 100644 --- a/src/conductor/asyncio_client/adapters/api/tags_api.py +++ b/src/conductor/asyncio_client/adapters/api/tags_api.py @@ -1,4 +1,20 @@ +from typing import List + from conductor.asyncio_client.http.api import TagsApi +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter + + +class TagsApiAdapter(TagsApi): + async def get_workflow_tags(self, *args, **kwargs) -> List[TagAdapter]: + return await super().get_workflow_tags(*args, **kwargs) + + async def set_workflow_tags( + self, workflow_name, body: List[TagAdapter], *args, **kwargs + ) -> None: + return await super().set_workflow_tags(workflow_name, body, *args, **kwargs) + async def get_task_tags(self, *args, **kwargs) -> List[TagAdapter]: + return await super().get_task_tags(*args, **kwargs) -class TagsApiAdapter(TagsApi): ... + async def set_task_tags(self, task_name, body: List[TagAdapter], *args, **kwargs) -> None: + return await super().set_task_tags(task_name, body, *args, **kwargs) diff --git a/src/conductor/asyncio_client/orkes/orkes_prompt_client.py b/src/conductor/asyncio_client/orkes/orkes_prompt_client.py index f5400fcb..edd0c913 100644 --- a/src/conductor/asyncio_client/orkes/orkes_prompt_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_prompt_client.py @@ -94,11 +94,13 @@ async def get_templates_by_tag( matching_templates = [] for template in all_templates: + if not template.name: + continue try: tags = await self.get_tags_for_prompt_template(template.name) if any(tag.key == tag_key and tag.value == tag_value for tag in tags): matching_templates.append(template) - except Exception: # noqa: PERF203 + except Exception: continue return matching_templates @@ -113,7 +115,7 @@ async def clone_template( await self.save_message_template( target_name, description, - source_template.template, + source_template.template or "", models=(source_template.models if hasattr(source_template, "models") else None), ) @@ -152,7 +154,9 @@ async def search_templates_by_name(self, name_pattern: str) -> List[MessageTempl """Search templates by name pattern (case-insensitive)""" all_templates = await self.get_message_templates() return [ - template for template in all_templates if name_pattern.lower() in template.name.lower() + template + for template in all_templates + if template.name and name_pattern.lower() in template.name.lower() ] async def get_templates_with_model(self, model_name: str) -> List[MessageTemplateAdapter]: diff --git a/src/conductor/asyncio_client/orkes/orkes_scheduler_client.py b/src/conductor/asyncio_client/orkes/orkes_scheduler_client.py index 514c9b40..3a009260 100644 --- a/src/conductor/asyncio_client/orkes/orkes_scheduler_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_scheduler_client.py @@ -172,10 +172,12 @@ async def update_schedule( cron_expression=cron_expression or existing_schedule.cron_expression, start_workflow_request=existing_schedule.start_workflow_request, paused=paused if paused is not None else existing_schedule.paused, - run_catch_up=( - run_catch_up if run_catch_up is not None else existing_schedule.run_catch_up + run_catchup_schedule_instances=( + run_catch_up + if run_catch_up is not None + else existing_schedule.run_catchup_schedule_instances ), - timezone=timezone or existing_schedule.timezone, + zone_id=timezone or existing_schedule.zone_id, ) return await self.save_schedule(save_request) diff --git a/src/conductor/asyncio_client/orkes/orkes_schema_client.py b/src/conductor/asyncio_client/orkes/orkes_schema_client.py index 649cb489..8f957392 100644 --- a/src/conductor/asyncio_client/orkes/orkes_schema_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_schema_client.py @@ -47,14 +47,14 @@ async def create_schema( name: str, version: int, schema_definition: dict, - description: Optional[str] = None, + schema_type: str = "JSON", ) -> None: """Create a new schema with simplified parameters""" schema_def = SchemaDefAdapter( name=name, version=version, - schema=schema_definition, - description=description, + data=schema_definition, + type=schema_type, ) await self.save_schema(schema_def) @@ -63,15 +63,15 @@ async def update_schema( name: str, version: int, schema_definition: dict, - description: Optional[str] = None, + schema_type: str = "JSON", create_new_version: bool = False, ) -> None: """Update an existing schema""" schema_def = SchemaDefAdapter( name=name, version=version, - schema=schema_definition, - description=description, + data=schema_definition, + type=schema_type, ) await self.save_schema(schema_def, new_version=create_new_version) @@ -129,8 +129,8 @@ async def bulk_save_schemas( schema_def = SchemaDefAdapter( name=schema_dict.get("name"), version=schema_dict.get("version"), - schema=schema_dict.get("schema"), - description=schema_dict.get("description"), + data=schema_dict.get("data"), + type=schema_dict.get("type", "JSON"), ) schema_defs.append(schema_def) @@ -149,8 +149,8 @@ async def clone_schema( cloned_schema = SchemaDefAdapter( name=target_name, version=target_version, - schema=source_schema.schema, - description=f"Clone of {source_schema.name} v{source_schema.version}", + data=source_schema.data, + type=source_schema.type, ) await self.save_schema(cloned_schema) @@ -166,15 +166,15 @@ async def search_schemas_by_name(self, name_pattern: str) -> List[SchemaDefAdapt schema for schema in all_schemas if name_pattern.lower() in (schema.name or "").lower() ] - async def get_schemas_with_description( - self, description_pattern: str + async def get_schemas_with_external_ref( + self, external_ref_pattern: str ) -> List[SchemaDefAdapter]: - """Find schemas that contain a specific text in their description""" + """Find schemas that contain a specific text in their external ref""" all_schemas = await self.get_all_schemas() return [ schema for schema in all_schemas - if schema.description and description_pattern.lower() in schema.description.lower() + if schema.external_ref and external_ref_pattern.lower() in schema.external_ref.lower() ] async def validate_schema_structure(self, schema_definition: dict) -> bool: @@ -187,7 +187,7 @@ async def get_schema_statistics(self) -> dict: all_schemas = await self.get_all_schemas() unique_names = set() - version_counts = {} + version_counts: dict[str, int] = {} for schema in all_schemas: if schema.name: @@ -197,7 +197,7 @@ async def get_schema_statistics(self) -> dict: return { "total_schemas": len(all_schemas), "unique_schema_names": len(unique_names), - "schemas_with_descriptions": len([s for s in all_schemas if s.description]), + "schemas_with_external_ref": len([s for s in all_schemas if s.external_ref]), "version_counts": version_counts, "schema_names": sorted(unique_names), } @@ -215,11 +215,11 @@ async def delete_schema(self, name: str, version: Optional[int] = None) -> None: await self.delete_schema_by_name(name) async def create_schema_version( - self, name: str, schema_definition: dict, description: Optional[str] = None + self, name: str, schema_definition: dict, schema_type: str = "JSON" ) -> None: """Create a new version of an existing schema""" # Get the highest version number for this schema versions = await self.get_schema_versions(name) new_version = max(versions) + 1 if versions else 1 - await self.create_schema(name, new_version, schema_definition, description) + await self.create_schema(name, new_version, schema_definition, schema_type) From 834e6b7b7741fa10fe71e5746dd20a4533b6d0cd Mon Sep 17 00:00:00 2001 From: IgorChvyrov-sm Date: Wed, 22 Oct 2025 17:41:20 +0300 Subject: [PATCH 04/17] Async client resource api refactoring --- .../adapters/api/application_resource_api.py | 372 ++++++++++++--- .../adapters/api/group_resource_api.py | 81 +++- .../adapters/api/integration_resource_api.py | 449 ++++++++++++++++-- .../adapters/api/metadata_resource_api.py | 149 +++++- .../adapters/api/prompt_resource_api.py | 141 +++++- .../adapters/api/scheduler_resource_api.py | 182 ++++++- .../adapters/api/schema_resource_api.py | 77 ++- .../adapters/api/secret_resource_api.py | 142 +++++- .../asyncio_client/adapters/api/tags_api.py | 107 ++++- .../adapters/api/task_resource_api.py | 166 ++++++- .../adapters/api/user_resource_api.py | 131 +++-- .../adapters/api/workflow_resource_api.py | 335 ++++++++++++- .../asyncio_client/ai/orchestrator.py | 4 +- .../asyncio_client/automator/task_handler.py | 2 +- .../asyncio_client/automator/task_runner.py | 16 +- .../orkes/orkes_authorization_client.py | 11 +- .../orkes/orkes_integration_client.py | 21 +- .../orkes/orkes_scheduler_client.py | 12 +- .../asyncio_client/orkes/orkes_task_client.py | 3 +- .../orkes/orkes_workflow_client.py | 13 +- src/conductor/asyncio_client/worker/worker.py | 17 +- .../workflow/executor/workflow_executor.py | 3 +- src/conductor/client/ai/orchestrator.py | 5 +- .../client/workflow/conductor_workflow.py | 38 +- .../client/workflow/task/sub_workflow_task.py | 6 +- .../shared/event/configuration/queue.py | 4 +- 26 files changed, 2206 insertions(+), 281 deletions(-) diff --git a/src/conductor/asyncio_client/adapters/api/application_resource_api.py b/src/conductor/asyncio_client/adapters/api/application_resource_api.py index 50364a31..7568b851 100644 --- a/src/conductor/asyncio_client/adapters/api/application_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/application_resource_api.py @@ -1,124 +1,374 @@ -from typing import List, Optional +from __future__ import annotations -from pydantic import StrictStr +from typing import Any, Annotated, Dict, List, Optional, Tuple, Union + +from pydantic import Field, StrictStr, StrictFloat, StrictInt from conductor.asyncio_client.http.api import ApplicationResourceApi from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.adapters.models.extended_conductor_application_adapter import ( ExtendedConductorApplicationAdapter, ) +from conductor.asyncio_client.adapters.models.create_or_update_application_request_adapter import ( + CreateOrUpdateApplicationRequestAdapter, +) class ApplicationResourceApiAdapter(ApplicationResourceApi): async def create_access_key( self, id: StrictStr, - *args, - **kwargs, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ): - # Convert empty application id to None to prevent sending invalid data to server if not id: - id = None - return await super().create_access_key(id, *args, **kwargs) + id = None # type: ignore[assignment] + return await super().create_access_key( + id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) async def add_role_to_application_user( - self, application_id: StrictStr, role: StrictStr, *args, **kwargs + self, + application_id: StrictStr, + role: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ): - # Convert empty application_id and role to None to prevent sending invalid data to server if not application_id: - application_id = None + application_id = None # type: ignore[assignment] if not role: - role = None - return await super().add_role_to_application_user(application_id, role, *args, **kwargs) + role = None # type: ignore[assignment] + return await super().add_role_to_application_user( + application_id, + role, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) # type: ignore[arg-type] async def delete_access_key( self, application_id: StrictStr, key_id: StrictStr, - *args, - **kwargs, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ): - # Convert empty application_id and key_id to None to prevent sending invalid data to server if not application_id: - application_id = None + application_id = None # type: ignore[assignment] if not key_id: - key_id = None - return await super().delete_access_key(application_id, key_id, *args, **kwargs) + key_id = None # type: ignore[assignment] + return await super().delete_access_key( + application_id, + key_id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) async def remove_role_from_application_user( self, application_id: StrictStr, role: StrictStr, - *args, - **kwargs, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ): - # Convert empty application_id and role to None to prevent sending invalid data to server if not application_id: - application_id = None + application_id = None # type: ignore[assignment] if not role: - role = None + role = None # type: ignore[assignment] return await super().remove_role_from_application_user( - application_id, role, *args, **kwargs + application_id, + role, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, ) - async def get_app_by_access_key_id( - self, access_key_id: StrictStr, *args, **kwargs + async def get_app_by_access_key_id( # type: ignore[override] + self, + access_key_id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> Optional[ExtendedConductorApplicationAdapter]: - # Convert empty access_key_id to None to prevent sending invalid data to server if not access_key_id: - access_key_id = None - return await super().get_app_by_access_key_id(access_key_id, *args, **kwargs) + access_key_id = None # type: ignore[assignment] + result = await super().get_app_by_access_key_id( + access_key_id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def get_access_keys(self, id: StrictStr, *args, **kwargs): - # Convert empty application id to None to prevent sending invalid data to server + async def get_access_keys( + self, + id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ): if not id: - id = None - return await super().get_access_keys(id, *args, **kwargs) + id = None # type: ignore[assignment] + return await super().get_access_keys( + id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) async def toggle_access_key_status( - self, application_id: StrictStr, key_id: StrictStr, *args, **kwargs + self, + application_id: StrictStr, + key_id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ): - # Convert empty application_id and key_id to None to prevent sending invalid data to server if not application_id: - application_id = None + application_id = None # type: ignore[assignment] if not key_id: - key_id = None - return await super().toggle_access_key_status(application_id, key_id, *args, **kwargs) + key_id = None # type: ignore[assignment] + return await super().toggle_access_key_status( + application_id, + key_id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) - async def get_tags_for_application(self, application_id: StrictStr, *args, **kwargs): - # Convert empty application_id to None to prevent sending invalid data to server - if not application_id: - application_id = None - return await super().get_tags_for_application(application_id, *args, **kwargs) + async def get_tags_for_application( # type: ignore[override] + self, + id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[TagAdapter]: + if not id: + id = None # type: ignore[assignment] + result = await super().get_tags_for_application( + id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] async def put_tag_for_application( - self, id: StrictStr, tag: List[TagAdapter], *args, **kwargs + self, + id: StrictStr, + tag: List[TagAdapter], # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - # Convert empty application id and tag list to None to prevent sending invalid data to server if not id: - id = None + id = None # type: ignore[assignment] if not tag: - tag = None - return await super().put_tag_for_application(id, tag, *args, **kwargs) + tag = None # type: ignore[assignment] + return await super().put_tag_for_application( + id, + tag, # type: ignore[arg-type] + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) async def delete_tag_for_application( - self, id: StrictStr, tag: List[TagAdapter], *args, **kwargs + self, + id: StrictStr, + tag: List[TagAdapter], # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - # Convert empty application id and tag list to None to prevent sending invalid data to server if not id: - id = None + id = None # type: ignore[assignment] if not tag: - tag = None - return await super().delete_tag_for_application(id, tag, *args, **kwargs) + tag = None # type: ignore[assignment] + return await super().delete_tag_for_application( + id, + tag, # type: ignore[arg-type] + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) - async def create_application(self, *args, **kwargs) -> ExtendedConductorApplicationAdapter: - return await super().create_application(*args, **kwargs) + async def create_application( # type: ignore[override] + self, + create_or_update_application_request: CreateOrUpdateApplicationRequestAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> ExtendedConductorApplicationAdapter: + result = await super().create_application( + create_or_update_application_request, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def update_application(self, *args, **kwargs) -> ExtendedConductorApplicationAdapter: - return await super().update_application(*args, **kwargs) + async def update_application( # type: ignore[override] + self, + id: StrictStr, + create_or_update_application_request: CreateOrUpdateApplicationRequestAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> ExtendedConductorApplicationAdapter: + result = await super().update_application( + id, + create_or_update_application_request, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def get_application(self, *args, **kwargs) -> ExtendedConductorApplicationAdapter: - return await super().get_application(*args, **kwargs) + async def get_application( + self, + id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> ExtendedConductorApplicationAdapter: + result = await super().get_application( + id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def list_applications(self, *args, **kwargs) -> List[ExtendedConductorApplicationAdapter]: - return await super().list_applications(*args, **kwargs) + async def list_applications( # type: ignore[override] + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[ExtendedConductorApplicationAdapter]: + result = await super().list_applications( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] diff --git a/src/conductor/asyncio_client/adapters/api/group_resource_api.py b/src/conductor/asyncio_client/adapters/api/group_resource_api.py index c176ef49..b3ad7198 100644 --- a/src/conductor/asyncio_client/adapters/api/group_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/group_resource_api.py @@ -1,15 +1,82 @@ -from typing import List +from __future__ import annotations + +from typing import List, Optional, Dict, Any, Annotated, Union, Tuple +from pydantic import Field, StrictFloat, StrictInt, StrictStr from conductor.asyncio_client.http.api import GroupResourceApi from conductor.asyncio_client.adapters.models.group_adapter import GroupAdapter +from conductor.asyncio_client.adapters.models.upsert_group_request_adapter import ( + UpsertGroupRequestAdapter, +) class GroupResourceApiAdapter(GroupResourceApi): - async def list_groups(self, *args, **kwargs) -> List[GroupAdapter]: - return await super().list_groups(*args, **kwargs) + async def list_groups( # type: ignore[override] + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[GroupAdapter]: + result = await super().list_groups( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] + + async def get_group( + self, + id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> GroupAdapter: + result = await super().get_group( + id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def get_group(self, *args, **kwargs) -> GroupAdapter: - return await super().get_group(*args, **kwargs) + async def upsert_group( + self, + id: StrictStr, + upsert_group_request: UpsertGroupRequestAdapter, # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> GroupAdapter: + result = await super().upsert_group( + id, + upsert_group_request, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) - async def upsert_group(self, *args, **kwargs) -> GroupAdapter: - return await super().upsert_group(*args, **kwargs) + return result # type: ignore[return-value] diff --git a/src/conductor/asyncio_client/adapters/api/integration_resource_api.py b/src/conductor/asyncio_client/adapters/api/integration_resource_api.py index 54672434..a63d8779 100644 --- a/src/conductor/asyncio_client/adapters/api/integration_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/integration_resource_api.py @@ -1,81 +1,450 @@ -from typing import List, Dict +from __future__ import annotations + +from typing import List, Dict, Any, Annotated, Union, Tuple, Optional +from pydantic import Field, StrictFloat, StrictInt, StrictStr, StrictBool from conductor.asyncio_client.http.api import IntegrationResourceApi from conductor.asyncio_client.adapters.models.integration_adapter import IntegrationAdapter from conductor.asyncio_client.adapters.models.integration_api_adapter import IntegrationApiAdapter from conductor.asyncio_client.adapters.models.integration_def_adapter import IntegrationDefAdapter -from conductor.asyncio_client.adapters.models.integration_update_adapter import ( - IntegrationUpdateAdapter, -) from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.adapters.models.event_log_adapter import EventLogAdapter +from conductor.asyncio_client.adapters.models.message_template_adapter import MessageTemplateAdapter class IntegrationResourceApiAdapter(IntegrationResourceApi): - async def get_integration_provider(self, *args, **kwargs) -> IntegrationDefAdapter: - return await super().get_integration_provider(*args, **kwargs) + async def get_integration_provider( + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> IntegrationAdapter: + result = await super().get_integration_provider( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def get_integration_providers(self, *args, **kwargs) -> List[IntegrationDefAdapter]: - return await super().get_integration_providers(*args, **kwargs) + async def get_integration_providers( # type: ignore[override] + self, + category: Optional[StrictStr] = None, + active_only: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[IntegrationAdapter]: + result = await super().get_integration_providers( + category, + active_only, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def get_integration_provider_defs(self, *args, **kwargs) -> List[IntegrationDefAdapter]: - return await super().get_integration_provider_defs(*args, **kwargs) + async def get_integration_provider_defs( # type: ignore[override] + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[IntegrationDefAdapter]: + result = await super().get_integration_provider_defs( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def get_integration_api(self, *args, **kwargs) -> IntegrationApiAdapter: - return await super().get_integration_api(*args, **kwargs) + async def get_integration_api( + self, + name: StrictStr, + integration_name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> IntegrationApiAdapter: + result = await super().get_integration_api( + name, + integration_name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def get_integration_apis(self, *args, **kwargs) -> List[IntegrationApiAdapter]: - return await super().get_integration_apis(*args, **kwargs) + async def get_integration_apis( # type: ignore[override] + self, + name: StrictStr, + active_only: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[IntegrationApiAdapter]: + result = await super().get_integration_apis( + name, + active_only, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) - async def get_integration_available_apis(self, *args, **kwargs) -> List[IntegrationApiAdapter]: - return await super().get_integration_available_apis(*args, **kwargs) + return result # type: ignore[return-value] + + async def get_integration_available_apis( + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[str]: + result = await super().get_integration_available_apis( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + return result # type: ignore[return-value] async def save_all_integrations( - self, request_body: List[IntegrationUpdateAdapter], *args, **kwargs + self, + integration: List[IntegrationAdapter], # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().save_all_integrations(request_body, *args, **kwargs) + return await super().save_all_integrations( + integration, # type: ignore[arg-type] + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def get_all_integrations( # type: ignore[override] + self, + category: Optional[StrictStr] = None, + active_only: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[IntegrationAdapter]: + result = await super().get_all_integrations( + category, + active_only, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) - async def get_all_integrations(self, *args, **kwargs) -> List[IntegrationAdapter]: - return await super().get_all_integrations(*args, **kwargs) + return result # type: ignore[return-value] - async def get_providers_and_integrations(self, *args, **kwargs) -> Dict[str, object]: - return await super().get_providers_and_integrations(*args, **kwargs) + async def get_providers_and_integrations( + self, + type: Optional[StrictStr] = None, + active_only: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[str]: + return await super().get_providers_and_integrations( + type, + active_only, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) async def put_tag_for_integration( - self, name, integration_name, tag: List[TagAdapter], *args, **kwargs + self, + name: StrictStr, + integration_name: StrictStr, + tag: List[TagAdapter], # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().put_tag_for_integration(name, integration_name, tag, *args, **kwargs) + return await super().put_tag_for_integration( + name, + integration_name, + tag, # type: ignore[arg-type] + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) - async def get_tags_for_integration(self, *args, **kwargs) -> List[TagAdapter]: - return await super().get_tags_for_integration(*args, **kwargs) + async def get_tags_for_integration( # type: ignore[override] + self, + name: StrictStr, + integration_name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[TagAdapter]: + result = await super().get_tags_for_integration( + name, + integration_name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + return result # type: ignore[return-value] async def delete_tag_for_integration( - self, name, integration_name, tag: List[TagAdapter], *args, **kwargs + self, + name: StrictStr, + integration_name: StrictStr, + tag: List[TagAdapter], # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: return await super().delete_tag_for_integration( - name, integration_name, tag, *args, **kwargs + name, + integration_name, + tag, # type: ignore[arg-type] + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, ) async def put_tag_for_integration_provider( - self, name, tag: List[TagAdapter], *args, **kwargs + self, + name: StrictStr, + tag: List[TagAdapter], # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().put_tag_for_integration_provider(name, tag, *args, **kwargs) + return await super().put_tag_for_integration_provider( + name, + tag, # type: ignore[arg-type] + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) - async def get_tags_for_integration_provider(self, *args, **kwargs) -> List[TagAdapter]: - return await super().get_tags_for_integration_provider(*args, **kwargs) + async def get_tags_for_integration_provider( # type: ignore[override] + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[TagAdapter]: + result = await super().get_tags_for_integration_provider( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] async def delete_tag_for_integration_provider( - self, name, tag: List[TagAdapter], *args, **kwargs + self, + name: StrictStr, + tag: List[TagAdapter], # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().delete_tag_for_integration_provider(name, tag, *args, **kwargs) + return await super().delete_tag_for_integration_provider( + name, + tag, # type: ignore[arg-type] + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) - async def get_token_usage_for_integration_provider(self, *args, **kwargs) -> int: - return await super().get_token_usage_for_integration_provider(*args, **kwargs) + async def get_token_usage_for_integration_provider( + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, str]: + return await super().get_token_usage_for_integration_provider( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) - async def get_prompts_with_integration(self, *args, **kwargs) -> List[str]: - return await super().get_prompts_with_integration(*args, **kwargs) + async def get_prompts_with_integration( # type: ignore[override] + self, + integration_provider: StrictStr, + integration_name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[MessageTemplateAdapter]: + result = await super().get_prompts_with_integration( + integration_provider, + integration_name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] async def record_event_stats( - self, type, event_log: List[EventLogAdapter], *args, **kwargs + self, + type: StrictStr, + event_log: List[EventLogAdapter], # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().record_event_stats(type, event_log, *args, **kwargs) + return await super().record_event_stats( + type, + event_log, # type: ignore[arg-type] + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) diff --git a/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py b/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py index 883eab5a..09161b66 100644 --- a/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py @@ -1,4 +1,7 @@ -from typing import List +from __future__ import annotations + +from typing import List, Optional, Dict, Any, Union, Annotated, Tuple +from pydantic import StrictStr, StrictBool, StrictFloat, StrictInt, Field from conductor.asyncio_client.http.api import MetadataResourceApi from conductor.asyncio_client.adapters.models.task_def_adapter import TaskDefAdapter @@ -9,19 +12,143 @@ class MetadataResourceApiAdapter(MetadataResourceApi): - async def get_task_def(self, *args, **kwargs) -> TaskDefAdapter: - return await super().get_task_def(*args, **kwargs) + async def get_task_def( # type: ignore[override] + self, + tasktype: StrictStr, + metadata: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> TaskDefAdapter: + result = await super().get_task_def( + tasktype, + metadata, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def get_task_defs(self, *args, **kwargs) -> List[TaskDefAdapter]: - return await super().get_task_defs(*args, **kwargs) + async def get_task_defs( # type: ignore[override] + self, + access: Optional[StrictStr] = None, + metadata: Optional[StrictBool] = None, + tag_key: Optional[StrictStr] = None, + tag_value: Optional[StrictStr] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[TaskDefAdapter]: + result = await super().get_task_defs( + access, + metadata, + tag_key, + tag_value, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] async def update( - self, extended_workflow_def: List[ExtendedWorkflowDefAdapter], *args, **kwargs + self, + extended_workflow_def: List[ExtendedWorkflowDefAdapter], # type: ignore[override] + overwrite: Optional[StrictBool] = None, + new_version: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> object: - return await super().update(extended_workflow_def, *args, **kwargs) + result = await super().update( + extended_workflow_def, # type: ignore[arg-type] + overwrite, + new_version, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def get(self, *args, **kwargs) -> WorkflowDefAdapter: - return await super().get(*args, **kwargs) + async def get( # type: ignore[override] + self, + name: StrictStr, + version: Optional[StrictInt] = None, + metadata: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> WorkflowDefAdapter: + result = await super().get( + name, + version, + metadata, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def get_workflow_defs(self, *args, **kwargs) -> List[WorkflowDefAdapter]: - return await super().get_workflow_defs(*args, **kwargs) + async def get_workflow_defs( # type: ignore[override] + self, + access: Optional[StrictStr] = None, + metadata: Optional[StrictBool] = None, + tag_key: Optional[StrictStr] = None, + tag_value: Optional[StrictStr] = None, + name: Optional[StrictStr] = None, + short: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[WorkflowDefAdapter]: + result = await super().get_workflow_defs( + access, + metadata, + tag_key, + tag_value, + name, + short, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] diff --git a/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py b/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py index 7668cfdf..3c3d0a85 100644 --- a/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py @@ -1,4 +1,7 @@ -from typing import List +from __future__ import annotations + +from typing import List, Optional, Dict, Any, Union, Annotated, Tuple +from pydantic import StrictStr, StrictFloat, StrictInt, Field from conductor.asyncio_client.http.api import PromptResourceApi from conductor.asyncio_client.adapters.models.message_template_adapter import ( @@ -8,26 +11,138 @@ class PromptResourceApiAdapter(PromptResourceApi): - async def get_message_template(self, *args, **kwargs) -> MessageTemplateAdapter: - return await super().get_message_template(*args, **kwargs) + async def get_message_template( + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> MessageTemplateAdapter: + result = await super().get_message_template( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def get_message_templates(self, *args, **kwargs) -> List[MessageTemplateAdapter]: - return await super().get_message_templates(*args, **kwargs) + async def get_message_templates( # type: ignore[override] + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[MessageTemplateAdapter]: + result = await super().get_message_templates( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] async def create_message_templates( - self, body: List[MessageTemplateAdapter], *args, **kwargs + self, + message_template: List[MessageTemplateAdapter], # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().create_message_templates(body, *args, **kwargs) + return await super().create_message_templates( + message_template, # type: ignore[arg-type] + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) async def put_tag_for_prompt_template( - self, name, body: List[TagAdapter], *args, **kwargs + self, + name: StrictStr, + tag: List[TagAdapter], # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().put_tag_for_prompt_template(name, body, *args, **kwargs) + return await super().put_tag_for_prompt_template( + name, + tag, # type: ignore[arg-type] + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) - async def get_tags_for_prompt_template(self, *args, **kwargs) -> List[TagAdapter]: - return await super().get_tags_for_prompt_template(*args, **kwargs) + async def get_tags_for_prompt_template( # type: ignore[override] + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[TagAdapter]: + result = await super().get_tags_for_prompt_template( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] async def delete_tag_for_prompt_template( - self, name, body: List[TagAdapter], *args, **kwargs + self, + name: StrictStr, + tag: List[TagAdapter], # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().delete_tag_for_prompt_template(name, body, *args, **kwargs) + return await super().delete_tag_for_prompt_template( + name, + tag, # type: ignore[arg-type] + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) diff --git a/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py b/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py index f8517f33..4ab35587 100644 --- a/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py @@ -1,5 +1,7 @@ -from typing import List +from __future__ import annotations +from typing import List, Optional, Dict, Any, Union, Annotated, Tuple +from pydantic import StrictStr, StrictFloat, StrictInt, Field from conductor.asyncio_client.http.api import SchedulerResourceApi from conductor.asyncio_client.adapters.models.workflow_schedule_adapter import ( WorkflowScheduleAdapter, @@ -14,25 +16,173 @@ class SchedulerResourceApiAdapter(SchedulerResourceApi): - async def get_schedule(self, *args, **kwargs) -> WorkflowScheduleAdapter: - return await super().get_schedule(*args, **kwargs) + async def get_schedule( # type: ignore[override] + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> WorkflowScheduleAdapter: + result = await super().get_schedule( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def get_all_schedules(self, *args, **kwargs) -> List[WorkflowScheduleModelAdapter]: - return await super().get_all_schedules(*args, **kwargs) + async def get_all_schedules( # type: ignore[override] + self, + workflow_name: Optional[StrictStr] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[WorkflowScheduleModelAdapter]: + result = await super().get_all_schedules( + workflow_name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def search_v2(self, *args, **kwargs) -> SearchResultWorkflowScheduleExecutionModelAdapter: - return await super().search_v2(*args, **kwargs) + async def search_v2( # type: ignore[override] + self, + start: Optional[StrictInt] = None, + size: Optional[StrictInt] = None, + sort: Optional[StrictStr] = None, + free_text: Optional[StrictStr] = None, + query: Optional[StrictStr] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> SearchResultWorkflowScheduleExecutionModelAdapter: + result = await super().search_v2( + start, + size, + sort, + free_text, + query, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def get_schedules_by_tag( - self, tag_key, tag_value, *args, **kwargs + async def get_schedules_by_tag( # type: ignore[override] + self, + tag: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[WorkflowScheduleModelAdapter]: - return await super().get_schedules_by_tag(tag_key, tag_value, *args, **kwargs) + result = await super().get_schedules_by_tag( + tag, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def put_tag_for_schedule(self, name, body: List[TagAdapter], *args, **kwargs) -> None: - return await super().put_tag_for_schedule(name, body, *args, **kwargs) + async def put_tag_for_schedule( + self, + name: StrictStr, + tag: List[TagAdapter], # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + return await super().put_tag_for_schedule( + name, + tag, # type: ignore[arg-type] + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) - async def get_tags_for_schedule(self, *args, **kwargs) -> List[TagAdapter]: - return await super().get_tags_for_schedule(*args, **kwargs) + async def get_tags_for_schedule( # type: ignore[override] + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[TagAdapter]: + result = await super().get_tags_for_schedule( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def delete_tag_for_schedule(self, name, body: List[TagAdapter], *args, **kwargs) -> None: - return await super().delete_tag_for_schedule(name, body, *args, **kwargs) + async def delete_tag_for_schedule( + self, + name: StrictStr, + tag: List[TagAdapter], # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + return await super().delete_tag_for_schedule( + name, + tag, # type: ignore[arg-type] + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) diff --git a/src/conductor/asyncio_client/adapters/api/schema_resource_api.py b/src/conductor/asyncio_client/adapters/api/schema_resource_api.py index 978a8322..837c5c0a 100644 --- a/src/conductor/asyncio_client/adapters/api/schema_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/schema_resource_api.py @@ -1,15 +1,78 @@ -from typing import List +from __future__ import annotations +from typing import List, Optional, Dict, Any, Union, Annotated, Tuple +from pydantic import StrictStr, StrictFloat, StrictInt, Field, StrictBool from conductor.asyncio_client.http.api import SchemaResourceApi from conductor.asyncio_client.adapters.models.schema_def_adapter import SchemaDefAdapter class SchemaResourceApiAdapter(SchemaResourceApi): - async def save(self, body: List[SchemaDefAdapter], *args, **kwargs) -> None: - return await super().save(body, *args, **kwargs) + async def save( + self, + schema_def: List[SchemaDefAdapter], # type: ignore[override] + new_version: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + return await super().save( + schema_def, # type: ignore[arg-type] + new_version, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) - async def get_schema_by_name_and_version(self, *args, **kwargs) -> SchemaDefAdapter: - return await super().get_schema_by_name_and_version(*args, **kwargs) + async def get_schema_by_name_and_version( # type: ignore[override] + self, + name: StrictStr, + version: StrictInt, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> SchemaDefAdapter: + result = await super().get_schema_by_name_and_version( + name, + version, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def get_all_schemas(self, *args, **kwargs) -> List[SchemaDefAdapter]: - return await super().get_all_schemas(*args, **kwargs) + async def get_all_schemas( # type: ignore[override] + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[SchemaDefAdapter]: + result = await super().get_all_schemas( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] diff --git a/src/conductor/asyncio_client/adapters/api/secret_resource_api.py b/src/conductor/asyncio_client/adapters/api/secret_resource_api.py index ca750bef..851511e2 100644 --- a/src/conductor/asyncio_client/adapters/api/secret_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/secret_resource_api.py @@ -1,4 +1,144 @@ +from __future__ import annotations + +from typing import List, Optional, Dict, Any, Union, Annotated, Tuple +from pydantic import StrictStr, StrictFloat, StrictInt, Field from conductor.asyncio_client.http.api import SecretResourceApi +from conductor.asyncio_client.adapters.models.extended_secret_adapter import ExtendedSecretAdapter +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter + + +class SecretResourceApiAdapter(SecretResourceApi): + async def secret_exists( # type: ignore[override] + self, + key: Annotated[str, Field(strict=True)], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> bool: + result = await super().secret_exists( + key, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] + + async def list_all_secret_names( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[str]: + return await super().list_all_secret_names( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def list_secrets_with_tags_that_user_can_grant_access_to( # type: ignore[override] + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[ExtendedSecretAdapter]: + result = await super().list_secrets_with_tags_that_user_can_grant_access_to( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] + + async def put_tag_for_secret( + self, + key: Annotated[str, Field(strict=True)], + tag: List[TagAdapter], # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + return await super().put_tag_for_secret( + key, + tag, # type: ignore[arg-type] + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + async def get_tags( # type: ignore[override] + self, + key: Annotated[str, Field(strict=True)], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[TagAdapter]: + result = await super().get_tags( + key, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] -class SecretResourceApiAdapter(SecretResourceApi): ... + async def delete_tag_for_secret( + self, + key: Annotated[str, Field(strict=True)], + tag: List[TagAdapter], # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + return await super().delete_tag_for_secret( + key, + tag, # type: ignore[arg-type] + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) diff --git a/src/conductor/asyncio_client/adapters/api/tags_api.py b/src/conductor/asyncio_client/adapters/api/tags_api.py index eadc9734..8efb44da 100644 --- a/src/conductor/asyncio_client/adapters/api/tags_api.py +++ b/src/conductor/asyncio_client/adapters/api/tags_api.py @@ -1,20 +1,105 @@ -from typing import List +from __future__ import annotations + +from typing import List, Optional, Dict, Any, Union, Annotated, Tuple +from pydantic import StrictStr, StrictFloat, StrictInt, Field from conductor.asyncio_client.http.api import TagsApi from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter class TagsApiAdapter(TagsApi): - async def get_workflow_tags(self, *args, **kwargs) -> List[TagAdapter]: - return await super().get_workflow_tags(*args, **kwargs) + async def get_workflow_tags( # type: ignore[override] + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[TagAdapter]: + result = await super().get_workflow_tags( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def set_workflow_tags( - self, workflow_name, body: List[TagAdapter], *args, **kwargs - ) -> None: - return await super().set_workflow_tags(workflow_name, body, *args, **kwargs) + async def set_workflow_tags( # type: ignore[override] + self, + name: StrictStr, + tag: List[TagAdapter], # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + result = await super().set_workflow_tags( + name, + tag, # type: ignore[arg-type] + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def get_task_tags(self, *args, **kwargs) -> List[TagAdapter]: - return await super().get_task_tags(*args, **kwargs) + async def get_task_tags( # type: ignore[override] + self, + task_name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[TagAdapter]: + result = await super().get_task_tags( + task_name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def set_task_tags(self, task_name, body: List[TagAdapter], *args, **kwargs) -> None: - return await super().set_task_tags(task_name, body, *args, **kwargs) + async def set_task_tags( # type: ignore[override] + self, + task_name: StrictStr, + tag: List[TagAdapter], # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + result = await super().set_task_tags( + task_name, + tag, # type: ignore[arg-type] + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] diff --git a/src/conductor/asyncio_client/adapters/api/task_resource_api.py b/src/conductor/asyncio_client/adapters/api/task_resource_api.py index 6efc63ea..5c2077fd 100644 --- a/src/conductor/asyncio_client/adapters/api/task_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/task_resource_api.py @@ -1,14 +1,178 @@ from __future__ import annotations -from typing import Optional, Dict, Union, Annotated, Any, Tuple +from typing import Optional, Dict, Union, Annotated, Any, Tuple, List from pydantic import validate_call, StrictStr, StrictFloat, Field, StrictInt +from conductor.asyncio_client.adapters.models.task_adapter import TaskAdapter +from conductor.asyncio_client.adapters.models.poll_data_adapter import PollDataAdapter +from conductor.asyncio_client.adapters.models.task_exec_log_adapter import TaskExecLogAdapter +from conductor.asyncio_client.adapters.models.search_result_task_summary_adapter import ( + SearchResultTaskSummaryAdapter, +) from conductor.asyncio_client.adapters.models.workflow_adapter import WorkflowAdapter from conductor.asyncio_client.http.api import TaskResourceApi class TaskResourceApiAdapter(TaskResourceApi): + async def poll( # type: ignore[override] + self, + tasktype: StrictStr, + workerid: Optional[StrictStr] = None, + domain: Optional[StrictStr] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Optional[TaskAdapter]: + result = await super().poll( + tasktype, + workerid, + domain, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] + + async def batch_poll( # type: ignore[override] + self, + tasktype: StrictStr, + workerid: Optional[StrictStr] = None, + domain: Optional[StrictStr] = None, + count: Optional[StrictInt] = None, + timeout: Optional[StrictInt] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[TaskAdapter]: + result = await super().batch_poll( + tasktype, + workerid, + domain, + count, + timeout, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] + + async def get_task( # type: ignore[override] + self, + task_id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> TaskAdapter: + result = await super().get_task( + task_id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] + + async def get_poll_data( # type: ignore[override] + self, + task_type: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[PollDataAdapter]: + result = await super().get_poll_data( + task_type, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] + + async def get_task_logs( # type: ignore[override] + self, + task_id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[TaskExecLogAdapter]: + result = await super().get_task_logs( + task_id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] + + async def search1( # type: ignore[override] + self, + start: Optional[StrictInt] = None, + size: Optional[StrictInt] = None, + sort: Optional[StrictStr] = None, + free_text: Optional[StrictStr] = None, + query: Optional[StrictStr] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> SearchResultTaskSummaryAdapter: + result = await super().search1( + start, + size, + sort, + free_text, + query, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] + @validate_call async def update_task_sync( self, diff --git a/src/conductor/asyncio_client/adapters/api/user_resource_api.py b/src/conductor/asyncio_client/adapters/api/user_resource_api.py index a638ec4d..449340b7 100644 --- a/src/conductor/asyncio_client/adapters/api/user_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/user_resource_api.py @@ -1,6 +1,8 @@ -from typing import List +from __future__ import annotations -from pydantic import StrictStr +from typing import List, Optional, Dict, Any, Union, Annotated, Tuple + +from pydantic import StrictStr, StrictFloat, StrictInt, Field, StrictBool from conductor.asyncio_client.http.api import UserResourceApi from conductor.asyncio_client.adapters.models import UpsertUserRequestAdapter as UpsertUserRequest @@ -11,47 +13,114 @@ class UserResourceApiAdapter(UserResourceApi): async def get_granted_permissions( self, user_id: StrictStr, - *args, - **kwargs, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> object: - # Convert empty user_id to None to prevent sending invalid data to server - if not user_id: - user_id = None - return await super().get_granted_permissions(user_id, *args, **kwargs) + return await super().get_granted_permissions( + user_id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) - async def get_user( + async def get_user( # type: ignore[override] self, id: StrictStr, - *args, - **kwargs, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> ConductorUserAdapter: - # Convert empty user id to None to prevent sending invalid data to server - if not id: - id = None - return await super().get_user(id, *args, **kwargs) + result = await super().get_user( + id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def upsert_user( + async def upsert_user( # type: ignore[override] self, id: StrictStr, - upsert_user_request: UpsertUserRequest, - *args, - **kwargs, + upsert_user_request: UpsertUserRequest, # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> ConductorUserAdapter: - # Convert empty user id to None to prevent sending invalid data to server - if not id: - id = None - return await super().upsert_user(id, upsert_user_request, *args, **kwargs) + result = await super().upsert_user( + id, + upsert_user_request, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] - async def list_users(self, *args, **kwargs) -> List[ConductorUserAdapter]: - return await super().list_users(*args, **kwargs) + async def list_users( # type: ignore[override] + self, + apps: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[ConductorUserAdapter]: + result = await super().list_users( + apps, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] async def delete_user( self, id: StrictStr, - *args, - **kwargs, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> object: - # Convert empty user id to None to prevent sending invalid data to server - if not id: - id = None - return await super().delete_user(id, *args, **kwargs) + return await super().delete_user( + id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) diff --git a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py index 4f417f8a..87deb007 100644 --- a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py @@ -1,13 +1,338 @@ from __future__ import annotations -from typing import Dict, Any, Union, Optional, Annotated, Tuple -from pydantic import validate_call, Field, StrictStr, StrictFloat, StrictInt -from conductor.asyncio_client.adapters.models.workflow_adapter import Workflow - +from typing import Dict, Any, Union, Optional, Annotated, Tuple, List +from pydantic import validate_call, Field, StrictStr, StrictFloat, StrictInt, StrictBool +from conductor.asyncio_client.adapters.models.workflow_adapter import WorkflowAdapter +from conductor.asyncio_client.adapters.models.workflow_run_adapter import WorkflowRunAdapter +from conductor.asyncio_client.adapters.models.workflow_status_adapter import WorkflowStatusAdapter +from conductor.asyncio_client.adapters.models.scrollable_search_result_workflow_summary_adapter import ( + ScrollableSearchResultWorkflowSummaryAdapter, +) +from conductor.asyncio_client.adapters.models.start_workflow_request_adapter import ( + StartWorkflowRequestAdapter, +) +from conductor.asyncio_client.adapters.models.workflow_test_request_adapter import ( + WorkflowTestRequestAdapter, +) +from conductor.asyncio_client.adapters.models.rerun_workflow_request_adapter import ( + RerunWorkflowRequestAdapter, +) +from conductor.asyncio_client.adapters.models.workflow_state_update_adapter import ( + WorkflowStateUpdateAdapter, +) +from conductor.asyncio_client.adapters.models.correlation_ids_search_request_adapter import ( + CorrelationIdsSearchRequestAdapter, +) from conductor.asyncio_client.http.api import WorkflowResourceApi class WorkflowResourceApiAdapter(WorkflowResourceApi): + async def execute_workflow( # type: ignore[override] + self, + name: StrictStr, + version: StrictInt, + request_id: StrictStr, + start_workflow_request: StartWorkflowRequestAdapter, # type: ignore[override] + wait_until_task_ref: Optional[StrictStr] = None, + wait_for_seconds: Optional[StrictInt] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> WorkflowRunAdapter: + result = await super().execute_workflow( + name, + version, + request_id, + start_workflow_request, # type: ignore[override] + wait_until_task_ref, + wait_for_seconds, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] + + async def get_execution_status( # type: ignore[override] + self, + workflow_id: StrictStr, + include_tasks: Optional[StrictBool] = None, + summarize: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> WorkflowAdapter: + result = await super().get_execution_status( + workflow_id, + include_tasks, + summarize, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] + + async def get_workflow_status_summary( # type: ignore[override] + self, + workflow_id: StrictStr, + include_output: Optional[StrictBool] = None, + include_variables: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> WorkflowStatusAdapter: # type: ignore[override] + result = await super().get_workflow_status_summary( + workflow_id, + include_output, + include_variables, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] + + async def get_running_workflow( + self, + name: StrictStr, + version: Optional[StrictInt] = None, + start_time: Optional[StrictInt] = None, + end_time: Optional[StrictInt] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[str]: + return await super().get_running_workflow( + name, + version, + start_time, + end_time, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def get_workflows( # type: ignore[override] + self, + name: StrictStr, + request_body: List[StrictStr], + include_closed: Optional[StrictBool] = None, + include_tasks: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, List[WorkflowAdapter]]: + result = await super().get_workflows( + name, + request_body, + include_closed, + include_tasks, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] + + async def get_workflows1( # type: ignore[override] + self, + correlation_ids_search_request: CorrelationIdsSearchRequestAdapter, # type: ignore[override] + include_closed: Optional[StrictBool] = None, + include_tasks: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, List[WorkflowAdapter]]: + result = await super().get_workflows1( + correlation_ids_search_request, + include_closed, + include_tasks, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] + + async def search( # type: ignore[override] + self, + start: Optional[StrictInt] = None, + size: Optional[StrictInt] = None, + sort: Optional[StrictStr] = None, + free_text: Optional[StrictStr] = None, + query: Optional[StrictStr] = None, + skip_cache: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> ScrollableSearchResultWorkflowSummaryAdapter: + result = await super().search( + start, + size, + sort, + free_text, + query, + skip_cache, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] + + async def rerun( + self, + workflow_id: StrictStr, + rerun_workflow_request: RerunWorkflowRequestAdapter, # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> str: + return await super().rerun( + workflow_id, + rerun_workflow_request, # type: ignore[override] + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def restart( + self, + workflow_id: StrictStr, + use_latest_definitions: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + await super().restart( + workflow_id, + use_latest_definitions, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def update_workflow_and_task_state( # type: ignore[override] + self, + workflow_id: StrictStr, + request_id: StrictStr, + workflow_state_update: WorkflowStateUpdateAdapter, # type: ignore[override] + wait_until_task_ref: Optional[StrictStr] = None, + wait_for_seconds: Optional[StrictInt] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> WorkflowRunAdapter: + result = await super().update_workflow_and_task_state( + workflow_id, + request_id, + workflow_state_update, # type: ignore[override] + wait_until_task_ref, + wait_for_seconds, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] + + async def test_workflow( # type: ignore[override] + self, + workflow_test_request: WorkflowTestRequestAdapter, # type: ignore[override] + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> WorkflowAdapter: + result = await super().test_workflow( + workflow_test_request, # type: ignore[override] + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result # type: ignore[return-value] + @validate_call async def update_workflow_state( self, @@ -22,7 +347,7 @@ async def update_workflow_state( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Workflow: + ) -> WorkflowAdapter: """Update workflow variables Updates the workflow variables and triggers evaluation. diff --git a/src/conductor/asyncio_client/ai/orchestrator.py b/src/conductor/asyncio_client/ai/orchestrator.py index 106fa8ec..bafcb9ab 100644 --- a/src/conductor/asyncio_client/ai/orchestrator.py +++ b/src/conductor/asyncio_client/ai/orchestrator.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import TYPE_CHECKING, List, Optional +from typing import TYPE_CHECKING, Dict, List, Optional from uuid import uuid4 from conductor.asyncio_client.adapters.models.integration_api_update_adapter import ( @@ -142,7 +142,7 @@ async def add_vector_store( db_integration_name, index, api_details ) - async def get_token_used(self, ai_integration: str) -> int: + async def get_token_used(self, ai_integration: str) -> Dict[str, str]: return await self.integration_client.get_token_usage_for_integration_provider( ai_integration ) diff --git a/src/conductor/asyncio_client/automator/task_handler.py b/src/conductor/asyncio_client/automator/task_handler.py index 9bc7992f..2fa0f4e7 100644 --- a/src/conductor/asyncio_client/automator/task_handler.py +++ b/src/conductor/asyncio_client/automator/task_handler.py @@ -13,7 +13,7 @@ from conductor.asyncio_client.telemetry.metrics_collector import AsyncMetricsCollector from conductor.asyncio_client.worker.worker import Worker from conductor.asyncio_client.worker.worker_interface import WorkerInterface -from conductor.shared.configuration.settings.metrics_settings import MetricsSettings +from conductor.shared.telemetry.configuration.metrics import MetricsSettings logger = logging.getLogger(Configuration.get_logging_formatted_name(__name__)) diff --git a/src/conductor/asyncio_client/automator/task_runner.py b/src/conductor/asyncio_client/automator/task_runner.py index b12f51bf..5a8ea422 100644 --- a/src/conductor/asyncio_client/automator/task_runner.py +++ b/src/conductor/asyncio_client/automator/task_runner.py @@ -23,7 +23,7 @@ from conductor.asyncio_client.http.exceptions import UnauthorizedException from conductor.asyncio_client.telemetry.metrics_collector import AsyncMetricsCollector from conductor.asyncio_client.worker.worker_interface import WorkerInterface -from conductor.shared.configuration.settings.metrics_settings import MetricsSettings +from conductor.shared.telemetry.configuration.metrics import MetricsSettings logger = logging.getLogger(Configuration.get_logging_formatted_name(__name__)) @@ -32,8 +32,8 @@ class AsyncTaskRunner: def __init__( self, worker: WorkerInterface, - configuration: Configuration = None, - metrics_settings: MetricsSettings = None, + configuration: Optional[Configuration] = None, + metrics_settings: Optional[MetricsSettings] = None, ): if not isinstance(worker, WorkerInterface): raise Exception("Invalid worker") @@ -78,7 +78,8 @@ async def run_once(self) -> None: task = await self.__poll_task() if task is not None and task.task_id is not None: task_result = await self.__execute_task(task) - await self.__update_task(task_result) + if task_result is not None: + await self.__update_task(task_result) await self.__wait_for_polling_interval() self.worker.clear_task_definition_name_cache() except Exception: @@ -95,10 +96,9 @@ async def __poll_task(self) -> Optional[TaskAdapter]: try: start_time = time.time() domain = self.worker.get_domain() - params = {"workerid": self.worker.get_identity()} - if domain is not None: - params["domain"] = domain - task = await self.task_client.poll(tasktype=task_definition_name, **params) + task = await self.task_client.poll( + tasktype=task_definition_name, workerid=self.worker.get_identity(), domain=domain + ) finish_time = time.time() time_spent = finish_time - start_time if self.metrics_collector is not None: diff --git a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py index a22e8a8d..9fc0bc8c 100644 --- a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py @@ -26,6 +26,9 @@ from conductor.asyncio_client.adapters.models.upsert_user_request_adapter import ( UpsertUserRequestAdapter as UpsertUserRequest, ) +from conductor.asyncio_client.adapters.models.create_or_update_application_request_adapter import ( + CreateOrUpdateApplicationRequestAdapter, +) from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient from conductor.client.orkes.models.access_key import AccessKey @@ -62,7 +65,7 @@ async def list_users(self, include_apps: bool = False) -> List[ConductorUserAdap # Application Operations async def create_application( - self, application: ExtendedConductorApplicationAdapter + self, application: CreateOrUpdateApplicationRequestAdapter ) -> ExtendedConductorApplicationAdapter: """Create a new application""" return await self.application_api.create_application( @@ -70,14 +73,16 @@ async def create_application( ) async def update_application( - self, application_id: str, application: ExtendedConductorApplicationAdapter + self, application_id: str, application: CreateOrUpdateApplicationRequestAdapter ) -> ExtendedConductorApplicationAdapter: """Update an existing application""" return await self.application_api.update_application( id=application_id, create_or_update_application_request=application ) - async def get_application(self, application_id: str) -> ExtendedConductorApplicationAdapter: + async def get_application( + self, application_id: str + ) -> Optional[ExtendedConductorApplicationAdapter]: """Get application by ID""" return await self.application_api.get_application(id=application_id) diff --git a/src/conductor/asyncio_client/orkes/orkes_integration_client.py b/src/conductor/asyncio_client/orkes/orkes_integration_client.py index 795549d1..77ddebcd 100644 --- a/src/conductor/asyncio_client/orkes/orkes_integration_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_integration_client.py @@ -12,6 +12,7 @@ from conductor.asyncio_client.adapters.models.integration_update_adapter import ( IntegrationUpdateAdapter, ) +from conductor.asyncio_client.adapters.models.message_template_adapter import MessageTemplateAdapter from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.adapters.models.event_log_adapter import EventLogAdapter from conductor.asyncio_client.http.exceptions import NotFoundException @@ -34,11 +35,11 @@ async def save_integration( ) -> None: await self.integration_api.save_integration_provider(integration_name, integration_details) - async def get_integration_provider(self, name: str) -> IntegrationDefAdapter: + async def get_integration_provider(self, name: str) -> IntegrationAdapter: """Get integration provider by name""" return await self.integration_api.get_integration_provider(name) - async def get_integration(self, integration_name: str) -> IntegrationDefAdapter | None: + async def get_integration(self, integration_name: str) -> Optional[IntegrationAdapter]: try: return await self.get_integration_provider(integration_name) except NotFoundException: @@ -50,7 +51,7 @@ async def delete_integration_provider(self, name: str) -> None: async def get_integration_providers( self, category: Optional[str] = None, active_only: Optional[bool] = None - ) -> List[IntegrationDefAdapter]: + ) -> List[IntegrationAdapter]: """Get all integration providers""" return await self.integration_api.get_integration_providers( category=category, active_only=active_only @@ -81,12 +82,12 @@ async def get_integration_apis(self, integration_name: str) -> List[IntegrationA """Get all APIs for a specific integration""" return await self.integration_api.get_integration_apis(integration_name) - async def get_integration_available_apis(self, name: str) -> List[IntegrationApiAdapter]: + async def get_integration_available_apis(self, name: str) -> List[str]: """Get available APIs for an integration""" return await self.integration_api.get_integration_available_apis(name) # Integration Operations - async def save_all_integrations(self, request_body: List[IntegrationUpdateAdapter]) -> None: + async def save_all_integrations(self, request_body: List[IntegrationAdapter]) -> None: """Save all integrations""" await self.integration_api.save_all_integrations(request_body) @@ -100,7 +101,7 @@ async def get_all_integrations( async def get_providers_and_integrations( self, integration_type: Optional[str] = None, active_only: Optional[bool] = None - ) -> Dict[str, object]: + ) -> List[str]: """Get providers and integrations together""" return await self.integration_api.get_providers_and_integrations( type=integration_type, active_only=active_only @@ -146,7 +147,7 @@ async def get_token_usage_for_integration(self, name: str, integration_name: str """Get token usage for a specific integration""" return await self.integration_api.get_token_usage_for_integration(name, integration_name) - async def get_token_usage_for_integration_provider(self, name: str) -> int: + async def get_token_usage_for_integration_provider(self, name: str) -> Dict[str, str]: """Get token usage for an integration provider""" return await self.integration_api.get_token_usage_for_integration_provider(name) @@ -165,7 +166,7 @@ async def associate_prompt_with_integration( async def get_prompts_with_integration( self, integration_provider: str, integration_name: str - ) -> List[str]: + ) -> List[MessageTemplateAdapter]: """Get prompts associated with an integration""" return await self.integration_api.get_prompts_with_integration( integration_provider, integration_name @@ -189,10 +190,10 @@ async def get_active_integrations(self) -> List[IntegrationAdapter]: async def get_integration_provider_by_category( self, category: str, active_only: bool = True - ) -> List[IntegrationDefAdapter]: + ) -> List[IntegrationAdapter]: """Get integration providers filtered by category""" return await self.get_integration_providers(category=category, active_only=active_only) - async def get_active_integration_providers(self) -> List[IntegrationDefAdapter]: + async def get_active_integration_providers(self) -> List[IntegrationAdapter]: """Get only active integration providers""" return await self.get_integration_providers(active_only=True) diff --git a/src/conductor/asyncio_client/orkes/orkes_scheduler_client.py b/src/conductor/asyncio_client/orkes/orkes_scheduler_client.py index 3a009260..4d330880 100644 --- a/src/conductor/asyncio_client/orkes/orkes_scheduler_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_scheduler_client.py @@ -77,11 +77,9 @@ async def search_schedules( start=start, size=size, sort=sort, free_text=free_text, query=query ) - async def get_schedules_by_tag( - self, tag_key: str, tag_value: str - ) -> List[WorkflowScheduleModelAdapter]: + async def get_schedules_by_tag(self, tag_value: str) -> List[WorkflowScheduleModelAdapter]: """Get schedules filtered by tag key and value""" - return await self.scheduler_api.get_schedules_by_tag(tag_key, tag_value) + return await self.scheduler_api.get_schedules_by_tag(tag_value) # Schedule Planning & Analysis async def get_next_few_schedules( @@ -254,8 +252,6 @@ async def get_schedule_count(self) -> int: schedules = await self.get_all_schedules() return len(schedules) - async def get_schedules_with_tag( - self, tag_key: str, tag_value: str - ) -> List[WorkflowScheduleModelAdapter]: + async def get_schedules_with_tag(self, tag_value: str) -> List[WorkflowScheduleModelAdapter]: """Get schedules that have a specific tag (alias for get_schedules_by_tag)""" - return await self.get_schedules_by_tag(tag_key, tag_value) + return await self.get_schedules_by_tag(tag_value) diff --git a/src/conductor/asyncio_client/orkes/orkes_task_client.py b/src/conductor/asyncio_client/orkes/orkes_task_client.py index a117401a..f5839f4d 100644 --- a/src/conductor/asyncio_client/orkes/orkes_task_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_task_client.py @@ -9,6 +9,7 @@ from conductor.asyncio_client.adapters.models.task_adapter import TaskAdapter from conductor.asyncio_client.adapters.models.task_exec_log_adapter import TaskExecLogAdapter from conductor.asyncio_client.adapters.models.task_result_adapter import TaskResultAdapter +from conductor.asyncio_client.adapters.models.workflow_adapter import WorkflowAdapter from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient @@ -77,7 +78,7 @@ async def update_task_sync( status: str, output: Dict[str, Any], worker_id: Optional[str] = None, - ) -> str: + ) -> WorkflowAdapter: """Update task synchronously by workflow ID and task reference name""" body = {"result": output} return await self.task_api.update_task_sync( diff --git a/src/conductor/asyncio_client/orkes/orkes_workflow_client.py b/src/conductor/asyncio_client/orkes/orkes_workflow_client.py index 0bf43b2b..3be02170 100644 --- a/src/conductor/asyncio_client/orkes/orkes_workflow_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_workflow_client.py @@ -1,7 +1,7 @@ from __future__ import annotations import uuid -from typing import Any, Dict, List, Optional +from typing import Any, Dict, List, Optional, cast from conductor.asyncio_client.adapters.models.correlation_ids_search_request_adapter import ( CorrelationIdsSearchRequestAdapter, @@ -72,7 +72,7 @@ async def execute_workflow( """Execute a workflow synchronously""" return await self.workflow_api.execute_workflow( name=start_workflow_request.name, - version=start_workflow_request.version, + version=start_workflow_request.version or 1, request_id=request_id, start_workflow_request=start_workflow_request, wait_until_task_ref=wait_until_task_ref, @@ -256,11 +256,10 @@ async def update_workflow_state( ) -> WorkflowAdapter: """Update workflow state""" # Convert the adapter to dict for the API call - request_body = ( - workflow_state_update.to_dict() - if hasattr(workflow_state_update, "to_dict") - else workflow_state_update - ) + if hasattr(workflow_state_update, "to_dict"): + request_body: Dict[str, Any] = workflow_state_update.to_dict() + else: + request_body = cast(Dict[str, Any], workflow_state_update) return await self.workflow_api.update_workflow_state( workflow_id=workflow_id, request_body=request_body ) diff --git a/src/conductor/asyncio_client/worker/worker.py b/src/conductor/asyncio_client/worker/worker.py index 0b00e1e4..a9babd2e 100644 --- a/src/conductor/asyncio_client/worker/worker.py +++ b/src/conductor/asyncio_client/worker/worker.py @@ -75,22 +75,23 @@ def execute(self, task: TaskAdapter) -> TaskResultAdapter: for input_name in params: typ = params[input_name].annotation default_value = params[input_name].default - if input_name in task.input_data: + if input_name in task.input_data: # type: ignore[operator] if typ in utils.simple_types: - task_input[input_name] = task.input_data[input_name] + task_input[input_name] = task.input_data[input_name] # type: ignore[index] else: task_input[input_name] = convert_from_dict_or_list( - typ, task.input_data[input_name] + typ, + task.input_data[input_name], # type: ignore[index] ) elif default_value is not inspect.Parameter.empty: task_input[input_name] = default_value else: task_input[input_name] = None - task_output = self.execute_function(**task_input) + task_output = self.execute_function(**task_input) # type: ignore[call-arg] if isinstance(task_output, TaskResultAdapter): - task_output.task_id = task.task_id - task_output.workflow_instance_id = task.workflow_instance_id + task_output.task_id = task.task_id # type: ignore[assignment] + task_output.workflow_instance_id = task.workflow_instance_id # type: ignore[assignment] return task_output else: task_result.status = TaskResultStatus.COMPLETED @@ -120,8 +121,8 @@ def execute(self, task: TaskAdapter) -> TaskResultAdapter: task_result.reason_for_incompletion = ne.args[0] if dataclasses.is_dataclass(type(task_result.output_data)): - task_output = dataclasses.asdict(task_result.output_data) - task_result.output_data = task_output + task_output = dataclasses.asdict(task_result.output_data) # type: ignore[call-overload] + task_result.output_data = task_output # type: ignore[assignment] return task_result if not isinstance(task_result.output_data, dict): task_output = task_result.output_data diff --git a/src/conductor/asyncio_client/workflow/executor/workflow_executor.py b/src/conductor/asyncio_client/workflow/executor/workflow_executor.py index 3497cdcb..d76f6e80 100644 --- a/src/conductor/asyncio_client/workflow/executor/workflow_executor.py +++ b/src/conductor/asyncio_client/workflow/executor/workflow_executor.py @@ -307,11 +307,12 @@ async def update_task_by_ref_name_sync( status: str, ) -> WorkflowAdapter: """Update a task By Ref Name""" + body = {"result": task_output} return await self.task_client.update_task_sync( - request_body=task_output, workflow_id=workflow_id, task_ref_name=task_reference_name, status=status, + request_body=body, ) async def get_task(self, task_id: str) -> Optional[TaskAdapter]: diff --git a/src/conductor/client/ai/orchestrator.py b/src/conductor/client/ai/orchestrator.py index dcb1bdd0..68b5c9a6 100644 --- a/src/conductor/client/ai/orchestrator.py +++ b/src/conductor/client/ai/orchestrator.py @@ -3,7 +3,6 @@ from typing import Optional, List, TYPE_CHECKING from uuid import uuid4 -from typing_extensions import Self from conductor.client.http.models import IntegrationApiUpdate, IntegrationUpdate from conductor.client.codegen.rest import ApiException @@ -22,7 +21,7 @@ class AIOrchestrator: def __init__( self, api_configuration: Configuration, prompt_test_workflow_name: str = "" - ) -> Self: + ) -> None: orkes_clients = OrkesClients(api_configuration) self.integration_client = orkes_clients.get_integration_client() @@ -38,7 +37,7 @@ def add_prompt_template(self, name: str, prompt_template: str, description: str) self.prompt_client.save_prompt(name, description, prompt_template) return self - def get_prompt_template(self, template_name: str) -> PromptTemplate: + def get_prompt_template(self, template_name: str) -> Optional[PromptTemplate]: try: return self.prompt_client.get_prompt(template_name) except ApiException as e: diff --git a/src/conductor/client/workflow/conductor_workflow.py b/src/conductor/client/workflow/conductor_workflow.py index e8338186..fa8fb0d6 100644 --- a/src/conductor/client/workflow/conductor_workflow.py +++ b/src/conductor/client/workflow/conductor_workflow.py @@ -29,22 +29,22 @@ def __init__( version: Optional[int] = None, description: Optional[str] = None, ) -> Self: - self._executor = executor - self.name = name - self.version = version - self.description = description - self._tasks = [] - self._owner_email = None - self._timeout_policy = None - self._timeout_seconds = 60 - self._failure_workflow = "" - self._input_parameters = [] - self._output_parameters = {} - self._input_template = {} - self._variables = {} - self._restartable = True - self._workflow_status_listener_enabled = False - self._workflow_status_listener_sink = None + self._executor: WorkflowExecutor = executor + self.name: str = name + self.version: Optional[int] = version + self.description: Optional[str] = description + self._tasks: List[TaskInterface] = [] + self._owner_email: Optional[str] = None + self._timeout_policy: Optional[TimeoutPolicy] = None + self._timeout_seconds: int = 60 + self._failure_workflow: str = "" + self._input_parameters: List[str] = [] + self._output_parameters: Dict[str, Any] = {} + self._input_template: Dict[str, Any] = {} + self._variables: Dict[str, Any] = {} + self._restartable: bool = True + self._workflow_status_listener_enabled: bool = False + self._workflow_status_listener_sink: Optional[str] = None @property def name(self) -> str: @@ -110,11 +110,11 @@ def restartable(self, restartable: bool) -> Self: self._restartable = deepcopy(restartable) return self - def enable_status_listener(self, sink_name: bool) -> Self: + def enable_status_listener(self, sink_name: bool) -> None: self._workflow_status_listener_sink = sink_name self._workflow_status_listener_enabled = True - def disable_status_listener(self) -> Self: + def disable_status_listener(self) -> None: self._workflow_status_listener_sink = None self._workflow_status_listener_enabled = False @@ -399,7 +399,7 @@ def output(self, json_path: Optional[str] = None) -> str: class InlineSubWorkflowTask(TaskInterface): - def __init__(self, task_ref_name: str, workflow: ConductorWorkflow) -> Self: + def __init__(self, task_ref_name: str, workflow: ConductorWorkflow) -> None: super().__init__( task_reference_name=task_ref_name, task_type=TaskType.SUB_WORKFLOW, diff --git a/src/conductor/client/workflow/task/sub_workflow_task.py b/src/conductor/client/workflow/task/sub_workflow_task.py index 38af91d3..1f0d99c6 100644 --- a/src/conductor/client/workflow/task/sub_workflow_task.py +++ b/src/conductor/client/workflow/task/sub_workflow_task.py @@ -2,8 +2,6 @@ from copy import deepcopy from typing import Dict, Optional -from typing_extensions import Self - from conductor.client.http.models.sub_workflow_params import SubWorkflowParams from conductor.client.http.models.workflow_task import WorkflowTask from conductor.client.workflow.conductor_workflow import ConductorWorkflow @@ -18,7 +16,7 @@ def __init__( workflow_name: str, version: Optional[int] = None, task_to_domain_map: Optional[Dict[str, str]] = None, - ) -> Self: + ) -> None: super().__init__(task_reference_name=task_ref_name, task_type=TaskType.SUB_WORKFLOW) self._workflow_name = deepcopy(workflow_name) self._version = deepcopy(version) @@ -35,7 +33,7 @@ def to_workflow_task(self) -> WorkflowTask: class InlineSubWorkflowTask(TaskInterface): - def __init__(self, task_ref_name: str, workflow: ConductorWorkflow) -> Self: + def __init__(self, task_ref_name: str, workflow: ConductorWorkflow) -> None: super().__init__( task_reference_name=task_ref_name, task_type=TaskType.SUB_WORKFLOW, diff --git a/src/conductor/shared/event/configuration/queue.py b/src/conductor/shared/event/configuration/queue.py index 0ef9b794..78d17f6e 100644 --- a/src/conductor/shared/event/configuration/queue.py +++ b/src/conductor/shared/event/configuration/queue.py @@ -1,5 +1,5 @@ from abc import ABC, abstractmethod -from typing import Any, ClassVar, Dict +from typing import ClassVar, Dict from conductor.shared.event.configuration.queue_worker import QueueWorkerConfiguration @@ -20,5 +20,5 @@ def add_producer(self, worker_configuration: QueueWorkerConfiguration) -> None: self.worker_configuration[self.WORKER_PRODUCER_KEY] = worker_configuration @abstractmethod - def get_worker_configuration(self) -> Dict[str, Any]: + def get_worker_configuration(self) -> str: raise NotImplementedError From 08be4a6cd72b8e66d228d44d39e80958cb04ee74 Mon Sep 17 00:00:00 2001 From: IgorChvyrov-sm Date: Thu, 23 Oct 2025 12:41:53 +0300 Subject: [PATCH 05/17] Fixed mypy issues --- .../adapters/api/workflow_resource_api.py | 10 ++-- .../adapters/models/action_adapter.py | 3 +- .../adapters/models/any_adapter.py | 2 +- .../adapters/models/conductor_user_adapter.py | 4 +- .../adapters/models/descriptor_adapter.py | 20 +++---- .../models/descriptor_proto_adapter.py | 36 +++++------ .../descriptor_proto_or_builder_adapter.py | 34 +++++------ .../models/enum_descriptor_adapter.py | 10 ++-- .../models/enum_descriptor_proto_adapter.py | 16 ++--- ...num_descriptor_proto_or_builder_adapter.py | 18 +++--- .../adapters/models/enum_options_adapter.py | 14 ++--- .../models/enum_options_or_builder_adapter.py | 12 ++-- .../models/enum_value_options_adapter.py | 12 ++-- .../enum_value_options_or_builder_adapter.py | 12 ++-- .../models/environment_variable_adapter.py | 2 +- .../adapters/models/event_handler_adapter.py | 4 +- .../extended_conductor_application_adapter.py | 2 +- .../models/extended_secret_adapter.py | 2 +- .../models/extended_task_def_adapter.py | 10 ++-- .../models/extended_workflow_def_adapter.py | 12 ++-- .../models/extension_range_options_adapter.py | 14 ++--- ...ension_range_options_or_builder_adapter.py | 18 +++--- .../adapters/models/field_options_adapter.py | 16 ++--- .../field_options_or_builder_adapter.py | 18 +++--- .../models/file_descriptor_adapter.py | 18 +++--- .../models/file_descriptor_proto_adapter.py | 30 +++++----- .../adapters/models/file_options_adapter.py | 12 ++-- .../models/file_options_or_builder_adapter.py | 14 ++--- .../models/granted_access_response_adapter.py | 2 +- .../adapters/models/group_adapter.py | 2 +- .../adapters/models/integration_adapter.py | 4 +- .../models/integration_api_adapter.py | 2 +- .../models/integration_def_adapter.py | 2 +- .../integration_def_form_field_adapter.py | 4 +- .../models/message_options_adapter.py | 12 ++-- .../message_options_or_builder_adapter.py | 14 ++--- .../models/message_template_adapter.py | 2 +- .../adapters/models/method_options_adapter.py | 14 ++--- .../method_options_or_builder_adapter.py | 14 ++--- .../adapters/models/oneof_options_adapter.py | 14 ++--- .../oneof_options_or_builder_adapter.py | 14 ++--- .../adapters/models/role_adapter.py | 2 +- ..._search_result_workflow_summary_adapter.py | 2 +- ...h_result_handled_event_response_adapter.py | 2 +- .../search_result_task_summary_adapter.py | 2 +- ...rkflow_schedule_execution_model_adapter.py | 2 +- .../models/service_descriptor_adapter.py | 11 ++-- .../service_descriptor_proto_adapter.py | 14 ++--- ...ice_descriptor_proto_or_builder_adapter.py | 14 ++--- .../models/service_options_adapter.py | 12 ++-- .../service_options_or_builder_adapter.py | 12 ++-- .../models/source_code_info_adapter.py | 10 ++-- .../source_code_info_or_builder_adapter.py | 10 ++-- .../adapters/models/task_def_adapter.py | 8 +-- .../adapters/models/task_result_adapter.py | 5 +- .../models/uninterpreted_option_adapter.py | 10 ++-- ...uninterpreted_option_or_builder_adapter.py | 10 ++-- .../adapters/models/webhook_config_adapter.py | 4 +- .../adapters/models/workflow_adapter.py | 6 +- .../adapters/models/workflow_def_adapter.py | 10 ++-- .../adapters/models/workflow_run_adapter.py | 16 ++--- .../models/workflow_schedule_adapter.py | 4 +- .../models/workflow_schedule_model_adapter.py | 4 +- .../adapters/models/workflow_task_adapter.py | 16 ++--- .../models/workflow_test_request_adapter.py | 6 +- .../asyncio_client/automator/task_handler.py | 3 +- .../configuration/configuration.py | 18 +++--- .../asyncio_client/event/event_client.py | 2 +- .../telemetry/metrics_collector.py | 4 +- .../workflow/task/do_while_task.py | 6 +- .../workflow/task/dynamic_fork_task.py | 2 +- .../asyncio_client/workflow/task/fork_task.py | 2 +- .../asyncio_client/workflow/task/http_task.py | 2 +- .../workflow/task/javascript_task.py | 4 +- .../task/llm_tasks/llm_index_documents.py | 8 +-- .../task/llm_tasks/llm_text_complete.py | 6 +- .../workflow/task/switch_task.py | 16 ++--- .../asyncio_client/workflow/task/task.py | 30 +++++----- .../api/application_resource_api_adapter.py | 59 +++++-------------- .../adapters/models/bulk_response_adapter.py | 9 ++- .../adapters/models/conductor_user_adapter.py | 4 +- .../adapters/models/integration_adapter.py | 36 ++--------- .../models/integration_api_adapter.py | 28 ++------- .../models/integration_def_adapter.py | 26 ++------ .../integration_def_form_field_adapter.py | 2 +- .../models/integration_update_adapter.py | 2 +- .../models/save_schedule_request_adapter.py | 2 +- .../adapters/models/schema_def_adapter.py | 6 +- .../models/start_workflow_request_adapter.py | 2 +- .../models/state_change_event_adapter.py | 16 +++-- .../models/sub_workflow_params_adapter.py | 2 +- .../adapters/models/target_ref_adapter.py | 4 +- .../adapters/models/task_def_adapter.py | 4 +- .../adapters/models/task_result_adapter.py | 2 +- .../adapters/models/task_summary_adapter.py | 46 ++------------- .../models/upsert_group_request_adapter.py | 4 +- .../models/upsert_user_request_adapter.py | 2 +- .../adapters/models/workflow_def_adapter.py | 2 +- .../adapters/models/workflow_run_adapter.py | 8 +-- .../adapters/models/workflow_task_adapter.py | 4 +- src/conductor/client/adapters/rest_adapter.py | 20 +++---- .../client/automator/task_handler.py | 18 +++--- src/conductor/client/automator/task_runner.py | 22 +++---- .../client/configuration/configuration.py | 2 +- src/conductor/client/event/event_client.py | 2 +- .../client/exceptions/auth_401_policy.py | 6 +- src/conductor/client/helpers/helper.py | 2 +- src/conductor/client/integration_client.py | 10 ++-- .../client/orkes/models/access_key.py | 2 + .../client/orkes/models/granted_permission.py | 4 +- .../client/orkes/models/metadata_tag.py | 4 +- .../client/orkes/models/ratelimit_tag.py | 4 +- .../client/orkes/orkes_integration_client.py | 12 ++-- .../client/orkes/orkes_metadata_client.py | 8 +-- .../client/orkes/orkes_prompt_client.py | 4 +- .../client/orkes/orkes_scheduler_client.py | 12 ++-- .../client/orkes/orkes_secret_client.py | 2 +- .../orkes/orkes_service_registry_client.py | 2 +- .../client/orkes/orkes_task_client.py | 4 +- .../client/orkes/orkes_workflow_client.py | 12 ++-- src/conductor/client/orkes_clients.py | 6 +- src/conductor/client/scheduler_client.py | 4 +- .../client/telemetry/metrics_collector.py | 6 +- src/conductor/client/worker/worker.py | 5 +- .../client/workflow/conductor_workflow.py | 16 ++--- .../workflow/executor/workflow_executor.py | 26 ++++---- .../client/workflow/task/do_while_task.py | 8 +-- .../client/workflow/task/dynamic_fork_task.py | 11 ++-- .../client/workflow/task/dynamic_task.py | 4 +- .../client/workflow/task/event_task.py | 8 +-- .../client/workflow/task/fork_task.py | 8 +-- .../client/workflow/task/get_document.py | 4 +- .../client/workflow/task/http_poll_task.py | 8 +-- .../client/workflow/task/http_task.py | 8 +-- .../client/workflow/task/human_task.py | 3 +- src/conductor/client/workflow/task/inline.py | 3 +- .../client/workflow/task/javascript_task.py | 7 +-- .../client/workflow/task/join_task.py | 4 +- .../client/workflow/task/json_jq_task.py | 4 +- .../client/workflow/task/kafka_publish.py | 8 ++- .../task/llm_tasks/llm_chat_complete.py | 8 +-- .../task/llm_tasks/llm_generate_embeddings.py | 3 +- .../task/llm_tasks/llm_index_documents.py | 10 ++-- .../workflow/task/llm_tasks/llm_index_text.py | 3 +- .../task/llm_tasks/llm_query_embeddings.py | 4 +- .../task/llm_tasks/llm_search_index.py | 3 +- .../task/llm_tasks/llm_text_complete.py | 9 ++- .../client/workflow/task/set_variable_task.py | 4 +- .../client/workflow/task/simple_task.py | 4 +- .../workflow/task/start_workflow_task.py | 3 +- .../client/workflow/task/switch_task.py | 18 +++--- src/conductor/client/workflow/task/task.py | 34 +++++------ .../client/workflow/task/terminate_task.py | 4 +- .../workflow/task/wait_for_webhook_task.py | 3 +- .../client/workflow/task/wait_task.py | 7 +-- src/conductor/shared/automator/utils.py | 12 ++-- .../shared/event/configuration/queue.py | 4 +- 157 files changed, 665 insertions(+), 811 deletions(-) diff --git a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py index 87deb007..c0123dbf 100644 --- a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py @@ -313,15 +313,15 @@ async def update_workflow_and_task_state( # type: ignore[override] async def test_workflow( # type: ignore[override] self, workflow_test_request: WorkflowTestRequestAdapter, # type: ignore[override] - _request_timeout: Union[ + _request_timeout: Union[ # noqa: PT019 None, Annotated[StrictFloat, Field(gt=0)], Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + _request_auth: Optional[Dict[StrictStr, Any]] = None, # noqa: PT019 + _content_type: Optional[StrictStr] = None, # noqa: PT019 + _headers: Optional[Dict[StrictStr, Any]] = None, # noqa: PT019 + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, # noqa: PT019 ) -> WorkflowAdapter: result = await super().test_workflow( workflow_test_request, # type: ignore[override] diff --git a/src/conductor/asyncio_client/adapters/models/action_adapter.py b/src/conductor/asyncio_client/adapters/models/action_adapter.py index 73d96fce..e613baf5 100644 --- a/src/conductor/asyncio_client/adapters/models/action_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/action_adapter.py @@ -1,6 +1,7 @@ from __future__ import annotations -from typing import Any, Dict, Optional, Self +from typing import Any, Dict, Optional +from typing_extensions import Self from conductor.asyncio_client.http.models import Action diff --git a/src/conductor/asyncio_client/adapters/models/any_adapter.py b/src/conductor/asyncio_client/adapters/models/any_adapter.py index a1992277..f3bbc738 100644 --- a/src/conductor/asyncio_client/adapters/models/any_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/any_adapter.py @@ -29,7 +29,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: { "allFields": obj.get("allFields"), "defaultInstanceForType": ( - Any.from_dict(obj["defaultInstanceForType"]) + Any.from_dict(obj["defaultInstanceForType"]) # type: ignore[attr-defined] if obj.get("defaultInstanceForType") is not None else None ), diff --git a/src/conductor/asyncio_client/adapters/models/conductor_user_adapter.py b/src/conductor/asyncio_client/adapters/models/conductor_user_adapter.py index e9d06ae3..0ff15a50 100644 --- a/src/conductor/asyncio_client/adapters/models/conductor_user_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/conductor_user_adapter.py @@ -9,8 +9,8 @@ class ConductorUserAdapter(ConductorUser): - groups: Optional[List["GroupAdapter"]] = None - roles: Optional[List["RoleAdapter"]] = None + groups: Optional[List["GroupAdapter"]] = None # type: ignore[assignment] + roles: Optional[List["RoleAdapter"]] = None # type: ignore[assignment] orkes_app: Optional[StrictBool] = Field(default=None, alias="orkesApp") orkes_api_gateway: Optional[StrictBool] = Field(default=None, alias="orkesApiGateway") contact_information: Optional[Dict[Any, str]] = Field(default=None, alias="contactInformation") diff --git a/src/conductor/asyncio_client/adapters/models/descriptor_adapter.py b/src/conductor/asyncio_client/adapters/models/descriptor_adapter.py index 748edbfa..1e657346 100644 --- a/src/conductor/asyncio_client/adapters/models/descriptor_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/descriptor_adapter.py @@ -9,16 +9,16 @@ class DescriptorAdapter(Descriptor): - containing_type: Optional["DescriptorAdapter"] = Field(default=None, alias="containingType") - enum_types: Optional[List["EnumDescriptorAdapter"]] = Field(default=None, alias="enumTypes") - extensions: Optional[List["FieldDescriptorAdapter"]] = None - fields: Optional[List["FieldDescriptorAdapter"]] = None - file: Optional["FileDescriptorAdapter"] = None - nested_types: Optional[List["DescriptorAdapter"]] = Field(default=None, alias="nestedTypes") - oneofs: Optional[List["OneofDescriptorAdapter"]] = None - options: Optional["MessageOptionsAdapter"] = None - proto: Optional["DescriptorProtoAdapter"] = None - real_oneofs: Optional[List["OneofDescriptorAdapter"]] = Field(default=None, alias="realOneofs") + containing_type: Optional["DescriptorAdapter"] = Field(default=None, alias="containingType") # type: ignore[assignment] + enum_types: Optional[List["EnumDescriptorAdapter"]] = Field(default=None, alias="enumTypes") # type: ignore[assignment] + extensions: Optional[List["FieldDescriptorAdapter"]] = None # type: ignore[assignment] + fields: Optional[List["FieldDescriptorAdapter"]] = None # type: ignore[assignment] + file: Optional["FileDescriptorAdapter"] = None # type: ignore[assignment] + nested_types: Optional[List["DescriptorAdapter"]] = Field(default=None, alias="nestedTypes") # type: ignore[assignment] + oneofs: Optional[List["OneofDescriptorAdapter"]] = None # type: ignore[assignment] + options: Optional["MessageOptionsAdapter"] = None # type: ignore[assignment] + proto: Optional["DescriptorProtoAdapter"] = None # type: ignore[assignment] + real_oneofs: Optional[List["OneofDescriptorAdapter"]] = Field(default=None, alias="realOneofs") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/descriptor_proto_adapter.py b/src/conductor/asyncio_client/adapters/models/descriptor_proto_adapter.py index 7f8761f0..4c52abb0 100644 --- a/src/conductor/asyncio_client/adapters/models/descriptor_proto_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/descriptor_proto_adapter.py @@ -10,59 +10,59 @@ class DescriptorProtoAdapter(DescriptorProto): all_fields: Optional[Dict[str, Dict[str, Any]]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["DescriptorProto"] = Field( + default_instance_for_type: Optional["DescriptorProto"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( + enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="enumTypeList" ) - enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( + enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="enumTypeOrBuilderList" ) - extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( + extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionList" ) - extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( + extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionOrBuilderList" ) - extension_range_list: Optional[List["ExtensionRangeAdapter"]] = Field( + extension_range_list: Optional[List["ExtensionRangeAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionRangeList" ) - extension_range_or_builder_list: Optional[List["ExtensionRangeOrBuilderAdapter"]] = Field( + extension_range_or_builder_list: Optional[List["ExtensionRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionRangeOrBuilderList" ) - field_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( + field_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="fieldList" ) - field_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( + field_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="fieldOrBuilderList" ) - nested_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( + nested_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="nestedTypeList" ) - nested_type_or_builder_list: Optional[List["DescriptorProtoOrBuilderAdapter"]] = Field( + nested_type_or_builder_list: Optional[List["DescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="nestedTypeOrBuilderList" ) - oneof_decl_list: Optional[List["OneofDescriptorProtoAdapter"]] = Field( + oneof_decl_list: Optional[List["OneofDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="oneofDeclList" ) - oneof_decl_or_builder_list: Optional[List["OneofDescriptorProtoOrBuilderAdapter"]] = Field( + oneof_decl_or_builder_list: Optional[List["OneofDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="oneofDeclOrBuilderList" ) options: Optional["MessageOptionsAdapter"] = None - options_or_builder: Optional["MessageOptionsOrBuilderAdapter"] = Field( + options_or_builder: Optional["MessageOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="optionsOrBuilder" ) - reserved_range_list: Optional[List["ReservedRangeAdapter"]] = Field( + reserved_range_list: Optional[List["ReservedRangeAdapter"]] = Field( # type: ignore[assignment] default=None, alias="reservedRangeList" ) - reserved_range_or_builder_list: Optional[List["ReservedRangeOrBuilderAdapter"]] = Field( + reserved_range_or_builder_list: Optional[List["ReservedRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="reservedRangeOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py index 10396da0..2225c3a6 100644 --- a/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py @@ -10,55 +10,55 @@ class DescriptorProtoOrBuilderAdapter(DescriptorProtoOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( + enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="enumTypeList" ) - enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( + enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="enumTypeOrBuilderList" ) - extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( + extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionList" ) - extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( + extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionOrBuilderList" ) - extension_range_list: Optional[List["ExtensionRangeAdapter"]] = Field( + extension_range_list: Optional[List["ExtensionRangeAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionRangeList" ) - extension_range_or_builder_list: Optional[List["ExtensionRangeOrBuilderAdapter"]] = Field( + extension_range_or_builder_list: Optional[List["ExtensionRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionRangeOrBuilderList" ) - field_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( + field_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="fieldList" ) - field_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( + field_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="fieldOrBuilderList" ) - nested_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( + nested_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="nestedTypeList" ) - oneof_decl_list: Optional[List["OneofDescriptorProtoAdapter"]] = Field( + oneof_decl_list: Optional[List["OneofDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="oneofDeclList" ) - oneof_decl_or_builder_list: Optional[List["OneofDescriptorProtoOrBuilderAdapter"]] = Field( + oneof_decl_or_builder_list: Optional[List["OneofDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="oneofDeclOrBuilderList" ) - options_or_builder: Optional["MessageOptionsOrBuilderAdapter"] = Field( + options_or_builder: Optional["MessageOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="optionsOrBuilder" ) - reserved_range_list: Optional[List["ReservedRangeAdapter"]] = Field( + reserved_range_list: Optional[List["ReservedRangeAdapter"]] = Field( # type: ignore[assignment] default=None, alias="reservedRangeList" ) - reserved_range_or_builder_list: Optional[List["ReservedRangeOrBuilderAdapter"]] = Field( + reserved_range_or_builder_list: Optional[List["ReservedRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="reservedRangeOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_descriptor_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_descriptor_adapter.py index 4f265294..f142c07e 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_descriptor_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_descriptor_adapter.py @@ -9,11 +9,11 @@ class EnumDescriptorAdapter(EnumDescriptor): - containing_type: Optional["DescriptorAdapter"] = Field(default=None, alias="containingType") - file: Optional["FileDescriptorAdapter"] = None - options: Optional["EnumOptionsAdapter"] = None - proto: Optional["EnumDescriptorProtoAdapter"] = None - values: Optional[List["EnumValueDescriptorAdapter"]] = None + containing_type: Optional["DescriptorAdapter"] = Field(default=None, alias="containingType") # type: ignore[assignment] + file: Optional["FileDescriptorAdapter"] = None # type: ignore[assignment] + options: Optional["EnumOptionsAdapter"] = None # type: ignore[assignment] + proto: Optional["EnumDescriptorProtoAdapter"] = None # type: ignore[assignment] + values: Optional[List["EnumValueDescriptorAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_adapter.py index e1c446b5..a74d690f 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_adapter.py @@ -10,27 +10,27 @@ class EnumDescriptorProtoAdapter(EnumDescriptorProto): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["EnumDescriptorProtoAdapter"] = Field( + default_instance_for_type: Optional["EnumDescriptorProtoAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) options: Optional["EnumOptionsAdapter"] = None - options_or_builder: Optional["EnumOptionsOrBuilderAdapter"] = Field( + options_or_builder: Optional["EnumOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="optionsOrBuilder" ) - reserved_range_list: Optional[List["EnumReservedRangeAdapter"]] = Field( + reserved_range_list: Optional[List["EnumReservedRangeAdapter"]] = Field( # type: ignore[assignment] default=None, alias="reservedRangeList" ) - reserved_range_or_builder_list: Optional[List["EnumReservedRangeOrBuilderAdapter"]] = Field( + reserved_range_or_builder_list: Optional[List["EnumReservedRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="reservedRangeOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") - value_list: Optional[List["EnumValueDescriptorProtoAdapter"]] = Field( + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + value_list: Optional[List["EnumValueDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="valueList" ) - value_or_builder_list: Optional[List["EnumValueDescriptorProtoOrBuilderAdapter"]] = Field( + value_or_builder_list: Optional[List["EnumValueDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="valueOrBuilderList" ) diff --git a/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_or_builder_adapter.py index ab658411..c5a3a57b 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_or_builder_adapter.py @@ -10,27 +10,27 @@ class EnumDescriptorProtoOrBuilderAdapter(EnumDescriptorProtoOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - options: Optional["EnumOptionsAdapter"] = None - options_or_builder: Optional["EnumOptionsOrBuilderAdapter"] = Field( + options: Optional["EnumOptionsAdapter"] = None # type: ignore[assignment] + options_or_builder: Optional["EnumOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="optionsOrBuilder" ) - reserved_range_list: Optional[List["EnumReservedRangeAdapter"]] = Field( + reserved_range_list: Optional[List["EnumReservedRangeAdapter"]] = Field( # type: ignore[assignment] default=None, alias="reservedRangeList" ) - reserved_range_or_builder_list: Optional[List["EnumReservedRangeOrBuilderAdapter"]] = Field( + reserved_range_or_builder_list: Optional[List["EnumReservedRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="reservedRangeOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") - value_list: Optional[List["EnumValueDescriptorProtoAdapter"]] = Field( + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + value_list: Optional[List["EnumValueDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="valueList" ) - value_or_builder_list: Optional[List["EnumValueDescriptorProtoOrBuilderAdapter"]] = Field( + value_or_builder_list: Optional[List["EnumValueDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="valueOrBuilderList" ) diff --git a/src/conductor/asyncio_client/adapters/models/enum_options_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_options_adapter.py index 0b3a3ca9..858d506f 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_options_adapter.py @@ -11,23 +11,23 @@ class EnumOptionsAdapter(EnumOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["EnumOptionsAdapter"] = Field( + default_instance_for_type: Optional["EnumOptionsAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_options_or_builder_adapter.py index 7c8495f0..5ce6490b 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class EnumOptionsOrBuilderAdapter(EnumOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_value_options_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_value_options_adapter.py index 05d9d6c7..6de7507c 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_value_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_value_options_adapter.py @@ -11,23 +11,23 @@ class EnumValueOptionsAdapter(EnumValueOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["EnumValueOptionsAdapter"] = Field( + default_instance_for_type: Optional["EnumValueOptionsAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_value_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_value_options_or_builder_adapter.py index c3369653..54ccbd01 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_value_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_value_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class EnumValueOptionsOrBuilderAdapter(EnumValueOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/environment_variable_adapter.py b/src/conductor/asyncio_client/adapters/models/environment_variable_adapter.py index c969d951..07028025 100644 --- a/src/conductor/asyncio_client/adapters/models/environment_variable_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/environment_variable_adapter.py @@ -8,7 +8,7 @@ class EnvironmentVariableAdapter(EnvironmentVariable): - tags: Optional[List["TagAdapter"]] = None + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/event_handler_adapter.py b/src/conductor/asyncio_client/adapters/models/event_handler_adapter.py index bfea7e00..b98ac1a4 100644 --- a/src/conductor/asyncio_client/adapters/models/event_handler_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/event_handler_adapter.py @@ -8,8 +8,8 @@ class EventHandlerAdapter(EventHandler): - actions: Optional[List["ActionAdapter"]] = None - tags: Optional[List["TagAdapter"]] = None + actions: Optional[List["ActionAdapter"]] = None # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extended_conductor_application_adapter.py b/src/conductor/asyncio_client/adapters/models/extended_conductor_application_adapter.py index 82fa4eed..a5b4b924 100644 --- a/src/conductor/asyncio_client/adapters/models/extended_conductor_application_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extended_conductor_application_adapter.py @@ -8,7 +8,7 @@ class ExtendedConductorApplicationAdapter(ExtendedConductorApplication): - tags: Optional[List["TagAdapter"]] = None + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extended_secret_adapter.py b/src/conductor/asyncio_client/adapters/models/extended_secret_adapter.py index ae4dc880..09b20b5a 100644 --- a/src/conductor/asyncio_client/adapters/models/extended_secret_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extended_secret_adapter.py @@ -8,7 +8,7 @@ class ExtendedSecretAdapter(ExtendedSecret): - tags: Optional[List["TagAdapter"]] = None + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extended_task_def_adapter.py b/src/conductor/asyncio_client/adapters/models/extended_task_def_adapter.py index 640b01f3..c549579a 100644 --- a/src/conductor/asyncio_client/adapters/models/extended_task_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extended_task_def_adapter.py @@ -9,12 +9,12 @@ class ExtendedTaskDefAdapter(ExtendedTaskDef): - input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") + input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") # type: ignore[assignment] input_template: Optional[Dict[str, Any]] = Field(default=None, alias="inputTemplate") - output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") - tags: Optional[List["TagAdapter"]] = None - timeout_seconds: Optional[int] = Field(alias="timeoutSeconds", default=None) - total_timeout_seconds: Optional[int] = Field(alias="totalTimeoutSeconds", default=None) + output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + timeout_seconds: Optional[int] = Field(alias="timeoutSeconds", default=None) # type: ignore[assignment] + total_timeout_seconds: Optional[int] = Field(alias="totalTimeoutSeconds", default=None) # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extended_workflow_def_adapter.py b/src/conductor/asyncio_client/adapters/models/extended_workflow_def_adapter.py index e7f51742..63828f05 100644 --- a/src/conductor/asyncio_client/adapters/models/extended_workflow_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extended_workflow_def_adapter.py @@ -9,17 +9,17 @@ class ExtendedWorkflowDefAdapter(ExtendedWorkflowDef): - input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") + input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") # type: ignore[assignment] input_template: Optional[Dict[str, Any]] = Field(default=None, alias="inputTemplate") output_parameters: Optional[Dict[str, Any]] = Field(default=None, alias="outputParameters") - output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") - rate_limit_config: Optional["RateLimitConfigAdapter"] = Field( + output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") # type: ignore[assignment] + rate_limit_config: Optional["RateLimitConfigAdapter"] = Field( # type: ignore[assignment] default=None, alias="rateLimitConfig" ) - tags: Optional[List["TagAdapter"]] = None - tasks: List["WorkflowTaskAdapter"] + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + tasks: List["WorkflowTaskAdapter"] # type: ignore[assignment] variables: Optional[Dict[str, Any]] = None - timeout_seconds: Optional[int] = Field(default=None, alias="timeoutSeconds") + timeout_seconds: Optional[int] = Field(default=None, alias="timeoutSeconds") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extension_range_options_adapter.py b/src/conductor/asyncio_client/adapters/models/extension_range_options_adapter.py index 5b4b1e96..9fcda2a1 100644 --- a/src/conductor/asyncio_client/adapters/models/extension_range_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extension_range_options_adapter.py @@ -11,26 +11,26 @@ class ExtensionRangeOptionsAdapter(ExtensionRangeOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - declaration_or_builder_list: Optional[List["DeclarationOrBuilderAdapter"]] = Field( + declaration_or_builder_list: Optional[List["DeclarationOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="declarationOrBuilderList" ) - default_instance_for_type: Optional["ExtensionRangeOptionsAdapter"] = Field( + default_instance_for_type: Optional["ExtensionRangeOptionsAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extension_range_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/extension_range_options_or_builder_adapter.py index 23e6411b..1859be85 100644 --- a/src/conductor/asyncio_client/adapters/models/extension_range_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extension_range_options_or_builder_adapter.py @@ -10,29 +10,29 @@ class ExtensionRangeOptionsOrBuilderAdapter(ExtensionRangeOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - declaration_list: Optional[List["DeclarationAdapter"]] = Field( + declaration_list: Optional[List["DeclarationAdapter"]] = Field( # type: ignore[assignment] default=None, alias="declarationList" ) - declaration_or_builder_list: Optional[List["DeclarationOrBuilderAdapter"]] = Field( + declaration_or_builder_list: Optional[List["DeclarationOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="declarationOrBuilderList" ) - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/field_options_adapter.py b/src/conductor/asyncio_client/adapters/models/field_options_adapter.py index a3227776..89fe5202 100644 --- a/src/conductor/asyncio_client/adapters/models/field_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/field_options_adapter.py @@ -11,29 +11,29 @@ class FieldOptionsAdapter(FieldOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["FieldOptionsAdapter"] = Field( + default_instance_for_type: Optional["FieldOptionsAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - edition_defaults_list: Optional[List["EditionDefaultAdapter"]] = Field( + edition_defaults_list: Optional[List["EditionDefaultAdapter"]] = Field( # type: ignore[assignment] default=None, alias="editionDefaultsList" ) - edition_defaults_or_builder_list: Optional[List["EditionDefaultOrBuilderAdapter"]] = Field( + edition_defaults_or_builder_list: Optional[List["EditionDefaultOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="editionDefaultsOrBuilderList" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/field_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/field_options_or_builder_adapter.py index df899eba..3fc8fc51 100644 --- a/src/conductor/asyncio_client/adapters/models/field_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/field_options_or_builder_adapter.py @@ -10,29 +10,29 @@ class FieldOptionsOrBuilderAdapter(FieldOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - edition_defaults_list: Optional[List["EditionDefaultAdapter"]] = Field( + edition_defaults_list: Optional[List["EditionDefaultAdapter"]] = Field( # type: ignore[assignment] default=None, alias="editionDefaultsList" ) - edition_defaults_or_builder_list: Optional[List["EditionDefaultOrBuilderAdapter"]] = Field( + edition_defaults_or_builder_list: Optional[List["EditionDefaultOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="editionDefaultsOrBuilderList" ) - features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/file_descriptor_adapter.py b/src/conductor/asyncio_client/adapters/models/file_descriptor_adapter.py index 381f3ef9..e42265ef 100644 --- a/src/conductor/asyncio_client/adapters/models/file_descriptor_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/file_descriptor_adapter.py @@ -9,17 +9,17 @@ class FileDescriptorAdapter(FileDescriptor): - dependencies: Optional[List["FileDescriptorAdapter"]] = None - enum_types: Optional[List["EnumDescriptorAdapter"]] = Field(default=None, alias="enumTypes") - extensions: Optional[List["FieldDescriptorAdapter"]] = None - file: Optional["FileDescriptorAdapter"] = None - message_types: Optional[List["DescriptorAdapter"]] = Field(default=None, alias="messageTypes") - options: Optional["FileOptionsAdapter"] = None - proto: Optional["FileDescriptorProtoAdapter"] = None - public_dependencies: Optional[List["FileDescriptorAdapter"]] = Field( + dependencies: Optional[List["FileDescriptorAdapter"]] = None # type: ignore[assignment] + enum_types: Optional[List["EnumDescriptorAdapter"]] = Field(default=None, alias="enumTypes") # type: ignore[assignment] + extensions: Optional[List["FieldDescriptorAdapter"]] = None # type: ignore[assignment] + file: Optional["FileDescriptorAdapter"] = None # type: ignore[assignment] + message_types: Optional[List["DescriptorAdapter"]] = Field(default=None, alias="messageTypes") # type: ignore[assignment] + options: Optional["FileOptionsAdapter"] = None # type: ignore[assignment] + proto: Optional["FileDescriptorProtoAdapter"] = None # type: ignore[assignment] + public_dependencies: Optional[List["FileDescriptorAdapter"]] = Field( # type: ignore[assignment] default=None, alias="publicDependencies" ) - services: Optional[List["ServiceDescriptorAdapter"]] = None + services: Optional[List["ServiceDescriptorAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/file_descriptor_proto_adapter.py b/src/conductor/asyncio_client/adapters/models/file_descriptor_proto_adapter.py index c27c7ab9..201a4372 100644 --- a/src/conductor/asyncio_client/adapters/models/file_descriptor_proto_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/file_descriptor_proto_adapter.py @@ -10,47 +10,47 @@ class FileDescriptorProtoAdapter(FileDescriptorProto): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["FileDescriptorProtoAdapter"] = Field( + default_instance_for_type: Optional["FileDescriptorProtoAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( + enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="enumTypeList" ) - enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( + enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="enumTypeOrBuilderList" ) - extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( + extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionList" ) - extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( + extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionOrBuilderList" ) - message_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( + message_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="messageTypeList" ) - message_type_or_builder_list: Optional[List["DescriptorProtoOrBuilderAdapter"]] = Field( + message_type_or_builder_list: Optional[List["DescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="messageTypeOrBuilderList" ) - options: Optional["FileOptionsAdapter"] = None - options_or_builder: Optional["FileOptionsOrBuilderAdapter"] = Field( + options: Optional["FileOptionsAdapter"] = None # type: ignore[assignment] + options_or_builder: Optional["FileOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="optionsOrBuilder" ) - service_list: Optional[List["ServiceDescriptorProtoAdapter"]] = Field( + service_list: Optional[List["ServiceDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="serviceList" ) - service_or_builder_list: Optional[List["ServiceDescriptorProtoOrBuilderAdapter"]] = Field( + service_or_builder_list: Optional[List["ServiceDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="serviceOrBuilderList" ) - source_code_info: Optional["SourceCodeInfoAdapter"] = Field( + source_code_info: Optional["SourceCodeInfoAdapter"] = Field( # type: ignore[assignment] default=None, alias="sourceCodeInfo" ) - source_code_info_or_builder: Optional["SourceCodeInfoOrBuilderAdapter"] = Field( + source_code_info_or_builder: Optional["SourceCodeInfoOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="sourceCodeInfoOrBuilder" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/file_options_adapter.py b/src/conductor/asyncio_client/adapters/models/file_options_adapter.py index 211a7619..9f9c21c9 100644 --- a/src/conductor/asyncio_client/adapters/models/file_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/file_options_adapter.py @@ -11,23 +11,23 @@ class FileOptionsAdapter(FileOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["FileOptionsAdapter"] = Field( + default_instance_for_type: Optional["FileOptionsAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/file_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/file_options_or_builder_adapter.py index d7d7bad2..e5c7e680 100644 --- a/src/conductor/asyncio_client/adapters/models/file_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/file_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class FileOptionsOrBuilderAdapter(FileOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/granted_access_response_adapter.py b/src/conductor/asyncio_client/adapters/models/granted_access_response_adapter.py index 08526c8c..d954f0cc 100644 --- a/src/conductor/asyncio_client/adapters/models/granted_access_response_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/granted_access_response_adapter.py @@ -9,7 +9,7 @@ class GrantedAccessResponseAdapter(GrantedAccessResponse): - granted_access: Optional[List["GrantedAccessAdapter"]] = Field( + granted_access: Optional[List["GrantedAccessAdapter"]] = Field( # type: ignore[assignment] default=None, alias="grantedAccess" ) diff --git a/src/conductor/asyncio_client/adapters/models/group_adapter.py b/src/conductor/asyncio_client/adapters/models/group_adapter.py index e378a20d..f7c19fda 100644 --- a/src/conductor/asyncio_client/adapters/models/group_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/group_adapter.py @@ -9,7 +9,7 @@ class GroupAdapter(Group): - roles: Optional[List["RoleAdapter"]] = None + roles: Optional[List["RoleAdapter"]] = None # type: ignore[assignment] @field_validator("default_access") def default_access_validate_enum(cls, value): diff --git a/src/conductor/asyncio_client/adapters/models/integration_adapter.py b/src/conductor/asyncio_client/adapters/models/integration_adapter.py index c10b1b34..53291829 100644 --- a/src/conductor/asyncio_client/adapters/models/integration_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/integration_adapter.py @@ -9,9 +9,9 @@ class IntegrationAdapter(Integration): - apis: Optional[List["IntegrationApiAdapter"]] = None + apis: Optional[List["IntegrationApiAdapter"]] = None # type: ignore[assignment] configuration: Optional[Dict[str, Any]] = None - tags: Optional[List["TagAdapter"]] = None + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] @field_validator("category") def category_validate_enum(cls, value): diff --git a/src/conductor/asyncio_client/adapters/models/integration_api_adapter.py b/src/conductor/asyncio_client/adapters/models/integration_api_adapter.py index c39911b5..f0bab337 100644 --- a/src/conductor/asyncio_client/adapters/models/integration_api_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/integration_api_adapter.py @@ -9,7 +9,7 @@ class IntegrationApiAdapter(IntegrationApi): configuration: Optional[Dict[str, Any]] = None - tags: Optional[List["TagAdapter"]] = None + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/integration_def_adapter.py b/src/conductor/asyncio_client/adapters/models/integration_def_adapter.py index 192cacbe..7c862be4 100644 --- a/src/conductor/asyncio_client/adapters/models/integration_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/integration_def_adapter.py @@ -9,7 +9,7 @@ class IntegrationDefAdapter(IntegrationDef): - configuration: Optional[List["IntegrationDefFormFieldAdapter"]] = None + configuration: Optional[List["IntegrationDefFormFieldAdapter"]] = None # type: ignore[assignment] @field_validator("category") def category_validate_enum(cls, value): diff --git a/src/conductor/asyncio_client/adapters/models/integration_def_form_field_adapter.py b/src/conductor/asyncio_client/adapters/models/integration_def_form_field_adapter.py index d10cf6cd..c8976c2b 100644 --- a/src/conductor/asyncio_client/adapters/models/integration_def_form_field_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/integration_def_form_field_adapter.py @@ -9,8 +9,8 @@ class IntegrationDefFormFieldAdapter(IntegrationDefFormField): - value_options: Optional[List["OptionAdapter"]] = Field(default=None, alias="valueOptions") - depends_on: Optional[List["IntegrationDefFormFieldAdapter"]] = Field( + value_options: Optional[List["OptionAdapter"]] = Field(default=None, alias="valueOptions") # type: ignore[assignment] + depends_on: Optional[List["IntegrationDefFormFieldAdapter"]] = Field( # type: ignore[assignment] default=None, alias="dependsOn" ) __properties: ClassVar[List[str]] = [ diff --git a/src/conductor/asyncio_client/adapters/models/message_options_adapter.py b/src/conductor/asyncio_client/adapters/models/message_options_adapter.py index ad6a528b..8becbfb1 100644 --- a/src/conductor/asyncio_client/adapters/models/message_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/message_options_adapter.py @@ -11,23 +11,23 @@ class MessageOptionsAdapter(MessageOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["MessageOptionsAdapter"] = Field( + default_instance_for_type: Optional["MessageOptionsAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/message_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/message_options_or_builder_adapter.py index 1f4872b8..926883bb 100644 --- a/src/conductor/asyncio_client/adapters/models/message_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/message_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class MessageOptionsOrBuilderAdapter(MessageOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/message_template_adapter.py b/src/conductor/asyncio_client/adapters/models/message_template_adapter.py index 9e281cd3..a7574c12 100644 --- a/src/conductor/asyncio_client/adapters/models/message_template_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/message_template_adapter.py @@ -8,7 +8,7 @@ class MessageTemplateAdapter(MessageTemplate): - tags: Optional[List["TagAdapter"]] = None + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/method_options_adapter.py b/src/conductor/asyncio_client/adapters/models/method_options_adapter.py index e58fa3b6..7d8c6b25 100644 --- a/src/conductor/asyncio_client/adapters/models/method_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/method_options_adapter.py @@ -11,23 +11,23 @@ class MethodOptionsAdapter(MethodOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["MethodOptionsAdapter"] = Field( + default_instance_for_type: Optional["MethodOptionsAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/method_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/method_options_or_builder_adapter.py index 10d73e46..bf138329 100644 --- a/src/conductor/asyncio_client/adapters/models/method_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/method_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class MethodOptionsOrBuilderAdapter(MethodOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/oneof_options_adapter.py b/src/conductor/asyncio_client/adapters/models/oneof_options_adapter.py index 63779f55..cd7c36b1 100644 --- a/src/conductor/asyncio_client/adapters/models/oneof_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/oneof_options_adapter.py @@ -11,23 +11,23 @@ class OneofOptionsAdapter(OneofOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["OneofOptionsAdapter"] = Field( + default_instance_for_type: Optional["OneofOptionsAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/oneof_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/oneof_options_or_builder_adapter.py index 172a7759..e106b69c 100644 --- a/src/conductor/asyncio_client/adapters/models/oneof_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/oneof_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class OneofOptionsOrBuilderAdapter(OneofOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/role_adapter.py b/src/conductor/asyncio_client/adapters/models/role_adapter.py index a9d30cce..6870ea85 100644 --- a/src/conductor/asyncio_client/adapters/models/role_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/role_adapter.py @@ -8,7 +8,7 @@ class RoleAdapter(Role): - permissions: Optional[List["PermissionAdapter"]] = None + permissions: Optional[List["PermissionAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/scrollable_search_result_workflow_summary_adapter.py b/src/conductor/asyncio_client/adapters/models/scrollable_search_result_workflow_summary_adapter.py index 49351bb4..349a0654 100644 --- a/src/conductor/asyncio_client/adapters/models/scrollable_search_result_workflow_summary_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/scrollable_search_result_workflow_summary_adapter.py @@ -8,7 +8,7 @@ class ScrollableSearchResultWorkflowSummaryAdapter(ScrollableSearchResultWorkflowSummary): - results: Optional[List["WorkflowSummaryAdapter"]] = None + results: Optional[List["WorkflowSummaryAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/search_result_handled_event_response_adapter.py b/src/conductor/asyncio_client/adapters/models/search_result_handled_event_response_adapter.py index c2c012ed..fde3d631 100644 --- a/src/conductor/asyncio_client/adapters/models/search_result_handled_event_response_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/search_result_handled_event_response_adapter.py @@ -8,7 +8,7 @@ class SearchResultHandledEventResponseAdapter(SearchResultHandledEventResponse): - results: Optional[List["HandledEventResponseAdapter"]] = None + results: Optional[List["HandledEventResponseAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/search_result_task_summary_adapter.py b/src/conductor/asyncio_client/adapters/models/search_result_task_summary_adapter.py index 3629ba0c..82078cef 100644 --- a/src/conductor/asyncio_client/adapters/models/search_result_task_summary_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/search_result_task_summary_adapter.py @@ -8,7 +8,7 @@ class SearchResultTaskSummaryAdapter(SearchResultTaskSummary): - results: Optional[List["TaskSummaryAdapter"]] = None + results: Optional[List["TaskSummaryAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/search_result_workflow_schedule_execution_model_adapter.py b/src/conductor/asyncio_client/adapters/models/search_result_workflow_schedule_execution_model_adapter.py index 6a174a11..a81255f8 100644 --- a/src/conductor/asyncio_client/adapters/models/search_result_workflow_schedule_execution_model_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/search_result_workflow_schedule_execution_model_adapter.py @@ -10,7 +10,7 @@ class SearchResultWorkflowScheduleExecutionModelAdapter(SearchResultWorkflowScheduleExecutionModel): - results: Optional[List["WorkflowScheduleExecutionModelAdapter"]] = None + results: Optional[List["WorkflowScheduleExecutionModelAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py b/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py index e34f9cfb..5d74ae75 100644 --- a/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py @@ -1,15 +1,16 @@ from __future__ import annotations -from typing import Any, Dict, List, Optional, Self +from typing import Any, Dict, List, Optional +from typing_extensions import Self from conductor.asyncio_client.http.models import ServiceDescriptor class ServiceDescriptorAdapter(ServiceDescriptor): - file: Optional["FileDescriptorAdapter"] = None - methods: Optional[List["MethodDescriptorAdapter"]] = None - options: Optional["ServiceOptionsAdapter"] = None - proto: Optional["ServiceDescriptorProtoAdapter"] = None + file: Optional["FileDescriptorAdapter"] = None # type: ignore[assignment] + methods: Optional[List["MethodDescriptorAdapter"]] = None # type: ignore[assignment] + options: Optional["ServiceOptionsAdapter"] = None # type: ignore[assignment] + proto: Optional["ServiceDescriptorProtoAdapter"] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_adapter.py b/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_adapter.py index 808e1526..d8f2981c 100644 --- a/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_adapter.py @@ -10,23 +10,23 @@ class ServiceDescriptorProtoAdapter(ServiceDescriptorProto): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["ServiceDescriptorProtoAdapter"] = Field( + default_instance_for_type: Optional["ServiceDescriptorProtoAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - method_list: Optional[List["MethodDescriptorProtoAdapter"]] = Field( + method_list: Optional[List["MethodDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="methodList" ) - method_or_builder_list: Optional[List["MethodDescriptorProtoOrBuilderAdapter"]] = Field( + method_or_builder_list: Optional[List["MethodDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="methodOrBuilderList" ) - options: Optional["ServiceOptionsAdapter"] = None - options_or_builder: Optional["ServiceOptionsOrBuilderAdapter"] = Field( + options: Optional["ServiceOptionsAdapter"] = None # type: ignore[assignment] + options_or_builder: Optional["ServiceOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="optionsOrBuilder" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_or_builder_adapter.py index ffe2a434..a2d9f855 100644 --- a/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_or_builder_adapter.py @@ -10,23 +10,23 @@ class ServiceDescriptorProtoOrBuilderAdapter(ServiceDescriptorProtoOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - method_list: Optional[List["MethodDescriptorProtoAdapter"]] = Field( + method_list: Optional[List["MethodDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="methodList" ) - method_or_builder_list: Optional[List["MethodDescriptorProtoOrBuilderAdapter"]] = Field( + method_or_builder_list: Optional[List["MethodDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="methodOrBuilderList" ) - options: Optional["ServiceOptionsAdapter"] = None - options_or_builder: Optional["ServiceOptionsOrBuilderAdapter"] = Field( + options: Optional["ServiceOptionsAdapter"] = None # type: ignore[assignment] + options_or_builder: Optional["ServiceOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="optionsOrBuilder" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_options_adapter.py b/src/conductor/asyncio_client/adapters/models/service_options_adapter.py index 41197a45..6afe75a7 100644 --- a/src/conductor/asyncio_client/adapters/models/service_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_options_adapter.py @@ -11,23 +11,23 @@ class ServiceOptionsAdapter(ServiceOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["ServiceOptionsAdapter"] = Field( + default_instance_for_type: Optional["ServiceOptionsAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/service_options_or_builder_adapter.py index 8fe0569b..c72fe67c 100644 --- a/src/conductor/asyncio_client/adapters/models/service_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class ServiceOptionsOrBuilderAdapter(ServiceOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/source_code_info_adapter.py b/src/conductor/asyncio_client/adapters/models/source_code_info_adapter.py index 4025cdd1..181d8f22 100644 --- a/src/conductor/asyncio_client/adapters/models/source_code_info_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/source_code_info_adapter.py @@ -10,17 +10,17 @@ class SourceCodeInfoAdapter(SourceCodeInfo): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["SourceCodeInfoAdapter"] = Field( + default_instance_for_type: Optional["SourceCodeInfoAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - location_list: Optional[List["LocationAdapter"]] = Field(default=None, alias="locationList") - location_or_builder_list: Optional[List["LocationOrBuilderAdapter"]] = Field( + location_list: Optional[List["LocationAdapter"]] = Field(default=None, alias="locationList") # type: ignore[assignment] + location_or_builder_list: Optional[List["LocationOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="locationOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/source_code_info_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/source_code_info_or_builder_adapter.py index e2d2c6fa..d7b9b98f 100644 --- a/src/conductor/asyncio_client/adapters/models/source_code_info_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/source_code_info_or_builder_adapter.py @@ -10,17 +10,17 @@ class SourceCodeInfoOrBuilderAdapter(SourceCodeInfoOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - location_list: Optional[List["LocationAdapter"]] = Field(default=None, alias="locationList") - location_or_builder_list: Optional[List["LocationOrBuilderAdapter"]] = Field( + location_list: Optional[List["LocationAdapter"]] = Field(default=None, alias="locationList") # type: ignore[assignment] + location_or_builder_list: Optional[List["LocationOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="locationOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/task_def_adapter.py b/src/conductor/asyncio_client/adapters/models/task_def_adapter.py index 71afa28e..915ff1db 100644 --- a/src/conductor/asyncio_client/adapters/models/task_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/task_def_adapter.py @@ -9,11 +9,11 @@ class TaskDefAdapter(TaskDef): - input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") + input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") # type: ignore[assignment] input_template: Optional[Dict[str, Any]] = Field(default=None, alias="inputTemplate") - output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") - timeout_seconds: Optional[int] = Field(alias="timeoutSeconds", default=None) - total_timeout_seconds: Optional[int] = Field(alias="totalTimeoutSeconds", default=None) + output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") # type: ignore[assignment] + timeout_seconds: Optional[int] = Field(alias="timeoutSeconds", default=None) # type: ignore[assignment] + total_timeout_seconds: Optional[int] = Field(alias="totalTimeoutSeconds", default=None) # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/task_result_adapter.py b/src/conductor/asyncio_client/adapters/models/task_result_adapter.py index c8eec6b7..23d1d907 100644 --- a/src/conductor/asyncio_client/adapters/models/task_result_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/task_result_adapter.py @@ -1,14 +1,15 @@ from __future__ import annotations -from typing import Any, Dict, List, Optional, Self +from typing import Any, Dict, List, Optional +from typing_extensions import Self from pydantic import Field from conductor.asyncio_client.http.models import TaskResult class TaskResultAdapter(TaskResult): - logs: Optional[List["TaskExecLogAdapter"]] = None + logs: Optional[List["TaskExecLogAdapter"]] = None # type: ignore[assignment] output_data: Optional[Dict[str, Any]] = Field(default=None, alias="outputData") @classmethod diff --git a/src/conductor/asyncio_client/adapters/models/uninterpreted_option_adapter.py b/src/conductor/asyncio_client/adapters/models/uninterpreted_option_adapter.py index c767d5f0..da41ccab 100644 --- a/src/conductor/asyncio_client/adapters/models/uninterpreted_option_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/uninterpreted_option_adapter.py @@ -10,17 +10,17 @@ class UninterpretedOptionAdapter(UninterpretedOption): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["UninterpretedOptionAdapter"] = Field( + default_instance_for_type: Optional["UninterpretedOptionAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - name_list: Optional[List["NamePartAdapter"]] = Field(default=None, alias="nameList") - name_or_builder_list: Optional[List["NamePartOrBuilderAdapter"]] = Field( + name_list: Optional[List["NamePartAdapter"]] = Field(default=None, alias="nameList") # type: ignore[assignment] + name_or_builder_list: Optional[List["NamePartOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="nameOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/uninterpreted_option_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/uninterpreted_option_or_builder_adapter.py index 5ab915d8..68ed98d2 100644 --- a/src/conductor/asyncio_client/adapters/models/uninterpreted_option_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/uninterpreted_option_or_builder_adapter.py @@ -10,17 +10,17 @@ class UninterpretedOptionOrBuilderAdapter(UninterpretedOptionOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - name_list: Optional[List["NamePartAdapter"]] = Field(default=None, alias="nameList") - name_or_builder_list: Optional[List["NamePartOrBuilderAdapter"]] = Field( + name_list: Optional[List["NamePartAdapter"]] = Field(default=None, alias="nameList") # type: ignore[assignment] + name_or_builder_list: Optional[List["NamePartOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="nameOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/webhook_config_adapter.py b/src/conductor/asyncio_client/adapters/models/webhook_config_adapter.py index 48831d7a..58bb8077 100644 --- a/src/conductor/asyncio_client/adapters/models/webhook_config_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/webhook_config_adapter.py @@ -9,8 +9,8 @@ class WebhookConfigAdapter(WebhookConfig): - tags: Optional[List["TagAdapter"]] = None - webhook_execution_history: Optional[List["WebhookExecutionHistoryAdapter"]] = Field( + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + webhook_execution_history: Optional[List["WebhookExecutionHistoryAdapter"]] = Field( # type: ignore[assignment] default=None, alias="webhookExecutionHistory" ) workflows_to_start: Optional[Dict[str, Any]] = Field(default=None, alias="workflowsToStart") diff --git a/src/conductor/asyncio_client/adapters/models/workflow_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_adapter.py index 2b7dab6e..02debcd2 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_adapter.py @@ -15,11 +15,11 @@ class WorkflowAdapter(Workflow): input: Optional[Dict[str, Any]] = None output: Optional[Dict[str, Any]] = None variables: Optional[Dict[str, Any]] = None - workflow_definition: Optional["WorkflowDefAdapter"] = Field( + workflow_definition: Optional["WorkflowDefAdapter"] = Field( # type: ignore[assignment] default=None, alias="workflowDefinition" ) - tasks: Optional[List["TaskAdapter"]] = None - history: Optional[List["WorkflowAdapter"]] = None + tasks: Optional[List["TaskAdapter"]] = None # type: ignore[assignment] + history: Optional[List["WorkflowAdapter"]] = None # type: ignore[assignment] def is_completed(self) -> bool: """Checks if the workflow has completed diff --git a/src/conductor/asyncio_client/adapters/models/workflow_def_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_def_adapter.py index 89e91aef..672e74a2 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_def_adapter.py @@ -13,14 +13,14 @@ class WorkflowDefAdapter(WorkflowDef): output_parameters: Optional[Dict[str, Any]] = Field(default=None, alias="outputParameters") variables: Optional[Dict[str, Any]] = None metadata: Optional[Dict[str, Any]] = None - tasks: List["WorkflowTaskAdapter"] + tasks: List["WorkflowTaskAdapter"] # type: ignore[assignment] schema_version: Optional[int] = Field(default=None, alias="schemaVersion") - output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") - input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") - rate_limit_config: Optional["RateLimitConfigAdapter"] = Field( + output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") # type: ignore[assignment] + input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") # type: ignore[assignment] + rate_limit_config: Optional["RateLimitConfigAdapter"] = Field( # type: ignore[assignment] default=None, alias="rateLimitConfig" ) - timeout_seconds: Optional[int] = Field(default=None, alias="timeoutSeconds") + timeout_seconds: Optional[int] = Field(default=None, alias="timeoutSeconds") # type: ignore[assignment] __properties: ClassVar[List[str]] = [ "createTime", diff --git a/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py index b72c78af..80fecc01 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py @@ -10,20 +10,20 @@ class WorkflowRunAdapter(WorkflowRun): input: Optional[Dict[str, Any]] = None output: Optional[Dict[str, Any]] = None - tasks: Optional[List["TaskAdapter"]] = None + tasks: Optional[List["TaskAdapter"]] = None # type: ignore[assignment] variables: Optional[Dict[str, Any]] = None @property - def current_task(self) -> TaskAdapter: + def current_task(self) -> TaskAdapter: # type: ignore[override] current = None - for task in self.tasks: + for task in self.tasks: # type: ignore[union-attr] if task.status in ("SCHEDULED", "IN_PROGRESS"): current = task - return current + return current # type: ignore[return-value] def get_task( self, name: Optional[str] = None, task_reference_name: Optional[str] = None - ) -> TaskAdapter: + ) -> TaskAdapter: # type: ignore[override] if name is None and task_reference_name is None: raise Exception( "ONLY one of name or task_reference_name MUST be provided. None were provided" @@ -34,13 +34,13 @@ def get_task( ) current = None - for task in self.tasks: + for task in self.tasks: # type: ignore[union-attr] if ( task.task_def_name == name - or task.workflow_task.task_reference_name == task_reference_name + or task.workflow_task.task_reference_name == task_reference_name # type: ignore[union-attr] ): current = task - return current + return current # type: ignore[return-value] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/workflow_schedule_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_schedule_adapter.py index 941b6cf5..06662bf8 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_schedule_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_schedule_adapter.py @@ -9,10 +9,10 @@ class WorkflowScheduleAdapter(WorkflowSchedule): - start_workflow_request: Optional["StartWorkflowRequestAdapter"] = Field( + start_workflow_request: Optional["StartWorkflowRequestAdapter"] = Field( # type: ignore[override] default=None, alias="startWorkflowRequest" ) - tags: Optional[List["TagAdapter"]] = None + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/workflow_schedule_model_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_schedule_model_adapter.py index e0d3963f..2d588eb4 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_schedule_model_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_schedule_model_adapter.py @@ -9,10 +9,10 @@ class WorkflowScheduleModelAdapter(WorkflowScheduleModel): - start_workflow_request: Optional["StartWorkflowRequestAdapter"] = Field( + start_workflow_request: Optional["StartWorkflowRequestAdapter"] = Field( # type: ignore[override] default=None, alias="startWorkflowRequest" ) - tags: Optional[List["TagAdapter"]] = None + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/workflow_task_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_task_adapter.py index c7460229..69eaa56b 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_task_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_task_adapter.py @@ -9,19 +9,19 @@ class WorkflowTaskAdapter(WorkflowTask): - cache_config: Optional["CacheConfigAdapter"] = Field(default=None, alias="cacheConfig") - default_case: Optional[List["WorkflowTaskAdapter"]] = Field(default=None, alias="defaultCase") - fork_tasks: Optional[List[List["WorkflowTaskAdapter"]]] = Field(default=None, alias="forkTasks") + cache_config: Optional["CacheConfigAdapter"] = Field(default=None, alias="cacheConfig") # type: ignore[assignment] + default_case: Optional[List["WorkflowTaskAdapter"]] = Field(default=None, alias="defaultCase") # type: ignore[assignment] + fork_tasks: Optional[List[List["WorkflowTaskAdapter"]]] = Field(default=None, alias="forkTasks") # type: ignore[assignment] input_parameters: Optional[Dict[str, Any]] = Field(default=None, alias="inputParameters") - loop_over: Optional[List["WorkflowTaskAdapter"]] = Field(default=None, alias="loopOver") - on_state_change: Optional[Dict[str, List["StateChangeEventAdapter"]]] = Field( + loop_over: Optional[List["WorkflowTaskAdapter"]] = Field(default=None, alias="loopOver") # type: ignore[assignment] + on_state_change: Optional[Dict[str, List["StateChangeEventAdapter"]]] = Field( # type: ignore[assignment] default=None, alias="onStateChange" ) - sub_workflow_param: Optional["SubWorkflowParamsAdapter"] = Field( + sub_workflow_param: Optional["SubWorkflowParamsAdapter"] = Field( # type: ignore[assignment] default=None, alias="subWorkflowParam" ) - task_definition: Optional["TaskDefAdapter"] = Field(default=None, alias="taskDefinition") - decision_cases: Optional[Dict[str, List["WorkflowTaskAdapter"]]] = Field( + task_definition: Optional["TaskDefAdapter"] = Field(default=None, alias="taskDefinition") # type: ignore[assignment] + decision_cases: Optional[Dict[str, List["WorkflowTaskAdapter"]]] = Field( # type: ignore[assignment] default=None, alias="decisionCases" ) diff --git a/src/conductor/asyncio_client/adapters/models/workflow_test_request_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_test_request_adapter.py index f76939f5..823ff8b8 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_test_request_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_test_request_adapter.py @@ -10,13 +10,13 @@ class WorkflowTestRequestAdapter(WorkflowTestRequest): input: Optional[Dict[str, Any]] = None - sub_workflow_test_request: Optional[Dict[str, "WorkflowTestRequestAdapter"]] = Field( + sub_workflow_test_request: Optional[Dict[str, "WorkflowTestRequestAdapter"]] = Field( # type: ignore[assignment] default=None, alias="subWorkflowTestRequest" ) - task_ref_to_mock_output: Optional[Dict[str, List["TaskMockAdapter"]]] = Field( + task_ref_to_mock_output: Optional[Dict[str, List["TaskMockAdapter"]]] = Field( # type: ignore[assignment] default=None, alias="taskRefToMockOutput" ) - workflow_def: Optional["WorkflowDefAdapter"] = Field(default=None, alias="workflowDef") + workflow_def: Optional["WorkflowDefAdapter"] = Field(default=None, alias="workflowDef") # type: ignore[assignment] priority: Optional[int] = Field(default=None, alias="priority") @classmethod diff --git a/src/conductor/asyncio_client/automator/task_handler.py b/src/conductor/asyncio_client/automator/task_handler.py index 2fa0f4e7..6807412b 100644 --- a/src/conductor/asyncio_client/automator/task_handler.py +++ b/src/conductor/asyncio_client/automator/task_handler.py @@ -55,8 +55,9 @@ def __init__( configuration: Configuration, metrics_settings: MetricsSettings, scan_for_annotated_workers: bool = True, - import_modules: List[str] = [], + import_modules: Optional[List[str]] = None, ): + import_modules = import_modules or [] self.metrics_provider_process: Optional[Process] = None self.logger_process, self.queue = _setup_logging_queue(configuration) diff --git a/src/conductor/asyncio_client/configuration/configuration.py b/src/conductor/asyncio_client/configuration/configuration.py index 57c4327a..aec13db3 100644 --- a/src/conductor/asyncio_client/configuration/configuration.py +++ b/src/conductor/asyncio_client/configuration/configuration.py @@ -134,7 +134,7 @@ def __init__( if server_url is not None: self.server_url = server_url else: - self.server_url = os.getenv("CONDUCTOR_SERVER_URL") + self.server_url = os.getenv("CONDUCTOR_SERVER_URL") # type: ignore[assignment] if self.server_url is None or self.server_url == "": self.server_url = "http://localhost:8080/api" @@ -143,12 +143,12 @@ def __init__( if auth_key is not None: self.auth_key = auth_key else: - self.auth_key = os.getenv("CONDUCTOR_AUTH_KEY") + self.auth_key = os.getenv("CONDUCTOR_AUTH_KEY") # type: ignore[assignment] if auth_secret is not None: self.auth_secret = auth_secret else: - self.auth_secret = os.getenv("CONDUCTOR_AUTH_SECRET") + self.auth_secret = os.getenv("CONDUCTOR_AUTH_SECRET") # type: ignore[assignment] # Additional worker properties with environment variable fallback self.polling_interval = polling_interval or self._get_env_int( @@ -173,10 +173,10 @@ def __init__( # Proxy configuration - can be set via parameter or environment variable self.proxy = proxy or os.getenv("CONDUCTOR_PROXY") # Proxy headers - can be set via parameter or environment variable - self.proxy_headers = proxy_headers + self.proxy_headers: Optional[Dict[str, Any]] = proxy_headers if not self.proxy_headers and os.getenv("CONDUCTOR_PROXY_HEADERS"): try: - self.proxy_headers = json.loads(os.getenv("CONDUCTOR_PROXY_HEADERS")) + self.proxy_headers = json.loads(os.getenv("CONDUCTOR_PROXY_HEADERS")) # type: ignore[arg-type] except (json.JSONDecodeError, TypeError): # If JSON parsing fails, treat as a single header value self.proxy_headers = {"Authorization": os.getenv("CONDUCTOR_PROXY_HEADERS")} @@ -213,19 +213,19 @@ def __init__( http_config_kwargs["verify_ssl"] = self._get_env_bool("CONDUCTOR_VERIFY_SSL", True) http_config_kwargs.update(kwargs) - self._http_config = HttpConfiguration(**http_config_kwargs) + self._http_config = HttpConfiguration(**http_config_kwargs) # type: ignore[arg-type] # Set proxy configuration on the HTTP config if self.proxy: self._http_config.proxy = self.proxy if self.proxy_headers: - self._http_config.proxy_headers = self.proxy_headers + self._http_config.proxy_headers = self.proxy_headers # type: ignore[assignment] # Set proxy configuration on the HTTP config if self.proxy: self._http_config.proxy = self.proxy if self.proxy_headers: - self._http_config.proxy_headers = self.proxy_headers + self._http_config.proxy_headers = self.proxy_headers # type: ignore[assignment] # Debug switch and logging setup self.__debug = debug @@ -460,7 +460,7 @@ def get_poll_interval_seconds(self) -> int: # Properties for commonly used HTTP configuration attributes @property - def host(self) -> str: + def host(self) -> Optional[str]: """Get server host URL.""" if getattr(self, "_http_config", None) is not None: return self._http_config.host diff --git a/src/conductor/asyncio_client/event/event_client.py b/src/conductor/asyncio_client/event/event_client.py index fa0b9b74..41fd6295 100644 --- a/src/conductor/asyncio_client/event/event_client.py +++ b/src/conductor/asyncio_client/event/event_client.py @@ -26,7 +26,7 @@ async def get_queue_configuration(self, queue_type: str, queue_name: str): async def put_queue_configuration(self, queue_configuration: QueueConfiguration): return await self.client.put_queue_config( - body=queue_configuration.get_worker_configuration(), + body=queue_configuration.get_worker_configuration(), # type: ignore[arg-type] queue_name=queue_configuration.queue_name, queue_type=queue_configuration.queue_type, ) diff --git a/src/conductor/asyncio_client/telemetry/metrics_collector.py b/src/conductor/asyncio_client/telemetry/metrics_collector.py index 65e0cc21..da644f7a 100644 --- a/src/conductor/asyncio_client/telemetry/metrics_collector.py +++ b/src/conductor/asyncio_client/telemetry/metrics_collector.py @@ -234,7 +234,7 @@ async def __increment_counter( if not self.must_collect_metrics: return counter = await self.__get_counter( - name=name, documentation=documentation, labelnames=labels.keys() + name=name, documentation=documentation, labelnames=list(labels.keys()) ) counter.labels(*labels.values()).inc() @@ -249,7 +249,7 @@ async def __record_gauge( if not self.must_collect_metrics: return gauge = await self.__get_gauge( - name=name, documentation=documentation, labelnames=labels.keys() + name=name, documentation=documentation, labelnames=list(labels.keys()) ) gauge.labels(*labels.values()).set(value) diff --git a/src/conductor/asyncio_client/workflow/task/do_while_task.py b/src/conductor/asyncio_client/workflow/task/do_while_task.py index 7d736529..ee97abc7 100644 --- a/src/conductor/asyncio_client/workflow/task/do_while_task.py +++ b/src/conductor/asyncio_client/workflow/task/do_while_task.py @@ -1,7 +1,7 @@ from __future__ import annotations from copy import deepcopy -from typing import List, Optional, Sequence, Union +from typing import List, Optional, Sequence from conductor.asyncio_client.adapters.models.workflow_task_adapter import WorkflowTaskAdapter from conductor.asyncio_client.workflow.task.task import ( @@ -35,7 +35,7 @@ def __init__( self, task_ref_name: str, iterations: int, - tasks: Union[TaskInterface, Sequence[TaskInterface]], + tasks: List[TaskInterface], ): super().__init__( task_ref_name=task_ref_name, @@ -48,7 +48,7 @@ class ForEachTask(DoWhileTask): def __init__( self, task_ref_name: str, - tasks: Union[TaskInterface, Sequence[TaskInterface]], + tasks: List[TaskInterface], iterate_over: str, variables: Optional[Sequence[str]] = None, ): diff --git a/src/conductor/asyncio_client/workflow/task/dynamic_fork_task.py b/src/conductor/asyncio_client/workflow/task/dynamic_fork_task.py index 85c685c2..002b8a3f 100644 --- a/src/conductor/asyncio_client/workflow/task/dynamic_fork_task.py +++ b/src/conductor/asyncio_client/workflow/task/dynamic_fork_task.py @@ -25,7 +25,7 @@ def __init__( self.tasks_input_param_name = tasks_input_param_name self._join_task = deepcopy(join_task) if join_task else None - def to_workflow_task(self) -> List[WorkflowTaskAdapter]: + def to_workflow_task(self) -> List[WorkflowTaskAdapter]: # type: ignore[override] wf_task = super().to_workflow_task() wf_task.dynamic_fork_join_tasks_param = self.tasks_param wf_task.dynamic_fork_tasks_input_param_name = self.tasks_input_param_name diff --git a/src/conductor/asyncio_client/workflow/task/fork_task.py b/src/conductor/asyncio_client/workflow/task/fork_task.py index 43fb8311..30a1f113 100644 --- a/src/conductor/asyncio_client/workflow/task/fork_task.py +++ b/src/conductor/asyncio_client/workflow/task/fork_task.py @@ -26,7 +26,7 @@ def __init__( self._forked_tasks = forked_tasks self._join_on = join_on - def to_workflow_task( + def to_workflow_task( # type: ignore[override] self, ) -> Union[WorkflowTaskAdapter, List[WorkflowTaskAdapter]]: workflow_task = super().to_workflow_task() diff --git a/src/conductor/asyncio_client/workflow/task/http_task.py b/src/conductor/asyncio_client/workflow/task/http_task.py index 949eef77..e1cbd45b 100644 --- a/src/conductor/asyncio_client/workflow/task/http_task.py +++ b/src/conductor/asyncio_client/workflow/task/http_task.py @@ -20,7 +20,7 @@ def __init__(self, task_ref_name: str, http_input: HttpInput | dict): }, ) - def status_code(self) -> int: + def status_code(self) -> str: return "${" + f"{self.task_reference_name}.output.response.statusCode" + "}" def headers(self, json_path: Optional[str] = None) -> str: diff --git a/src/conductor/asyncio_client/workflow/task/javascript_task.py b/src/conductor/asyncio_client/workflow/task/javascript_task.py index d1a911ec..604b5786 100644 --- a/src/conductor/asyncio_client/workflow/task/javascript_task.py +++ b/src/conductor/asyncio_client/workflow/task/javascript_task.py @@ -28,6 +28,6 @@ def output(self, json_path: Optional[str] = None) -> str: base_path = f"{self.task_reference_name}.output.result" return f"${{{base_path if json_path is None else f'{base_path}.{json_path}'}}}" - def evaluator_type(self, evaluator_type: str): + @TaskInterface.evaluator_type.setter # type: ignore[attr-defined] + def evaluator_type(self, evaluator_type: str) -> None: self.input_parameters["evaluatorType"] = evaluator_type - return self diff --git a/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_index_documents.py b/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_index_documents.py index a05578fd..a86f7b02 100644 --- a/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_index_documents.py +++ b/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_index_documents.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Optional +from typing import Optional, Dict, Any from conductor.asyncio_client.workflow.task.task import TaskInterface from conductor.shared.workflow.enums import TaskType @@ -41,7 +41,7 @@ def __init__( metadata: Optional[dict] = None, ): metadata = metadata or {} - input_params = { + input_params: Dict[str, Any] = { "vectorDB": vector_db, "namespace": namespace, "index": index, @@ -52,7 +52,7 @@ def __init__( "metadata": metadata, } - optional_input_params = {} + optional_input_params: Dict[str, Any] = {} if chunk_size is not None: optional_input_params.update({"chunkSize": chunk_size}) @@ -63,7 +63,7 @@ def __init__( if doc_id is not None: optional_input_params.update({"docId": doc_id}) - input_params.update(optional_input_params) + input_params.update(optional_input_params) # type: ignore[arg-type] if task_name is None: task_name = "llm_index_document" diff --git a/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_text_complete.py b/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_text_complete.py index 9a43557b..4948c912 100644 --- a/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_text_complete.py +++ b/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_text_complete.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Dict, List, Optional +from typing import Dict, List, Optional, Any from conductor.asyncio_client.workflow.task.task import TaskInterface from conductor.shared.workflow.enums import TaskType @@ -20,7 +20,7 @@ def __init__( task_name: Optional[str] = None, ): stop_words = stop_words or [] - optional_input_params = {} + optional_input_params: Dict[str, Any] = {} if stop_words: optional_input_params.update({"stopWords": stop_words}) @@ -31,7 +31,7 @@ def __init__( if not task_name: task_name = "llm_text_complete" - input_params = { + input_params: Dict[str, Any] = { "llmProvider": llm_provider, "model": model, "promptName": prompt_name, diff --git a/src/conductor/asyncio_client/workflow/task/switch_task.py b/src/conductor/asyncio_client/workflow/task/switch_task.py index 6cef4434..504bebdd 100644 --- a/src/conductor/asyncio_client/workflow/task/switch_task.py +++ b/src/conductor/asyncio_client/workflow/task/switch_task.py @@ -1,5 +1,7 @@ +from __future__ import annotations + from copy import deepcopy -from typing import List +from typing import List, Dict, Optional from conductor.asyncio_client.adapters.models.workflow_task_adapter import WorkflowTaskAdapter from conductor.asyncio_client.workflow.task.task import ( @@ -15,8 +17,8 @@ def __init__(self, task_ref_name: str, case_expression: str, use_javascript: boo task_reference_name=task_ref_name, task_type=TaskType.SWITCH, ) - self._default_case = None - self._decision_cases = {} + self._default_case: Optional[List[TaskInterface]] = None + self._decision_cases: Dict[str, List[TaskInterface]] = {} self._expression = deepcopy(case_expression) self._use_javascript = deepcopy(use_javascript) @@ -29,7 +31,7 @@ def switch_case(self, case_name: str, tasks: List[TaskInterface]): def default_case(self, tasks: List[TaskInterface]): if isinstance(tasks, List): - self._default_case = deepcopy(tasks) + self._default_case = deepcopy(tasks) # type: ignore[assignment] else: self._default_case = [deepcopy(tasks)] return self @@ -41,7 +43,7 @@ def to_workflow_task(self) -> WorkflowTaskAdapter: workflow.expression = self._expression else: workflow.evaluator_type = EvaluatorType.VALUE_PARAM - workflow.input_parameters["switchCaseValue"] = self._expression + workflow.input_parameters["switchCaseValue"] = self._expression # type: ignore[index] workflow.expression = "switchCaseValue" workflow.decision_cases = {} for case_value, tasks in self._decision_cases.items(): @@ -49,6 +51,6 @@ def to_workflow_task(self) -> WorkflowTaskAdapter: *tasks, ) if self._default_case is None: - self._default_case = [] - workflow.default_case = get_task_interface_list_as_workflow_task_list(*self._default_case) + self._default_case = [] # type: ignore[assignment] + workflow.default_case = get_task_interface_list_as_workflow_task_list(*self._default_case) # type: ignore[misc] return workflow diff --git a/src/conductor/asyncio_client/workflow/task/task.py b/src/conductor/asyncio_client/workflow/task/task.py index 16d31936..84a83c2c 100644 --- a/src/conductor/asyncio_client/workflow/task/task.py +++ b/src/conductor/asyncio_client/workflow/task/task.py @@ -31,16 +31,16 @@ def __init__( cache_key: Optional[str] = None, cache_ttl_second: int = 0, ): - self.task_reference_name = task_reference_name - self.task_type = task_type - self.name = task_name or task_reference_name - self.description = description - self.optional = optional - self.input_parameters = input_parameters - self._cache_key = cache_key - self._cache_ttl_second = cache_ttl_second - self._expression = None - self._evaluator_type = None + self.task_reference_name: str = task_reference_name + self.task_type: TaskType = task_type + self.name: str = task_name or task_reference_name + self.description: Optional[str] = description + self.optional: Optional[bool] = optional + self._input_parameters: Dict[str, Any] = input_parameters or {} + self._cache_key: Optional[str] = cache_key + self._cache_ttl_second: int = cache_ttl_second + self._expression: Optional[str] = None + self._evaluator_type: Optional[str] = None @property def task_reference_name(self) -> str: @@ -73,7 +73,7 @@ def name(self, name: str) -> None: self._name = name @property - def expression(self) -> str: + def expression(self) -> Optional[str]: return self._expression @expression.setter @@ -81,7 +81,7 @@ def expression(self, expression: str) -> None: self._expression = expression @property - def evaluator_type(self) -> str: + def evaluator_type(self) -> Optional[str]: return self._evaluator_type @evaluator_type.setter @@ -93,7 +93,7 @@ def cache(self, cache_key: str, cache_ttl_second: int): self._cache_ttl_second = cache_ttl_second @property - def description(self) -> str: + def description(self) -> Optional[str]: return self._description @description.setter @@ -103,7 +103,7 @@ def description(self, description: str) -> None: self._description = deepcopy(description) @property - def optional(self) -> bool: + def optional(self) -> Optional[bool]: return self._optional @optional.setter @@ -127,7 +127,7 @@ def input_parameters(self, input_parameters: Dict[str, Any]) -> None: except AttributeError as err: raise ValueError(f"Invalid type: {type(input_parameters)}") from err - self._input_parameters = deepcopy(input_parameters) + self._input_parameters: Dict[str, Any] = deepcopy(input_parameters) # type: ignore[no-redef] def input_parameter(self, key: str, value: Any): if not isinstance(key, str): diff --git a/src/conductor/client/adapters/api/application_resource_api_adapter.py b/src/conductor/client/adapters/api/application_resource_api_adapter.py index f6840e26..d91f573a 100644 --- a/src/conductor/client/adapters/api/application_resource_api_adapter.py +++ b/src/conductor/client/adapters/api/application_resource_api_adapter.py @@ -1,67 +1,36 @@ +from typing import List + +from conductor.client.orkes.models.metadata_tag import MetadataTag from conductor.client.codegen.api.application_resource_api import ApplicationResourceApi +from conductor.client.http.models.extended_conductor_application import ExtendedConductorApplication class ApplicationResourceApiAdapter(ApplicationResourceApi): - def create_access_key(self, id, **kwargs): - # Convert empty application id to None to prevent sending invalid data to server - if not id: - id = None + def create_access_key(self, id: str, **kwargs): return super().create_access_key(id, **kwargs) - def add_role_to_application_user(self, application_id, role, **kwargs): - # Convert empty application_id and role to None to prevent sending invalid data to server - if not application_id: - application_id = None - if not role: - role = None + def add_role_to_application_user(self, application_id: str, role: str, **kwargs): return super().add_role_to_application_user(application_id, role, **kwargs) - def delete_access_key(self, application_id, key_id, **kwargs): - # Convert empty application_id and key_id to None to prevent sending invalid data to server - if not application_id: - application_id = None - if not key_id: - key_id = None + def delete_access_key(self, application_id: str, key_id: str, **kwargs): return super().delete_access_key(application_id, key_id, **kwargs) - def remove_role_from_application_user(self, application_id, role, **kwargs): - # Convert empty application_id and role to None to prevent sending invalid data to server - if not application_id: - application_id = None - if not role: - role = None + def remove_role_from_application_user(self, application_id: str, role: str, **kwargs): return super().remove_role_from_application_user(application_id, role, **kwargs) - def get_app_by_access_key_id(self, access_key_id: str, **kwargs): - # Convert empty access_key_id to None to prevent sending invalid data to server - if not access_key_id: - access_key_id = None + def get_app_by_access_key_id( + self, access_key_id: str, **kwargs + ) -> ExtendedConductorApplication: return super().get_app_by_access_key_id(access_key_id, **kwargs) def get_access_keys(self, id: str, **kwargs): - # Convert empty application id to None to prevent sending invalid data to server - if not id: - id = None return super().get_access_keys(id=id, **kwargs) - def toggle_access_key_status(self, application_id, key_id, **kwargs): - # Convert empty application_id and key_id to None to prevent sending invalid data to server - if not application_id: - application_id = None - if not key_id: - key_id = None + def toggle_access_key_status(self, application_id: str, key_id: str, **kwargs): return super().toggle_access_key_status(application_id, key_id, **kwargs) - def get_tags_for_application(self, application_id, **kwargs): - # Convert empty application_id to None to prevent sending invalid data to server - if not application_id: - application_id = None + def get_tags_for_application(self, application_id: str, **kwargs) -> List[MetadataTag]: # type: ignore[override] return super().get_tags_for_application(application_id, **kwargs) - def delete_tag_for_application(self, body, id, **kwargs): - # Convert empty tag list (body) and application id to None to prevent sending invalid data to server - if not body: - body = None - if not id: - id = None + def delete_tag_for_application(self, body: List[MetadataTag], id: str, **kwargs) -> None: return super().delete_tag_for_application(body, id, **kwargs) diff --git a/src/conductor/client/adapters/models/bulk_response_adapter.py b/src/conductor/client/adapters/models/bulk_response_adapter.py index 64f3c8d6..f634f4ed 100644 --- a/src/conductor/client/adapters/models/bulk_response_adapter.py +++ b/src/conductor/client/adapters/models/bulk_response_adapter.py @@ -3,15 +3,14 @@ class BulkResponseAdapter(BulkResponse): - swagger_types: ClassVar[Dict[str, str]] = { - "bulk_error_results": "dict(str, str)", + swagger_types: ClassVar[Dict[str, str]] = { # type: ignore[misc] + **BulkResponse.swagger_types, "bulk_successful_results": "list[str]", "message": "str", } - attribute_map: ClassVar[Dict[str, str]] = { - "bulk_error_results": "bulkErrorResults", - "bulk_successful_results": "bulkSuccessfulResults", + attribute_map: ClassVar[Dict[str, str]] = { # type: ignore[misc] + **BulkResponse.attribute_map, "message": "message", } diff --git a/src/conductor/client/adapters/models/conductor_user_adapter.py b/src/conductor/client/adapters/models/conductor_user_adapter.py index 4c81fc97..b3d71742 100644 --- a/src/conductor/client/adapters/models/conductor_user_adapter.py +++ b/src/conductor/client/adapters/models/conductor_user_adapter.py @@ -4,14 +4,14 @@ class ConductorUserAdapter(ConductorUser): - swagger_types: ClassVar[Dict[str, str]] = { + swagger_types: ClassVar[Dict[str, str]] = { # type: ignore[misc] **ConductorUser.swagger_types, "orkes_app": "bool", "orkes_api_gateway": "bool", "contact_information": "dict(str, str)", } - attribute_map: ClassVar[Dict[str, str]] = { + attribute_map: ClassVar[Dict[str, str]] = { # type: ignore[misc] **ConductorUser.attribute_map, "orkes_app": "orkesApp", "orkes_api_gateway": "orkesApiGateway", diff --git a/src/conductor/client/adapters/models/integration_adapter.py b/src/conductor/client/adapters/models/integration_adapter.py index 54437f6a..8648b72f 100644 --- a/src/conductor/client/adapters/models/integration_adapter.py +++ b/src/conductor/client/adapters/models/integration_adapter.py @@ -6,42 +6,16 @@ class IntegrationAdapter(Integration): - swagger_types: ClassVar[Dict[str, str]] = { - "apis": "list[IntegrationApi]", - "category": "str", - "configuration": "dict(str, object)", - "create_time": "int", + swagger_types: ClassVar[Dict[str, str]] = { # type: ignore[misc] + **Integration.swagger_types, "created_on": "int", - "created_by": "str", - "description": "str", - "enabled": "bool", - "models_count": "int", - "name": "str", - "owner_app": "str", - "tags": "list[Tag]", - "type": "str", - "update_time": "int", "updated_on": "int", - "updated_by": "str", } - attribute_map: ClassVar[Dict[str, str]] = { - "apis": "apis", - "category": "category", - "configuration": "configuration", - "create_time": "createTime", + attribute_map: ClassVar[Dict[str, str]] = { # type: ignore[misc] + **Integration.attribute_map, "created_on": "createdOn", - "created_by": "createdBy", - "description": "description", - "enabled": "enabled", - "models_count": "modelsCount", - "name": "name", - "owner_app": "ownerApp", - "tags": "tags", - "type": "type", - "update_time": "updateTime", "updated_on": "updatedOn", - "updated_by": "updatedBy", } def __init__( @@ -131,7 +105,7 @@ def updated_on(self, update_time): self._update_time = update_time self._updated_on = update_time - @Integration.category.setter + @Integration.category.setter # type: ignore[attr-defined] def category(self, category): allowed_values = [ "API", diff --git a/src/conductor/client/adapters/models/integration_api_adapter.py b/src/conductor/client/adapters/models/integration_api_adapter.py index 79cbacd4..d59f3d08 100644 --- a/src/conductor/client/adapters/models/integration_api_adapter.py +++ b/src/conductor/client/adapters/models/integration_api_adapter.py @@ -6,36 +6,16 @@ class IntegrationApiAdapter(IntegrationApi): - swagger_types: ClassVar[Dict[str, str]] = { - "api": "str", - "configuration": "dict(str, object)", - "create_time": "int", + swagger_types: ClassVar[Dict[str, str]] = { # type: ignore[misc] + **IntegrationApi.swagger_types, "created_on": "int", - "created_by": "str", - "description": "str", - "enabled": "bool", - "integration_name": "str", - "owner_app": "str", - "tags": "list[Tag]", - "update_time": "int", "updated_on": "int", - "updated_by": "str", } - attribute_map: ClassVar[Dict[str, str]] = { - "api": "api", - "configuration": "configuration", - "create_time": "createTime", + attribute_map: ClassVar[Dict[str, str]] = { # type: ignore[misc] + **IntegrationApi.attribute_map, "created_on": "createdOn", - "created_by": "createdBy", - "description": "description", - "enabled": "enabled", - "integration_name": "integrationName", - "owner_app": "ownerApp", - "tags": "tags", - "update_time": "updateTime", "updated_on": "updatedOn", - "updated_by": "updatedBy", } def __init__( diff --git a/src/conductor/client/adapters/models/integration_def_adapter.py b/src/conductor/client/adapters/models/integration_def_adapter.py index 4cfecc8a..e343ebbd 100644 --- a/src/conductor/client/adapters/models/integration_def_adapter.py +++ b/src/conductor/client/adapters/models/integration_def_adapter.py @@ -6,29 +6,13 @@ class IntegrationDefAdapter(IntegrationDef): - swagger_types: ClassVar[Dict[str, str]] = { - "category": "str", - "category_label": "str", - "configuration": "list[IntegrationDefFormField]", - "description": "str", - "enabled": "bool", - "icon_name": "str", - "name": "str", - "tags": "list[str]", - "type": "str", + swagger_types: ClassVar[Dict[str, str]] = { # type: ignore[misc] + **IntegrationDef.swagger_types, "apis": "list[IntegrationDefApi]", } - attribute_map: ClassVar[Dict[str, str]] = { - "category": "category", - "category_label": "categoryLabel", - "configuration": "configuration", - "description": "description", - "enabled": "enabled", - "icon_name": "iconName", - "name": "name", - "tags": "tags", - "type": "type", + attribute_map: ClassVar[Dict[str, str]] = { # type: ignore[misc] + **IntegrationDef.attribute_map, "apis": "apis", } @@ -85,7 +69,7 @@ def apis(self): def apis(self, apis): self._apis = apis - @IntegrationDef.category.setter + @IntegrationDef.category.setter # type: ignore[attr-defined] def category(self, category): """Sets the category of this IntegrationUpdate. diff --git a/src/conductor/client/adapters/models/integration_def_form_field_adapter.py b/src/conductor/client/adapters/models/integration_def_form_field_adapter.py index e232a82b..874169e3 100644 --- a/src/conductor/client/adapters/models/integration_def_form_field_adapter.py +++ b/src/conductor/client/adapters/models/integration_def_form_field_adapter.py @@ -2,7 +2,7 @@ class IntegrationDefFormFieldAdapter(IntegrationDefFormField): - @IntegrationDefFormField.field_name.setter + @IntegrationDefFormField.field_name.setter # type: ignore[attr-defined] def field_name(self, field_name): """Sets the field_name of this IntegrationDefFormField. diff --git a/src/conductor/client/adapters/models/integration_update_adapter.py b/src/conductor/client/adapters/models/integration_update_adapter.py index 0d3b03b4..5bdfc3b1 100644 --- a/src/conductor/client/adapters/models/integration_update_adapter.py +++ b/src/conductor/client/adapters/models/integration_update_adapter.py @@ -2,7 +2,7 @@ class IntegrationUpdateAdapter(IntegrationUpdate): - @IntegrationUpdate.category.setter + @IntegrationUpdate.category.setter # type: ignore[attr-defined] def category(self, category): allowed_values = [ "API", diff --git a/src/conductor/client/adapters/models/save_schedule_request_adapter.py b/src/conductor/client/adapters/models/save_schedule_request_adapter.py index c9569b53..2c3f9f6f 100644 --- a/src/conductor/client/adapters/models/save_schedule_request_adapter.py +++ b/src/conductor/client/adapters/models/save_schedule_request_adapter.py @@ -2,7 +2,7 @@ class SaveScheduleRequestAdapter(SaveScheduleRequest): - @SaveScheduleRequest.start_workflow_request.setter + @SaveScheduleRequest.start_workflow_request.setter # type: ignore[attr-defined] def start_workflow_request(self, start_workflow_request): """Sets the start_workflow_request of this SaveScheduleRequest. diff --git a/src/conductor/client/adapters/models/schema_def_adapter.py b/src/conductor/client/adapters/models/schema_def_adapter.py index 2e2ce0b3..59aa5342 100644 --- a/src/conductor/client/adapters/models/schema_def_adapter.py +++ b/src/conductor/client/adapters/models/schema_def_adapter.py @@ -57,7 +57,7 @@ def __init__( if version is not None: self.version = version - @SchemaDef.type.setter + @SchemaDef.type.setter # type: ignore[attr-defined] def type(self, type): """Sets the type of this SchemaDef. @@ -67,7 +67,7 @@ def type(self, type): """ self._type = type - @SchemaDef.name.setter + @SchemaDef.name.setter # type: ignore[attr-defined] def name(self, name): """Sets the name of this SchemaDef. @@ -77,7 +77,7 @@ def name(self, name): """ self._name = name - @SchemaDef.version.setter + @SchemaDef.version.setter # type: ignore[attr-defined] def version(self, version): """Sets the data of this SchemaDef. diff --git a/src/conductor/client/adapters/models/start_workflow_request_adapter.py b/src/conductor/client/adapters/models/start_workflow_request_adapter.py index e33dbe6d..b625499c 100644 --- a/src/conductor/client/adapters/models/start_workflow_request_adapter.py +++ b/src/conductor/client/adapters/models/start_workflow_request_adapter.py @@ -61,7 +61,7 @@ def __init__( if workflow_def is not None: self.workflow_def = workflow_def - @StartWorkflowRequest.name.setter + @StartWorkflowRequest.name.setter # type: ignore[attr-defined] def name(self, name): """Sets the name of this StartWorkflowRequest. diff --git a/src/conductor/client/adapters/models/state_change_event_adapter.py b/src/conductor/client/adapters/models/state_change_event_adapter.py index 2d98df91..e34038b9 100644 --- a/src/conductor/client/adapters/models/state_change_event_adapter.py +++ b/src/conductor/client/adapters/models/state_change_event_adapter.py @@ -1,9 +1,7 @@ from __future__ import annotations from enum import Enum -from typing import ClassVar, Dict, List, Union, Optional - -from typing_extensions import Self +from typing import ClassVar, Dict, List, Union, Optional, Any from conductor.client.codegen.models.state_change_event import StateChangeEvent @@ -24,7 +22,7 @@ class StateChangeConfig: # Keep original init for backward compatibility def __init__( self, - event_type: Union[str, StateChangeEventType, List[StateChangeEventType]] = None, + event_type: Optional[Union[StateChangeEventType, List[StateChangeEventType]]] = None, events: Optional[List[StateChangeEvent]] = None, ) -> None: if event_type is None: @@ -40,7 +38,7 @@ def type(self): return self._type @type.setter - def type(self, event_type: StateChangeEventType) -> Self: + def type(self, event_type: StateChangeEventType) -> None: self._type = event_type.name @property @@ -48,12 +46,12 @@ def events(self): return self._events @events.setter - def events(self, events: List[StateChangeEvent]) -> Self: + def events(self, events: List[StateChangeEvent]) -> None: self._events = events def to_dict(self) -> Dict: """Returns the model properties as a dict""" - result = {} + result: Dict[str, Any] = {} for attr in self.swagger_types.keys(): value = getattr(self, attr) if isinstance(value, list): @@ -100,7 +98,7 @@ def __init__(self, payload=None, type=None): self.payload = payload self.type = type - @StateChangeEvent.payload.setter + @StateChangeEvent.payload.setter # type: ignore[attr-defined] def payload(self, payload): """Sets the payload of this StateChangeEvent. @@ -113,7 +111,7 @@ def payload(self, payload): self._payload = payload - @StateChangeEvent.type.setter + @StateChangeEvent.type.setter # type: ignore[attr-defined] def type(self, type): """Sets the type of this StateChangeEvent. diff --git a/src/conductor/client/adapters/models/sub_workflow_params_adapter.py b/src/conductor/client/adapters/models/sub_workflow_params_adapter.py index 26b4ddd9..eb2955b9 100644 --- a/src/conductor/client/adapters/models/sub_workflow_params_adapter.py +++ b/src/conductor/client/adapters/models/sub_workflow_params_adapter.py @@ -2,7 +2,7 @@ class SubWorkflowParamsAdapter(SubWorkflowParams): - @SubWorkflowParams.idempotency_strategy.setter + @SubWorkflowParams.idempotency_strategy.setter # type: ignore[attr-defined] def idempotency_strategy(self, idempotency_strategy): """Sets the idempotency_strategy of this SubWorkflowParams. diff --git a/src/conductor/client/adapters/models/target_ref_adapter.py b/src/conductor/client/adapters/models/target_ref_adapter.py index e54308f3..e2fcf51a 100644 --- a/src/conductor/client/adapters/models/target_ref_adapter.py +++ b/src/conductor/client/adapters/models/target_ref_adapter.py @@ -2,7 +2,7 @@ class TargetRefAdapter(TargetRef): - @TargetRef.id.setter + @TargetRef.id.setter # type: ignore[attr-defined] def id(self, id): """Sets the id of this TargetRef. @@ -12,7 +12,7 @@ def id(self, id): """ self._id = id - @TargetRef.type.setter + @TargetRef.type.setter # type: ignore[attr-defined] def type(self, type): """Sets the type of this TargetRef. diff --git a/src/conductor/client/adapters/models/task_def_adapter.py b/src/conductor/client/adapters/models/task_def_adapter.py index 875b7884..7f826efe 100644 --- a/src/conductor/client/adapters/models/task_def_adapter.py +++ b/src/conductor/client/adapters/models/task_def_adapter.py @@ -2,7 +2,7 @@ class TaskDefAdapter(TaskDef): - @TaskDef.total_timeout_seconds.setter + @TaskDef.total_timeout_seconds.setter # type: ignore[attr-defined] def total_timeout_seconds(self, total_timeout_seconds): """Sets the total_timeout_seconds of this TaskDef. @@ -12,7 +12,7 @@ def total_timeout_seconds(self, total_timeout_seconds): """ self._total_timeout_seconds = total_timeout_seconds - @TaskDef.timeout_seconds.setter + @TaskDef.timeout_seconds.setter # type: ignore[attr-defined] def timeout_seconds(self, timeout_seconds): """Sets the timeout_seconds of this TaskDef. diff --git a/src/conductor/client/adapters/models/task_result_adapter.py b/src/conductor/client/adapters/models/task_result_adapter.py index 6e061ec3..cbb76638 100644 --- a/src/conductor/client/adapters/models/task_result_adapter.py +++ b/src/conductor/client/adapters/models/task_result_adapter.py @@ -4,7 +4,7 @@ class TaskResultAdapter(TaskResult): - @TaskResult.status.setter + @TaskResult.status.setter # type: ignore[attr-defined] def status(self, status): """Sets the status of this TaskResult. diff --git a/src/conductor/client/adapters/models/task_summary_adapter.py b/src/conductor/client/adapters/models/task_summary_adapter.py index 2719a70c..2de82c31 100644 --- a/src/conductor/client/adapters/models/task_summary_adapter.py +++ b/src/conductor/client/adapters/models/task_summary_adapter.py @@ -6,51 +6,13 @@ class TaskSummaryAdapter(TaskSummary): - swagger_types: ClassVar[Dict[str, str]] = { - "correlation_id": "str", - "end_time": "str", - "execution_time": "int", - "external_input_payload_storage_path": "str", - "external_output_payload_storage_path": "str", - "input": "str", - "output": "str", - "queue_wait_time": "int", - "reason_for_incompletion": "str", - "scheduled_time": "str", - "start_time": "str", - "status": "str", - "task_def_name": "str", - "task_id": "str", - "task_reference_name": "str", - "task_type": "str", - "update_time": "str", - "workflow_id": "str", - "workflow_priority": "int", - "workflow_type": "str", + swagger_types: ClassVar[Dict[str, str]] = { # type: ignore[misc] + **TaskSummary.swagger_types, "domain": "str", } - attribute_map: ClassVar[Dict[str, str]] = { - "correlation_id": "correlationId", - "end_time": "endTime", - "execution_time": "executionTime", - "external_input_payload_storage_path": "externalInputPayloadStoragePath", - "external_output_payload_storage_path": "externalOutputPayloadStoragePath", - "input": "input", - "output": "output", - "queue_wait_time": "queueWaitTime", - "reason_for_incompletion": "reasonForIncompletion", - "scheduled_time": "scheduledTime", - "start_time": "startTime", - "status": "status", - "task_def_name": "taskDefName", - "task_id": "taskId", - "task_reference_name": "taskReferenceName", - "task_type": "taskType", - "update_time": "updateTime", - "workflow_id": "workflowId", - "workflow_priority": "workflowPriority", - "workflow_type": "workflowType", + attribute_map: ClassVar[Dict[str, str]] = { # type: ignore[misc] + **TaskSummary.attribute_map, "domain": "domain", } diff --git a/src/conductor/client/adapters/models/upsert_group_request_adapter.py b/src/conductor/client/adapters/models/upsert_group_request_adapter.py index d0498c6e..97b15ab7 100644 --- a/src/conductor/client/adapters/models/upsert_group_request_adapter.py +++ b/src/conductor/client/adapters/models/upsert_group_request_adapter.py @@ -2,7 +2,7 @@ class UpsertGroupRequestAdapter(UpsertGroupRequest): - @UpsertGroupRequest.roles.setter + @UpsertGroupRequest.roles.setter # type: ignore[attr-defined] def roles(self, roles): """Sets the roles of this UpsertGroupRequest. @@ -27,7 +27,7 @@ def roles(self, roles): self._roles = roles - @UpsertGroupRequest.default_access.setter + @UpsertGroupRequest.default_access.setter # type: ignore[attr-defined] def default_access(self, default_access): """Sets the default_access of this UpsertGroupRequest. diff --git a/src/conductor/client/adapters/models/upsert_user_request_adapter.py b/src/conductor/client/adapters/models/upsert_user_request_adapter.py index 98036b01..f74b97e7 100644 --- a/src/conductor/client/adapters/models/upsert_user_request_adapter.py +++ b/src/conductor/client/adapters/models/upsert_user_request_adapter.py @@ -12,7 +12,7 @@ class RolesEnum(str, Enum): class UpsertUserRequestAdapter(UpsertUserRequest): - @UpsertUserRequest.roles.setter + @UpsertUserRequest.roles.setter # type: ignore[attr-defined] def roles(self, roles): """Sets the roles of this UpsertUserRequest. diff --git a/src/conductor/client/adapters/models/workflow_def_adapter.py b/src/conductor/client/adapters/models/workflow_def_adapter.py index 629f4fe6..7a28915b 100644 --- a/src/conductor/client/adapters/models/workflow_def_adapter.py +++ b/src/conductor/client/adapters/models/workflow_def_adapter.py @@ -146,7 +146,7 @@ def tasks(self, tasks): """ self._tasks = tasks - @WorkflowDef.timeout_seconds.setter + @WorkflowDef.timeout_seconds.setter # type: ignore[attr-defined] def timeout_seconds(self, timeout_seconds): """Sets the timeout_seconds of this WorkflowDef. diff --git a/src/conductor/client/adapters/models/workflow_run_adapter.py b/src/conductor/client/adapters/models/workflow_run_adapter.py index 25465c8f..a2a54d68 100644 --- a/src/conductor/client/adapters/models/workflow_run_adapter.py +++ b/src/conductor/client/adapters/models/workflow_run_adapter.py @@ -71,8 +71,8 @@ def __init__( self.workflow_id = workflow_id @property - def current_task(self) -> TaskAdapter: - current = None + def current_task(self) -> Optional[TaskAdapter]: + current: Optional[TaskAdapter] = None for task in self.tasks: if task.status in ("SCHEDULED", "IN_PROGRESS"): current = task @@ -80,7 +80,7 @@ def current_task(self) -> TaskAdapter: def get_task( self, name: Optional[str] = None, task_reference_name: Optional[str] = None - ) -> TaskAdapter: + ) -> Optional[TaskAdapter]: if name is None and task_reference_name is None: raise Exception( "ONLY one of name or task_reference_name MUST be provided. None were provided" @@ -90,7 +90,7 @@ def get_task( "ONLY one of name or task_reference_name MUST be provided. both were provided" ) - current = None + current: Optional[TaskAdapter] = None for task in self.tasks: if ( task.task_def_name == name diff --git a/src/conductor/client/adapters/models/workflow_task_adapter.py b/src/conductor/client/adapters/models/workflow_task_adapter.py index 3f7d4543..ad4c2576 100644 --- a/src/conductor/client/adapters/models/workflow_task_adapter.py +++ b/src/conductor/client/adapters/models/workflow_task_adapter.py @@ -6,7 +6,7 @@ class WorkflowTaskAdapter(WorkflowTask): - @WorkflowTask.workflow_task_type.setter + @WorkflowTask.workflow_task_type.setter # type: ignore[attr-defined] def workflow_task_type(self, workflow_task_type): """Sets the workflow_task_type of this WorkflowTask. @@ -16,7 +16,7 @@ def workflow_task_type(self, workflow_task_type): """ self._workflow_task_type = workflow_task_type - @WorkflowTask.on_state_change.setter + @WorkflowTask.on_state_change.setter # type: ignore[attr-defined] def on_state_change(self, state_change): """Sets the on_state_change of this WorkflowTask. diff --git a/src/conductor/client/adapters/rest_adapter.py b/src/conductor/client/adapters/rest_adapter.py index f5e5ea45..4930fa93 100644 --- a/src/conductor/client/adapters/rest_adapter.py +++ b/src/conductor/client/adapters/rest_adapter.py @@ -2,7 +2,7 @@ import io import logging import ssl -from typing import Any, Dict, Optional, Tuple, Union +from typing import Any, Dict, Optional, Union import httpx from httpx import HTTPStatusError, RequestError, Response, TimeoutException @@ -105,7 +105,7 @@ def __init__(self, connection: Optional[httpx.Client] = None, configuration=None client_kwargs["verify"] = ssl_context - self.connection = httpx.Client(**client_kwargs) + self.connection = httpx.Client(**client_kwargs) # type: ignore[arg-type] def close(self): """Close the HTTP client connection.""" @@ -132,7 +132,7 @@ def request( body: Optional[Union[str, bytes, Dict[str, Any]]] = None, post_params: Optional[Dict[str, Any]] = None, _preload_content: bool = True, - _request_timeout: Optional[Union[float, Tuple[float, float]]] = None, + _request_timeout: Optional[float] = None, ) -> RESTResponse: """Perform HTTP request using httpx. @@ -233,7 +233,7 @@ def GET( headers: Optional[Dict[str, str]] = None, query_params: Optional[Dict[str, Any]] = None, _preload_content: bool = True, - _request_timeout: Optional[Union[float, Tuple[float, float]]] = None, + _request_timeout: Optional[float] = None, ) -> RESTResponse: """Perform GET request.""" return self.request( @@ -251,7 +251,7 @@ def HEAD( headers: Optional[Dict[str, str]] = None, query_params: Optional[Dict[str, Any]] = None, _preload_content: bool = True, - _request_timeout: Optional[Union[float, Tuple[float, float]]] = None, + _request_timeout: Optional[float] = None, ) -> RESTResponse: """Perform HEAD request.""" return self.request( @@ -271,7 +271,7 @@ def OPTIONS( post_params: Optional[Dict[str, Any]] = None, body: Optional[Union[str, bytes, Dict[str, Any]]] = None, _preload_content: bool = True, - _request_timeout: Optional[Union[float, Tuple[float, float]]] = None, + _request_timeout: Optional[float] = None, ) -> RESTResponse: """Perform OPTIONS request.""" return self.request( @@ -292,7 +292,7 @@ def DELETE( query_params: Optional[Dict[str, Any]] = None, body: Optional[Union[str, bytes, Dict[str, Any]]] = None, _preload_content: bool = True, - _request_timeout: Optional[Union[float, Tuple[float, float]]] = None, + _request_timeout: Optional[float] = None, ) -> RESTResponse: """Perform DELETE request.""" return self.request( @@ -313,7 +313,7 @@ def POST( post_params: Optional[Dict[str, Any]] = None, body: Optional[Union[str, bytes, Dict[str, Any]]] = None, _preload_content: bool = True, - _request_timeout: Optional[Union[float, Tuple[float, float]]] = None, + _request_timeout: Optional[float] = None, ) -> RESTResponse: """Perform POST request.""" return self.request( @@ -335,7 +335,7 @@ def PUT( post_params: Optional[Dict[str, Any]] = None, body: Optional[Union[str, bytes, Dict[str, Any]]] = None, _preload_content: bool = True, - _request_timeout: Optional[Union[float, Tuple[float, float]]] = None, + _request_timeout: Optional[float] = None, ) -> RESTResponse: """Perform PUT request.""" return self.request( @@ -357,7 +357,7 @@ def PATCH( post_params: Optional[Dict[str, Any]] = None, body: Optional[Union[str, bytes, Dict[str, Any]]] = None, _preload_content: bool = True, - _request_timeout: Optional[Union[float, Tuple[float, float]]] = None, + _request_timeout: Optional[float] = None, ) -> RESTResponse: """Perform PATCH request.""" return self.request( diff --git a/src/conductor/client/automator/task_handler.py b/src/conductor/client/automator/task_handler.py index 1b33297d..10797494 100644 --- a/src/conductor/client/automator/task_handler.py +++ b/src/conductor/client/automator/task_handler.py @@ -85,8 +85,10 @@ def __init__( logger.info("Created worker with name=%s and domain=%s", task_def_name, domain) workers.append(worker) - self.__create_task_runner_processes(workers, configuration, metrics_settings) - self.__create_metrics_provider_process(metrics_settings) + self.__create_task_runner_processes( + workers, configuration or Configuration(), metrics_settings or MetricsSettings() + ) + self.__create_metrics_provider_process(metrics_settings or MetricsSettings()) logger.info("TaskHandler initialized") def __enter__(self): @@ -118,9 +120,11 @@ def join_processes(self) -> None: logger.info("KeyboardInterrupt: Stopping all processes") self.stop_processes() - def __create_metrics_provider_process(self, metrics_settings: MetricsSettings) -> None: + def __create_metrics_provider_process( + self, metrics_settings: Optional[MetricsSettings] = None + ) -> None: if metrics_settings is None: - self.metrics_provider_process = None + self.metrics_provider_process: Optional[Process] = None return self.metrics_provider_process = Process( target=MetricsCollector.provide_metrics, args=(metrics_settings,) @@ -133,7 +137,7 @@ def __create_task_runner_processes( configuration: Configuration, metrics_settings: MetricsSettings, ) -> None: - self.task_runner_processes = [] + self.task_runner_processes: List[Process] = [] for worker in workers: self.__create_task_runner_process(worker, configuration, metrics_settings) @@ -200,8 +204,8 @@ def __stop_process(self, process: Process): # Setup centralized logging queue -def _setup_logging_queue(configuration: Configuration): - queue = Queue() +def _setup_logging_queue(configuration: Optional[Configuration]): + queue: Queue = Queue() if configuration: configuration.apply_logging_config() log_level = configuration.log_level diff --git a/src/conductor/client/automator/task_runner.py b/src/conductor/client/automator/task_runner.py index 49174584..627163f9 100644 --- a/src/conductor/client/automator/task_runner.py +++ b/src/conductor/client/automator/task_runner.py @@ -1,9 +1,13 @@ +from __future__ import annotations + import logging import os import sys import time import traceback +from typing import Optional + from conductor.client.codegen.rest import AuthorizationException, ApiException from conductor.client.configuration.configuration import Configuration from conductor.client.http.api.task_resource_api import TaskResourceApi @@ -22,8 +26,8 @@ class TaskRunner: def __init__( self, worker: WorkerInterface, - configuration: Configuration = None, - metrics_settings: MetricsSettings = None, + configuration: Optional[Configuration] = None, + metrics_settings: Optional[MetricsSettings] = None, ): if not isinstance(worker, WorkerInterface): raise Exception("Invalid worker") @@ -74,7 +78,7 @@ def run_once(self) -> None: except Exception: pass - def __poll_task(self) -> Task: + def __poll_task(self) -> Optional[Task]: task_definition_name = self.worker.get_task_definition_name() if self.worker.paused(): logger.debug("Stop polling task for: %s", task_definition_name) @@ -96,7 +100,7 @@ def __poll_task(self) -> Task: except AuthorizationException as auth_exception: if self.metrics_collector is not None: self.metrics_collector.increment_task_poll_error( - task_definition_name, type(auth_exception) + task_definition_name, auth_exception ) if auth_exception.invalid_token: logger.error( @@ -113,7 +117,7 @@ def __poll_task(self) -> Task: return None except ApiException as e: if self.metrics_collector is not None: - self.metrics_collector.increment_task_poll_error(task_definition_name, type(e)) + self.metrics_collector.increment_task_poll_error(task_definition_name, e) logger.error( "Failed to poll task: %s, reason: %s, code: %s", task_definition_name, @@ -123,7 +127,7 @@ def __poll_task(self) -> Task: return None except Exception as e: if self.metrics_collector is not None: - self.metrics_collector.increment_task_poll_error(task_definition_name, type(e)) + self.metrics_collector.increment_task_poll_error(task_definition_name, e) logger.error("Failed to poll task: %s; reason: %s", task_definition_name, e) return None @@ -164,7 +168,7 @@ def __execute_task(self, task: Task) -> TaskResult: ) except Exception as e: if self.metrics_collector is not None: - self.metrics_collector.increment_task_execution_error(task_definition_name, type(e)) + self.metrics_collector.increment_task_execution_error(task_definition_name, e) task_result = TaskResult( task_id=task.task_id, workflow_instance_id=task.workflow_instance_id, @@ -210,9 +214,7 @@ def __update_task(self, task_result: TaskResult): return response except Exception as e: if self.metrics_collector is not None: - self.metrics_collector.increment_task_update_error( - task_definition_name, type(e) - ) + self.metrics_collector.increment_task_update_error(task_definition_name, e) logger.error( "Failed to update task id: %s; workflow_instance_id: %s; task_definition_name: %s; reason: %s", task_result.task_id, diff --git a/src/conductor/client/configuration/configuration.py b/src/conductor/client/configuration/configuration.py index c8fbeec7..cb821156 100644 --- a/src/conductor/client/configuration/configuration.py +++ b/src/conductor/client/configuration/configuration.py @@ -136,7 +136,7 @@ def __init__( if key is not None and secret is not None: self.authentication_settings = AuthenticationSettings(key_id=key, key_secret=secret) else: - self.authentication_settings = None + self.authentication_settings = None # type: ignore[assignment] # Debug switch self.debug = debug diff --git a/src/conductor/client/event/event_client.py b/src/conductor/client/event/event_client.py index cf13e3f5..3263e521 100644 --- a/src/conductor/client/event/event_client.py +++ b/src/conductor/client/event/event_client.py @@ -19,7 +19,7 @@ def get_kafka_queue_configuration(self, queue_topic: str) -> QueueConfiguration: queue_name=queue_topic, ) - def get_queue_configuration(self, queue_type: str, queue_name: str): + def get_queue_configuration(self, queue_type: str, queue_name: str) -> QueueConfiguration: return self.client.get_queue_config(queue_type, queue_name) def put_queue_configuration(self, queue_configuration: QueueConfiguration): diff --git a/src/conductor/client/exceptions/auth_401_policy.py b/src/conductor/client/exceptions/auth_401_policy.py index 8c595ef1..379af5f9 100644 --- a/src/conductor/client/exceptions/auth_401_policy.py +++ b/src/conductor/client/exceptions/auth_401_policy.py @@ -2,7 +2,7 @@ import logging import random import time -from typing import Optional +from typing import Dict, Optional logger = logging.getLogger(__name__) @@ -28,8 +28,8 @@ def __init__( self.stop_behavior = stop_behavior # Track attempts per endpoint to allow reset on success - self._attempt_counts = {} - self._last_success_time = {} + self._attempt_counts: Dict[str, int] = {} + self._last_success_time: Dict[str, float] = {} def is_401_unauthorized(self, status_code: int) -> bool: """Check if the status code is specifically 401 (not 403 or other auth errors).""" diff --git a/src/conductor/client/helpers/helper.py b/src/conductor/client/helpers/helper.py index e227fc8c..c651d5e6 100644 --- a/src/conductor/client/helpers/helper.py +++ b/src/conductor/client/helpers/helper.py @@ -17,7 +17,7 @@ class ObjectMapper(object): PRIMITIVE_TYPES: ClassVar[Tuple] = (float, bool, bytes, six.text_type, *six.integer_types) NATIVE_TYPES_MAPPING: ClassVar[Dict] = { "int": int, - "long": int if six.PY3 else long, # noqa: F821, YTT202 + "long": int if six.PY3 else long, # type: ignore[name-defined] # noqa: F821, YTT202 "float": float, "str": str, "bool": bool, diff --git a/src/conductor/client/integration_client.py b/src/conductor/client/integration_client.py index bfa2f622..6cd3faa9 100644 --- a/src/conductor/client/integration_client.py +++ b/src/conductor/client/integration_client.py @@ -1,6 +1,6 @@ -from __future__ import absolute_import +from __future__ import annotations from abc import ABC, abstractmethod -from typing import List +from typing import List, Optional from conductor.client.http.models.integration import Integration from conductor.client.http.models.integration_api import IntegrationApi @@ -49,13 +49,15 @@ def delete_integration(self, integration_name: str): """Delete an integration""" @abstractmethod - def get_integration_api(self, api_name: str, integration_name: str) -> IntegrationApi: ... + def get_integration_api( + self, api_name: str, integration_name: str + ) -> Optional[IntegrationApi]: ... @abstractmethod def get_integration_apis(self, integration_name: str) -> List[IntegrationApi]: ... @abstractmethod - def get_integration(self, integration_name: str) -> Integration: ... + def get_integration(self, integration_name: str) -> Optional[Integration]: ... @abstractmethod def get_integrations(self) -> List[Integration]: diff --git a/src/conductor/client/orkes/models/access_key.py b/src/conductor/client/orkes/models/access_key.py index 4d32361d..8146ccb5 100644 --- a/src/conductor/client/orkes/models/access_key.py +++ b/src/conductor/client/orkes/models/access_key.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from conductor.client.orkes.models.access_key_status import AccessKeyStatus from typing import Optional diff --git a/src/conductor/client/orkes/models/granted_permission.py b/src/conductor/client/orkes/models/granted_permission.py index 92f6b3f4..18b325dc 100644 --- a/src/conductor/client/orkes/models/granted_permission.py +++ b/src/conductor/client/orkes/models/granted_permission.py @@ -1,12 +1,10 @@ from typing import List -from typing_extensions import Self - from conductor.client.http.models.target_ref import TargetRef class GrantedPermission: - def __init__(self, target: TargetRef, access: List[str]) -> Self: + def __init__(self, target: TargetRef, access: List[str]) -> None: self._target = target self._access = access diff --git a/src/conductor/client/orkes/models/metadata_tag.py b/src/conductor/client/orkes/models/metadata_tag.py index e3d1aed1..d44eb78f 100644 --- a/src/conductor/client/orkes/models/metadata_tag.py +++ b/src/conductor/client/orkes/models/metadata_tag.py @@ -1,8 +1,6 @@ -from typing_extensions import Self - from conductor.client.http.models.tag_object import TagObject class MetadataTag(TagObject): - def __init__(self, key: str, value: str) -> Self: + def __init__(self, key: str, value: str) -> None: super().__init__(key=key, type="METADATA", value=value) diff --git a/src/conductor/client/orkes/models/ratelimit_tag.py b/src/conductor/client/orkes/models/ratelimit_tag.py index 9c0c5b70..bb7fc7fc 100644 --- a/src/conductor/client/orkes/models/ratelimit_tag.py +++ b/src/conductor/client/orkes/models/ratelimit_tag.py @@ -1,8 +1,6 @@ -from typing_extensions import Self - from conductor.client.http.models.tag_object import TagObject class RateLimitTag(TagObject): - def __init__(self, key: str, value: int) -> Self: + def __init__(self, key: str, value: int) -> None: super().__init__(key=key, type="RATE_LIMIT", value=value) diff --git a/src/conductor/client/orkes/orkes_integration_client.py b/src/conductor/client/orkes/orkes_integration_client.py index 540c0b87..012ccf24 100644 --- a/src/conductor/client/orkes/orkes_integration_client.py +++ b/src/conductor/client/orkes/orkes_integration_client.py @@ -32,7 +32,7 @@ def delete_integration_api(self, api_name: str, integration_name: str): def delete_integration(self, integration_name: str): self.integrationApi.delete_integration_provider(integration_name) - def get_integration_api(self, api_name: str, integration_name: str) -> IntegrationApi: + def get_integration_api(self, api_name: str, integration_name: str) -> Optional[IntegrationApi]: try: return self.integrationApi.get_integration_api(api_name, integration_name) except ApiException as e: @@ -43,7 +43,7 @@ def get_integration_api(self, api_name: str, integration_name: str) -> Integrati def get_integration_apis(self, integration_name: str) -> List[IntegrationApi]: return self.integrationApi.get_integration_apis(integration_name) - def get_integration(self, integration_name: str) -> Integration: + def get_integration(self, integration_name: str) -> Optional[Integration]: try: return self.integrationApi.get_integration_provider(integration_name) except ApiException as e: @@ -54,7 +54,7 @@ def get_integration(self, integration_name: str) -> Integration: def get_integrations(self) -> List[Integration]: return self.integrationApi.get_integration_providers() - def get_integration_provider(self, name: str) -> IntegrationDef: + def get_integration_provider(self, name: str) -> Optional[IntegrationDef]: """Get integration provider by name""" try: return self.integrationApi.get_integration_provider(name) @@ -71,7 +71,7 @@ def get_integration_providers( if category is not None: kwargs["category"] = category if active_only is not None: - kwargs["active_only"] = active_only + kwargs["active_only"] = active_only # type: ignore[assignment] return self.integrationApi.get_integration_providers(**kwargs) def get_integration_provider_defs(self) -> List[IntegrationDef]: @@ -152,7 +152,7 @@ def get_all_integrations( if category is not None: kwargs["category"] = category if active_only is not None: - kwargs["active_only"] = active_only + kwargs["active_only"] = active_only # type: ignore[assignment] return self.integrationApi.get_all_integrations(**kwargs) def get_providers_and_integrations( @@ -163,5 +163,5 @@ def get_providers_and_integrations( if integration_type is not None: kwargs["type"] = integration_type if active_only is not None: - kwargs["active_only"] = active_only + kwargs["active_only"] = active_only # type: ignore[assignment] return self.integrationApi.get_providers_and_integrations(**kwargs) diff --git a/src/conductor/client/orkes/orkes_metadata_client.py b/src/conductor/client/orkes/orkes_metadata_client.py index 2358a6e0..3023ccfd 100644 --- a/src/conductor/client/orkes/orkes_metadata_client.py +++ b/src/conductor/client/orkes/orkes_metadata_client.py @@ -55,7 +55,7 @@ def add_workflow_tag(self, tag: MetadataTag, workflow_name: str): self.tagsApi.add_workflow_tag(tag, workflow_name) def delete_workflow_tag(self, tag: MetadataTag, workflow_name: str): - tagStr = TagString(tag.key, tag.type, tag.value) + tagStr = TagString(tag.key, tag.type, tag.value) # type: ignore[attr-defined] self.tagsApi.delete_workflow_tag(tagStr, workflow_name) def get_workflow_tags(self, workflow_name: str) -> List[MetadataTag]: @@ -68,7 +68,7 @@ def addTaskTag(self, tag: MetadataTag, taskName: str): self.tagsApi.add_task_tag(tag, taskName) def deleteTaskTag(self, tag: MetadataTag, taskName: str): - tagStr = TagString(tag.key, tag.type, tag.value) + tagStr = TagString(tag.key, tag.type, tag.value) # type: ignore[attr-defined] self.tagsApi.delete_task_tag(tagStr, taskName) def getTaskTags(self, taskName: str) -> List[MetadataTag]: @@ -85,8 +85,8 @@ def setWorkflowRateLimit(self, rateLimit: int, workflowName: str): def getWorkflowRateLimit(self, workflowName: str) -> Optional[int]: tags = self.tagsApi.get_workflow_tags(workflowName) for tag in tags: - if tag.type == "RATE_LIMIT" and tag.key == workflowName: - return tag.value + if tag.type == "RATE_LIMIT" and tag.key == workflowName: # type: ignore[attr-defined] + return tag.value # type: ignore[attr-defined, return-value] return None diff --git a/src/conductor/client/orkes/orkes_prompt_client.py b/src/conductor/client/orkes/orkes_prompt_client.py index 342dbe0c..c97d4e21 100644 --- a/src/conductor/client/orkes/orkes_prompt_client.py +++ b/src/conductor/client/orkes/orkes_prompt_client.py @@ -18,9 +18,9 @@ def __init__(self, configuration: Configuration): def save_prompt(self, prompt_name: str, description: str, prompt_template: str): self.promptApi.save_message_template(prompt_template, description, prompt_name) - def get_prompt(self, prompt_name: str) -> PromptTemplate: + def get_prompt(self, prompt_name: str) -> Optional[PromptTemplate]: # type: ignore[override] try: - return self.promptApi.get_message_template(prompt_name) + return self.promptApi.get_message_template(prompt_name) # type: ignore[return-value] except ApiException as e: if e.is_not_found(): return None diff --git a/src/conductor/client/orkes/orkes_scheduler_client.py b/src/conductor/client/orkes/orkes_scheduler_client.py index 402103be..74c78a67 100644 --- a/src/conductor/client/orkes/orkes_scheduler_client.py +++ b/src/conductor/client/orkes/orkes_scheduler_client.py @@ -1,5 +1,5 @@ from __future__ import annotations -from typing import Optional, List +from typing import Optional, List, Tuple from conductor.client.configuration.configuration import Configuration from conductor.client.http.models.save_schedule_request import SaveScheduleRequest @@ -19,7 +19,7 @@ def __init__(self, configuration: Configuration): def save_schedule(self, save_schedule_request: SaveScheduleRequest): self.schedulerResourceApi.save_schedule(save_schedule_request) - def get_schedule(self, name: str) -> WorkflowSchedule: + def get_schedule(self, name: str) -> Tuple[Optional[WorkflowSchedule], str]: return self.schedulerResourceApi.get_schedule(name) def get_all_schedules(self, workflow_name: Optional[str] = None) -> List[WorkflowSchedule]: @@ -74,11 +74,11 @@ def search_schedule_executions( if size: kwargs.update({"size": size}) if sort: - kwargs.update({"sort": sort}) + kwargs.update({"sort": sort}) # type: ignore[dict-item] if free_text: - kwargs.update({"free_text": free_text}) + kwargs.update({"free_text": free_text}) # type: ignore[dict-item] if query: - kwargs.update({"query": query}) + kwargs.update({"query": query}) # type: ignore[dict-item] return self.schedulerResourceApi.search_v2(**kwargs) def requeue_all_execution_records(self): @@ -91,4 +91,4 @@ def get_scheduler_tags(self, name: str) -> List[MetadataTag]: return self.schedulerResourceApi.get_tags_for_schedule(name) def delete_scheduler_tags(self, tags: List[MetadataTag], name: str) -> List[MetadataTag]: - self.schedulerResourceApi.delete_tag_for_schedule(tags, name) + return self.schedulerResourceApi.delete_tag_for_schedule(tags, name) diff --git a/src/conductor/client/orkes/orkes_secret_client.py b/src/conductor/client/orkes/orkes_secret_client.py index 02aed980..70e3d7a2 100644 --- a/src/conductor/client/orkes/orkes_secret_client.py +++ b/src/conductor/client/orkes/orkes_secret_client.py @@ -35,4 +35,4 @@ def get_secret_tags(self, key: str) -> List[MetadataTag]: return self.secretResourceApi.get_tags(key) def delete_secret_tags(self, tags: List[MetadataTag], key: str) -> List[MetadataTag]: - self.secretResourceApi.delete_tag_for_secret(tags, key) + return self.secretResourceApi.delete_tag_for_secret(tags, key) diff --git a/src/conductor/client/orkes/orkes_service_registry_client.py b/src/conductor/client/orkes/orkes_service_registry_client.py index 48cf1b42..ff595f66 100644 --- a/src/conductor/client/orkes/orkes_service_registry_client.py +++ b/src/conductor/client/orkes/orkes_service_registry_client.py @@ -73,4 +73,4 @@ def get_queue_sizes_for_all_tasks(self) -> dict: def is_circuit_breaker_open(self, name: str) -> bool: """Check if circuit breaker is open for a service""" status = self.get_circuit_breaker_status(name) - return status.current_state and status.current_state.upper() == "OPEN" + return bool(status.current_state and status.current_state.upper() == "OPEN") diff --git a/src/conductor/client/orkes/orkes_task_client.py b/src/conductor/client/orkes/orkes_task_client.py index 855c9072..afa6a806 100644 --- a/src/conductor/client/orkes/orkes_task_client.py +++ b/src/conductor/client/orkes/orkes_task_client.py @@ -38,9 +38,9 @@ def batch_poll_tasks( if worker_id: kwargs.update({"workerid": worker_id}) if count: - kwargs.update({"count": count}) + kwargs.update({"count": count}) # type: ignore[dict-item] if timeout_in_millisecond: - kwargs.update({"timeout": timeout_in_millisecond}) + kwargs.update({"timeout": timeout_in_millisecond}) # type: ignore[dict-item] if domain: kwargs.update({"domain": domain}) diff --git a/src/conductor/client/orkes/orkes_workflow_client.py b/src/conductor/client/orkes/orkes_workflow_client.py index 2506028f..50e1c1c4 100644 --- a/src/conductor/client/orkes/orkes_workflow_client.py +++ b/src/conductor/client/orkes/orkes_workflow_client.py @@ -36,7 +36,7 @@ def start_workflow_by_name( if version: kwargs.update({"version": version}) if correlationId: - kwargs.update({"correlation_id": correlationId}) + kwargs.update({"correlation_id": correlationId}) # type: ignore[dict-item] if priority: kwargs.update({"priority": priority}) @@ -126,7 +126,7 @@ def terminate_workflow( if reason: kwargs["reason"] = reason if trigger_failure_workflow: - kwargs["trigger_failure_workflow"] = trigger_failure_workflow + kwargs["trigger_failure_workflow"] = trigger_failure_workflow # type: ignore[assignment] self.workflowResourceApi.terminate1(workflow_id, **kwargs) def get_workflow(self, workflow_id: str, include_tasks: Optional[bool] = True) -> Workflow: @@ -152,7 +152,7 @@ def delete_workflow(self, workflow_id: str, archive_workflow: Optional[bool] = T self.workflowResourceApi.delete1(workflow_id, archive_workflow=archive_workflow) def skip_task_from_workflow( - self, workflow_id: str, task_reference_name: str, request: SkipTaskRequest + self, workflow_id: str, task_reference_name: str, request: Optional[SkipTaskRequest] ): self.workflowResourceApi.skip_task_from_workflow(workflow_id, task_reference_name, request) @@ -190,9 +190,9 @@ def get_by_correlation_ids_in_batch( kwargs["body"] = batch_request if include_tasks: - kwargs["include_tasks"] = include_tasks + kwargs["include_tasks"] = include_tasks # type: ignore[assignment] if include_completed: - kwargs["include_closed"] = include_completed + kwargs["include_closed"] = include_completed # type: ignore[assignment] return self.workflowResourceApi.get_workflows1(**kwargs) def get_by_correlation_ids( @@ -234,7 +234,7 @@ def update_state( if wait_until_task_ref_names is not None: kwargs["wait_until_task_ref"] = ",".join(wait_until_task_ref_names) if wait_for_seconds is not None: - kwargs["wait_for_seconds"] = wait_for_seconds + kwargs["wait_for_seconds"] = wait_for_seconds # type: ignore[assignment] return self.workflowResourceApi.update_workflow_and_task_state( body=update_request, workflow_id=workflow_id, request_id=request_id, **kwargs diff --git a/src/conductor/client/orkes_clients.py b/src/conductor/client/orkes_clients.py index 08a76c4c..c4c74fc5 100644 --- a/src/conductor/client/orkes_clients.py +++ b/src/conductor/client/orkes_clients.py @@ -1,3 +1,7 @@ +from __future__ import annotations + +from typing import Optional + from conductor.client.authorization_client import AuthorizationClient from conductor.client.configuration.configuration import Configuration from conductor.client.integration_client import IntegrationClient @@ -21,7 +25,7 @@ class OrkesClients: - def __init__(self, configuration: Configuration = None): + def __init__(self, configuration: Optional[Configuration] = None): if configuration is None: configuration = Configuration() self.configuration = configuration diff --git a/src/conductor/client/scheduler_client.py b/src/conductor/client/scheduler_client.py index a7274249..dcd8ca90 100644 --- a/src/conductor/client/scheduler_client.py +++ b/src/conductor/client/scheduler_client.py @@ -1,6 +1,6 @@ from __future__ import annotations from abc import ABC, abstractmethod -from typing import Optional, List +from typing import Optional, List, Tuple from conductor.client.http.models.workflow_schedule import WorkflowSchedule from conductor.client.http.models.save_schedule_request import SaveScheduleRequest from conductor.client.http.models.search_result_workflow_schedule_execution_model import ( @@ -15,7 +15,7 @@ def save_schedule(self, save_schedule_request: SaveScheduleRequest): pass @abstractmethod - def get_schedule(self, name: str) -> (Optional[WorkflowSchedule], str): + def get_schedule(self, name: str) -> Tuple[Optional[WorkflowSchedule], str]: pass @abstractmethod diff --git a/src/conductor/client/telemetry/metrics_collector.py b/src/conductor/client/telemetry/metrics_collector.py index 10dbd944..7b14f700 100644 --- a/src/conductor/client/telemetry/metrics_collector.py +++ b/src/conductor/client/telemetry/metrics_collector.py @@ -170,7 +170,7 @@ def __increment_counter( if not self.must_collect_metrics: return counter = self.__get_counter( - name=name, documentation=documentation, labelnames=labels.keys() + name=name, documentation=documentation, labelnames=list(labels.keys()) ) counter.labels(*labels.values()).inc() @@ -183,7 +183,9 @@ def __record_gauge( ) -> None: if not self.must_collect_metrics: return - gauge = self.__get_gauge(name=name, documentation=documentation, labelnames=labels.keys()) + gauge = self.__get_gauge( + name=name, documentation=documentation, labelnames=list(labels.keys()) + ) gauge.labels(*labels.values()).set(value) def __get_counter( diff --git a/src/conductor/client/worker/worker.py b/src/conductor/client/worker/worker.py index ba25f2df..1a77b180 100644 --- a/src/conductor/client/worker/worker.py +++ b/src/conductor/client/worker/worker.py @@ -7,7 +7,6 @@ from copy import deepcopy from typing import Any, Callable, Union, Optional -from typing_extensions import Self from conductor.shared.automator import utils from conductor.shared.automator.utils import convert_from_dict_or_list @@ -46,7 +45,7 @@ def __init__( poll_interval: Optional[float] = None, domain: Optional[str] = None, worker_id: Optional[str] = None, - ) -> Self: + ) -> None: super().__init__(task_definition_name) self.api_client = ApiClient() self.config = Configuration() @@ -89,7 +88,7 @@ def execute(self, task: Task) -> TaskResult: task_input[input_name] = default_value else: task_input[input_name] = None - task_output = self.execute_function(**task_input) + task_output = self.execute_function(**task_input) # type: ignore[call-arg] if isinstance(task_output, TaskResult): task_output.task_id = task.task_id diff --git a/src/conductor/client/workflow/conductor_workflow.py b/src/conductor/client/workflow/conductor_workflow.py index fa8fb0d6..32bb9aac 100644 --- a/src/conductor/client/workflow/conductor_workflow.py +++ b/src/conductor/client/workflow/conductor_workflow.py @@ -28,11 +28,11 @@ def __init__( name: str, version: Optional[int] = None, description: Optional[str] = None, - ) -> Self: + ) -> None: self._executor: WorkflowExecutor = executor - self.name: str = name - self.version: Optional[int] = version - self.description: Optional[str] = description + self._name: str = name + self._version: Optional[int] = version + self._description: Optional[str] = description self._tasks: List[TaskInterface] = [] self._owner_email: Optional[str] = None self._timeout_policy: Optional[TimeoutPolicy] = None @@ -57,7 +57,7 @@ def name(self, name: str) -> None: self._name = deepcopy(name) @property - def version(self) -> int: + def version(self) -> Optional[int]: return self._version @version.setter @@ -67,7 +67,7 @@ def version(self, version: int) -> None: self._version = deepcopy(version) @property - def description(self) -> str: + def description(self) -> Optional[str]: return self._description @description.setter @@ -110,7 +110,7 @@ def restartable(self, restartable: bool) -> Self: self._restartable = deepcopy(restartable) return self - def enable_status_listener(self, sink_name: bool) -> None: + def enable_status_listener(self, sink_name: str) -> None: self._workflow_status_listener_sink = sink_name self._workflow_status_listener_enabled = True @@ -304,7 +304,7 @@ def to_workflow_task(self): return sub_workflow_task.to_workflow_task() def __get_workflow_task_list(self) -> List[WorkflowTask]: - workflow_task_list = [] + workflow_task_list: List[WorkflowTask] = [] for task in self._tasks: converted_task = task.to_workflow_task() if isinstance(converted_task, list): diff --git a/src/conductor/client/workflow/executor/workflow_executor.py b/src/conductor/client/workflow/executor/workflow_executor.py index 8f968147..68db940d 100644 --- a/src/conductor/client/workflow/executor/workflow_executor.py +++ b/src/conductor/client/workflow/executor/workflow_executor.py @@ -2,7 +2,6 @@ import uuid from typing import Any, Dict, List, Optional -from typing_extensions import Self from conductor.client.configuration.configuration import Configuration from conductor.client.http.api.metadata_resource_api import MetadataResourceApi @@ -25,7 +24,7 @@ class WorkflowExecutor: - def __init__(self, configuration: Configuration) -> Self: + def __init__(self, configuration: Configuration) -> None: api_client = ApiClient(configuration) self.metadata_client = MetadataResourceApi(api_client) self.task_client = TaskResourceApi(api_client) @@ -172,7 +171,9 @@ def search( skip_cache: Optional[bool] = None, ) -> ScrollableSearchResultWorkflowSummary: """Search for workflows based on payload and other parameters""" - return self.workflow_client.search(start=start, size=size, free_text=free_text, query=query) + return self.workflow_client.search( + start=start or 0, size=size or 100, free_text=free_text or "*", query=query + ) def get_by_correlation_ids( self, @@ -185,8 +186,8 @@ def get_by_correlation_ids( return self.workflow_client.get_by_correlation_ids( correlation_ids=correlation_ids, workflow_name=workflow_name, - include_tasks=include_tasks, - include_completed=include_closed, + include_tasks=include_tasks or False, + include_completed=include_closed or False, ) def get_by_correlation_ids_and_names( @@ -202,8 +203,8 @@ def get_by_correlation_ids_and_names( """ return self.workflow_client.get_by_correlation_ids_in_batch( batch_request=batch_request, - include_completed=include_closed, - include_tasks=include_tasks, + include_completed=include_closed or False, + include_tasks=include_tasks or False, ) def pause(self, workflow_id: str) -> None: @@ -224,19 +225,19 @@ def terminate( return self.workflow_client.terminate_workflow( workflow_id=workflow_id, reason=reason, - trigger_failure_workflow=trigger_failure_workflow, + trigger_failure_workflow=trigger_failure_workflow or False, ) def restart(self, workflow_id: str, use_latest_definitions: Optional[bool] = None) -> None: """Restarts a completed workflow""" return self.workflow_client.restart_workflow( - workflow_id=workflow_id, use_latest_def=use_latest_definitions + workflow_id=workflow_id, use_latest_def=use_latest_definitions or False ) def retry(self, workflow_id: str, resume_subworkflow_tasks: Optional[bool] = None) -> None: """Retries the last failed task""" return self.workflow_client.retry_workflow( - workflow_id=workflow_id, resume_subworkflow_tasks=resume_subworkflow_tasks + workflow_id=workflow_id, resume_subworkflow_tasks=resume_subworkflow_tasks or False ) def rerun(self, rerun_workflow_request: RerunWorkflowRequest, workflow_id: str) -> str: @@ -247,7 +248,10 @@ def rerun(self, rerun_workflow_request: RerunWorkflowRequest, workflow_id: str) ) def skip_task_from_workflow( - self, workflow_id: str, task_reference_name: str, skip_task_request: SkipTaskRequest = None + self, + workflow_id: str, + task_reference_name: str, + skip_task_request: Optional[SkipTaskRequest] = None, ) -> None: """Skips a given task from a current running workflow""" return self.workflow_client.skip_task_from_workflow( diff --git a/src/conductor/client/workflow/task/do_while_task.py b/src/conductor/client/workflow/task/do_while_task.py index 2e9011a8..7f6437ba 100644 --- a/src/conductor/client/workflow/task/do_while_task.py +++ b/src/conductor/client/workflow/task/do_while_task.py @@ -3,8 +3,6 @@ from typing import List, Optional -from typing_extensions import Self - from conductor.client.http.models.workflow_task import WorkflowTask from conductor.client.workflow.task.task import ( TaskInterface, @@ -21,7 +19,7 @@ class DoWhileTask(TaskInterface): # termination_condition is a Javascript expression that evaluates to True or False def __init__( self, task_ref_name: str, termination_condition: str, tasks: List[TaskInterface] - ) -> Self: + ) -> None: super().__init__( task_reference_name=task_ref_name, task_type=TaskType.DO_WHILE, @@ -42,7 +40,7 @@ def to_workflow_task(self) -> WorkflowTask: class LoopTask(DoWhileTask): - def __init__(self, task_ref_name: str, iterations: int, tasks: List[TaskInterface]) -> Self: + def __init__(self, task_ref_name: str, iterations: int, tasks: List[TaskInterface]) -> None: super().__init__( task_ref_name=task_ref_name, termination_condition=get_for_loop_condition( @@ -60,7 +58,7 @@ def __init__( tasks: List[TaskInterface], iterate_over: str, variables: Optional[List[str]] = None, - ) -> Self: + ) -> None: super().__init__( task_ref_name=task_ref_name, termination_condition=get_for_loop_condition( diff --git a/src/conductor/client/workflow/task/dynamic_fork_task.py b/src/conductor/client/workflow/task/dynamic_fork_task.py index c4ee4d23..6867ca8d 100644 --- a/src/conductor/client/workflow/task/dynamic_fork_task.py +++ b/src/conductor/client/workflow/task/dynamic_fork_task.py @@ -1,6 +1,7 @@ -from copy import deepcopy +from __future__ import annotations -from typing_extensions import Self +from copy import deepcopy +from typing import List, Optional from conductor.client.http.models.workflow_task import WorkflowTask from conductor.client.workflow.task.join_task import JoinTask @@ -14,14 +15,14 @@ def __init__( task_ref_name: str, tasks_param: str = "dynamicTasks", tasks_input_param_name: str = "dynamicTasksInputs", - join_task: JoinTask = None, - ) -> Self: + join_task: Optional[JoinTask] = None, + ) -> None: super().__init__(task_reference_name=task_ref_name, task_type=TaskType.FORK_JOIN_DYNAMIC) self.tasks_param = tasks_param self.tasks_input_param_name = tasks_input_param_name self._join_task = deepcopy(join_task) - def to_workflow_task(self) -> WorkflowTask: + def to_workflow_task(self) -> List[WorkflowTask]: # type: ignore[override] wf_task = super().to_workflow_task() wf_task.dynamic_fork_join_tasks_param = self.tasks_param wf_task.dynamic_fork_tasks_input_param_name = self.tasks_input_param_name diff --git a/src/conductor/client/workflow/task/dynamic_task.py b/src/conductor/client/workflow/task/dynamic_task.py index 374f6202..d005b435 100644 --- a/src/conductor/client/workflow/task/dynamic_task.py +++ b/src/conductor/client/workflow/task/dynamic_task.py @@ -1,5 +1,3 @@ -from typing_extensions import Self - from conductor.client.http.models import WorkflowTask from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType @@ -8,7 +6,7 @@ class DynamicTask(TaskInterface): def __init__( self, dynamic_task: str, task_reference_name: str, dynamic_task_param: str = "taskToExecute" - ) -> Self: + ) -> None: super().__init__( task_reference_name=task_reference_name, task_type=TaskType.DYNAMIC, diff --git a/src/conductor/client/workflow/task/event_task.py b/src/conductor/client/workflow/task/event_task.py index a29cb8ee..ce13eec5 100644 --- a/src/conductor/client/workflow/task/event_task.py +++ b/src/conductor/client/workflow/task/event_task.py @@ -1,14 +1,12 @@ from copy import deepcopy -from typing_extensions import Self - from conductor.client.http.models.workflow_task import WorkflowTask from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType class EventTaskInterface(TaskInterface): - def __init__(self, task_ref_name: str, event_prefix: str, event_suffix: str) -> Self: + def __init__(self, task_ref_name: str, event_prefix: str, event_suffix: str) -> None: super().__init__(task_reference_name=task_ref_name, task_type=TaskType.EVENT) self._sink = deepcopy(event_prefix) + ":" + deepcopy(event_suffix) @@ -19,10 +17,10 @@ def to_workflow_task(self) -> WorkflowTask: class SqsEventTask(EventTaskInterface): - def __init__(self, task_ref_name: str, queue_name: str) -> Self: + def __init__(self, task_ref_name: str, queue_name: str) -> None: super().__init__(task_ref_name, "sqs", queue_name) class ConductorEventTask(EventTaskInterface): - def __init__(self, task_ref_name: str, event_name: str) -> Self: + def __init__(self, task_ref_name: str, event_name: str) -> None: super().__init__(task_ref_name, "conductor", event_name) diff --git a/src/conductor/client/workflow/task/fork_task.py b/src/conductor/client/workflow/task/fork_task.py index 50d3ad3a..ffaaa6dc 100644 --- a/src/conductor/client/workflow/task/fork_task.py +++ b/src/conductor/client/workflow/task/fork_task.py @@ -1,8 +1,6 @@ from __future__ import annotations from copy import deepcopy -from typing import List, Optional - -from typing_extensions import Self +from typing import List, Optional, Union from conductor.client.http.models.workflow_task import WorkflowTask from conductor.client.workflow.task.join_task import JoinTask @@ -20,12 +18,12 @@ def __init__( task_ref_name: str, forked_tasks: List[List[TaskInterface]], join_on: Optional[List[str]] = None, - ) -> Self: + ) -> None: super().__init__(task_reference_name=task_ref_name, task_type=TaskType.FORK_JOIN) self._forked_tasks = deepcopy(forked_tasks) self._join_on = join_on - def to_workflow_task(self) -> [WorkflowTask]: + def to_workflow_task(self) -> Union[WorkflowTask, List[WorkflowTask]]: # type: ignore[override] tasks = [] workflow_task = super().to_workflow_task() workflow_task.fork_tasks = [] diff --git a/src/conductor/client/workflow/task/get_document.py b/src/conductor/client/workflow/task/get_document.py index 696d3ab7..20bb4cde 100644 --- a/src/conductor/client/workflow/task/get_document.py +++ b/src/conductor/client/workflow/task/get_document.py @@ -1,11 +1,9 @@ -from typing_extensions import Self - from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType class GetDocument(TaskInterface): - def __init__(self, task_name: str, task_ref_name: str, url: str, media_type: str) -> Self: + def __init__(self, task_name: str, task_ref_name: str, url: str, media_type: str) -> None: super().__init__( task_name=task_name, task_reference_name=task_ref_name, diff --git a/src/conductor/client/workflow/task/http_poll_task.py b/src/conductor/client/workflow/task/http_poll_task.py index 6dd4d950..64c63a3c 100644 --- a/src/conductor/client/workflow/task/http_poll_task.py +++ b/src/conductor/client/workflow/task/http_poll_task.py @@ -3,8 +3,6 @@ from typing import Any, ClassVar, Dict, List, Optional -from typing_extensions import Self - from conductor.client.workflow.task.http_task import HttpMethod from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType @@ -23,7 +21,7 @@ class HttpPollInput: "_termination_condition": "str", "_polling_interval": "int", "_max_poll_count": "int", - "_polling_strategy": str, + "_polling_strategy": "str", } attribute_map: ClassVar[Dict[str, str]] = { @@ -55,7 +53,7 @@ def __init__( connection_time_out: Optional[int] = None, read_timeout: Optional[int] = None, body: Any = None, - ) -> Self: + ) -> None: self._method = deepcopy(method) self._uri = deepcopy(uri) self._headers = deepcopy(headers) @@ -71,7 +69,7 @@ def __init__( class HttpPollTask(TaskInterface): - def __init__(self, task_ref_name: str, http_input: HttpPollInput) -> Self: + def __init__(self, task_ref_name: str, http_input: HttpPollInput) -> None: super().__init__( task_reference_name=task_ref_name, task_type=TaskType.HTTP_POLL, diff --git a/src/conductor/client/workflow/task/http_task.py b/src/conductor/client/workflow/task/http_task.py index 957da85b..c253f26a 100644 --- a/src/conductor/client/workflow/task/http_task.py +++ b/src/conductor/client/workflow/task/http_task.py @@ -3,8 +3,6 @@ from enum import Enum from typing import Any, ClassVar, Dict, List, Optional, Union -from typing_extensions import Self - from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType @@ -51,7 +49,7 @@ def __init__( connection_time_out: Optional[int] = None, read_timeout: Optional[int] = None, body: Any = None, - ) -> Self: + ) -> None: self._method = deepcopy(method) self._uri = deepcopy(uri) self._headers = deepcopy(headers) @@ -63,7 +61,7 @@ def __init__( class HttpTask(TaskInterface): - def __init__(self, task_ref_name: str, http_input: Union[HttpInput, dict]) -> Self: + def __init__(self, task_ref_name: str, http_input: Union[HttpInput, dict]) -> None: if type(http_input) is dict and "method" not in http_input: http_input["method"] = "GET" super().__init__( @@ -72,7 +70,7 @@ def __init__(self, task_ref_name: str, http_input: Union[HttpInput, dict]) -> Se input_parameters={"http_request": http_input}, ) - def status_code(self) -> int: + def status_code(self) -> str: return "${" + f"{self.task_reference_name}.output.response.statusCode" + "}" def headers(self, json_path: Optional[str] = None) -> str: diff --git a/src/conductor/client/workflow/task/human_task.py b/src/conductor/client/workflow/task/human_task.py index 212b0472..8f6836a8 100644 --- a/src/conductor/client/workflow/task/human_task.py +++ b/src/conductor/client/workflow/task/human_task.py @@ -1,7 +1,6 @@ from __future__ import annotations from enum import Enum from typing import Optional -from typing_extensions import Self from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType @@ -35,7 +34,7 @@ def __init__( form_template: Optional[str] = None, form_version: int = 0, assignment_completion_strategy: AssignmentCompletionStrategy = AssignmentCompletionStrategy.LEAVE_OPEN, - ) -> Self: + ) -> None: super().__init__(task_reference_name=task_ref_name, task_type=TaskType.HUMAN) self.input_parameters.update( { diff --git a/src/conductor/client/workflow/task/inline.py b/src/conductor/client/workflow/task/inline.py index 55a66e1e..a2d31569 100644 --- a/src/conductor/client/workflow/task/inline.py +++ b/src/conductor/client/workflow/task/inline.py @@ -1,6 +1,5 @@ from __future__ import annotations from typing import Dict, Optional -from typing_extensions import Self from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType @@ -9,7 +8,7 @@ class InlineTask(TaskInterface): def __init__( self, task_ref_name: str, script: str, bindings: Optional[Dict[str, str]] = None - ) -> Self: + ) -> None: super().__init__( task_reference_name=task_ref_name, task_type=TaskType.INLINE, diff --git a/src/conductor/client/workflow/task/javascript_task.py b/src/conductor/client/workflow/task/javascript_task.py index c71e7c86..fa7eee68 100644 --- a/src/conductor/client/workflow/task/javascript_task.py +++ b/src/conductor/client/workflow/task/javascript_task.py @@ -1,6 +1,5 @@ from __future__ import annotations from typing import Dict, Optional -from typing_extensions import Self from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType @@ -9,7 +8,7 @@ class JavascriptTask(TaskInterface): def __init__( self, task_ref_name: str, script: str, bindings: Optional[Dict[str, str]] = None - ) -> Self: + ) -> None: super().__init__( task_reference_name=task_ref_name, task_type=TaskType.INLINE, @@ -27,6 +26,6 @@ def output(self, json_path: Optional[str] = None) -> str: else: return "${" + f"{self.task_reference_name}.output.result.{json_path}" + "}" - def evaluator_type(self, evaluator_type: str) -> Self: + @TaskInterface.evaluator_type.setter # type: ignore[attr-defined] + def evaluator_type(self, evaluator_type: str) -> None: # type: ignore[override] self.input_parameters["evaluatorType"] = evaluator_type - return self diff --git a/src/conductor/client/workflow/task/join_task.py b/src/conductor/client/workflow/task/join_task.py index b17a2024..27702f26 100644 --- a/src/conductor/client/workflow/task/join_task.py +++ b/src/conductor/client/workflow/task/join_task.py @@ -2,8 +2,6 @@ from copy import deepcopy from typing import List, Optional -from typing_extensions import Self - from conductor.client.http.models.workflow_task import WorkflowTask from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType @@ -15,7 +13,7 @@ def __init__( task_ref_name: str, join_on: Optional[List[str]] = None, join_on_script: Optional[str] = None, - ) -> Self: + ) -> None: super().__init__(task_reference_name=task_ref_name, task_type=TaskType.JOIN) self._join_on = deepcopy(join_on) if join_on_script is not None: diff --git a/src/conductor/client/workflow/task/json_jq_task.py b/src/conductor/client/workflow/task/json_jq_task.py index e47b11f0..23f2da54 100644 --- a/src/conductor/client/workflow/task/json_jq_task.py +++ b/src/conductor/client/workflow/task/json_jq_task.py @@ -1,11 +1,9 @@ -from typing_extensions import Self - from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType class JsonJQTask(TaskInterface): - def __init__(self, task_ref_name: str, script: str) -> Self: + def __init__(self, task_ref_name: str, script: str) -> None: super().__init__( task_reference_name=task_ref_name, task_type=TaskType.JSON_JQ_TRANSFORM, diff --git a/src/conductor/client/workflow/task/kafka_publish.py b/src/conductor/client/workflow/task/kafka_publish.py index dde7f2dd..910f97a7 100644 --- a/src/conductor/client/workflow/task/kafka_publish.py +++ b/src/conductor/client/workflow/task/kafka_publish.py @@ -1,12 +1,14 @@ -from typing_extensions import Self - +from __future__ import annotations +from typing import Optional from conductor.client.workflow.task.kafka_publish_input import KafkaPublishInput from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType class KafkaPublishTask(TaskInterface): - def __init__(self, task_ref_name: str, kafka_publish_input: KafkaPublishInput = None) -> Self: + def __init__( + self, task_ref_name: str, kafka_publish_input: Optional[KafkaPublishInput] = None + ) -> None: super().__init__( task_reference_name=task_ref_name, task_type=TaskType.KAFKA_PUBLISH, diff --git a/src/conductor/client/workflow/task/llm_tasks/llm_chat_complete.py b/src/conductor/client/workflow/task/llm_tasks/llm_chat_complete.py index 9751a851..a8d05a22 100644 --- a/src/conductor/client/workflow/task/llm_tasks/llm_chat_complete.py +++ b/src/conductor/client/workflow/task/llm_tasks/llm_chat_complete.py @@ -1,5 +1,5 @@ from __future__ import annotations -from typing import Optional, List, Dict +from typing import Optional, List, Dict, Any from typing_extensions import Self @@ -26,11 +26,11 @@ def __init__( top_p: int = 1, instructions_template: Optional[str] = None, template_variables: Optional[Dict[str, object]] = None, - ) -> Self: + ) -> None: template_variables = template_variables or {} stop_words = stop_words or [] - optional_input_params = {} + optional_input_params: Dict[str, Any] = {} if stop_words: optional_input_params.update({"stopWords": stop_words}) @@ -38,7 +38,7 @@ def __init__( if max_tokens: optional_input_params.update({"maxTokens": max_tokens}) - input_params = { + input_params: Dict[str, Any] = { "llmProvider": llm_provider, "model": model, "promptVariables": template_variables, diff --git a/src/conductor/client/workflow/task/llm_tasks/llm_generate_embeddings.py b/src/conductor/client/workflow/task/llm_tasks/llm_generate_embeddings.py index 789bdec9..83fc54cf 100644 --- a/src/conductor/client/workflow/task/llm_tasks/llm_generate_embeddings.py +++ b/src/conductor/client/workflow/task/llm_tasks/llm_generate_embeddings.py @@ -1,6 +1,5 @@ from __future__ import annotations from typing import Optional -from typing_extensions import Self from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType @@ -14,7 +13,7 @@ def __init__( model: str, text: str, task_name: Optional[str] = None, - ) -> Self: + ) -> None: if task_name is None: task_name = "llm_generate_embeddings" super().__init__( diff --git a/src/conductor/client/workflow/task/llm_tasks/llm_index_documents.py b/src/conductor/client/workflow/task/llm_tasks/llm_index_documents.py index cfcea306..990bf0e3 100644 --- a/src/conductor/client/workflow/task/llm_tasks/llm_index_documents.py +++ b/src/conductor/client/workflow/task/llm_tasks/llm_index_documents.py @@ -1,8 +1,6 @@ from __future__ import annotations -from typing import Optional - -from typing_extensions import Self +from typing import Optional, Dict, Any from conductor.client.workflow.task.llm_tasks.utils.embedding_model import EmbeddingModel from conductor.client.workflow.task.task import TaskInterface @@ -41,7 +39,7 @@ def __init__( doc_id: Optional[str] = None, task_name: Optional[str] = None, metadata: Optional[dict] = None, - ) -> Self: + ) -> None: metadata = metadata or {} input_params = { "vectorDB": vector_db, @@ -54,7 +52,7 @@ def __init__( "metadata": metadata, } - optional_input_params = {} + optional_input_params: Dict[str, Any] = {} if chunk_size is not None: optional_input_params.update({"chunkSize": chunk_size}) @@ -65,7 +63,7 @@ def __init__( if doc_id is not None: optional_input_params.update({"docId": doc_id}) - input_params.update(optional_input_params) + input_params.update(optional_input_params) # type: ignore[arg-type] if task_name is None: task_name = "llm_index_document" diff --git a/src/conductor/client/workflow/task/llm_tasks/llm_index_text.py b/src/conductor/client/workflow/task/llm_tasks/llm_index_text.py index b1784869..df5a9f9e 100644 --- a/src/conductor/client/workflow/task/llm_tasks/llm_index_text.py +++ b/src/conductor/client/workflow/task/llm_tasks/llm_index_text.py @@ -1,6 +1,5 @@ from __future__ import annotations from typing import Optional -from typing_extensions import Self from conductor.client.workflow.task.llm_tasks.utils.embedding_model import EmbeddingModel from conductor.client.workflow.task.task import TaskInterface @@ -32,7 +31,7 @@ def __init__( namespace: Optional[str] = None, task_name: Optional[str] = None, metadata: Optional[dict] = None, - ) -> Self: + ) -> None: metadata = metadata or {} if task_name is None: task_name = "llm_index_doc" diff --git a/src/conductor/client/workflow/task/llm_tasks/llm_query_embeddings.py b/src/conductor/client/workflow/task/llm_tasks/llm_query_embeddings.py index 14e685ec..8e97e679 100644 --- a/src/conductor/client/workflow/task/llm_tasks/llm_query_embeddings.py +++ b/src/conductor/client/workflow/task/llm_tasks/llm_query_embeddings.py @@ -1,8 +1,6 @@ from __future__ import annotations from typing import List, Optional -from typing_extensions import Self - from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType @@ -16,7 +14,7 @@ def __init__( embeddings: List[int], task_name: Optional[str] = None, namespace: Optional[str] = None, - ) -> Self: + ) -> None: if task_name is None: task_name = "llm_get_embeddings" diff --git a/src/conductor/client/workflow/task/llm_tasks/llm_search_index.py b/src/conductor/client/workflow/task/llm_tasks/llm_search_index.py index 4511d6e3..c5291654 100644 --- a/src/conductor/client/workflow/task/llm_tasks/llm_search_index.py +++ b/src/conductor/client/workflow/task/llm_tasks/llm_search_index.py @@ -1,6 +1,5 @@ from __future__ import annotations from typing import Optional -from typing_extensions import Self from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType @@ -18,7 +17,7 @@ def __init__( query: str, task_name: Optional[str] = None, max_results: int = 1, - ) -> Self: + ) -> None: if task_name is None: task_name = "llm_search_index" diff --git a/src/conductor/client/workflow/task/llm_tasks/llm_text_complete.py b/src/conductor/client/workflow/task/llm_tasks/llm_text_complete.py index f944403f..3ab102b5 100644 --- a/src/conductor/client/workflow/task/llm_tasks/llm_text_complete.py +++ b/src/conductor/client/workflow/task/llm_tasks/llm_text_complete.py @@ -1,7 +1,6 @@ from __future__ import annotations -from typing import Optional, List, Dict - +from typing import Optional, List, Dict, Any from typing_extensions import Self from conductor.client.workflow.task.task import TaskInterface @@ -20,9 +19,9 @@ def __init__( temperature: int = 0, top_p: int = 1, task_name: Optional[str] = None, - ) -> Self: + ) -> None: stop_words = stop_words or [] - optional_input_params = {} + optional_input_params: Dict[str, Any] = {} if stop_words: optional_input_params.update({"stopWords": stop_words}) @@ -33,7 +32,7 @@ def __init__( if not task_name: task_name = "llm_text_complete" - input_params = { + input_params: Dict[str, Any] = { "llmProvider": llm_provider, "model": model, "promptName": prompt_name, diff --git a/src/conductor/client/workflow/task/set_variable_task.py b/src/conductor/client/workflow/task/set_variable_task.py index 89e9046d..48db36f6 100644 --- a/src/conductor/client/workflow/task/set_variable_task.py +++ b/src/conductor/client/workflow/task/set_variable_task.py @@ -1,9 +1,7 @@ -from typing_extensions import Self - from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType class SetVariableTask(TaskInterface): - def __init__(self, task_ref_name: str) -> Self: + def __init__(self, task_ref_name: str) -> None: super().__init__(task_reference_name=task_ref_name, task_type=TaskType.SET_VARIABLE) diff --git a/src/conductor/client/workflow/task/simple_task.py b/src/conductor/client/workflow/task/simple_task.py index f745de15..68df51fa 100644 --- a/src/conductor/client/workflow/task/simple_task.py +++ b/src/conductor/client/workflow/task/simple_task.py @@ -1,13 +1,11 @@ from typing import Dict -from typing_extensions import Self - from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType class SimpleTask(TaskInterface): - def __init__(self, task_def_name: str, task_reference_name: str) -> Self: + def __init__(self, task_def_name: str, task_reference_name: str) -> None: super().__init__( task_reference_name=task_reference_name, task_type=TaskType.SIMPLE, diff --git a/src/conductor/client/workflow/task/start_workflow_task.py b/src/conductor/client/workflow/task/start_workflow_task.py index 96d7115b..88809aca 100644 --- a/src/conductor/client/workflow/task/start_workflow_task.py +++ b/src/conductor/client/workflow/task/start_workflow_task.py @@ -1,6 +1,5 @@ from __future__ import annotations from typing import Optional -from typing_extensions import Self from conductor.client.http.models.start_workflow_request import StartWorkflowRequest from conductor.client.workflow.task.task import TaskInterface @@ -14,7 +13,7 @@ def __init__( workflow_name: str, start_workflow_request: StartWorkflowRequest, version: Optional[int] = None, - ) -> Self: + ) -> None: super().__init__( task_reference_name=task_ref_name, task_type=TaskType.START_WORKFLOW, diff --git a/src/conductor/client/workflow/task/switch_task.py b/src/conductor/client/workflow/task/switch_task.py index 0b3816e6..9f2a114f 100644 --- a/src/conductor/client/workflow/task/switch_task.py +++ b/src/conductor/client/workflow/task/switch_task.py @@ -1,6 +1,8 @@ +from __future__ import annotations + from copy import deepcopy from enum import Enum -from typing import List +from typing import List, Dict, Optional from typing_extensions import Self @@ -21,14 +23,14 @@ class EvaluatorType(str, Enum): class SwitchTask(TaskInterface): def __init__( self, task_ref_name: str, case_expression: str, use_javascript: bool = False - ) -> Self: + ) -> None: super().__init__( task_reference_name=task_ref_name, task_type=TaskType.SWITCH, ) - self._default_case = None - self._decision_cases = {} - self._expression = deepcopy(case_expression) + self._default_case: Optional[TaskInterface] = None + self._decision_cases: Dict[str, List[TaskInterface]] = {} + self._expression = deepcopy(case_expression) # type: ignore[assignment] self._use_javascript = deepcopy(use_javascript) def switch_case(self, case_name: str, tasks: List[TaskInterface]) -> Self: @@ -40,7 +42,7 @@ def switch_case(self, case_name: str, tasks: List[TaskInterface]) -> Self: def default_case(self, tasks: List[TaskInterface]) -> Self: if isinstance(tasks, List): - self._default_case = deepcopy(tasks) + self._default_case = deepcopy(tasks) # type: ignore[assignment] else: self._default_case = [deepcopy(tasks)] return self @@ -60,6 +62,6 @@ def to_workflow_task(self) -> WorkflowTask: *tasks, ) if self._default_case is None: - self._default_case = [] - workflow.default_case = get_task_interface_list_as_workflow_task_list(*self._default_case) + self._default_case = [] # type: ignore[assignment] + workflow.default_case = get_task_interface_list_as_workflow_task_list(*self._default_case) # type: ignore[misc] return workflow diff --git a/src/conductor/client/workflow/task/task.py b/src/conductor/client/workflow/task/task.py index 1bd88038..925f8d0a 100644 --- a/src/conductor/client/workflow/task/task.py +++ b/src/conductor/client/workflow/task/task.py @@ -10,8 +10,8 @@ from conductor.client.workflow.task.task_type import TaskType -def get_task_interface_list_as_workflow_task_list(*tasks: Self) -> List[WorkflowTask]: - converted_tasks = [] +def get_task_interface_list_as_workflow_task_list(*tasks: TaskInterface) -> List[WorkflowTask]: + converted_tasks: List[WorkflowTask] = [] for task in tasks: wf_task = task.to_workflow_task() if isinstance(wf_task, list): @@ -33,17 +33,17 @@ def __init__( input_parameters: Optional[Dict[str, Any]] = None, cache_key: Optional[str] = None, cache_ttl_second: int = 0, - ) -> Self: - self.task_reference_name = task_reference_name - self.task_type = task_type - self.name = task_name or task_reference_name - self.description = description - self.optional = optional - self.input_parameters = input_parameters - self._cache_key = cache_key - self._cache_ttl_second = cache_ttl_second - self._expression = None - self._evaluator_type = None + ) -> None: + self.task_reference_name: str = task_reference_name + self.task_type: TaskType = task_type + self.name: str = task_name or task_reference_name + self.description: Optional[str] = description + self.optional: Optional[bool] = optional + self._input_parameters: Dict[str, Any] = input_parameters or {} + self._cache_key: Optional[str] = cache_key + self._cache_ttl_second: int = cache_ttl_second + self._expression: Optional[str] = None + self._evaluator_type: Optional[str] = None @property def task_reference_name(self) -> str: @@ -76,7 +76,7 @@ def name(self, name: str) -> None: self._name = name @property - def expression(self) -> str: + def expression(self) -> Optional[str]: return self._expression @expression.setter @@ -84,7 +84,7 @@ def expression(self, expression: str) -> None: self._expression = expression @property - def evaluator_type(self) -> str: + def evaluator_type(self) -> Optional[str]: return self._evaluator_type @evaluator_type.setter @@ -96,7 +96,7 @@ def cache(self, cache_key: str, cache_ttl_second: int): self._cache_ttl_second = cache_ttl_second @property - def description(self) -> str: + def description(self) -> Optional[str]: return self._description @description.setter @@ -106,7 +106,7 @@ def description(self, description: str) -> None: self._description = deepcopy(description) @property - def optional(self) -> bool: + def optional(self) -> Optional[bool]: return self._optional @optional.setter diff --git a/src/conductor/client/workflow/task/terminate_task.py b/src/conductor/client/workflow/task/terminate_task.py index 745ef7f5..c1682ac6 100644 --- a/src/conductor/client/workflow/task/terminate_task.py +++ b/src/conductor/client/workflow/task/terminate_task.py @@ -1,7 +1,5 @@ from enum import Enum -from typing_extensions import Self - from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType @@ -16,7 +14,7 @@ class WorkflowStatus(str, Enum): class TerminateTask(TaskInterface): - def __init__(self, task_ref_name: str, status: WorkflowStatus, termination_reason: str) -> Self: + def __init__(self, task_ref_name: str, status: WorkflowStatus, termination_reason: str) -> None: super().__init__( task_reference_name=task_ref_name, task_type=TaskType.TERMINATE, diff --git a/src/conductor/client/workflow/task/wait_for_webhook_task.py b/src/conductor/client/workflow/task/wait_for_webhook_task.py index 7ca5b39e..57f63005 100644 --- a/src/conductor/client/workflow/task/wait_for_webhook_task.py +++ b/src/conductor/client/workflow/task/wait_for_webhook_task.py @@ -1,14 +1,13 @@ from __future__ import annotations from abc import ABC from typing import Dict, Optional -from typing_extensions import Self from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType class WaitForWebHookTask(TaskInterface, ABC): - def __init__(self, task_ref_name: str, matches: Dict[str, object]) -> Self: + def __init__(self, task_ref_name: str, matches: Dict[str, object]) -> None: """ matches: dictionary of matching payload that acts as correction between the incoming webhook payload and a running workflow task - amongst all the running workflows. diff --git a/src/conductor/client/workflow/task/wait_task.py b/src/conductor/client/workflow/task/wait_task.py index 63abe58d..62b3f669 100644 --- a/src/conductor/client/workflow/task/wait_task.py +++ b/src/conductor/client/workflow/task/wait_task.py @@ -1,7 +1,6 @@ from __future__ import annotations from abc import ABC from typing import Optional -from typing_extensions import Self from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType @@ -13,7 +12,7 @@ def __init__( task_ref_name: str, wait_until: Optional[str] = None, wait_for_seconds: Optional[int] = None, - ) -> Self: + ) -> None: """ wait_until: Specific date/time to wait for e.g. 2023-12-25 05:25 PST wait_for_seconds: time to block for - e.g. specifying 60 will wait for 60 seconds @@ -30,12 +29,12 @@ def __init__( class WaitForDurationTask(WaitTask): - def __init__(self, task_ref_name: str, duration_time_seconds: int) -> Self: + def __init__(self, task_ref_name: str, duration_time_seconds: int) -> None: super().__init__(task_ref_name) self.input_parameters = {"duration": str(duration_time_seconds) + "s"} class WaitUntilTask(WaitTask): - def __init__(self, task_ref_name: str, date_time: str) -> Self: + def __init__(self, task_ref_name: str, date_time: str) -> None: super().__init__(task_ref_name) self.input_parameters = {"until": date_time} diff --git a/src/conductor/shared/automator/utils.py b/src/conductor/shared/automator/utils.py index d67a0743..a3913726 100644 --- a/src/conductor/shared/automator/utils.py +++ b/src/conductor/shared/automator/utils.py @@ -5,7 +5,7 @@ import inspect import logging import typing -from typing import List, cast +from typing import Any, List, cast from dacite import from_dict from requests.structures import CaseInsensitiveDict @@ -51,7 +51,7 @@ def convert_from_dict(cls: type, data: dict) -> object: ): data = {} - members = inspect.signature(cls.__init__).parameters + members = inspect.signature(cls.__init__).parameters # type: ignore[misc] kwargs = {} for member in members: @@ -84,7 +84,7 @@ def convert_from_dict(cls: type, data: dict) -> object: or typ is dict or str(typ).startswith("OrderedDict[") ): - values = {} + values = {} # type: ignore[assignment] generic_type = object if len(generic_types) > 1: generic_type = generic_types[1] @@ -107,7 +107,9 @@ def convert_from_dict(cls: type, data: dict) -> object: return cls(**kwargs) -def get_value(typ: type, val: object) -> object: +def get_value(typ: type, val: Any) -> Any: + values: Any = None + if typ in simple_types: return val elif ( @@ -126,7 +128,7 @@ def get_value(typ: type, val: object) -> object: values = {} for k in val: v = val[k] - values[k] = get_value(object, v) + values[k] = get_value(object, v) # type: ignore[call-overload] return values else: return convert_from_dict(typ, val) diff --git a/src/conductor/shared/event/configuration/queue.py b/src/conductor/shared/event/configuration/queue.py index 78d17f6e..0ef9b794 100644 --- a/src/conductor/shared/event/configuration/queue.py +++ b/src/conductor/shared/event/configuration/queue.py @@ -1,5 +1,5 @@ from abc import ABC, abstractmethod -from typing import ClassVar, Dict +from typing import Any, ClassVar, Dict from conductor.shared.event.configuration.queue_worker import QueueWorkerConfiguration @@ -20,5 +20,5 @@ def add_producer(self, worker_configuration: QueueWorkerConfiguration) -> None: self.worker_configuration[self.WORKER_PRODUCER_KEY] = worker_configuration @abstractmethod - def get_worker_configuration(self) -> str: + def get_worker_configuration(self) -> Dict[str, Any]: raise NotImplementedError From 005c31a5cf13871a69e10f477684313829f23c37 Mon Sep 17 00:00:00 2001 From: IgorChvyrov-sm Date: Thu, 23 Oct 2025 13:10:58 +0300 Subject: [PATCH 06/17] Imports sorting --- setup.py | 3 +- .../adapters/api/application_resource_api.py | 14 +++++----- .../adapters/api/group_resource_api.py | 5 ++-- .../adapters/api/integration_resource_api.py | 11 ++++---- .../adapters/api/metadata_resource_api.py | 11 ++++---- .../adapters/api/prompt_resource_api.py | 7 +++-- .../adapters/api/scheduler_resource_api.py | 16 ++++++----- .../adapters/api/schema_resource_api.py | 8 ++++-- .../adapters/api/secret_resource_api.py | 8 ++++-- .../asyncio_client/adapters/api/tags_api.py | 7 +++-- .../adapters/api/task_resource_api.py | 8 +++--- .../adapters/api/user_resource_api.py | 6 ++-- .../adapters/api/workflow_resource_api.py | 28 ++++++++++--------- .../adapters/api_client_adapter.py | 5 ++-- .../adapters/models/action_adapter.py | 1 + .../adapters/models/any_adapter.py | 3 +- .../descriptor_proto_or_builder_adapter.py | 6 ++-- .../adapters/models/schema_def_adapter.py | 2 +- .../models/service_descriptor_adapter.py | 1 + .../adapters/models/task_result_adapter.py | 2 +- .../adapters/models/workflow_adapter.py | 2 +- .../asyncio_client/ai/orchestrator.py | 2 +- .../asyncio_client/event/event_client.py | 2 +- .../orkes/orkes_authorization_client.py | 8 +++--- .../asyncio_client/orkes/orkes_base_client.py | 2 +- .../asyncio_client/orkes/orkes_clients.py | 2 +- .../orkes/orkes_integration_client.py | 7 +++-- .../orkes/orkes_metadata_client.py | 4 +-- .../orkes/orkes_prompt_client.py | 2 +- .../orkes/orkes_scheduler_client.py | 2 +- .../orkes/orkes_schema_client.py | 2 +- .../orkes/orkes_secret_client.py | 2 +- .../asyncio_client/orkes/orkes_task_client.py | 2 +- .../orkes/orkes_workflow_client.py | 2 +- src/conductor/asyncio_client/worker/worker.py | 2 +- .../workflow/executor/workflow_executor.py | 2 +- .../task/llm_tasks/llm_index_documents.py | 2 +- .../task/llm_tasks/llm_text_complete.py | 2 +- .../workflow/task/switch_task.py | 2 +- .../api/application_resource_api_adapter.py | 2 +- .../client/adapters/api_client_adapter.py | 7 ++--- .../adapters/models/bulk_response_adapter.py | 1 + .../client/adapters/models/health.py | 2 +- .../adapters/models/health_check_status.py | 2 +- .../models/integration_def_api_adapter.py | 2 +- .../models/state_change_event_adapter.py | 2 +- src/conductor/client/adapters/rest_adapter.py | 1 + src/conductor/client/ai/orchestrator.py | 10 +++---- src/conductor/client/authorization_client.py | 24 ++++++++-------- src/conductor/client/automator/task_runner.py | 3 +- .../client/configuration/configuration.py | 3 +- .../exceptions/api_exception_handler.py | 2 +- .../client/exceptions/auth_401_policy.py | 1 + src/conductor/client/helpers/helper.py | 4 +-- src/conductor/client/integration_client.py | 1 + src/conductor/client/metadata_client.py | 4 ++- .../client/orkes/models/access_key.py | 3 +- .../orkes/orkes_authorization_client.py | 1 + .../client/orkes/orkes_base_client.py | 2 +- .../client/orkes/orkes_integration_client.py | 9 +++--- .../client/orkes/orkes_metadata_client.py | 3 +- .../client/orkes/orkes_prompt_client.py | 2 +- .../client/orkes/orkes_scheduler_client.py | 3 +- .../orkes/orkes_service_registry_client.py | 9 +++--- .../client/orkes/orkes_task_client.py | 3 +- .../client/orkes/orkes_workflow_client.py | 11 ++++---- src/conductor/client/orkes_clients.py | 8 +++--- src/conductor/client/prompt_client.py | 1 - src/conductor/client/scheduler_client.py | 6 ++-- src/conductor/client/schema_client.py | 1 - src/conductor/client/secret_client.py | 1 + .../client/service_registry_client.py | 9 +++--- src/conductor/client/task_client.py | 7 +++-- .../client/telemetry/metrics_collector.py | 7 ++--- src/conductor/client/worker/worker.py | 12 ++++---- .../client/worker/worker_interface.py | 3 +- src/conductor/client/worker/worker_task.py | 2 ++ .../client/workflow/conductor_workflow.py | 7 +++-- .../workflow/executor/workflow_executor.py | 18 ++++++------ .../client/workflow/task/do_while_task.py | 2 +- .../client/workflow/task/fork_task.py | 1 + .../client/workflow/task/http_poll_task.py | 2 +- .../client/workflow/task/http_task.py | 1 + .../client/workflow/task/human_task.py | 1 + src/conductor/client/workflow/task/inline.py | 1 + .../client/workflow/task/javascript_task.py | 1 + .../client/workflow/task/join_task.py | 1 + .../client/workflow/task/kafka_publish.py | 2 ++ .../workflow/task/kafka_publish_input.py | 3 +- .../task/llm_tasks/llm_chat_complete.py | 3 +- .../task/llm_tasks/llm_generate_embeddings.py | 1 + .../task/llm_tasks/llm_index_documents.py | 2 +- .../workflow/task/llm_tasks/llm_index_text.py | 1 + .../task/llm_tasks/llm_query_embeddings.py | 1 + .../task/llm_tasks/llm_search_index.py | 1 + .../task/llm_tasks/llm_text_complete.py | 3 +- .../workflow/task/start_workflow_task.py | 1 + .../client/workflow/task/sub_workflow_task.py | 1 + .../client/workflow/task/switch_task.py | 2 +- src/conductor/client/workflow/task/task.py | 2 +- .../workflow/task/wait_for_webhook_task.py | 1 + .../client/workflow/task/wait_task.py | 1 + src/conductor/client/workflow_client.py | 13 +++++---- src/conductor/shared/worker/__init__.py | 6 ++-- src/conductor/shared/worker/task_options.py | 1 - 105 files changed, 252 insertions(+), 205 deletions(-) diff --git a/setup.py b/setup.py index 2c914902..70f9efad 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,7 @@ -import setuptools import os +import setuptools + version = os.environ["CONDUCTOR_PYTHON_VERSION"] if version is None: version = "0.0.0-SNAPSHOT" diff --git a/src/conductor/asyncio_client/adapters/api/application_resource_api.py b/src/conductor/asyncio_client/adapters/api/application_resource_api.py index 7568b851..e7b9a56c 100644 --- a/src/conductor/asyncio_client/adapters/api/application_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/application_resource_api.py @@ -1,17 +1,17 @@ from __future__ import annotations -from typing import Any, Annotated, Dict, List, Optional, Tuple, Union +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union -from pydantic import Field, StrictStr, StrictFloat, StrictInt +from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.http.api import ApplicationResourceApi -from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter -from conductor.asyncio_client.adapters.models.extended_conductor_application_adapter import ( - ExtendedConductorApplicationAdapter, -) from conductor.asyncio_client.adapters.models.create_or_update_application_request_adapter import ( CreateOrUpdateApplicationRequestAdapter, ) +from conductor.asyncio_client.adapters.models.extended_conductor_application_adapter import ( + ExtendedConductorApplicationAdapter, +) +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter +from conductor.asyncio_client.http.api import ApplicationResourceApi class ApplicationResourceApiAdapter(ApplicationResourceApi): diff --git a/src/conductor/asyncio_client/adapters/api/group_resource_api.py b/src/conductor/asyncio_client/adapters/api/group_resource_api.py index b3ad7198..d4ef7193 100644 --- a/src/conductor/asyncio_client/adapters/api/group_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/group_resource_api.py @@ -1,13 +1,14 @@ from __future__ import annotations -from typing import List, Optional, Dict, Any, Annotated, Union, Tuple +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union + from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.http.api import GroupResourceApi from conductor.asyncio_client.adapters.models.group_adapter import GroupAdapter from conductor.asyncio_client.adapters.models.upsert_group_request_adapter import ( UpsertGroupRequestAdapter, ) +from conductor.asyncio_client.http.api import GroupResourceApi class GroupResourceApiAdapter(GroupResourceApi): diff --git a/src/conductor/asyncio_client/adapters/api/integration_resource_api.py b/src/conductor/asyncio_client/adapters/api/integration_resource_api.py index a63d8779..59f09776 100644 --- a/src/conductor/asyncio_client/adapters/api/integration_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/integration_resource_api.py @@ -1,15 +1,16 @@ from __future__ import annotations -from typing import List, Dict, Any, Annotated, Union, Tuple, Optional -from pydantic import Field, StrictFloat, StrictInt, StrictStr, StrictBool +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union -from conductor.asyncio_client.http.api import IntegrationResourceApi +from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr + +from conductor.asyncio_client.adapters.models.event_log_adapter import EventLogAdapter from conductor.asyncio_client.adapters.models.integration_adapter import IntegrationAdapter from conductor.asyncio_client.adapters.models.integration_api_adapter import IntegrationApiAdapter from conductor.asyncio_client.adapters.models.integration_def_adapter import IntegrationDefAdapter -from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter -from conductor.asyncio_client.adapters.models.event_log_adapter import EventLogAdapter from conductor.asyncio_client.adapters.models.message_template_adapter import MessageTemplateAdapter +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter +from conductor.asyncio_client.http.api import IntegrationResourceApi class IntegrationResourceApiAdapter(IntegrationResourceApi): diff --git a/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py b/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py index 09161b66..292e242f 100644 --- a/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py @@ -1,14 +1,15 @@ from __future__ import annotations -from typing import List, Optional, Dict, Any, Union, Annotated, Tuple -from pydantic import StrictStr, StrictBool, StrictFloat, StrictInt, Field +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union + +from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.http.api import MetadataResourceApi -from conductor.asyncio_client.adapters.models.task_def_adapter import TaskDefAdapter -from conductor.asyncio_client.adapters.models.workflow_def_adapter import WorkflowDefAdapter from conductor.asyncio_client.adapters.models.extended_workflow_def_adapter import ( ExtendedWorkflowDefAdapter, ) +from conductor.asyncio_client.adapters.models.task_def_adapter import TaskDefAdapter +from conductor.asyncio_client.adapters.models.workflow_def_adapter import WorkflowDefAdapter +from conductor.asyncio_client.http.api import MetadataResourceApi class MetadataResourceApiAdapter(MetadataResourceApi): diff --git a/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py b/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py index 3c3d0a85..9776dd5d 100644 --- a/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py @@ -1,13 +1,14 @@ from __future__ import annotations -from typing import List, Optional, Dict, Any, Union, Annotated, Tuple -from pydantic import StrictStr, StrictFloat, StrictInt, Field +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union + +from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.http.api import PromptResourceApi from conductor.asyncio_client.adapters.models.message_template_adapter import ( MessageTemplateAdapter, ) from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter +from conductor.asyncio_client.http.api import PromptResourceApi class PromptResourceApiAdapter(PromptResourceApi): diff --git a/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py b/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py index 4ab35587..a94af4a8 100644 --- a/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py @@ -1,18 +1,20 @@ from __future__ import annotations -from typing import List, Optional, Dict, Any, Union, Annotated, Tuple -from pydantic import StrictStr, StrictFloat, StrictInt, Field -from conductor.asyncio_client.http.api import SchedulerResourceApi +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union + +from pydantic import Field, StrictFloat, StrictInt, StrictStr + +from conductor.asyncio_client.adapters.models.search_result_workflow_schedule_execution_model_adapter import ( + SearchResultWorkflowScheduleExecutionModelAdapter, +) +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.adapters.models.workflow_schedule_adapter import ( WorkflowScheduleAdapter, ) from conductor.asyncio_client.adapters.models.workflow_schedule_model_adapter import ( WorkflowScheduleModelAdapter, ) -from conductor.asyncio_client.adapters.models.search_result_workflow_schedule_execution_model_adapter import ( - SearchResultWorkflowScheduleExecutionModelAdapter, -) -from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter +from conductor.asyncio_client.http.api import SchedulerResourceApi class SchedulerResourceApiAdapter(SchedulerResourceApi): diff --git a/src/conductor/asyncio_client/adapters/api/schema_resource_api.py b/src/conductor/asyncio_client/adapters/api/schema_resource_api.py index 837c5c0a..9ec0cc72 100644 --- a/src/conductor/asyncio_client/adapters/api/schema_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/schema_resource_api.py @@ -1,9 +1,11 @@ from __future__ import annotations -from typing import List, Optional, Dict, Any, Union, Annotated, Tuple -from pydantic import StrictStr, StrictFloat, StrictInt, Field, StrictBool -from conductor.asyncio_client.http.api import SchemaResourceApi +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union + +from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr + from conductor.asyncio_client.adapters.models.schema_def_adapter import SchemaDefAdapter +from conductor.asyncio_client.http.api import SchemaResourceApi class SchemaResourceApiAdapter(SchemaResourceApi): diff --git a/src/conductor/asyncio_client/adapters/api/secret_resource_api.py b/src/conductor/asyncio_client/adapters/api/secret_resource_api.py index 851511e2..cf5b6475 100644 --- a/src/conductor/asyncio_client/adapters/api/secret_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/secret_resource_api.py @@ -1,10 +1,12 @@ from __future__ import annotations -from typing import List, Optional, Dict, Any, Union, Annotated, Tuple -from pydantic import StrictStr, StrictFloat, StrictInt, Field -from conductor.asyncio_client.http.api import SecretResourceApi +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union + +from pydantic import Field, StrictFloat, StrictInt, StrictStr + from conductor.asyncio_client.adapters.models.extended_secret_adapter import ExtendedSecretAdapter from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter +from conductor.asyncio_client.http.api import SecretResourceApi class SecretResourceApiAdapter(SecretResourceApi): diff --git a/src/conductor/asyncio_client/adapters/api/tags_api.py b/src/conductor/asyncio_client/adapters/api/tags_api.py index 8efb44da..fc0c94d2 100644 --- a/src/conductor/asyncio_client/adapters/api/tags_api.py +++ b/src/conductor/asyncio_client/adapters/api/tags_api.py @@ -1,10 +1,11 @@ from __future__ import annotations -from typing import List, Optional, Dict, Any, Union, Annotated, Tuple -from pydantic import StrictStr, StrictFloat, StrictInt, Field +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union + +from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.http.api import TagsApi from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter +from conductor.asyncio_client.http.api import TagsApi class TagsApiAdapter(TagsApi): diff --git a/src/conductor/asyncio_client/adapters/api/task_resource_api.py b/src/conductor/asyncio_client/adapters/api/task_resource_api.py index 5c2077fd..e0351ebd 100644 --- a/src/conductor/asyncio_client/adapters/api/task_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/task_resource_api.py @@ -1,15 +1,15 @@ from __future__ import annotations -from typing import Optional, Dict, Union, Annotated, Any, Tuple, List +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union -from pydantic import validate_call, StrictStr, StrictFloat, Field, StrictInt +from pydantic import Field, StrictFloat, StrictInt, StrictStr, validate_call -from conductor.asyncio_client.adapters.models.task_adapter import TaskAdapter from conductor.asyncio_client.adapters.models.poll_data_adapter import PollDataAdapter -from conductor.asyncio_client.adapters.models.task_exec_log_adapter import TaskExecLogAdapter from conductor.asyncio_client.adapters.models.search_result_task_summary_adapter import ( SearchResultTaskSummaryAdapter, ) +from conductor.asyncio_client.adapters.models.task_adapter import TaskAdapter +from conductor.asyncio_client.adapters.models.task_exec_log_adapter import TaskExecLogAdapter from conductor.asyncio_client.adapters.models.workflow_adapter import WorkflowAdapter from conductor.asyncio_client.http.api import TaskResourceApi diff --git a/src/conductor/asyncio_client/adapters/api/user_resource_api.py b/src/conductor/asyncio_client/adapters/api/user_resource_api.py index 449340b7..a45d13e0 100644 --- a/src/conductor/asyncio_client/adapters/api/user_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/user_resource_api.py @@ -1,12 +1,12 @@ from __future__ import annotations -from typing import List, Optional, Dict, Any, Union, Annotated, Tuple +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union -from pydantic import StrictStr, StrictFloat, StrictInt, Field, StrictBool +from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.http.api import UserResourceApi from conductor.asyncio_client.adapters.models import UpsertUserRequestAdapter as UpsertUserRequest from conductor.asyncio_client.adapters.models.conductor_user_adapter import ConductorUserAdapter +from conductor.asyncio_client.http.api import UserResourceApi class UserResourceApiAdapter(UserResourceApi): diff --git a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py index c0123dbf..67a80fdb 100644 --- a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py @@ -1,27 +1,29 @@ from __future__ import annotations -from typing import Dict, Any, Union, Optional, Annotated, Tuple, List -from pydantic import validate_call, Field, StrictStr, StrictFloat, StrictInt, StrictBool -from conductor.asyncio_client.adapters.models.workflow_adapter import WorkflowAdapter -from conductor.asyncio_client.adapters.models.workflow_run_adapter import WorkflowRunAdapter -from conductor.asyncio_client.adapters.models.workflow_status_adapter import WorkflowStatusAdapter +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union + +from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr, validate_call + +from conductor.asyncio_client.adapters.models.correlation_ids_search_request_adapter import ( + CorrelationIdsSearchRequestAdapter, +) +from conductor.asyncio_client.adapters.models.rerun_workflow_request_adapter import ( + RerunWorkflowRequestAdapter, +) from conductor.asyncio_client.adapters.models.scrollable_search_result_workflow_summary_adapter import ( ScrollableSearchResultWorkflowSummaryAdapter, ) from conductor.asyncio_client.adapters.models.start_workflow_request_adapter import ( StartWorkflowRequestAdapter, ) -from conductor.asyncio_client.adapters.models.workflow_test_request_adapter import ( - WorkflowTestRequestAdapter, -) -from conductor.asyncio_client.adapters.models.rerun_workflow_request_adapter import ( - RerunWorkflowRequestAdapter, -) +from conductor.asyncio_client.adapters.models.workflow_adapter import WorkflowAdapter +from conductor.asyncio_client.adapters.models.workflow_run_adapter import WorkflowRunAdapter from conductor.asyncio_client.adapters.models.workflow_state_update_adapter import ( WorkflowStateUpdateAdapter, ) -from conductor.asyncio_client.adapters.models.correlation_ids_search_request_adapter import ( - CorrelationIdsSearchRequestAdapter, +from conductor.asyncio_client.adapters.models.workflow_status_adapter import WorkflowStatusAdapter +from conductor.asyncio_client.adapters.models.workflow_test_request_adapter import ( + WorkflowTestRequestAdapter, ) from conductor.asyncio_client.http.api import WorkflowResourceApi diff --git a/src/conductor/asyncio_client/adapters/api_client_adapter.py b/src/conductor/asyncio_client/adapters/api_client_adapter.py index 112ed4b7..7832fd37 100644 --- a/src/conductor/asyncio_client/adapters/api_client_adapter.py +++ b/src/conductor/asyncio_client/adapters/api_client_adapter.py @@ -11,10 +11,9 @@ from conductor.asyncio_client.configuration import Configuration from conductor.asyncio_client.http import rest from conductor.asyncio_client.http.api_client import ApiClient -from conductor.asyncio_client.http.api_response import ApiResponse -from conductor.asyncio_client.http.api_response import T as ApiResponseT +from conductor.asyncio_client.http.api_response import ApiResponse, T as ApiResponseT from conductor.asyncio_client.http.exceptions import ApiException -from conductor.client.exceptions.auth_401_policy import Auth401Policy, Auth401Handler +from conductor.client.exceptions.auth_401_policy import Auth401Handler, Auth401Policy logger = logging.getLogger(Configuration.get_logging_formatted_name(__name__)) diff --git a/src/conductor/asyncio_client/adapters/models/action_adapter.py b/src/conductor/asyncio_client/adapters/models/action_adapter.py index e613baf5..0e240e24 100644 --- a/src/conductor/asyncio_client/adapters/models/action_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/action_adapter.py @@ -1,6 +1,7 @@ from __future__ import annotations from typing import Any, Dict, Optional + from typing_extensions import Self from conductor.asyncio_client.http.models import Action diff --git a/src/conductor/asyncio_client/adapters/models/any_adapter.py b/src/conductor/asyncio_client/adapters/models/any_adapter.py index f3bbc738..d3eca3e3 100644 --- a/src/conductor/asyncio_client/adapters/models/any_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/any_adapter.py @@ -1,7 +1,6 @@ from __future__ import annotations -from typing import Any as AnyType -from typing import Dict, Optional +from typing import Any as AnyType, Dict, Optional from pydantic import Field from typing_extensions import Self diff --git a/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py index 2225c3a6..e25ae689 100644 --- a/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py @@ -232,6 +232,9 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: from conductor.asyncio_client.adapters.models.message_adapter import ( # noqa: E402 MessageAdapter, ) +from conductor.asyncio_client.adapters.models.message_options_adapter import ( # noqa: E402 + MessageOptionsAdapter, +) from conductor.asyncio_client.adapters.models.message_options_or_builder_adapter import ( # noqa: E402 MessageOptionsOrBuilderAdapter, ) @@ -250,8 +253,5 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: from conductor.asyncio_client.adapters.models.unknown_field_set_adapter import ( # noqa: E402 UnknownFieldSetAdapter, ) -from conductor.asyncio_client.adapters.models.message_options_adapter import ( # noqa: E402 - MessageOptionsAdapter, -) DescriptorProtoOrBuilderAdapter.model_rebuild(raise_errors=False) diff --git a/src/conductor/asyncio_client/adapters/models/schema_def_adapter.py b/src/conductor/asyncio_client/adapters/models/schema_def_adapter.py index aa5d2c7e..b5cb63f2 100644 --- a/src/conductor/asyncio_client/adapters/models/schema_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/schema_def_adapter.py @@ -1,6 +1,6 @@ from __future__ import annotations -from enum import Enum +from enum import Enum from typing import Any, Dict, Optional from conductor.asyncio_client.http.models import SchemaDef diff --git a/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py b/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py index 5d74ae75..600f9524 100644 --- a/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py @@ -1,6 +1,7 @@ from __future__ import annotations from typing import Any, Dict, List, Optional + from typing_extensions import Self from conductor.asyncio_client.http.models import ServiceDescriptor diff --git a/src/conductor/asyncio_client/adapters/models/task_result_adapter.py b/src/conductor/asyncio_client/adapters/models/task_result_adapter.py index 23d1d907..286aba85 100644 --- a/src/conductor/asyncio_client/adapters/models/task_result_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/task_result_adapter.py @@ -2,8 +2,8 @@ from typing import Any, Dict, List, Optional -from typing_extensions import Self from pydantic import Field +from typing_extensions import Self from conductor.asyncio_client.http.models import TaskResult diff --git a/src/conductor/asyncio_client/adapters/models/workflow_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_adapter.py index 02debcd2..f59230e2 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_adapter.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Any, Dict, List, Optional, TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Dict, List, Optional if TYPE_CHECKING: from conductor.asyncio_client.adapters.models.task_adapter import TaskAdapter diff --git a/src/conductor/asyncio_client/ai/orchestrator.py b/src/conductor/asyncio_client/ai/orchestrator.py index bafcb9ab..d38914dc 100644 --- a/src/conductor/asyncio_client/ai/orchestrator.py +++ b/src/conductor/asyncio_client/ai/orchestrator.py @@ -13,13 +13,13 @@ from conductor.asyncio_client.orkes.orkes_clients import OrkesClients if TYPE_CHECKING: + from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.message_template_adapter import ( MessageTemplateAdapter, ) from conductor.asyncio_client.configuration import Configuration from conductor.shared.ai.configuration.interfaces.integration_config import IntegrationConfig from conductor.shared.ai.enums import LLMProvider, VectorDB - from conductor.asyncio_client.adapters import ApiClient NOT_FOUND_STATUS = 404 diff --git a/src/conductor/asyncio_client/event/event_client.py b/src/conductor/asyncio_client/event/event_client.py index 41fd6295..cf9e5856 100644 --- a/src/conductor/asyncio_client/event/event_client.py +++ b/src/conductor/asyncio_client/event/event_client.py @@ -1,7 +1,7 @@ +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.api.event_resource_api import ( EventResourceApiAdapter, ) -from conductor.asyncio_client.adapters import ApiClient from conductor.shared.event.configuration import QueueConfiguration diff --git a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py index 9fc0bc8c..8c6901c7 100644 --- a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import List, Dict, Any, cast, Optional +from typing import Any, Dict, List, Optional, cast from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.authorization_request_adapter import ( @@ -9,6 +9,9 @@ from conductor.asyncio_client.adapters.models.conductor_user_adapter import ( ConductorUserAdapter, ) +from conductor.asyncio_client.adapters.models.create_or_update_application_request_adapter import ( + CreateOrUpdateApplicationRequestAdapter, +) from conductor.asyncio_client.adapters.models.extended_conductor_application_adapter import ( ExtendedConductorApplicationAdapter, ) @@ -26,9 +29,6 @@ from conductor.asyncio_client.adapters.models.upsert_user_request_adapter import ( UpsertUserRequestAdapter as UpsertUserRequest, ) -from conductor.asyncio_client.adapters.models.create_or_update_application_request_adapter import ( - CreateOrUpdateApplicationRequestAdapter, -) from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient from conductor.client.orkes.models.access_key import AccessKey diff --git a/src/conductor/asyncio_client/orkes/orkes_base_client.py b/src/conductor/asyncio_client/orkes/orkes_base_client.py index d944de9a..b8571149 100644 --- a/src/conductor/asyncio_client/orkes/orkes_base_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_base_client.py @@ -1,5 +1,6 @@ import logging +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.api.application_resource_api import ( ApplicationResourceApiAdapter, ) @@ -20,7 +21,6 @@ from conductor.asyncio_client.adapters.api.user_resource_api import UserResourceApiAdapter from conductor.asyncio_client.adapters.api.workflow_resource_api import WorkflowResourceApiAdapter from conductor.asyncio_client.configuration.configuration import Configuration -from conductor.asyncio_client.adapters import ApiClient class OrkesBaseClient: diff --git a/src/conductor/asyncio_client/orkes/orkes_clients.py b/src/conductor/asyncio_client/orkes/orkes_clients.py index 52e4688b..a55ff004 100644 --- a/src/conductor/asyncio_client/orkes/orkes_clients.py +++ b/src/conductor/asyncio_client/orkes/orkes_clients.py @@ -2,8 +2,8 @@ from typing import Optional -from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_authorization_client import OrkesAuthorizationClient from conductor.asyncio_client.orkes.orkes_integration_client import OrkesIntegrationClient from conductor.asyncio_client.orkes.orkes_metadata_client import OrkesMetadataClient diff --git a/src/conductor/asyncio_client/orkes/orkes_integration_client.py b/src/conductor/asyncio_client/orkes/orkes_integration_client.py index 77ddebcd..e96b31a0 100644 --- a/src/conductor/asyncio_client/orkes/orkes_integration_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_integration_client.py @@ -1,8 +1,9 @@ from __future__ import annotations -from typing import Optional, List, Dict + +from typing import Dict, List, Optional from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.configuration.configuration import Configuration +from conductor.asyncio_client.adapters.models.event_log_adapter import EventLogAdapter from conductor.asyncio_client.adapters.models.integration_adapter import IntegrationAdapter from conductor.asyncio_client.adapters.models.integration_api_adapter import IntegrationApiAdapter from conductor.asyncio_client.adapters.models.integration_api_update_adapter import ( @@ -14,7 +15,7 @@ ) from conductor.asyncio_client.adapters.models.message_template_adapter import MessageTemplateAdapter from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter -from conductor.asyncio_client.adapters.models.event_log_adapter import EventLogAdapter +from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.http.exceptions import NotFoundException from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient diff --git a/src/conductor/asyncio_client/orkes/orkes_metadata_client.py b/src/conductor/asyncio_client/orkes/orkes_metadata_client.py index fa87125e..2bce4de0 100644 --- a/src/conductor/asyncio_client/orkes/orkes_metadata_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_metadata_client.py @@ -2,16 +2,16 @@ from typing import List, Optional +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.extended_task_def_adapter import ( ExtendedTaskDefAdapter, ) from conductor.asyncio_client.adapters.models.extended_workflow_def_adapter import ( ExtendedWorkflowDefAdapter, ) +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.adapters.models.task_def_adapter import TaskDefAdapter from conductor.asyncio_client.adapters.models.workflow_def_adapter import WorkflowDefAdapter -from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient diff --git a/src/conductor/asyncio_client/orkes/orkes_prompt_client.py b/src/conductor/asyncio_client/orkes/orkes_prompt_client.py index edd0c913..c103aaaa 100644 --- a/src/conductor/asyncio_client/orkes/orkes_prompt_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_prompt_client.py @@ -2,6 +2,7 @@ from typing import List, Optional +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.message_template_adapter import ( MessageTemplateAdapter, ) @@ -9,7 +10,6 @@ PromptTemplateTestRequestAdapter, ) from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient diff --git a/src/conductor/asyncio_client/orkes/orkes_scheduler_client.py b/src/conductor/asyncio_client/orkes/orkes_scheduler_client.py index 4d330880..88d99d30 100644 --- a/src/conductor/asyncio_client/orkes/orkes_scheduler_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_scheduler_client.py @@ -2,6 +2,7 @@ from typing import Dict, List, Optional +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.save_schedule_request_adapter import ( SaveScheduleRequestAdapter, ) @@ -18,7 +19,6 @@ from conductor.asyncio_client.adapters.models.workflow_schedule_model_adapter import ( WorkflowScheduleModelAdapter, ) -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient diff --git a/src/conductor/asyncio_client/orkes/orkes_schema_client.py b/src/conductor/asyncio_client/orkes/orkes_schema_client.py index 8f957392..06d4792e 100644 --- a/src/conductor/asyncio_client/orkes/orkes_schema_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_schema_client.py @@ -2,8 +2,8 @@ from typing import List, Optional -from conductor.asyncio_client.adapters.models.schema_def_adapter import SchemaDefAdapter from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.models.schema_def_adapter import SchemaDefAdapter from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient diff --git a/src/conductor/asyncio_client/orkes/orkes_secret_client.py b/src/conductor/asyncio_client/orkes/orkes_secret_client.py index e4bebd75..d465824a 100644 --- a/src/conductor/asyncio_client/orkes/orkes_secret_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_secret_client.py @@ -2,9 +2,9 @@ from typing import Dict, List +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.extended_secret_adapter import ExtendedSecretAdapter from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient diff --git a/src/conductor/asyncio_client/orkes/orkes_task_client.py b/src/conductor/asyncio_client/orkes/orkes_task_client.py index f5839f4d..a5f2bfe8 100644 --- a/src/conductor/asyncio_client/orkes/orkes_task_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_task_client.py @@ -2,6 +2,7 @@ from typing import Any, Dict, List, Optional +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.poll_data_adapter import PollDataAdapter from conductor.asyncio_client.adapters.models.search_result_task_summary_adapter import ( SearchResultTaskSummaryAdapter, @@ -10,7 +11,6 @@ from conductor.asyncio_client.adapters.models.task_exec_log_adapter import TaskExecLogAdapter from conductor.asyncio_client.adapters.models.task_result_adapter import TaskResultAdapter from conductor.asyncio_client.adapters.models.workflow_adapter import WorkflowAdapter -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient diff --git a/src/conductor/asyncio_client/orkes/orkes_workflow_client.py b/src/conductor/asyncio_client/orkes/orkes_workflow_client.py index 3be02170..67a74663 100644 --- a/src/conductor/asyncio_client/orkes/orkes_workflow_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_workflow_client.py @@ -3,6 +3,7 @@ import uuid from typing import Any, Dict, List, Optional, cast +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.correlation_ids_search_request_adapter import ( CorrelationIdsSearchRequestAdapter, ) @@ -27,7 +28,6 @@ from conductor.asyncio_client.adapters.models.workflow_test_request_adapter import ( WorkflowTestRequestAdapter, ) -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient diff --git a/src/conductor/asyncio_client/worker/worker.py b/src/conductor/asyncio_client/worker/worker.py index a9babd2e..6068a5a1 100644 --- a/src/conductor/asyncio_client/worker/worker.py +++ b/src/conductor/asyncio_client/worker/worker.py @@ -8,6 +8,7 @@ from copy import deepcopy from typing import Any, Callable, Optional, Union +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.task_adapter import TaskAdapter from conductor.asyncio_client.adapters.models.task_exec_log_adapter import ( TaskExecLogAdapter, @@ -16,7 +17,6 @@ TaskResultAdapter, ) from conductor.asyncio_client.configuration import Configuration -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.worker.worker_interface import WorkerInterface from conductor.shared.automator import utils from conductor.shared.automator.utils import convert_from_dict_or_list diff --git a/src/conductor/asyncio_client/workflow/executor/workflow_executor.py b/src/conductor/asyncio_client/workflow/executor/workflow_executor.py index d76f6e80..c68b8656 100644 --- a/src/conductor/asyncio_client/workflow/executor/workflow_executor.py +++ b/src/conductor/asyncio_client/workflow/executor/workflow_executor.py @@ -3,6 +3,7 @@ import uuid from typing import Any, Dict, List, Optional +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.api.metadata_resource_api import MetadataResourceApiAdapter from conductor.asyncio_client.adapters.api.task_resource_api import TaskResourceApiAdapter from conductor.asyncio_client.adapters.models.correlation_ids_search_request_adapter import ( @@ -29,7 +30,6 @@ from conductor.asyncio_client.adapters.models.workflow_run_adapter import WorkflowRunAdapter from conductor.asyncio_client.adapters.models.workflow_status_adapter import WorkflowStatusAdapter from conductor.asyncio_client.configuration.configuration import Configuration -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.orkes.orkes_workflow_client import OrkesWorkflowClient diff --git a/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_index_documents.py b/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_index_documents.py index a86f7b02..73ad8e71 100644 --- a/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_index_documents.py +++ b/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_index_documents.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Optional, Dict, Any +from typing import Any, Dict, Optional from conductor.asyncio_client.workflow.task.task import TaskInterface from conductor.shared.workflow.enums import TaskType diff --git a/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_text_complete.py b/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_text_complete.py index 4948c912..6fe0e0b5 100644 --- a/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_text_complete.py +++ b/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_text_complete.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Dict, List, Optional, Any +from typing import Any, Dict, List, Optional from conductor.asyncio_client.workflow.task.task import TaskInterface from conductor.shared.workflow.enums import TaskType diff --git a/src/conductor/asyncio_client/workflow/task/switch_task.py b/src/conductor/asyncio_client/workflow/task/switch_task.py index 504bebdd..5edb67de 100644 --- a/src/conductor/asyncio_client/workflow/task/switch_task.py +++ b/src/conductor/asyncio_client/workflow/task/switch_task.py @@ -1,7 +1,7 @@ from __future__ import annotations from copy import deepcopy -from typing import List, Dict, Optional +from typing import Dict, List, Optional from conductor.asyncio_client.adapters.models.workflow_task_adapter import WorkflowTaskAdapter from conductor.asyncio_client.workflow.task.task import ( diff --git a/src/conductor/client/adapters/api/application_resource_api_adapter.py b/src/conductor/client/adapters/api/application_resource_api_adapter.py index d91f573a..70163ab9 100644 --- a/src/conductor/client/adapters/api/application_resource_api_adapter.py +++ b/src/conductor/client/adapters/api/application_resource_api_adapter.py @@ -1,8 +1,8 @@ from typing import List -from conductor.client.orkes.models.metadata_tag import MetadataTag from conductor.client.codegen.api.application_resource_api import ApplicationResourceApi from conductor.client.http.models.extended_conductor_application import ExtendedConductorApplication +from conductor.client.orkes.models.metadata_tag import MetadataTag class ApplicationResourceApiAdapter(ApplicationResourceApi): diff --git a/src/conductor/client/adapters/api_client_adapter.py b/src/conductor/client/adapters/api_client_adapter.py index 7ace9140..3bb1a6a1 100644 --- a/src/conductor/client/adapters/api_client_adapter.py +++ b/src/conductor/client/adapters/api_client_adapter.py @@ -1,12 +1,11 @@ import logging import time +from conductor.client.adapters.rest_adapter import RESTClientObjectAdapter from conductor.client.codegen.api_client import ApiClient +from conductor.client.codegen.rest import ApiException, AuthorizationException from conductor.client.configuration.configuration import Configuration -from conductor.client.adapters.rest_adapter import RESTClientObjectAdapter -from conductor.client.exceptions.auth_401_policy import Auth401Policy, Auth401Handler - -from conductor.client.codegen.rest import AuthorizationException, ApiException +from conductor.client.exceptions.auth_401_policy import Auth401Handler, Auth401Policy logger = logging.getLogger(Configuration.get_logging_formatted_name(__name__)) diff --git a/src/conductor/client/adapters/models/bulk_response_adapter.py b/src/conductor/client/adapters/models/bulk_response_adapter.py index f634f4ed..2f057f5f 100644 --- a/src/conductor/client/adapters/models/bulk_response_adapter.py +++ b/src/conductor/client/adapters/models/bulk_response_adapter.py @@ -1,4 +1,5 @@ from typing import ClassVar, Dict + from conductor.client.codegen.models import BulkResponse diff --git a/src/conductor/client/adapters/models/health.py b/src/conductor/client/adapters/models/health.py index a4220b7c..233c5e48 100644 --- a/src/conductor/client/adapters/models/health.py +++ b/src/conductor/client/adapters/models/health.py @@ -1,6 +1,6 @@ -from typing import ClassVar, Dict import pprint import re # noqa: F401 +from typing import ClassVar, Dict import six diff --git a/src/conductor/client/adapters/models/health_check_status.py b/src/conductor/client/adapters/models/health_check_status.py index 225a2b71..d3a8e374 100644 --- a/src/conductor/client/adapters/models/health_check_status.py +++ b/src/conductor/client/adapters/models/health_check_status.py @@ -1,5 +1,5 @@ -from typing import ClassVar, Dict import pprint +from typing import ClassVar, Dict import six diff --git a/src/conductor/client/adapters/models/integration_def_api_adapter.py b/src/conductor/client/adapters/models/integration_def_api_adapter.py index af35b172..f44e190c 100644 --- a/src/conductor/client/adapters/models/integration_def_api_adapter.py +++ b/src/conductor/client/adapters/models/integration_def_api_adapter.py @@ -1,5 +1,5 @@ -from typing import ClassVar, Dict import pprint +from typing import ClassVar, Dict import six diff --git a/src/conductor/client/adapters/models/state_change_event_adapter.py b/src/conductor/client/adapters/models/state_change_event_adapter.py index e34038b9..84562c43 100644 --- a/src/conductor/client/adapters/models/state_change_event_adapter.py +++ b/src/conductor/client/adapters/models/state_change_event_adapter.py @@ -1,7 +1,7 @@ from __future__ import annotations from enum import Enum -from typing import ClassVar, Dict, List, Union, Optional, Any +from typing import Any, ClassVar, Dict, List, Optional, Union from conductor.client.codegen.models.state_change_event import StateChangeEvent diff --git a/src/conductor/client/adapters/rest_adapter.py b/src/conductor/client/adapters/rest_adapter.py index 4930fa93..7eefbd95 100644 --- a/src/conductor/client/adapters/rest_adapter.py +++ b/src/conductor/client/adapters/rest_adapter.py @@ -1,4 +1,5 @@ from __future__ import annotations + import io import logging import ssl diff --git a/src/conductor/client/ai/orchestrator.py b/src/conductor/client/ai/orchestrator.py index 68b5c9a6..eaccb635 100644 --- a/src/conductor/client/ai/orchestrator.py +++ b/src/conductor/client/ai/orchestrator.py @@ -1,19 +1,17 @@ from __future__ import annotations -from typing import Optional, List, TYPE_CHECKING +from typing import TYPE_CHECKING, List, Optional from uuid import uuid4 - -from conductor.client.http.models import IntegrationApiUpdate, IntegrationUpdate from conductor.client.codegen.rest import ApiException +from conductor.client.http.models import IntegrationApiUpdate, IntegrationUpdate from conductor.client.orkes_clients import OrkesClients if TYPE_CHECKING: - from conductor.client.http.models import PromptTemplate from conductor.client.configuration.configuration import Configuration + from conductor.client.http.models import PromptTemplate from conductor.shared.ai.configuration.interfaces.integration_config import IntegrationConfig - from conductor.shared.ai.enums import VectorDB - from conductor.shared.ai.enums import LLMProvider + from conductor.shared.ai.enums import LLMProvider, VectorDB NOT_FOUND_STATUS = 404 diff --git a/src/conductor/client/authorization_client.py b/src/conductor/client/authorization_client.py index 1991543e..9fc2f3b3 100644 --- a/src/conductor/client/authorization_client.py +++ b/src/conductor/client/authorization_client.py @@ -1,21 +1,23 @@ from __future__ import annotations + from abc import ABC, abstractmethod from typing import Dict, List, Optional -from conductor.client.orkes.models.metadata_tag import MetadataTag -from conductor.client.orkes.models.access_type import AccessType -from conductor.client.orkes.models.granted_permission import GrantedPermission -from conductor.client.orkes.models.access_key import AccessKey -from conductor.client.orkes.models.created_access_key import CreatedAccessKey -from conductor.client.http.models.group import Group -from conductor.client.http.models.target_ref import TargetRef -from conductor.client.http.models.subject_ref import SubjectRef -from conductor.client.http.models.conductor_user import ConductorUser + from conductor.client.http.models.conductor_application import ConductorApplication -from conductor.client.http.models.upsert_user_request import UpsertUserRequest -from conductor.client.http.models.upsert_group_request import UpsertGroupRequest +from conductor.client.http.models.conductor_user import ConductorUser from conductor.client.http.models.create_or_update_application_request import ( CreateOrUpdateApplicationRequest, ) +from conductor.client.http.models.group import Group +from conductor.client.http.models.subject_ref import SubjectRef +from conductor.client.http.models.target_ref import TargetRef +from conductor.client.http.models.upsert_group_request import UpsertGroupRequest +from conductor.client.http.models.upsert_user_request import UpsertUserRequest +from conductor.client.orkes.models.access_key import AccessKey +from conductor.client.orkes.models.access_type import AccessType +from conductor.client.orkes.models.created_access_key import CreatedAccessKey +from conductor.client.orkes.models.granted_permission import GrantedPermission +from conductor.client.orkes.models.metadata_tag import MetadataTag class AuthorizationClient(ABC): diff --git a/src/conductor/client/automator/task_runner.py b/src/conductor/client/automator/task_runner.py index 627163f9..9bc7d97b 100644 --- a/src/conductor/client/automator/task_runner.py +++ b/src/conductor/client/automator/task_runner.py @@ -5,10 +5,9 @@ import sys import time import traceback - from typing import Optional -from conductor.client.codegen.rest import AuthorizationException, ApiException +from conductor.client.codegen.rest import ApiException, AuthorizationException from conductor.client.configuration.configuration import Configuration from conductor.client.http.api.task_resource_api import TaskResourceApi from conductor.client.http.api_client import ApiClient diff --git a/src/conductor/client/configuration/configuration.py b/src/conductor/client/configuration/configuration.py index cb821156..463623e4 100644 --- a/src/conductor/client/configuration/configuration.py +++ b/src/conductor/client/configuration/configuration.py @@ -1,11 +1,10 @@ from __future__ import annotations import json - import logging import os import time -from typing import Optional, Dict, Union +from typing import Dict, Optional, Union from conductor.shared.configuration.settings.authentication_settings import ( AuthenticationSettings, diff --git a/src/conductor/client/exceptions/api_exception_handler.py b/src/conductor/client/exceptions/api_exception_handler.py index 0675cede..b30dc278 100644 --- a/src/conductor/client/exceptions/api_exception_handler.py +++ b/src/conductor/client/exceptions/api_exception_handler.py @@ -1,7 +1,7 @@ import json -from conductor.client.exceptions.api_error import APIError, APIErrorCode from conductor.client.codegen.rest import ApiException +from conductor.client.exceptions.api_error import APIError, APIErrorCode BAD_REQUEST_STATUS = 400 FORBIDDEN_STATUS = 403 diff --git a/src/conductor/client/exceptions/auth_401_policy.py b/src/conductor/client/exceptions/auth_401_policy.py index 379af5f9..980848f0 100644 --- a/src/conductor/client/exceptions/auth_401_policy.py +++ b/src/conductor/client/exceptions/auth_401_policy.py @@ -1,4 +1,5 @@ from __future__ import annotations + import logging import random import time diff --git a/src/conductor/client/helpers/helper.py b/src/conductor/client/helpers/helper.py index c651d5e6..11aee302 100644 --- a/src/conductor/client/helpers/helper.py +++ b/src/conductor/client/helpers/helper.py @@ -1,14 +1,14 @@ import datetime import logging import re -from dateutil.parser import parse from typing import ClassVar, Dict, Tuple import six +from dateutil.parser import parse from requests.structures import CaseInsensitiveDict -from conductor.client.configuration.configuration import Configuration from conductor.client.codegen import rest +from conductor.client.configuration.configuration import Configuration logger = logging.getLogger(Configuration.get_logging_formatted_name(__name__)) diff --git a/src/conductor/client/integration_client.py b/src/conductor/client/integration_client.py index 6cd3faa9..7995e6c2 100644 --- a/src/conductor/client/integration_client.py +++ b/src/conductor/client/integration_client.py @@ -1,4 +1,5 @@ from __future__ import annotations + from abc import ABC, abstractmethod from typing import List, Optional diff --git a/src/conductor/client/metadata_client.py b/src/conductor/client/metadata_client.py index 3c0b44bc..21508acc 100644 --- a/src/conductor/client/metadata_client.py +++ b/src/conductor/client/metadata_client.py @@ -1,8 +1,10 @@ from __future__ import annotations + from abc import ABC, abstractmethod from typing import List, Optional -from conductor.client.http.models.workflow_def import WorkflowDef + from conductor.client.http.models.task_def import TaskDef +from conductor.client.http.models.workflow_def import WorkflowDef from conductor.client.orkes.models.metadata_tag import MetadataTag diff --git a/src/conductor/client/orkes/models/access_key.py b/src/conductor/client/orkes/models/access_key.py index 8146ccb5..318bde76 100644 --- a/src/conductor/client/orkes/models/access_key.py +++ b/src/conductor/client/orkes/models/access_key.py @@ -1,8 +1,9 @@ from __future__ import annotations -from conductor.client.orkes.models.access_key_status import AccessKeyStatus from typing import Optional +from conductor.client.orkes.models.access_key_status import AccessKeyStatus + class AccessKey: def __init__(self, id: str, status: AccessKeyStatus, created_at: int) -> None: diff --git a/src/conductor/client/orkes/orkes_authorization_client.py b/src/conductor/client/orkes/orkes_authorization_client.py index 1e453c93..2b71f591 100644 --- a/src/conductor/client/orkes/orkes_authorization_client.py +++ b/src/conductor/client/orkes/orkes_authorization_client.py @@ -1,4 +1,5 @@ from __future__ import annotations + from typing import Dict, List, Optional from conductor.client.authorization_client import AuthorizationClient diff --git a/src/conductor/client/orkes/orkes_base_client.py b/src/conductor/client/orkes/orkes_base_client.py index bf66260b..f42cd638 100644 --- a/src/conductor/client/orkes/orkes_base_client.py +++ b/src/conductor/client/orkes/orkes_base_client.py @@ -11,11 +11,11 @@ from conductor.client.http.api.schema_resource_api import SchemaResourceApi from conductor.client.http.api.secret_resource_api import SecretResourceApi from conductor.client.http.api.service_registry_resource_api import ServiceRegistryResourceApi +from conductor.client.http.api.tags_api import TagsApi from conductor.client.http.api.task_resource_api import TaskResourceApi from conductor.client.http.api.user_resource_api import UserResourceApi from conductor.client.http.api.workflow_resource_api import WorkflowResourceApi from conductor.client.http.api_client import ApiClient -from conductor.client.http.api.tags_api import TagsApi class OrkesBaseClient(object): diff --git a/src/conductor/client/orkes/orkes_integration_client.py b/src/conductor/client/orkes/orkes_integration_client.py index 012ccf24..c4c1e6db 100644 --- a/src/conductor/client/orkes/orkes_integration_client.py +++ b/src/conductor/client/orkes/orkes_integration_client.py @@ -1,16 +1,15 @@ -from __future__ import annotations -from __future__ import absolute_import +from __future__ import absolute_import, annotations -from typing import List, Optional, Dict +from typing import Dict, List, Optional +from conductor.client.codegen.rest import ApiException from conductor.client.configuration.configuration import Configuration from conductor.client.http.models.integration import Integration from conductor.client.http.models.integration_api import IntegrationApi from conductor.client.http.models.integration_api_update import IntegrationApiUpdate -from conductor.client.http.models.integration_update import IntegrationUpdate from conductor.client.http.models.integration_def import IntegrationDef +from conductor.client.http.models.integration_update import IntegrationUpdate from conductor.client.http.models.prompt_template import PromptTemplate -from conductor.client.codegen.rest import ApiException from conductor.client.integration_client import IntegrationClient from conductor.client.orkes.orkes_base_client import OrkesBaseClient diff --git a/src/conductor/client/orkes/orkes_metadata_client.py b/src/conductor/client/orkes/orkes_metadata_client.py index 3023ccfd..f16c65a4 100644 --- a/src/conductor/client/orkes/orkes_metadata_client.py +++ b/src/conductor/client/orkes/orkes_metadata_client.py @@ -1,5 +1,6 @@ from __future__ import annotations -from typing import Optional, List + +from typing import List, Optional from conductor.client.configuration.configuration import Configuration from conductor.client.http.models.tag_string import TagString diff --git a/src/conductor/client/orkes/orkes_prompt_client.py b/src/conductor/client/orkes/orkes_prompt_client.py index c97d4e21..41dade79 100644 --- a/src/conductor/client/orkes/orkes_prompt_client.py +++ b/src/conductor/client/orkes/orkes_prompt_client.py @@ -2,10 +2,10 @@ from typing import List, Optional +from conductor.client.codegen.rest import ApiException from conductor.client.configuration.configuration import Configuration from conductor.client.http.models.prompt_template import PromptTemplate from conductor.client.http.models.prompt_template_test_request import PromptTemplateTestRequest -from conductor.client.codegen.rest import ApiException from conductor.client.orkes.models.metadata_tag import MetadataTag from conductor.client.orkes.orkes_base_client import OrkesBaseClient from conductor.client.prompt_client import PromptClient diff --git a/src/conductor/client/orkes/orkes_scheduler_client.py b/src/conductor/client/orkes/orkes_scheduler_client.py index 74c78a67..6e309433 100644 --- a/src/conductor/client/orkes/orkes_scheduler_client.py +++ b/src/conductor/client/orkes/orkes_scheduler_client.py @@ -1,5 +1,6 @@ from __future__ import annotations -from typing import Optional, List, Tuple + +from typing import List, Optional, Tuple from conductor.client.configuration.configuration import Configuration from conductor.client.http.models.save_schedule_request import SaveScheduleRequest diff --git a/src/conductor/client/orkes/orkes_service_registry_client.py b/src/conductor/client/orkes/orkes_service_registry_client.py index ff595f66..697d1201 100644 --- a/src/conductor/client/orkes/orkes_service_registry_client.py +++ b/src/conductor/client/orkes/orkes_service_registry_client.py @@ -1,13 +1,14 @@ from __future__ import annotations -from typing import Optional, List + +from typing import List, Optional from conductor.client.configuration.configuration import Configuration -from conductor.client.http.models.service_registry import ServiceRegistry -from conductor.client.http.models.service_method import ServiceMethod -from conductor.client.http.models.proto_registry_entry import ProtoRegistryEntry from conductor.client.http.models.circuit_breaker_transition_response import ( CircuitBreakerTransitionResponse, ) +from conductor.client.http.models.proto_registry_entry import ProtoRegistryEntry +from conductor.client.http.models.service_method import ServiceMethod +from conductor.client.http.models.service_registry import ServiceRegistry from conductor.client.orkes.orkes_base_client import OrkesBaseClient from conductor.client.service_registry_client import ServiceRegistryClient diff --git a/src/conductor/client/orkes/orkes_task_client.py b/src/conductor/client/orkes/orkes_task_client.py index afa6a806..86a08d2d 100644 --- a/src/conductor/client/orkes/orkes_task_client.py +++ b/src/conductor/client/orkes/orkes_task_client.py @@ -1,5 +1,6 @@ from __future__ import annotations -from typing import Optional, List + +from typing import List, Optional from conductor.client.configuration.configuration import Configuration from conductor.client.http.models.poll_data import PollData diff --git a/src/conductor/client/orkes/orkes_workflow_client.py b/src/conductor/client/orkes/orkes_workflow_client.py index 50e1c1c4..d87c1b06 100644 --- a/src/conductor/client/orkes/orkes_workflow_client.py +++ b/src/conductor/client/orkes/orkes_workflow_client.py @@ -1,20 +1,21 @@ from __future__ import annotations -from typing import Optional, List, Dict + import uuid +from typing import Dict, List, Optional from conductor.client.configuration.configuration import Configuration -from conductor.client.http.models.skip_task_request import SkipTaskRequest -from conductor.client.http.models.workflow_status import WorkflowStatus +from conductor.client.http.models.correlation_ids_search_request import CorrelationIdsSearchRequest +from conductor.client.http.models.rerun_workflow_request import RerunWorkflowRequest from conductor.client.http.models.scrollable_search_result_workflow_summary import ( ScrollableSearchResultWorkflowSummary, ) from conductor.client.http.models.signal_response import SignalResponse -from conductor.client.http.models.correlation_ids_search_request import CorrelationIdsSearchRequest -from conductor.client.http.models.rerun_workflow_request import RerunWorkflowRequest +from conductor.client.http.models.skip_task_request import SkipTaskRequest from conductor.client.http.models.start_workflow_request import StartWorkflowRequest from conductor.client.http.models.workflow import Workflow from conductor.client.http.models.workflow_run import WorkflowRun from conductor.client.http.models.workflow_state_update import WorkflowStateUpdate +from conductor.client.http.models.workflow_status import WorkflowStatus from conductor.client.http.models.workflow_test_request import WorkflowTestRequest from conductor.client.orkes.orkes_base_client import OrkesBaseClient from conductor.client.workflow_client import WorkflowClient diff --git a/src/conductor/client/orkes_clients.py b/src/conductor/client/orkes_clients.py index c4c74fc5..686c27e7 100644 --- a/src/conductor/client/orkes_clients.py +++ b/src/conductor/client/orkes_clients.py @@ -6,15 +6,15 @@ from conductor.client.configuration.configuration import Configuration from conductor.client.integration_client import IntegrationClient from conductor.client.metadata_client import MetadataClient +from conductor.client.orkes.orkes_authorization_client import OrkesAuthorizationClient from conductor.client.orkes.orkes_integration_client import OrkesIntegrationClient from conductor.client.orkes.orkes_metadata_client import OrkesMetadataClient from conductor.client.orkes.orkes_prompt_client import OrkesPromptClient -from conductor.client.orkes.orkes_schema_client import OrkesSchemaClient -from conductor.client.orkes.orkes_workflow_client import OrkesWorkflowClient -from conductor.client.orkes.orkes_task_client import OrkesTaskClient from conductor.client.orkes.orkes_scheduler_client import OrkesSchedulerClient +from conductor.client.orkes.orkes_schema_client import OrkesSchemaClient from conductor.client.orkes.orkes_secret_client import OrkesSecretClient -from conductor.client.orkes.orkes_authorization_client import OrkesAuthorizationClient +from conductor.client.orkes.orkes_task_client import OrkesTaskClient +from conductor.client.orkes.orkes_workflow_client import OrkesWorkflowClient from conductor.client.prompt_client import PromptClient from conductor.client.scheduler_client import SchedulerClient from conductor.client.schema_client import SchemaClient diff --git a/src/conductor/client/prompt_client.py b/src/conductor/client/prompt_client.py index ce62c7b5..0226600d 100644 --- a/src/conductor/client/prompt_client.py +++ b/src/conductor/client/prompt_client.py @@ -4,7 +4,6 @@ from typing import List, Optional # python 2 and python 3 compatibility library - from conductor.client.http.models.prompt_template import PromptTemplate from conductor.client.orkes.models.metadata_tag import MetadataTag diff --git a/src/conductor/client/scheduler_client.py b/src/conductor/client/scheduler_client.py index dcd8ca90..5b0cf558 100644 --- a/src/conductor/client/scheduler_client.py +++ b/src/conductor/client/scheduler_client.py @@ -1,11 +1,13 @@ from __future__ import annotations + from abc import ABC, abstractmethod -from typing import Optional, List, Tuple -from conductor.client.http.models.workflow_schedule import WorkflowSchedule +from typing import List, Optional, Tuple + from conductor.client.http.models.save_schedule_request import SaveScheduleRequest from conductor.client.http.models.search_result_workflow_schedule_execution_model import ( SearchResultWorkflowScheduleExecutionModel, ) +from conductor.client.http.models.workflow_schedule import WorkflowSchedule from conductor.client.orkes.models.metadata_tag import MetadataTag diff --git a/src/conductor/client/schema_client.py b/src/conductor/client/schema_client.py index f7a360e0..08bec8a1 100644 --- a/src/conductor/client/schema_client.py +++ b/src/conductor/client/schema_client.py @@ -4,7 +4,6 @@ from typing import List # python 2 and python 3 compatibility library - from conductor.client.http.models.schema_def import SchemaDef diff --git a/src/conductor/client/secret_client.py b/src/conductor/client/secret_client.py index cb9d8a15..0ca3fac7 100644 --- a/src/conductor/client/secret_client.py +++ b/src/conductor/client/secret_client.py @@ -1,5 +1,6 @@ from abc import ABC, abstractmethod from typing import List, Set + from conductor.client.orkes.models.metadata_tag import MetadataTag diff --git a/src/conductor/client/service_registry_client.py b/src/conductor/client/service_registry_client.py index 97d61be6..6107f111 100644 --- a/src/conductor/client/service_registry_client.py +++ b/src/conductor/client/service_registry_client.py @@ -1,13 +1,14 @@ from __future__ import annotations + from abc import ABC, abstractmethod -from typing import Optional, List +from typing import List, Optional -from conductor.client.http.models.service_registry import ServiceRegistry -from conductor.client.http.models.service_method import ServiceMethod -from conductor.client.http.models.proto_registry_entry import ProtoRegistryEntry from conductor.client.http.models.circuit_breaker_transition_response import ( CircuitBreakerTransitionResponse, ) +from conductor.client.http.models.proto_registry_entry import ProtoRegistryEntry +from conductor.client.http.models.service_method import ServiceMethod +from conductor.client.http.models.service_registry import ServiceRegistry class ServiceRegistryClient(ABC): diff --git a/src/conductor/client/task_client.py b/src/conductor/client/task_client.py index 5b84c96f..895ad435 100644 --- a/src/conductor/client/task_client.py +++ b/src/conductor/client/task_client.py @@ -1,13 +1,14 @@ from __future__ import annotations + from abc import ABC, abstractmethod -from typing import Optional, List +from typing import List, Optional from conductor.client.http.models.poll_data import PollData -from conductor.client.http.models.workflow import Workflow from conductor.client.http.models.task import Task +from conductor.client.http.models.task_exec_log import TaskExecLog from conductor.client.http.models.task_result import TaskResult +from conductor.client.http.models.workflow import Workflow from conductor.shared.http.enums import TaskResultStatus -from conductor.client.http.models.task_exec_log import TaskExecLog class TaskClient(ABC): diff --git a/src/conductor/client/telemetry/metrics_collector.py b/src/conductor/client/telemetry/metrics_collector.py index 7b14f700..b375a3ab 100644 --- a/src/conductor/client/telemetry/metrics_collector.py +++ b/src/conductor/client/telemetry/metrics_collector.py @@ -3,17 +3,14 @@ import time from typing import Any, ClassVar, Dict, List -from prometheus_client import CollectorRegistry -from prometheus_client import Counter -from prometheus_client import Gauge -from prometheus_client import write_to_textfile +from prometheus_client import CollectorRegistry, Counter, Gauge, write_to_textfile from prometheus_client.multiprocess import MultiProcessCollector from conductor.client.configuration.configuration import Configuration -from conductor.shared.configuration.settings.metrics_settings import MetricsSettings from conductor.client.telemetry.model.metric_documentation import MetricDocumentation from conductor.client.telemetry.model.metric_label import MetricLabel from conductor.client.telemetry.model.metric_name import MetricName +from conductor.shared.configuration.settings.metrics_settings import MetricsSettings logger = logging.getLogger(Configuration.get_logging_formatted_name(__name__)) diff --git a/src/conductor/client/worker/worker.py b/src/conductor/client/worker/worker.py index 1a77b180..ee0536cf 100644 --- a/src/conductor/client/worker/worker.py +++ b/src/conductor/client/worker/worker.py @@ -1,23 +1,23 @@ from __future__ import annotations + import dataclasses import inspect import logging import time import traceback from copy import deepcopy -from typing import Any, Callable, Union, Optional - +from typing import Any, Callable, Optional, Union -from conductor.shared.automator import utils -from conductor.shared.automator.utils import convert_from_dict_or_list from conductor.client.configuration.configuration import Configuration from conductor.client.http.api_client import ApiClient -from conductor.client.http.models.task_exec_log import TaskExecLog from conductor.client.http.models.task import Task +from conductor.client.http.models.task_exec_log import TaskExecLog from conductor.client.http.models.task_result import TaskResult +from conductor.client.worker.worker_interface import WorkerInterface +from conductor.shared.automator import utils +from conductor.shared.automator.utils import convert_from_dict_or_list from conductor.shared.http.enums import TaskResultStatus from conductor.shared.worker.exception import NonRetryableException -from conductor.client.worker.worker_interface import WorkerInterface ExecuteTaskFunction = Callable[[Union[Task, object]], Union[TaskResult, object]] diff --git a/src/conductor/client/worker/worker_interface.py b/src/conductor/client/worker/worker_interface.py index d4ca6e8e..716f9091 100644 --- a/src/conductor/client/worker/worker_interface.py +++ b/src/conductor/client/worker/worker_interface.py @@ -1,11 +1,12 @@ from __future__ import annotations + import abc import socket from typing import Union +from conductor.client.configuration.configuration import Configuration from conductor.client.http.models.task import Task from conductor.client.http.models.task_result import TaskResult -from conductor.client.configuration.configuration import Configuration DEFAULT_POLLING_INTERVAL = 100 # ms diff --git a/src/conductor/client/worker/worker_task.py b/src/conductor/client/worker/worker_task.py index 92983d2a..956dfd1e 100644 --- a/src/conductor/client/worker/worker_task.py +++ b/src/conductor/client/worker/worker_task.py @@ -1,6 +1,8 @@ from __future__ import annotations + import functools from typing import Optional + from conductor.client.automator.task_handler import register_decorated_fn from conductor.client.configuration.configuration import Configuration from conductor.client.workflow.task.simple_task import SimpleTask diff --git a/src/conductor/client/workflow/conductor_workflow.py b/src/conductor/client/workflow/conductor_workflow.py index 32bb9aac..750714e0 100644 --- a/src/conductor/client/workflow/conductor_workflow.py +++ b/src/conductor/client/workflow/conductor_workflow.py @@ -1,22 +1,23 @@ from __future__ import annotations + from copy import deepcopy -from typing import Any, Dict, List, Union, Optional +from typing import Any, Dict, List, Optional, Union from shortuuid import uuid from typing_extensions import Self from conductor.client.http.models.start_workflow_request import StartWorkflowRequest +from conductor.client.http.models.sub_workflow_params import SubWorkflowParams from conductor.client.http.models.workflow_def import WorkflowDef from conductor.client.http.models.workflow_run import WorkflowRun from conductor.client.http.models.workflow_task import WorkflowTask -from conductor.client.http.models.sub_workflow_params import SubWorkflowParams -from conductor.shared.http.enums import IdempotencyStrategy from conductor.client.workflow.executor.workflow_executor import WorkflowExecutor from conductor.client.workflow.task.fork_task import ForkTask from conductor.client.workflow.task.join_task import JoinTask from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType from conductor.client.workflow.task.timeout_policy import TimeoutPolicy +from conductor.shared.http.enums import IdempotencyStrategy class ConductorWorkflow: diff --git a/src/conductor/client/workflow/executor/workflow_executor.py b/src/conductor/client/workflow/executor/workflow_executor.py index 68db940d..3c7028e8 100644 --- a/src/conductor/client/workflow/executor/workflow_executor.py +++ b/src/conductor/client/workflow/executor/workflow_executor.py @@ -1,25 +1,25 @@ from __future__ import annotations + import uuid from typing import Any, Dict, List, Optional - from conductor.client.configuration.configuration import Configuration from conductor.client.http.api.metadata_resource_api import MetadataResourceApi from conductor.client.http.api.task_resource_api import TaskResourceApi from conductor.client.http.api_client import ApiClient +from conductor.client.http.models.correlation_ids_search_request import CorrelationIdsSearchRequest +from conductor.client.http.models.rerun_workflow_request import RerunWorkflowRequest +from conductor.client.http.models.scrollable_search_result_workflow_summary import ( + ScrollableSearchResultWorkflowSummary, +) +from conductor.client.http.models.signal_response import SignalResponse +from conductor.client.http.models.skip_task_request import SkipTaskRequest +from conductor.client.http.models.start_workflow_request import StartWorkflowRequest from conductor.client.http.models.task_result import TaskResult from conductor.client.http.models.workflow import Workflow from conductor.client.http.models.workflow_def import WorkflowDef from conductor.client.http.models.workflow_run import WorkflowRun from conductor.client.http.models.workflow_status import WorkflowStatus -from conductor.client.http.models.scrollable_search_result_workflow_summary import ( - ScrollableSearchResultWorkflowSummary, -) -from conductor.client.http.models.start_workflow_request import StartWorkflowRequest -from conductor.client.http.models.skip_task_request import SkipTaskRequest -from conductor.client.http.models.rerun_workflow_request import RerunWorkflowRequest -from conductor.client.http.models.signal_response import SignalResponse -from conductor.client.http.models.correlation_ids_search_request import CorrelationIdsSearchRequest from conductor.client.orkes.orkes_workflow_client import OrkesWorkflowClient diff --git a/src/conductor/client/workflow/task/do_while_task.py b/src/conductor/client/workflow/task/do_while_task.py index 7f6437ba..495080da 100644 --- a/src/conductor/client/workflow/task/do_while_task.py +++ b/src/conductor/client/workflow/task/do_while_task.py @@ -1,6 +1,6 @@ from __future__ import annotations -from copy import deepcopy +from copy import deepcopy from typing import List, Optional from conductor.client.http.models.workflow_task import WorkflowTask diff --git a/src/conductor/client/workflow/task/fork_task.py b/src/conductor/client/workflow/task/fork_task.py index ffaaa6dc..96f2eba0 100644 --- a/src/conductor/client/workflow/task/fork_task.py +++ b/src/conductor/client/workflow/task/fork_task.py @@ -1,4 +1,5 @@ from __future__ import annotations + from copy import deepcopy from typing import List, Optional, Union diff --git a/src/conductor/client/workflow/task/http_poll_task.py b/src/conductor/client/workflow/task/http_poll_task.py index 64c63a3c..54c7f10a 100644 --- a/src/conductor/client/workflow/task/http_poll_task.py +++ b/src/conductor/client/workflow/task/http_poll_task.py @@ -1,6 +1,6 @@ from __future__ import annotations -from copy import deepcopy +from copy import deepcopy from typing import Any, ClassVar, Dict, List, Optional from conductor.client.workflow.task.http_task import HttpMethod diff --git a/src/conductor/client/workflow/task/http_task.py b/src/conductor/client/workflow/task/http_task.py index c253f26a..98c5a4ca 100644 --- a/src/conductor/client/workflow/task/http_task.py +++ b/src/conductor/client/workflow/task/http_task.py @@ -1,4 +1,5 @@ from __future__ import annotations + from copy import deepcopy from enum import Enum from typing import Any, ClassVar, Dict, List, Optional, Union diff --git a/src/conductor/client/workflow/task/human_task.py b/src/conductor/client/workflow/task/human_task.py index 8f6836a8..669bcf3f 100644 --- a/src/conductor/client/workflow/task/human_task.py +++ b/src/conductor/client/workflow/task/human_task.py @@ -1,4 +1,5 @@ from __future__ import annotations + from enum import Enum from typing import Optional diff --git a/src/conductor/client/workflow/task/inline.py b/src/conductor/client/workflow/task/inline.py index a2d31569..90e314f3 100644 --- a/src/conductor/client/workflow/task/inline.py +++ b/src/conductor/client/workflow/task/inline.py @@ -1,4 +1,5 @@ from __future__ import annotations + from typing import Dict, Optional from conductor.client.workflow.task.task import TaskInterface diff --git a/src/conductor/client/workflow/task/javascript_task.py b/src/conductor/client/workflow/task/javascript_task.py index fa7eee68..7cc6c8c1 100644 --- a/src/conductor/client/workflow/task/javascript_task.py +++ b/src/conductor/client/workflow/task/javascript_task.py @@ -1,4 +1,5 @@ from __future__ import annotations + from typing import Dict, Optional from conductor.client.workflow.task.task import TaskInterface diff --git a/src/conductor/client/workflow/task/join_task.py b/src/conductor/client/workflow/task/join_task.py index 27702f26..8de7d926 100644 --- a/src/conductor/client/workflow/task/join_task.py +++ b/src/conductor/client/workflow/task/join_task.py @@ -1,4 +1,5 @@ from __future__ import annotations + from copy import deepcopy from typing import List, Optional diff --git a/src/conductor/client/workflow/task/kafka_publish.py b/src/conductor/client/workflow/task/kafka_publish.py index 910f97a7..755ccc91 100644 --- a/src/conductor/client/workflow/task/kafka_publish.py +++ b/src/conductor/client/workflow/task/kafka_publish.py @@ -1,5 +1,7 @@ from __future__ import annotations + from typing import Optional + from conductor.client.workflow.task.kafka_publish_input import KafkaPublishInput from conductor.client.workflow.task.task import TaskInterface from conductor.client.workflow.task.task_type import TaskType diff --git a/src/conductor/client/workflow/task/kafka_publish_input.py b/src/conductor/client/workflow/task/kafka_publish_input.py index 51839f54..cd0a0e47 100644 --- a/src/conductor/client/workflow/task/kafka_publish_input.py +++ b/src/conductor/client/workflow/task/kafka_publish_input.py @@ -1,6 +1,7 @@ from __future__ import annotations + from copy import deepcopy -from typing import Dict, Any, Optional, ClassVar +from typing import Any, ClassVar, Dict, Optional class KafkaPublishInput: diff --git a/src/conductor/client/workflow/task/llm_tasks/llm_chat_complete.py b/src/conductor/client/workflow/task/llm_tasks/llm_chat_complete.py index a8d05a22..09109720 100644 --- a/src/conductor/client/workflow/task/llm_tasks/llm_chat_complete.py +++ b/src/conductor/client/workflow/task/llm_tasks/llm_chat_complete.py @@ -1,5 +1,6 @@ from __future__ import annotations -from typing import Optional, List, Dict, Any + +from typing import Any, Dict, List, Optional from typing_extensions import Self diff --git a/src/conductor/client/workflow/task/llm_tasks/llm_generate_embeddings.py b/src/conductor/client/workflow/task/llm_tasks/llm_generate_embeddings.py index 83fc54cf..12dda0a0 100644 --- a/src/conductor/client/workflow/task/llm_tasks/llm_generate_embeddings.py +++ b/src/conductor/client/workflow/task/llm_tasks/llm_generate_embeddings.py @@ -1,4 +1,5 @@ from __future__ import annotations + from typing import Optional from conductor.client.workflow.task.task import TaskInterface diff --git a/src/conductor/client/workflow/task/llm_tasks/llm_index_documents.py b/src/conductor/client/workflow/task/llm_tasks/llm_index_documents.py index 990bf0e3..a1c98650 100644 --- a/src/conductor/client/workflow/task/llm_tasks/llm_index_documents.py +++ b/src/conductor/client/workflow/task/llm_tasks/llm_index_documents.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Optional, Dict, Any +from typing import Any, Dict, Optional from conductor.client.workflow.task.llm_tasks.utils.embedding_model import EmbeddingModel from conductor.client.workflow.task.task import TaskInterface diff --git a/src/conductor/client/workflow/task/llm_tasks/llm_index_text.py b/src/conductor/client/workflow/task/llm_tasks/llm_index_text.py index df5a9f9e..05139e4e 100644 --- a/src/conductor/client/workflow/task/llm_tasks/llm_index_text.py +++ b/src/conductor/client/workflow/task/llm_tasks/llm_index_text.py @@ -1,4 +1,5 @@ from __future__ import annotations + from typing import Optional from conductor.client.workflow.task.llm_tasks.utils.embedding_model import EmbeddingModel diff --git a/src/conductor/client/workflow/task/llm_tasks/llm_query_embeddings.py b/src/conductor/client/workflow/task/llm_tasks/llm_query_embeddings.py index 8e97e679..212fce13 100644 --- a/src/conductor/client/workflow/task/llm_tasks/llm_query_embeddings.py +++ b/src/conductor/client/workflow/task/llm_tasks/llm_query_embeddings.py @@ -1,4 +1,5 @@ from __future__ import annotations + from typing import List, Optional from conductor.client.workflow.task.task import TaskInterface diff --git a/src/conductor/client/workflow/task/llm_tasks/llm_search_index.py b/src/conductor/client/workflow/task/llm_tasks/llm_search_index.py index c5291654..0ceee5ee 100644 --- a/src/conductor/client/workflow/task/llm_tasks/llm_search_index.py +++ b/src/conductor/client/workflow/task/llm_tasks/llm_search_index.py @@ -1,4 +1,5 @@ from __future__ import annotations + from typing import Optional from conductor.client.workflow.task.task import TaskInterface diff --git a/src/conductor/client/workflow/task/llm_tasks/llm_text_complete.py b/src/conductor/client/workflow/task/llm_tasks/llm_text_complete.py index 3ab102b5..fac4f154 100644 --- a/src/conductor/client/workflow/task/llm_tasks/llm_text_complete.py +++ b/src/conductor/client/workflow/task/llm_tasks/llm_text_complete.py @@ -1,6 +1,7 @@ from __future__ import annotations -from typing import Optional, List, Dict, Any +from typing import Any, Dict, List, Optional + from typing_extensions import Self from conductor.client.workflow.task.task import TaskInterface diff --git a/src/conductor/client/workflow/task/start_workflow_task.py b/src/conductor/client/workflow/task/start_workflow_task.py index 88809aca..d59f615e 100644 --- a/src/conductor/client/workflow/task/start_workflow_task.py +++ b/src/conductor/client/workflow/task/start_workflow_task.py @@ -1,4 +1,5 @@ from __future__ import annotations + from typing import Optional from conductor.client.http.models.start_workflow_request import StartWorkflowRequest diff --git a/src/conductor/client/workflow/task/sub_workflow_task.py b/src/conductor/client/workflow/task/sub_workflow_task.py index 1f0d99c6..8919ec88 100644 --- a/src/conductor/client/workflow/task/sub_workflow_task.py +++ b/src/conductor/client/workflow/task/sub_workflow_task.py @@ -1,4 +1,5 @@ from __future__ import annotations + from copy import deepcopy from typing import Dict, Optional diff --git a/src/conductor/client/workflow/task/switch_task.py b/src/conductor/client/workflow/task/switch_task.py index 9f2a114f..4f411f42 100644 --- a/src/conductor/client/workflow/task/switch_task.py +++ b/src/conductor/client/workflow/task/switch_task.py @@ -2,7 +2,7 @@ from copy import deepcopy from enum import Enum -from typing import List, Dict, Optional +from typing import Dict, List, Optional from typing_extensions import Self diff --git a/src/conductor/client/workflow/task/task.py b/src/conductor/client/workflow/task/task.py index 925f8d0a..d04ce27e 100644 --- a/src/conductor/client/workflow/task/task.py +++ b/src/conductor/client/workflow/task/task.py @@ -1,7 +1,7 @@ from __future__ import annotations from copy import deepcopy -from typing import Any, Dict, List, Union, Optional +from typing import Any, Dict, List, Optional, Union from typing_extensions import Self diff --git a/src/conductor/client/workflow/task/wait_for_webhook_task.py b/src/conductor/client/workflow/task/wait_for_webhook_task.py index 57f63005..9ea475d2 100644 --- a/src/conductor/client/workflow/task/wait_for_webhook_task.py +++ b/src/conductor/client/workflow/task/wait_for_webhook_task.py @@ -1,4 +1,5 @@ from __future__ import annotations + from abc import ABC from typing import Dict, Optional diff --git a/src/conductor/client/workflow/task/wait_task.py b/src/conductor/client/workflow/task/wait_task.py index 62b3f669..f78f1d48 100644 --- a/src/conductor/client/workflow/task/wait_task.py +++ b/src/conductor/client/workflow/task/wait_task.py @@ -1,4 +1,5 @@ from __future__ import annotations + from abc import ABC from typing import Optional diff --git a/src/conductor/client/workflow_client.py b/src/conductor/client/workflow_client.py index db35014e..447a40db 100644 --- a/src/conductor/client/workflow_client.py +++ b/src/conductor/client/workflow_client.py @@ -1,19 +1,20 @@ from __future__ import annotations + from abc import ABC, abstractmethod -from typing import Optional, List, Dict +from typing import Dict, List, Optional -from conductor.client.http.models.workflow_run import WorkflowRun -from conductor.client.http.models.skip_task_request import SkipTaskRequest -from conductor.client.http.models.workflow_status import WorkflowStatus +from conductor.client.http.models.correlation_ids_search_request import CorrelationIdsSearchRequest +from conductor.client.http.models.rerun_workflow_request import RerunWorkflowRequest from conductor.client.http.models.scrollable_search_result_workflow_summary import ( ScrollableSearchResultWorkflowSummary, ) from conductor.client.http.models.signal_response import SignalResponse -from conductor.client.http.models.correlation_ids_search_request import CorrelationIdsSearchRequest -from conductor.client.http.models.rerun_workflow_request import RerunWorkflowRequest +from conductor.client.http.models.skip_task_request import SkipTaskRequest from conductor.client.http.models.start_workflow_request import StartWorkflowRequest from conductor.client.http.models.workflow import Workflow +from conductor.client.http.models.workflow_run import WorkflowRun from conductor.client.http.models.workflow_state_update import WorkflowStateUpdate +from conductor.client.http.models.workflow_status import WorkflowStatus from conductor.client.http.models.workflow_test_request import WorkflowTestRequest diff --git a/src/conductor/shared/worker/__init__.py b/src/conductor/shared/worker/__init__.py index 5dd1bdba..87e15bc8 100644 --- a/src/conductor/shared/worker/__init__.py +++ b/src/conductor/shared/worker/__init__.py @@ -1,12 +1,12 @@ from conductor.shared.worker.exception import NonRetryableException +from conductor.shared.worker.task_definition_helper import ( + apply_task_options_to_task_def, +) from conductor.shared.worker.task_options import ( TaskOptions, get_task_options, task_options, ) -from conductor.shared.worker.task_definition_helper import ( - apply_task_options_to_task_def, -) __all__ = [ "NonRetryableException", diff --git a/src/conductor/shared/worker/task_options.py b/src/conductor/shared/worker/task_options.py index c3e45e55..5f010253 100644 --- a/src/conductor/shared/worker/task_options.py +++ b/src/conductor/shared/worker/task_options.py @@ -3,7 +3,6 @@ import functools from typing import Callable, Optional - _TASK_OPTIONS_ATTR = "_conductor_task_options" From 17d22109ad5f0e1020b15f13f4b6326510d72957 Mon Sep 17 00:00:00 2001 From: IgorChvyrov-sm Date: Thu, 23 Oct 2025 15:03:52 +0300 Subject: [PATCH 07/17] Refactoring --- .../adapters/api/user_resource_api.py | 12 ++++++ .../asyncio_client/automator/task_handler.py | 10 +++-- .../orkes/orkes_authorization_client.py | 41 +++++++++++-------- .../orkes/orkes_workflow_client.py | 4 +- .../workflow/executor/workflow_executor.py | 8 ++-- .../api/application_resource_api_adapter.py | 41 ++++++++++++++++++- .../unit/asyncio_client/test_rest_adapter.py | 2 - .../orkes/test_async_authorization_client.py | 26 ++++++------ .../workflow/test_async_workflow_executor.py | 6 +-- 9 files changed, 101 insertions(+), 49 deletions(-) diff --git a/src/conductor/asyncio_client/adapters/api/user_resource_api.py b/src/conductor/asyncio_client/adapters/api/user_resource_api.py index a45d13e0..3a880d8d 100644 --- a/src/conductor/asyncio_client/adapters/api/user_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/user_resource_api.py @@ -23,6 +23,9 @@ async def get_granted_permissions( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> object: + # Convert empty user_id to None to prevent sending invalid data to server + if not user_id: + user_id = None # type: ignore[assignment] return await super().get_granted_permissions( user_id, _request_timeout=_request_timeout, @@ -45,6 +48,9 @@ async def get_user( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> ConductorUserAdapter: + # Convert empty user id to None to prevent sending invalid data to server + if not id: + id = None # type: ignore[assignment] result = await super().get_user( id, _request_timeout=_request_timeout, @@ -69,6 +75,9 @@ async def upsert_user( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> ConductorUserAdapter: + # Convert empty user id to None to prevent sending invalid data to server + if not id: + id = None # type: ignore[assignment] result = await super().upsert_user( id, upsert_user_request, @@ -116,6 +125,9 @@ async def delete_user( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> object: + # Convert empty user id to None to prevent sending invalid data to server + if not id: + id = None # type: ignore[assignment] return await super().delete_user( id, _request_timeout=_request_timeout, diff --git a/src/conductor/asyncio_client/automator/task_handler.py b/src/conductor/asyncio_client/automator/task_handler.py index 6807412b..29bdd684 100644 --- a/src/conductor/asyncio_client/automator/task_handler.py +++ b/src/conductor/asyncio_client/automator/task_handler.py @@ -53,7 +53,7 @@ def __init__( self, workers: List[WorkerInterface], configuration: Configuration, - metrics_settings: MetricsSettings, + metrics_settings: Optional[MetricsSettings] = None, scan_for_annotated_workers: bool = True, import_modules: Optional[List[str]] = None, ): @@ -123,7 +123,9 @@ def join_processes(self) -> None: logger.info("KeyboardInterrupt: Stopping all processes") self.stop_processes() - def __create_metrics_provider_process(self, metrics_settings: MetricsSettings) -> None: + def __create_metrics_provider_process( + self, metrics_settings: Optional[MetricsSettings] = None + ) -> None: if metrics_settings is None: self.metrics_provider_process = None return @@ -138,7 +140,7 @@ def __create_task_runner_processes( self, workers: List[WorkerInterface], configuration: Configuration, - metrics_settings: MetricsSettings, + metrics_settings: Optional[MetricsSettings] = None, ) -> None: self.task_runner_processes: List[Process] = [] for worker in workers: @@ -148,7 +150,7 @@ def __create_task_runner_process( self, worker: WorkerInterface, configuration: Configuration, - metrics_settings: MetricsSettings, + metrics_settings: Optional[MetricsSettings] = None, ) -> None: task_runner = AsyncTaskRunner(worker, configuration, metrics_settings) process = Process(target=self.coroutine_as_process_target, args=(task_runner.run,)) diff --git a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py index 8c6901c7..33bdcedf 100644 --- a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py @@ -51,9 +51,10 @@ async def update_user( """Update an existing user""" return await self.user_api.upsert_user(id=user_id, upsert_user_request=upsert_user_request) - async def get_user(self, user_id: str) -> ConductorUserAdapter: + async def get_user(self, user_id: str) -> Optional[ConductorUserAdapter]: """Get user by ID""" - return await self.user_api.get_user(id=user_id) + result = await self.user_api.get_user(id=user_id) + return ConductorUserAdapter.from_dict(result) # type: ignore[arg-type] async def delete_user(self, user_id: str) -> None: """Delete user by ID""" @@ -66,25 +67,28 @@ async def list_users(self, include_apps: bool = False) -> List[ConductorUserAdap # Application Operations async def create_application( self, application: CreateOrUpdateApplicationRequestAdapter - ) -> ExtendedConductorApplicationAdapter: + ) -> Optional[ExtendedConductorApplicationAdapter]: """Create a new application""" - return await self.application_api.create_application( + result = await self.application_api.create_application( create_or_update_application_request=application ) + return ExtendedConductorApplicationAdapter.from_dict(result) # type: ignore[arg-type] async def update_application( self, application_id: str, application: CreateOrUpdateApplicationRequestAdapter - ) -> ExtendedConductorApplicationAdapter: + ) -> Optional[ExtendedConductorApplicationAdapter]: """Update an existing application""" - return await self.application_api.update_application( + result = await self.application_api.update_application( id=application_id, create_or_update_application_request=application ) + return ExtendedConductorApplicationAdapter.from_dict(result) # type: ignore[arg-type] async def get_application( self, application_id: str ) -> Optional[ExtendedConductorApplicationAdapter]: """Get application by ID""" - return await self.application_api.get_application(id=application_id) + result = await self.application_api.get_application(id=application_id) + return ExtendedConductorApplicationAdapter.from_dict(result) # type: ignore[arg-type] async def delete_application(self, application_id: str) -> None: """Delete application by ID""" @@ -105,15 +109,17 @@ async def create_group( async def update_group( self, group_id: str, upsert_group_request: UpsertGroupRequest - ) -> GroupAdapter: + ) -> Optional[GroupAdapter]: """Update an existing group""" - return await self.group_api.upsert_group( + result = await self.group_api.upsert_group( id=group_id, upsert_group_request=upsert_group_request ) + return GroupAdapter.from_dict(result) # type: ignore[arg-type] - async def get_group(self, group_id: str) -> GroupAdapter: + async def get_group(self, group_id: str) -> Optional[GroupAdapter]: """Get group by ID""" - return await self.group_api.get_group(id=group_id) + result = await self.group_api.get_group(id=group_id) + return GroupAdapter.from_dict(result) # type: ignore[arg-type] async def delete_group(self, group_id: str) -> None: """Delete group by ID""" @@ -170,15 +176,17 @@ async def get_group_permissions(self, group_id: str) -> object: # Convenience Methods async def upsert_user( self, user_id: str, upsert_user_request: UpsertUserRequest - ) -> ConductorUserAdapter: + ) -> Optional[ConductorUserAdapter]: """Alias for create_user/update_user""" - return await self.create_user(user_id, upsert_user_request) + result = await self.create_user(user_id, upsert_user_request) + return ConductorUserAdapter.from_dict(result) # type: ignore[arg-type] async def upsert_group( self, group_id: str, upsert_group_request: UpsertGroupRequest - ) -> GroupAdapter: + ) -> Optional[GroupAdapter]: """Alias for create_group/update_group""" - return await self.create_group(group_id, upsert_group_request) + result = await self.create_group(group_id, upsert_group_request) + return GroupAdapter.from_dict(result) # type: ignore[arg-type] async def set_application_tags(self, tags: List[TagAdapter], application_id: str): await self.application_api.put_tag_for_application(application_id, tags) @@ -241,4 +249,5 @@ async def get_granted_permissions_for_user(self, user_id: str) -> List[GrantedAc async def get_app_by_access_key_id( self, access_key_id: str, *args, **kwargs ) -> Optional[ExtendedConductorApplicationAdapter]: - return await self.application_api.get_app_by_access_key_id(access_key_id, *args, **kwargs) + result = await self.application_api.get_app_by_access_key_id(access_key_id, *args, **kwargs) + return ExtendedConductorApplicationAdapter.from_dict(result) # type: ignore[arg-type] diff --git a/src/conductor/asyncio_client/orkes/orkes_workflow_client.py b/src/conductor/asyncio_client/orkes/orkes_workflow_client.py index 67a74663..6ab444c6 100644 --- a/src/conductor/asyncio_client/orkes/orkes_workflow_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_workflow_client.py @@ -228,13 +228,13 @@ async def skip_task_from_workflow( self, workflow_id: str, task_reference_name: str, - skip_task_request: SkipTaskRequestAdapter, + skip_task_request: Optional[SkipTaskRequestAdapter] = None, ) -> None: """Skip a task in a workflow""" await self.workflow_api.skip_task_from_workflow( workflow_id=workflow_id, task_reference_name=task_reference_name, - skip_task_request=skip_task_request, + skip_task_request=skip_task_request, # type: ignore[arg-type] ) async def jump_to_task( diff --git a/src/conductor/asyncio_client/workflow/executor/workflow_executor.py b/src/conductor/asyncio_client/workflow/executor/workflow_executor.py index c68b8656..91282355 100644 --- a/src/conductor/asyncio_client/workflow/executor/workflow_executor.py +++ b/src/conductor/asyncio_client/workflow/executor/workflow_executor.py @@ -266,7 +266,7 @@ async def skip_task_from_workflow( self, workflow_id: str, task_reference_name: str, - skip_task_request: SkipTaskRequestAdapter, + skip_task_request: Optional[SkipTaskRequestAdapter] = None, ) -> None: """Skips a given task from a current running workflow""" return await self.workflow_client.skip_task_from_workflow( @@ -307,18 +307,16 @@ async def update_task_by_ref_name_sync( status: str, ) -> WorkflowAdapter: """Update a task By Ref Name""" - body = {"result": task_output} return await self.task_client.update_task_sync( + request_body=task_output, workflow_id=workflow_id, task_ref_name=task_reference_name, status=status, - request_body=body, ) async def get_task(self, task_id: str) -> Optional[TaskAdapter]: """Get task by Id""" - task = await self.task_client.get_task(task_id=task_id) - return TaskAdapter.from_dict(task.to_dict()) + return await self.task_client.get_task(task_id=task_id) def __get_task_result( self, task_id: str, workflow_id: str, task_output: Dict[str, Any], status: str diff --git a/src/conductor/client/adapters/api/application_resource_api_adapter.py b/src/conductor/client/adapters/api/application_resource_api_adapter.py index 70163ab9..b4c28a4d 100644 --- a/src/conductor/client/adapters/api/application_resource_api_adapter.py +++ b/src/conductor/client/adapters/api/application_resource_api_adapter.py @@ -7,30 +7,67 @@ class ApplicationResourceApiAdapter(ApplicationResourceApi): def create_access_key(self, id: str, **kwargs): + # Convert empty application id to None to prevent sending invalid data to server + if not id: + id = None # type: ignore[assignment] return super().create_access_key(id, **kwargs) def add_role_to_application_user(self, application_id: str, role: str, **kwargs): + # Convert empty application_id and role to None to prevent sending invalid data to server + if not application_id: + application_id = None # type: ignore[assignment] + if not role: + role = None # type: ignore[assignment] return super().add_role_to_application_user(application_id, role, **kwargs) def delete_access_key(self, application_id: str, key_id: str, **kwargs): + # Convert empty application_id and key_id to None to prevent sending invalid data to server + if not application_id: + application_id = None # type: ignore[assignment] + if not key_id: + key_id = None # type: ignore[assignment] return super().delete_access_key(application_id, key_id, **kwargs) def remove_role_from_application_user(self, application_id: str, role: str, **kwargs): + # Convert empty application_id and role to None to prevent sending invalid data to server + if not application_id: + application_id = None # type: ignore[assignment] + if not role: + role = None # type: ignore[assignment] return super().remove_role_from_application_user(application_id, role, **kwargs) def get_app_by_access_key_id( self, access_key_id: str, **kwargs ) -> ExtendedConductorApplication: + # Convert empty access_key_id to None to prevent sending invalid data to server + if not access_key_id: + access_key_id = None # type: ignore[assignment] return super().get_app_by_access_key_id(access_key_id, **kwargs) def get_access_keys(self, id: str, **kwargs): + # Convert empty application id to None to prevent sending invalid data to server + if not id: + id = None # type: ignore[assignment] return super().get_access_keys(id=id, **kwargs) def toggle_access_key_status(self, application_id: str, key_id: str, **kwargs): + # Convert empty application_id and key_id to None to prevent sending invalid data to server + if not application_id: + application_id = None # type: ignore[assignment] + if not key_id: + key_id = None # type: ignore[assignment] return super().toggle_access_key_status(application_id, key_id, **kwargs) def get_tags_for_application(self, application_id: str, **kwargs) -> List[MetadataTag]: # type: ignore[override] + # Convert empty application_id to None to prevent sending invalid data to server + if not application_id: + application_id = None # type: ignore[assignment] return super().get_tags_for_application(application_id, **kwargs) - def delete_tag_for_application(self, body: List[MetadataTag], id: str, **kwargs) -> None: - return super().delete_tag_for_application(body, id, **kwargs) + def delete_tag_for_application(self, tag: List[MetadataTag], id: str, **kwargs) -> None: # type: ignore[override] + # Convert empty application id and tag list to None to prevent sending invalid data to server + if not id: + id = None # type: ignore[assignment] + if not tag: + tag = None # type: ignore[assignment] + return super().delete_tag_for_application(tag, id, **kwargs) diff --git a/tests/unit/asyncio_client/test_rest_adapter.py b/tests/unit/asyncio_client/test_rest_adapter.py index fb4fef74..bbf9810e 100644 --- a/tests/unit/asyncio_client/test_rest_adapter.py +++ b/tests/unit/asyncio_client/test_rest_adapter.py @@ -141,7 +141,6 @@ def test_check_http2_support_success(mock_logger): result = adapter.check_http2_support("https://example.com") assert result is True - mock_logger.info.assert_called() @patch("conductor.client.adapters.rest_adapter.logger") @@ -161,7 +160,6 @@ def test_check_http2_support_failure(mock_logger): result = adapter.check_http2_support("https://example.com") assert result is False - mock_logger.info.assert_called() @patch("conductor.client.adapters.rest_adapter.logger") diff --git a/tests/unit/orkes/test_async_authorization_client.py b/tests/unit/orkes/test_async_authorization_client.py index 8e09a409..2700da3c 100644 --- a/tests/unit/orkes/test_async_authorization_client.py +++ b/tests/unit/orkes/test_async_authorization_client.py @@ -264,7 +264,7 @@ async def test_get_user_with_empty_string(mocker, authorization_client, conducto mock = mocker.patch.object(UserResourceApi, "get_user") mock.return_value = conductor_user_adapter await authorization_client.get_user("") - mock.assert_called_with(id=None) + mock.assert_called_with(None, _request_timeout=None, _request_auth=None, _content_type=None, _headers=None, _host_index=0) @pytest.mark.asyncio @@ -279,7 +279,7 @@ async def test_delete_user_with_empty_string(mocker, authorization_client): from conductor.asyncio_client.http.api import UserResourceApi mock = mocker.patch.object(UserResourceApi, "delete_user") await authorization_client.delete_user("") - mock.assert_called_with(id=None) + mock.assert_called_with(None, _request_timeout=None, _request_auth=None, _content_type=None, _headers=None, _host_index=0) @pytest.mark.asyncio @@ -319,7 +319,7 @@ async def test_upsert_user_with_empty_string(mocker, authorization_client, condu upsert_req = UpsertUserRequestAdapter(name=USER_NAME, roles=["ADMIN"]) mock.return_value = conductor_user_adapter await authorization_client.upsert_user("", upsert_req) - mock.assert_called_with(id=None, upsert_user_request=upsert_req) + mock.assert_called_with(None, upsert_req, _request_timeout=None, _request_auth=None, _content_type=None, _headers=None, _host_index=0) @pytest.mark.asyncio @@ -517,7 +517,7 @@ async def test_get_granted_permissions_for_user_with_empty_string(mocker, author mock = mocker.patch.object(UserResourceApi, "get_granted_permissions") mock.return_value = {"grantedAccess": []} await authorization_client.get_granted_permissions_for_user("") - mock.assert_called_with(user_id=None) + mock.assert_called_with(None, _request_timeout=None, _request_auth=None, _content_type=None, _headers=None, _host_index=0) @pytest.mark.asyncio @@ -532,7 +532,7 @@ async def test_create_access_key_empty_string_converts_to_none(mocker, authoriza "secret": "test-secret", } await authorization_client.create_access_key("") - mock.assert_called_with(id=None) + mock.assert_called_with(None, _request_timeout=None, _request_auth=None, _content_type=None, _headers=None, _host_index=0) @pytest.mark.asyncio @@ -545,7 +545,7 @@ async def test_add_role_to_application_user_empty_strings_convert_to_none( mock = mocker.patch.object(ApplicationResourceApi, "add_role_to_application_user") await authorization_client.add_role_to_application_user("", "") - mock.assert_called_with(application_id=None, role=None) + mock.assert_called_with(None, None, _request_timeout=None, _request_auth=None, _content_type=None, _headers=None, _host_index=0) @pytest.mark.asyncio @@ -556,7 +556,7 @@ async def test_delete_access_key_empty_strings_convert_to_none(mocker, authoriza mock = mocker.patch.object(ApplicationResourceApi, "delete_access_key") await authorization_client.delete_access_key("", "") - mock.assert_called_with(application_id=None, key_id=None) + mock.assert_called_with(None, None, _request_timeout=None, _request_auth=None, _content_type=None, _headers=None, _host_index=0) @pytest.mark.asyncio @@ -569,7 +569,7 @@ async def test_remove_role_from_application_user_empty_strings_convert_to_none( mock = mocker.patch.object(ApplicationResourceApi, "remove_role_from_application_user") await authorization_client.remove_role_from_application_user("", "") - mock.assert_called_with(application_id=None, role=None) + mock.assert_called_with(None, None, _request_timeout=None, _request_auth=None, _content_type=None, _headers=None, _host_index=0) @pytest.mark.asyncio @@ -583,7 +583,7 @@ async def test_get_app_by_access_key_id_empty_string_converts_to_none( mock = mocker.patch.object(ApplicationResourceApi, "get_app_by_access_key_id") mock.return_value = extended_conductor_application_adapter await authorization_client.get_app_by_access_key_id("") - mock.assert_called_with(access_key_id=None) + mock.assert_called_with(None, _request_timeout=None, _request_auth=None, _content_type=None, _headers=None, _host_index=0) @pytest.mark.asyncio @@ -595,7 +595,7 @@ async def test_get_access_keys_empty_string_converts_to_none(mocker, authorizati mock = mocker.patch.object(ApplicationResourceApi, "get_access_keys") mock.return_value = [] await authorization_client.get_access_keys("") - mock.assert_called_with(id=None) + mock.assert_called_with(None, _request_timeout=None, _request_auth=None, _content_type=None, _headers=None, _host_index=0) @pytest.mark.asyncio @@ -611,7 +611,7 @@ async def test_toggle_access_key_status_empty_strings_convert_to_none(mocker, au "status": "INACTIVE", } await authorization_client.toggle_access_key_status("", "") - mock.assert_called_with(application_id=None, key_id=None) + mock.assert_called_with(None, None, _request_timeout=None, _request_auth=None, _content_type=None, _headers=None, _host_index=0) @pytest.mark.asyncio @@ -623,7 +623,7 @@ async def test_get_tags_for_application_empty_string_converts_to_none(mocker, au mock = mocker.patch.object(ApplicationResourceApi, "get_tags_for_application") mock.return_value = [] await authorization_client.get_application_tags("") - mock.assert_called_with(id=None) + mock.assert_called_with(None, _request_timeout=None, _request_auth=None, _content_type=None, _headers=None, _host_index=0) @pytest.mark.asyncio @@ -636,4 +636,4 @@ async def test_delete_tag_for_application_empty_strings_convert_to_none( mock = mocker.patch.object(ApplicationResourceApi, "delete_tag_for_application") await authorization_client.delete_application_tags([], "") - mock.assert_called_with(id=None, tag=None) + mock.assert_called_with(None, None, _request_timeout=None, _request_auth=None, _content_type=None, _headers=None, _host_index=0) diff --git a/tests/unit/workflow/test_async_workflow_executor.py b/tests/unit/workflow/test_async_workflow_executor.py index 12f0d0af..70f1384c 100644 --- a/tests/unit/workflow/test_async_workflow_executor.py +++ b/tests/unit/workflow/test_async_workflow_executor.py @@ -341,11 +341,7 @@ async def test_search_with_defaults(workflow_executor, mock_workflow_client): result = await workflow_executor.search() mock_workflow_client.search.assert_called_once_with( - start=None, - size=None, - free_text=None, - query=None, - skip_cache=None + start=0, size=100, free_text='*', query=None, skip_cache=None ) assert result == mock_search_result From 2563ffcb9bfc4ea4deb350c0a47dbf0540f091a5 Mon Sep 17 00:00:00 2001 From: IgorChvyrov-sm Date: Fri, 24 Oct 2025 15:01:57 +0200 Subject: [PATCH 08/17] Fixed mypy using facade pattern on adapters level --- .../adapters/api/group_resource_api.py | 199 +++++++++++++++++- .../asyncio_client/adapters/utils.py | 36 ++++ .../orkes/orkes_authorization_client.py | 5 +- 3 files changed, 230 insertions(+), 10 deletions(-) create mode 100644 src/conductor/asyncio_client/adapters/utils.py diff --git a/src/conductor/asyncio_client/adapters/api/group_resource_api.py b/src/conductor/asyncio_client/adapters/api/group_resource_api.py index d4ef7193..ced755cc 100644 --- a/src/conductor/asyncio_client/adapters/api/group_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/group_resource_api.py @@ -4,15 +4,24 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr +from conductor.asyncio_client.adapters.models.granted_access_response_adapter import ( + GrantedAccessResponseAdapter, +) from conductor.asyncio_client.adapters.models.group_adapter import GroupAdapter from conductor.asyncio_client.adapters.models.upsert_group_request_adapter import ( UpsertGroupRequestAdapter, ) from conductor.asyncio_client.http.api import GroupResourceApi +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter + +class GroupResourceApiAdapter: + """Adapter for GroupResourceApi that converts between generated models and adapters.""" -class GroupResourceApiAdapter(GroupResourceApi): - async def list_groups( # type: ignore[override] + def __init__(self, api_client): + self._api = GroupResourceApi(api_client) + + async def list_groups( self, _request_timeout: Union[ None, @@ -24,14 +33,15 @@ async def list_groups( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[GroupAdapter]: - result = await super().list_groups( + """List all groups, returning GroupAdapter instances.""" + result = await self._api.list_groups( _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, GroupAdapter) async def get_group( self, @@ -46,7 +56,8 @@ async def get_group( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> GroupAdapter: - result = await super().get_group( + """Get a group by ID, returning a GroupAdapter instance.""" + result = await self._api.get_group( id, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -54,12 +65,12 @@ async def get_group( _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, GroupAdapter) async def upsert_group( self, id: StrictStr, - upsert_group_request: UpsertGroupRequestAdapter, # type: ignore[override] + upsert_group_request: UpsertGroupRequestAdapter, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -70,7 +81,8 @@ async def upsert_group( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> GroupAdapter: - result = await super().upsert_group( + """Create or update a group, returning a GroupAdapter instance.""" + result = await self._api.upsert_group( id, upsert_group_request, _request_timeout=_request_timeout, @@ -79,5 +91,174 @@ async def upsert_group( _headers=_headers, _host_index=_host_index, ) + return convert_to_adapter(result, GroupAdapter) + + async def delete_group( + self, + id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Delete a group by ID.""" + await self._api.delete_group( + id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) - return result # type: ignore[return-value] + async def add_user_to_group( + self, + group_id: StrictStr, + user_id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Add a user to a group.""" + return await self._api.add_user_to_group( + group_id, + user_id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def remove_user_from_group( + self, + group_id: StrictStr, + user_id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Remove a user from a group.""" + return await self._api.remove_user_from_group( + group_id, + user_id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def add_users_to_group( + self, + group_id: StrictStr, + request_body: List[StrictStr], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Add multiple users to a group.""" + await self._api.add_users_to_group( + group_id, + request_body, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def remove_users_from_group( + self, + group_id: StrictStr, + request_body: List[StrictStr], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Remove multiple users from a group.""" + await self._api.remove_users_from_group( + group_id, + request_body, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def get_users_in_group( + self, + id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Get users in a group.""" + return await self._api.get_users_in_group( + id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def get_granted_permissions1( + self, + group_id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> GrantedAccessResponseAdapter: + """Get granted permissions for a group.""" + result = await self._api.get_granted_permissions1( + group_id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_to_adapter(result, GrantedAccessResponseAdapter) diff --git a/src/conductor/asyncio_client/adapters/utils.py b/src/conductor/asyncio_client/adapters/utils.py new file mode 100644 index 00000000..252df233 --- /dev/null +++ b/src/conductor/asyncio_client/adapters/utils.py @@ -0,0 +1,36 @@ +""" +Utility functions for converting between generated models and adapters. +""" + +from typing import List, TypeVar, Type, Any +from pydantic import BaseModel + +T = TypeVar("T", bound=BaseModel) + + +def convert_list_to_adapter(items: List[Any], adapter_class: Type[T]) -> List[T]: + """ + Convert a list of generated models to a list of adapters. + + Args: + items: List of generated model instances + adapter_class: The adapter class to convert to + + Returns: + List of adapter instances + """ + return [adapter_class.model_validate(item.model_dump()) for item in items] + + +def convert_to_adapter(item: Any, adapter_class: Type[T]) -> T: + """ + Convert a single generated model to an adapter. + + Args: + item: Generated model instance + adapter_class: The adapter class to convert to + + Returns: + Adapter instance + """ + return adapter_class.model_validate(item.model_dump()) diff --git a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py index 33bdcedf..a332ad08 100644 --- a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py @@ -18,6 +18,9 @@ from conductor.asyncio_client.adapters.models.granted_access_adapter import ( GrantedAccessAdapter as GrantedAccess, ) +from conductor.asyncio_client.adapters.models.granted_access_response_adapter import ( + GrantedAccessResponseAdapter, +) from conductor.asyncio_client.adapters.models.group_adapter import GroupAdapter from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.adapters.models.target_ref_adapter import ( @@ -169,7 +172,7 @@ async def get_permissions(self, entity_type: str, entity_id: str) -> object: """Get permissions for a specific entity (user, group, or application)""" return await self.authorization_api.get_permissions(type=entity_type, id=entity_id) - async def get_group_permissions(self, group_id: str) -> object: + async def get_group_permissions(self, group_id: str) -> GrantedAccessResponseAdapter: """Get permissions granted to a group""" return await self.group_api.get_granted_permissions1(group_id=group_id) From f502404f2e9fa87130cdb0ba00701bfc3b6de994 Mon Sep 17 00:00:00 2001 From: IgorChvyrov-sm Date: Tue, 28 Oct 2025 16:16:08 +0300 Subject: [PATCH 09/17] Fixed mypy using facade pattern on adapters level --- pyproject.toml | 8 +- .../adapters/api/admin_resource_api.py | 132 +++- .../adapters/api/application_resource_api.py | 204 +++--- .../api/authorization_resource_api.py | 63 +- .../adapters/api/environment_resource_api.py | 183 ++++- .../api/event_execution_resource_api.py | 67 +- .../adapters/api/event_resource_api.py | 401 ++++++++++- .../adapters/api/group_resource_api.py | 3 +- .../adapters/api/health_check_resource_api.py | 32 +- .../api/incoming_webhook_resource_api.py | 62 +- .../adapters/api/integration_resource_api.py | 307 +++++++-- .../adapters/api/limits_resource_api.py | 32 +- .../adapters/api/metadata_resource_api.py | 195 +++++- .../adapters/api/metrics_resource_api.py | 40 +- .../api/metrics_token_resource_api.py | 35 +- .../adapters/api/prompt_resource_api.py | 126 +++- .../adapters/api/queue_admin_resource_api.py | 53 +- .../adapters/api/scheduler_resource_api.py | 240 ++++++- .../adapters/api/schema_resource_api.py | 76 ++- .../adapters/api/secret_resource_api.py | 181 ++++- .../asyncio_client/adapters/api/tags_api.py | 159 ++++- .../adapters/api/task_resource_api.py | 307 +++++++-- .../adapters/api/token_resource_api.py | 59 +- .../adapters/api/user_resource_api.py | 68 +- .../adapters/api/version_resource_api.py | 32 +- .../api/webhooks_config_resource_api.py | 206 +++++- .../api/workflow_bulk_resource_api.py | 162 ++++- .../adapters/api/workflow_resource_api.py | 624 ++++++++++++++---- .../adapters/models/conductor_user_adapter.py | 4 +- .../adapters/models/descriptor_adapter.py | 20 +- .../models/descriptor_proto_adapter.py | 36 +- .../descriptor_proto_or_builder_adapter.py | 34 +- .../models/enum_descriptor_adapter.py | 10 +- .../models/enum_descriptor_proto_adapter.py | 16 +- ...num_descriptor_proto_or_builder_adapter.py | 18 +- .../adapters/models/enum_options_adapter.py | 14 +- .../models/enum_options_or_builder_adapter.py | 12 +- .../models/enum_value_options_adapter.py | 12 +- .../enum_value_options_or_builder_adapter.py | 12 +- .../models/environment_variable_adapter.py | 2 +- .../adapters/models/event_handler_adapter.py | 4 +- .../extended_conductor_application_adapter.py | 2 +- .../models/extended_secret_adapter.py | 2 +- .../models/extended_task_def_adapter.py | 10 +- .../models/extended_workflow_def_adapter.py | 12 +- .../models/extension_range_options_adapter.py | 14 +- ...ension_range_options_or_builder_adapter.py | 18 +- .../adapters/models/field_options_adapter.py | 16 +- .../field_options_or_builder_adapter.py | 18 +- .../models/file_descriptor_adapter.py | 18 +- .../models/file_descriptor_proto_adapter.py | 30 +- .../adapters/models/file_options_adapter.py | 12 +- .../models/file_options_or_builder_adapter.py | 14 +- .../models/granted_access_response_adapter.py | 2 +- .../adapters/models/group_adapter.py | 2 +- .../adapters/models/integration_adapter.py | 4 +- .../models/integration_api_adapter.py | 2 +- .../models/integration_def_adapter.py | 2 +- .../integration_def_form_field_adapter.py | 4 +- .../models/message_options_adapter.py | 12 +- .../message_options_or_builder_adapter.py | 14 +- .../models/message_template_adapter.py | 2 +- .../adapters/models/method_options_adapter.py | 14 +- .../method_options_or_builder_adapter.py | 14 +- .../adapters/models/oneof_options_adapter.py | 14 +- .../oneof_options_or_builder_adapter.py | 14 +- .../adapters/models/role_adapter.py | 2 +- ..._search_result_workflow_summary_adapter.py | 2 +- ...h_result_handled_event_response_adapter.py | 2 +- .../search_result_task_summary_adapter.py | 2 +- ...rkflow_schedule_execution_model_adapter.py | 2 +- .../models/service_descriptor_adapter.py | 8 +- .../service_descriptor_proto_adapter.py | 14 +- ...ice_descriptor_proto_or_builder_adapter.py | 14 +- .../models/service_options_adapter.py | 12 +- .../service_options_or_builder_adapter.py | 12 +- .../models/source_code_info_adapter.py | 10 +- .../source_code_info_or_builder_adapter.py | 10 +- .../adapters/models/task_def_adapter.py | 8 +- .../adapters/models/task_result_adapter.py | 2 +- .../models/uninterpreted_option_adapter.py | 10 +- ...uninterpreted_option_or_builder_adapter.py | 10 +- .../adapters/models/webhook_config_adapter.py | 4 +- .../adapters/models/workflow_adapter.py | 6 +- .../adapters/models/workflow_def_adapter.py | 10 +- .../adapters/models/workflow_run_adapter.py | 2 +- .../models/workflow_schedule_adapter.py | 2 +- .../models/workflow_schedule_model_adapter.py | 2 +- .../adapters/models/workflow_task_adapter.py | 16 +- .../models/workflow_test_request_adapter.py | 6 +- .../asyncio_client/adapters/utils.py | 18 +- .../orkes/orkes_authorization_client.py | 9 +- .../orkes/orkes_metadata_client.py | 2 +- .../orkes/orkes_secret_client.py | 4 +- .../unit/orkes/test_async_metadata_client.py | 4 +- 95 files changed, 3907 insertions(+), 815 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 01919908..ba9dae62 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -151,7 +151,9 @@ ignore = [ # too-many-return-statements "PLR0911", # flake8-type-checking (150 errors) - "TC" + "TC", + # PT013: Arguments starting with underscore in function definitions starting with `test_` (e.g., test_connectivity in event_resource_api.py) + "PT019" ] [tool.ruff.lint.isort] @@ -214,6 +216,10 @@ follow_imports = "silent" plugins = [ "pydantic.mypy" ] +disable_error_code = [ + "assignment", + "arg-type", +] [[tool.mypy.overrides]] module = [ diff --git a/src/conductor/asyncio_client/adapters/api/admin_resource_api.py b/src/conductor/asyncio_client/adapters/api/admin_resource_api.py index 16af873f..d8af1f49 100644 --- a/src/conductor/asyncio_client/adapters/api/admin_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/admin_resource_api.py @@ -1,4 +1,134 @@ +from __future__ import annotations + +from typing import Any, Annotated, Dict, Optional, Tuple, Union, List +from pydantic import StrictStr, StrictFloat, StrictInt, Field + +from conductor.asyncio_client.adapters.models.task_adapter import TaskAdapter from conductor.asyncio_client.http.api import AdminResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter + + +class AdminResourceApiAdapter: + """Adapter for AdminResourceApi that converts between generated models and adapters.""" + + def __init__(self, api_client: ApiClient): + self._api = AdminResourceApi(api_client) + + async def clear_task_execution_cache( + self, + task_def_name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Clear the task execution cache""" + await self._api.clear_task_execution_cache( + task_def_name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def get_redis_usage( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, object]: + """Get the Redis usage""" + return await self._api.get_redis_usage( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def requeue_sweep( + self, + workflow_id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> str: + """Requeue sweep""" + return await self._api.requeue_sweep( + workflow_id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + async def verify_and_repair_workflow_consistency( + self, + workflow_id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> str: + """Verify and repair workflow consistency""" + return await self._api.verify_and_repair_workflow_consistency( + workflow_id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) -class AdminResourceApiAdapter(AdminResourceApi): ... + async def view( + self, + tasktype: StrictStr, + start: Optional[StrictInt] = None, + count: Optional[StrictInt] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[TaskAdapter]: + """View tasks""" + result = await self._api.view( + tasktype, + start, + count, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_list_to_adapter(result, TaskAdapter) diff --git a/src/conductor/asyncio_client/adapters/api/application_resource_api.py b/src/conductor/asyncio_client/adapters/api/application_resource_api.py index e7b9a56c..07dc500e 100644 --- a/src/conductor/asyncio_client/adapters/api/application_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/application_resource_api.py @@ -12,9 +12,16 @@ ) from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.http.api import ApplicationResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter -class ApplicationResourceApiAdapter(ApplicationResourceApi): +class ApplicationResourceApiAdapter: + """Adapter for ApplicationResourceApi that converts between generated models and adapters.""" + + def __init__(self, api_client: ApiClient): + self._api = ApplicationResourceApi(api_client) + async def create_access_key( self, id: StrictStr, @@ -27,11 +34,12 @@ async def create_access_key( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ): - if not id: - id = None # type: ignore[assignment] - return await super().create_access_key( - id, + ) -> object: + """Create an access key""" + normalized_id: Optional[StrictStr] = id or None + + return await self._api.create_access_key( + normalized_id, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -52,20 +60,20 @@ async def add_role_to_application_user( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ): - if not application_id: - application_id = None # type: ignore[assignment] - if not role: - role = None # type: ignore[assignment] - return await super().add_role_to_application_user( - application_id, - role, + ) -> object: + """Add a role to an application user""" + normalized_application_id: Optional[StrictStr] = application_id or None + normalized_role: Optional[StrictStr] = role or None + + return await self._api.add_role_to_application_user( + normalized_application_id, + normalized_role, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, - ) # type: ignore[arg-type] + ) async def delete_access_key( self, @@ -80,14 +88,14 @@ async def delete_access_key( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ): - if not application_id: - application_id = None # type: ignore[assignment] - if not key_id: - key_id = None # type: ignore[assignment] - return await super().delete_access_key( - application_id, - key_id, + ) -> object: + """Delete an access key""" + normalized_application_id: Optional[StrictStr] = application_id or None + normalized_key_id: Optional[StrictStr] = key_id or None + + return await self._api.delete_access_key( + normalized_application_id, + normalized_key_id, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -108,14 +116,14 @@ async def remove_role_from_application_user( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ): - if not application_id: - application_id = None # type: ignore[assignment] - if not role: - role = None # type: ignore[assignment] - return await super().remove_role_from_application_user( - application_id, - role, + ) -> object: + """Remove role from application user""" + normalized_application_id: Optional[StrictStr] = application_id or None + normalized_role: Optional[StrictStr] = role or None + + return await self._api.remove_role_from_application_user( + normalized_application_id, + normalized_role, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -123,7 +131,7 @@ async def remove_role_from_application_user( _host_index=_host_index, ) - async def get_app_by_access_key_id( # type: ignore[override] + async def get_app_by_access_key_id( self, access_key_id: StrictStr, _request_timeout: Union[ @@ -136,17 +144,18 @@ async def get_app_by_access_key_id( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> Optional[ExtendedConductorApplicationAdapter]: - if not access_key_id: - access_key_id = None # type: ignore[assignment] - result = await super().get_app_by_access_key_id( - access_key_id, + """Get application by access key_id""" + normalized_access_key_id: Optional[StrictStr] = access_key_id or None + + result = await self._api.get_app_by_access_key_id( + normalized_access_key_id, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, ExtendedConductorApplicationAdapter) async def get_access_keys( self, @@ -160,11 +169,12 @@ async def get_access_keys( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ): - if not id: - id = None # type: ignore[assignment] - return await super().get_access_keys( - id, + ) -> object: + """Get access keys for an application""" + normalized_id: Optional[StrictStr] = id or None + + return await self._api.get_access_keys( + normalized_id, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -185,14 +195,14 @@ async def toggle_access_key_status( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ): - if not application_id: - application_id = None # type: ignore[assignment] - if not key_id: - key_id = None # type: ignore[assignment] - return await super().toggle_access_key_status( - application_id, - key_id, + ) -> object: + """Toggle access key status""" + normalized_application_id: Optional[StrictStr] = application_id or None + normalized_key_id: Optional[StrictStr] = key_id or None + + return await self._api.toggle_access_key_status( + normalized_application_id, + normalized_key_id, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -200,7 +210,7 @@ async def toggle_access_key_status( _host_index=_host_index, ) - async def get_tags_for_application( # type: ignore[override] + async def get_tags_for_application( self, id: StrictStr, _request_timeout: Union[ @@ -213,22 +223,23 @@ async def get_tags_for_application( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TagAdapter]: - if not id: - id = None # type: ignore[assignment] - result = await super().get_tags_for_application( - id, + """Get tags for an application""" + normalized_id: Optional[StrictStr] = id or None + + result = await self._api.get_tags_for_application( + normalized_id, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, TagAdapter) async def put_tag_for_application( self, id: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -239,13 +250,13 @@ async def put_tag_for_application( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - if not id: - id = None # type: ignore[assignment] - if not tag: - tag = None # type: ignore[assignment] - return await super().put_tag_for_application( - id, - tag, # type: ignore[arg-type] + """Put tag for an application""" + normalized_id: Optional[StrictStr] = id or None + normalized_tag: Optional[List[TagAdapter]] = tag or None + + await self._api.put_tag_for_application( + normalized_id, + normalized_tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -256,7 +267,7 @@ async def put_tag_for_application( async def delete_tag_for_application( self, id: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -267,13 +278,13 @@ async def delete_tag_for_application( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - if not id: - id = None # type: ignore[assignment] - if not tag: - tag = None # type: ignore[assignment] - return await super().delete_tag_for_application( - id, - tag, # type: ignore[arg-type] + """Delete tag for an application""" + normalized_id: Optional[StrictStr] = id or None + normalized_tag: Optional[List[TagAdapter]] = tag or None + + return await self._api.delete_tag_for_application( + normalized_id, + normalized_tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -281,7 +292,7 @@ async def delete_tag_for_application( _host_index=_host_index, ) - async def create_application( # type: ignore[override] + async def create_application( self, create_or_update_application_request: CreateOrUpdateApplicationRequestAdapter, _request_timeout: Union[ @@ -294,7 +305,8 @@ async def create_application( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> ExtendedConductorApplicationAdapter: - result = await super().create_application( + """Create an application""" + result = await self._api.create_application( create_or_update_application_request, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -302,9 +314,9 @@ async def create_application( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, ExtendedConductorApplicationAdapter) - async def update_application( # type: ignore[override] + async def update_application( self, id: StrictStr, create_or_update_application_request: CreateOrUpdateApplicationRequestAdapter, @@ -318,7 +330,8 @@ async def update_application( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> ExtendedConductorApplicationAdapter: - result = await super().update_application( + """Update an application""" + result = await self._api.update_application( id, create_or_update_application_request, _request_timeout=_request_timeout, @@ -327,7 +340,7 @@ async def update_application( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, ExtendedConductorApplicationAdapter) async def get_application( self, @@ -342,7 +355,8 @@ async def get_application( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> ExtendedConductorApplicationAdapter: - result = await super().get_application( + """Get an application""" + result = await self._api.get_application( id, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -350,9 +364,9 @@ async def get_application( _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, ExtendedConductorApplicationAdapter) - async def list_applications( # type: ignore[override] + async def list_applications( self, _request_timeout: Union[ None, @@ -364,11 +378,35 @@ async def list_applications( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[ExtendedConductorApplicationAdapter]: - result = await super().list_applications( + """List applications""" + result = await self._api.list_applications( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_list_to_adapter(result, ExtendedConductorApplicationAdapter) + + async def delete_application( + self, + id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Delete an application""" + return await self._api.delete_application( + id, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] diff --git a/src/conductor/asyncio_client/adapters/api/authorization_resource_api.py b/src/conductor/asyncio_client/adapters/api/authorization_resource_api.py index 872a7280..f404fdea 100644 --- a/src/conductor/asyncio_client/adapters/api/authorization_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/authorization_resource_api.py @@ -1,4 +1,65 @@ +from __future__ import annotations + +from typing import Annotated, Any, Dict, Optional, Tuple, Union + +from pydantic import Field, StrictFloat, StrictInt, StrictStr + from conductor.asyncio_client.http.api import AuthorizationResourceApi +from conductor.asyncio_client.adapters.models.authorization_request_adapter import ( + AuthorizationRequestAdapter, +) +from conductor.asyncio_client.adapters import ApiClient + + +class AuthorizationResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self.api = AuthorizationResourceApi(api_client) + + async def get_permissions( + self, + type: StrictStr, + id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Get permissions""" + return await self.api.get_permissions(type, id) + async def grant_permissions( + self, + authorization_request: AuthorizationRequestAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Grant permissions""" + return await self.api.grant_permissions(authorization_request) -class AuthorizationResourceApiAdapter(AuthorizationResourceApi): ... + async def remove_permissions( + self, + authorization_request: AuthorizationRequestAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Remove permissions""" + return await self.api.remove_permissions(authorization_request) diff --git a/src/conductor/asyncio_client/adapters/api/environment_resource_api.py b/src/conductor/asyncio_client/adapters/api/environment_resource_api.py index 892b50b5..d3f1c4ae 100644 --- a/src/conductor/asyncio_client/adapters/api/environment_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/environment_resource_api.py @@ -1,4 +1,185 @@ +from __future__ import annotations + from conductor.asyncio_client.http.api import EnvironmentResourceApi +from typing import Annotated, Any, Dict, Optional, List, Tuple, Union + +from pydantic import Field, StrictFloat, StrictInt, StrictStr +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter +from conductor.asyncio_client.adapters.models.environment_variable_adapter import ( + EnvironmentVariableAdapter, +) +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter + + +class EnvironmentResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = EnvironmentResourceApi(api_client) + + async def create_or_update_env_variable( + self, + key: StrictStr, + body: Annotated[str, Field(min_length=0, strict=True, max_length=65535)], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Create or update environment variable""" + await self._api.create_or_update_env_variable( + key, + body, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def delete_env_variable( + self, + key: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> str: + """Delete environment variable""" + return await self._api.delete_env_variable( + key, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def delete_tag_for_env_var( + self, + name: StrictStr, + tag: List[TagAdapter], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Delete tag for environment variable""" + await self._api.delete_tag_for_env_var( + name, + tag, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def get2( + self, + key: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> str: + """Get environment variable by key""" + return await self._api.get2( + key, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def get_all( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[EnvironmentVariableAdapter]: + """Get all environment variables""" + result = await self._api.get_all( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_list_to_adapter(result, EnvironmentVariableAdapter) + + async def get_tags_for_env_var( + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[TagAdapter]: + """Get tags for environment variables""" + result = await self._api.get_tags_for_env_var( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_list_to_adapter(result, TagAdapter) -class EnvironmentResourceApiAdapter(EnvironmentResourceApi): ... + async def put_tag_for_env_var( + self, + name: StrictStr, + tag: List[TagAdapter], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Put tag for environment variable""" + await self._api.put_tag_for_env_var( + name, + tag, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) diff --git a/src/conductor/asyncio_client/adapters/api/event_execution_resource_api.py b/src/conductor/asyncio_client/adapters/api/event_execution_resource_api.py index 06bcd9c1..f0f7894e 100644 --- a/src/conductor/asyncio_client/adapters/api/event_execution_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/event_execution_resource_api.py @@ -1,4 +1,69 @@ +from __future__ import annotations +from typing import Annotated, Any, Dict, Optional, List, Tuple, Union +from pydantic import Field, StrictFloat, StrictInt, StrictStr + +from conductor.asyncio_client.adapters.models.search_result_handled_event_response_adapter import ( + SearchResultHandledEventResponseAdapter, +) +from conductor.asyncio_client.adapters.models.extended_event_execution_adapter import ( + ExtendedEventExecutionAdapter, +) from conductor.asyncio_client.http.api import EventExecutionResourceApi +from conductor.asyncio_client.adapters import ApiClient + +from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter + + +class EventExecutionResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = EventExecutionResourceApi(api_client) + + async def get_event_handlers_for_event1( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> SearchResultHandledEventResponseAdapter: + """Get All active Event Handlers for the last 24 hours""" + result = await self.get_event_handlers_for_event1( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + return convert_to_adapter(result, SearchResultHandledEventResponseAdapter) + async def get_event_handlers_for_event2( + self, + event: StrictStr, + var_from: StrictInt, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[ExtendedEventExecutionAdapter]: + """Get event handlers for a given event""" + result = await self.get_event_handlers_for_event2( + event=event, + var_from=var_from, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) -class EventExecutionResourceApiAdapter(EventExecutionResourceApi): ... + return convert_list_to_adapter(result, ExtendedEventExecutionAdapter) diff --git a/src/conductor/asyncio_client/adapters/api/event_resource_api.py b/src/conductor/asyncio_client/adapters/api/event_resource_api.py index 24f6f70d..f4107088 100644 --- a/src/conductor/asyncio_client/adapters/api/event_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/event_resource_api.py @@ -1,4 +1,403 @@ +from __future__ import annotations + from conductor.asyncio_client.http.api import EventResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.models.connectivity_test_input_adapter import ( + ConnectivityTestInputAdapter, +) +from typing import Annotated, Any, Dict, Optional, List, Tuple, Union +from pydantic import Field, StrictFloat, StrictInt, StrictStr, StrictBool + +from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter +from conductor.asyncio_client.adapters.models.event_handler_adapter import EventHandlerAdapter +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter +from conductor.asyncio_client.adapters.models.connectivity_test_result_adapter import ( + ConnectivityTestResultAdapter, +) + + +class EventResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = EventResourceApi(api_client) + + async def add_event_handler( + self, + event_handler: List[EventHandlerAdapter], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Add a new event handler""" + await self._api.add_event_handler( + event_handler, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def delete_queue_config( + self, + queue_type: StrictStr, + queue_name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Delete queue config""" + await self._api.delete_queue_config( + queue_type, + queue_name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def delete_tag_for_event_handler( + self, + name: StrictStr, + tag: List[TagAdapter], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Delete a tag for event handler""" + await self._api.delete_tag_for_event_handler( + name, + tag, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def get_event_handler_by_name( + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> EventHandlerAdapter: + """Get event handler by name""" + result = await self._api.get_event_handler_by_name( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_to_adapter(result, EventHandlerAdapter) + + async def get_event_handlers( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[EventHandlerAdapter]: + """Get all event handlers""" + result = await self._api.get_event_handlers( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_list_to_adapter(result, EventHandlerAdapter) + + async def get_event_handlers_for_event( + self, + event: StrictStr, + active_only: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[EventHandlerAdapter]: + """Get event handlers for a given event""" + result = await self._api.get_event_handlers_for_event( + event, + active_only, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_list_to_adapter(result, EventHandlerAdapter) + + async def get_queue_config( + self, + queue_type: StrictStr, + queue_name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, object]: + """Get queue config""" + return await self._api.get_queue_config( + queue_type, + queue_name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def get_queue_names( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, str]: + """Get all queue configs""" + return await self._api.get_queue_names( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def get_tags_for_event_handler( + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[TagAdapter]: + """Get tags for event handler""" + result = await self._api.get_tags_for_event_handler( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_list_to_adapter(result, TagAdapter) + + async def handle_incoming_event( + self, + request_body: Dict[str, Dict[str, Any]], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Handle an incoming event""" + await self._api.handle_incoming_event( + request_body, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def put_queue_config( + self, + queue_type: StrictStr, + queue_name: StrictStr, + body: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """(Deprecated) Put queue config""" + await self._api.put_queue_config( + queue_type, + queue_name, + body, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def put_tag_for_event_handler( + self, + name: StrictStr, + tag: List[TagAdapter], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Put a tag for event handler""" + await self._api.put_tag_for_event_handler( + name, + tag, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def remove_event_handler_status( + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Remove an event handler""" + await self._api.remove_event_handler_status( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def test( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> EventHandlerAdapter: + """Get event handler by name""" + result = await self._api.test( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_to_adapter(result, EventHandlerAdapter) + async def test_connectivity( + self, + connectivity_test_input: ConnectivityTestInputAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> ConnectivityTestResultAdapter: + """Test connectivity for a given queue using a workflow with EVENT task and an EventHandler""" + result = await self._api.test_connectivity( + connectivity_test_input, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_to_adapter(result, ConnectivityTestResultAdapter) -class EventResourceApiAdapter(EventResourceApi): ... + async def update_event_handler( + self, + event_handler: EventHandlerAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Update an existing event handler""" + await self._api.update_event_handler( + event_handler, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) diff --git a/src/conductor/asyncio_client/adapters/api/group_resource_api.py b/src/conductor/asyncio_client/adapters/api/group_resource_api.py index ced755cc..290f9792 100644 --- a/src/conductor/asyncio_client/adapters/api/group_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/group_resource_api.py @@ -13,12 +13,13 @@ ) from conductor.asyncio_client.http.api import GroupResourceApi from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter +from conductor.asyncio_client.adapters import ApiClient class GroupResourceApiAdapter: """Adapter for GroupResourceApi that converts between generated models and adapters.""" - def __init__(self, api_client): + def __init__(self, api_client: ApiClient): self._api = GroupResourceApi(api_client) async def list_groups( diff --git a/src/conductor/asyncio_client/adapters/api/health_check_resource_api.py b/src/conductor/asyncio_client/adapters/api/health_check_resource_api.py index f44cde8d..c064dd7a 100644 --- a/src/conductor/asyncio_client/adapters/api/health_check_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/health_check_resource_api.py @@ -1,4 +1,34 @@ +from __future__ import annotations + +from typing import Annotated, Any, Dict, Optional, Tuple, Union + +from pydantic import Field, StrictFloat, StrictInt, StrictStr +from conductor.asyncio_client.adapters import ApiClient + from conductor.asyncio_client.http.api import HealthCheckResourceApi -class HealthCheckResourceApiAdapter(HealthCheckResourceApi): ... +class HealthCheckResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = HealthCheckResourceApi(api_client) + + async def do_check( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, object]: + """Check the health of the API""" + return await self._api.do_check( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) diff --git a/src/conductor/asyncio_client/adapters/api/incoming_webhook_resource_api.py b/src/conductor/asyncio_client/adapters/api/incoming_webhook_resource_api.py index 4a91fcef..11818af4 100644 --- a/src/conductor/asyncio_client/adapters/api/incoming_webhook_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/incoming_webhook_resource_api.py @@ -1,4 +1,64 @@ +from __future__ import annotations + +from typing import Any, Annotated, Dict, Optional, Tuple, Union +from pydantic import StrictStr, StrictFloat, StrictInt, Field + from conductor.asyncio_client.http.api import IncomingWebhookResourceApi +from conductor.asyncio_client.adapters import ApiClient + + +class IncomingWebhookResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = IncomingWebhookResourceApi(api_client) + async def handle_webhook( + self, + id: StrictStr, + request_params: Dict[str, Dict[str, Any]], + body: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> str: + """Handle webhook""" + return await self._api.handle_webhook( + id, + request_params, + body, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) -class IncomingWebhookResourceApiAdapter(IncomingWebhookResourceApi): ... + async def handle_webhook1( + self, + id: StrictStr, + request_params: Dict[str, Dict[str, Any]], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> str: + """Handle webhook""" + return await self._api.handle_webhook1( + id, + request_params, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) diff --git a/src/conductor/asyncio_client/adapters/api/integration_resource_api.py b/src/conductor/asyncio_client/adapters/api/integration_resource_api.py index 59f09776..00243df0 100644 --- a/src/conductor/asyncio_client/adapters/api/integration_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/integration_resource_api.py @@ -11,9 +11,95 @@ from conductor.asyncio_client.adapters.models.message_template_adapter import MessageTemplateAdapter from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.http.api import IntegrationResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter +from conductor.asyncio_client.adapters.models.integration_api_update_adapter import ( + IntegrationApiUpdateAdapter, +) +from conductor.asyncio_client.adapters.models.integration_update_adapter import ( + IntegrationUpdateAdapter, +) -class IntegrationResourceApiAdapter(IntegrationResourceApi): +class IntegrationResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = IntegrationResourceApi(api_client) + + async def associate_prompt_with_integration( + self, + integration_provider: StrictStr, + integration_name: StrictStr, + prompt_name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Associate a prompt with an integration""" + await self._api.associate_prompt_with_integration( + integration_provider, + integration_name, + prompt_name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def delete_integration_api( + self, + name: StrictStr, + integration_name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Delete an Integration""" + await self._api.delete_integration_api( + name, + integration_name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def delete_integration_provider( + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Delete an Integration Provider""" + await self._api.delete_integration_provider( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + async def get_integration_provider( self, name: StrictStr, @@ -27,7 +113,8 @@ async def get_integration_provider( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> IntegrationAdapter: - result = await super().get_integration_provider( + """Get a specific integration provider""" + result = await self._api.get_integration_provider( name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -35,9 +122,9 @@ async def get_integration_provider( _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, IntegrationAdapter) - async def get_integration_providers( # type: ignore[override] + async def get_integration_providers( self, category: Optional[StrictStr] = None, active_only: Optional[StrictBool] = None, @@ -51,7 +138,8 @@ async def get_integration_providers( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[IntegrationAdapter]: - result = await super().get_integration_providers( + """Get all Integrations Providers""" + result = await self._api.get_integration_providers( category, active_only, _request_timeout=_request_timeout, @@ -60,9 +148,9 @@ async def get_integration_providers( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, IntegrationAdapter) - async def get_integration_provider_defs( # type: ignore[override] + async def get_integration_provider_defs( self, _request_timeout: Union[ None, @@ -74,14 +162,15 @@ async def get_integration_provider_defs( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[IntegrationDefAdapter]: - result = await super().get_integration_provider_defs( + """Get integration provider definitions""" + result = await self._api.get_integration_provider_defs( _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, IntegrationDefAdapter) async def get_integration_api( self, @@ -97,7 +186,8 @@ async def get_integration_api( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> IntegrationApiAdapter: - result = await super().get_integration_api( + """Get a specific integration api""" + result = await self._api.get_integration_api( name, integration_name, _request_timeout=_request_timeout, @@ -106,9 +196,9 @@ async def get_integration_api( _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, IntegrationApiAdapter) - async def get_integration_apis( # type: ignore[override] + async def get_integration_apis( self, name: StrictStr, active_only: Optional[StrictBool] = None, @@ -122,7 +212,8 @@ async def get_integration_apis( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[IntegrationApiAdapter]: - result = await super().get_integration_apis( + """Get all integration apis""" + result = await self._api.get_integration_apis( name, active_only, _request_timeout=_request_timeout, @@ -132,7 +223,7 @@ async def get_integration_apis( # type: ignore[override] _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, IntegrationApiAdapter) async def get_integration_available_apis( self, @@ -147,7 +238,8 @@ async def get_integration_available_apis( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[str]: - result = await super().get_integration_available_apis( + """Get all integration available apis""" + result = await self._api.get_integration_available_apis( name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -156,11 +248,62 @@ async def get_integration_available_apis( _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def save_all_integrations( self, - integration: List[IntegrationAdapter], # type: ignore[override] + integration: List[IntegrationAdapter], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Save all Integrations""" + await self._api.save_all_integrations( + integration, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def save_integration_api( + self, + name: StrictStr, + integration_name: StrictStr, + integration_api_update: IntegrationApiUpdateAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Create or Update Integration""" + await self._api.save_integration_api( + name, + integration_name, + integration_api_update, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def save_integration_provider( + self, + name: StrictStr, + integration_update: IntegrationUpdateAdapter, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -171,8 +314,10 @@ async def save_all_integrations( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().save_all_integrations( - integration, # type: ignore[arg-type] + """Create or Update Integration Provider""" + await self._api.save_integration_provider( + name, + integration_update, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -180,7 +325,7 @@ async def save_all_integrations( _host_index=_host_index, ) - async def get_all_integrations( # type: ignore[override] + async def get_all_integrations( self, category: Optional[StrictStr] = None, active_only: Optional[StrictBool] = None, @@ -194,7 +339,8 @@ async def get_all_integrations( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[IntegrationAdapter]: - result = await super().get_all_integrations( + """Get all integrations""" + result = await self._api.get_all_integrations( category, active_only, _request_timeout=_request_timeout, @@ -204,7 +350,7 @@ async def get_all_integrations( # type: ignore[override] _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, IntegrationAdapter) async def get_providers_and_integrations( self, @@ -220,7 +366,8 @@ async def get_providers_and_integrations( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[str]: - return await super().get_providers_and_integrations( + """Get providers and integrations""" + result = await self._api.get_providers_and_integrations( type, active_only, _request_timeout=_request_timeout, @@ -229,12 +376,13 @@ async def get_providers_and_integrations( _headers=_headers, _host_index=_host_index, ) + return result async def put_tag_for_integration( self, name: StrictStr, integration_name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -245,10 +393,11 @@ async def put_tag_for_integration( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().put_tag_for_integration( + """Put a tag to Integration""" + await self._api.put_tag_for_integration( name, integration_name, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -256,7 +405,7 @@ async def put_tag_for_integration( _host_index=_host_index, ) - async def get_tags_for_integration( # type: ignore[override] + async def get_tags_for_integration( self, name: StrictStr, integration_name: StrictStr, @@ -270,7 +419,8 @@ async def get_tags_for_integration( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TagAdapter]: - result = await super().get_tags_for_integration( + """Get tags for integration""" + result = await self._api.get_tags_for_integration( name, integration_name, _request_timeout=_request_timeout, @@ -280,13 +430,13 @@ async def get_tags_for_integration( # type: ignore[override] _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, TagAdapter) async def delete_tag_for_integration( self, name: StrictStr, integration_name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -297,10 +447,11 @@ async def delete_tag_for_integration( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().delete_tag_for_integration( + """Delete a tag for Integration""" + await self._api.delete_tag_for_integration( name, integration_name, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -311,7 +462,7 @@ async def delete_tag_for_integration( async def put_tag_for_integration_provider( self, name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -322,9 +473,10 @@ async def put_tag_for_integration_provider( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().put_tag_for_integration_provider( + """Put a tag to Integration Provider""" + await self._api.put_tag_for_integration_provider( name, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -332,7 +484,7 @@ async def put_tag_for_integration_provider( _host_index=_host_index, ) - async def get_tags_for_integration_provider( # type: ignore[override] + async def get_tags_for_integration_provider( self, name: StrictStr, _request_timeout: Union[ @@ -345,7 +497,8 @@ async def get_tags_for_integration_provider( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TagAdapter]: - result = await super().get_tags_for_integration_provider( + """Get tags for integration provider""" + result = await self._api.get_tags_for_integration_provider( name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -353,12 +506,12 @@ async def get_tags_for_integration_provider( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, TagAdapter) async def delete_tag_for_integration_provider( self, name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -369,9 +522,10 @@ async def delete_tag_for_integration_provider( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().delete_tag_for_integration_provider( + """Delete a tag for Integration Provider""" + await self._api.delete_tag_for_integration_provider( name, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -392,7 +546,8 @@ async def get_token_usage_for_integration_provider( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> Dict[str, str]: - return await super().get_token_usage_for_integration_provider( + """Get Token Usage by Integration Provider""" + result = await self._api.get_token_usage_for_integration_provider( name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -400,8 +555,9 @@ async def get_token_usage_for_integration_provider( _headers=_headers, _host_index=_host_index, ) + return result - async def get_prompts_with_integration( # type: ignore[override] + async def get_prompts_with_integration( self, integration_provider: StrictStr, integration_name: StrictStr, @@ -415,7 +571,8 @@ async def get_prompts_with_integration( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[MessageTemplateAdapter]: - result = await super().get_prompts_with_integration( + """Get prompts with integration""" + result = await self._api.get_prompts_with_integration( integration_provider, integration_name, _request_timeout=_request_timeout, @@ -424,12 +581,12 @@ async def get_prompts_with_integration( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, MessageTemplateAdapter) async def record_event_stats( self, type: StrictStr, - event_log: List[EventLogAdapter], # type: ignore[override] + event_log: List[EventLogAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -440,12 +597,66 @@ async def record_event_stats( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().record_event_stats( + """Record Event Stats""" + await self._api.record_event_stats( type, - event_log, # type: ignore[arg-type] + event_log, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def register_token_usage( + self, + name: StrictStr, + integration_name: StrictStr, + body: StrictInt, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Register Token Usage""" + await self._api.register_token_usage( + name, + integration_name, + body, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def get_token_usage_for_integration( + self, + name: StrictStr, + integration_name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> int: + """Get Token Usage by Integration""" + result = await self._api.get_token_usage_for_integration( + name, + integration_name, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) + return result diff --git a/src/conductor/asyncio_client/adapters/api/limits_resource_api.py b/src/conductor/asyncio_client/adapters/api/limits_resource_api.py index 44eb8e24..1b5aab16 100644 --- a/src/conductor/asyncio_client/adapters/api/limits_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/limits_resource_api.py @@ -1,4 +1,34 @@ +from __future__ import annotations + +from typing import Annotated, Any, Dict, Optional, Tuple, Union + +from pydantic import Field, StrictFloat, StrictInt, StrictStr + from conductor.asyncio_client.http.api import LimitsResourceApi +from conductor.asyncio_client.adapters import ApiClient + +class LimitsResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = LimitsResourceApi(api_client) -class LimitsResourceApiAdapter(LimitsResourceApi): ... + async def get1( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, object]: + """Get limits""" + return await self._api.get1( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) diff --git a/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py b/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py index 292e242f..b678668b 100644 --- a/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py @@ -9,11 +9,46 @@ ) from conductor.asyncio_client.adapters.models.task_def_adapter import TaskDefAdapter from conductor.asyncio_client.adapters.models.workflow_def_adapter import WorkflowDefAdapter +from conductor.asyncio_client.adapters.models.extended_task_def_adapter import ( + ExtendedTaskDefAdapter, +) from conductor.asyncio_client.http.api import MetadataResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter + +class MetadataResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = MetadataResourceApi(api_client) + + async def create( + self, + extended_workflow_def: ExtendedWorkflowDefAdapter, + overwrite: Optional[StrictBool] = None, + new_version: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Create a new workflow definition""" + return await self._api.create( + extended_workflow_def, + overwrite, + new_version, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) -class MetadataResourceApiAdapter(MetadataResourceApi): - async def get_task_def( # type: ignore[override] + async def get_task_def( self, tasktype: StrictStr, metadata: Optional[StrictBool] = None, @@ -26,8 +61,9 @@ async def get_task_def( # type: ignore[override] _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> TaskDefAdapter: - result = await super().get_task_def( + ) -> object: + """Get a task definition""" + return await self._api.get_task_def( tasktype, metadata, _request_timeout=_request_timeout, @@ -36,9 +72,8 @@ async def get_task_def( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] - async def get_task_defs( # type: ignore[override] + async def get_task_defs( self, access: Optional[StrictStr] = None, metadata: Optional[StrictBool] = None, @@ -54,7 +89,8 @@ async def get_task_defs( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TaskDefAdapter]: - result = await super().get_task_defs( + """Get all task definitions""" + result = await self._api.get_task_defs( access, metadata, tag_key, @@ -65,11 +101,11 @@ async def get_task_defs( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, TaskDefAdapter) async def update( self, - extended_workflow_def: List[ExtendedWorkflowDefAdapter], # type: ignore[override] + extended_workflow_def: List[ExtendedWorkflowDefAdapter], overwrite: Optional[StrictBool] = None, new_version: Optional[StrictBool] = None, _request_timeout: Union[ @@ -82,8 +118,9 @@ async def update( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> object: - result = await super().update( - extended_workflow_def, # type: ignore[arg-type] + """Create or update workflow definition(s)""" + result = await self._api.update( + extended_workflow_def, overwrite, new_version, _request_timeout=_request_timeout, @@ -92,9 +129,53 @@ async def update( _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result + + async def update_task_def( + self, + extended_task_def: ExtendedTaskDefAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Update a task definition""" + return await self._api.update_task_def( + extended_task_def, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def upload_workflows_and_tasks_definitions_to_s3( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Upload all workflows and tasks definitions to Object storage if configured""" + return await self._api.upload_workflows_and_tasks_definitions_to_s3( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) - async def get( # type: ignore[override] + async def get( self, name: StrictStr, version: Optional[StrictInt] = None, @@ -109,19 +190,20 @@ async def get( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> WorkflowDefAdapter: - result = await super().get( - name, - version, - metadata, + """Get a workflow definition""" + result = await self._api.get( + name=name, + version=version, + metadata=metadata, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, WorkflowDefAdapter) - async def get_workflow_defs( # type: ignore[override] + async def get_workflow_defs( self, access: Optional[StrictStr] = None, metadata: Optional[StrictBool] = None, @@ -139,7 +221,7 @@ async def get_workflow_defs( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[WorkflowDefAdapter]: - result = await super().get_workflow_defs( + result = await self._api.get_workflow_defs( access, metadata, tag_key, @@ -152,4 +234,75 @@ async def get_workflow_defs( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, WorkflowDefAdapter) + + async def register_task_def( + self, + extended_task_def: List[ExtendedTaskDefAdapter], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Register a task definition""" + return await self._api.register_task_def( + extended_task_def, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def unregister_task_def( + self, + tasktype: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Unregister a task definition""" + return await self._api.unregister_task_def( + tasktype, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def unregister_workflow_def( + self, + name: StrictStr, + version: StrictInt, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Unregister a workflow definition""" + return await self._api.unregister_workflow_def( + name, + version, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) diff --git a/src/conductor/asyncio_client/adapters/api/metrics_resource_api.py b/src/conductor/asyncio_client/adapters/api/metrics_resource_api.py index 4dad395e..0c1db62f 100644 --- a/src/conductor/asyncio_client/adapters/api/metrics_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/metrics_resource_api.py @@ -1,4 +1,42 @@ +from __future__ import annotations + +from typing import Annotated, Any, Dict, Optional, Tuple, Union + +from pydantic import Field, StrictFloat, StrictInt, StrictStr + from conductor.asyncio_client.http.api import MetricsResourceApi +from conductor.asyncio_client.adapters import ApiClient + +class MetricsResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = MetricsResourceApi(api_client) -class MetricsResourceApiAdapter(MetricsResourceApi): ... + async def prometheus_task_metrics( + self, + task_name: StrictStr, + start: StrictStr, + end: StrictStr, + step: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, object]: + """Get prometheus task metrics""" + return await self._api.prometheus_task_metrics( + task_name=task_name, + start=start, + end=end, + step=step, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) diff --git a/src/conductor/asyncio_client/adapters/api/metrics_token_resource_api.py b/src/conductor/asyncio_client/adapters/api/metrics_token_resource_api.py index 49203a86..cbcfcc5d 100644 --- a/src/conductor/asyncio_client/adapters/api/metrics_token_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/metrics_token_resource_api.py @@ -1,4 +1,37 @@ +from __future__ import annotations + +from typing import Annotated, Any, Dict, Optional, Tuple, Union + +from pydantic import Field, StrictFloat, StrictInt, StrictStr + from conductor.asyncio_client.http.api import MetricsTokenResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.models.metrics_token_adapter import MetricsTokenAdapter +from conductor.asyncio_client.adapters.utils import convert_to_adapter + +class MetricsTokenResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = MetricsTokenResourceApi(api_client) -class MetricsTokenResourceApiAdapter(MetricsTokenResourceApi): ... + async def token( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> MetricsTokenAdapter: + """Get metrics token""" + result = await self._api.token( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_to_adapter(result, MetricsTokenAdapter) diff --git a/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py b/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py index 9776dd5d..bf6f45a1 100644 --- a/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py @@ -7,11 +7,19 @@ from conductor.asyncio_client.adapters.models.message_template_adapter import ( MessageTemplateAdapter, ) +from conductor.asyncio_client.adapters.models.prompt_template_test_request_adapter import ( + PromptTemplateTestRequestAdapter, +) from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.http.api import PromptResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter + +class PromptResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = PromptResourceApi(api_client) -class PromptResourceApiAdapter(PromptResourceApi): async def get_message_template( self, name: StrictStr, @@ -25,7 +33,8 @@ async def get_message_template( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> MessageTemplateAdapter: - result = await super().get_message_template( + """Get a message template by name""" + result = await self._api.get_message_template( name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -33,9 +42,9 @@ async def get_message_template( _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, MessageTemplateAdapter) - async def get_message_templates( # type: ignore[override] + async def get_message_templates( self, _request_timeout: Union[ None, @@ -47,18 +56,19 @@ async def get_message_templates( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[MessageTemplateAdapter]: - result = await super().get_message_templates( + """Get all message templates""" + result = await self._api.get_message_templates( _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, MessageTemplateAdapter) async def create_message_templates( self, - message_template: List[MessageTemplateAdapter], # type: ignore[override] + message_template: List[MessageTemplateAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -69,8 +79,9 @@ async def create_message_templates( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().create_message_templates( - message_template, # type: ignore[arg-type] + """Create multiple message templates in bulk""" + return await self._api.create_message_templates( + message_template, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -81,7 +92,7 @@ async def create_message_templates( async def put_tag_for_prompt_template( self, name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -92,9 +103,10 @@ async def put_tag_for_prompt_template( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().put_tag_for_prompt_template( + """Put a tag to Prompt Template""" + await self._api.put_tag_for_prompt_template( name, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -102,7 +114,7 @@ async def put_tag_for_prompt_template( _host_index=_host_index, ) - async def get_tags_for_prompt_template( # type: ignore[override] + async def get_tags_for_prompt_template( self, name: StrictStr, _request_timeout: Union[ @@ -115,7 +127,8 @@ async def get_tags_for_prompt_template( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TagAdapter]: - result = await super().get_tags_for_prompt_template( + """Get tags for a prompt template""" + result = await self._api.get_tags_for_prompt_template( name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -123,12 +136,62 @@ async def get_tags_for_prompt_template( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, TagAdapter) async def delete_tag_for_prompt_template( self, name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Delete a tag from a prompt template""" + return await self._api.delete_tag_for_prompt_template( + name, + tag, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def delete_message_template( + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Delete a message template""" + await self._api.delete_message_template( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def save_message_template( + self, + name: StrictStr, + description: StrictStr, + body: StrictStr, + models: Optional[List[StrictStr]] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -139,9 +202,36 @@ async def delete_tag_for_prompt_template( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().delete_tag_for_prompt_template( + """Create or Update a template""" + await self._api.save_message_template( name, - tag, # type: ignore[arg-type] + description, + body, + models, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def test_message_template( + self, + prompt_template_test_request: PromptTemplateTestRequestAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> str: + """Test Prompt Template""" + return await self._api.test_message_template( + prompt_template_test_request, + _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, diff --git a/src/conductor/asyncio_client/adapters/api/queue_admin_resource_api.py b/src/conductor/asyncio_client/adapters/api/queue_admin_resource_api.py index 9b04cc6e..ad59f7b9 100644 --- a/src/conductor/asyncio_client/adapters/api/queue_admin_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/queue_admin_resource_api.py @@ -1,4 +1,55 @@ +from __future__ import annotations + +from typing import Annotated, Any, Dict, Optional, Tuple, Union + +from pydantic import Field, StrictFloat, StrictInt, StrictStr + from conductor.asyncio_client.http.api import QueueAdminResourceApi +from conductor.asyncio_client.adapters import ApiClient + + +class QueueAdminResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = QueueAdminResourceApi(api_client) + async def names( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, str]: + """Get queue names""" + return await self._api.names( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) -class QueueAdminResourceApiAdapter(QueueAdminResourceApi): ... + async def size1( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, Dict[str, int]]: + """Get queue size""" + return await self._api.size1( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) diff --git a/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py b/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py index a94af4a8..935e1a9d 100644 --- a/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py @@ -15,10 +15,38 @@ WorkflowScheduleModelAdapter, ) from conductor.asyncio_client.http.api import SchedulerResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter -class SchedulerResourceApiAdapter(SchedulerResourceApi): - async def get_schedule( # type: ignore[override] +class SchedulerResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = SchedulerResourceApi(api_client) + + async def delete_schedule( + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Delete a workflow schedule by name""" + return await self._api.delete_schedule( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def get_schedule( self, name: StrictStr, _request_timeout: Union[ @@ -31,7 +59,8 @@ async def get_schedule( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> WorkflowScheduleAdapter: - result = await super().get_schedule( + """Get a workflow schedule by name""" + result = await self._api.get_schedule( name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -39,9 +68,9 @@ async def get_schedule( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, WorkflowScheduleAdapter) - async def get_all_schedules( # type: ignore[override] + async def get_all_schedules( self, workflow_name: Optional[StrictStr] = None, _request_timeout: Union[ @@ -54,7 +83,8 @@ async def get_all_schedules( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[WorkflowScheduleModelAdapter]: - result = await super().get_all_schedules( + """Get all workflow schedules, optionally filtered by workflow name""" + result = await self._api.get_all_schedules( workflow_name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -62,9 +92,9 @@ async def get_all_schedules( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, WorkflowScheduleModelAdapter) - async def search_v2( # type: ignore[override] + async def search_v2( self, start: Optional[StrictInt] = None, size: Optional[StrictInt] = None, @@ -81,7 +111,8 @@ async def search_v2( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> SearchResultWorkflowScheduleExecutionModelAdapter: - result = await super().search_v2( + """Search for workflow schedule executions""" + result = await self._api.search_v2( start, size, sort, @@ -93,9 +124,9 @@ async def search_v2( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, SearchResultWorkflowScheduleExecutionModelAdapter) - async def get_schedules_by_tag( # type: ignore[override] + async def get_schedules_by_tag( self, tag: StrictStr, _request_timeout: Union[ @@ -108,7 +139,8 @@ async def get_schedules_by_tag( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[WorkflowScheduleModelAdapter]: - result = await super().get_schedules_by_tag( + """Get schedules by tag""" + result = await self._api.get_schedules_by_tag( tag, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -116,12 +148,12 @@ async def get_schedules_by_tag( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, WorkflowScheduleModelAdapter) async def put_tag_for_schedule( self, name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -132,9 +164,10 @@ async def put_tag_for_schedule( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().put_tag_for_schedule( + """Put a tag to schedule""" + await self._api.put_tag_for_schedule( name, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -142,7 +175,7 @@ async def put_tag_for_schedule( _host_index=_host_index, ) - async def get_tags_for_schedule( # type: ignore[override] + async def get_tags_for_schedule( self, name: StrictStr, _request_timeout: Union[ @@ -155,7 +188,8 @@ async def get_tags_for_schedule( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TagAdapter]: - result = await super().get_tags_for_schedule( + """Get tags for a schedule""" + result = await self._api.get_tags_for_schedule( name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -163,12 +197,12 @@ async def get_tags_for_schedule( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, TagAdapter) async def delete_tag_for_schedule( self, name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -179,9 +213,171 @@ async def delete_tag_for_schedule( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().delete_tag_for_schedule( + """Delete a tag from a schedule""" + return await self._api.delete_tag_for_schedule( name, - tag, # type: ignore[arg-type] + tag, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def get_next_few_schedules( + self, + cron_expression: StrictStr, + schedule_start_time: Optional[StrictInt] = None, + schedule_end_time: Optional[StrictInt] = None, + limit: Optional[StrictInt] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[int]: + """Get the next few schedules for a cron expression""" + return await self._api.get_next_few_schedules( + cron_expression, + schedule_start_time, + schedule_end_time, + limit, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def pause_all_schedules( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, object]: + """Pause all scheduling in a single conductor server instance (for debugging only)""" + return await self._api.pause_all_schedules( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def pause_schedule( + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Pauses an existing schedule by name""" + return await self._api.pause_schedule( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def requeue_all_execution_records( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, object]: + """Requeue all execution records""" + return await self._api.requeue_all_execution_records( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def resume_all_schedules( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, object]: + """Resume all scheduling in a single conductor server instance (for debugging only)""" + return await self._api.resume_all_schedules( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def resume_schedule( + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Resume a paused schedule by name""" + return await self._api.resume_schedule( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def save_schedule( + self, + save_schedule_request: WorkflowScheduleModelAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Save a schedule""" + return await self._api.save_schedule( + save_schedule_request, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, diff --git a/src/conductor/asyncio_client/adapters/api/schema_resource_api.py b/src/conductor/asyncio_client/adapters/api/schema_resource_api.py index 9ec0cc72..3e923bbb 100644 --- a/src/conductor/asyncio_client/adapters/api/schema_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/schema_resource_api.py @@ -6,12 +6,65 @@ from conductor.asyncio_client.adapters.models.schema_def_adapter import SchemaDefAdapter from conductor.asyncio_client.http.api import SchemaResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter -class SchemaResourceApiAdapter(SchemaResourceApi): +class SchemaResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = SchemaResourceApi(api_client) + + async def delete_schema_by_name( + self, + name: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Delete all versions of schema by name""" + return await self._api.delete_schema_by_name( + name, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def delete_schema_by_name_and_version( + self, + name: StrictStr, + version: StrictInt, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Delete a version of schema by name and version""" + return await self._api.delete_schema_by_name_and_version( + name, + version, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + async def save( self, - schema_def: List[SchemaDefAdapter], # type: ignore[override] + schema_def: List[SchemaDefAdapter], new_version: Optional[StrictBool] = None, _request_timeout: Union[ None, @@ -23,8 +76,9 @@ async def save( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().save( - schema_def, # type: ignore[arg-type] + """Save a schema""" + await self._api.save( + schema_def, new_version, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -33,7 +87,7 @@ async def save( _host_index=_host_index, ) - async def get_schema_by_name_and_version( # type: ignore[override] + async def get_schema_by_name_and_version( self, name: StrictStr, version: StrictInt, @@ -47,7 +101,8 @@ async def get_schema_by_name_and_version( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> SchemaDefAdapter: - result = await super().get_schema_by_name_and_version( + """Get a schema by name and version""" + result = await self._api.get_schema_by_name_and_version( name, version, _request_timeout=_request_timeout, @@ -56,9 +111,9 @@ async def get_schema_by_name_and_version( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, SchemaDefAdapter) - async def get_all_schemas( # type: ignore[override] + async def get_all_schemas( self, _request_timeout: Union[ None, @@ -70,11 +125,12 @@ async def get_all_schemas( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[SchemaDefAdapter]: - result = await super().get_all_schemas( + """Get all schemas""" + result = await self._api.get_all_schemas( _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, SchemaDefAdapter) diff --git a/src/conductor/asyncio_client/adapters/api/secret_resource_api.py b/src/conductor/asyncio_client/adapters/api/secret_resource_api.py index cf5b6475..69ef2c70 100644 --- a/src/conductor/asyncio_client/adapters/api/secret_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/secret_resource_api.py @@ -7,10 +7,57 @@ from conductor.asyncio_client.adapters.models.extended_secret_adapter import ExtendedSecretAdapter from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.http.api import SecretResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter -class SecretResourceApiAdapter(SecretResourceApi): - async def secret_exists( # type: ignore[override] +class SecretResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = SecretResourceApi(api_client) + + async def clear_local_cache( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, str]: + """Clear local cache""" + return await self._api.clear_local_cache( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def clear_redis_cache( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, str]: + """Clear redis cache""" + return await self._api.clear_redis_cache( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def delete_secret( self, key: Annotated[str, Field(strict=True)], _request_timeout: Union[ @@ -22,8 +69,32 @@ async def secret_exists( # type: ignore[override] _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> bool: - result = await super().secret_exists( + ) -> object: + """Delete a secret value by key""" + return await self._api.delete_secret( + key, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def secret_exists( + self, + key: Annotated[str, Field(strict=True)], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Check if a secret exists by key""" + return await self._api.secret_exists( key, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -31,7 +102,6 @@ async def secret_exists( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] async def list_all_secret_names( self, @@ -45,7 +115,8 @@ async def list_all_secret_names( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[str]: - return await super().list_all_secret_names( + """List all secret names""" + return await self._api.list_all_secret_names( _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -53,7 +124,7 @@ async def list_all_secret_names( _host_index=_host_index, ) - async def list_secrets_with_tags_that_user_can_grant_access_to( # type: ignore[override] + async def list_secrets_with_tags_that_user_can_grant_access_to( self, _request_timeout: Union[ None, @@ -65,19 +136,45 @@ async def list_secrets_with_tags_that_user_can_grant_access_to( # type: ignore[ _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[ExtendedSecretAdapter]: - result = await super().list_secrets_with_tags_that_user_can_grant_access_to( + """List secrets with tags that the current user can grant access to""" + result = await self._api.list_secrets_with_tags_that_user_can_grant_access_to( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_list_to_adapter(result, ExtendedSecretAdapter) + + async def put_secret( + self, + key: Annotated[str, Field(strict=True)], + body: Annotated[str, Field(min_length=0, strict=True, max_length=65535)], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Put a secret value by key""" + return await self._api.put_secret( + key, + body, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] async def put_tag_for_secret( self, key: Annotated[str, Field(strict=True)], - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -88,9 +185,10 @@ async def put_tag_for_secret( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().put_tag_for_secret( + """Put a tag for a secret""" + await self._api.put_tag_for_secret( key, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -98,7 +196,7 @@ async def put_tag_for_secret( _host_index=_host_index, ) - async def get_tags( # type: ignore[override] + async def get_tags( self, key: Annotated[str, Field(strict=True)], _request_timeout: Union[ @@ -111,7 +209,8 @@ async def get_tags( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TagAdapter]: - result = await super().get_tags( + """Get tags for a secret""" + result = await self._api.get_tags( key, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -119,12 +218,12 @@ async def get_tags( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, TagAdapter) async def delete_tag_for_secret( self, key: Annotated[str, Field(strict=True)], - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -135,9 +234,55 @@ async def delete_tag_for_secret( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - return await super().delete_tag_for_secret( + """Delete a tag for a secret""" + return await self._api.delete_tag_for_secret( key, - tag, # type: ignore[arg-type] + tag, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def get_secret( + self, + key: Annotated[str, Field(strict=True)], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> str: + """Get a secret value by key""" + result = await self._api.get_secret( + key, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return result + + async def list_secrets_that_user_can_grant_access_to( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[str]: + """List all secret names user can grant access to""" + return await self._api.list_secrets_that_user_can_grant_access_to( _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, diff --git a/src/conductor/asyncio_client/adapters/api/tags_api.py b/src/conductor/asyncio_client/adapters/api/tags_api.py index fc0c94d2..642f3dc6 100644 --- a/src/conductor/asyncio_client/adapters/api/tags_api.py +++ b/src/conductor/asyncio_client/adapters/api/tags_api.py @@ -6,10 +6,137 @@ from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.http.api import TagsApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter -class TagsApiAdapter(TagsApi): - async def get_workflow_tags( # type: ignore[override] +class TagsApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = TagsApi(api_client) + + async def add_task_tag( + self, + task_name: StrictStr, + tag: TagAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Add a tag to a task""" + return await self._api.add_task_tag( + task_name, + tag, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def add_workflow_tag( + self, + name: StrictStr, + tag: TagAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Add a tag to a workflow""" + return await self._api.add_workflow_tag( + name, + tag, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def delete_task_tag( + self, + task_name: StrictStr, + tag: TagAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Delete a tag from a task""" + return await self._api.delete_task_tag( + task_name, + tag, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def delete_workflow_tag( + self, + name: StrictStr, + tag: TagAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Delete a tag from a workflow""" + return await self._api.delete_workflow_tag( + name, + tag, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def get_tags1( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[TagAdapter]: + """List all tags""" + result = await self._api.get_tags1( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_list_to_adapter(result, TagAdapter) + + async def get_workflow_tags( self, name: StrictStr, _request_timeout: Union[ @@ -22,7 +149,7 @@ async def get_workflow_tags( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TagAdapter]: - result = await super().get_workflow_tags( + result = await self._api.get_workflow_tags( name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -30,12 +157,12 @@ async def get_workflow_tags( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, TagAdapter) - async def set_workflow_tags( # type: ignore[override] + async def set_workflow_tags( self, name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -46,18 +173,17 @@ async def set_workflow_tags( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> object: - result = await super().set_workflow_tags( + return await self._api.set_workflow_tags( name, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] - async def get_task_tags( # type: ignore[override] + async def get_task_tags( self, task_name: StrictStr, _request_timeout: Union[ @@ -70,7 +196,7 @@ async def get_task_tags( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TagAdapter]: - result = await super().get_task_tags( + result = await self._api.get_task_tags( task_name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -78,12 +204,12 @@ async def get_task_tags( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, TagAdapter) - async def set_task_tags( # type: ignore[override] + async def set_task_tags( self, task_name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -94,13 +220,12 @@ async def set_task_tags( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> object: - result = await super().set_task_tags( + return await self._api.set_task_tags( task_name, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] diff --git a/src/conductor/asyncio_client/adapters/api/task_resource_api.py b/src/conductor/asyncio_client/adapters/api/task_resource_api.py index e0351ebd..e38f86f1 100644 --- a/src/conductor/asyncio_client/adapters/api/task_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/task_resource_api.py @@ -2,7 +2,7 @@ from typing import Annotated, Any, Dict, List, Optional, Tuple, Union -from pydantic import Field, StrictFloat, StrictInt, StrictStr, validate_call +from pydantic import Field, StrictFloat, StrictInt, StrictStr from conductor.asyncio_client.adapters.models.poll_data_adapter import PollDataAdapter from conductor.asyncio_client.adapters.models.search_result_task_summary_adapter import ( @@ -10,12 +10,60 @@ ) from conductor.asyncio_client.adapters.models.task_adapter import TaskAdapter from conductor.asyncio_client.adapters.models.task_exec_log_adapter import TaskExecLogAdapter +from conductor.asyncio_client.adapters.models.task_result_adapter import TaskResultAdapter from conductor.asyncio_client.adapters.models.workflow_adapter import WorkflowAdapter from conductor.asyncio_client.http.api import TaskResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter -class TaskResourceApiAdapter(TaskResourceApi): - async def poll( # type: ignore[override] +class TaskResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = TaskResourceApi(api_client) + + async def all( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, int]: + """Get the details about each queue""" + return await self._api.all( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def all_verbose( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, Dict[str, Dict[str, int]]]: + """Get the details about each queue""" + return await self._api.all_verbose( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def poll( self, tasktype: StrictStr, workerid: Optional[StrictStr] = None, @@ -30,7 +78,7 @@ async def poll( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> Optional[TaskAdapter]: - result = await super().poll( + result = await self._api.poll( tasktype, workerid, domain, @@ -40,9 +88,32 @@ async def poll( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, TaskAdapter) if result else None - async def batch_poll( # type: ignore[override] + async def requeue_pending_task( + self, + task_type: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> str: + """Requeue pending tasks""" + return await self._api.requeue_pending_task( + task_type, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def batch_poll( self, tasktype: StrictStr, workerid: Optional[StrictStr] = None, @@ -59,7 +130,7 @@ async def batch_poll( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TaskAdapter]: - result = await super().batch_poll( + result = await self._api.batch_poll( tasktype, workerid, domain, @@ -71,9 +142,42 @@ async def batch_poll( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, TaskAdapter) - async def get_task( # type: ignore[override] + async def get_all_poll_data( + self, + worker_size: Optional[StrictInt] = None, + worker_opt: Optional[StrictStr] = None, + queue_size: Optional[StrictInt] = None, + queue_opt: Optional[StrictStr] = None, + last_poll_time_size: Optional[StrictInt] = None, + last_poll_time_opt: Optional[StrictStr] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, object]: + """Get the last poll data for all task types""" + return await self._api.get_all_poll_data( + worker_size, + worker_opt, + queue_size, + queue_opt, + last_poll_time_size, + last_poll_time_opt, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def get_task( self, task_id: StrictStr, _request_timeout: Union[ @@ -86,7 +190,7 @@ async def get_task( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> TaskAdapter: - result = await super().get_task( + result = await self._api.get_task( task_id, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -94,9 +198,9 @@ async def get_task( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, TaskAdapter) - async def get_poll_data( # type: ignore[override] + async def get_poll_data( self, task_type: StrictStr, _request_timeout: Union[ @@ -109,7 +213,7 @@ async def get_poll_data( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[PollDataAdapter]: - result = await super().get_poll_data( + result = await self._api.get_poll_data( task_type, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -117,9 +221,9 @@ async def get_poll_data( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, PollDataAdapter) - async def get_task_logs( # type: ignore[override] + async def get_task_logs( self, task_id: StrictStr, _request_timeout: Union[ @@ -132,17 +236,42 @@ async def get_task_logs( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TaskExecLogAdapter]: - result = await super().get_task_logs( + result = await self._api.get_task_logs( + task_id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_list_to_adapter(result, TaskExecLogAdapter) + + async def log( + self, + task_id: StrictStr, + body: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Log Task Execution Details""" + await self._api.log( task_id, + body, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] - async def search1( # type: ignore[override] + async def search1( self, start: Optional[StrictInt] = None, size: Optional[StrictInt] = None, @@ -159,7 +288,7 @@ async def search1( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> SearchResultTaskSummaryAdapter: - result = await super().search1( + result = await self._api.search1( start, size, sort, @@ -171,9 +300,85 @@ async def search1( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, SearchResultTaskSummaryAdapter) + + async def size( + self, + task_type: Optional[List[StrictStr]] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, int]: + """Get Task type queue sizes""" + return await self._api.size( + task_type, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def update_task( + self, + task_result: TaskResultAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> str: + """Update a task""" + return await self._api.update_task( + task_result, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def update_task1( + self, + workflow_id: StrictStr, + task_ref_name: StrictStr, + status: StrictStr, + request_body: Dict[str, Dict[str, Any]], + workerid: Optional[StrictStr] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> str: + """Update a task By Ref Name""" + return await self._api.update_task1( + workflow_id, + task_ref_name, + status, + request_body, + workerid, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) - @validate_call async def update_task_sync( self, workflow_id: StrictStr, @@ -191,59 +396,17 @@ async def update_task_sync( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> WorkflowAdapter: - """Update a task By Ref Name synchronously - - - :param workflow_id: (required) - :type workflow_id: str - :param task_ref_name: (required) - :type task_ref_name: str - :param status: (required) - :type status: str - :param request_body: (required) - :type request_body: Dict[str, object] - :param workerid: - :type workerid: str - :param _request_timeout: timeout setting for this request. If one - number provided, it will be total request - timeout. It can also be a pair (tuple) of - (connection, read) timeouts. - :type _request_timeout: int, tuple(int, int), optional - :param _request_auth: set to override the auth_settings for an a single - request; this effectively ignores the - authentication in the spec for a single request. - :type _request_auth: dict, optional - :param _content_type: force content-type for the request. - :type _content_type: str, Optional - :param _headers: set to override the headers for a single - request; this effectively ignores the headers - in the spec for a single request. - :type _headers: dict, optional - :param _host_index: set to override the host_index for a single - request; this effectively ignores the host_index - in the spec for a single request. - :type _host_index: int, optional - :return: Returns the result object. - """ - - _param = self._update_task_sync_serialize( - workflow_id=workflow_id, - task_ref_name=task_ref_name, - status=status, - request_body=request_body, - workerid=workerid, + """Update a task By Ref Name synchronously""" + result = await self._api.update_task_sync( + workflow_id, + task_ref_name, + status, + request_body, + workerid, + _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - - _response_types_map: Dict[str, Optional[str]] = { - "200": "Workflow", - } - response_data = await self.api_client.call_api(*_param, _request_timeout=_request_timeout) - await response_data.read() - return self.api_client.response_deserialize( - response_data=response_data, - response_types_map=_response_types_map, - ).data + return convert_to_adapter(result, WorkflowAdapter) diff --git a/src/conductor/asyncio_client/adapters/api/token_resource_api.py b/src/conductor/asyncio_client/adapters/api/token_resource_api.py index 52f40be2..df2ca193 100644 --- a/src/conductor/asyncio_client/adapters/api/token_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/token_resource_api.py @@ -1,4 +1,61 @@ +from __future__ import annotations + +from typing import Annotated, Any, Dict, Optional, Tuple, Union + +from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr +from conductor.asyncio_client.adapters.models.generate_token_request_adapter import ( + GenerateTokenRequestAdapter, +) from conductor.asyncio_client.http.api import TokenResourceApi +from conductor.asyncio_client.adapters import ApiClient + + +class TokenResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = TokenResourceApi(api_client) + async def generate_token( + self, + generate_token_request: GenerateTokenRequestAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Generate JWT with the given access key""" + return await self._api.generate_token( + generate_token_request, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) -class TokenResourceApiAdapter(TokenResourceApi): ... + async def get_user_info( + self, + claims: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Get the user info from the token""" + return await self._api.get_user_info( + claims, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) diff --git a/src/conductor/asyncio_client/adapters/api/user_resource_api.py b/src/conductor/asyncio_client/adapters/api/user_resource_api.py index 3a880d8d..00962dc9 100644 --- a/src/conductor/asyncio_client/adapters/api/user_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/user_resource_api.py @@ -4,12 +4,44 @@ from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters.models import UpsertUserRequestAdapter as UpsertUserRequest +from conductor.asyncio_client.adapters.models import UpsertUserRequestAdapter from conductor.asyncio_client.adapters.models.conductor_user_adapter import ConductorUserAdapter +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.http.api import UserResourceApi +from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter -class UserResourceApiAdapter(UserResourceApi): +class UserResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = UserResourceApi(api_client) + + async def check_permissions( + self, + user_id: StrictStr, + type: StrictStr, + id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> object: + """Get the permissions this user has over workflows and tasks""" + return await self._api.check_permissions( + user_id, + type, + id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + async def get_granted_permissions( self, user_id: StrictStr, @@ -25,8 +57,8 @@ async def get_granted_permissions( ) -> object: # Convert empty user_id to None to prevent sending invalid data to server if not user_id: - user_id = None # type: ignore[assignment] - return await super().get_granted_permissions( + user_id = None + return await self._api.get_granted_permissions( user_id, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -35,7 +67,7 @@ async def get_granted_permissions( _host_index=_host_index, ) - async def get_user( # type: ignore[override] + async def get_user( self, id: StrictStr, _request_timeout: Union[ @@ -50,8 +82,8 @@ async def get_user( # type: ignore[override] ) -> ConductorUserAdapter: # Convert empty user id to None to prevent sending invalid data to server if not id: - id = None # type: ignore[assignment] - result = await super().get_user( + id = None + result = await self._api.get_user( id, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -59,12 +91,12 @@ async def get_user( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, ConductorUserAdapter) - async def upsert_user( # type: ignore[override] + async def upsert_user( self, id: StrictStr, - upsert_user_request: UpsertUserRequest, # type: ignore[override] + upsert_user_request: UpsertUserRequestAdapter, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -77,8 +109,8 @@ async def upsert_user( # type: ignore[override] ) -> ConductorUserAdapter: # Convert empty user id to None to prevent sending invalid data to server if not id: - id = None # type: ignore[assignment] - result = await super().upsert_user( + id = None + result = await self._api.upsert_user( id, upsert_user_request, _request_timeout=_request_timeout, @@ -87,9 +119,9 @@ async def upsert_user( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, ConductorUserAdapter) - async def list_users( # type: ignore[override] + async def list_users( self, apps: Optional[StrictBool] = None, _request_timeout: Union[ @@ -102,7 +134,7 @@ async def list_users( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[ConductorUserAdapter]: - result = await super().list_users( + result = await self._api.list_users( apps, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -110,7 +142,7 @@ async def list_users( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_list_to_adapter(result, ConductorUserAdapter) async def delete_user( self, @@ -127,8 +159,8 @@ async def delete_user( ) -> object: # Convert empty user id to None to prevent sending invalid data to server if not id: - id = None # type: ignore[assignment] - return await super().delete_user( + id = None + return await self._api.delete_user( id, _request_timeout=_request_timeout, _request_auth=_request_auth, diff --git a/src/conductor/asyncio_client/adapters/api/version_resource_api.py b/src/conductor/asyncio_client/adapters/api/version_resource_api.py index e5a49c7a..2896be44 100644 --- a/src/conductor/asyncio_client/adapters/api/version_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/version_resource_api.py @@ -1,4 +1,34 @@ +from __future__ import annotations + +from typing import Annotated, Any, Dict, Optional, Tuple, Union + +from pydantic import Field, StrictFloat, StrictInt, StrictStr + from conductor.asyncio_client.http.api import VersionResourceApi +from conductor.asyncio_client.adapters import ApiClient + +class VersionResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = VersionResourceApi(api_client) -class VersionResourceApiAdapter(VersionResourceApi): ... + async def get_version( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> str: + """Get the server's version""" + return await self._api.get_version( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) diff --git a/src/conductor/asyncio_client/adapters/api/webhooks_config_resource_api.py b/src/conductor/asyncio_client/adapters/api/webhooks_config_resource_api.py index eb3b9e0d..8b317602 100644 --- a/src/conductor/asyncio_client/adapters/api/webhooks_config_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/webhooks_config_resource_api.py @@ -1,4 +1,208 @@ +from __future__ import annotations + +from typing import Annotated, Any, Dict, Optional, Tuple, Union, List + +from pydantic import Field, StrictFloat, StrictInt, StrictStr + from conductor.asyncio_client.http.api import WebhooksConfigResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter +from conductor.asyncio_client.adapters.models.webhook_config_adapter import WebhookConfigAdapter +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter + + +class WebhooksConfigResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = WebhooksConfigResourceApi(api_client) + + async def create_webhook( + self, + webhook_config: WebhookConfigAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> WebhookConfigAdapter: + result = await self._api.create_webhook( + webhook_config, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_to_adapter(result, WebhookConfigAdapter) + + async def delete_tag_for_webhook( + self, + id: StrictStr, + tag: List[TagAdapter], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Delete a tag for webhook id""" + await self._api.delete_tag_for_webhook( + id, + tag, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def delete_webhook( + self, + id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Delete a webhook id""" + await self._api.delete_webhook( + id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def get_all_webhook( + self, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[WebhookConfigAdapter]: + """Get all webhooks""" + result = await self._api.get_all_webhook( + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_list_to_adapter(result, WebhookConfigAdapter) + + async def get_tags_for_webhook( + self, + id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[TagAdapter]: + """Get tags by webhook id""" + result = await self._api.get_tags_for_webhook( + id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_list_to_adapter(result, TagAdapter) + + async def get_webhook( + self, + id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> WebhookConfigAdapter: + """Get webhook by id""" + result = await self._api.get_webhook( + id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_to_adapter(result, WebhookConfigAdapter) + async def put_tag_for_webhook( + self, + id: StrictStr, + tag: List[TagAdapter], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Put a tag to webhook id""" + await self._api.put_tag_for_webhook( + id, + tag, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) -class WebhooksConfigResourceApiAdapter(WebhooksConfigResourceApi): ... + async def update_webhook( + self, + id: StrictStr, + webhook_config: WebhookConfigAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> WebhookConfigAdapter: + """Update a webhook id""" + result = await self._api.update_webhook( + id, + webhook_config, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_to_adapter(result, WebhookConfigAdapter) diff --git a/src/conductor/asyncio_client/adapters/api/workflow_bulk_resource_api.py b/src/conductor/asyncio_client/adapters/api/workflow_bulk_resource_api.py index b1ae1437..d828fc87 100644 --- a/src/conductor/asyncio_client/adapters/api/workflow_bulk_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/workflow_bulk_resource_api.py @@ -1,4 +1,164 @@ +from __future__ import annotations + +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union + +from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr from conductor.asyncio_client.http.api import WorkflowBulkResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_to_adapter +from conductor.asyncio_client.adapters.models.bulk_response_adapter import BulkResponseAdapter + + +class WorkflowBulkResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = WorkflowBulkResourceApi(api_client) + + async def delete( + self, + request_body: List[StrictStr], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> BulkResponseAdapter: + """Permanently remove workflows from the system""" + result = await self._api.delete( + request_body, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_to_adapter(result, BulkResponseAdapter) + + async def pause_workflow1( + self, + request_body: List[StrictStr], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> BulkResponseAdapter: + """Pause the list of workflows""" + result = await self._api.pause_workflow1( + request_body, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_to_adapter(result, BulkResponseAdapter) + + async def restart1( + self, + request_body: List[StrictStr], + use_latest_definitions: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> BulkResponseAdapter: + """Restart the list of completed workflow""" + result = await self._api.restart1( + request_body, + use_latest_definitions, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_to_adapter(result, BulkResponseAdapter) + + async def resume_workflow1( + self, + request_body: List[StrictStr], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> BulkResponseAdapter: + """Resume the list of paused workflows""" + result = await self._api.resume_workflow1( + request_body, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_to_adapter(result, BulkResponseAdapter) + async def retry1( + self, + request_body: List[StrictStr], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> BulkResponseAdapter: + """Retry the last failed task for each workflow from the list""" + result = await self._api.retry1( + request_body, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_to_adapter(result, BulkResponseAdapter) -class WorkflowBulkResourceApiAdapter(WorkflowBulkResourceApi): ... + async def terminate( + self, + request_body: List[StrictStr], + reason: Optional[StrictStr] = None, + trigger_failure_workflow: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> BulkResponseAdapter: + """Terminate the list of workflows""" + result = await self._api.terminate( + request_body, + reason, + trigger_failure_workflow, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_to_adapter(result, BulkResponseAdapter) diff --git a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py index 67a80fdb..13e4232a 100644 --- a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py @@ -2,7 +2,7 @@ from typing import Annotated, Any, Dict, List, Optional, Tuple, Union -from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr, validate_call +from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr from conductor.asyncio_client.adapters.models.correlation_ids_search_request_adapter import ( CorrelationIdsSearchRequestAdapter, @@ -16,6 +16,9 @@ from conductor.asyncio_client.adapters.models.start_workflow_request_adapter import ( StartWorkflowRequestAdapter, ) +from conductor.asyncio_client.adapters.models.skip_task_request_adapter import ( + SkipTaskRequestAdapter, +) from conductor.asyncio_client.adapters.models.workflow_adapter import WorkflowAdapter from conductor.asyncio_client.adapters.models.workflow_run_adapter import WorkflowRunAdapter from conductor.asyncio_client.adapters.models.workflow_state_update_adapter import ( @@ -26,15 +29,77 @@ WorkflowTestRequestAdapter, ) from conductor.asyncio_client.http.api import WorkflowResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import ( + convert_to_adapter, + convert_dict_to_adapter, + convert_list_to_adapter, +) +from conductor.asyncio_client.adapters.models.task_list_search_result_summary_adapter import ( + TaskListSearchResultSummaryAdapter, +) +from conductor.asyncio_client.adapters.models.upgrade_workflow_request_adapter import ( + UpgradeWorkflowRequestAdapter, +) + +class WorkflowResourceApiAdapter: + def __init__(self, api_client: ApiClient): + self._api = WorkflowResourceApi(api_client) -class WorkflowResourceApiAdapter(WorkflowResourceApi): - async def execute_workflow( # type: ignore[override] + async def decide( + self, + workflow_id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + await self._api.decide( + workflow_id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def delete1( + self, + workflow_id: StrictStr, + archive_workflow: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Removes the workflow from the system""" + await self._api.delete1( + workflow_id, + archive_workflow, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def execute_workflow( self, name: StrictStr, version: StrictInt, request_id: StrictStr, - start_workflow_request: StartWorkflowRequestAdapter, # type: ignore[override] + start_workflow_request: StartWorkflowRequestAdapter, wait_until_task_ref: Optional[StrictStr] = None, wait_for_seconds: Optional[StrictInt] = None, _request_timeout: Union[ @@ -47,22 +112,94 @@ async def execute_workflow( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> WorkflowRunAdapter: - result = await super().execute_workflow( + result = await self._api.execute_workflow( + name, + version, + request_id, + start_workflow_request, + wait_until_task_ref, + wait_for_seconds, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_to_adapter(result, WorkflowRunAdapter) + + async def execute_workflow_as_api( + self, + name: StrictStr, + request_body: Dict[str, Dict[str, Any]], + version: Optional[StrictInt] = None, + request_id: Optional[StrictStr] = None, + wait_until_task_ref: Optional[StrictStr] = None, + wait_for_seconds: Optional[StrictInt] = None, + x_idempotency_key: Optional[StrictStr] = None, + x_on_conflict: Optional[StrictStr] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, object]: + """Execute a workflow synchronously with input and outputs""" + return await self._api.execute_workflow_as_api( name, + request_body, version, request_id, - start_workflow_request, # type: ignore[override] wait_until_task_ref, wait_for_seconds, + x_idempotency_key, + x_on_conflict, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] - async def get_execution_status( # type: ignore[override] + async def execute_workflow_as_get_api( + self, + name: StrictStr, + version: Optional[StrictInt] = None, + request_id: Optional[StrictStr] = None, + wait_until_task_ref: Optional[StrictStr] = None, + wait_for_seconds: Optional[StrictInt] = None, + x_idempotency_key: Optional[StrictStr] = None, + x_on_conflict: Optional[StrictStr] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> Dict[str, object]: + """(Deprecated) Execute a workflow synchronously with input and outputs using get api""" + return await self._api.execute_workflow_as_get_api( + name, + version, + request_id, + wait_until_task_ref, + wait_for_seconds, + x_idempotency_key, + x_on_conflict, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def get_execution_status( self, workflow_id: StrictStr, include_tasks: Optional[StrictBool] = None, @@ -77,7 +214,7 @@ async def get_execution_status( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> WorkflowAdapter: - result = await super().get_execution_status( + result = await self._api.get_execution_status( workflow_id, include_tasks, summarize, @@ -87,9 +224,38 @@ async def get_execution_status( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, WorkflowAdapter) + + async def get_execution_status_task_list( + self, + workflow_id: StrictStr, + start: Optional[StrictInt] = None, + count: Optional[StrictInt] = None, + status: Optional[List[StrictStr]] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> TaskListSearchResultSummaryAdapter: + result = await self._api.get_execution_status_task_list( + workflow_id, + start, + count, + status, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_to_adapter(result, TaskListSearchResultSummaryAdapter) - async def get_workflow_status_summary( # type: ignore[override] + async def get_workflow_status_summary( self, workflow_id: StrictStr, include_output: Optional[StrictBool] = None, @@ -103,8 +269,8 @@ async def get_workflow_status_summary( # type: ignore[override] _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> WorkflowStatusAdapter: # type: ignore[override] - result = await super().get_workflow_status_summary( + ) -> WorkflowStatusAdapter: + result = await self._api.get_workflow_status_summary( workflow_id, include_output, include_variables, @@ -114,7 +280,7 @@ async def get_workflow_status_summary( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, WorkflowStatusAdapter) async def get_running_workflow( self, @@ -132,7 +298,7 @@ async def get_running_workflow( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[str]: - return await super().get_running_workflow( + return await self._api.get_running_workflow( name, version, start_time, @@ -144,7 +310,7 @@ async def get_running_workflow( _host_index=_host_index, ) - async def get_workflows( # type: ignore[override] + async def get_workflows( self, name: StrictStr, request_body: List[StrictStr], @@ -160,7 +326,7 @@ async def get_workflows( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> Dict[str, List[WorkflowAdapter]]: - result = await super().get_workflows( + result = await self._api.get_workflows( name, request_body, include_closed, @@ -171,11 +337,11 @@ async def get_workflows( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_dict_to_adapter(result, WorkflowAdapter) - async def get_workflows1( # type: ignore[override] + async def get_workflows1( self, - correlation_ids_search_request: CorrelationIdsSearchRequestAdapter, # type: ignore[override] + correlation_ids_search_request: CorrelationIdsSearchRequestAdapter, include_closed: Optional[StrictBool] = None, include_tasks: Optional[StrictBool] = None, _request_timeout: Union[ @@ -188,7 +354,7 @@ async def get_workflows1( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> Dict[str, List[WorkflowAdapter]]: - result = await super().get_workflows1( + result = await self._api.get_workflows1( correlation_ids_search_request, include_closed, include_tasks, @@ -198,9 +364,88 @@ async def get_workflows1( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_dict_to_adapter(result, WorkflowAdapter) + + async def get_workflows2( + self, + name: StrictStr, + correlation_id: StrictStr, + include_closed: Optional[StrictBool] = None, + include_tasks: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> List[WorkflowAdapter]: + result = await self._api.get_workflows2( + name, + correlation_id, + include_closed, + include_tasks, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_list_to_adapter(result, WorkflowAdapter) + + async def jump_to_task( + self, + workflow_id: StrictStr, + task_reference_name: StrictStr, + request_body: Dict[str, Dict[str, Any]], + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Jump workflow execution to given task""" + await self._api.jump_to_task( + workflow_id, + task_reference_name, + request_body, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) - async def search( # type: ignore[override] + async def pause_workflow( + self, + workflow_id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Pauses the workflow""" + await self._api.pause_workflow( + workflow_id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def search( self, start: Optional[StrictInt] = None, size: Optional[StrictInt] = None, @@ -218,7 +463,7 @@ async def search( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> ScrollableSearchResultWorkflowSummaryAdapter: - result = await super().search( + result = await self._api.search( start, size, sort, @@ -231,12 +476,62 @@ async def search( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, ScrollableSearchResultWorkflowSummaryAdapter) + + async def skip_task_from_workflow( + self, + workflow_id: StrictStr, + task_reference_name: StrictStr, + skip_task_request: SkipTaskRequestAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Skips a given task from a current running workflow""" + await self._api.skip_task_from_workflow( + workflow_id, + task_reference_name, + skip_task_request, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def start_workflow( + self, + start_workflow_request: StartWorkflowRequestAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> str: + """Start a new workflow with StartWorkflowRequest, which allows task to be executed in a domain""" + return await self._api.start_workflow( + start_workflow_request, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) async def rerun( self, workflow_id: StrictStr, - rerun_workflow_request: RerunWorkflowRequestAdapter, # type: ignore[override] + rerun_workflow_request: RerunWorkflowRequestAdapter, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -247,9 +542,32 @@ async def rerun( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> str: - return await super().rerun( + return await self._api.rerun( + workflow_id, + rerun_workflow_request, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def reset_workflow( + self, + workflow_id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Resets callback times of all non-terminal SIMPLE tasks to 0""" + await self._api.reset_workflow( workflow_id, - rerun_workflow_request, # type: ignore[override] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -271,7 +589,7 @@ async def restart( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - await super().restart( + await self._api.restart( workflow_id, use_latest_definitions, _request_timeout=_request_timeout, @@ -281,11 +599,61 @@ async def restart( _host_index=_host_index, ) - async def update_workflow_and_task_state( # type: ignore[override] + async def resume_workflow( + self, + workflow_id: StrictStr, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Resumes the workflow""" + await self._api.resume_workflow( + workflow_id, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def retry( + self, + workflow_id: StrictStr, + resume_subworkflow_tasks: Optional[StrictBool] = None, + retry_if_retried_by_parent: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Retries the last failed task""" + await self._api.retry( + workflow_id, + resume_subworkflow_tasks, + retry_if_retried_by_parent, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + + async def update_workflow_and_task_state( self, workflow_id: StrictStr, request_id: StrictStr, - workflow_state_update: WorkflowStateUpdateAdapter, # type: ignore[override] + workflow_state_update: WorkflowStateUpdateAdapter, wait_until_task_ref: Optional[StrictStr] = None, wait_for_seconds: Optional[StrictInt] = None, _request_timeout: Union[ @@ -298,10 +666,10 @@ async def update_workflow_and_task_state( # type: ignore[override] _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> WorkflowRunAdapter: - result = await super().update_workflow_and_task_state( + result = await self._api.update_workflow_and_task_state( workflow_id, request_id, - workflow_state_update, # type: ignore[override] + workflow_state_update, wait_until_task_ref, wait_for_seconds, _request_timeout=_request_timeout, @@ -310,36 +678,35 @@ async def update_workflow_and_task_state( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, WorkflowRunAdapter) - async def test_workflow( # type: ignore[override] + async def test_workflow( self, - workflow_test_request: WorkflowTestRequestAdapter, # type: ignore[override] - _request_timeout: Union[ # noqa: PT019 + workflow_test_request: WorkflowTestRequestAdapter, + _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, # noqa: PT019 - _content_type: Optional[StrictStr] = None, # noqa: PT019 - _headers: Optional[Dict[StrictStr, Any]] = None, # noqa: PT019 - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, # noqa: PT019 + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> WorkflowAdapter: - result = await super().test_workflow( - workflow_test_request, # type: ignore[override] + result = await self._api.test_workflow( + workflow_test_request, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return convert_to_adapter(result, WorkflowAdapter) - @validate_call async def update_workflow_state( self, workflow_id: StrictStr, - request_body: Dict[str, Any], + request_body: Dict[str, Dict[str, Any]], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -350,56 +717,42 @@ async def update_workflow_state( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> WorkflowAdapter: - """Update workflow variables - - Updates the workflow variables and triggers evaluation. - - :param workflow_id: (required) - :type workflow_id: str - :param request_body: (required) - :type request_body: Dict[str, object] - :param _request_timeout: timeout setting for this request. If one - number provided, it will be total request - timeout. It can also be a pair (tuple) of - (connection, read) timeouts. - :type _request_timeout: int, tuple(int, int), optional - :param _request_auth: set to override the auth_settings for an a single - request; this effectively ignores the - authentication in the spec for a single request. - :type _request_auth: dict, optional - :param _content_type: force content-type for the request. - :type _content_type: str, Optional - :param _headers: set to override the headers for a single - request; this effectively ignores the headers - in the spec for a single request. - :type _headers: dict, optional - :param _host_index: set to override the host_index for a single - request; this effectively ignores the host_index - in the spec for a single request. - :type _host_index: int, optional - :return: Returns the result object. - """ - - _param = self._update_workflow_state_serialize( - workflow_id=workflow_id, - request_body=request_body, + result = await self._api.update_workflow_state( + workflow_id, + request_body, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) + return convert_to_adapter(result, WorkflowAdapter) + + async def upgrade_running_workflow_to_version( + self, + workflow_id: StrictStr, + upgrade_workflow_request: UpgradeWorkflowRequestAdapter, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Upgrade running workflow to newer version""" + await self._api.upgrade_running_workflow_to_version( + workflow_id, + upgrade_workflow_request, + _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - _response_types_map: Dict[str, Optional[str]] = { - "200": "Workflow", - } - response_data = await self.api_client.call_api(*_param, _request_timeout=_request_timeout) - await response_data.read() - return self.api_client.response_deserialize( - response_data=response_data, - response_types_map=_response_types_map, - ).data - - @validate_call async def start_workflow1( self, name: StrictStr, @@ -419,65 +772,44 @@ async def start_workflow1( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> str: - """Start a new workflow. Returns the ID of the workflow instance that can be later used for tracking - - - :param name: (required) - :type name: str - :param request_body: (required) - :type request_body: Dict[str, object] - :param version: - :type version: int - :param correlation_id: - :type correlation_id: str - :param priority: - :type priority: int - :param x_idempotency_key: - :type x_idempotency_key: str - :param x_on_conflict: - :type x_on_conflict: str - :param _request_timeout: timeout setting for this request. If one - number provided, it will be total request - timeout. It can also be a pair (tuple) of - (connection, read) timeouts. - :type _request_timeout: int, tuple(int, int), optional - :param _request_auth: set to override the auth_settings for an a single - request; this effectively ignores the - authentication in the spec for a single request. - :type _request_auth: dict, optional - :param _content_type: force content-type for the request. - :type _content_type: str, Optional - :param _headers: set to override the headers for a single - request; this effectively ignores the headers - in the spec for a single request. - :type _headers: dict, optional - :param _host_index: set to override the host_index for a single - request; this effectively ignores the host_index - in the spec for a single request. - :type _host_index: int, optional - :return: Returns the result object. - """ - - _param = self._start_workflow1_serialize( - name=name, - request_body=request_body, - version=version, - correlation_id=correlation_id, - priority=priority, - x_idempotency_key=x_idempotency_key, - x_on_conflict=x_on_conflict, + return await self._api.start_workflow1( + name, + request_body, + version, + correlation_id, + priority, + x_idempotency_key, + x_on_conflict, + _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - _response_types_map: Dict[str, Optional[str]] = { - "200": "str", - } - response_data = await self.api_client.call_api(*_param, _request_timeout=_request_timeout) - await response_data.read() - return self.api_client.response_deserialize( - response_data=response_data, - response_types_map=_response_types_map, - ).data + async def terminate1( + self, + workflow_id: StrictStr, + reason: Optional[StrictStr] = None, + trigger_failure_workflow: Optional[StrictBool] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> None: + """Terminate workflow execution""" + await self._api.terminate1( + workflow_id, + reason, + trigger_failure_workflow, + _request_timeout=_request_timeout, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index, + ) diff --git a/src/conductor/asyncio_client/adapters/models/conductor_user_adapter.py b/src/conductor/asyncio_client/adapters/models/conductor_user_adapter.py index 0ff15a50..e9d06ae3 100644 --- a/src/conductor/asyncio_client/adapters/models/conductor_user_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/conductor_user_adapter.py @@ -9,8 +9,8 @@ class ConductorUserAdapter(ConductorUser): - groups: Optional[List["GroupAdapter"]] = None # type: ignore[assignment] - roles: Optional[List["RoleAdapter"]] = None # type: ignore[assignment] + groups: Optional[List["GroupAdapter"]] = None + roles: Optional[List["RoleAdapter"]] = None orkes_app: Optional[StrictBool] = Field(default=None, alias="orkesApp") orkes_api_gateway: Optional[StrictBool] = Field(default=None, alias="orkesApiGateway") contact_information: Optional[Dict[Any, str]] = Field(default=None, alias="contactInformation") diff --git a/src/conductor/asyncio_client/adapters/models/descriptor_adapter.py b/src/conductor/asyncio_client/adapters/models/descriptor_adapter.py index 1e657346..748edbfa 100644 --- a/src/conductor/asyncio_client/adapters/models/descriptor_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/descriptor_adapter.py @@ -9,16 +9,16 @@ class DescriptorAdapter(Descriptor): - containing_type: Optional["DescriptorAdapter"] = Field(default=None, alias="containingType") # type: ignore[assignment] - enum_types: Optional[List["EnumDescriptorAdapter"]] = Field(default=None, alias="enumTypes") # type: ignore[assignment] - extensions: Optional[List["FieldDescriptorAdapter"]] = None # type: ignore[assignment] - fields: Optional[List["FieldDescriptorAdapter"]] = None # type: ignore[assignment] - file: Optional["FileDescriptorAdapter"] = None # type: ignore[assignment] - nested_types: Optional[List["DescriptorAdapter"]] = Field(default=None, alias="nestedTypes") # type: ignore[assignment] - oneofs: Optional[List["OneofDescriptorAdapter"]] = None # type: ignore[assignment] - options: Optional["MessageOptionsAdapter"] = None # type: ignore[assignment] - proto: Optional["DescriptorProtoAdapter"] = None # type: ignore[assignment] - real_oneofs: Optional[List["OneofDescriptorAdapter"]] = Field(default=None, alias="realOneofs") # type: ignore[assignment] + containing_type: Optional["DescriptorAdapter"] = Field(default=None, alias="containingType") + enum_types: Optional[List["EnumDescriptorAdapter"]] = Field(default=None, alias="enumTypes") + extensions: Optional[List["FieldDescriptorAdapter"]] = None + fields: Optional[List["FieldDescriptorAdapter"]] = None + file: Optional["FileDescriptorAdapter"] = None + nested_types: Optional[List["DescriptorAdapter"]] = Field(default=None, alias="nestedTypes") + oneofs: Optional[List["OneofDescriptorAdapter"]] = None + options: Optional["MessageOptionsAdapter"] = None + proto: Optional["DescriptorProtoAdapter"] = None + real_oneofs: Optional[List["OneofDescriptorAdapter"]] = Field(default=None, alias="realOneofs") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/descriptor_proto_adapter.py b/src/conductor/asyncio_client/adapters/models/descriptor_proto_adapter.py index 4c52abb0..7f8761f0 100644 --- a/src/conductor/asyncio_client/adapters/models/descriptor_proto_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/descriptor_proto_adapter.py @@ -10,59 +10,59 @@ class DescriptorProtoAdapter(DescriptorProto): all_fields: Optional[Dict[str, Dict[str, Any]]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["DescriptorProto"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["DescriptorProto"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( default=None, alias="enumTypeList" ) - enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="enumTypeOrBuilderList" ) - extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( default=None, alias="extensionList" ) - extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="extensionOrBuilderList" ) - extension_range_list: Optional[List["ExtensionRangeAdapter"]] = Field( # type: ignore[assignment] + extension_range_list: Optional[List["ExtensionRangeAdapter"]] = Field( default=None, alias="extensionRangeList" ) - extension_range_or_builder_list: Optional[List["ExtensionRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] + extension_range_or_builder_list: Optional[List["ExtensionRangeOrBuilderAdapter"]] = Field( default=None, alias="extensionRangeOrBuilderList" ) - field_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + field_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( default=None, alias="fieldList" ) - field_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + field_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="fieldOrBuilderList" ) - nested_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + nested_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( default=None, alias="nestedTypeList" ) - nested_type_or_builder_list: Optional[List["DescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + nested_type_or_builder_list: Optional[List["DescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="nestedTypeOrBuilderList" ) - oneof_decl_list: Optional[List["OneofDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + oneof_decl_list: Optional[List["OneofDescriptorProtoAdapter"]] = Field( default=None, alias="oneofDeclList" ) - oneof_decl_or_builder_list: Optional[List["OneofDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + oneof_decl_or_builder_list: Optional[List["OneofDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="oneofDeclOrBuilderList" ) options: Optional["MessageOptionsAdapter"] = None - options_or_builder: Optional["MessageOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] + options_or_builder: Optional["MessageOptionsOrBuilderAdapter"] = Field( default=None, alias="optionsOrBuilder" ) - reserved_range_list: Optional[List["ReservedRangeAdapter"]] = Field( # type: ignore[assignment] + reserved_range_list: Optional[List["ReservedRangeAdapter"]] = Field( default=None, alias="reservedRangeList" ) - reserved_range_or_builder_list: Optional[List["ReservedRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] + reserved_range_or_builder_list: Optional[List["ReservedRangeOrBuilderAdapter"]] = Field( default=None, alias="reservedRangeOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py index e25ae689..91d4fbf9 100644 --- a/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py @@ -10,55 +10,55 @@ class DescriptorProtoOrBuilderAdapter(DescriptorProtoOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( default=None, alias="enumTypeList" ) - enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="enumTypeOrBuilderList" ) - extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( default=None, alias="extensionList" ) - extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="extensionOrBuilderList" ) - extension_range_list: Optional[List["ExtensionRangeAdapter"]] = Field( # type: ignore[assignment] + extension_range_list: Optional[List["ExtensionRangeAdapter"]] = Field( default=None, alias="extensionRangeList" ) - extension_range_or_builder_list: Optional[List["ExtensionRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] + extension_range_or_builder_list: Optional[List["ExtensionRangeOrBuilderAdapter"]] = Field( default=None, alias="extensionRangeOrBuilderList" ) - field_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + field_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( default=None, alias="fieldList" ) - field_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + field_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="fieldOrBuilderList" ) - nested_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + nested_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( default=None, alias="nestedTypeList" ) - oneof_decl_list: Optional[List["OneofDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + oneof_decl_list: Optional[List["OneofDescriptorProtoAdapter"]] = Field( default=None, alias="oneofDeclList" ) - oneof_decl_or_builder_list: Optional[List["OneofDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + oneof_decl_or_builder_list: Optional[List["OneofDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="oneofDeclOrBuilderList" ) - options_or_builder: Optional["MessageOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] + options_or_builder: Optional["MessageOptionsOrBuilderAdapter"] = Field( default=None, alias="optionsOrBuilder" ) - reserved_range_list: Optional[List["ReservedRangeAdapter"]] = Field( # type: ignore[assignment] + reserved_range_list: Optional[List["ReservedRangeAdapter"]] = Field( default=None, alias="reservedRangeList" ) - reserved_range_or_builder_list: Optional[List["ReservedRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] + reserved_range_or_builder_list: Optional[List["ReservedRangeOrBuilderAdapter"]] = Field( default=None, alias="reservedRangeOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_descriptor_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_descriptor_adapter.py index f142c07e..4f265294 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_descriptor_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_descriptor_adapter.py @@ -9,11 +9,11 @@ class EnumDescriptorAdapter(EnumDescriptor): - containing_type: Optional["DescriptorAdapter"] = Field(default=None, alias="containingType") # type: ignore[assignment] - file: Optional["FileDescriptorAdapter"] = None # type: ignore[assignment] - options: Optional["EnumOptionsAdapter"] = None # type: ignore[assignment] - proto: Optional["EnumDescriptorProtoAdapter"] = None # type: ignore[assignment] - values: Optional[List["EnumValueDescriptorAdapter"]] = None # type: ignore[assignment] + containing_type: Optional["DescriptorAdapter"] = Field(default=None, alias="containingType") + file: Optional["FileDescriptorAdapter"] = None + options: Optional["EnumOptionsAdapter"] = None + proto: Optional["EnumDescriptorProtoAdapter"] = None + values: Optional[List["EnumValueDescriptorAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_adapter.py index a74d690f..e1c446b5 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_adapter.py @@ -10,27 +10,27 @@ class EnumDescriptorProtoAdapter(EnumDescriptorProto): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["EnumDescriptorProtoAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["EnumDescriptorProtoAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) options: Optional["EnumOptionsAdapter"] = None - options_or_builder: Optional["EnumOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] + options_or_builder: Optional["EnumOptionsOrBuilderAdapter"] = Field( default=None, alias="optionsOrBuilder" ) - reserved_range_list: Optional[List["EnumReservedRangeAdapter"]] = Field( # type: ignore[assignment] + reserved_range_list: Optional[List["EnumReservedRangeAdapter"]] = Field( default=None, alias="reservedRangeList" ) - reserved_range_or_builder_list: Optional[List["EnumReservedRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] + reserved_range_or_builder_list: Optional[List["EnumReservedRangeOrBuilderAdapter"]] = Field( default=None, alias="reservedRangeOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] - value_list: Optional[List["EnumValueDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + value_list: Optional[List["EnumValueDescriptorProtoAdapter"]] = Field( default=None, alias="valueList" ) - value_or_builder_list: Optional[List["EnumValueDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + value_or_builder_list: Optional[List["EnumValueDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="valueOrBuilderList" ) diff --git a/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_or_builder_adapter.py index c5a3a57b..ab658411 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_or_builder_adapter.py @@ -10,27 +10,27 @@ class EnumDescriptorProtoOrBuilderAdapter(EnumDescriptorProtoOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - options: Optional["EnumOptionsAdapter"] = None # type: ignore[assignment] - options_or_builder: Optional["EnumOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] + options: Optional["EnumOptionsAdapter"] = None + options_or_builder: Optional["EnumOptionsOrBuilderAdapter"] = Field( default=None, alias="optionsOrBuilder" ) - reserved_range_list: Optional[List["EnumReservedRangeAdapter"]] = Field( # type: ignore[assignment] + reserved_range_list: Optional[List["EnumReservedRangeAdapter"]] = Field( default=None, alias="reservedRangeList" ) - reserved_range_or_builder_list: Optional[List["EnumReservedRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] + reserved_range_or_builder_list: Optional[List["EnumReservedRangeOrBuilderAdapter"]] = Field( default=None, alias="reservedRangeOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] - value_list: Optional[List["EnumValueDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + value_list: Optional[List["EnumValueDescriptorProtoAdapter"]] = Field( default=None, alias="valueList" ) - value_or_builder_list: Optional[List["EnumValueDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + value_or_builder_list: Optional[List["EnumValueDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="valueOrBuilderList" ) diff --git a/src/conductor/asyncio_client/adapters/models/enum_options_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_options_adapter.py index 858d506f..0b3a3ca9 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_options_adapter.py @@ -11,23 +11,23 @@ class EnumOptionsAdapter(EnumOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["EnumOptionsAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["EnumOptionsAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features: Optional["FeatureSetAdapter"] = None + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_options_or_builder_adapter.py index 5ce6490b..7c8495f0 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class EnumOptionsOrBuilderAdapter(EnumOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_value_options_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_value_options_adapter.py index 6de7507c..05d9d6c7 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_value_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_value_options_adapter.py @@ -11,23 +11,23 @@ class EnumValueOptionsAdapter(EnumValueOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["EnumValueOptionsAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["EnumValueOptionsAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_value_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_value_options_or_builder_adapter.py index 54ccbd01..c3369653 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_value_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_value_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class EnumValueOptionsOrBuilderAdapter(EnumValueOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/environment_variable_adapter.py b/src/conductor/asyncio_client/adapters/models/environment_variable_adapter.py index 07028025..c969d951 100644 --- a/src/conductor/asyncio_client/adapters/models/environment_variable_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/environment_variable_adapter.py @@ -8,7 +8,7 @@ class EnvironmentVariableAdapter(EnvironmentVariable): - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/event_handler_adapter.py b/src/conductor/asyncio_client/adapters/models/event_handler_adapter.py index b98ac1a4..bfea7e00 100644 --- a/src/conductor/asyncio_client/adapters/models/event_handler_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/event_handler_adapter.py @@ -8,8 +8,8 @@ class EventHandlerAdapter(EventHandler): - actions: Optional[List["ActionAdapter"]] = None # type: ignore[assignment] - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + actions: Optional[List["ActionAdapter"]] = None + tags: Optional[List["TagAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extended_conductor_application_adapter.py b/src/conductor/asyncio_client/adapters/models/extended_conductor_application_adapter.py index a5b4b924..82fa4eed 100644 --- a/src/conductor/asyncio_client/adapters/models/extended_conductor_application_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extended_conductor_application_adapter.py @@ -8,7 +8,7 @@ class ExtendedConductorApplicationAdapter(ExtendedConductorApplication): - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extended_secret_adapter.py b/src/conductor/asyncio_client/adapters/models/extended_secret_adapter.py index 09b20b5a..ae4dc880 100644 --- a/src/conductor/asyncio_client/adapters/models/extended_secret_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extended_secret_adapter.py @@ -8,7 +8,7 @@ class ExtendedSecretAdapter(ExtendedSecret): - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extended_task_def_adapter.py b/src/conductor/asyncio_client/adapters/models/extended_task_def_adapter.py index c549579a..640b01f3 100644 --- a/src/conductor/asyncio_client/adapters/models/extended_task_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extended_task_def_adapter.py @@ -9,12 +9,12 @@ class ExtendedTaskDefAdapter(ExtendedTaskDef): - input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") # type: ignore[assignment] + input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") input_template: Optional[Dict[str, Any]] = Field(default=None, alias="inputTemplate") - output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") # type: ignore[assignment] - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] - timeout_seconds: Optional[int] = Field(alias="timeoutSeconds", default=None) # type: ignore[assignment] - total_timeout_seconds: Optional[int] = Field(alias="totalTimeoutSeconds", default=None) # type: ignore[assignment] + output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") + tags: Optional[List["TagAdapter"]] = None + timeout_seconds: Optional[int] = Field(alias="timeoutSeconds", default=None) + total_timeout_seconds: Optional[int] = Field(alias="totalTimeoutSeconds", default=None) @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extended_workflow_def_adapter.py b/src/conductor/asyncio_client/adapters/models/extended_workflow_def_adapter.py index 63828f05..e7f51742 100644 --- a/src/conductor/asyncio_client/adapters/models/extended_workflow_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extended_workflow_def_adapter.py @@ -9,17 +9,17 @@ class ExtendedWorkflowDefAdapter(ExtendedWorkflowDef): - input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") # type: ignore[assignment] + input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") input_template: Optional[Dict[str, Any]] = Field(default=None, alias="inputTemplate") output_parameters: Optional[Dict[str, Any]] = Field(default=None, alias="outputParameters") - output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") # type: ignore[assignment] - rate_limit_config: Optional["RateLimitConfigAdapter"] = Field( # type: ignore[assignment] + output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") + rate_limit_config: Optional["RateLimitConfigAdapter"] = Field( default=None, alias="rateLimitConfig" ) - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] - tasks: List["WorkflowTaskAdapter"] # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None + tasks: List["WorkflowTaskAdapter"] variables: Optional[Dict[str, Any]] = None - timeout_seconds: Optional[int] = Field(default=None, alias="timeoutSeconds") # type: ignore[assignment] + timeout_seconds: Optional[int] = Field(default=None, alias="timeoutSeconds") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extension_range_options_adapter.py b/src/conductor/asyncio_client/adapters/models/extension_range_options_adapter.py index 9fcda2a1..5b4b1e96 100644 --- a/src/conductor/asyncio_client/adapters/models/extension_range_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extension_range_options_adapter.py @@ -11,26 +11,26 @@ class ExtensionRangeOptionsAdapter(ExtensionRangeOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - declaration_or_builder_list: Optional[List["DeclarationOrBuilderAdapter"]] = Field( # type: ignore[assignment] + declaration_or_builder_list: Optional[List["DeclarationOrBuilderAdapter"]] = Field( default=None, alias="declarationOrBuilderList" ) - default_instance_for_type: Optional["ExtensionRangeOptionsAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["ExtensionRangeOptionsAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extension_range_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/extension_range_options_or_builder_adapter.py index 1859be85..23e6411b 100644 --- a/src/conductor/asyncio_client/adapters/models/extension_range_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extension_range_options_or_builder_adapter.py @@ -10,29 +10,29 @@ class ExtensionRangeOptionsOrBuilderAdapter(ExtensionRangeOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - declaration_list: Optional[List["DeclarationAdapter"]] = Field( # type: ignore[assignment] + declaration_list: Optional[List["DeclarationAdapter"]] = Field( default=None, alias="declarationList" ) - declaration_or_builder_list: Optional[List["DeclarationOrBuilderAdapter"]] = Field( # type: ignore[assignment] + declaration_or_builder_list: Optional[List["DeclarationOrBuilderAdapter"]] = Field( default=None, alias="declarationOrBuilderList" ) - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features: Optional["FeatureSetAdapter"] = None + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/field_options_adapter.py b/src/conductor/asyncio_client/adapters/models/field_options_adapter.py index 89fe5202..a3227776 100644 --- a/src/conductor/asyncio_client/adapters/models/field_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/field_options_adapter.py @@ -11,29 +11,29 @@ class FieldOptionsAdapter(FieldOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["FieldOptionsAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["FieldOptionsAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - edition_defaults_list: Optional[List["EditionDefaultAdapter"]] = Field( # type: ignore[assignment] + edition_defaults_list: Optional[List["EditionDefaultAdapter"]] = Field( default=None, alias="editionDefaultsList" ) - edition_defaults_or_builder_list: Optional[List["EditionDefaultOrBuilderAdapter"]] = Field( # type: ignore[assignment] + edition_defaults_or_builder_list: Optional[List["EditionDefaultOrBuilderAdapter"]] = Field( default=None, alias="editionDefaultsOrBuilderList" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/field_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/field_options_or_builder_adapter.py index 3fc8fc51..df899eba 100644 --- a/src/conductor/asyncio_client/adapters/models/field_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/field_options_or_builder_adapter.py @@ -10,29 +10,29 @@ class FieldOptionsOrBuilderAdapter(FieldOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - edition_defaults_list: Optional[List["EditionDefaultAdapter"]] = Field( # type: ignore[assignment] + edition_defaults_list: Optional[List["EditionDefaultAdapter"]] = Field( default=None, alias="editionDefaultsList" ) - edition_defaults_or_builder_list: Optional[List["EditionDefaultOrBuilderAdapter"]] = Field( # type: ignore[assignment] + edition_defaults_or_builder_list: Optional[List["EditionDefaultOrBuilderAdapter"]] = Field( default=None, alias="editionDefaultsOrBuilderList" ) - features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features: Optional["FeatureSetAdapter"] = None + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/file_descriptor_adapter.py b/src/conductor/asyncio_client/adapters/models/file_descriptor_adapter.py index e42265ef..381f3ef9 100644 --- a/src/conductor/asyncio_client/adapters/models/file_descriptor_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/file_descriptor_adapter.py @@ -9,17 +9,17 @@ class FileDescriptorAdapter(FileDescriptor): - dependencies: Optional[List["FileDescriptorAdapter"]] = None # type: ignore[assignment] - enum_types: Optional[List["EnumDescriptorAdapter"]] = Field(default=None, alias="enumTypes") # type: ignore[assignment] - extensions: Optional[List["FieldDescriptorAdapter"]] = None # type: ignore[assignment] - file: Optional["FileDescriptorAdapter"] = None # type: ignore[assignment] - message_types: Optional[List["DescriptorAdapter"]] = Field(default=None, alias="messageTypes") # type: ignore[assignment] - options: Optional["FileOptionsAdapter"] = None # type: ignore[assignment] - proto: Optional["FileDescriptorProtoAdapter"] = None # type: ignore[assignment] - public_dependencies: Optional[List["FileDescriptorAdapter"]] = Field( # type: ignore[assignment] + dependencies: Optional[List["FileDescriptorAdapter"]] = None + enum_types: Optional[List["EnumDescriptorAdapter"]] = Field(default=None, alias="enumTypes") + extensions: Optional[List["FieldDescriptorAdapter"]] = None + file: Optional["FileDescriptorAdapter"] = None + message_types: Optional[List["DescriptorAdapter"]] = Field(default=None, alias="messageTypes") + options: Optional["FileOptionsAdapter"] = None + proto: Optional["FileDescriptorProtoAdapter"] = None + public_dependencies: Optional[List["FileDescriptorAdapter"]] = Field( default=None, alias="publicDependencies" ) - services: Optional[List["ServiceDescriptorAdapter"]] = None # type: ignore[assignment] + services: Optional[List["ServiceDescriptorAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/file_descriptor_proto_adapter.py b/src/conductor/asyncio_client/adapters/models/file_descriptor_proto_adapter.py index 201a4372..c27c7ab9 100644 --- a/src/conductor/asyncio_client/adapters/models/file_descriptor_proto_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/file_descriptor_proto_adapter.py @@ -10,47 +10,47 @@ class FileDescriptorProtoAdapter(FileDescriptorProto): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["FileDescriptorProtoAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["FileDescriptorProtoAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( default=None, alias="enumTypeList" ) - enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="enumTypeOrBuilderList" ) - extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( default=None, alias="extensionList" ) - extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="extensionOrBuilderList" ) - message_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + message_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( default=None, alias="messageTypeList" ) - message_type_or_builder_list: Optional[List["DescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + message_type_or_builder_list: Optional[List["DescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="messageTypeOrBuilderList" ) - options: Optional["FileOptionsAdapter"] = None # type: ignore[assignment] - options_or_builder: Optional["FileOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] + options: Optional["FileOptionsAdapter"] = None + options_or_builder: Optional["FileOptionsOrBuilderAdapter"] = Field( default=None, alias="optionsOrBuilder" ) - service_list: Optional[List["ServiceDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + service_list: Optional[List["ServiceDescriptorProtoAdapter"]] = Field( default=None, alias="serviceList" ) - service_or_builder_list: Optional[List["ServiceDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + service_or_builder_list: Optional[List["ServiceDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="serviceOrBuilderList" ) - source_code_info: Optional["SourceCodeInfoAdapter"] = Field( # type: ignore[assignment] + source_code_info: Optional["SourceCodeInfoAdapter"] = Field( default=None, alias="sourceCodeInfo" ) - source_code_info_or_builder: Optional["SourceCodeInfoOrBuilderAdapter"] = Field( # type: ignore[assignment] + source_code_info_or_builder: Optional["SourceCodeInfoOrBuilderAdapter"] = Field( default=None, alias="sourceCodeInfoOrBuilder" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/file_options_adapter.py b/src/conductor/asyncio_client/adapters/models/file_options_adapter.py index 9f9c21c9..211a7619 100644 --- a/src/conductor/asyncio_client/adapters/models/file_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/file_options_adapter.py @@ -11,23 +11,23 @@ class FileOptionsAdapter(FileOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["FileOptionsAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["FileOptionsAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/file_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/file_options_or_builder_adapter.py index e5c7e680..d7d7bad2 100644 --- a/src/conductor/asyncio_client/adapters/models/file_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/file_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class FileOptionsOrBuilderAdapter(FileOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features: Optional["FeatureSetAdapter"] = None + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/granted_access_response_adapter.py b/src/conductor/asyncio_client/adapters/models/granted_access_response_adapter.py index d954f0cc..08526c8c 100644 --- a/src/conductor/asyncio_client/adapters/models/granted_access_response_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/granted_access_response_adapter.py @@ -9,7 +9,7 @@ class GrantedAccessResponseAdapter(GrantedAccessResponse): - granted_access: Optional[List["GrantedAccessAdapter"]] = Field( # type: ignore[assignment] + granted_access: Optional[List["GrantedAccessAdapter"]] = Field( default=None, alias="grantedAccess" ) diff --git a/src/conductor/asyncio_client/adapters/models/group_adapter.py b/src/conductor/asyncio_client/adapters/models/group_adapter.py index f7c19fda..e378a20d 100644 --- a/src/conductor/asyncio_client/adapters/models/group_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/group_adapter.py @@ -9,7 +9,7 @@ class GroupAdapter(Group): - roles: Optional[List["RoleAdapter"]] = None # type: ignore[assignment] + roles: Optional[List["RoleAdapter"]] = None @field_validator("default_access") def default_access_validate_enum(cls, value): diff --git a/src/conductor/asyncio_client/adapters/models/integration_adapter.py b/src/conductor/asyncio_client/adapters/models/integration_adapter.py index 53291829..c10b1b34 100644 --- a/src/conductor/asyncio_client/adapters/models/integration_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/integration_adapter.py @@ -9,9 +9,9 @@ class IntegrationAdapter(Integration): - apis: Optional[List["IntegrationApiAdapter"]] = None # type: ignore[assignment] + apis: Optional[List["IntegrationApiAdapter"]] = None configuration: Optional[Dict[str, Any]] = None - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None @field_validator("category") def category_validate_enum(cls, value): diff --git a/src/conductor/asyncio_client/adapters/models/integration_api_adapter.py b/src/conductor/asyncio_client/adapters/models/integration_api_adapter.py index f0bab337..c39911b5 100644 --- a/src/conductor/asyncio_client/adapters/models/integration_api_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/integration_api_adapter.py @@ -9,7 +9,7 @@ class IntegrationApiAdapter(IntegrationApi): configuration: Optional[Dict[str, Any]] = None - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/integration_def_adapter.py b/src/conductor/asyncio_client/adapters/models/integration_def_adapter.py index 7c862be4..192cacbe 100644 --- a/src/conductor/asyncio_client/adapters/models/integration_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/integration_def_adapter.py @@ -9,7 +9,7 @@ class IntegrationDefAdapter(IntegrationDef): - configuration: Optional[List["IntegrationDefFormFieldAdapter"]] = None # type: ignore[assignment] + configuration: Optional[List["IntegrationDefFormFieldAdapter"]] = None @field_validator("category") def category_validate_enum(cls, value): diff --git a/src/conductor/asyncio_client/adapters/models/integration_def_form_field_adapter.py b/src/conductor/asyncio_client/adapters/models/integration_def_form_field_adapter.py index c8976c2b..d10cf6cd 100644 --- a/src/conductor/asyncio_client/adapters/models/integration_def_form_field_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/integration_def_form_field_adapter.py @@ -9,8 +9,8 @@ class IntegrationDefFormFieldAdapter(IntegrationDefFormField): - value_options: Optional[List["OptionAdapter"]] = Field(default=None, alias="valueOptions") # type: ignore[assignment] - depends_on: Optional[List["IntegrationDefFormFieldAdapter"]] = Field( # type: ignore[assignment] + value_options: Optional[List["OptionAdapter"]] = Field(default=None, alias="valueOptions") + depends_on: Optional[List["IntegrationDefFormFieldAdapter"]] = Field( default=None, alias="dependsOn" ) __properties: ClassVar[List[str]] = [ diff --git a/src/conductor/asyncio_client/adapters/models/message_options_adapter.py b/src/conductor/asyncio_client/adapters/models/message_options_adapter.py index 8becbfb1..ad6a528b 100644 --- a/src/conductor/asyncio_client/adapters/models/message_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/message_options_adapter.py @@ -11,23 +11,23 @@ class MessageOptionsAdapter(MessageOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["MessageOptionsAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageOptionsAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/message_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/message_options_or_builder_adapter.py index 926883bb..1f4872b8 100644 --- a/src/conductor/asyncio_client/adapters/models/message_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/message_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class MessageOptionsOrBuilderAdapter(MessageOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features: Optional["FeatureSetAdapter"] = None + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/message_template_adapter.py b/src/conductor/asyncio_client/adapters/models/message_template_adapter.py index a7574c12..9e281cd3 100644 --- a/src/conductor/asyncio_client/adapters/models/message_template_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/message_template_adapter.py @@ -8,7 +8,7 @@ class MessageTemplateAdapter(MessageTemplate): - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/method_options_adapter.py b/src/conductor/asyncio_client/adapters/models/method_options_adapter.py index 7d8c6b25..e58fa3b6 100644 --- a/src/conductor/asyncio_client/adapters/models/method_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/method_options_adapter.py @@ -11,23 +11,23 @@ class MethodOptionsAdapter(MethodOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["MethodOptionsAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MethodOptionsAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features: Optional["FeatureSetAdapter"] = None + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/method_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/method_options_or_builder_adapter.py index bf138329..10d73e46 100644 --- a/src/conductor/asyncio_client/adapters/models/method_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/method_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class MethodOptionsOrBuilderAdapter(MethodOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features: Optional["FeatureSetAdapter"] = None + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/oneof_options_adapter.py b/src/conductor/asyncio_client/adapters/models/oneof_options_adapter.py index cd7c36b1..63779f55 100644 --- a/src/conductor/asyncio_client/adapters/models/oneof_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/oneof_options_adapter.py @@ -11,23 +11,23 @@ class OneofOptionsAdapter(OneofOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["OneofOptionsAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["OneofOptionsAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features: Optional["FeatureSetAdapter"] = None + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/oneof_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/oneof_options_or_builder_adapter.py index e106b69c..172a7759 100644 --- a/src/conductor/asyncio_client/adapters/models/oneof_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/oneof_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class OneofOptionsOrBuilderAdapter(OneofOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features: Optional["FeatureSetAdapter"] = None + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/role_adapter.py b/src/conductor/asyncio_client/adapters/models/role_adapter.py index 6870ea85..a9d30cce 100644 --- a/src/conductor/asyncio_client/adapters/models/role_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/role_adapter.py @@ -8,7 +8,7 @@ class RoleAdapter(Role): - permissions: Optional[List["PermissionAdapter"]] = None # type: ignore[assignment] + permissions: Optional[List["PermissionAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/scrollable_search_result_workflow_summary_adapter.py b/src/conductor/asyncio_client/adapters/models/scrollable_search_result_workflow_summary_adapter.py index 349a0654..49351bb4 100644 --- a/src/conductor/asyncio_client/adapters/models/scrollable_search_result_workflow_summary_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/scrollable_search_result_workflow_summary_adapter.py @@ -8,7 +8,7 @@ class ScrollableSearchResultWorkflowSummaryAdapter(ScrollableSearchResultWorkflowSummary): - results: Optional[List["WorkflowSummaryAdapter"]] = None # type: ignore[assignment] + results: Optional[List["WorkflowSummaryAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/search_result_handled_event_response_adapter.py b/src/conductor/asyncio_client/adapters/models/search_result_handled_event_response_adapter.py index fde3d631..c2c012ed 100644 --- a/src/conductor/asyncio_client/adapters/models/search_result_handled_event_response_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/search_result_handled_event_response_adapter.py @@ -8,7 +8,7 @@ class SearchResultHandledEventResponseAdapter(SearchResultHandledEventResponse): - results: Optional[List["HandledEventResponseAdapter"]] = None # type: ignore[assignment] + results: Optional[List["HandledEventResponseAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/search_result_task_summary_adapter.py b/src/conductor/asyncio_client/adapters/models/search_result_task_summary_adapter.py index 82078cef..3629ba0c 100644 --- a/src/conductor/asyncio_client/adapters/models/search_result_task_summary_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/search_result_task_summary_adapter.py @@ -8,7 +8,7 @@ class SearchResultTaskSummaryAdapter(SearchResultTaskSummary): - results: Optional[List["TaskSummaryAdapter"]] = None # type: ignore[assignment] + results: Optional[List["TaskSummaryAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/search_result_workflow_schedule_execution_model_adapter.py b/src/conductor/asyncio_client/adapters/models/search_result_workflow_schedule_execution_model_adapter.py index a81255f8..6a174a11 100644 --- a/src/conductor/asyncio_client/adapters/models/search_result_workflow_schedule_execution_model_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/search_result_workflow_schedule_execution_model_adapter.py @@ -10,7 +10,7 @@ class SearchResultWorkflowScheduleExecutionModelAdapter(SearchResultWorkflowScheduleExecutionModel): - results: Optional[List["WorkflowScheduleExecutionModelAdapter"]] = None # type: ignore[assignment] + results: Optional[List["WorkflowScheduleExecutionModelAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py b/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py index 600f9524..c58e6aba 100644 --- a/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py @@ -8,10 +8,10 @@ class ServiceDescriptorAdapter(ServiceDescriptor): - file: Optional["FileDescriptorAdapter"] = None # type: ignore[assignment] - methods: Optional[List["MethodDescriptorAdapter"]] = None # type: ignore[assignment] - options: Optional["ServiceOptionsAdapter"] = None # type: ignore[assignment] - proto: Optional["ServiceDescriptorProtoAdapter"] = None # type: ignore[assignment] + file: Optional["FileDescriptorAdapter"] = None + methods: Optional[List["MethodDescriptorAdapter"]] = None + options: Optional["ServiceOptionsAdapter"] = None + proto: Optional["ServiceDescriptorProtoAdapter"] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_adapter.py b/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_adapter.py index d8f2981c..808e1526 100644 --- a/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_adapter.py @@ -10,23 +10,23 @@ class ServiceDescriptorProtoAdapter(ServiceDescriptorProto): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["ServiceDescriptorProtoAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["ServiceDescriptorProtoAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - method_list: Optional[List["MethodDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + method_list: Optional[List["MethodDescriptorProtoAdapter"]] = Field( default=None, alias="methodList" ) - method_or_builder_list: Optional[List["MethodDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + method_or_builder_list: Optional[List["MethodDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="methodOrBuilderList" ) - options: Optional["ServiceOptionsAdapter"] = None # type: ignore[assignment] - options_or_builder: Optional["ServiceOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] + options: Optional["ServiceOptionsAdapter"] = None + options_or_builder: Optional["ServiceOptionsOrBuilderAdapter"] = Field( default=None, alias="optionsOrBuilder" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_or_builder_adapter.py index a2d9f855..ffe2a434 100644 --- a/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_or_builder_adapter.py @@ -10,23 +10,23 @@ class ServiceDescriptorProtoOrBuilderAdapter(ServiceDescriptorProtoOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - method_list: Optional[List["MethodDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + method_list: Optional[List["MethodDescriptorProtoAdapter"]] = Field( default=None, alias="methodList" ) - method_or_builder_list: Optional[List["MethodDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + method_or_builder_list: Optional[List["MethodDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="methodOrBuilderList" ) - options: Optional["ServiceOptionsAdapter"] = None # type: ignore[assignment] - options_or_builder: Optional["ServiceOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] + options: Optional["ServiceOptionsAdapter"] = None + options_or_builder: Optional["ServiceOptionsOrBuilderAdapter"] = Field( default=None, alias="optionsOrBuilder" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_options_adapter.py b/src/conductor/asyncio_client/adapters/models/service_options_adapter.py index 6afe75a7..41197a45 100644 --- a/src/conductor/asyncio_client/adapters/models/service_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_options_adapter.py @@ -11,23 +11,23 @@ class ServiceOptionsAdapter(ServiceOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["ServiceOptionsAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["ServiceOptionsAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/service_options_or_builder_adapter.py index c72fe67c..8fe0569b 100644 --- a/src/conductor/asyncio_client/adapters/models/service_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class ServiceOptionsOrBuilderAdapter(ServiceOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/source_code_info_adapter.py b/src/conductor/asyncio_client/adapters/models/source_code_info_adapter.py index 181d8f22..4025cdd1 100644 --- a/src/conductor/asyncio_client/adapters/models/source_code_info_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/source_code_info_adapter.py @@ -10,17 +10,17 @@ class SourceCodeInfoAdapter(SourceCodeInfo): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["SourceCodeInfoAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["SourceCodeInfoAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - location_list: Optional[List["LocationAdapter"]] = Field(default=None, alias="locationList") # type: ignore[assignment] - location_or_builder_list: Optional[List["LocationOrBuilderAdapter"]] = Field( # type: ignore[assignment] + location_list: Optional[List["LocationAdapter"]] = Field(default=None, alias="locationList") + location_or_builder_list: Optional[List["LocationOrBuilderAdapter"]] = Field( default=None, alias="locationOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/source_code_info_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/source_code_info_or_builder_adapter.py index d7b9b98f..e2d2c6fa 100644 --- a/src/conductor/asyncio_client/adapters/models/source_code_info_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/source_code_info_or_builder_adapter.py @@ -10,17 +10,17 @@ class SourceCodeInfoOrBuilderAdapter(SourceCodeInfoOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - location_list: Optional[List["LocationAdapter"]] = Field(default=None, alias="locationList") # type: ignore[assignment] - location_or_builder_list: Optional[List["LocationOrBuilderAdapter"]] = Field( # type: ignore[assignment] + location_list: Optional[List["LocationAdapter"]] = Field(default=None, alias="locationList") + location_or_builder_list: Optional[List["LocationOrBuilderAdapter"]] = Field( default=None, alias="locationOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/task_def_adapter.py b/src/conductor/asyncio_client/adapters/models/task_def_adapter.py index 915ff1db..71afa28e 100644 --- a/src/conductor/asyncio_client/adapters/models/task_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/task_def_adapter.py @@ -9,11 +9,11 @@ class TaskDefAdapter(TaskDef): - input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") # type: ignore[assignment] + input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") input_template: Optional[Dict[str, Any]] = Field(default=None, alias="inputTemplate") - output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") # type: ignore[assignment] - timeout_seconds: Optional[int] = Field(alias="timeoutSeconds", default=None) # type: ignore[assignment] - total_timeout_seconds: Optional[int] = Field(alias="totalTimeoutSeconds", default=None) # type: ignore[assignment] + output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") + timeout_seconds: Optional[int] = Field(alias="timeoutSeconds", default=None) + total_timeout_seconds: Optional[int] = Field(alias="totalTimeoutSeconds", default=None) @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/task_result_adapter.py b/src/conductor/asyncio_client/adapters/models/task_result_adapter.py index 286aba85..c2816664 100644 --- a/src/conductor/asyncio_client/adapters/models/task_result_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/task_result_adapter.py @@ -9,7 +9,7 @@ class TaskResultAdapter(TaskResult): - logs: Optional[List["TaskExecLogAdapter"]] = None # type: ignore[assignment] + logs: Optional[List["TaskExecLogAdapter"]] = None output_data: Optional[Dict[str, Any]] = Field(default=None, alias="outputData") @classmethod diff --git a/src/conductor/asyncio_client/adapters/models/uninterpreted_option_adapter.py b/src/conductor/asyncio_client/adapters/models/uninterpreted_option_adapter.py index da41ccab..c767d5f0 100644 --- a/src/conductor/asyncio_client/adapters/models/uninterpreted_option_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/uninterpreted_option_adapter.py @@ -10,17 +10,17 @@ class UninterpretedOptionAdapter(UninterpretedOption): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["UninterpretedOptionAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["UninterpretedOptionAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - name_list: Optional[List["NamePartAdapter"]] = Field(default=None, alias="nameList") # type: ignore[assignment] - name_or_builder_list: Optional[List["NamePartOrBuilderAdapter"]] = Field( # type: ignore[assignment] + name_list: Optional[List["NamePartAdapter"]] = Field(default=None, alias="nameList") + name_or_builder_list: Optional[List["NamePartOrBuilderAdapter"]] = Field( default=None, alias="nameOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/uninterpreted_option_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/uninterpreted_option_or_builder_adapter.py index 68ed98d2..5ab915d8 100644 --- a/src/conductor/asyncio_client/adapters/models/uninterpreted_option_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/uninterpreted_option_or_builder_adapter.py @@ -10,17 +10,17 @@ class UninterpretedOptionOrBuilderAdapter(UninterpretedOptionOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - name_list: Optional[List["NamePartAdapter"]] = Field(default=None, alias="nameList") # type: ignore[assignment] - name_or_builder_list: Optional[List["NamePartOrBuilderAdapter"]] = Field( # type: ignore[assignment] + name_list: Optional[List["NamePartAdapter"]] = Field(default=None, alias="nameList") + name_or_builder_list: Optional[List["NamePartOrBuilderAdapter"]] = Field( default=None, alias="nameOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/webhook_config_adapter.py b/src/conductor/asyncio_client/adapters/models/webhook_config_adapter.py index 58bb8077..48831d7a 100644 --- a/src/conductor/asyncio_client/adapters/models/webhook_config_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/webhook_config_adapter.py @@ -9,8 +9,8 @@ class WebhookConfigAdapter(WebhookConfig): - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] - webhook_execution_history: Optional[List["WebhookExecutionHistoryAdapter"]] = Field( # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None + webhook_execution_history: Optional[List["WebhookExecutionHistoryAdapter"]] = Field( default=None, alias="webhookExecutionHistory" ) workflows_to_start: Optional[Dict[str, Any]] = Field(default=None, alias="workflowsToStart") diff --git a/src/conductor/asyncio_client/adapters/models/workflow_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_adapter.py index f59230e2..c2afe942 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_adapter.py @@ -15,11 +15,11 @@ class WorkflowAdapter(Workflow): input: Optional[Dict[str, Any]] = None output: Optional[Dict[str, Any]] = None variables: Optional[Dict[str, Any]] = None - workflow_definition: Optional["WorkflowDefAdapter"] = Field( # type: ignore[assignment] + workflow_definition: Optional["WorkflowDefAdapter"] = Field( default=None, alias="workflowDefinition" ) - tasks: Optional[List["TaskAdapter"]] = None # type: ignore[assignment] - history: Optional[List["WorkflowAdapter"]] = None # type: ignore[assignment] + tasks: Optional[List["TaskAdapter"]] = None + history: Optional[List["WorkflowAdapter"]] = None def is_completed(self) -> bool: """Checks if the workflow has completed diff --git a/src/conductor/asyncio_client/adapters/models/workflow_def_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_def_adapter.py index 672e74a2..89e91aef 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_def_adapter.py @@ -13,14 +13,14 @@ class WorkflowDefAdapter(WorkflowDef): output_parameters: Optional[Dict[str, Any]] = Field(default=None, alias="outputParameters") variables: Optional[Dict[str, Any]] = None metadata: Optional[Dict[str, Any]] = None - tasks: List["WorkflowTaskAdapter"] # type: ignore[assignment] + tasks: List["WorkflowTaskAdapter"] schema_version: Optional[int] = Field(default=None, alias="schemaVersion") - output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") # type: ignore[assignment] - input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") # type: ignore[assignment] - rate_limit_config: Optional["RateLimitConfigAdapter"] = Field( # type: ignore[assignment] + output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") + input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") + rate_limit_config: Optional["RateLimitConfigAdapter"] = Field( default=None, alias="rateLimitConfig" ) - timeout_seconds: Optional[int] = Field(default=None, alias="timeoutSeconds") # type: ignore[assignment] + timeout_seconds: Optional[int] = Field(default=None, alias="timeoutSeconds") __properties: ClassVar[List[str]] = [ "createTime", diff --git a/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py index 80fecc01..fe4c2003 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py @@ -10,7 +10,7 @@ class WorkflowRunAdapter(WorkflowRun): input: Optional[Dict[str, Any]] = None output: Optional[Dict[str, Any]] = None - tasks: Optional[List["TaskAdapter"]] = None # type: ignore[assignment] + tasks: Optional[List["TaskAdapter"]] = None variables: Optional[Dict[str, Any]] = None @property diff --git a/src/conductor/asyncio_client/adapters/models/workflow_schedule_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_schedule_adapter.py index 06662bf8..f6ec6376 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_schedule_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_schedule_adapter.py @@ -12,7 +12,7 @@ class WorkflowScheduleAdapter(WorkflowSchedule): start_workflow_request: Optional["StartWorkflowRequestAdapter"] = Field( # type: ignore[override] default=None, alias="startWorkflowRequest" ) - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/workflow_schedule_model_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_schedule_model_adapter.py index 2d588eb4..635843c8 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_schedule_model_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_schedule_model_adapter.py @@ -12,7 +12,7 @@ class WorkflowScheduleModelAdapter(WorkflowScheduleModel): start_workflow_request: Optional["StartWorkflowRequestAdapter"] = Field( # type: ignore[override] default=None, alias="startWorkflowRequest" ) - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/workflow_task_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_task_adapter.py index 69eaa56b..c7460229 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_task_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_task_adapter.py @@ -9,19 +9,19 @@ class WorkflowTaskAdapter(WorkflowTask): - cache_config: Optional["CacheConfigAdapter"] = Field(default=None, alias="cacheConfig") # type: ignore[assignment] - default_case: Optional[List["WorkflowTaskAdapter"]] = Field(default=None, alias="defaultCase") # type: ignore[assignment] - fork_tasks: Optional[List[List["WorkflowTaskAdapter"]]] = Field(default=None, alias="forkTasks") # type: ignore[assignment] + cache_config: Optional["CacheConfigAdapter"] = Field(default=None, alias="cacheConfig") + default_case: Optional[List["WorkflowTaskAdapter"]] = Field(default=None, alias="defaultCase") + fork_tasks: Optional[List[List["WorkflowTaskAdapter"]]] = Field(default=None, alias="forkTasks") input_parameters: Optional[Dict[str, Any]] = Field(default=None, alias="inputParameters") - loop_over: Optional[List["WorkflowTaskAdapter"]] = Field(default=None, alias="loopOver") # type: ignore[assignment] - on_state_change: Optional[Dict[str, List["StateChangeEventAdapter"]]] = Field( # type: ignore[assignment] + loop_over: Optional[List["WorkflowTaskAdapter"]] = Field(default=None, alias="loopOver") + on_state_change: Optional[Dict[str, List["StateChangeEventAdapter"]]] = Field( default=None, alias="onStateChange" ) - sub_workflow_param: Optional["SubWorkflowParamsAdapter"] = Field( # type: ignore[assignment] + sub_workflow_param: Optional["SubWorkflowParamsAdapter"] = Field( default=None, alias="subWorkflowParam" ) - task_definition: Optional["TaskDefAdapter"] = Field(default=None, alias="taskDefinition") # type: ignore[assignment] - decision_cases: Optional[Dict[str, List["WorkflowTaskAdapter"]]] = Field( # type: ignore[assignment] + task_definition: Optional["TaskDefAdapter"] = Field(default=None, alias="taskDefinition") + decision_cases: Optional[Dict[str, List["WorkflowTaskAdapter"]]] = Field( default=None, alias="decisionCases" ) diff --git a/src/conductor/asyncio_client/adapters/models/workflow_test_request_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_test_request_adapter.py index 823ff8b8..f76939f5 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_test_request_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_test_request_adapter.py @@ -10,13 +10,13 @@ class WorkflowTestRequestAdapter(WorkflowTestRequest): input: Optional[Dict[str, Any]] = None - sub_workflow_test_request: Optional[Dict[str, "WorkflowTestRequestAdapter"]] = Field( # type: ignore[assignment] + sub_workflow_test_request: Optional[Dict[str, "WorkflowTestRequestAdapter"]] = Field( default=None, alias="subWorkflowTestRequest" ) - task_ref_to_mock_output: Optional[Dict[str, List["TaskMockAdapter"]]] = Field( # type: ignore[assignment] + task_ref_to_mock_output: Optional[Dict[str, List["TaskMockAdapter"]]] = Field( default=None, alias="taskRefToMockOutput" ) - workflow_def: Optional["WorkflowDefAdapter"] = Field(default=None, alias="workflowDef") # type: ignore[assignment] + workflow_def: Optional["WorkflowDefAdapter"] = Field(default=None, alias="workflowDef") priority: Optional[int] = Field(default=None, alias="priority") @classmethod diff --git a/src/conductor/asyncio_client/adapters/utils.py b/src/conductor/asyncio_client/adapters/utils.py index 252df233..9a19ef00 100644 --- a/src/conductor/asyncio_client/adapters/utils.py +++ b/src/conductor/asyncio_client/adapters/utils.py @@ -2,7 +2,7 @@ Utility functions for converting between generated models and adapters. """ -from typing import List, TypeVar, Type, Any +from typing import List, TypeVar, Type, Any, Dict from pydantic import BaseModel T = TypeVar("T", bound=BaseModel) @@ -34,3 +34,19 @@ def convert_to_adapter(item: Any, adapter_class: Type[T]) -> T: Adapter instance """ return adapter_class.model_validate(item.model_dump()) + + +def convert_dict_to_adapter( + input_dict: Dict[str, List[Any]], adapter_class: Type[T] +) -> Dict[str, List[T]]: + """ + Convert a dictionary of model lists to a dictionary of adapter lists. + + Args: + input_dict: Dictionary mapping string keys to lists of model instances + adapter_class: The adapter class to convert to + + Returns: + Dictionary mapping string keys to lists of adapter instances + """ + return {key: convert_list_to_adapter(items, adapter_class) for key, items in input_dict.items()} diff --git a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py index a332ad08..1b0a8a70 100644 --- a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py @@ -34,7 +34,6 @@ ) from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient -from conductor.client.orkes.models.access_key import AccessKey class OrkesAuthorizationClient(OrkesBaseClient): @@ -200,15 +199,15 @@ async def get_application_tags(self, application_id: str) -> List[TagAdapter]: async def delete_application_tags(self, tags: List[TagAdapter], application_id: str): await self.application_api.delete_tag_for_application(application_id, tags) - async def create_access_key(self, application_id: str) -> AccessKey: + async def create_access_key(self, application_id: str) -> object: key_obj = await self.application_api.create_access_key(application_id) return key_obj - async def get_access_keys(self, application_id: str) -> List[AccessKey]: + async def get_access_keys(self, application_id: str) -> object: access_keys_obj = await self.application_api.get_access_keys(application_id) - return list(access_keys_obj) + return access_keys_obj - async def toggle_access_key_status(self, application_id: str, key_id: str) -> AccessKey: + async def toggle_access_key_status(self, application_id: str, key_id: str) -> object: key_obj = await self.application_api.toggle_access_key_status(application_id, key_id) return key_obj diff --git a/src/conductor/asyncio_client/orkes/orkes_metadata_client.py b/src/conductor/asyncio_client/orkes/orkes_metadata_client.py index 2bce4de0..e8af757f 100644 --- a/src/conductor/asyncio_client/orkes/orkes_metadata_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_metadata_client.py @@ -33,7 +33,7 @@ async def unregister_task_def(self, task_type: str) -> None: """Unregister a task definition""" await self.metadata_api.unregister_task_def(task_type) - async def get_task_def(self, task_type: str) -> TaskDefAdapter: + async def get_task_def(self, task_type: str) -> object: """Get a task definition by task type""" return await self.metadata_api.get_task_def(task_type) diff --git a/src/conductor/asyncio_client/orkes/orkes_secret_client.py b/src/conductor/asyncio_client/orkes/orkes_secret_client.py index d465824a..44b7c0bf 100644 --- a/src/conductor/asyncio_client/orkes/orkes_secret_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_secret_client.py @@ -26,7 +26,7 @@ async def delete_secret(self, key: str) -> object: """Delete a secret by key""" return await self.secret_api.delete_secret(key) - async def secret_exists(self, key: str) -> bool: + async def secret_exists(self, key: str) -> object: """Check if a secret exists by key""" return await self.secret_api.secret_exists(key) @@ -76,6 +76,6 @@ async def update_secret(self, key: str, secret: str) -> object: """Alias for put_secret for consistency with other clients""" return await self.put_secret(key, secret) - async def has_secret(self, key: str) -> bool: + async def has_secret(self, key: str) -> object: """Alias for secret_exists for consistency""" return await self.secret_exists(key) diff --git a/tests/unit/orkes/test_async_metadata_client.py b/tests/unit/orkes/test_async_metadata_client.py index 50d59101..4b368f94 100644 --- a/tests/unit/orkes/test_async_metadata_client.py +++ b/tests/unit/orkes/test_async_metadata_client.py @@ -6,7 +6,7 @@ from conductor.asyncio_client.adapters.api.metadata_resource_api import ( MetadataResourceApiAdapter, ) -from conductor.asyncio_client.adapters.api.tags_api import TagsApi +from conductor.asyncio_client.adapters.api.tags_api import TagsApiAdapter from conductor.asyncio_client.adapters.models.extended_task_def_adapter import ( ExtendedTaskDefAdapter, ) @@ -90,7 +90,7 @@ def test_init(metadata_client): message = "metadata_api is not of type MetadataResourceApiAdapter" assert isinstance(metadata_client.metadata_api, MetadataResourceApiAdapter), message message = "tags_api is not of type TagsApi" - assert isinstance(metadata_client.tags_api, TagsApi), message + assert isinstance(metadata_client.tags_api, TagsApiAdapter), message @pytest.mark.asyncio From 00b06ec681980a3fde4a5c3fbe9a9a4422596cfb Mon Sep 17 00:00:00 2001 From: IgorChvyrov-sm Date: Tue, 28 Oct 2025 17:56:35 +0300 Subject: [PATCH 10/17] Refactored resource apis --- .../adapters/api/application_resource_api.py | 15 ++-- .../adapters/api/group_resource_api.py | 14 ++-- .../adapters/api/user_resource_api.py | 12 ++-- .../adapters/api/workflow_resource_api.py | 71 ++++++++++++++++--- .../orkes/orkes_authorization_client.py | 12 +--- 5 files changed, 81 insertions(+), 43 deletions(-) diff --git a/src/conductor/asyncio_client/adapters/api/application_resource_api.py b/src/conductor/asyncio_client/adapters/api/application_resource_api.py index 07dc500e..cefb3540 100644 --- a/src/conductor/asyncio_client/adapters/api/application_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/application_resource_api.py @@ -304,9 +304,9 @@ async def create_application( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ExtendedConductorApplicationAdapter: + ) -> object: """Create an application""" - result = await self._api.create_application( + return await self._api.create_application( create_or_update_application_request, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -314,7 +314,6 @@ async def create_application( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, ExtendedConductorApplicationAdapter) async def update_application( self, @@ -329,9 +328,9 @@ async def update_application( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ExtendedConductorApplicationAdapter: + ) -> object: """Update an application""" - result = await self._api.update_application( + return await self._api.update_application( id, create_or_update_application_request, _request_timeout=_request_timeout, @@ -340,7 +339,6 @@ async def update_application( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, ExtendedConductorApplicationAdapter) async def get_application( self, @@ -354,9 +352,9 @@ async def get_application( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ExtendedConductorApplicationAdapter: + ) -> object: """Get an application""" - result = await self._api.get_application( + return await self._api.get_application( id, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -364,7 +362,6 @@ async def get_application( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, ExtendedConductorApplicationAdapter) async def list_applications( self, diff --git a/src/conductor/asyncio_client/adapters/api/group_resource_api.py b/src/conductor/asyncio_client/adapters/api/group_resource_api.py index 290f9792..d4f8c3ae 100644 --- a/src/conductor/asyncio_client/adapters/api/group_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/group_resource_api.py @@ -56,9 +56,9 @@ async def get_group( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> GroupAdapter: + ) -> object: """Get a group by ID, returning a GroupAdapter instance.""" - result = await self._api.get_group( + return await self._api.get_group( id, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -66,7 +66,6 @@ async def get_group( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, GroupAdapter) async def upsert_group( self, @@ -81,9 +80,9 @@ async def upsert_group( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> GroupAdapter: + ) -> object: """Create or update a group, returning a GroupAdapter instance.""" - result = await self._api.upsert_group( + return await self._api.upsert_group( id, upsert_group_request, _request_timeout=_request_timeout, @@ -92,7 +91,6 @@ async def upsert_group( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, GroupAdapter) async def delete_group( self, @@ -106,9 +104,9 @@ async def delete_group( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: + ) -> object: """Delete a group by ID.""" - await self._api.delete_group( + return await self._api.delete_group( id, _request_timeout=_request_timeout, _request_auth=_request_auth, diff --git a/src/conductor/asyncio_client/adapters/api/user_resource_api.py b/src/conductor/asyncio_client/adapters/api/user_resource_api.py index 00962dc9..79429eb9 100644 --- a/src/conductor/asyncio_client/adapters/api/user_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/user_resource_api.py @@ -8,7 +8,7 @@ from conductor.asyncio_client.adapters.models.conductor_user_adapter import ConductorUserAdapter from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.http.api import UserResourceApi -from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter class UserResourceApiAdapter: @@ -79,11 +79,11 @@ async def get_user( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ConductorUserAdapter: + ) -> object: # Convert empty user id to None to prevent sending invalid data to server if not id: id = None - result = await self._api.get_user( + return await self._api.get_user( id, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -91,7 +91,6 @@ async def get_user( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, ConductorUserAdapter) async def upsert_user( self, @@ -106,11 +105,11 @@ async def upsert_user( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ConductorUserAdapter: + ) -> object: # Convert empty user id to None to prevent sending invalid data to server if not id: id = None - result = await self._api.upsert_user( + return await self._api.upsert_user( id, upsert_user_request, _request_timeout=_request_timeout, @@ -119,7 +118,6 @@ async def upsert_user( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, ConductorUserAdapter) async def list_users( self, diff --git a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py index 13e4232a..da9e6ac3 100644 --- a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py @@ -2,7 +2,7 @@ from typing import Annotated, Any, Dict, List, Optional, Tuple, Union -from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr +from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr, validate_call from conductor.asyncio_client.adapters.models.correlation_ids_search_request_adapter import ( CorrelationIdsSearchRequestAdapter, @@ -753,6 +753,7 @@ async def upgrade_running_workflow_to_version( _host_index=_host_index, ) + @validate_call async def start_workflow1( self, name: StrictStr, @@ -772,21 +773,71 @@ async def start_workflow1( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> str: - return await self._api.start_workflow1( - name, - request_body, - version, - correlation_id, - priority, - x_idempotency_key, - x_on_conflict, - _request_timeout=_request_timeout, + """Start a new workflow. Returns the ID of the workflow instance that can be later used for tracking + + + :param name: (required) + :type name: str + :param request_body: (required) + :type request_body: Dict[str, Any] + :param version: + :type version: int + :param correlation_id: + :type correlation_id: str + :param priority: + :type priority: int + :param x_idempotency_key: + :type x_idempotency_key: str + :param x_on_conflict: + :type x_on_conflict: str + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :type _request_timeout: int, tuple(int, int), optional + :param _request_auth: set to override the auth_settings for an a single + request; this effectively ignores the + authentication in the spec for a single request. + :type _request_auth: dict, optional + :param _content_type: force content-type for the request. + :type _content_type: str, Optional + :param _headers: set to override the headers for a single + request; this effectively ignores the headers + in the spec for a single request. + :type _headers: dict, optional + :param _host_index: set to override the host_index for a single + request; this effectively ignores the host_index + in the spec for a single request. + :type _host_index: int, optional + :return: Returns the result object. + """ + + _param = self._api._start_workflow1_serialize( + name=name, + request_body=request_body, + version=version, + correlation_id=correlation_id, + priority=priority, + x_idempotency_key=x_idempotency_key, + x_on_conflict=x_on_conflict, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) + _response_types_map: Dict[str, Optional[str]] = { + "200": "str", + } + response_data = await self._api.api_client.call_api( + *_param, _request_timeout=_request_timeout + ) + await response_data.read() + return self._api.api_client.response_deserialize( + response_data=response_data, + response_types_map=_response_types_map, + ).data + async def terminate1( self, workflow_id: StrictStr, diff --git a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py index 1b0a8a70..c851b5dd 100644 --- a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py @@ -41,15 +41,11 @@ def __init__(self, configuration: Configuration, api_client: ApiClient): super().__init__(configuration, api_client) # User Operations - async def create_user( - self, user_id: str, upsert_user_request: UpsertUserRequest - ) -> ConductorUserAdapter: + async def create_user(self, user_id: str, upsert_user_request: UpsertUserRequest) -> object: """Create a new user""" return await self.user_api.upsert_user(id=user_id, upsert_user_request=upsert_user_request) - async def update_user( - self, user_id: str, upsert_user_request: UpsertUserRequest - ) -> ConductorUserAdapter: + async def update_user(self, user_id: str, upsert_user_request: UpsertUserRequest) -> object: """Update an existing user""" return await self.user_api.upsert_user(id=user_id, upsert_user_request=upsert_user_request) @@ -101,9 +97,7 @@ async def list_applications(self) -> List[ExtendedConductorApplicationAdapter]: return await self.application_api.list_applications() # Group Operations - async def create_group( - self, group_id: str, upsert_group_request: UpsertGroupRequest - ) -> GroupAdapter: + async def create_group(self, group_id: str, upsert_group_request: UpsertGroupRequest) -> object: """Create a new group""" return await self.group_api.upsert_group( id=group_id, upsert_group_request=upsert_group_request From 4402aa1f93a1e49134348f3e088ca8f797ff3b9a Mon Sep 17 00:00:00 2001 From: IgorChvyrov-sm Date: Tue, 28 Oct 2025 17:57:29 +0300 Subject: [PATCH 11/17] Sorted imports --- .../adapters/api/admin_resource_api.py | 9 ++++---- .../adapters/api/application_resource_api.py | 4 ++-- .../api/authorization_resource_api.py | 4 ++-- .../adapters/api/environment_resource_api.py | 7 +++--- .../api/event_execution_resource_api.py | 15 +++++++------ .../adapters/api/event_resource_api.py | 15 +++++++------ .../adapters/api/group_resource_api.py | 4 ++-- .../adapters/api/health_check_resource_api.py | 2 +- .../api/incoming_webhook_resource_api.py | 7 +++--- .../adapters/api/integration_resource_api.py | 12 +++++----- .../adapters/api/limits_resource_api.py | 2 +- .../adapters/api/metadata_resource_api.py | 10 ++++----- .../adapters/api/metrics_resource_api.py | 2 +- .../api/metrics_token_resource_api.py | 2 +- .../adapters/api/prompt_resource_api.py | 4 ++-- .../adapters/api/queue_admin_resource_api.py | 2 +- .../adapters/api/scheduler_resource_api.py | 4 ++-- .../adapters/api/schema_resource_api.py | 4 ++-- .../adapters/api/secret_resource_api.py | 4 ++-- .../asyncio_client/adapters/api/tags_api.py | 4 ++-- .../adapters/api/task_resource_api.py | 4 ++-- .../adapters/api/token_resource_api.py | 3 ++- .../adapters/api/user_resource_api.py | 4 ++-- .../adapters/api/version_resource_api.py | 2 +- .../api/webhooks_config_resource_api.py | 8 +++---- .../api/workflow_bulk_resource_api.py | 5 +++-- .../adapters/api/workflow_resource_api.py | 22 +++++++++---------- .../adapters/models/__init__.py | 7 +++--- .../asyncio_client/adapters/utils.py | 3 ++- .../client/adapters/models/__init__.py | 14 +++++------- 30 files changed, 97 insertions(+), 92 deletions(-) diff --git a/src/conductor/asyncio_client/adapters/api/admin_resource_api.py b/src/conductor/asyncio_client/adapters/api/admin_resource_api.py index d8af1f49..176f7a4c 100644 --- a/src/conductor/asyncio_client/adapters/api/admin_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/admin_resource_api.py @@ -1,12 +1,13 @@ from __future__ import annotations -from typing import Any, Annotated, Dict, Optional, Tuple, Union, List -from pydantic import StrictStr, StrictFloat, StrictInt, Field +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union + +from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters.models.task_adapter import TaskAdapter -from conductor.asyncio_client.http.api import AdminResourceApi from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.models.task_adapter import TaskAdapter from conductor.asyncio_client.adapters.utils import convert_list_to_adapter +from conductor.asyncio_client.http.api import AdminResourceApi class AdminResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/application_resource_api.py b/src/conductor/asyncio_client/adapters/api/application_resource_api.py index cefb3540..d4443f1a 100644 --- a/src/conductor/asyncio_client/adapters/api/application_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/application_resource_api.py @@ -4,6 +4,7 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.create_or_update_application_request_adapter import ( CreateOrUpdateApplicationRequestAdapter, ) @@ -11,9 +12,8 @@ ExtendedConductorApplicationAdapter, ) from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter from conductor.asyncio_client.http.api import ApplicationResourceApi -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter class ApplicationResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/authorization_resource_api.py b/src/conductor/asyncio_client/adapters/api/authorization_resource_api.py index f404fdea..86c31fa3 100644 --- a/src/conductor/asyncio_client/adapters/api/authorization_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/authorization_resource_api.py @@ -4,11 +4,11 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.http.api import AuthorizationResourceApi +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.authorization_request_adapter import ( AuthorizationRequestAdapter, ) -from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.http.api import AuthorizationResourceApi class AuthorizationResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/environment_resource_api.py b/src/conductor/asyncio_client/adapters/api/environment_resource_api.py index d3f1c4ae..c3a8ed22 100644 --- a/src/conductor/asyncio_client/adapters/api/environment_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/environment_resource_api.py @@ -1,15 +1,16 @@ from __future__ import annotations -from conductor.asyncio_client.http.api import EnvironmentResourceApi -from typing import Annotated, Any, Dict, Optional, List, Tuple, Union +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictFloat, StrictInt, StrictStr + from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.adapters.models.environment_variable_adapter import ( EnvironmentVariableAdapter, ) +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.adapters.utils import convert_list_to_adapter +from conductor.asyncio_client.http.api import EnvironmentResourceApi class EnvironmentResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/event_execution_resource_api.py b/src/conductor/asyncio_client/adapters/api/event_execution_resource_api.py index f0f7894e..ddb9fc5e 100644 --- a/src/conductor/asyncio_client/adapters/api/event_execution_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/event_execution_resource_api.py @@ -1,17 +1,18 @@ from __future__ import annotations -from typing import Annotated, Any, Dict, Optional, List, Tuple, Union + +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union + from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters.models.search_result_handled_event_response_adapter import ( - SearchResultHandledEventResponseAdapter, -) +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.extended_event_execution_adapter import ( ExtendedEventExecutionAdapter, ) +from conductor.asyncio_client.adapters.models.search_result_handled_event_response_adapter import ( + SearchResultHandledEventResponseAdapter, +) +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter from conductor.asyncio_client.http.api import EventExecutionResourceApi -from conductor.asyncio_client.adapters import ApiClient - -from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter class EventExecutionResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/event_resource_api.py b/src/conductor/asyncio_client/adapters/api/event_resource_api.py index f4107088..7096a148 100644 --- a/src/conductor/asyncio_client/adapters/api/event_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/event_resource_api.py @@ -1,19 +1,20 @@ from __future__ import annotations -from conductor.asyncio_client.http.api import EventResourceApi +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union + +from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr + from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.connectivity_test_input_adapter import ( ConnectivityTestInputAdapter, ) -from typing import Annotated, Any, Dict, Optional, List, Tuple, Union -from pydantic import Field, StrictFloat, StrictInt, StrictStr, StrictBool - -from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter -from conductor.asyncio_client.adapters.models.event_handler_adapter import EventHandlerAdapter -from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.adapters.models.connectivity_test_result_adapter import ( ConnectivityTestResultAdapter, ) +from conductor.asyncio_client.adapters.models.event_handler_adapter import EventHandlerAdapter +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter +from conductor.asyncio_client.http.api import EventResourceApi class EventResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/group_resource_api.py b/src/conductor/asyncio_client/adapters/api/group_resource_api.py index d4f8c3ae..a9467712 100644 --- a/src/conductor/asyncio_client/adapters/api/group_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/group_resource_api.py @@ -4,6 +4,7 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.granted_access_response_adapter import ( GrantedAccessResponseAdapter, ) @@ -11,9 +12,8 @@ from conductor.asyncio_client.adapters.models.upsert_group_request_adapter import ( UpsertGroupRequestAdapter, ) -from conductor.asyncio_client.http.api import GroupResourceApi from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter -from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.http.api import GroupResourceApi class GroupResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/health_check_resource_api.py b/src/conductor/asyncio_client/adapters/api/health_check_resource_api.py index c064dd7a..c9ef2c15 100644 --- a/src/conductor/asyncio_client/adapters/api/health_check_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/health_check_resource_api.py @@ -3,8 +3,8 @@ from typing import Annotated, Any, Dict, Optional, Tuple, Union from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.http.api import HealthCheckResourceApi diff --git a/src/conductor/asyncio_client/adapters/api/incoming_webhook_resource_api.py b/src/conductor/asyncio_client/adapters/api/incoming_webhook_resource_api.py index 11818af4..231324c2 100644 --- a/src/conductor/asyncio_client/adapters/api/incoming_webhook_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/incoming_webhook_resource_api.py @@ -1,10 +1,11 @@ from __future__ import annotations -from typing import Any, Annotated, Dict, Optional, Tuple, Union -from pydantic import StrictStr, StrictFloat, StrictInt, Field +from typing import Annotated, Any, Dict, Optional, Tuple, Union + +from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.http.api import IncomingWebhookResourceApi from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.http.api import IncomingWebhookResourceApi class IncomingWebhookResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/integration_resource_api.py b/src/conductor/asyncio_client/adapters/api/integration_resource_api.py index 00243df0..d2511fda 100644 --- a/src/conductor/asyncio_client/adapters/api/integration_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/integration_resource_api.py @@ -4,21 +4,21 @@ from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.event_log_adapter import EventLogAdapter from conductor.asyncio_client.adapters.models.integration_adapter import IntegrationAdapter from conductor.asyncio_client.adapters.models.integration_api_adapter import IntegrationApiAdapter -from conductor.asyncio_client.adapters.models.integration_def_adapter import IntegrationDefAdapter -from conductor.asyncio_client.adapters.models.message_template_adapter import MessageTemplateAdapter -from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter -from conductor.asyncio_client.http.api import IntegrationResourceApi -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter from conductor.asyncio_client.adapters.models.integration_api_update_adapter import ( IntegrationApiUpdateAdapter, ) +from conductor.asyncio_client.adapters.models.integration_def_adapter import IntegrationDefAdapter from conductor.asyncio_client.adapters.models.integration_update_adapter import ( IntegrationUpdateAdapter, ) +from conductor.asyncio_client.adapters.models.message_template_adapter import MessageTemplateAdapter +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter +from conductor.asyncio_client.http.api import IntegrationResourceApi class IntegrationResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/limits_resource_api.py b/src/conductor/asyncio_client/adapters/api/limits_resource_api.py index 1b5aab16..6184b1d7 100644 --- a/src/conductor/asyncio_client/adapters/api/limits_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/limits_resource_api.py @@ -4,8 +4,8 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.http.api import LimitsResourceApi from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.http.api import LimitsResourceApi class LimitsResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py b/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py index b678668b..7d848f91 100644 --- a/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py @@ -4,17 +4,17 @@ from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.models.extended_task_def_adapter import ( + ExtendedTaskDefAdapter, +) from conductor.asyncio_client.adapters.models.extended_workflow_def_adapter import ( ExtendedWorkflowDefAdapter, ) from conductor.asyncio_client.adapters.models.task_def_adapter import TaskDefAdapter from conductor.asyncio_client.adapters.models.workflow_def_adapter import WorkflowDefAdapter -from conductor.asyncio_client.adapters.models.extended_task_def_adapter import ( - ExtendedTaskDefAdapter, -) -from conductor.asyncio_client.http.api import MetadataResourceApi -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter +from conductor.asyncio_client.http.api import MetadataResourceApi class MetadataResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/metrics_resource_api.py b/src/conductor/asyncio_client/adapters/api/metrics_resource_api.py index 0c1db62f..66a120c0 100644 --- a/src/conductor/asyncio_client/adapters/api/metrics_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/metrics_resource_api.py @@ -4,8 +4,8 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.http.api import MetricsResourceApi from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.http.api import MetricsResourceApi class MetricsResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/metrics_token_resource_api.py b/src/conductor/asyncio_client/adapters/api/metrics_token_resource_api.py index cbcfcc5d..867fcec4 100644 --- a/src/conductor/asyncio_client/adapters/api/metrics_token_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/metrics_token_resource_api.py @@ -4,10 +4,10 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.http.api import MetricsTokenResourceApi from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.metrics_token_adapter import MetricsTokenAdapter from conductor.asyncio_client.adapters.utils import convert_to_adapter +from conductor.asyncio_client.http.api import MetricsTokenResourceApi class MetricsTokenResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py b/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py index bf6f45a1..88ec0827 100644 --- a/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py @@ -4,6 +4,7 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.message_template_adapter import ( MessageTemplateAdapter, ) @@ -11,9 +12,8 @@ PromptTemplateTestRequestAdapter, ) from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter -from conductor.asyncio_client.http.api import PromptResourceApi -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter +from conductor.asyncio_client.http.api import PromptResourceApi class PromptResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/queue_admin_resource_api.py b/src/conductor/asyncio_client/adapters/api/queue_admin_resource_api.py index ad59f7b9..0fbd6e31 100644 --- a/src/conductor/asyncio_client/adapters/api/queue_admin_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/queue_admin_resource_api.py @@ -4,8 +4,8 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.http.api import QueueAdminResourceApi from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.http.api import QueueAdminResourceApi class QueueAdminResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py b/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py index 935e1a9d..9b200c16 100644 --- a/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py @@ -4,6 +4,7 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.search_result_workflow_schedule_execution_model_adapter import ( SearchResultWorkflowScheduleExecutionModelAdapter, ) @@ -14,9 +15,8 @@ from conductor.asyncio_client.adapters.models.workflow_schedule_model_adapter import ( WorkflowScheduleModelAdapter, ) -from conductor.asyncio_client.http.api import SchedulerResourceApi -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter +from conductor.asyncio_client.http.api import SchedulerResourceApi class SchedulerResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/schema_resource_api.py b/src/conductor/asyncio_client/adapters/api/schema_resource_api.py index 3e923bbb..fd9781ed 100644 --- a/src/conductor/asyncio_client/adapters/api/schema_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/schema_resource_api.py @@ -4,10 +4,10 @@ from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters.models.schema_def_adapter import SchemaDefAdapter -from conductor.asyncio_client.http.api import SchemaResourceApi from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.models.schema_def_adapter import SchemaDefAdapter from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter +from conductor.asyncio_client.http.api import SchemaResourceApi class SchemaResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/secret_resource_api.py b/src/conductor/asyncio_client/adapters/api/secret_resource_api.py index 69ef2c70..9228d860 100644 --- a/src/conductor/asyncio_client/adapters/api/secret_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/secret_resource_api.py @@ -4,11 +4,11 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.extended_secret_adapter import ExtendedSecretAdapter from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter -from conductor.asyncio_client.http.api import SecretResourceApi -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.utils import convert_list_to_adapter +from conductor.asyncio_client.http.api import SecretResourceApi class SecretResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/tags_api.py b/src/conductor/asyncio_client/adapters/api/tags_api.py index 642f3dc6..cb065d2f 100644 --- a/src/conductor/asyncio_client/adapters/api/tags_api.py +++ b/src/conductor/asyncio_client/adapters/api/tags_api.py @@ -4,10 +4,10 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter -from conductor.asyncio_client.http.api import TagsApi from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.adapters.utils import convert_list_to_adapter +from conductor.asyncio_client.http.api import TagsApi class TagsApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/task_resource_api.py b/src/conductor/asyncio_client/adapters/api/task_resource_api.py index e38f86f1..27c1b4cc 100644 --- a/src/conductor/asyncio_client/adapters/api/task_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/task_resource_api.py @@ -4,6 +4,7 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.poll_data_adapter import PollDataAdapter from conductor.asyncio_client.adapters.models.search_result_task_summary_adapter import ( SearchResultTaskSummaryAdapter, @@ -12,9 +13,8 @@ from conductor.asyncio_client.adapters.models.task_exec_log_adapter import TaskExecLogAdapter from conductor.asyncio_client.adapters.models.task_result_adapter import TaskResultAdapter from conductor.asyncio_client.adapters.models.workflow_adapter import WorkflowAdapter -from conductor.asyncio_client.http.api import TaskResourceApi -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter +from conductor.asyncio_client.http.api import TaskResourceApi class TaskResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/token_resource_api.py b/src/conductor/asyncio_client/adapters/api/token_resource_api.py index df2ca193..74173e8d 100644 --- a/src/conductor/asyncio_client/adapters/api/token_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/token_resource_api.py @@ -3,11 +3,12 @@ from typing import Annotated, Any, Dict, Optional, Tuple, Union from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr + +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.generate_token_request_adapter import ( GenerateTokenRequestAdapter, ) from conductor.asyncio_client.http.api import TokenResourceApi -from conductor.asyncio_client.adapters import ApiClient class TokenResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/user_resource_api.py b/src/conductor/asyncio_client/adapters/api/user_resource_api.py index 79429eb9..c391f24c 100644 --- a/src/conductor/asyncio_client/adapters/api/user_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/user_resource_api.py @@ -4,11 +4,11 @@ from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models import UpsertUserRequestAdapter from conductor.asyncio_client.adapters.models.conductor_user_adapter import ConductorUserAdapter -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.http.api import UserResourceApi from conductor.asyncio_client.adapters.utils import convert_list_to_adapter +from conductor.asyncio_client.http.api import UserResourceApi class UserResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/version_resource_api.py b/src/conductor/asyncio_client/adapters/api/version_resource_api.py index 2896be44..f56b673b 100644 --- a/src/conductor/asyncio_client/adapters/api/version_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/version_resource_api.py @@ -4,8 +4,8 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.http.api import VersionResourceApi from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.http.api import VersionResourceApi class VersionResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/webhooks_config_resource_api.py b/src/conductor/asyncio_client/adapters/api/webhooks_config_resource_api.py index 8b317602..4620eae5 100644 --- a/src/conductor/asyncio_client/adapters/api/webhooks_config_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/webhooks_config_resource_api.py @@ -1,14 +1,14 @@ from __future__ import annotations -from typing import Annotated, Any, Dict, Optional, Tuple, Union, List +from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.http.api import WebhooksConfigResourceApi from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter -from conductor.asyncio_client.adapters.models.webhook_config_adapter import WebhookConfigAdapter from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter +from conductor.asyncio_client.adapters.models.webhook_config_adapter import WebhookConfigAdapter +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter +from conductor.asyncio_client.http.api import WebhooksConfigResourceApi class WebhooksConfigResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/workflow_bulk_resource_api.py b/src/conductor/asyncio_client/adapters/api/workflow_bulk_resource_api.py index d828fc87..bf66e9e2 100644 --- a/src/conductor/asyncio_client/adapters/api/workflow_bulk_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/workflow_bulk_resource_api.py @@ -3,10 +3,11 @@ from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.http.api import WorkflowBulkResourceApi + from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.utils import convert_to_adapter from conductor.asyncio_client.adapters.models.bulk_response_adapter import BulkResponseAdapter +from conductor.asyncio_client.adapters.utils import convert_to_adapter +from conductor.asyncio_client.http.api import WorkflowBulkResourceApi class WorkflowBulkResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py index da9e6ac3..d7cac23f 100644 --- a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py @@ -4,6 +4,7 @@ from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr, validate_call +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.correlation_ids_search_request_adapter import ( CorrelationIdsSearchRequestAdapter, ) @@ -13,11 +14,17 @@ from conductor.asyncio_client.adapters.models.scrollable_search_result_workflow_summary_adapter import ( ScrollableSearchResultWorkflowSummaryAdapter, ) +from conductor.asyncio_client.adapters.models.skip_task_request_adapter import ( + SkipTaskRequestAdapter, +) from conductor.asyncio_client.adapters.models.start_workflow_request_adapter import ( StartWorkflowRequestAdapter, ) -from conductor.asyncio_client.adapters.models.skip_task_request_adapter import ( - SkipTaskRequestAdapter, +from conductor.asyncio_client.adapters.models.task_list_search_result_summary_adapter import ( + TaskListSearchResultSummaryAdapter, +) +from conductor.asyncio_client.adapters.models.upgrade_workflow_request_adapter import ( + UpgradeWorkflowRequestAdapter, ) from conductor.asyncio_client.adapters.models.workflow_adapter import WorkflowAdapter from conductor.asyncio_client.adapters.models.workflow_run_adapter import WorkflowRunAdapter @@ -28,19 +35,12 @@ from conductor.asyncio_client.adapters.models.workflow_test_request_adapter import ( WorkflowTestRequestAdapter, ) -from conductor.asyncio_client.http.api import WorkflowResourceApi -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.utils import ( - convert_to_adapter, convert_dict_to_adapter, convert_list_to_adapter, + convert_to_adapter, ) -from conductor.asyncio_client.adapters.models.task_list_search_result_summary_adapter import ( - TaskListSearchResultSummaryAdapter, -) -from conductor.asyncio_client.adapters.models.upgrade_workflow_request_adapter import ( - UpgradeWorkflowRequestAdapter, -) +from conductor.asyncio_client.http.api import WorkflowResourceApi class WorkflowResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/models/__init__.py b/src/conductor/asyncio_client/adapters/models/__init__.py index 3e97d2d6..1e04fd4c 100644 --- a/src/conductor/asyncio_client/adapters/models/__init__.py +++ b/src/conductor/asyncio_client/adapters/models/__init__.py @@ -23,12 +23,12 @@ from conductor.asyncio_client.adapters.models.connectivity_test_result_adapter import ( ConnectivityTestResultAdapter as ConnectivityTestResult, ) -from conductor.asyncio_client.adapters.models.create_or_update_application_request_adapter import ( - CreateOrUpdateApplicationRequestAdapter as CreateOrUpdateApplicationRequest, -) from conductor.asyncio_client.adapters.models.correlation_ids_search_request_adapter import ( CorrelationIdsSearchRequestAdapter as CorrelationIdsSearchRequest, ) +from conductor.asyncio_client.adapters.models.create_or_update_application_request_adapter import ( + CreateOrUpdateApplicationRequestAdapter as CreateOrUpdateApplicationRequest, +) from conductor.asyncio_client.adapters.models.declaration_adapter import ( DeclarationAdapter as Declaration, ) @@ -415,7 +415,6 @@ WorkflowTestRequestAdapter as WorkflowTestRequest, ) - __all__ = [ "Action", "Any", diff --git a/src/conductor/asyncio_client/adapters/utils.py b/src/conductor/asyncio_client/adapters/utils.py index 9a19ef00..9423e177 100644 --- a/src/conductor/asyncio_client/adapters/utils.py +++ b/src/conductor/asyncio_client/adapters/utils.py @@ -2,7 +2,8 @@ Utility functions for converting between generated models and adapters. """ -from typing import List, TypeVar, Type, Any, Dict +from typing import Any, Dict, List, Type, TypeVar + from pydantic import BaseModel T = TypeVar("T", bound=BaseModel) diff --git a/src/conductor/client/adapters/models/__init__.py b/src/conductor/client/adapters/models/__init__.py index 32373812..b18bff01 100644 --- a/src/conductor/client/adapters/models/__init__.py +++ b/src/conductor/client/adapters/models/__init__.py @@ -83,8 +83,6 @@ from conductor.client.adapters.models.event_log_adapter import EventLogAdapter as EventLog from conductor.client.adapters.models.extended_conductor_application_adapter import ( ExtendedConductorApplicationAdapter as ConductorApplication, -) -from conductor.client.adapters.models.extended_conductor_application_adapter import ( ExtendedConductorApplicationAdapter as ExtendedConductorApplication, ) from conductor.client.adapters.models.extended_event_execution_adapter import ( @@ -239,15 +237,17 @@ ) from conductor.client.adapters.models.request_param_adapter import ( RequestParamAdapter as RequestParam, + SchemaAdapter as Schema, ) -from conductor.client.adapters.models.request_param_adapter import SchemaAdapter as Schema from conductor.client.adapters.models.rerun_workflow_request_adapter import ( RerunWorkflowRequestAdapter as RerunWorkflowRequest, ) from conductor.client.adapters.models.response_adapter import ResponseAdapter as Response from conductor.client.adapters.models.role_adapter import RoleAdapter as Role -from conductor.client.adapters.models.schema_def_adapter import SchemaDefAdapter as SchemaDef -from conductor.client.adapters.models.schema_def_adapter import SchemaType +from conductor.client.adapters.models.schema_def_adapter import ( + SchemaDefAdapter as SchemaDef, + SchemaType, +) from conductor.client.adapters.models.scrollable_search_result_workflow_summary_adapter import ( ScrollableSearchResultWorkflowSummaryAdapter as ScrollableSearchResultWorkflowSummary, ) @@ -257,11 +257,9 @@ from conductor.client.adapters.models.service_method_adapter import ( ServiceMethodAdapter as ServiceMethod, ) -from conductor.client.adapters.models.service_registry_adapter import ConfigAdapter as Config from conductor.client.adapters.models.service_registry_adapter import ( + ConfigAdapter as Config, OrkesCircuitBreakerConfigAdapter as OrkesCircuitBreakerConfig, -) -from conductor.client.adapters.models.service_registry_adapter import ( ServiceRegistryAdapter as ServiceRegistry, ) from conductor.client.adapters.models.signal_response_adapter import ( From 4ad47bf0f59eb96388429cab04152a04247699e6 Mon Sep 17 00:00:00 2001 From: IgorChvyrov-sm Date: Wed, 29 Oct 2025 15:36:59 +0300 Subject: [PATCH 12/17] Revert "Sorted imports" This reverts commit 4402aa1f93a1e49134348f3e088ca8f797ff3b9a. --- .../adapters/api/admin_resource_api.py | 9 ++++---- .../adapters/api/application_resource_api.py | 4 ++-- .../api/authorization_resource_api.py | 4 ++-- .../adapters/api/environment_resource_api.py | 7 +++--- .../api/event_execution_resource_api.py | 15 ++++++------- .../adapters/api/event_resource_api.py | 15 ++++++------- .../adapters/api/group_resource_api.py | 4 ++-- .../adapters/api/health_check_resource_api.py | 2 +- .../api/incoming_webhook_resource_api.py | 7 +++--- .../adapters/api/integration_resource_api.py | 12 +++++----- .../adapters/api/limits_resource_api.py | 2 +- .../adapters/api/metadata_resource_api.py | 10 ++++----- .../adapters/api/metrics_resource_api.py | 2 +- .../api/metrics_token_resource_api.py | 2 +- .../adapters/api/prompt_resource_api.py | 4 ++-- .../adapters/api/queue_admin_resource_api.py | 2 +- .../adapters/api/scheduler_resource_api.py | 4 ++-- .../adapters/api/schema_resource_api.py | 4 ++-- .../adapters/api/secret_resource_api.py | 4 ++-- .../asyncio_client/adapters/api/tags_api.py | 4 ++-- .../adapters/api/task_resource_api.py | 4 ++-- .../adapters/api/token_resource_api.py | 3 +-- .../adapters/api/user_resource_api.py | 4 ++-- .../adapters/api/version_resource_api.py | 2 +- .../api/webhooks_config_resource_api.py | 8 +++---- .../api/workflow_bulk_resource_api.py | 5 ++--- .../adapters/api/workflow_resource_api.py | 22 +++++++++---------- .../adapters/models/__init__.py | 7 +++--- .../asyncio_client/adapters/utils.py | 3 +-- .../client/adapters/models/__init__.py | 14 +++++++----- 30 files changed, 92 insertions(+), 97 deletions(-) diff --git a/src/conductor/asyncio_client/adapters/api/admin_resource_api.py b/src/conductor/asyncio_client/adapters/api/admin_resource_api.py index 176f7a4c..d8af1f49 100644 --- a/src/conductor/asyncio_client/adapters/api/admin_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/admin_resource_api.py @@ -1,13 +1,12 @@ from __future__ import annotations -from typing import Annotated, Any, Dict, List, Optional, Tuple, Union +from typing import Any, Annotated, Dict, Optional, Tuple, Union, List +from pydantic import StrictStr, StrictFloat, StrictInt, Field -from pydantic import Field, StrictFloat, StrictInt, StrictStr - -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.task_adapter import TaskAdapter -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter from conductor.asyncio_client.http.api import AdminResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter class AdminResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/application_resource_api.py b/src/conductor/asyncio_client/adapters/api/application_resource_api.py index d4443f1a..cefb3540 100644 --- a/src/conductor/asyncio_client/adapters/api/application_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/application_resource_api.py @@ -4,7 +4,6 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.create_or_update_application_request_adapter import ( CreateOrUpdateApplicationRequestAdapter, ) @@ -12,8 +11,9 @@ ExtendedConductorApplicationAdapter, ) from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter from conductor.asyncio_client.http.api import ApplicationResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter class ApplicationResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/authorization_resource_api.py b/src/conductor/asyncio_client/adapters/api/authorization_resource_api.py index 86c31fa3..f404fdea 100644 --- a/src/conductor/asyncio_client/adapters/api/authorization_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/authorization_resource_api.py @@ -4,11 +4,11 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.http.api import AuthorizationResourceApi from conductor.asyncio_client.adapters.models.authorization_request_adapter import ( AuthorizationRequestAdapter, ) -from conductor.asyncio_client.http.api import AuthorizationResourceApi +from conductor.asyncio_client.adapters import ApiClient class AuthorizationResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/environment_resource_api.py b/src/conductor/asyncio_client/adapters/api/environment_resource_api.py index c3a8ed22..d3f1c4ae 100644 --- a/src/conductor/asyncio_client/adapters/api/environment_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/environment_resource_api.py @@ -1,16 +1,15 @@ from __future__ import annotations -from typing import Annotated, Any, Dict, List, Optional, Tuple, Union +from conductor.asyncio_client.http.api import EnvironmentResourceApi +from typing import Annotated, Any, Dict, Optional, List, Tuple, Union from pydantic import Field, StrictFloat, StrictInt, StrictStr - from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.adapters.models.environment_variable_adapter import ( EnvironmentVariableAdapter, ) -from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.adapters.utils import convert_list_to_adapter -from conductor.asyncio_client.http.api import EnvironmentResourceApi class EnvironmentResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/event_execution_resource_api.py b/src/conductor/asyncio_client/adapters/api/event_execution_resource_api.py index ddb9fc5e..f0f7894e 100644 --- a/src/conductor/asyncio_client/adapters/api/event_execution_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/event_execution_resource_api.py @@ -1,18 +1,17 @@ from __future__ import annotations - -from typing import Annotated, Any, Dict, List, Optional, Tuple, Union - +from typing import Annotated, Any, Dict, Optional, List, Tuple, Union from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.models.extended_event_execution_adapter import ( - ExtendedEventExecutionAdapter, -) from conductor.asyncio_client.adapters.models.search_result_handled_event_response_adapter import ( SearchResultHandledEventResponseAdapter, ) -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter +from conductor.asyncio_client.adapters.models.extended_event_execution_adapter import ( + ExtendedEventExecutionAdapter, +) from conductor.asyncio_client.http.api import EventExecutionResourceApi +from conductor.asyncio_client.adapters import ApiClient + +from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter class EventExecutionResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/event_resource_api.py b/src/conductor/asyncio_client/adapters/api/event_resource_api.py index 7096a148..f4107088 100644 --- a/src/conductor/asyncio_client/adapters/api/event_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/event_resource_api.py @@ -1,20 +1,19 @@ from __future__ import annotations -from typing import Annotated, Any, Dict, List, Optional, Tuple, Union - -from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr - +from conductor.asyncio_client.http.api import EventResourceApi from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.connectivity_test_input_adapter import ( ConnectivityTestInputAdapter, ) +from typing import Annotated, Any, Dict, Optional, List, Tuple, Union +from pydantic import Field, StrictFloat, StrictInt, StrictStr, StrictBool + +from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter +from conductor.asyncio_client.adapters.models.event_handler_adapter import EventHandlerAdapter +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.adapters.models.connectivity_test_result_adapter import ( ConnectivityTestResultAdapter, ) -from conductor.asyncio_client.adapters.models.event_handler_adapter import EventHandlerAdapter -from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter -from conductor.asyncio_client.http.api import EventResourceApi class EventResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/group_resource_api.py b/src/conductor/asyncio_client/adapters/api/group_resource_api.py index a9467712..d4f8c3ae 100644 --- a/src/conductor/asyncio_client/adapters/api/group_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/group_resource_api.py @@ -4,7 +4,6 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.granted_access_response_adapter import ( GrantedAccessResponseAdapter, ) @@ -12,8 +11,9 @@ from conductor.asyncio_client.adapters.models.upsert_group_request_adapter import ( UpsertGroupRequestAdapter, ) -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter from conductor.asyncio_client.http.api import GroupResourceApi +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter +from conductor.asyncio_client.adapters import ApiClient class GroupResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/health_check_resource_api.py b/src/conductor/asyncio_client/adapters/api/health_check_resource_api.py index c9ef2c15..c064dd7a 100644 --- a/src/conductor/asyncio_client/adapters/api/health_check_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/health_check_resource_api.py @@ -3,8 +3,8 @@ from typing import Annotated, Any, Dict, Optional, Tuple, Union from pydantic import Field, StrictFloat, StrictInt, StrictStr - from conductor.asyncio_client.adapters import ApiClient + from conductor.asyncio_client.http.api import HealthCheckResourceApi diff --git a/src/conductor/asyncio_client/adapters/api/incoming_webhook_resource_api.py b/src/conductor/asyncio_client/adapters/api/incoming_webhook_resource_api.py index 231324c2..11818af4 100644 --- a/src/conductor/asyncio_client/adapters/api/incoming_webhook_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/incoming_webhook_resource_api.py @@ -1,11 +1,10 @@ from __future__ import annotations -from typing import Annotated, Any, Dict, Optional, Tuple, Union +from typing import Any, Annotated, Dict, Optional, Tuple, Union +from pydantic import StrictStr, StrictFloat, StrictInt, Field -from pydantic import Field, StrictFloat, StrictInt, StrictStr - -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.http.api import IncomingWebhookResourceApi +from conductor.asyncio_client.adapters import ApiClient class IncomingWebhookResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/integration_resource_api.py b/src/conductor/asyncio_client/adapters/api/integration_resource_api.py index d2511fda..00243df0 100644 --- a/src/conductor/asyncio_client/adapters/api/integration_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/integration_resource_api.py @@ -4,21 +4,21 @@ from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.event_log_adapter import EventLogAdapter from conductor.asyncio_client.adapters.models.integration_adapter import IntegrationAdapter from conductor.asyncio_client.adapters.models.integration_api_adapter import IntegrationApiAdapter +from conductor.asyncio_client.adapters.models.integration_def_adapter import IntegrationDefAdapter +from conductor.asyncio_client.adapters.models.message_template_adapter import MessageTemplateAdapter +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter +from conductor.asyncio_client.http.api import IntegrationResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter from conductor.asyncio_client.adapters.models.integration_api_update_adapter import ( IntegrationApiUpdateAdapter, ) -from conductor.asyncio_client.adapters.models.integration_def_adapter import IntegrationDefAdapter from conductor.asyncio_client.adapters.models.integration_update_adapter import ( IntegrationUpdateAdapter, ) -from conductor.asyncio_client.adapters.models.message_template_adapter import MessageTemplateAdapter -from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter -from conductor.asyncio_client.http.api import IntegrationResourceApi class IntegrationResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/limits_resource_api.py b/src/conductor/asyncio_client/adapters/api/limits_resource_api.py index 6184b1d7..1b5aab16 100644 --- a/src/conductor/asyncio_client/adapters/api/limits_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/limits_resource_api.py @@ -4,8 +4,8 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.http.api import LimitsResourceApi +from conductor.asyncio_client.adapters import ApiClient class LimitsResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py b/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py index 7d848f91..b678668b 100644 --- a/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py @@ -4,17 +4,17 @@ from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.models.extended_task_def_adapter import ( - ExtendedTaskDefAdapter, -) from conductor.asyncio_client.adapters.models.extended_workflow_def_adapter import ( ExtendedWorkflowDefAdapter, ) from conductor.asyncio_client.adapters.models.task_def_adapter import TaskDefAdapter from conductor.asyncio_client.adapters.models.workflow_def_adapter import WorkflowDefAdapter -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter +from conductor.asyncio_client.adapters.models.extended_task_def_adapter import ( + ExtendedTaskDefAdapter, +) from conductor.asyncio_client.http.api import MetadataResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter class MetadataResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/metrics_resource_api.py b/src/conductor/asyncio_client/adapters/api/metrics_resource_api.py index 66a120c0..0c1db62f 100644 --- a/src/conductor/asyncio_client/adapters/api/metrics_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/metrics_resource_api.py @@ -4,8 +4,8 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.http.api import MetricsResourceApi +from conductor.asyncio_client.adapters import ApiClient class MetricsResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/metrics_token_resource_api.py b/src/conductor/asyncio_client/adapters/api/metrics_token_resource_api.py index 867fcec4..cbcfcc5d 100644 --- a/src/conductor/asyncio_client/adapters/api/metrics_token_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/metrics_token_resource_api.py @@ -4,10 +4,10 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr +from conductor.asyncio_client.http.api import MetricsTokenResourceApi from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.metrics_token_adapter import MetricsTokenAdapter from conductor.asyncio_client.adapters.utils import convert_to_adapter -from conductor.asyncio_client.http.api import MetricsTokenResourceApi class MetricsTokenResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py b/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py index 88ec0827..bf6f45a1 100644 --- a/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py @@ -4,7 +4,6 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.message_template_adapter import ( MessageTemplateAdapter, ) @@ -12,8 +11,9 @@ PromptTemplateTestRequestAdapter, ) from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter from conductor.asyncio_client.http.api import PromptResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter class PromptResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/queue_admin_resource_api.py b/src/conductor/asyncio_client/adapters/api/queue_admin_resource_api.py index 0fbd6e31..ad59f7b9 100644 --- a/src/conductor/asyncio_client/adapters/api/queue_admin_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/queue_admin_resource_api.py @@ -4,8 +4,8 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.http.api import QueueAdminResourceApi +from conductor.asyncio_client.adapters import ApiClient class QueueAdminResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py b/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py index 9b200c16..935e1a9d 100644 --- a/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py @@ -4,7 +4,6 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.search_result_workflow_schedule_execution_model_adapter import ( SearchResultWorkflowScheduleExecutionModelAdapter, ) @@ -15,8 +14,9 @@ from conductor.asyncio_client.adapters.models.workflow_schedule_model_adapter import ( WorkflowScheduleModelAdapter, ) -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter from conductor.asyncio_client.http.api import SchedulerResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter class SchedulerResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/schema_resource_api.py b/src/conductor/asyncio_client/adapters/api/schema_resource_api.py index fd9781ed..3e923bbb 100644 --- a/src/conductor/asyncio_client/adapters/api/schema_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/schema_resource_api.py @@ -4,10 +4,10 @@ from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.schema_def_adapter import SchemaDefAdapter -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter from conductor.asyncio_client.http.api import SchemaResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter class SchemaResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/secret_resource_api.py b/src/conductor/asyncio_client/adapters/api/secret_resource_api.py index 9228d860..69ef2c70 100644 --- a/src/conductor/asyncio_client/adapters/api/secret_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/secret_resource_api.py @@ -4,11 +4,11 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.extended_secret_adapter import ExtendedSecretAdapter from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter from conductor.asyncio_client.http.api import SecretResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter class SecretResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/tags_api.py b/src/conductor/asyncio_client/adapters/api/tags_api.py index cb065d2f..642f3dc6 100644 --- a/src/conductor/asyncio_client/adapters/api/tags_api.py +++ b/src/conductor/asyncio_client/adapters/api/tags_api.py @@ -4,10 +4,10 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter from conductor.asyncio_client.http.api import TagsApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter class TagsApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/task_resource_api.py b/src/conductor/asyncio_client/adapters/api/task_resource_api.py index 27c1b4cc..e38f86f1 100644 --- a/src/conductor/asyncio_client/adapters/api/task_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/task_resource_api.py @@ -4,7 +4,6 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.poll_data_adapter import PollDataAdapter from conductor.asyncio_client.adapters.models.search_result_task_summary_adapter import ( SearchResultTaskSummaryAdapter, @@ -13,8 +12,9 @@ from conductor.asyncio_client.adapters.models.task_exec_log_adapter import TaskExecLogAdapter from conductor.asyncio_client.adapters.models.task_result_adapter import TaskResultAdapter from conductor.asyncio_client.adapters.models.workflow_adapter import WorkflowAdapter -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter from conductor.asyncio_client.http.api import TaskResourceApi +from conductor.asyncio_client.adapters import ApiClient +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter class TaskResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/token_resource_api.py b/src/conductor/asyncio_client/adapters/api/token_resource_api.py index 74173e8d..df2ca193 100644 --- a/src/conductor/asyncio_client/adapters/api/token_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/token_resource_api.py @@ -3,12 +3,11 @@ from typing import Annotated, Any, Dict, Optional, Tuple, Union from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr - -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.generate_token_request_adapter import ( GenerateTokenRequestAdapter, ) from conductor.asyncio_client.http.api import TokenResourceApi +from conductor.asyncio_client.adapters import ApiClient class TokenResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/user_resource_api.py b/src/conductor/asyncio_client/adapters/api/user_resource_api.py index c391f24c..79429eb9 100644 --- a/src/conductor/asyncio_client/adapters/api/user_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/user_resource_api.py @@ -4,11 +4,11 @@ from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models import UpsertUserRequestAdapter from conductor.asyncio_client.adapters.models.conductor_user_adapter import ConductorUserAdapter -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.http.api import UserResourceApi +from conductor.asyncio_client.adapters.utils import convert_list_to_adapter class UserResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/version_resource_api.py b/src/conductor/asyncio_client/adapters/api/version_resource_api.py index f56b673b..2896be44 100644 --- a/src/conductor/asyncio_client/adapters/api/version_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/version_resource_api.py @@ -4,8 +4,8 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.http.api import VersionResourceApi +from conductor.asyncio_client.adapters import ApiClient class VersionResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/webhooks_config_resource_api.py b/src/conductor/asyncio_client/adapters/api/webhooks_config_resource_api.py index 4620eae5..8b317602 100644 --- a/src/conductor/asyncio_client/adapters/api/webhooks_config_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/webhooks_config_resource_api.py @@ -1,14 +1,14 @@ from __future__ import annotations -from typing import Annotated, Any, Dict, List, Optional, Tuple, Union +from typing import Annotated, Any, Dict, Optional, Tuple, Union, List from pydantic import Field, StrictFloat, StrictInt, StrictStr +from conductor.asyncio_client.http.api import WebhooksConfigResourceApi from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter +from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter from conductor.asyncio_client.adapters.models.webhook_config_adapter import WebhookConfigAdapter -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter -from conductor.asyncio_client.http.api import WebhooksConfigResourceApi +from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter class WebhooksConfigResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/workflow_bulk_resource_api.py b/src/conductor/asyncio_client/adapters/api/workflow_bulk_resource_api.py index bf66e9e2..d828fc87 100644 --- a/src/conductor/asyncio_client/adapters/api/workflow_bulk_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/workflow_bulk_resource_api.py @@ -3,11 +3,10 @@ from typing import Annotated, Any, Dict, List, Optional, Tuple, Union from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr - +from conductor.asyncio_client.http.api import WorkflowBulkResourceApi from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.models.bulk_response_adapter import BulkResponseAdapter from conductor.asyncio_client.adapters.utils import convert_to_adapter -from conductor.asyncio_client.http.api import WorkflowBulkResourceApi +from conductor.asyncio_client.adapters.models.bulk_response_adapter import BulkResponseAdapter class WorkflowBulkResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py index d7cac23f..da9e6ac3 100644 --- a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py @@ -4,7 +4,6 @@ from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr, validate_call -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.models.correlation_ids_search_request_adapter import ( CorrelationIdsSearchRequestAdapter, ) @@ -14,17 +13,11 @@ from conductor.asyncio_client.adapters.models.scrollable_search_result_workflow_summary_adapter import ( ScrollableSearchResultWorkflowSummaryAdapter, ) -from conductor.asyncio_client.adapters.models.skip_task_request_adapter import ( - SkipTaskRequestAdapter, -) from conductor.asyncio_client.adapters.models.start_workflow_request_adapter import ( StartWorkflowRequestAdapter, ) -from conductor.asyncio_client.adapters.models.task_list_search_result_summary_adapter import ( - TaskListSearchResultSummaryAdapter, -) -from conductor.asyncio_client.adapters.models.upgrade_workflow_request_adapter import ( - UpgradeWorkflowRequestAdapter, +from conductor.asyncio_client.adapters.models.skip_task_request_adapter import ( + SkipTaskRequestAdapter, ) from conductor.asyncio_client.adapters.models.workflow_adapter import WorkflowAdapter from conductor.asyncio_client.adapters.models.workflow_run_adapter import WorkflowRunAdapter @@ -35,12 +28,19 @@ from conductor.asyncio_client.adapters.models.workflow_test_request_adapter import ( WorkflowTestRequestAdapter, ) +from conductor.asyncio_client.http.api import WorkflowResourceApi +from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.adapters.utils import ( + convert_to_adapter, convert_dict_to_adapter, convert_list_to_adapter, - convert_to_adapter, ) -from conductor.asyncio_client.http.api import WorkflowResourceApi +from conductor.asyncio_client.adapters.models.task_list_search_result_summary_adapter import ( + TaskListSearchResultSummaryAdapter, +) +from conductor.asyncio_client.adapters.models.upgrade_workflow_request_adapter import ( + UpgradeWorkflowRequestAdapter, +) class WorkflowResourceApiAdapter: diff --git a/src/conductor/asyncio_client/adapters/models/__init__.py b/src/conductor/asyncio_client/adapters/models/__init__.py index 1e04fd4c..3e97d2d6 100644 --- a/src/conductor/asyncio_client/adapters/models/__init__.py +++ b/src/conductor/asyncio_client/adapters/models/__init__.py @@ -23,12 +23,12 @@ from conductor.asyncio_client.adapters.models.connectivity_test_result_adapter import ( ConnectivityTestResultAdapter as ConnectivityTestResult, ) -from conductor.asyncio_client.adapters.models.correlation_ids_search_request_adapter import ( - CorrelationIdsSearchRequestAdapter as CorrelationIdsSearchRequest, -) from conductor.asyncio_client.adapters.models.create_or_update_application_request_adapter import ( CreateOrUpdateApplicationRequestAdapter as CreateOrUpdateApplicationRequest, ) +from conductor.asyncio_client.adapters.models.correlation_ids_search_request_adapter import ( + CorrelationIdsSearchRequestAdapter as CorrelationIdsSearchRequest, +) from conductor.asyncio_client.adapters.models.declaration_adapter import ( DeclarationAdapter as Declaration, ) @@ -415,6 +415,7 @@ WorkflowTestRequestAdapter as WorkflowTestRequest, ) + __all__ = [ "Action", "Any", diff --git a/src/conductor/asyncio_client/adapters/utils.py b/src/conductor/asyncio_client/adapters/utils.py index 9423e177..9a19ef00 100644 --- a/src/conductor/asyncio_client/adapters/utils.py +++ b/src/conductor/asyncio_client/adapters/utils.py @@ -2,8 +2,7 @@ Utility functions for converting between generated models and adapters. """ -from typing import Any, Dict, List, Type, TypeVar - +from typing import List, TypeVar, Type, Any, Dict from pydantic import BaseModel T = TypeVar("T", bound=BaseModel) diff --git a/src/conductor/client/adapters/models/__init__.py b/src/conductor/client/adapters/models/__init__.py index b18bff01..32373812 100644 --- a/src/conductor/client/adapters/models/__init__.py +++ b/src/conductor/client/adapters/models/__init__.py @@ -83,6 +83,8 @@ from conductor.client.adapters.models.event_log_adapter import EventLogAdapter as EventLog from conductor.client.adapters.models.extended_conductor_application_adapter import ( ExtendedConductorApplicationAdapter as ConductorApplication, +) +from conductor.client.adapters.models.extended_conductor_application_adapter import ( ExtendedConductorApplicationAdapter as ExtendedConductorApplication, ) from conductor.client.adapters.models.extended_event_execution_adapter import ( @@ -237,17 +239,15 @@ ) from conductor.client.adapters.models.request_param_adapter import ( RequestParamAdapter as RequestParam, - SchemaAdapter as Schema, ) +from conductor.client.adapters.models.request_param_adapter import SchemaAdapter as Schema from conductor.client.adapters.models.rerun_workflow_request_adapter import ( RerunWorkflowRequestAdapter as RerunWorkflowRequest, ) from conductor.client.adapters.models.response_adapter import ResponseAdapter as Response from conductor.client.adapters.models.role_adapter import RoleAdapter as Role -from conductor.client.adapters.models.schema_def_adapter import ( - SchemaDefAdapter as SchemaDef, - SchemaType, -) +from conductor.client.adapters.models.schema_def_adapter import SchemaDefAdapter as SchemaDef +from conductor.client.adapters.models.schema_def_adapter import SchemaType from conductor.client.adapters.models.scrollable_search_result_workflow_summary_adapter import ( ScrollableSearchResultWorkflowSummaryAdapter as ScrollableSearchResultWorkflowSummary, ) @@ -257,9 +257,11 @@ from conductor.client.adapters.models.service_method_adapter import ( ServiceMethodAdapter as ServiceMethod, ) +from conductor.client.adapters.models.service_registry_adapter import ConfigAdapter as Config from conductor.client.adapters.models.service_registry_adapter import ( - ConfigAdapter as Config, OrkesCircuitBreakerConfigAdapter as OrkesCircuitBreakerConfig, +) +from conductor.client.adapters.models.service_registry_adapter import ( ServiceRegistryAdapter as ServiceRegistry, ) from conductor.client.adapters.models.signal_response_adapter import ( From 8edbc489318aa0a5f3a0cf8a9df1cdfecba00660 Mon Sep 17 00:00:00 2001 From: IgorChvyrov-sm Date: Wed, 29 Oct 2025 15:37:01 +0300 Subject: [PATCH 13/17] Revert "Refactored resource apis" This reverts commit 00b06ec681980a3fde4a5c3fbe9a9a4422596cfb. --- .../adapters/api/application_resource_api.py | 15 ++-- .../adapters/api/group_resource_api.py | 14 ++-- .../adapters/api/user_resource_api.py | 12 ++-- .../adapters/api/workflow_resource_api.py | 71 +++---------------- .../orkes/orkes_authorization_client.py | 12 +++- 5 files changed, 43 insertions(+), 81 deletions(-) diff --git a/src/conductor/asyncio_client/adapters/api/application_resource_api.py b/src/conductor/asyncio_client/adapters/api/application_resource_api.py index cefb3540..07dc500e 100644 --- a/src/conductor/asyncio_client/adapters/api/application_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/application_resource_api.py @@ -304,9 +304,9 @@ async def create_application( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: + ) -> ExtendedConductorApplicationAdapter: """Create an application""" - return await self._api.create_application( + result = await self._api.create_application( create_or_update_application_request, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -314,6 +314,7 @@ async def create_application( _headers=_headers, _host_index=_host_index, ) + return convert_to_adapter(result, ExtendedConductorApplicationAdapter) async def update_application( self, @@ -328,9 +329,9 @@ async def update_application( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: + ) -> ExtendedConductorApplicationAdapter: """Update an application""" - return await self._api.update_application( + result = await self._api.update_application( id, create_or_update_application_request, _request_timeout=_request_timeout, @@ -339,6 +340,7 @@ async def update_application( _headers=_headers, _host_index=_host_index, ) + return convert_to_adapter(result, ExtendedConductorApplicationAdapter) async def get_application( self, @@ -352,9 +354,9 @@ async def get_application( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: + ) -> ExtendedConductorApplicationAdapter: """Get an application""" - return await self._api.get_application( + result = await self._api.get_application( id, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -362,6 +364,7 @@ async def get_application( _headers=_headers, _host_index=_host_index, ) + return convert_to_adapter(result, ExtendedConductorApplicationAdapter) async def list_applications( self, diff --git a/src/conductor/asyncio_client/adapters/api/group_resource_api.py b/src/conductor/asyncio_client/adapters/api/group_resource_api.py index d4f8c3ae..290f9792 100644 --- a/src/conductor/asyncio_client/adapters/api/group_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/group_resource_api.py @@ -56,9 +56,9 @@ async def get_group( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: + ) -> GroupAdapter: """Get a group by ID, returning a GroupAdapter instance.""" - return await self._api.get_group( + result = await self._api.get_group( id, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -66,6 +66,7 @@ async def get_group( _headers=_headers, _host_index=_host_index, ) + return convert_to_adapter(result, GroupAdapter) async def upsert_group( self, @@ -80,9 +81,9 @@ async def upsert_group( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: + ) -> GroupAdapter: """Create or update a group, returning a GroupAdapter instance.""" - return await self._api.upsert_group( + result = await self._api.upsert_group( id, upsert_group_request, _request_timeout=_request_timeout, @@ -91,6 +92,7 @@ async def upsert_group( _headers=_headers, _host_index=_host_index, ) + return convert_to_adapter(result, GroupAdapter) async def delete_group( self, @@ -104,9 +106,9 @@ async def delete_group( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: + ) -> None: """Delete a group by ID.""" - return await self._api.delete_group( + await self._api.delete_group( id, _request_timeout=_request_timeout, _request_auth=_request_auth, diff --git a/src/conductor/asyncio_client/adapters/api/user_resource_api.py b/src/conductor/asyncio_client/adapters/api/user_resource_api.py index 79429eb9..00962dc9 100644 --- a/src/conductor/asyncio_client/adapters/api/user_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/user_resource_api.py @@ -8,7 +8,7 @@ from conductor.asyncio_client.adapters.models.conductor_user_adapter import ConductorUserAdapter from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.http.api import UserResourceApi -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter +from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter class UserResourceApiAdapter: @@ -79,11 +79,11 @@ async def get_user( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: + ) -> ConductorUserAdapter: # Convert empty user id to None to prevent sending invalid data to server if not id: id = None - return await self._api.get_user( + result = await self._api.get_user( id, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -91,6 +91,7 @@ async def get_user( _headers=_headers, _host_index=_host_index, ) + return convert_to_adapter(result, ConductorUserAdapter) async def upsert_user( self, @@ -105,11 +106,11 @@ async def upsert_user( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: + ) -> ConductorUserAdapter: # Convert empty user id to None to prevent sending invalid data to server if not id: id = None - return await self._api.upsert_user( + result = await self._api.upsert_user( id, upsert_user_request, _request_timeout=_request_timeout, @@ -118,6 +119,7 @@ async def upsert_user( _headers=_headers, _host_index=_host_index, ) + return convert_to_adapter(result, ConductorUserAdapter) async def list_users( self, diff --git a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py index da9e6ac3..13e4232a 100644 --- a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py @@ -2,7 +2,7 @@ from typing import Annotated, Any, Dict, List, Optional, Tuple, Union -from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr, validate_call +from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr from conductor.asyncio_client.adapters.models.correlation_ids_search_request_adapter import ( CorrelationIdsSearchRequestAdapter, @@ -753,7 +753,6 @@ async def upgrade_running_workflow_to_version( _host_index=_host_index, ) - @validate_call async def start_workflow1( self, name: StrictStr, @@ -773,71 +772,21 @@ async def start_workflow1( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> str: - """Start a new workflow. Returns the ID of the workflow instance that can be later used for tracking - - - :param name: (required) - :type name: str - :param request_body: (required) - :type request_body: Dict[str, Any] - :param version: - :type version: int - :param correlation_id: - :type correlation_id: str - :param priority: - :type priority: int - :param x_idempotency_key: - :type x_idempotency_key: str - :param x_on_conflict: - :type x_on_conflict: str - :param _request_timeout: timeout setting for this request. If one - number provided, it will be total request - timeout. It can also be a pair (tuple) of - (connection, read) timeouts. - :type _request_timeout: int, tuple(int, int), optional - :param _request_auth: set to override the auth_settings for an a single - request; this effectively ignores the - authentication in the spec for a single request. - :type _request_auth: dict, optional - :param _content_type: force content-type for the request. - :type _content_type: str, Optional - :param _headers: set to override the headers for a single - request; this effectively ignores the headers - in the spec for a single request. - :type _headers: dict, optional - :param _host_index: set to override the host_index for a single - request; this effectively ignores the host_index - in the spec for a single request. - :type _host_index: int, optional - :return: Returns the result object. - """ - - _param = self._api._start_workflow1_serialize( - name=name, - request_body=request_body, - version=version, - correlation_id=correlation_id, - priority=priority, - x_idempotency_key=x_idempotency_key, - x_on_conflict=x_on_conflict, + return await self._api.start_workflow1( + name, + request_body, + version, + correlation_id, + priority, + x_idempotency_key, + x_on_conflict, + _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - _response_types_map: Dict[str, Optional[str]] = { - "200": "str", - } - response_data = await self._api.api_client.call_api( - *_param, _request_timeout=_request_timeout - ) - await response_data.read() - return self._api.api_client.response_deserialize( - response_data=response_data, - response_types_map=_response_types_map, - ).data - async def terminate1( self, workflow_id: StrictStr, diff --git a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py index c851b5dd..1b0a8a70 100644 --- a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py @@ -41,11 +41,15 @@ def __init__(self, configuration: Configuration, api_client: ApiClient): super().__init__(configuration, api_client) # User Operations - async def create_user(self, user_id: str, upsert_user_request: UpsertUserRequest) -> object: + async def create_user( + self, user_id: str, upsert_user_request: UpsertUserRequest + ) -> ConductorUserAdapter: """Create a new user""" return await self.user_api.upsert_user(id=user_id, upsert_user_request=upsert_user_request) - async def update_user(self, user_id: str, upsert_user_request: UpsertUserRequest) -> object: + async def update_user( + self, user_id: str, upsert_user_request: UpsertUserRequest + ) -> ConductorUserAdapter: """Update an existing user""" return await self.user_api.upsert_user(id=user_id, upsert_user_request=upsert_user_request) @@ -97,7 +101,9 @@ async def list_applications(self) -> List[ExtendedConductorApplicationAdapter]: return await self.application_api.list_applications() # Group Operations - async def create_group(self, group_id: str, upsert_group_request: UpsertGroupRequest) -> object: + async def create_group( + self, group_id: str, upsert_group_request: UpsertGroupRequest + ) -> GroupAdapter: """Create a new group""" return await self.group_api.upsert_group( id=group_id, upsert_group_request=upsert_group_request From f77d0e7767096c34f5ce91736f29d071de846e54 Mon Sep 17 00:00:00 2001 From: IgorChvyrov-sm Date: Wed, 29 Oct 2025 15:37:03 +0300 Subject: [PATCH 14/17] Revert "Fixed mypy using facade pattern on adapters level" This reverts commit f502404f2e9fa87130cdb0ba00701bfc3b6de994. --- pyproject.toml | 8 +- .../adapters/api/admin_resource_api.py | 132 +--- .../adapters/api/application_resource_api.py | 204 +++--- .../api/authorization_resource_api.py | 63 +- .../adapters/api/environment_resource_api.py | 183 +---- .../api/event_execution_resource_api.py | 67 +- .../adapters/api/event_resource_api.py | 401 +---------- .../adapters/api/group_resource_api.py | 3 +- .../adapters/api/health_check_resource_api.py | 32 +- .../api/incoming_webhook_resource_api.py | 62 +- .../adapters/api/integration_resource_api.py | 307 ++------- .../adapters/api/limits_resource_api.py | 32 +- .../adapters/api/metadata_resource_api.py | 195 +----- .../adapters/api/metrics_resource_api.py | 40 +- .../api/metrics_token_resource_api.py | 35 +- .../adapters/api/prompt_resource_api.py | 126 +--- .../adapters/api/queue_admin_resource_api.py | 53 +- .../adapters/api/scheduler_resource_api.py | 240 +------ .../adapters/api/schema_resource_api.py | 76 +-- .../adapters/api/secret_resource_api.py | 181 +---- .../asyncio_client/adapters/api/tags_api.py | 159 +---- .../adapters/api/task_resource_api.py | 307 ++------- .../adapters/api/token_resource_api.py | 59 +- .../adapters/api/user_resource_api.py | 68 +- .../adapters/api/version_resource_api.py | 32 +- .../api/webhooks_config_resource_api.py | 206 +----- .../api/workflow_bulk_resource_api.py | 162 +---- .../adapters/api/workflow_resource_api.py | 624 ++++-------------- .../adapters/models/conductor_user_adapter.py | 4 +- .../adapters/models/descriptor_adapter.py | 20 +- .../models/descriptor_proto_adapter.py | 36 +- .../descriptor_proto_or_builder_adapter.py | 34 +- .../models/enum_descriptor_adapter.py | 10 +- .../models/enum_descriptor_proto_adapter.py | 16 +- ...num_descriptor_proto_or_builder_adapter.py | 18 +- .../adapters/models/enum_options_adapter.py | 14 +- .../models/enum_options_or_builder_adapter.py | 12 +- .../models/enum_value_options_adapter.py | 12 +- .../enum_value_options_or_builder_adapter.py | 12 +- .../models/environment_variable_adapter.py | 2 +- .../adapters/models/event_handler_adapter.py | 4 +- .../extended_conductor_application_adapter.py | 2 +- .../models/extended_secret_adapter.py | 2 +- .../models/extended_task_def_adapter.py | 10 +- .../models/extended_workflow_def_adapter.py | 12 +- .../models/extension_range_options_adapter.py | 14 +- ...ension_range_options_or_builder_adapter.py | 18 +- .../adapters/models/field_options_adapter.py | 16 +- .../field_options_or_builder_adapter.py | 18 +- .../models/file_descriptor_adapter.py | 18 +- .../models/file_descriptor_proto_adapter.py | 30 +- .../adapters/models/file_options_adapter.py | 12 +- .../models/file_options_or_builder_adapter.py | 14 +- .../models/granted_access_response_adapter.py | 2 +- .../adapters/models/group_adapter.py | 2 +- .../adapters/models/integration_adapter.py | 4 +- .../models/integration_api_adapter.py | 2 +- .../models/integration_def_adapter.py | 2 +- .../integration_def_form_field_adapter.py | 4 +- .../models/message_options_adapter.py | 12 +- .../message_options_or_builder_adapter.py | 14 +- .../models/message_template_adapter.py | 2 +- .../adapters/models/method_options_adapter.py | 14 +- .../method_options_or_builder_adapter.py | 14 +- .../adapters/models/oneof_options_adapter.py | 14 +- .../oneof_options_or_builder_adapter.py | 14 +- .../adapters/models/role_adapter.py | 2 +- ..._search_result_workflow_summary_adapter.py | 2 +- ...h_result_handled_event_response_adapter.py | 2 +- .../search_result_task_summary_adapter.py | 2 +- ...rkflow_schedule_execution_model_adapter.py | 2 +- .../models/service_descriptor_adapter.py | 8 +- .../service_descriptor_proto_adapter.py | 14 +- ...ice_descriptor_proto_or_builder_adapter.py | 14 +- .../models/service_options_adapter.py | 12 +- .../service_options_or_builder_adapter.py | 12 +- .../models/source_code_info_adapter.py | 10 +- .../source_code_info_or_builder_adapter.py | 10 +- .../adapters/models/task_def_adapter.py | 8 +- .../adapters/models/task_result_adapter.py | 2 +- .../models/uninterpreted_option_adapter.py | 10 +- ...uninterpreted_option_or_builder_adapter.py | 10 +- .../adapters/models/webhook_config_adapter.py | 4 +- .../adapters/models/workflow_adapter.py | 6 +- .../adapters/models/workflow_def_adapter.py | 10 +- .../adapters/models/workflow_run_adapter.py | 2 +- .../models/workflow_schedule_adapter.py | 2 +- .../models/workflow_schedule_model_adapter.py | 2 +- .../adapters/models/workflow_task_adapter.py | 16 +- .../models/workflow_test_request_adapter.py | 6 +- .../asyncio_client/adapters/utils.py | 18 +- .../orkes/orkes_authorization_client.py | 9 +- .../orkes/orkes_metadata_client.py | 2 +- .../orkes/orkes_secret_client.py | 4 +- .../unit/orkes/test_async_metadata_client.py | 4 +- 95 files changed, 815 insertions(+), 3907 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ba9dae62..01919908 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -151,9 +151,7 @@ ignore = [ # too-many-return-statements "PLR0911", # flake8-type-checking (150 errors) - "TC", - # PT013: Arguments starting with underscore in function definitions starting with `test_` (e.g., test_connectivity in event_resource_api.py) - "PT019" + "TC" ] [tool.ruff.lint.isort] @@ -216,10 +214,6 @@ follow_imports = "silent" plugins = [ "pydantic.mypy" ] -disable_error_code = [ - "assignment", - "arg-type", -] [[tool.mypy.overrides]] module = [ diff --git a/src/conductor/asyncio_client/adapters/api/admin_resource_api.py b/src/conductor/asyncio_client/adapters/api/admin_resource_api.py index d8af1f49..16af873f 100644 --- a/src/conductor/asyncio_client/adapters/api/admin_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/admin_resource_api.py @@ -1,134 +1,4 @@ -from __future__ import annotations - -from typing import Any, Annotated, Dict, Optional, Tuple, Union, List -from pydantic import StrictStr, StrictFloat, StrictInt, Field - -from conductor.asyncio_client.adapters.models.task_adapter import TaskAdapter from conductor.asyncio_client.http.api import AdminResourceApi -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter - - -class AdminResourceApiAdapter: - """Adapter for AdminResourceApi that converts between generated models and adapters.""" - - def __init__(self, api_client: ApiClient): - self._api = AdminResourceApi(api_client) - - async def clear_task_execution_cache( - self, - task_def_name: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Clear the task execution cache""" - await self._api.clear_task_execution_cache( - task_def_name, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def get_redis_usage( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, object]: - """Get the Redis usage""" - return await self._api.get_redis_usage( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def requeue_sweep( - self, - workflow_id: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> str: - """Requeue sweep""" - return await self._api.requeue_sweep( - workflow_id, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - async def verify_and_repair_workflow_consistency( - self, - workflow_id: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> str: - """Verify and repair workflow consistency""" - return await self._api.verify_and_repair_workflow_consistency( - workflow_id, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - async def view( - self, - tasktype: StrictStr, - start: Optional[StrictInt] = None, - count: Optional[StrictInt] = None, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> List[TaskAdapter]: - """View tasks""" - result = await self._api.view( - tasktype, - start, - count, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_list_to_adapter(result, TaskAdapter) +class AdminResourceApiAdapter(AdminResourceApi): ... diff --git a/src/conductor/asyncio_client/adapters/api/application_resource_api.py b/src/conductor/asyncio_client/adapters/api/application_resource_api.py index 07dc500e..e7b9a56c 100644 --- a/src/conductor/asyncio_client/adapters/api/application_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/application_resource_api.py @@ -12,16 +12,9 @@ ) from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.http.api import ApplicationResourceApi -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter -class ApplicationResourceApiAdapter: - """Adapter for ApplicationResourceApi that converts between generated models and adapters.""" - - def __init__(self, api_client: ApiClient): - self._api = ApplicationResourceApi(api_client) - +class ApplicationResourceApiAdapter(ApplicationResourceApi): async def create_access_key( self, id: StrictStr, @@ -34,12 +27,11 @@ async def create_access_key( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Create an access key""" - normalized_id: Optional[StrictStr] = id or None - - return await self._api.create_access_key( - normalized_id, + ): + if not id: + id = None # type: ignore[assignment] + return await super().create_access_key( + id, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -60,20 +52,20 @@ async def add_role_to_application_user( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Add a role to an application user""" - normalized_application_id: Optional[StrictStr] = application_id or None - normalized_role: Optional[StrictStr] = role or None - - return await self._api.add_role_to_application_user( - normalized_application_id, - normalized_role, + ): + if not application_id: + application_id = None # type: ignore[assignment] + if not role: + role = None # type: ignore[assignment] + return await super().add_role_to_application_user( + application_id, + role, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, - ) + ) # type: ignore[arg-type] async def delete_access_key( self, @@ -88,14 +80,14 @@ async def delete_access_key( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Delete an access key""" - normalized_application_id: Optional[StrictStr] = application_id or None - normalized_key_id: Optional[StrictStr] = key_id or None - - return await self._api.delete_access_key( - normalized_application_id, - normalized_key_id, + ): + if not application_id: + application_id = None # type: ignore[assignment] + if not key_id: + key_id = None # type: ignore[assignment] + return await super().delete_access_key( + application_id, + key_id, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -116,14 +108,14 @@ async def remove_role_from_application_user( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Remove role from application user""" - normalized_application_id: Optional[StrictStr] = application_id or None - normalized_role: Optional[StrictStr] = role or None - - return await self._api.remove_role_from_application_user( - normalized_application_id, - normalized_role, + ): + if not application_id: + application_id = None # type: ignore[assignment] + if not role: + role = None # type: ignore[assignment] + return await super().remove_role_from_application_user( + application_id, + role, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -131,7 +123,7 @@ async def remove_role_from_application_user( _host_index=_host_index, ) - async def get_app_by_access_key_id( + async def get_app_by_access_key_id( # type: ignore[override] self, access_key_id: StrictStr, _request_timeout: Union[ @@ -144,18 +136,17 @@ async def get_app_by_access_key_id( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> Optional[ExtendedConductorApplicationAdapter]: - """Get application by access key_id""" - normalized_access_key_id: Optional[StrictStr] = access_key_id or None - - result = await self._api.get_app_by_access_key_id( - normalized_access_key_id, + if not access_key_id: + access_key_id = None # type: ignore[assignment] + result = await super().get_app_by_access_key_id( + access_key_id, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, ExtendedConductorApplicationAdapter) + return result # type: ignore[return-value] async def get_access_keys( self, @@ -169,12 +160,11 @@ async def get_access_keys( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Get access keys for an application""" - normalized_id: Optional[StrictStr] = id or None - - return await self._api.get_access_keys( - normalized_id, + ): + if not id: + id = None # type: ignore[assignment] + return await super().get_access_keys( + id, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -195,14 +185,14 @@ async def toggle_access_key_status( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Toggle access key status""" - normalized_application_id: Optional[StrictStr] = application_id or None - normalized_key_id: Optional[StrictStr] = key_id or None - - return await self._api.toggle_access_key_status( - normalized_application_id, - normalized_key_id, + ): + if not application_id: + application_id = None # type: ignore[assignment] + if not key_id: + key_id = None # type: ignore[assignment] + return await super().toggle_access_key_status( + application_id, + key_id, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -210,7 +200,7 @@ async def toggle_access_key_status( _host_index=_host_index, ) - async def get_tags_for_application( + async def get_tags_for_application( # type: ignore[override] self, id: StrictStr, _request_timeout: Union[ @@ -223,23 +213,22 @@ async def get_tags_for_application( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TagAdapter]: - """Get tags for an application""" - normalized_id: Optional[StrictStr] = id or None - - result = await self._api.get_tags_for_application( - normalized_id, + if not id: + id = None # type: ignore[assignment] + result = await super().get_tags_for_application( + id, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, TagAdapter) + return result # type: ignore[return-value] async def put_tag_for_application( self, id: StrictStr, - tag: List[TagAdapter], + tag: List[TagAdapter], # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -250,13 +239,13 @@ async def put_tag_for_application( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - """Put tag for an application""" - normalized_id: Optional[StrictStr] = id or None - normalized_tag: Optional[List[TagAdapter]] = tag or None - - await self._api.put_tag_for_application( - normalized_id, - normalized_tag, + if not id: + id = None # type: ignore[assignment] + if not tag: + tag = None # type: ignore[assignment] + return await super().put_tag_for_application( + id, + tag, # type: ignore[arg-type] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -267,7 +256,7 @@ async def put_tag_for_application( async def delete_tag_for_application( self, id: StrictStr, - tag: List[TagAdapter], + tag: List[TagAdapter], # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -278,13 +267,13 @@ async def delete_tag_for_application( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - """Delete tag for an application""" - normalized_id: Optional[StrictStr] = id or None - normalized_tag: Optional[List[TagAdapter]] = tag or None - - return await self._api.delete_tag_for_application( - normalized_id, - normalized_tag, + if not id: + id = None # type: ignore[assignment] + if not tag: + tag = None # type: ignore[assignment] + return await super().delete_tag_for_application( + id, + tag, # type: ignore[arg-type] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -292,7 +281,7 @@ async def delete_tag_for_application( _host_index=_host_index, ) - async def create_application( + async def create_application( # type: ignore[override] self, create_or_update_application_request: CreateOrUpdateApplicationRequestAdapter, _request_timeout: Union[ @@ -305,8 +294,7 @@ async def create_application( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> ExtendedConductorApplicationAdapter: - """Create an application""" - result = await self._api.create_application( + result = await super().create_application( create_or_update_application_request, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -314,9 +302,9 @@ async def create_application( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, ExtendedConductorApplicationAdapter) + return result # type: ignore[return-value] - async def update_application( + async def update_application( # type: ignore[override] self, id: StrictStr, create_or_update_application_request: CreateOrUpdateApplicationRequestAdapter, @@ -330,8 +318,7 @@ async def update_application( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> ExtendedConductorApplicationAdapter: - """Update an application""" - result = await self._api.update_application( + result = await super().update_application( id, create_or_update_application_request, _request_timeout=_request_timeout, @@ -340,7 +327,7 @@ async def update_application( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, ExtendedConductorApplicationAdapter) + return result # type: ignore[return-value] async def get_application( self, @@ -355,8 +342,7 @@ async def get_application( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> ExtendedConductorApplicationAdapter: - """Get an application""" - result = await self._api.get_application( + result = await super().get_application( id, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -364,9 +350,9 @@ async def get_application( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, ExtendedConductorApplicationAdapter) + return result # type: ignore[return-value] - async def list_applications( + async def list_applications( # type: ignore[override] self, _request_timeout: Union[ None, @@ -378,35 +364,11 @@ async def list_applications( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[ExtendedConductorApplicationAdapter]: - """List applications""" - result = await self._api.list_applications( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_list_to_adapter(result, ExtendedConductorApplicationAdapter) - - async def delete_application( - self, - id: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Delete an application""" - return await self._api.delete_application( - id, + result = await super().list_applications( _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) + return result # type: ignore[return-value] diff --git a/src/conductor/asyncio_client/adapters/api/authorization_resource_api.py b/src/conductor/asyncio_client/adapters/api/authorization_resource_api.py index f404fdea..872a7280 100644 --- a/src/conductor/asyncio_client/adapters/api/authorization_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/authorization_resource_api.py @@ -1,65 +1,4 @@ -from __future__ import annotations - -from typing import Annotated, Any, Dict, Optional, Tuple, Union - -from pydantic import Field, StrictFloat, StrictInt, StrictStr - from conductor.asyncio_client.http.api import AuthorizationResourceApi -from conductor.asyncio_client.adapters.models.authorization_request_adapter import ( - AuthorizationRequestAdapter, -) -from conductor.asyncio_client.adapters import ApiClient - - -class AuthorizationResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self.api = AuthorizationResourceApi(api_client) - - async def get_permissions( - self, - type: StrictStr, - id: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Get permissions""" - return await self.api.get_permissions(type, id) - async def grant_permissions( - self, - authorization_request: AuthorizationRequestAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Grant permissions""" - return await self.api.grant_permissions(authorization_request) - async def remove_permissions( - self, - authorization_request: AuthorizationRequestAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Remove permissions""" - return await self.api.remove_permissions(authorization_request) +class AuthorizationResourceApiAdapter(AuthorizationResourceApi): ... diff --git a/src/conductor/asyncio_client/adapters/api/environment_resource_api.py b/src/conductor/asyncio_client/adapters/api/environment_resource_api.py index d3f1c4ae..892b50b5 100644 --- a/src/conductor/asyncio_client/adapters/api/environment_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/environment_resource_api.py @@ -1,185 +1,4 @@ -from __future__ import annotations - from conductor.asyncio_client.http.api import EnvironmentResourceApi -from typing import Annotated, Any, Dict, Optional, List, Tuple, Union - -from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter -from conductor.asyncio_client.adapters.models.environment_variable_adapter import ( - EnvironmentVariableAdapter, -) -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter - - -class EnvironmentResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = EnvironmentResourceApi(api_client) - - async def create_or_update_env_variable( - self, - key: StrictStr, - body: Annotated[str, Field(min_length=0, strict=True, max_length=65535)], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Create or update environment variable""" - await self._api.create_or_update_env_variable( - key, - body, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def delete_env_variable( - self, - key: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> str: - """Delete environment variable""" - return await self._api.delete_env_variable( - key, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def delete_tag_for_env_var( - self, - name: StrictStr, - tag: List[TagAdapter], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Delete tag for environment variable""" - await self._api.delete_tag_for_env_var( - name, - tag, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def get2( - self, - key: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> str: - """Get environment variable by key""" - return await self._api.get2( - key, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def get_all( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> List[EnvironmentVariableAdapter]: - """Get all environment variables""" - result = await self._api.get_all( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_list_to_adapter(result, EnvironmentVariableAdapter) - - async def get_tags_for_env_var( - self, - name: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> List[TagAdapter]: - """Get tags for environment variables""" - result = await self._api.get_tags_for_env_var( - name, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_list_to_adapter(result, TagAdapter) - async def put_tag_for_env_var( - self, - name: StrictStr, - tag: List[TagAdapter], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Put tag for environment variable""" - await self._api.put_tag_for_env_var( - name, - tag, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) +class EnvironmentResourceApiAdapter(EnvironmentResourceApi): ... diff --git a/src/conductor/asyncio_client/adapters/api/event_execution_resource_api.py b/src/conductor/asyncio_client/adapters/api/event_execution_resource_api.py index f0f7894e..06bcd9c1 100644 --- a/src/conductor/asyncio_client/adapters/api/event_execution_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/event_execution_resource_api.py @@ -1,69 +1,4 @@ -from __future__ import annotations -from typing import Annotated, Any, Dict, Optional, List, Tuple, Union -from pydantic import Field, StrictFloat, StrictInt, StrictStr - -from conductor.asyncio_client.adapters.models.search_result_handled_event_response_adapter import ( - SearchResultHandledEventResponseAdapter, -) -from conductor.asyncio_client.adapters.models.extended_event_execution_adapter import ( - ExtendedEventExecutionAdapter, -) from conductor.asyncio_client.http.api import EventExecutionResourceApi -from conductor.asyncio_client.adapters import ApiClient - -from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter - - -class EventExecutionResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = EventExecutionResourceApi(api_client) - - async def get_event_handlers_for_event1( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> SearchResultHandledEventResponseAdapter: - """Get All active Event Handlers for the last 24 hours""" - result = await self.get_event_handlers_for_event1( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - return convert_to_adapter(result, SearchResultHandledEventResponseAdapter) - async def get_event_handlers_for_event2( - self, - event: StrictStr, - var_from: StrictInt, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> List[ExtendedEventExecutionAdapter]: - """Get event handlers for a given event""" - result = await self.get_event_handlers_for_event2( - event=event, - var_from=var_from, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_list_to_adapter(result, ExtendedEventExecutionAdapter) +class EventExecutionResourceApiAdapter(EventExecutionResourceApi): ... diff --git a/src/conductor/asyncio_client/adapters/api/event_resource_api.py b/src/conductor/asyncio_client/adapters/api/event_resource_api.py index f4107088..24f6f70d 100644 --- a/src/conductor/asyncio_client/adapters/api/event_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/event_resource_api.py @@ -1,403 +1,4 @@ -from __future__ import annotations - from conductor.asyncio_client.http.api import EventResourceApi -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.models.connectivity_test_input_adapter import ( - ConnectivityTestInputAdapter, -) -from typing import Annotated, Any, Dict, Optional, List, Tuple, Union -from pydantic import Field, StrictFloat, StrictInt, StrictStr, StrictBool - -from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter -from conductor.asyncio_client.adapters.models.event_handler_adapter import EventHandlerAdapter -from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter -from conductor.asyncio_client.adapters.models.connectivity_test_result_adapter import ( - ConnectivityTestResultAdapter, -) - - -class EventResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = EventResourceApi(api_client) - - async def add_event_handler( - self, - event_handler: List[EventHandlerAdapter], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Add a new event handler""" - await self._api.add_event_handler( - event_handler, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def delete_queue_config( - self, - queue_type: StrictStr, - queue_name: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Delete queue config""" - await self._api.delete_queue_config( - queue_type, - queue_name, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def delete_tag_for_event_handler( - self, - name: StrictStr, - tag: List[TagAdapter], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Delete a tag for event handler""" - await self._api.delete_tag_for_event_handler( - name, - tag, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def get_event_handler_by_name( - self, - name: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> EventHandlerAdapter: - """Get event handler by name""" - result = await self._api.get_event_handler_by_name( - name, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_to_adapter(result, EventHandlerAdapter) - - async def get_event_handlers( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> List[EventHandlerAdapter]: - """Get all event handlers""" - result = await self._api.get_event_handlers( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_list_to_adapter(result, EventHandlerAdapter) - - async def get_event_handlers_for_event( - self, - event: StrictStr, - active_only: Optional[StrictBool] = None, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> List[EventHandlerAdapter]: - """Get event handlers for a given event""" - result = await self._api.get_event_handlers_for_event( - event, - active_only, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_list_to_adapter(result, EventHandlerAdapter) - - async def get_queue_config( - self, - queue_type: StrictStr, - queue_name: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, object]: - """Get queue config""" - return await self._api.get_queue_config( - queue_type, - queue_name, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def get_queue_names( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, str]: - """Get all queue configs""" - return await self._api.get_queue_names( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def get_tags_for_event_handler( - self, - name: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> List[TagAdapter]: - """Get tags for event handler""" - result = await self._api.get_tags_for_event_handler( - name, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_list_to_adapter(result, TagAdapter) - - async def handle_incoming_event( - self, - request_body: Dict[str, Dict[str, Any]], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Handle an incoming event""" - await self._api.handle_incoming_event( - request_body, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def put_queue_config( - self, - queue_type: StrictStr, - queue_name: StrictStr, - body: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """(Deprecated) Put queue config""" - await self._api.put_queue_config( - queue_type, - queue_name, - body, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def put_tag_for_event_handler( - self, - name: StrictStr, - tag: List[TagAdapter], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Put a tag for event handler""" - await self._api.put_tag_for_event_handler( - name, - tag, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def remove_event_handler_status( - self, - name: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Remove an event handler""" - await self._api.remove_event_handler_status( - name, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def test( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> EventHandlerAdapter: - """Get event handler by name""" - result = await self._api.test( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_to_adapter(result, EventHandlerAdapter) - async def test_connectivity( - self, - connectivity_test_input: ConnectivityTestInputAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ConnectivityTestResultAdapter: - """Test connectivity for a given queue using a workflow with EVENT task and an EventHandler""" - result = await self._api.test_connectivity( - connectivity_test_input, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_to_adapter(result, ConnectivityTestResultAdapter) - async def update_event_handler( - self, - event_handler: EventHandlerAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Update an existing event handler""" - await self._api.update_event_handler( - event_handler, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) +class EventResourceApiAdapter(EventResourceApi): ... diff --git a/src/conductor/asyncio_client/adapters/api/group_resource_api.py b/src/conductor/asyncio_client/adapters/api/group_resource_api.py index 290f9792..ced755cc 100644 --- a/src/conductor/asyncio_client/adapters/api/group_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/group_resource_api.py @@ -13,13 +13,12 @@ ) from conductor.asyncio_client.http.api import GroupResourceApi from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter -from conductor.asyncio_client.adapters import ApiClient class GroupResourceApiAdapter: """Adapter for GroupResourceApi that converts between generated models and adapters.""" - def __init__(self, api_client: ApiClient): + def __init__(self, api_client): self._api = GroupResourceApi(api_client) async def list_groups( diff --git a/src/conductor/asyncio_client/adapters/api/health_check_resource_api.py b/src/conductor/asyncio_client/adapters/api/health_check_resource_api.py index c064dd7a..f44cde8d 100644 --- a/src/conductor/asyncio_client/adapters/api/health_check_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/health_check_resource_api.py @@ -1,34 +1,4 @@ -from __future__ import annotations - -from typing import Annotated, Any, Dict, Optional, Tuple, Union - -from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters import ApiClient - from conductor.asyncio_client.http.api import HealthCheckResourceApi -class HealthCheckResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = HealthCheckResourceApi(api_client) - - async def do_check( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, object]: - """Check the health of the API""" - return await self._api.do_check( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) +class HealthCheckResourceApiAdapter(HealthCheckResourceApi): ... diff --git a/src/conductor/asyncio_client/adapters/api/incoming_webhook_resource_api.py b/src/conductor/asyncio_client/adapters/api/incoming_webhook_resource_api.py index 11818af4..4a91fcef 100644 --- a/src/conductor/asyncio_client/adapters/api/incoming_webhook_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/incoming_webhook_resource_api.py @@ -1,64 +1,4 @@ -from __future__ import annotations - -from typing import Any, Annotated, Dict, Optional, Tuple, Union -from pydantic import StrictStr, StrictFloat, StrictInt, Field - from conductor.asyncio_client.http.api import IncomingWebhookResourceApi -from conductor.asyncio_client.adapters import ApiClient - - -class IncomingWebhookResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = IncomingWebhookResourceApi(api_client) - async def handle_webhook( - self, - id: StrictStr, - request_params: Dict[str, Dict[str, Any]], - body: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> str: - """Handle webhook""" - return await self._api.handle_webhook( - id, - request_params, - body, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - async def handle_webhook1( - self, - id: StrictStr, - request_params: Dict[str, Dict[str, Any]], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> str: - """Handle webhook""" - return await self._api.handle_webhook1( - id, - request_params, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) +class IncomingWebhookResourceApiAdapter(IncomingWebhookResourceApi): ... diff --git a/src/conductor/asyncio_client/adapters/api/integration_resource_api.py b/src/conductor/asyncio_client/adapters/api/integration_resource_api.py index 00243df0..59f09776 100644 --- a/src/conductor/asyncio_client/adapters/api/integration_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/integration_resource_api.py @@ -11,95 +11,9 @@ from conductor.asyncio_client.adapters.models.message_template_adapter import MessageTemplateAdapter from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.http.api import IntegrationResourceApi -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter -from conductor.asyncio_client.adapters.models.integration_api_update_adapter import ( - IntegrationApiUpdateAdapter, -) -from conductor.asyncio_client.adapters.models.integration_update_adapter import ( - IntegrationUpdateAdapter, -) -class IntegrationResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = IntegrationResourceApi(api_client) - - async def associate_prompt_with_integration( - self, - integration_provider: StrictStr, - integration_name: StrictStr, - prompt_name: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Associate a prompt with an integration""" - await self._api.associate_prompt_with_integration( - integration_provider, - integration_name, - prompt_name, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def delete_integration_api( - self, - name: StrictStr, - integration_name: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Delete an Integration""" - await self._api.delete_integration_api( - name, - integration_name, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def delete_integration_provider( - self, - name: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Delete an Integration Provider""" - await self._api.delete_integration_provider( - name, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - +class IntegrationResourceApiAdapter(IntegrationResourceApi): async def get_integration_provider( self, name: StrictStr, @@ -113,8 +27,7 @@ async def get_integration_provider( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> IntegrationAdapter: - """Get a specific integration provider""" - result = await self._api.get_integration_provider( + result = await super().get_integration_provider( name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -122,9 +35,9 @@ async def get_integration_provider( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, IntegrationAdapter) + return result # type: ignore[return-value] - async def get_integration_providers( + async def get_integration_providers( # type: ignore[override] self, category: Optional[StrictStr] = None, active_only: Optional[StrictBool] = None, @@ -138,8 +51,7 @@ async def get_integration_providers( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[IntegrationAdapter]: - """Get all Integrations Providers""" - result = await self._api.get_integration_providers( + result = await super().get_integration_providers( category, active_only, _request_timeout=_request_timeout, @@ -148,9 +60,9 @@ async def get_integration_providers( _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, IntegrationAdapter) + return result # type: ignore[return-value] - async def get_integration_provider_defs( + async def get_integration_provider_defs( # type: ignore[override] self, _request_timeout: Union[ None, @@ -162,15 +74,14 @@ async def get_integration_provider_defs( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[IntegrationDefAdapter]: - """Get integration provider definitions""" - result = await self._api.get_integration_provider_defs( + result = await super().get_integration_provider_defs( _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, IntegrationDefAdapter) + return result # type: ignore[return-value] async def get_integration_api( self, @@ -186,8 +97,7 @@ async def get_integration_api( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> IntegrationApiAdapter: - """Get a specific integration api""" - result = await self._api.get_integration_api( + result = await super().get_integration_api( name, integration_name, _request_timeout=_request_timeout, @@ -196,9 +106,9 @@ async def get_integration_api( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, IntegrationApiAdapter) + return result # type: ignore[return-value] - async def get_integration_apis( + async def get_integration_apis( # type: ignore[override] self, name: StrictStr, active_only: Optional[StrictBool] = None, @@ -212,8 +122,7 @@ async def get_integration_apis( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[IntegrationApiAdapter]: - """Get all integration apis""" - result = await self._api.get_integration_apis( + result = await super().get_integration_apis( name, active_only, _request_timeout=_request_timeout, @@ -223,7 +132,7 @@ async def get_integration_apis( _host_index=_host_index, ) - return convert_list_to_adapter(result, IntegrationApiAdapter) + return result # type: ignore[return-value] async def get_integration_available_apis( self, @@ -238,8 +147,7 @@ async def get_integration_available_apis( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[str]: - """Get all integration available apis""" - result = await self._api.get_integration_available_apis( + result = await super().get_integration_available_apis( name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -248,62 +156,11 @@ async def get_integration_available_apis( _host_index=_host_index, ) - return result + return result # type: ignore[return-value] async def save_all_integrations( self, - integration: List[IntegrationAdapter], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Save all Integrations""" - await self._api.save_all_integrations( - integration, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def save_integration_api( - self, - name: StrictStr, - integration_name: StrictStr, - integration_api_update: IntegrationApiUpdateAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Create or Update Integration""" - await self._api.save_integration_api( - name, - integration_name, - integration_api_update, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def save_integration_provider( - self, - name: StrictStr, - integration_update: IntegrationUpdateAdapter, + integration: List[IntegrationAdapter], # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -314,10 +171,8 @@ async def save_integration_provider( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - """Create or Update Integration Provider""" - await self._api.save_integration_provider( - name, - integration_update, + return await super().save_all_integrations( + integration, # type: ignore[arg-type] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -325,7 +180,7 @@ async def save_integration_provider( _host_index=_host_index, ) - async def get_all_integrations( + async def get_all_integrations( # type: ignore[override] self, category: Optional[StrictStr] = None, active_only: Optional[StrictBool] = None, @@ -339,8 +194,7 @@ async def get_all_integrations( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[IntegrationAdapter]: - """Get all integrations""" - result = await self._api.get_all_integrations( + result = await super().get_all_integrations( category, active_only, _request_timeout=_request_timeout, @@ -350,7 +204,7 @@ async def get_all_integrations( _host_index=_host_index, ) - return convert_list_to_adapter(result, IntegrationAdapter) + return result # type: ignore[return-value] async def get_providers_and_integrations( self, @@ -366,8 +220,7 @@ async def get_providers_and_integrations( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[str]: - """Get providers and integrations""" - result = await self._api.get_providers_and_integrations( + return await super().get_providers_and_integrations( type, active_only, _request_timeout=_request_timeout, @@ -376,13 +229,12 @@ async def get_providers_and_integrations( _headers=_headers, _host_index=_host_index, ) - return result async def put_tag_for_integration( self, name: StrictStr, integration_name: StrictStr, - tag: List[TagAdapter], + tag: List[TagAdapter], # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -393,11 +245,10 @@ async def put_tag_for_integration( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - """Put a tag to Integration""" - await self._api.put_tag_for_integration( + return await super().put_tag_for_integration( name, integration_name, - tag, + tag, # type: ignore[arg-type] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -405,7 +256,7 @@ async def put_tag_for_integration( _host_index=_host_index, ) - async def get_tags_for_integration( + async def get_tags_for_integration( # type: ignore[override] self, name: StrictStr, integration_name: StrictStr, @@ -419,8 +270,7 @@ async def get_tags_for_integration( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TagAdapter]: - """Get tags for integration""" - result = await self._api.get_tags_for_integration( + result = await super().get_tags_for_integration( name, integration_name, _request_timeout=_request_timeout, @@ -430,13 +280,13 @@ async def get_tags_for_integration( _host_index=_host_index, ) - return convert_list_to_adapter(result, TagAdapter) + return result # type: ignore[return-value] async def delete_tag_for_integration( self, name: StrictStr, integration_name: StrictStr, - tag: List[TagAdapter], + tag: List[TagAdapter], # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -447,11 +297,10 @@ async def delete_tag_for_integration( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - """Delete a tag for Integration""" - await self._api.delete_tag_for_integration( + return await super().delete_tag_for_integration( name, integration_name, - tag, + tag, # type: ignore[arg-type] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -462,7 +311,7 @@ async def delete_tag_for_integration( async def put_tag_for_integration_provider( self, name: StrictStr, - tag: List[TagAdapter], + tag: List[TagAdapter], # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -473,10 +322,9 @@ async def put_tag_for_integration_provider( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - """Put a tag to Integration Provider""" - await self._api.put_tag_for_integration_provider( + return await super().put_tag_for_integration_provider( name, - tag, + tag, # type: ignore[arg-type] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -484,7 +332,7 @@ async def put_tag_for_integration_provider( _host_index=_host_index, ) - async def get_tags_for_integration_provider( + async def get_tags_for_integration_provider( # type: ignore[override] self, name: StrictStr, _request_timeout: Union[ @@ -497,8 +345,7 @@ async def get_tags_for_integration_provider( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TagAdapter]: - """Get tags for integration provider""" - result = await self._api.get_tags_for_integration_provider( + result = await super().get_tags_for_integration_provider( name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -506,12 +353,12 @@ async def get_tags_for_integration_provider( _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, TagAdapter) + return result # type: ignore[return-value] async def delete_tag_for_integration_provider( self, name: StrictStr, - tag: List[TagAdapter], + tag: List[TagAdapter], # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -522,10 +369,9 @@ async def delete_tag_for_integration_provider( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - """Delete a tag for Integration Provider""" - await self._api.delete_tag_for_integration_provider( + return await super().delete_tag_for_integration_provider( name, - tag, + tag, # type: ignore[arg-type] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -546,8 +392,7 @@ async def get_token_usage_for_integration_provider( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> Dict[str, str]: - """Get Token Usage by Integration Provider""" - result = await self._api.get_token_usage_for_integration_provider( + return await super().get_token_usage_for_integration_provider( name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -555,9 +400,8 @@ async def get_token_usage_for_integration_provider( _headers=_headers, _host_index=_host_index, ) - return result - async def get_prompts_with_integration( + async def get_prompts_with_integration( # type: ignore[override] self, integration_provider: StrictStr, integration_name: StrictStr, @@ -571,8 +415,7 @@ async def get_prompts_with_integration( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[MessageTemplateAdapter]: - """Get prompts with integration""" - result = await self._api.get_prompts_with_integration( + result = await super().get_prompts_with_integration( integration_provider, integration_name, _request_timeout=_request_timeout, @@ -581,12 +424,12 @@ async def get_prompts_with_integration( _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, MessageTemplateAdapter) + return result # type: ignore[return-value] async def record_event_stats( self, type: StrictStr, - event_log: List[EventLogAdapter], + event_log: List[EventLogAdapter], # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -597,66 +440,12 @@ async def record_event_stats( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - """Record Event Stats""" - await self._api.record_event_stats( + return await super().record_event_stats( type, - event_log, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def register_token_usage( - self, - name: StrictStr, - integration_name: StrictStr, - body: StrictInt, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Register Token Usage""" - await self._api.register_token_usage( - name, - integration_name, - body, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def get_token_usage_for_integration( - self, - name: StrictStr, - integration_name: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> int: - """Get Token Usage by Integration""" - result = await self._api.get_token_usage_for_integration( - name, - integration_name, + event_log, # type: ignore[arg-type] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return result diff --git a/src/conductor/asyncio_client/adapters/api/limits_resource_api.py b/src/conductor/asyncio_client/adapters/api/limits_resource_api.py index 1b5aab16..44eb8e24 100644 --- a/src/conductor/asyncio_client/adapters/api/limits_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/limits_resource_api.py @@ -1,34 +1,4 @@ -from __future__ import annotations - -from typing import Annotated, Any, Dict, Optional, Tuple, Union - -from pydantic import Field, StrictFloat, StrictInt, StrictStr - from conductor.asyncio_client.http.api import LimitsResourceApi -from conductor.asyncio_client.adapters import ApiClient - -class LimitsResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = LimitsResourceApi(api_client) - async def get1( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, object]: - """Get limits""" - return await self._api.get1( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) +class LimitsResourceApiAdapter(LimitsResourceApi): ... diff --git a/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py b/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py index b678668b..292e242f 100644 --- a/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py @@ -9,46 +9,11 @@ ) from conductor.asyncio_client.adapters.models.task_def_adapter import TaskDefAdapter from conductor.asyncio_client.adapters.models.workflow_def_adapter import WorkflowDefAdapter -from conductor.asyncio_client.adapters.models.extended_task_def_adapter import ( - ExtendedTaskDefAdapter, -) from conductor.asyncio_client.http.api import MetadataResourceApi -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter - -class MetadataResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = MetadataResourceApi(api_client) - - async def create( - self, - extended_workflow_def: ExtendedWorkflowDefAdapter, - overwrite: Optional[StrictBool] = None, - new_version: Optional[StrictBool] = None, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Create a new workflow definition""" - return await self._api.create( - extended_workflow_def, - overwrite, - new_version, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - async def get_task_def( +class MetadataResourceApiAdapter(MetadataResourceApi): + async def get_task_def( # type: ignore[override] self, tasktype: StrictStr, metadata: Optional[StrictBool] = None, @@ -61,9 +26,8 @@ async def get_task_def( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Get a task definition""" - return await self._api.get_task_def( + ) -> TaskDefAdapter: + result = await super().get_task_def( tasktype, metadata, _request_timeout=_request_timeout, @@ -72,8 +36,9 @@ async def get_task_def( _headers=_headers, _host_index=_host_index, ) + return result # type: ignore[return-value] - async def get_task_defs( + async def get_task_defs( # type: ignore[override] self, access: Optional[StrictStr] = None, metadata: Optional[StrictBool] = None, @@ -89,8 +54,7 @@ async def get_task_defs( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TaskDefAdapter]: - """Get all task definitions""" - result = await self._api.get_task_defs( + result = await super().get_task_defs( access, metadata, tag_key, @@ -101,11 +65,11 @@ async def get_task_defs( _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, TaskDefAdapter) + return result # type: ignore[return-value] async def update( self, - extended_workflow_def: List[ExtendedWorkflowDefAdapter], + extended_workflow_def: List[ExtendedWorkflowDefAdapter], # type: ignore[override] overwrite: Optional[StrictBool] = None, new_version: Optional[StrictBool] = None, _request_timeout: Union[ @@ -118,9 +82,8 @@ async def update( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> object: - """Create or update workflow definition(s)""" - result = await self._api.update( - extended_workflow_def, + result = await super().update( + extended_workflow_def, # type: ignore[arg-type] overwrite, new_version, _request_timeout=_request_timeout, @@ -129,53 +92,9 @@ async def update( _headers=_headers, _host_index=_host_index, ) - return result - - async def update_task_def( - self, - extended_task_def: ExtendedTaskDefAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Update a task definition""" - return await self._api.update_task_def( - extended_task_def, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def upload_workflows_and_tasks_definitions_to_s3( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Upload all workflows and tasks definitions to Object storage if configured""" - return await self._api.upload_workflows_and_tasks_definitions_to_s3( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) + return result # type: ignore[return-value] - async def get( + async def get( # type: ignore[override] self, name: StrictStr, version: Optional[StrictInt] = None, @@ -190,20 +109,19 @@ async def get( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> WorkflowDefAdapter: - """Get a workflow definition""" - result = await self._api.get( - name=name, - version=version, - metadata=metadata, + result = await super().get( + name, + version, + metadata, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, WorkflowDefAdapter) + return result # type: ignore[return-value] - async def get_workflow_defs( + async def get_workflow_defs( # type: ignore[override] self, access: Optional[StrictStr] = None, metadata: Optional[StrictBool] = None, @@ -221,7 +139,7 @@ async def get_workflow_defs( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[WorkflowDefAdapter]: - result = await self._api.get_workflow_defs( + result = await super().get_workflow_defs( access, metadata, tag_key, @@ -234,75 +152,4 @@ async def get_workflow_defs( _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, WorkflowDefAdapter) - - async def register_task_def( - self, - extended_task_def: List[ExtendedTaskDefAdapter], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Register a task definition""" - return await self._api.register_task_def( - extended_task_def, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def unregister_task_def( - self, - tasktype: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Unregister a task definition""" - return await self._api.unregister_task_def( - tasktype, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def unregister_workflow_def( - self, - name: StrictStr, - version: StrictInt, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Unregister a workflow definition""" - return await self._api.unregister_workflow_def( - name, - version, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) + return result # type: ignore[return-value] diff --git a/src/conductor/asyncio_client/adapters/api/metrics_resource_api.py b/src/conductor/asyncio_client/adapters/api/metrics_resource_api.py index 0c1db62f..4dad395e 100644 --- a/src/conductor/asyncio_client/adapters/api/metrics_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/metrics_resource_api.py @@ -1,42 +1,4 @@ -from __future__ import annotations - -from typing import Annotated, Any, Dict, Optional, Tuple, Union - -from pydantic import Field, StrictFloat, StrictInt, StrictStr - from conductor.asyncio_client.http.api import MetricsResourceApi -from conductor.asyncio_client.adapters import ApiClient - -class MetricsResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = MetricsResourceApi(api_client) - async def prometheus_task_metrics( - self, - task_name: StrictStr, - start: StrictStr, - end: StrictStr, - step: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, object]: - """Get prometheus task metrics""" - return await self._api.prometheus_task_metrics( - task_name=task_name, - start=start, - end=end, - step=step, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) +class MetricsResourceApiAdapter(MetricsResourceApi): ... diff --git a/src/conductor/asyncio_client/adapters/api/metrics_token_resource_api.py b/src/conductor/asyncio_client/adapters/api/metrics_token_resource_api.py index cbcfcc5d..49203a86 100644 --- a/src/conductor/asyncio_client/adapters/api/metrics_token_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/metrics_token_resource_api.py @@ -1,37 +1,4 @@ -from __future__ import annotations - -from typing import Annotated, Any, Dict, Optional, Tuple, Union - -from pydantic import Field, StrictFloat, StrictInt, StrictStr - from conductor.asyncio_client.http.api import MetricsTokenResourceApi -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.models.metrics_token_adapter import MetricsTokenAdapter -from conductor.asyncio_client.adapters.utils import convert_to_adapter - -class MetricsTokenResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = MetricsTokenResourceApi(api_client) - async def token( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> MetricsTokenAdapter: - """Get metrics token""" - result = await self._api.token( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_to_adapter(result, MetricsTokenAdapter) +class MetricsTokenResourceApiAdapter(MetricsTokenResourceApi): ... diff --git a/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py b/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py index bf6f45a1..9776dd5d 100644 --- a/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py @@ -7,19 +7,11 @@ from conductor.asyncio_client.adapters.models.message_template_adapter import ( MessageTemplateAdapter, ) -from conductor.asyncio_client.adapters.models.prompt_template_test_request_adapter import ( - PromptTemplateTestRequestAdapter, -) from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.http.api import PromptResourceApi -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter - -class PromptResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = PromptResourceApi(api_client) +class PromptResourceApiAdapter(PromptResourceApi): async def get_message_template( self, name: StrictStr, @@ -33,8 +25,7 @@ async def get_message_template( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> MessageTemplateAdapter: - """Get a message template by name""" - result = await self._api.get_message_template( + result = await super().get_message_template( name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -42,9 +33,9 @@ async def get_message_template( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, MessageTemplateAdapter) + return result # type: ignore[return-value] - async def get_message_templates( + async def get_message_templates( # type: ignore[override] self, _request_timeout: Union[ None, @@ -56,19 +47,18 @@ async def get_message_templates( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[MessageTemplateAdapter]: - """Get all message templates""" - result = await self._api.get_message_templates( + result = await super().get_message_templates( _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, MessageTemplateAdapter) + return result # type: ignore[return-value] async def create_message_templates( self, - message_template: List[MessageTemplateAdapter], + message_template: List[MessageTemplateAdapter], # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -79,9 +69,8 @@ async def create_message_templates( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - """Create multiple message templates in bulk""" - return await self._api.create_message_templates( - message_template, + return await super().create_message_templates( + message_template, # type: ignore[arg-type] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -92,7 +81,7 @@ async def create_message_templates( async def put_tag_for_prompt_template( self, name: StrictStr, - tag: List[TagAdapter], + tag: List[TagAdapter], # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -103,10 +92,9 @@ async def put_tag_for_prompt_template( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - """Put a tag to Prompt Template""" - await self._api.put_tag_for_prompt_template( + return await super().put_tag_for_prompt_template( name, - tag, + tag, # type: ignore[arg-type] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -114,7 +102,7 @@ async def put_tag_for_prompt_template( _host_index=_host_index, ) - async def get_tags_for_prompt_template( + async def get_tags_for_prompt_template( # type: ignore[override] self, name: StrictStr, _request_timeout: Union[ @@ -127,8 +115,7 @@ async def get_tags_for_prompt_template( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TagAdapter]: - """Get tags for a prompt template""" - result = await self._api.get_tags_for_prompt_template( + result = await super().get_tags_for_prompt_template( name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -136,62 +123,12 @@ async def get_tags_for_prompt_template( _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, TagAdapter) + return result # type: ignore[return-value] async def delete_tag_for_prompt_template( self, name: StrictStr, - tag: List[TagAdapter], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Delete a tag from a prompt template""" - return await self._api.delete_tag_for_prompt_template( - name, - tag, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def delete_message_template( - self, - name: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Delete a message template""" - await self._api.delete_message_template( - name, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def save_message_template( - self, - name: StrictStr, - description: StrictStr, - body: StrictStr, - models: Optional[List[StrictStr]] = None, + tag: List[TagAdapter], # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -202,36 +139,9 @@ async def save_message_template( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - """Create or Update a template""" - await self._api.save_message_template( + return await super().delete_tag_for_prompt_template( name, - description, - body, - models, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def test_message_template( - self, - prompt_template_test_request: PromptTemplateTestRequestAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> str: - """Test Prompt Template""" - return await self._api.test_message_template( - prompt_template_test_request, - _request_timeout=_request_timeout, + tag, # type: ignore[arg-type] _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, diff --git a/src/conductor/asyncio_client/adapters/api/queue_admin_resource_api.py b/src/conductor/asyncio_client/adapters/api/queue_admin_resource_api.py index ad59f7b9..9b04cc6e 100644 --- a/src/conductor/asyncio_client/adapters/api/queue_admin_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/queue_admin_resource_api.py @@ -1,55 +1,4 @@ -from __future__ import annotations - -from typing import Annotated, Any, Dict, Optional, Tuple, Union - -from pydantic import Field, StrictFloat, StrictInt, StrictStr - from conductor.asyncio_client.http.api import QueueAdminResourceApi -from conductor.asyncio_client.adapters import ApiClient - - -class QueueAdminResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = QueueAdminResourceApi(api_client) - async def names( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, str]: - """Get queue names""" - return await self._api.names( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - async def size1( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, Dict[str, int]]: - """Get queue size""" - return await self._api.size1( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) +class QueueAdminResourceApiAdapter(QueueAdminResourceApi): ... diff --git a/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py b/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py index 935e1a9d..a94af4a8 100644 --- a/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py @@ -15,38 +15,10 @@ WorkflowScheduleModelAdapter, ) from conductor.asyncio_client.http.api import SchedulerResourceApi -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter -class SchedulerResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = SchedulerResourceApi(api_client) - - async def delete_schedule( - self, - name: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Delete a workflow schedule by name""" - return await self._api.delete_schedule( - name, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def get_schedule( +class SchedulerResourceApiAdapter(SchedulerResourceApi): + async def get_schedule( # type: ignore[override] self, name: StrictStr, _request_timeout: Union[ @@ -59,8 +31,7 @@ async def get_schedule( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> WorkflowScheduleAdapter: - """Get a workflow schedule by name""" - result = await self._api.get_schedule( + result = await super().get_schedule( name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -68,9 +39,9 @@ async def get_schedule( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, WorkflowScheduleAdapter) + return result # type: ignore[return-value] - async def get_all_schedules( + async def get_all_schedules( # type: ignore[override] self, workflow_name: Optional[StrictStr] = None, _request_timeout: Union[ @@ -83,8 +54,7 @@ async def get_all_schedules( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[WorkflowScheduleModelAdapter]: - """Get all workflow schedules, optionally filtered by workflow name""" - result = await self._api.get_all_schedules( + result = await super().get_all_schedules( workflow_name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -92,9 +62,9 @@ async def get_all_schedules( _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, WorkflowScheduleModelAdapter) + return result # type: ignore[return-value] - async def search_v2( + async def search_v2( # type: ignore[override] self, start: Optional[StrictInt] = None, size: Optional[StrictInt] = None, @@ -111,8 +81,7 @@ async def search_v2( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> SearchResultWorkflowScheduleExecutionModelAdapter: - """Search for workflow schedule executions""" - result = await self._api.search_v2( + result = await super().search_v2( start, size, sort, @@ -124,9 +93,9 @@ async def search_v2( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, SearchResultWorkflowScheduleExecutionModelAdapter) + return result # type: ignore[return-value] - async def get_schedules_by_tag( + async def get_schedules_by_tag( # type: ignore[override] self, tag: StrictStr, _request_timeout: Union[ @@ -139,8 +108,7 @@ async def get_schedules_by_tag( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[WorkflowScheduleModelAdapter]: - """Get schedules by tag""" - result = await self._api.get_schedules_by_tag( + result = await super().get_schedules_by_tag( tag, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -148,12 +116,12 @@ async def get_schedules_by_tag( _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, WorkflowScheduleModelAdapter) + return result # type: ignore[return-value] async def put_tag_for_schedule( self, name: StrictStr, - tag: List[TagAdapter], + tag: List[TagAdapter], # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -164,10 +132,9 @@ async def put_tag_for_schedule( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - """Put a tag to schedule""" - await self._api.put_tag_for_schedule( + return await super().put_tag_for_schedule( name, - tag, + tag, # type: ignore[arg-type] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -175,7 +142,7 @@ async def put_tag_for_schedule( _host_index=_host_index, ) - async def get_tags_for_schedule( + async def get_tags_for_schedule( # type: ignore[override] self, name: StrictStr, _request_timeout: Union[ @@ -188,8 +155,7 @@ async def get_tags_for_schedule( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TagAdapter]: - """Get tags for a schedule""" - result = await self._api.get_tags_for_schedule( + result = await super().get_tags_for_schedule( name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -197,12 +163,12 @@ async def get_tags_for_schedule( _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, TagAdapter) + return result # type: ignore[return-value] async def delete_tag_for_schedule( self, name: StrictStr, - tag: List[TagAdapter], + tag: List[TagAdapter], # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -213,171 +179,9 @@ async def delete_tag_for_schedule( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - """Delete a tag from a schedule""" - return await self._api.delete_tag_for_schedule( + return await super().delete_tag_for_schedule( name, - tag, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def get_next_few_schedules( - self, - cron_expression: StrictStr, - schedule_start_time: Optional[StrictInt] = None, - schedule_end_time: Optional[StrictInt] = None, - limit: Optional[StrictInt] = None, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> List[int]: - """Get the next few schedules for a cron expression""" - return await self._api.get_next_few_schedules( - cron_expression, - schedule_start_time, - schedule_end_time, - limit, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def pause_all_schedules( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, object]: - """Pause all scheduling in a single conductor server instance (for debugging only)""" - return await self._api.pause_all_schedules( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def pause_schedule( - self, - name: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Pauses an existing schedule by name""" - return await self._api.pause_schedule( - name, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def requeue_all_execution_records( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, object]: - """Requeue all execution records""" - return await self._api.requeue_all_execution_records( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def resume_all_schedules( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, object]: - """Resume all scheduling in a single conductor server instance (for debugging only)""" - return await self._api.resume_all_schedules( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def resume_schedule( - self, - name: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Resume a paused schedule by name""" - return await self._api.resume_schedule( - name, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def save_schedule( - self, - save_schedule_request: WorkflowScheduleModelAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Save a schedule""" - return await self._api.save_schedule( - save_schedule_request, + tag, # type: ignore[arg-type] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, diff --git a/src/conductor/asyncio_client/adapters/api/schema_resource_api.py b/src/conductor/asyncio_client/adapters/api/schema_resource_api.py index 3e923bbb..9ec0cc72 100644 --- a/src/conductor/asyncio_client/adapters/api/schema_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/schema_resource_api.py @@ -6,65 +6,12 @@ from conductor.asyncio_client.adapters.models.schema_def_adapter import SchemaDefAdapter from conductor.asyncio_client.http.api import SchemaResourceApi -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter -class SchemaResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = SchemaResourceApi(api_client) - - async def delete_schema_by_name( - self, - name: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Delete all versions of schema by name""" - return await self._api.delete_schema_by_name( - name, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def delete_schema_by_name_and_version( - self, - name: StrictStr, - version: StrictInt, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Delete a version of schema by name and version""" - return await self._api.delete_schema_by_name_and_version( - name, - version, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - +class SchemaResourceApiAdapter(SchemaResourceApi): async def save( self, - schema_def: List[SchemaDefAdapter], + schema_def: List[SchemaDefAdapter], # type: ignore[override] new_version: Optional[StrictBool] = None, _request_timeout: Union[ None, @@ -76,9 +23,8 @@ async def save( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - """Save a schema""" - await self._api.save( - schema_def, + return await super().save( + schema_def, # type: ignore[arg-type] new_version, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -87,7 +33,7 @@ async def save( _host_index=_host_index, ) - async def get_schema_by_name_and_version( + async def get_schema_by_name_and_version( # type: ignore[override] self, name: StrictStr, version: StrictInt, @@ -101,8 +47,7 @@ async def get_schema_by_name_and_version( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> SchemaDefAdapter: - """Get a schema by name and version""" - result = await self._api.get_schema_by_name_and_version( + result = await super().get_schema_by_name_and_version( name, version, _request_timeout=_request_timeout, @@ -111,9 +56,9 @@ async def get_schema_by_name_and_version( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, SchemaDefAdapter) + return result # type: ignore[return-value] - async def get_all_schemas( + async def get_all_schemas( # type: ignore[override] self, _request_timeout: Union[ None, @@ -125,12 +70,11 @@ async def get_all_schemas( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[SchemaDefAdapter]: - """Get all schemas""" - result = await self._api.get_all_schemas( + result = await super().get_all_schemas( _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, SchemaDefAdapter) + return result # type: ignore[return-value] diff --git a/src/conductor/asyncio_client/adapters/api/secret_resource_api.py b/src/conductor/asyncio_client/adapters/api/secret_resource_api.py index 69ef2c70..cf5b6475 100644 --- a/src/conductor/asyncio_client/adapters/api/secret_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/secret_resource_api.py @@ -7,57 +7,10 @@ from conductor.asyncio_client.adapters.models.extended_secret_adapter import ExtendedSecretAdapter from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.http.api import SecretResourceApi -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter -class SecretResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = SecretResourceApi(api_client) - - async def clear_local_cache( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, str]: - """Clear local cache""" - return await self._api.clear_local_cache( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def clear_redis_cache( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, str]: - """Clear redis cache""" - return await self._api.clear_redis_cache( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def delete_secret( +class SecretResourceApiAdapter(SecretResourceApi): + async def secret_exists( # type: ignore[override] self, key: Annotated[str, Field(strict=True)], _request_timeout: Union[ @@ -69,32 +22,8 @@ async def delete_secret( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Delete a secret value by key""" - return await self._api.delete_secret( - key, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def secret_exists( - self, - key: Annotated[str, Field(strict=True)], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Check if a secret exists by key""" - return await self._api.secret_exists( + ) -> bool: + result = await super().secret_exists( key, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -102,6 +31,7 @@ async def secret_exists( _headers=_headers, _host_index=_host_index, ) + return result # type: ignore[return-value] async def list_all_secret_names( self, @@ -115,8 +45,7 @@ async def list_all_secret_names( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[str]: - """List all secret names""" - return await self._api.list_all_secret_names( + return await super().list_all_secret_names( _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -124,7 +53,7 @@ async def list_all_secret_names( _host_index=_host_index, ) - async def list_secrets_with_tags_that_user_can_grant_access_to( + async def list_secrets_with_tags_that_user_can_grant_access_to( # type: ignore[override] self, _request_timeout: Union[ None, @@ -136,45 +65,19 @@ async def list_secrets_with_tags_that_user_can_grant_access_to( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[ExtendedSecretAdapter]: - """List secrets with tags that the current user can grant access to""" - result = await self._api.list_secrets_with_tags_that_user_can_grant_access_to( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_list_to_adapter(result, ExtendedSecretAdapter) - - async def put_secret( - self, - key: Annotated[str, Field(strict=True)], - body: Annotated[str, Field(min_length=0, strict=True, max_length=65535)], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Put a secret value by key""" - return await self._api.put_secret( - key, - body, + result = await super().list_secrets_with_tags_that_user_can_grant_access_to( _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) + return result # type: ignore[return-value] async def put_tag_for_secret( self, key: Annotated[str, Field(strict=True)], - tag: List[TagAdapter], + tag: List[TagAdapter], # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -185,10 +88,9 @@ async def put_tag_for_secret( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - """Put a tag for a secret""" - await self._api.put_tag_for_secret( + return await super().put_tag_for_secret( key, - tag, + tag, # type: ignore[arg-type] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -196,7 +98,7 @@ async def put_tag_for_secret( _host_index=_host_index, ) - async def get_tags( + async def get_tags( # type: ignore[override] self, key: Annotated[str, Field(strict=True)], _request_timeout: Union[ @@ -209,8 +111,7 @@ async def get_tags( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TagAdapter]: - """Get tags for a secret""" - result = await self._api.get_tags( + result = await super().get_tags( key, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -218,12 +119,12 @@ async def get_tags( _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, TagAdapter) + return result # type: ignore[return-value] async def delete_tag_for_secret( self, key: Annotated[str, Field(strict=True)], - tag: List[TagAdapter], + tag: List[TagAdapter], # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -234,55 +135,9 @@ async def delete_tag_for_secret( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - """Delete a tag for a secret""" - return await self._api.delete_tag_for_secret( + return await super().delete_tag_for_secret( key, - tag, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def get_secret( - self, - key: Annotated[str, Field(strict=True)], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> str: - """Get a secret value by key""" - result = await self._api.get_secret( - key, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return result - - async def list_secrets_that_user_can_grant_access_to( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> List[str]: - """List all secret names user can grant access to""" - return await self._api.list_secrets_that_user_can_grant_access_to( + tag, # type: ignore[arg-type] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, diff --git a/src/conductor/asyncio_client/adapters/api/tags_api.py b/src/conductor/asyncio_client/adapters/api/tags_api.py index 642f3dc6..fc0c94d2 100644 --- a/src/conductor/asyncio_client/adapters/api/tags_api.py +++ b/src/conductor/asyncio_client/adapters/api/tags_api.py @@ -6,137 +6,10 @@ from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.http.api import TagsApi -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter -class TagsApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = TagsApi(api_client) - - async def add_task_tag( - self, - task_name: StrictStr, - tag: TagAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Add a tag to a task""" - return await self._api.add_task_tag( - task_name, - tag, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def add_workflow_tag( - self, - name: StrictStr, - tag: TagAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Add a tag to a workflow""" - return await self._api.add_workflow_tag( - name, - tag, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def delete_task_tag( - self, - task_name: StrictStr, - tag: TagAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Delete a tag from a task""" - return await self._api.delete_task_tag( - task_name, - tag, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def delete_workflow_tag( - self, - name: StrictStr, - tag: TagAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Delete a tag from a workflow""" - return await self._api.delete_workflow_tag( - name, - tag, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def get_tags1( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> List[TagAdapter]: - """List all tags""" - result = await self._api.get_tags1( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_list_to_adapter(result, TagAdapter) - - async def get_workflow_tags( +class TagsApiAdapter(TagsApi): + async def get_workflow_tags( # type: ignore[override] self, name: StrictStr, _request_timeout: Union[ @@ -149,7 +22,7 @@ async def get_workflow_tags( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TagAdapter]: - result = await self._api.get_workflow_tags( + result = await super().get_workflow_tags( name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -157,12 +30,12 @@ async def get_workflow_tags( _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, TagAdapter) + return result # type: ignore[return-value] - async def set_workflow_tags( + async def set_workflow_tags( # type: ignore[override] self, name: StrictStr, - tag: List[TagAdapter], + tag: List[TagAdapter], # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -173,17 +46,18 @@ async def set_workflow_tags( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> object: - return await self._api.set_workflow_tags( + result = await super().set_workflow_tags( name, - tag, + tag, # type: ignore[arg-type] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) + return result # type: ignore[return-value] - async def get_task_tags( + async def get_task_tags( # type: ignore[override] self, task_name: StrictStr, _request_timeout: Union[ @@ -196,7 +70,7 @@ async def get_task_tags( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TagAdapter]: - result = await self._api.get_task_tags( + result = await super().get_task_tags( task_name, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -204,12 +78,12 @@ async def get_task_tags( _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, TagAdapter) + return result # type: ignore[return-value] - async def set_task_tags( + async def set_task_tags( # type: ignore[override] self, task_name: StrictStr, - tag: List[TagAdapter], + tag: List[TagAdapter], # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -220,12 +94,13 @@ async def set_task_tags( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> object: - return await self._api.set_task_tags( + result = await super().set_task_tags( task_name, - tag, + tag, # type: ignore[arg-type] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) + return result # type: ignore[return-value] diff --git a/src/conductor/asyncio_client/adapters/api/task_resource_api.py b/src/conductor/asyncio_client/adapters/api/task_resource_api.py index e38f86f1..e0351ebd 100644 --- a/src/conductor/asyncio_client/adapters/api/task_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/task_resource_api.py @@ -2,7 +2,7 @@ from typing import Annotated, Any, Dict, List, Optional, Tuple, Union -from pydantic import Field, StrictFloat, StrictInt, StrictStr +from pydantic import Field, StrictFloat, StrictInt, StrictStr, validate_call from conductor.asyncio_client.adapters.models.poll_data_adapter import PollDataAdapter from conductor.asyncio_client.adapters.models.search_result_task_summary_adapter import ( @@ -10,60 +10,12 @@ ) from conductor.asyncio_client.adapters.models.task_adapter import TaskAdapter from conductor.asyncio_client.adapters.models.task_exec_log_adapter import TaskExecLogAdapter -from conductor.asyncio_client.adapters.models.task_result_adapter import TaskResultAdapter from conductor.asyncio_client.adapters.models.workflow_adapter import WorkflowAdapter from conductor.asyncio_client.http.api import TaskResourceApi -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter -class TaskResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = TaskResourceApi(api_client) - - async def all( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, int]: - """Get the details about each queue""" - return await self._api.all( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def all_verbose( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, Dict[str, Dict[str, int]]]: - """Get the details about each queue""" - return await self._api.all_verbose( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def poll( +class TaskResourceApiAdapter(TaskResourceApi): + async def poll( # type: ignore[override] self, tasktype: StrictStr, workerid: Optional[StrictStr] = None, @@ -78,7 +30,7 @@ async def poll( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> Optional[TaskAdapter]: - result = await self._api.poll( + result = await super().poll( tasktype, workerid, domain, @@ -88,32 +40,9 @@ async def poll( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, TaskAdapter) if result else None + return result # type: ignore[return-value] - async def requeue_pending_task( - self, - task_type: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> str: - """Requeue pending tasks""" - return await self._api.requeue_pending_task( - task_type, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def batch_poll( + async def batch_poll( # type: ignore[override] self, tasktype: StrictStr, workerid: Optional[StrictStr] = None, @@ -130,7 +59,7 @@ async def batch_poll( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TaskAdapter]: - result = await self._api.batch_poll( + result = await super().batch_poll( tasktype, workerid, domain, @@ -142,42 +71,9 @@ async def batch_poll( _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, TaskAdapter) + return result # type: ignore[return-value] - async def get_all_poll_data( - self, - worker_size: Optional[StrictInt] = None, - worker_opt: Optional[StrictStr] = None, - queue_size: Optional[StrictInt] = None, - queue_opt: Optional[StrictStr] = None, - last_poll_time_size: Optional[StrictInt] = None, - last_poll_time_opt: Optional[StrictStr] = None, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, object]: - """Get the last poll data for all task types""" - return await self._api.get_all_poll_data( - worker_size, - worker_opt, - queue_size, - queue_opt, - last_poll_time_size, - last_poll_time_opt, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def get_task( + async def get_task( # type: ignore[override] self, task_id: StrictStr, _request_timeout: Union[ @@ -190,7 +86,7 @@ async def get_task( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> TaskAdapter: - result = await self._api.get_task( + result = await super().get_task( task_id, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -198,9 +94,9 @@ async def get_task( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, TaskAdapter) + return result # type: ignore[return-value] - async def get_poll_data( + async def get_poll_data( # type: ignore[override] self, task_type: StrictStr, _request_timeout: Union[ @@ -213,7 +109,7 @@ async def get_poll_data( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[PollDataAdapter]: - result = await self._api.get_poll_data( + result = await super().get_poll_data( task_type, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -221,9 +117,9 @@ async def get_poll_data( _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, PollDataAdapter) + return result # type: ignore[return-value] - async def get_task_logs( + async def get_task_logs( # type: ignore[override] self, task_id: StrictStr, _request_timeout: Union[ @@ -236,42 +132,17 @@ async def get_task_logs( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TaskExecLogAdapter]: - result = await self._api.get_task_logs( - task_id, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_list_to_adapter(result, TaskExecLogAdapter) - - async def log( - self, - task_id: StrictStr, - body: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Log Task Execution Details""" - await self._api.log( + result = await super().get_task_logs( task_id, - body, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) + return result # type: ignore[return-value] - async def search1( + async def search1( # type: ignore[override] self, start: Optional[StrictInt] = None, size: Optional[StrictInt] = None, @@ -288,7 +159,7 @@ async def search1( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> SearchResultTaskSummaryAdapter: - result = await self._api.search1( + result = await super().search1( start, size, sort, @@ -300,85 +171,9 @@ async def search1( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, SearchResultTaskSummaryAdapter) - - async def size( - self, - task_type: Optional[List[StrictStr]] = None, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, int]: - """Get Task type queue sizes""" - return await self._api.size( - task_type, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def update_task( - self, - task_result: TaskResultAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> str: - """Update a task""" - return await self._api.update_task( - task_result, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def update_task1( - self, - workflow_id: StrictStr, - task_ref_name: StrictStr, - status: StrictStr, - request_body: Dict[str, Dict[str, Any]], - workerid: Optional[StrictStr] = None, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> str: - """Update a task By Ref Name""" - return await self._api.update_task1( - workflow_id, - task_ref_name, - status, - request_body, - workerid, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) + return result # type: ignore[return-value] + @validate_call async def update_task_sync( self, workflow_id: StrictStr, @@ -396,17 +191,59 @@ async def update_task_sync( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> WorkflowAdapter: - """Update a task By Ref Name synchronously""" - result = await self._api.update_task_sync( - workflow_id, - task_ref_name, - status, - request_body, - workerid, - _request_timeout=_request_timeout, + """Update a task By Ref Name synchronously + + + :param workflow_id: (required) + :type workflow_id: str + :param task_ref_name: (required) + :type task_ref_name: str + :param status: (required) + :type status: str + :param request_body: (required) + :type request_body: Dict[str, object] + :param workerid: + :type workerid: str + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :type _request_timeout: int, tuple(int, int), optional + :param _request_auth: set to override the auth_settings for an a single + request; this effectively ignores the + authentication in the spec for a single request. + :type _request_auth: dict, optional + :param _content_type: force content-type for the request. + :type _content_type: str, Optional + :param _headers: set to override the headers for a single + request; this effectively ignores the headers + in the spec for a single request. + :type _headers: dict, optional + :param _host_index: set to override the host_index for a single + request; this effectively ignores the host_index + in the spec for a single request. + :type _host_index: int, optional + :return: Returns the result object. + """ + + _param = self._update_task_sync_serialize( + workflow_id=workflow_id, + task_ref_name=task_ref_name, + status=status, + request_body=request_body, + workerid=workerid, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, WorkflowAdapter) + + _response_types_map: Dict[str, Optional[str]] = { + "200": "Workflow", + } + response_data = await self.api_client.call_api(*_param, _request_timeout=_request_timeout) + await response_data.read() + return self.api_client.response_deserialize( + response_data=response_data, + response_types_map=_response_types_map, + ).data diff --git a/src/conductor/asyncio_client/adapters/api/token_resource_api.py b/src/conductor/asyncio_client/adapters/api/token_resource_api.py index df2ca193..52f40be2 100644 --- a/src/conductor/asyncio_client/adapters/api/token_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/token_resource_api.py @@ -1,61 +1,4 @@ -from __future__ import annotations - -from typing import Annotated, Any, Dict, Optional, Tuple, Union - -from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters.models.generate_token_request_adapter import ( - GenerateTokenRequestAdapter, -) from conductor.asyncio_client.http.api import TokenResourceApi -from conductor.asyncio_client.adapters import ApiClient - - -class TokenResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = TokenResourceApi(api_client) - async def generate_token( - self, - generate_token_request: GenerateTokenRequestAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Generate JWT with the given access key""" - return await self._api.generate_token( - generate_token_request, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - async def get_user_info( - self, - claims: Optional[StrictBool] = None, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Get the user info from the token""" - return await self._api.get_user_info( - claims, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) +class TokenResourceApiAdapter(TokenResourceApi): ... diff --git a/src/conductor/asyncio_client/adapters/api/user_resource_api.py b/src/conductor/asyncio_client/adapters/api/user_resource_api.py index 00962dc9..3a880d8d 100644 --- a/src/conductor/asyncio_client/adapters/api/user_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/user_resource_api.py @@ -4,44 +4,12 @@ from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters.models import UpsertUserRequestAdapter +from conductor.asyncio_client.adapters.models import UpsertUserRequestAdapter as UpsertUserRequest from conductor.asyncio_client.adapters.models.conductor_user_adapter import ConductorUserAdapter -from conductor.asyncio_client.adapters import ApiClient from conductor.asyncio_client.http.api import UserResourceApi -from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter -class UserResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = UserResourceApi(api_client) - - async def check_permissions( - self, - user_id: StrictStr, - type: StrictStr, - id: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Get the permissions this user has over workflows and tasks""" - return await self._api.check_permissions( - user_id, - type, - id, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - +class UserResourceApiAdapter(UserResourceApi): async def get_granted_permissions( self, user_id: StrictStr, @@ -57,8 +25,8 @@ async def get_granted_permissions( ) -> object: # Convert empty user_id to None to prevent sending invalid data to server if not user_id: - user_id = None - return await self._api.get_granted_permissions( + user_id = None # type: ignore[assignment] + return await super().get_granted_permissions( user_id, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -67,7 +35,7 @@ async def get_granted_permissions( _host_index=_host_index, ) - async def get_user( + async def get_user( # type: ignore[override] self, id: StrictStr, _request_timeout: Union[ @@ -82,8 +50,8 @@ async def get_user( ) -> ConductorUserAdapter: # Convert empty user id to None to prevent sending invalid data to server if not id: - id = None - result = await self._api.get_user( + id = None # type: ignore[assignment] + result = await super().get_user( id, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -91,12 +59,12 @@ async def get_user( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, ConductorUserAdapter) + return result # type: ignore[return-value] - async def upsert_user( + async def upsert_user( # type: ignore[override] self, id: StrictStr, - upsert_user_request: UpsertUserRequestAdapter, + upsert_user_request: UpsertUserRequest, # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -109,8 +77,8 @@ async def upsert_user( ) -> ConductorUserAdapter: # Convert empty user id to None to prevent sending invalid data to server if not id: - id = None - result = await self._api.upsert_user( + id = None # type: ignore[assignment] + result = await super().upsert_user( id, upsert_user_request, _request_timeout=_request_timeout, @@ -119,9 +87,9 @@ async def upsert_user( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, ConductorUserAdapter) + return result # type: ignore[return-value] - async def list_users( + async def list_users( # type: ignore[override] self, apps: Optional[StrictBool] = None, _request_timeout: Union[ @@ -134,7 +102,7 @@ async def list_users( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[ConductorUserAdapter]: - result = await self._api.list_users( + result = await super().list_users( apps, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -142,7 +110,7 @@ async def list_users( _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, ConductorUserAdapter) + return result # type: ignore[return-value] async def delete_user( self, @@ -159,8 +127,8 @@ async def delete_user( ) -> object: # Convert empty user id to None to prevent sending invalid data to server if not id: - id = None - return await self._api.delete_user( + id = None # type: ignore[assignment] + return await super().delete_user( id, _request_timeout=_request_timeout, _request_auth=_request_auth, diff --git a/src/conductor/asyncio_client/adapters/api/version_resource_api.py b/src/conductor/asyncio_client/adapters/api/version_resource_api.py index 2896be44..e5a49c7a 100644 --- a/src/conductor/asyncio_client/adapters/api/version_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/version_resource_api.py @@ -1,34 +1,4 @@ -from __future__ import annotations - -from typing import Annotated, Any, Dict, Optional, Tuple, Union - -from pydantic import Field, StrictFloat, StrictInt, StrictStr - from conductor.asyncio_client.http.api import VersionResourceApi -from conductor.asyncio_client.adapters import ApiClient - -class VersionResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = VersionResourceApi(api_client) - async def get_version( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> str: - """Get the server's version""" - return await self._api.get_version( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) +class VersionResourceApiAdapter(VersionResourceApi): ... diff --git a/src/conductor/asyncio_client/adapters/api/webhooks_config_resource_api.py b/src/conductor/asyncio_client/adapters/api/webhooks_config_resource_api.py index 8b317602..eb3b9e0d 100644 --- a/src/conductor/asyncio_client/adapters/api/webhooks_config_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/webhooks_config_resource_api.py @@ -1,208 +1,4 @@ -from __future__ import annotations - -from typing import Annotated, Any, Dict, Optional, Tuple, Union, List - -from pydantic import Field, StrictFloat, StrictInt, StrictStr - from conductor.asyncio_client.http.api import WebhooksConfigResourceApi -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.utils import convert_to_adapter, convert_list_to_adapter -from conductor.asyncio_client.adapters.models.webhook_config_adapter import WebhookConfigAdapter -from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter - - -class WebhooksConfigResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = WebhooksConfigResourceApi(api_client) - - async def create_webhook( - self, - webhook_config: WebhookConfigAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> WebhookConfigAdapter: - result = await self._api.create_webhook( - webhook_config, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_to_adapter(result, WebhookConfigAdapter) - - async def delete_tag_for_webhook( - self, - id: StrictStr, - tag: List[TagAdapter], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Delete a tag for webhook id""" - await self._api.delete_tag_for_webhook( - id, - tag, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def delete_webhook( - self, - id: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Delete a webhook id""" - await self._api.delete_webhook( - id, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def get_all_webhook( - self, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> List[WebhookConfigAdapter]: - """Get all webhooks""" - result = await self._api.get_all_webhook( - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_list_to_adapter(result, WebhookConfigAdapter) - - async def get_tags_for_webhook( - self, - id: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> List[TagAdapter]: - """Get tags by webhook id""" - result = await self._api.get_tags_for_webhook( - id, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_list_to_adapter(result, TagAdapter) - - async def get_webhook( - self, - id: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> WebhookConfigAdapter: - """Get webhook by id""" - result = await self._api.get_webhook( - id, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_to_adapter(result, WebhookConfigAdapter) - async def put_tag_for_webhook( - self, - id: StrictStr, - tag: List[TagAdapter], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Put a tag to webhook id""" - await self._api.put_tag_for_webhook( - id, - tag, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - async def update_webhook( - self, - id: StrictStr, - webhook_config: WebhookConfigAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> WebhookConfigAdapter: - """Update a webhook id""" - result = await self._api.update_webhook( - id, - webhook_config, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_to_adapter(result, WebhookConfigAdapter) +class WebhooksConfigResourceApiAdapter(WebhooksConfigResourceApi): ... diff --git a/src/conductor/asyncio_client/adapters/api/workflow_bulk_resource_api.py b/src/conductor/asyncio_client/adapters/api/workflow_bulk_resource_api.py index d828fc87..b1ae1437 100644 --- a/src/conductor/asyncio_client/adapters/api/workflow_bulk_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/workflow_bulk_resource_api.py @@ -1,164 +1,4 @@ -from __future__ import annotations - -from typing import Annotated, Any, Dict, List, Optional, Tuple, Union - -from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr from conductor.asyncio_client.http.api import WorkflowBulkResourceApi -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.utils import convert_to_adapter -from conductor.asyncio_client.adapters.models.bulk_response_adapter import BulkResponseAdapter - - -class WorkflowBulkResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = WorkflowBulkResourceApi(api_client) - - async def delete( - self, - request_body: List[StrictStr], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> BulkResponseAdapter: - """Permanently remove workflows from the system""" - result = await self._api.delete( - request_body, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_to_adapter(result, BulkResponseAdapter) - - async def pause_workflow1( - self, - request_body: List[StrictStr], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> BulkResponseAdapter: - """Pause the list of workflows""" - result = await self._api.pause_workflow1( - request_body, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_to_adapter(result, BulkResponseAdapter) - - async def restart1( - self, - request_body: List[StrictStr], - use_latest_definitions: Optional[StrictBool] = None, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> BulkResponseAdapter: - """Restart the list of completed workflow""" - result = await self._api.restart1( - request_body, - use_latest_definitions, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_to_adapter(result, BulkResponseAdapter) - - async def resume_workflow1( - self, - request_body: List[StrictStr], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> BulkResponseAdapter: - """Resume the list of paused workflows""" - result = await self._api.resume_workflow1( - request_body, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_to_adapter(result, BulkResponseAdapter) - async def retry1( - self, - request_body: List[StrictStr], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> BulkResponseAdapter: - """Retry the last failed task for each workflow from the list""" - result = await self._api.retry1( - request_body, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_to_adapter(result, BulkResponseAdapter) - async def terminate( - self, - request_body: List[StrictStr], - reason: Optional[StrictStr] = None, - trigger_failure_workflow: Optional[StrictBool] = None, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> BulkResponseAdapter: - """Terminate the list of workflows""" - result = await self._api.terminate( - request_body, - reason, - trigger_failure_workflow, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_to_adapter(result, BulkResponseAdapter) +class WorkflowBulkResourceApiAdapter(WorkflowBulkResourceApi): ... diff --git a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py index 13e4232a..67a80fdb 100644 --- a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py @@ -2,7 +2,7 @@ from typing import Annotated, Any, Dict, List, Optional, Tuple, Union -from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr +from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr, validate_call from conductor.asyncio_client.adapters.models.correlation_ids_search_request_adapter import ( CorrelationIdsSearchRequestAdapter, @@ -16,9 +16,6 @@ from conductor.asyncio_client.adapters.models.start_workflow_request_adapter import ( StartWorkflowRequestAdapter, ) -from conductor.asyncio_client.adapters.models.skip_task_request_adapter import ( - SkipTaskRequestAdapter, -) from conductor.asyncio_client.adapters.models.workflow_adapter import WorkflowAdapter from conductor.asyncio_client.adapters.models.workflow_run_adapter import WorkflowRunAdapter from conductor.asyncio_client.adapters.models.workflow_state_update_adapter import ( @@ -29,77 +26,15 @@ WorkflowTestRequestAdapter, ) from conductor.asyncio_client.http.api import WorkflowResourceApi -from conductor.asyncio_client.adapters import ApiClient -from conductor.asyncio_client.adapters.utils import ( - convert_to_adapter, - convert_dict_to_adapter, - convert_list_to_adapter, -) -from conductor.asyncio_client.adapters.models.task_list_search_result_summary_adapter import ( - TaskListSearchResultSummaryAdapter, -) -from conductor.asyncio_client.adapters.models.upgrade_workflow_request_adapter import ( - UpgradeWorkflowRequestAdapter, -) - -class WorkflowResourceApiAdapter: - def __init__(self, api_client: ApiClient): - self._api = WorkflowResourceApi(api_client) - async def decide( - self, - workflow_id: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - await self._api.decide( - workflow_id, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def delete1( - self, - workflow_id: StrictStr, - archive_workflow: Optional[StrictBool] = None, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Removes the workflow from the system""" - await self._api.delete1( - workflow_id, - archive_workflow, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def execute_workflow( +class WorkflowResourceApiAdapter(WorkflowResourceApi): + async def execute_workflow( # type: ignore[override] self, name: StrictStr, version: StrictInt, request_id: StrictStr, - start_workflow_request: StartWorkflowRequestAdapter, + start_workflow_request: StartWorkflowRequestAdapter, # type: ignore[override] wait_until_task_ref: Optional[StrictStr] = None, wait_for_seconds: Optional[StrictInt] = None, _request_timeout: Union[ @@ -112,94 +47,22 @@ async def execute_workflow( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> WorkflowRunAdapter: - result = await self._api.execute_workflow( - name, - version, - request_id, - start_workflow_request, - wait_until_task_ref, - wait_for_seconds, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_to_adapter(result, WorkflowRunAdapter) - - async def execute_workflow_as_api( - self, - name: StrictStr, - request_body: Dict[str, Dict[str, Any]], - version: Optional[StrictInt] = None, - request_id: Optional[StrictStr] = None, - wait_until_task_ref: Optional[StrictStr] = None, - wait_for_seconds: Optional[StrictInt] = None, - x_idempotency_key: Optional[StrictStr] = None, - x_on_conflict: Optional[StrictStr] = None, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, object]: - """Execute a workflow synchronously with input and outputs""" - return await self._api.execute_workflow_as_api( + result = await super().execute_workflow( name, - request_body, version, request_id, + start_workflow_request, # type: ignore[override] wait_until_task_ref, wait_for_seconds, - x_idempotency_key, - x_on_conflict, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) + return result # type: ignore[return-value] - async def execute_workflow_as_get_api( - self, - name: StrictStr, - version: Optional[StrictInt] = None, - request_id: Optional[StrictStr] = None, - wait_until_task_ref: Optional[StrictStr] = None, - wait_for_seconds: Optional[StrictInt] = None, - x_idempotency_key: Optional[StrictStr] = None, - x_on_conflict: Optional[StrictStr] = None, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> Dict[str, object]: - """(Deprecated) Execute a workflow synchronously with input and outputs using get api""" - return await self._api.execute_workflow_as_get_api( - name, - version, - request_id, - wait_until_task_ref, - wait_for_seconds, - x_idempotency_key, - x_on_conflict, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def get_execution_status( + async def get_execution_status( # type: ignore[override] self, workflow_id: StrictStr, include_tasks: Optional[StrictBool] = None, @@ -214,7 +77,7 @@ async def get_execution_status( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> WorkflowAdapter: - result = await self._api.get_execution_status( + result = await super().get_execution_status( workflow_id, include_tasks, summarize, @@ -224,38 +87,9 @@ async def get_execution_status( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, WorkflowAdapter) - - async def get_execution_status_task_list( - self, - workflow_id: StrictStr, - start: Optional[StrictInt] = None, - count: Optional[StrictInt] = None, - status: Optional[List[StrictStr]] = None, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> TaskListSearchResultSummaryAdapter: - result = await self._api.get_execution_status_task_list( - workflow_id, - start, - count, - status, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_to_adapter(result, TaskListSearchResultSummaryAdapter) + return result # type: ignore[return-value] - async def get_workflow_status_summary( + async def get_workflow_status_summary( # type: ignore[override] self, workflow_id: StrictStr, include_output: Optional[StrictBool] = None, @@ -269,8 +103,8 @@ async def get_workflow_status_summary( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> WorkflowStatusAdapter: - result = await self._api.get_workflow_status_summary( + ) -> WorkflowStatusAdapter: # type: ignore[override] + result = await super().get_workflow_status_summary( workflow_id, include_output, include_variables, @@ -280,7 +114,7 @@ async def get_workflow_status_summary( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, WorkflowStatusAdapter) + return result # type: ignore[return-value] async def get_running_workflow( self, @@ -298,7 +132,7 @@ async def get_running_workflow( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[str]: - return await self._api.get_running_workflow( + return await super().get_running_workflow( name, version, start_time, @@ -310,7 +144,7 @@ async def get_running_workflow( _host_index=_host_index, ) - async def get_workflows( + async def get_workflows( # type: ignore[override] self, name: StrictStr, request_body: List[StrictStr], @@ -326,7 +160,7 @@ async def get_workflows( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> Dict[str, List[WorkflowAdapter]]: - result = await self._api.get_workflows( + result = await super().get_workflows( name, request_body, include_closed, @@ -337,11 +171,11 @@ async def get_workflows( _headers=_headers, _host_index=_host_index, ) - return convert_dict_to_adapter(result, WorkflowAdapter) + return result # type: ignore[return-value] - async def get_workflows1( + async def get_workflows1( # type: ignore[override] self, - correlation_ids_search_request: CorrelationIdsSearchRequestAdapter, + correlation_ids_search_request: CorrelationIdsSearchRequestAdapter, # type: ignore[override] include_closed: Optional[StrictBool] = None, include_tasks: Optional[StrictBool] = None, _request_timeout: Union[ @@ -354,7 +188,7 @@ async def get_workflows1( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> Dict[str, List[WorkflowAdapter]]: - result = await self._api.get_workflows1( + result = await super().get_workflows1( correlation_ids_search_request, include_closed, include_tasks, @@ -364,88 +198,9 @@ async def get_workflows1( _headers=_headers, _host_index=_host_index, ) - return convert_dict_to_adapter(result, WorkflowAdapter) - - async def get_workflows2( - self, - name: StrictStr, - correlation_id: StrictStr, - include_closed: Optional[StrictBool] = None, - include_tasks: Optional[StrictBool] = None, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> List[WorkflowAdapter]: - result = await self._api.get_workflows2( - name, - correlation_id, - include_closed, - include_tasks, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_list_to_adapter(result, WorkflowAdapter) - - async def jump_to_task( - self, - workflow_id: StrictStr, - task_reference_name: StrictStr, - request_body: Dict[str, Dict[str, Any]], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Jump workflow execution to given task""" - await self._api.jump_to_task( - workflow_id, - task_reference_name, - request_body, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) + return result # type: ignore[return-value] - async def pause_workflow( - self, - workflow_id: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Pauses the workflow""" - await self._api.pause_workflow( - workflow_id, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def search( + async def search( # type: ignore[override] self, start: Optional[StrictInt] = None, size: Optional[StrictInt] = None, @@ -463,7 +218,7 @@ async def search( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> ScrollableSearchResultWorkflowSummaryAdapter: - result = await self._api.search( + result = await super().search( start, size, sort, @@ -476,62 +231,12 @@ async def search( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, ScrollableSearchResultWorkflowSummaryAdapter) - - async def skip_task_from_workflow( - self, - workflow_id: StrictStr, - task_reference_name: StrictStr, - skip_task_request: SkipTaskRequestAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Skips a given task from a current running workflow""" - await self._api.skip_task_from_workflow( - workflow_id, - task_reference_name, - skip_task_request, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def start_workflow( - self, - start_workflow_request: StartWorkflowRequestAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> str: - """Start a new workflow with StartWorkflowRequest, which allows task to be executed in a domain""" - return await self._api.start_workflow( - start_workflow_request, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) + return result # type: ignore[return-value] async def rerun( self, workflow_id: StrictStr, - rerun_workflow_request: RerunWorkflowRequestAdapter, + rerun_workflow_request: RerunWorkflowRequestAdapter, # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -542,32 +247,9 @@ async def rerun( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> str: - return await self._api.rerun( - workflow_id, - rerun_workflow_request, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def reset_workflow( - self, - workflow_id: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Resets callback times of all non-terminal SIMPLE tasks to 0""" - await self._api.reset_workflow( + return await super().rerun( workflow_id, + rerun_workflow_request, # type: ignore[override] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -589,7 +271,7 @@ async def restart( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - await self._api.restart( + await super().restart( workflow_id, use_latest_definitions, _request_timeout=_request_timeout, @@ -599,61 +281,11 @@ async def restart( _host_index=_host_index, ) - async def resume_workflow( - self, - workflow_id: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Resumes the workflow""" - await self._api.resume_workflow( - workflow_id, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def retry( - self, - workflow_id: StrictStr, - resume_subworkflow_tasks: Optional[StrictBool] = None, - retry_if_retried_by_parent: Optional[StrictBool] = None, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Retries the last failed task""" - await self._api.retry( - workflow_id, - resume_subworkflow_tasks, - retry_if_retried_by_parent, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def update_workflow_and_task_state( + async def update_workflow_and_task_state( # type: ignore[override] self, workflow_id: StrictStr, request_id: StrictStr, - workflow_state_update: WorkflowStateUpdateAdapter, + workflow_state_update: WorkflowStateUpdateAdapter, # type: ignore[override] wait_until_task_ref: Optional[StrictStr] = None, wait_for_seconds: Optional[StrictInt] = None, _request_timeout: Union[ @@ -666,10 +298,10 @@ async def update_workflow_and_task_state( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> WorkflowRunAdapter: - result = await self._api.update_workflow_and_task_state( + result = await super().update_workflow_and_task_state( workflow_id, request_id, - workflow_state_update, + workflow_state_update, # type: ignore[override] wait_until_task_ref, wait_for_seconds, _request_timeout=_request_timeout, @@ -678,35 +310,36 @@ async def update_workflow_and_task_state( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, WorkflowRunAdapter) + return result # type: ignore[return-value] - async def test_workflow( + async def test_workflow( # type: ignore[override] self, - workflow_test_request: WorkflowTestRequestAdapter, - _request_timeout: Union[ + workflow_test_request: WorkflowTestRequestAdapter, # type: ignore[override] + _request_timeout: Union[ # noqa: PT019 None, Annotated[StrictFloat, Field(gt=0)], Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + _request_auth: Optional[Dict[StrictStr, Any]] = None, # noqa: PT019 + _content_type: Optional[StrictStr] = None, # noqa: PT019 + _headers: Optional[Dict[StrictStr, Any]] = None, # noqa: PT019 + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, # noqa: PT019 ) -> WorkflowAdapter: - result = await self._api.test_workflow( - workflow_test_request, + result = await super().test_workflow( + workflow_test_request, # type: ignore[override] _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, WorkflowAdapter) + return result # type: ignore[return-value] + @validate_call async def update_workflow_state( self, workflow_id: StrictStr, - request_body: Dict[str, Dict[str, Any]], + request_body: Dict[str, Any], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -717,42 +350,56 @@ async def update_workflow_state( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> WorkflowAdapter: - result = await self._api.update_workflow_state( - workflow_id, - request_body, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_to_adapter(result, WorkflowAdapter) - - async def upgrade_running_workflow_to_version( - self, - workflow_id: StrictStr, - upgrade_workflow_request: UpgradeWorkflowRequestAdapter, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Upgrade running workflow to newer version""" - await self._api.upgrade_running_workflow_to_version( - workflow_id, - upgrade_workflow_request, - _request_timeout=_request_timeout, + """Update workflow variables + + Updates the workflow variables and triggers evaluation. + + :param workflow_id: (required) + :type workflow_id: str + :param request_body: (required) + :type request_body: Dict[str, object] + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :type _request_timeout: int, tuple(int, int), optional + :param _request_auth: set to override the auth_settings for an a single + request; this effectively ignores the + authentication in the spec for a single request. + :type _request_auth: dict, optional + :param _content_type: force content-type for the request. + :type _content_type: str, Optional + :param _headers: set to override the headers for a single + request; this effectively ignores the headers + in the spec for a single request. + :type _headers: dict, optional + :param _host_index: set to override the host_index for a single + request; this effectively ignores the host_index + in the spec for a single request. + :type _host_index: int, optional + :return: Returns the result object. + """ + + _param = self._update_workflow_state_serialize( + workflow_id=workflow_id, + request_body=request_body, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) + _response_types_map: Dict[str, Optional[str]] = { + "200": "Workflow", + } + response_data = await self.api_client.call_api(*_param, _request_timeout=_request_timeout) + await response_data.read() + return self.api_client.response_deserialize( + response_data=response_data, + response_types_map=_response_types_map, + ).data + + @validate_call async def start_workflow1( self, name: StrictStr, @@ -772,44 +419,65 @@ async def start_workflow1( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> str: - return await self._api.start_workflow1( - name, - request_body, - version, - correlation_id, - priority, - x_idempotency_key, - x_on_conflict, - _request_timeout=_request_timeout, + """Start a new workflow. Returns the ID of the workflow instance that can be later used for tracking + + + :param name: (required) + :type name: str + :param request_body: (required) + :type request_body: Dict[str, object] + :param version: + :type version: int + :param correlation_id: + :type correlation_id: str + :param priority: + :type priority: int + :param x_idempotency_key: + :type x_idempotency_key: str + :param x_on_conflict: + :type x_on_conflict: str + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :type _request_timeout: int, tuple(int, int), optional + :param _request_auth: set to override the auth_settings for an a single + request; this effectively ignores the + authentication in the spec for a single request. + :type _request_auth: dict, optional + :param _content_type: force content-type for the request. + :type _content_type: str, Optional + :param _headers: set to override the headers for a single + request; this effectively ignores the headers + in the spec for a single request. + :type _headers: dict, optional + :param _host_index: set to override the host_index for a single + request; this effectively ignores the host_index + in the spec for a single request. + :type _host_index: int, optional + :return: Returns the result object. + """ + + _param = self._start_workflow1_serialize( + name=name, + request_body=request_body, + version=version, + correlation_id=correlation_id, + priority=priority, + x_idempotency_key=x_idempotency_key, + x_on_conflict=x_on_conflict, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - async def terminate1( - self, - workflow_id: StrictStr, - reason: Optional[StrictStr] = None, - trigger_failure_workflow: Optional[StrictBool] = None, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Terminate workflow execution""" - await self._api.terminate1( - workflow_id, - reason, - trigger_failure_workflow, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) + _response_types_map: Dict[str, Optional[str]] = { + "200": "str", + } + response_data = await self.api_client.call_api(*_param, _request_timeout=_request_timeout) + await response_data.read() + return self.api_client.response_deserialize( + response_data=response_data, + response_types_map=_response_types_map, + ).data diff --git a/src/conductor/asyncio_client/adapters/models/conductor_user_adapter.py b/src/conductor/asyncio_client/adapters/models/conductor_user_adapter.py index e9d06ae3..0ff15a50 100644 --- a/src/conductor/asyncio_client/adapters/models/conductor_user_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/conductor_user_adapter.py @@ -9,8 +9,8 @@ class ConductorUserAdapter(ConductorUser): - groups: Optional[List["GroupAdapter"]] = None - roles: Optional[List["RoleAdapter"]] = None + groups: Optional[List["GroupAdapter"]] = None # type: ignore[assignment] + roles: Optional[List["RoleAdapter"]] = None # type: ignore[assignment] orkes_app: Optional[StrictBool] = Field(default=None, alias="orkesApp") orkes_api_gateway: Optional[StrictBool] = Field(default=None, alias="orkesApiGateway") contact_information: Optional[Dict[Any, str]] = Field(default=None, alias="contactInformation") diff --git a/src/conductor/asyncio_client/adapters/models/descriptor_adapter.py b/src/conductor/asyncio_client/adapters/models/descriptor_adapter.py index 748edbfa..1e657346 100644 --- a/src/conductor/asyncio_client/adapters/models/descriptor_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/descriptor_adapter.py @@ -9,16 +9,16 @@ class DescriptorAdapter(Descriptor): - containing_type: Optional["DescriptorAdapter"] = Field(default=None, alias="containingType") - enum_types: Optional[List["EnumDescriptorAdapter"]] = Field(default=None, alias="enumTypes") - extensions: Optional[List["FieldDescriptorAdapter"]] = None - fields: Optional[List["FieldDescriptorAdapter"]] = None - file: Optional["FileDescriptorAdapter"] = None - nested_types: Optional[List["DescriptorAdapter"]] = Field(default=None, alias="nestedTypes") - oneofs: Optional[List["OneofDescriptorAdapter"]] = None - options: Optional["MessageOptionsAdapter"] = None - proto: Optional["DescriptorProtoAdapter"] = None - real_oneofs: Optional[List["OneofDescriptorAdapter"]] = Field(default=None, alias="realOneofs") + containing_type: Optional["DescriptorAdapter"] = Field(default=None, alias="containingType") # type: ignore[assignment] + enum_types: Optional[List["EnumDescriptorAdapter"]] = Field(default=None, alias="enumTypes") # type: ignore[assignment] + extensions: Optional[List["FieldDescriptorAdapter"]] = None # type: ignore[assignment] + fields: Optional[List["FieldDescriptorAdapter"]] = None # type: ignore[assignment] + file: Optional["FileDescriptorAdapter"] = None # type: ignore[assignment] + nested_types: Optional[List["DescriptorAdapter"]] = Field(default=None, alias="nestedTypes") # type: ignore[assignment] + oneofs: Optional[List["OneofDescriptorAdapter"]] = None # type: ignore[assignment] + options: Optional["MessageOptionsAdapter"] = None # type: ignore[assignment] + proto: Optional["DescriptorProtoAdapter"] = None # type: ignore[assignment] + real_oneofs: Optional[List["OneofDescriptorAdapter"]] = Field(default=None, alias="realOneofs") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/descriptor_proto_adapter.py b/src/conductor/asyncio_client/adapters/models/descriptor_proto_adapter.py index 7f8761f0..4c52abb0 100644 --- a/src/conductor/asyncio_client/adapters/models/descriptor_proto_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/descriptor_proto_adapter.py @@ -10,59 +10,59 @@ class DescriptorProtoAdapter(DescriptorProto): all_fields: Optional[Dict[str, Dict[str, Any]]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["DescriptorProto"] = Field( + default_instance_for_type: Optional["DescriptorProto"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( + enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="enumTypeList" ) - enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( + enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="enumTypeOrBuilderList" ) - extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( + extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionList" ) - extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( + extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionOrBuilderList" ) - extension_range_list: Optional[List["ExtensionRangeAdapter"]] = Field( + extension_range_list: Optional[List["ExtensionRangeAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionRangeList" ) - extension_range_or_builder_list: Optional[List["ExtensionRangeOrBuilderAdapter"]] = Field( + extension_range_or_builder_list: Optional[List["ExtensionRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionRangeOrBuilderList" ) - field_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( + field_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="fieldList" ) - field_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( + field_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="fieldOrBuilderList" ) - nested_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( + nested_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="nestedTypeList" ) - nested_type_or_builder_list: Optional[List["DescriptorProtoOrBuilderAdapter"]] = Field( + nested_type_or_builder_list: Optional[List["DescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="nestedTypeOrBuilderList" ) - oneof_decl_list: Optional[List["OneofDescriptorProtoAdapter"]] = Field( + oneof_decl_list: Optional[List["OneofDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="oneofDeclList" ) - oneof_decl_or_builder_list: Optional[List["OneofDescriptorProtoOrBuilderAdapter"]] = Field( + oneof_decl_or_builder_list: Optional[List["OneofDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="oneofDeclOrBuilderList" ) options: Optional["MessageOptionsAdapter"] = None - options_or_builder: Optional["MessageOptionsOrBuilderAdapter"] = Field( + options_or_builder: Optional["MessageOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="optionsOrBuilder" ) - reserved_range_list: Optional[List["ReservedRangeAdapter"]] = Field( + reserved_range_list: Optional[List["ReservedRangeAdapter"]] = Field( # type: ignore[assignment] default=None, alias="reservedRangeList" ) - reserved_range_or_builder_list: Optional[List["ReservedRangeOrBuilderAdapter"]] = Field( + reserved_range_or_builder_list: Optional[List["ReservedRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="reservedRangeOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py index 91d4fbf9..e25ae689 100644 --- a/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py @@ -10,55 +10,55 @@ class DescriptorProtoOrBuilderAdapter(DescriptorProtoOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( + enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="enumTypeList" ) - enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( + enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="enumTypeOrBuilderList" ) - extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( + extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionList" ) - extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( + extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionOrBuilderList" ) - extension_range_list: Optional[List["ExtensionRangeAdapter"]] = Field( + extension_range_list: Optional[List["ExtensionRangeAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionRangeList" ) - extension_range_or_builder_list: Optional[List["ExtensionRangeOrBuilderAdapter"]] = Field( + extension_range_or_builder_list: Optional[List["ExtensionRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionRangeOrBuilderList" ) - field_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( + field_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="fieldList" ) - field_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( + field_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="fieldOrBuilderList" ) - nested_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( + nested_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="nestedTypeList" ) - oneof_decl_list: Optional[List["OneofDescriptorProtoAdapter"]] = Field( + oneof_decl_list: Optional[List["OneofDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="oneofDeclList" ) - oneof_decl_or_builder_list: Optional[List["OneofDescriptorProtoOrBuilderAdapter"]] = Field( + oneof_decl_or_builder_list: Optional[List["OneofDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="oneofDeclOrBuilderList" ) - options_or_builder: Optional["MessageOptionsOrBuilderAdapter"] = Field( + options_or_builder: Optional["MessageOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="optionsOrBuilder" ) - reserved_range_list: Optional[List["ReservedRangeAdapter"]] = Field( + reserved_range_list: Optional[List["ReservedRangeAdapter"]] = Field( # type: ignore[assignment] default=None, alias="reservedRangeList" ) - reserved_range_or_builder_list: Optional[List["ReservedRangeOrBuilderAdapter"]] = Field( + reserved_range_or_builder_list: Optional[List["ReservedRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="reservedRangeOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_descriptor_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_descriptor_adapter.py index 4f265294..f142c07e 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_descriptor_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_descriptor_adapter.py @@ -9,11 +9,11 @@ class EnumDescriptorAdapter(EnumDescriptor): - containing_type: Optional["DescriptorAdapter"] = Field(default=None, alias="containingType") - file: Optional["FileDescriptorAdapter"] = None - options: Optional["EnumOptionsAdapter"] = None - proto: Optional["EnumDescriptorProtoAdapter"] = None - values: Optional[List["EnumValueDescriptorAdapter"]] = None + containing_type: Optional["DescriptorAdapter"] = Field(default=None, alias="containingType") # type: ignore[assignment] + file: Optional["FileDescriptorAdapter"] = None # type: ignore[assignment] + options: Optional["EnumOptionsAdapter"] = None # type: ignore[assignment] + proto: Optional["EnumDescriptorProtoAdapter"] = None # type: ignore[assignment] + values: Optional[List["EnumValueDescriptorAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_adapter.py index e1c446b5..a74d690f 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_adapter.py @@ -10,27 +10,27 @@ class EnumDescriptorProtoAdapter(EnumDescriptorProto): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["EnumDescriptorProtoAdapter"] = Field( + default_instance_for_type: Optional["EnumDescriptorProtoAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) options: Optional["EnumOptionsAdapter"] = None - options_or_builder: Optional["EnumOptionsOrBuilderAdapter"] = Field( + options_or_builder: Optional["EnumOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="optionsOrBuilder" ) - reserved_range_list: Optional[List["EnumReservedRangeAdapter"]] = Field( + reserved_range_list: Optional[List["EnumReservedRangeAdapter"]] = Field( # type: ignore[assignment] default=None, alias="reservedRangeList" ) - reserved_range_or_builder_list: Optional[List["EnumReservedRangeOrBuilderAdapter"]] = Field( + reserved_range_or_builder_list: Optional[List["EnumReservedRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="reservedRangeOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") - value_list: Optional[List["EnumValueDescriptorProtoAdapter"]] = Field( + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + value_list: Optional[List["EnumValueDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="valueList" ) - value_or_builder_list: Optional[List["EnumValueDescriptorProtoOrBuilderAdapter"]] = Field( + value_or_builder_list: Optional[List["EnumValueDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="valueOrBuilderList" ) diff --git a/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_or_builder_adapter.py index ab658411..c5a3a57b 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_or_builder_adapter.py @@ -10,27 +10,27 @@ class EnumDescriptorProtoOrBuilderAdapter(EnumDescriptorProtoOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - options: Optional["EnumOptionsAdapter"] = None - options_or_builder: Optional["EnumOptionsOrBuilderAdapter"] = Field( + options: Optional["EnumOptionsAdapter"] = None # type: ignore[assignment] + options_or_builder: Optional["EnumOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="optionsOrBuilder" ) - reserved_range_list: Optional[List["EnumReservedRangeAdapter"]] = Field( + reserved_range_list: Optional[List["EnumReservedRangeAdapter"]] = Field( # type: ignore[assignment] default=None, alias="reservedRangeList" ) - reserved_range_or_builder_list: Optional[List["EnumReservedRangeOrBuilderAdapter"]] = Field( + reserved_range_or_builder_list: Optional[List["EnumReservedRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="reservedRangeOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") - value_list: Optional[List["EnumValueDescriptorProtoAdapter"]] = Field( + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + value_list: Optional[List["EnumValueDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="valueList" ) - value_or_builder_list: Optional[List["EnumValueDescriptorProtoOrBuilderAdapter"]] = Field( + value_or_builder_list: Optional[List["EnumValueDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="valueOrBuilderList" ) diff --git a/src/conductor/asyncio_client/adapters/models/enum_options_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_options_adapter.py index 0b3a3ca9..858d506f 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_options_adapter.py @@ -11,23 +11,23 @@ class EnumOptionsAdapter(EnumOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["EnumOptionsAdapter"] = Field( + default_instance_for_type: Optional["EnumOptionsAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_options_or_builder_adapter.py index 7c8495f0..5ce6490b 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class EnumOptionsOrBuilderAdapter(EnumOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_value_options_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_value_options_adapter.py index 05d9d6c7..6de7507c 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_value_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_value_options_adapter.py @@ -11,23 +11,23 @@ class EnumValueOptionsAdapter(EnumValueOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["EnumValueOptionsAdapter"] = Field( + default_instance_for_type: Optional["EnumValueOptionsAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_value_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_value_options_or_builder_adapter.py index c3369653..54ccbd01 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_value_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_value_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class EnumValueOptionsOrBuilderAdapter(EnumValueOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/environment_variable_adapter.py b/src/conductor/asyncio_client/adapters/models/environment_variable_adapter.py index c969d951..07028025 100644 --- a/src/conductor/asyncio_client/adapters/models/environment_variable_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/environment_variable_adapter.py @@ -8,7 +8,7 @@ class EnvironmentVariableAdapter(EnvironmentVariable): - tags: Optional[List["TagAdapter"]] = None + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/event_handler_adapter.py b/src/conductor/asyncio_client/adapters/models/event_handler_adapter.py index bfea7e00..b98ac1a4 100644 --- a/src/conductor/asyncio_client/adapters/models/event_handler_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/event_handler_adapter.py @@ -8,8 +8,8 @@ class EventHandlerAdapter(EventHandler): - actions: Optional[List["ActionAdapter"]] = None - tags: Optional[List["TagAdapter"]] = None + actions: Optional[List["ActionAdapter"]] = None # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extended_conductor_application_adapter.py b/src/conductor/asyncio_client/adapters/models/extended_conductor_application_adapter.py index 82fa4eed..a5b4b924 100644 --- a/src/conductor/asyncio_client/adapters/models/extended_conductor_application_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extended_conductor_application_adapter.py @@ -8,7 +8,7 @@ class ExtendedConductorApplicationAdapter(ExtendedConductorApplication): - tags: Optional[List["TagAdapter"]] = None + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extended_secret_adapter.py b/src/conductor/asyncio_client/adapters/models/extended_secret_adapter.py index ae4dc880..09b20b5a 100644 --- a/src/conductor/asyncio_client/adapters/models/extended_secret_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extended_secret_adapter.py @@ -8,7 +8,7 @@ class ExtendedSecretAdapter(ExtendedSecret): - tags: Optional[List["TagAdapter"]] = None + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extended_task_def_adapter.py b/src/conductor/asyncio_client/adapters/models/extended_task_def_adapter.py index 640b01f3..c549579a 100644 --- a/src/conductor/asyncio_client/adapters/models/extended_task_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extended_task_def_adapter.py @@ -9,12 +9,12 @@ class ExtendedTaskDefAdapter(ExtendedTaskDef): - input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") + input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") # type: ignore[assignment] input_template: Optional[Dict[str, Any]] = Field(default=None, alias="inputTemplate") - output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") - tags: Optional[List["TagAdapter"]] = None - timeout_seconds: Optional[int] = Field(alias="timeoutSeconds", default=None) - total_timeout_seconds: Optional[int] = Field(alias="totalTimeoutSeconds", default=None) + output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + timeout_seconds: Optional[int] = Field(alias="timeoutSeconds", default=None) # type: ignore[assignment] + total_timeout_seconds: Optional[int] = Field(alias="totalTimeoutSeconds", default=None) # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extended_workflow_def_adapter.py b/src/conductor/asyncio_client/adapters/models/extended_workflow_def_adapter.py index e7f51742..63828f05 100644 --- a/src/conductor/asyncio_client/adapters/models/extended_workflow_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extended_workflow_def_adapter.py @@ -9,17 +9,17 @@ class ExtendedWorkflowDefAdapter(ExtendedWorkflowDef): - input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") + input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") # type: ignore[assignment] input_template: Optional[Dict[str, Any]] = Field(default=None, alias="inputTemplate") output_parameters: Optional[Dict[str, Any]] = Field(default=None, alias="outputParameters") - output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") - rate_limit_config: Optional["RateLimitConfigAdapter"] = Field( + output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") # type: ignore[assignment] + rate_limit_config: Optional["RateLimitConfigAdapter"] = Field( # type: ignore[assignment] default=None, alias="rateLimitConfig" ) - tags: Optional[List["TagAdapter"]] = None - tasks: List["WorkflowTaskAdapter"] + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + tasks: List["WorkflowTaskAdapter"] # type: ignore[assignment] variables: Optional[Dict[str, Any]] = None - timeout_seconds: Optional[int] = Field(default=None, alias="timeoutSeconds") + timeout_seconds: Optional[int] = Field(default=None, alias="timeoutSeconds") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extension_range_options_adapter.py b/src/conductor/asyncio_client/adapters/models/extension_range_options_adapter.py index 5b4b1e96..9fcda2a1 100644 --- a/src/conductor/asyncio_client/adapters/models/extension_range_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extension_range_options_adapter.py @@ -11,26 +11,26 @@ class ExtensionRangeOptionsAdapter(ExtensionRangeOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - declaration_or_builder_list: Optional[List["DeclarationOrBuilderAdapter"]] = Field( + declaration_or_builder_list: Optional[List["DeclarationOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="declarationOrBuilderList" ) - default_instance_for_type: Optional["ExtensionRangeOptionsAdapter"] = Field( + default_instance_for_type: Optional["ExtensionRangeOptionsAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extension_range_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/extension_range_options_or_builder_adapter.py index 23e6411b..1859be85 100644 --- a/src/conductor/asyncio_client/adapters/models/extension_range_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extension_range_options_or_builder_adapter.py @@ -10,29 +10,29 @@ class ExtensionRangeOptionsOrBuilderAdapter(ExtensionRangeOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - declaration_list: Optional[List["DeclarationAdapter"]] = Field( + declaration_list: Optional[List["DeclarationAdapter"]] = Field( # type: ignore[assignment] default=None, alias="declarationList" ) - declaration_or_builder_list: Optional[List["DeclarationOrBuilderAdapter"]] = Field( + declaration_or_builder_list: Optional[List["DeclarationOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="declarationOrBuilderList" ) - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/field_options_adapter.py b/src/conductor/asyncio_client/adapters/models/field_options_adapter.py index a3227776..89fe5202 100644 --- a/src/conductor/asyncio_client/adapters/models/field_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/field_options_adapter.py @@ -11,29 +11,29 @@ class FieldOptionsAdapter(FieldOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["FieldOptionsAdapter"] = Field( + default_instance_for_type: Optional["FieldOptionsAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - edition_defaults_list: Optional[List["EditionDefaultAdapter"]] = Field( + edition_defaults_list: Optional[List["EditionDefaultAdapter"]] = Field( # type: ignore[assignment] default=None, alias="editionDefaultsList" ) - edition_defaults_or_builder_list: Optional[List["EditionDefaultOrBuilderAdapter"]] = Field( + edition_defaults_or_builder_list: Optional[List["EditionDefaultOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="editionDefaultsOrBuilderList" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/field_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/field_options_or_builder_adapter.py index df899eba..3fc8fc51 100644 --- a/src/conductor/asyncio_client/adapters/models/field_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/field_options_or_builder_adapter.py @@ -10,29 +10,29 @@ class FieldOptionsOrBuilderAdapter(FieldOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - edition_defaults_list: Optional[List["EditionDefaultAdapter"]] = Field( + edition_defaults_list: Optional[List["EditionDefaultAdapter"]] = Field( # type: ignore[assignment] default=None, alias="editionDefaultsList" ) - edition_defaults_or_builder_list: Optional[List["EditionDefaultOrBuilderAdapter"]] = Field( + edition_defaults_or_builder_list: Optional[List["EditionDefaultOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="editionDefaultsOrBuilderList" ) - features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/file_descriptor_adapter.py b/src/conductor/asyncio_client/adapters/models/file_descriptor_adapter.py index 381f3ef9..e42265ef 100644 --- a/src/conductor/asyncio_client/adapters/models/file_descriptor_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/file_descriptor_adapter.py @@ -9,17 +9,17 @@ class FileDescriptorAdapter(FileDescriptor): - dependencies: Optional[List["FileDescriptorAdapter"]] = None - enum_types: Optional[List["EnumDescriptorAdapter"]] = Field(default=None, alias="enumTypes") - extensions: Optional[List["FieldDescriptorAdapter"]] = None - file: Optional["FileDescriptorAdapter"] = None - message_types: Optional[List["DescriptorAdapter"]] = Field(default=None, alias="messageTypes") - options: Optional["FileOptionsAdapter"] = None - proto: Optional["FileDescriptorProtoAdapter"] = None - public_dependencies: Optional[List["FileDescriptorAdapter"]] = Field( + dependencies: Optional[List["FileDescriptorAdapter"]] = None # type: ignore[assignment] + enum_types: Optional[List["EnumDescriptorAdapter"]] = Field(default=None, alias="enumTypes") # type: ignore[assignment] + extensions: Optional[List["FieldDescriptorAdapter"]] = None # type: ignore[assignment] + file: Optional["FileDescriptorAdapter"] = None # type: ignore[assignment] + message_types: Optional[List["DescriptorAdapter"]] = Field(default=None, alias="messageTypes") # type: ignore[assignment] + options: Optional["FileOptionsAdapter"] = None # type: ignore[assignment] + proto: Optional["FileDescriptorProtoAdapter"] = None # type: ignore[assignment] + public_dependencies: Optional[List["FileDescriptorAdapter"]] = Field( # type: ignore[assignment] default=None, alias="publicDependencies" ) - services: Optional[List["ServiceDescriptorAdapter"]] = None + services: Optional[List["ServiceDescriptorAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/file_descriptor_proto_adapter.py b/src/conductor/asyncio_client/adapters/models/file_descriptor_proto_adapter.py index c27c7ab9..201a4372 100644 --- a/src/conductor/asyncio_client/adapters/models/file_descriptor_proto_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/file_descriptor_proto_adapter.py @@ -10,47 +10,47 @@ class FileDescriptorProtoAdapter(FileDescriptorProto): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["FileDescriptorProtoAdapter"] = Field( + default_instance_for_type: Optional["FileDescriptorProtoAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( + enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="enumTypeList" ) - enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( + enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="enumTypeOrBuilderList" ) - extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( + extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionList" ) - extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( + extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="extensionOrBuilderList" ) - message_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( + message_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="messageTypeList" ) - message_type_or_builder_list: Optional[List["DescriptorProtoOrBuilderAdapter"]] = Field( + message_type_or_builder_list: Optional[List["DescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="messageTypeOrBuilderList" ) - options: Optional["FileOptionsAdapter"] = None - options_or_builder: Optional["FileOptionsOrBuilderAdapter"] = Field( + options: Optional["FileOptionsAdapter"] = None # type: ignore[assignment] + options_or_builder: Optional["FileOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="optionsOrBuilder" ) - service_list: Optional[List["ServiceDescriptorProtoAdapter"]] = Field( + service_list: Optional[List["ServiceDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="serviceList" ) - service_or_builder_list: Optional[List["ServiceDescriptorProtoOrBuilderAdapter"]] = Field( + service_or_builder_list: Optional[List["ServiceDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="serviceOrBuilderList" ) - source_code_info: Optional["SourceCodeInfoAdapter"] = Field( + source_code_info: Optional["SourceCodeInfoAdapter"] = Field( # type: ignore[assignment] default=None, alias="sourceCodeInfo" ) - source_code_info_or_builder: Optional["SourceCodeInfoOrBuilderAdapter"] = Field( + source_code_info_or_builder: Optional["SourceCodeInfoOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="sourceCodeInfoOrBuilder" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/file_options_adapter.py b/src/conductor/asyncio_client/adapters/models/file_options_adapter.py index 211a7619..9f9c21c9 100644 --- a/src/conductor/asyncio_client/adapters/models/file_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/file_options_adapter.py @@ -11,23 +11,23 @@ class FileOptionsAdapter(FileOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["FileOptionsAdapter"] = Field( + default_instance_for_type: Optional["FileOptionsAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/file_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/file_options_or_builder_adapter.py index d7d7bad2..e5c7e680 100644 --- a/src/conductor/asyncio_client/adapters/models/file_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/file_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class FileOptionsOrBuilderAdapter(FileOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/granted_access_response_adapter.py b/src/conductor/asyncio_client/adapters/models/granted_access_response_adapter.py index 08526c8c..d954f0cc 100644 --- a/src/conductor/asyncio_client/adapters/models/granted_access_response_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/granted_access_response_adapter.py @@ -9,7 +9,7 @@ class GrantedAccessResponseAdapter(GrantedAccessResponse): - granted_access: Optional[List["GrantedAccessAdapter"]] = Field( + granted_access: Optional[List["GrantedAccessAdapter"]] = Field( # type: ignore[assignment] default=None, alias="grantedAccess" ) diff --git a/src/conductor/asyncio_client/adapters/models/group_adapter.py b/src/conductor/asyncio_client/adapters/models/group_adapter.py index e378a20d..f7c19fda 100644 --- a/src/conductor/asyncio_client/adapters/models/group_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/group_adapter.py @@ -9,7 +9,7 @@ class GroupAdapter(Group): - roles: Optional[List["RoleAdapter"]] = None + roles: Optional[List["RoleAdapter"]] = None # type: ignore[assignment] @field_validator("default_access") def default_access_validate_enum(cls, value): diff --git a/src/conductor/asyncio_client/adapters/models/integration_adapter.py b/src/conductor/asyncio_client/adapters/models/integration_adapter.py index c10b1b34..53291829 100644 --- a/src/conductor/asyncio_client/adapters/models/integration_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/integration_adapter.py @@ -9,9 +9,9 @@ class IntegrationAdapter(Integration): - apis: Optional[List["IntegrationApiAdapter"]] = None + apis: Optional[List["IntegrationApiAdapter"]] = None # type: ignore[assignment] configuration: Optional[Dict[str, Any]] = None - tags: Optional[List["TagAdapter"]] = None + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] @field_validator("category") def category_validate_enum(cls, value): diff --git a/src/conductor/asyncio_client/adapters/models/integration_api_adapter.py b/src/conductor/asyncio_client/adapters/models/integration_api_adapter.py index c39911b5..f0bab337 100644 --- a/src/conductor/asyncio_client/adapters/models/integration_api_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/integration_api_adapter.py @@ -9,7 +9,7 @@ class IntegrationApiAdapter(IntegrationApi): configuration: Optional[Dict[str, Any]] = None - tags: Optional[List["TagAdapter"]] = None + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/integration_def_adapter.py b/src/conductor/asyncio_client/adapters/models/integration_def_adapter.py index 192cacbe..7c862be4 100644 --- a/src/conductor/asyncio_client/adapters/models/integration_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/integration_def_adapter.py @@ -9,7 +9,7 @@ class IntegrationDefAdapter(IntegrationDef): - configuration: Optional[List["IntegrationDefFormFieldAdapter"]] = None + configuration: Optional[List["IntegrationDefFormFieldAdapter"]] = None # type: ignore[assignment] @field_validator("category") def category_validate_enum(cls, value): diff --git a/src/conductor/asyncio_client/adapters/models/integration_def_form_field_adapter.py b/src/conductor/asyncio_client/adapters/models/integration_def_form_field_adapter.py index d10cf6cd..c8976c2b 100644 --- a/src/conductor/asyncio_client/adapters/models/integration_def_form_field_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/integration_def_form_field_adapter.py @@ -9,8 +9,8 @@ class IntegrationDefFormFieldAdapter(IntegrationDefFormField): - value_options: Optional[List["OptionAdapter"]] = Field(default=None, alias="valueOptions") - depends_on: Optional[List["IntegrationDefFormFieldAdapter"]] = Field( + value_options: Optional[List["OptionAdapter"]] = Field(default=None, alias="valueOptions") # type: ignore[assignment] + depends_on: Optional[List["IntegrationDefFormFieldAdapter"]] = Field( # type: ignore[assignment] default=None, alias="dependsOn" ) __properties: ClassVar[List[str]] = [ diff --git a/src/conductor/asyncio_client/adapters/models/message_options_adapter.py b/src/conductor/asyncio_client/adapters/models/message_options_adapter.py index ad6a528b..8becbfb1 100644 --- a/src/conductor/asyncio_client/adapters/models/message_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/message_options_adapter.py @@ -11,23 +11,23 @@ class MessageOptionsAdapter(MessageOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["MessageOptionsAdapter"] = Field( + default_instance_for_type: Optional["MessageOptionsAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/message_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/message_options_or_builder_adapter.py index 1f4872b8..926883bb 100644 --- a/src/conductor/asyncio_client/adapters/models/message_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/message_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class MessageOptionsOrBuilderAdapter(MessageOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/message_template_adapter.py b/src/conductor/asyncio_client/adapters/models/message_template_adapter.py index 9e281cd3..a7574c12 100644 --- a/src/conductor/asyncio_client/adapters/models/message_template_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/message_template_adapter.py @@ -8,7 +8,7 @@ class MessageTemplateAdapter(MessageTemplate): - tags: Optional[List["TagAdapter"]] = None + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/method_options_adapter.py b/src/conductor/asyncio_client/adapters/models/method_options_adapter.py index e58fa3b6..7d8c6b25 100644 --- a/src/conductor/asyncio_client/adapters/models/method_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/method_options_adapter.py @@ -11,23 +11,23 @@ class MethodOptionsAdapter(MethodOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["MethodOptionsAdapter"] = Field( + default_instance_for_type: Optional["MethodOptionsAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/method_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/method_options_or_builder_adapter.py index 10d73e46..bf138329 100644 --- a/src/conductor/asyncio_client/adapters/models/method_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/method_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class MethodOptionsOrBuilderAdapter(MethodOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/oneof_options_adapter.py b/src/conductor/asyncio_client/adapters/models/oneof_options_adapter.py index 63779f55..cd7c36b1 100644 --- a/src/conductor/asyncio_client/adapters/models/oneof_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/oneof_options_adapter.py @@ -11,23 +11,23 @@ class OneofOptionsAdapter(OneofOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["OneofOptionsAdapter"] = Field( + default_instance_for_type: Optional["OneofOptionsAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/oneof_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/oneof_options_or_builder_adapter.py index 172a7759..e106b69c 100644 --- a/src/conductor/asyncio_client/adapters/models/oneof_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/oneof_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class OneofOptionsOrBuilderAdapter(OneofOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/role_adapter.py b/src/conductor/asyncio_client/adapters/models/role_adapter.py index a9d30cce..6870ea85 100644 --- a/src/conductor/asyncio_client/adapters/models/role_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/role_adapter.py @@ -8,7 +8,7 @@ class RoleAdapter(Role): - permissions: Optional[List["PermissionAdapter"]] = None + permissions: Optional[List["PermissionAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/scrollable_search_result_workflow_summary_adapter.py b/src/conductor/asyncio_client/adapters/models/scrollable_search_result_workflow_summary_adapter.py index 49351bb4..349a0654 100644 --- a/src/conductor/asyncio_client/adapters/models/scrollable_search_result_workflow_summary_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/scrollable_search_result_workflow_summary_adapter.py @@ -8,7 +8,7 @@ class ScrollableSearchResultWorkflowSummaryAdapter(ScrollableSearchResultWorkflowSummary): - results: Optional[List["WorkflowSummaryAdapter"]] = None + results: Optional[List["WorkflowSummaryAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/search_result_handled_event_response_adapter.py b/src/conductor/asyncio_client/adapters/models/search_result_handled_event_response_adapter.py index c2c012ed..fde3d631 100644 --- a/src/conductor/asyncio_client/adapters/models/search_result_handled_event_response_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/search_result_handled_event_response_adapter.py @@ -8,7 +8,7 @@ class SearchResultHandledEventResponseAdapter(SearchResultHandledEventResponse): - results: Optional[List["HandledEventResponseAdapter"]] = None + results: Optional[List["HandledEventResponseAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/search_result_task_summary_adapter.py b/src/conductor/asyncio_client/adapters/models/search_result_task_summary_adapter.py index 3629ba0c..82078cef 100644 --- a/src/conductor/asyncio_client/adapters/models/search_result_task_summary_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/search_result_task_summary_adapter.py @@ -8,7 +8,7 @@ class SearchResultTaskSummaryAdapter(SearchResultTaskSummary): - results: Optional[List["TaskSummaryAdapter"]] = None + results: Optional[List["TaskSummaryAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/search_result_workflow_schedule_execution_model_adapter.py b/src/conductor/asyncio_client/adapters/models/search_result_workflow_schedule_execution_model_adapter.py index 6a174a11..a81255f8 100644 --- a/src/conductor/asyncio_client/adapters/models/search_result_workflow_schedule_execution_model_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/search_result_workflow_schedule_execution_model_adapter.py @@ -10,7 +10,7 @@ class SearchResultWorkflowScheduleExecutionModelAdapter(SearchResultWorkflowScheduleExecutionModel): - results: Optional[List["WorkflowScheduleExecutionModelAdapter"]] = None + results: Optional[List["WorkflowScheduleExecutionModelAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py b/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py index c58e6aba..600f9524 100644 --- a/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py @@ -8,10 +8,10 @@ class ServiceDescriptorAdapter(ServiceDescriptor): - file: Optional["FileDescriptorAdapter"] = None - methods: Optional[List["MethodDescriptorAdapter"]] = None - options: Optional["ServiceOptionsAdapter"] = None - proto: Optional["ServiceDescriptorProtoAdapter"] = None + file: Optional["FileDescriptorAdapter"] = None # type: ignore[assignment] + methods: Optional[List["MethodDescriptorAdapter"]] = None # type: ignore[assignment] + options: Optional["ServiceOptionsAdapter"] = None # type: ignore[assignment] + proto: Optional["ServiceDescriptorProtoAdapter"] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_adapter.py b/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_adapter.py index 808e1526..d8f2981c 100644 --- a/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_adapter.py @@ -10,23 +10,23 @@ class ServiceDescriptorProtoAdapter(ServiceDescriptorProto): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["ServiceDescriptorProtoAdapter"] = Field( + default_instance_for_type: Optional["ServiceDescriptorProtoAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - method_list: Optional[List["MethodDescriptorProtoAdapter"]] = Field( + method_list: Optional[List["MethodDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="methodList" ) - method_or_builder_list: Optional[List["MethodDescriptorProtoOrBuilderAdapter"]] = Field( + method_or_builder_list: Optional[List["MethodDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="methodOrBuilderList" ) - options: Optional["ServiceOptionsAdapter"] = None - options_or_builder: Optional["ServiceOptionsOrBuilderAdapter"] = Field( + options: Optional["ServiceOptionsAdapter"] = None # type: ignore[assignment] + options_or_builder: Optional["ServiceOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="optionsOrBuilder" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_or_builder_adapter.py index ffe2a434..a2d9f855 100644 --- a/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_or_builder_adapter.py @@ -10,23 +10,23 @@ class ServiceDescriptorProtoOrBuilderAdapter(ServiceDescriptorProtoOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - method_list: Optional[List["MethodDescriptorProtoAdapter"]] = Field( + method_list: Optional[List["MethodDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] default=None, alias="methodList" ) - method_or_builder_list: Optional[List["MethodDescriptorProtoOrBuilderAdapter"]] = Field( + method_or_builder_list: Optional[List["MethodDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="methodOrBuilderList" ) - options: Optional["ServiceOptionsAdapter"] = None - options_or_builder: Optional["ServiceOptionsOrBuilderAdapter"] = Field( + options: Optional["ServiceOptionsAdapter"] = None # type: ignore[assignment] + options_or_builder: Optional["ServiceOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="optionsOrBuilder" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_options_adapter.py b/src/conductor/asyncio_client/adapters/models/service_options_adapter.py index 41197a45..6afe75a7 100644 --- a/src/conductor/asyncio_client/adapters/models/service_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_options_adapter.py @@ -11,23 +11,23 @@ class ServiceOptionsAdapter(ServiceOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["ServiceOptionsAdapter"] = Field( + default_instance_for_type: Optional["ServiceOptionsAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/service_options_or_builder_adapter.py index 8fe0569b..c72fe67c 100644 --- a/src/conductor/asyncio_client/adapters/models/service_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class ServiceOptionsOrBuilderAdapter(ServiceOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") + Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/source_code_info_adapter.py b/src/conductor/asyncio_client/adapters/models/source_code_info_adapter.py index 4025cdd1..181d8f22 100644 --- a/src/conductor/asyncio_client/adapters/models/source_code_info_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/source_code_info_adapter.py @@ -10,17 +10,17 @@ class SourceCodeInfoAdapter(SourceCodeInfo): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["SourceCodeInfoAdapter"] = Field( + default_instance_for_type: Optional["SourceCodeInfoAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - location_list: Optional[List["LocationAdapter"]] = Field(default=None, alias="locationList") - location_or_builder_list: Optional[List["LocationOrBuilderAdapter"]] = Field( + location_list: Optional[List["LocationAdapter"]] = Field(default=None, alias="locationList") # type: ignore[assignment] + location_or_builder_list: Optional[List["LocationOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="locationOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/source_code_info_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/source_code_info_or_builder_adapter.py index e2d2c6fa..d7b9b98f 100644 --- a/src/conductor/asyncio_client/adapters/models/source_code_info_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/source_code_info_or_builder_adapter.py @@ -10,17 +10,17 @@ class SourceCodeInfoOrBuilderAdapter(SourceCodeInfoOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - location_list: Optional[List["LocationAdapter"]] = Field(default=None, alias="locationList") - location_or_builder_list: Optional[List["LocationOrBuilderAdapter"]] = Field( + location_list: Optional[List["LocationAdapter"]] = Field(default=None, alias="locationList") # type: ignore[assignment] + location_or_builder_list: Optional[List["LocationOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="locationOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/task_def_adapter.py b/src/conductor/asyncio_client/adapters/models/task_def_adapter.py index 71afa28e..915ff1db 100644 --- a/src/conductor/asyncio_client/adapters/models/task_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/task_def_adapter.py @@ -9,11 +9,11 @@ class TaskDefAdapter(TaskDef): - input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") + input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") # type: ignore[assignment] input_template: Optional[Dict[str, Any]] = Field(default=None, alias="inputTemplate") - output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") - timeout_seconds: Optional[int] = Field(alias="timeoutSeconds", default=None) - total_timeout_seconds: Optional[int] = Field(alias="totalTimeoutSeconds", default=None) + output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") # type: ignore[assignment] + timeout_seconds: Optional[int] = Field(alias="timeoutSeconds", default=None) # type: ignore[assignment] + total_timeout_seconds: Optional[int] = Field(alias="totalTimeoutSeconds", default=None) # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/task_result_adapter.py b/src/conductor/asyncio_client/adapters/models/task_result_adapter.py index c2816664..286aba85 100644 --- a/src/conductor/asyncio_client/adapters/models/task_result_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/task_result_adapter.py @@ -9,7 +9,7 @@ class TaskResultAdapter(TaskResult): - logs: Optional[List["TaskExecLogAdapter"]] = None + logs: Optional[List["TaskExecLogAdapter"]] = None # type: ignore[assignment] output_data: Optional[Dict[str, Any]] = Field(default=None, alias="outputData") @classmethod diff --git a/src/conductor/asyncio_client/adapters/models/uninterpreted_option_adapter.py b/src/conductor/asyncio_client/adapters/models/uninterpreted_option_adapter.py index c767d5f0..da41ccab 100644 --- a/src/conductor/asyncio_client/adapters/models/uninterpreted_option_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/uninterpreted_option_adapter.py @@ -10,17 +10,17 @@ class UninterpretedOptionAdapter(UninterpretedOption): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["UninterpretedOptionAdapter"] = Field( + default_instance_for_type: Optional["UninterpretedOptionAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - name_list: Optional[List["NamePartAdapter"]] = Field(default=None, alias="nameList") - name_or_builder_list: Optional[List["NamePartOrBuilderAdapter"]] = Field( + name_list: Optional[List["NamePartAdapter"]] = Field(default=None, alias="nameList") # type: ignore[assignment] + name_or_builder_list: Optional[List["NamePartOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="nameOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/uninterpreted_option_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/uninterpreted_option_or_builder_adapter.py index 5ab915d8..68ed98d2 100644 --- a/src/conductor/asyncio_client/adapters/models/uninterpreted_option_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/uninterpreted_option_or_builder_adapter.py @@ -10,17 +10,17 @@ class UninterpretedOptionOrBuilderAdapter(UninterpretedOptionOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( + default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( + descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] default=None, alias="descriptorForType" ) - name_list: Optional[List["NamePartAdapter"]] = Field(default=None, alias="nameList") - name_or_builder_list: Optional[List["NamePartOrBuilderAdapter"]] = Field( + name_list: Optional[List["NamePartAdapter"]] = Field(default=None, alias="nameList") # type: ignore[assignment] + name_or_builder_list: Optional[List["NamePartOrBuilderAdapter"]] = Field( # type: ignore[assignment] default=None, alias="nameOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/webhook_config_adapter.py b/src/conductor/asyncio_client/adapters/models/webhook_config_adapter.py index 48831d7a..58bb8077 100644 --- a/src/conductor/asyncio_client/adapters/models/webhook_config_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/webhook_config_adapter.py @@ -9,8 +9,8 @@ class WebhookConfigAdapter(WebhookConfig): - tags: Optional[List["TagAdapter"]] = None - webhook_execution_history: Optional[List["WebhookExecutionHistoryAdapter"]] = Field( + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + webhook_execution_history: Optional[List["WebhookExecutionHistoryAdapter"]] = Field( # type: ignore[assignment] default=None, alias="webhookExecutionHistory" ) workflows_to_start: Optional[Dict[str, Any]] = Field(default=None, alias="workflowsToStart") diff --git a/src/conductor/asyncio_client/adapters/models/workflow_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_adapter.py index c2afe942..f59230e2 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_adapter.py @@ -15,11 +15,11 @@ class WorkflowAdapter(Workflow): input: Optional[Dict[str, Any]] = None output: Optional[Dict[str, Any]] = None variables: Optional[Dict[str, Any]] = None - workflow_definition: Optional["WorkflowDefAdapter"] = Field( + workflow_definition: Optional["WorkflowDefAdapter"] = Field( # type: ignore[assignment] default=None, alias="workflowDefinition" ) - tasks: Optional[List["TaskAdapter"]] = None - history: Optional[List["WorkflowAdapter"]] = None + tasks: Optional[List["TaskAdapter"]] = None # type: ignore[assignment] + history: Optional[List["WorkflowAdapter"]] = None # type: ignore[assignment] def is_completed(self) -> bool: """Checks if the workflow has completed diff --git a/src/conductor/asyncio_client/adapters/models/workflow_def_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_def_adapter.py index 89e91aef..672e74a2 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_def_adapter.py @@ -13,14 +13,14 @@ class WorkflowDefAdapter(WorkflowDef): output_parameters: Optional[Dict[str, Any]] = Field(default=None, alias="outputParameters") variables: Optional[Dict[str, Any]] = None metadata: Optional[Dict[str, Any]] = None - tasks: List["WorkflowTaskAdapter"] + tasks: List["WorkflowTaskAdapter"] # type: ignore[assignment] schema_version: Optional[int] = Field(default=None, alias="schemaVersion") - output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") - input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") - rate_limit_config: Optional["RateLimitConfigAdapter"] = Field( + output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") # type: ignore[assignment] + input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") # type: ignore[assignment] + rate_limit_config: Optional["RateLimitConfigAdapter"] = Field( # type: ignore[assignment] default=None, alias="rateLimitConfig" ) - timeout_seconds: Optional[int] = Field(default=None, alias="timeoutSeconds") + timeout_seconds: Optional[int] = Field(default=None, alias="timeoutSeconds") # type: ignore[assignment] __properties: ClassVar[List[str]] = [ "createTime", diff --git a/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py index fe4c2003..80fecc01 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py @@ -10,7 +10,7 @@ class WorkflowRunAdapter(WorkflowRun): input: Optional[Dict[str, Any]] = None output: Optional[Dict[str, Any]] = None - tasks: Optional[List["TaskAdapter"]] = None + tasks: Optional[List["TaskAdapter"]] = None # type: ignore[assignment] variables: Optional[Dict[str, Any]] = None @property diff --git a/src/conductor/asyncio_client/adapters/models/workflow_schedule_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_schedule_adapter.py index f6ec6376..06662bf8 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_schedule_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_schedule_adapter.py @@ -12,7 +12,7 @@ class WorkflowScheduleAdapter(WorkflowSchedule): start_workflow_request: Optional["StartWorkflowRequestAdapter"] = Field( # type: ignore[override] default=None, alias="startWorkflowRequest" ) - tags: Optional[List["TagAdapter"]] = None + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/workflow_schedule_model_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_schedule_model_adapter.py index 635843c8..2d588eb4 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_schedule_model_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_schedule_model_adapter.py @@ -12,7 +12,7 @@ class WorkflowScheduleModelAdapter(WorkflowScheduleModel): start_workflow_request: Optional["StartWorkflowRequestAdapter"] = Field( # type: ignore[override] default=None, alias="startWorkflowRequest" ) - tags: Optional[List["TagAdapter"]] = None + tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/workflow_task_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_task_adapter.py index c7460229..69eaa56b 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_task_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_task_adapter.py @@ -9,19 +9,19 @@ class WorkflowTaskAdapter(WorkflowTask): - cache_config: Optional["CacheConfigAdapter"] = Field(default=None, alias="cacheConfig") - default_case: Optional[List["WorkflowTaskAdapter"]] = Field(default=None, alias="defaultCase") - fork_tasks: Optional[List[List["WorkflowTaskAdapter"]]] = Field(default=None, alias="forkTasks") + cache_config: Optional["CacheConfigAdapter"] = Field(default=None, alias="cacheConfig") # type: ignore[assignment] + default_case: Optional[List["WorkflowTaskAdapter"]] = Field(default=None, alias="defaultCase") # type: ignore[assignment] + fork_tasks: Optional[List[List["WorkflowTaskAdapter"]]] = Field(default=None, alias="forkTasks") # type: ignore[assignment] input_parameters: Optional[Dict[str, Any]] = Field(default=None, alias="inputParameters") - loop_over: Optional[List["WorkflowTaskAdapter"]] = Field(default=None, alias="loopOver") - on_state_change: Optional[Dict[str, List["StateChangeEventAdapter"]]] = Field( + loop_over: Optional[List["WorkflowTaskAdapter"]] = Field(default=None, alias="loopOver") # type: ignore[assignment] + on_state_change: Optional[Dict[str, List["StateChangeEventAdapter"]]] = Field( # type: ignore[assignment] default=None, alias="onStateChange" ) - sub_workflow_param: Optional["SubWorkflowParamsAdapter"] = Field( + sub_workflow_param: Optional["SubWorkflowParamsAdapter"] = Field( # type: ignore[assignment] default=None, alias="subWorkflowParam" ) - task_definition: Optional["TaskDefAdapter"] = Field(default=None, alias="taskDefinition") - decision_cases: Optional[Dict[str, List["WorkflowTaskAdapter"]]] = Field( + task_definition: Optional["TaskDefAdapter"] = Field(default=None, alias="taskDefinition") # type: ignore[assignment] + decision_cases: Optional[Dict[str, List["WorkflowTaskAdapter"]]] = Field( # type: ignore[assignment] default=None, alias="decisionCases" ) diff --git a/src/conductor/asyncio_client/adapters/models/workflow_test_request_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_test_request_adapter.py index f76939f5..823ff8b8 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_test_request_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_test_request_adapter.py @@ -10,13 +10,13 @@ class WorkflowTestRequestAdapter(WorkflowTestRequest): input: Optional[Dict[str, Any]] = None - sub_workflow_test_request: Optional[Dict[str, "WorkflowTestRequestAdapter"]] = Field( + sub_workflow_test_request: Optional[Dict[str, "WorkflowTestRequestAdapter"]] = Field( # type: ignore[assignment] default=None, alias="subWorkflowTestRequest" ) - task_ref_to_mock_output: Optional[Dict[str, List["TaskMockAdapter"]]] = Field( + task_ref_to_mock_output: Optional[Dict[str, List["TaskMockAdapter"]]] = Field( # type: ignore[assignment] default=None, alias="taskRefToMockOutput" ) - workflow_def: Optional["WorkflowDefAdapter"] = Field(default=None, alias="workflowDef") + workflow_def: Optional["WorkflowDefAdapter"] = Field(default=None, alias="workflowDef") # type: ignore[assignment] priority: Optional[int] = Field(default=None, alias="priority") @classmethod diff --git a/src/conductor/asyncio_client/adapters/utils.py b/src/conductor/asyncio_client/adapters/utils.py index 9a19ef00..252df233 100644 --- a/src/conductor/asyncio_client/adapters/utils.py +++ b/src/conductor/asyncio_client/adapters/utils.py @@ -2,7 +2,7 @@ Utility functions for converting between generated models and adapters. """ -from typing import List, TypeVar, Type, Any, Dict +from typing import List, TypeVar, Type, Any from pydantic import BaseModel T = TypeVar("T", bound=BaseModel) @@ -34,19 +34,3 @@ def convert_to_adapter(item: Any, adapter_class: Type[T]) -> T: Adapter instance """ return adapter_class.model_validate(item.model_dump()) - - -def convert_dict_to_adapter( - input_dict: Dict[str, List[Any]], adapter_class: Type[T] -) -> Dict[str, List[T]]: - """ - Convert a dictionary of model lists to a dictionary of adapter lists. - - Args: - input_dict: Dictionary mapping string keys to lists of model instances - adapter_class: The adapter class to convert to - - Returns: - Dictionary mapping string keys to lists of adapter instances - """ - return {key: convert_list_to_adapter(items, adapter_class) for key, items in input_dict.items()} diff --git a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py index 1b0a8a70..a332ad08 100644 --- a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py @@ -34,6 +34,7 @@ ) from conductor.asyncio_client.configuration.configuration import Configuration from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient +from conductor.client.orkes.models.access_key import AccessKey class OrkesAuthorizationClient(OrkesBaseClient): @@ -199,15 +200,15 @@ async def get_application_tags(self, application_id: str) -> List[TagAdapter]: async def delete_application_tags(self, tags: List[TagAdapter], application_id: str): await self.application_api.delete_tag_for_application(application_id, tags) - async def create_access_key(self, application_id: str) -> object: + async def create_access_key(self, application_id: str) -> AccessKey: key_obj = await self.application_api.create_access_key(application_id) return key_obj - async def get_access_keys(self, application_id: str) -> object: + async def get_access_keys(self, application_id: str) -> List[AccessKey]: access_keys_obj = await self.application_api.get_access_keys(application_id) - return access_keys_obj + return list(access_keys_obj) - async def toggle_access_key_status(self, application_id: str, key_id: str) -> object: + async def toggle_access_key_status(self, application_id: str, key_id: str) -> AccessKey: key_obj = await self.application_api.toggle_access_key_status(application_id, key_id) return key_obj diff --git a/src/conductor/asyncio_client/orkes/orkes_metadata_client.py b/src/conductor/asyncio_client/orkes/orkes_metadata_client.py index e8af757f..2bce4de0 100644 --- a/src/conductor/asyncio_client/orkes/orkes_metadata_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_metadata_client.py @@ -33,7 +33,7 @@ async def unregister_task_def(self, task_type: str) -> None: """Unregister a task definition""" await self.metadata_api.unregister_task_def(task_type) - async def get_task_def(self, task_type: str) -> object: + async def get_task_def(self, task_type: str) -> TaskDefAdapter: """Get a task definition by task type""" return await self.metadata_api.get_task_def(task_type) diff --git a/src/conductor/asyncio_client/orkes/orkes_secret_client.py b/src/conductor/asyncio_client/orkes/orkes_secret_client.py index 44b7c0bf..d465824a 100644 --- a/src/conductor/asyncio_client/orkes/orkes_secret_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_secret_client.py @@ -26,7 +26,7 @@ async def delete_secret(self, key: str) -> object: """Delete a secret by key""" return await self.secret_api.delete_secret(key) - async def secret_exists(self, key: str) -> object: + async def secret_exists(self, key: str) -> bool: """Check if a secret exists by key""" return await self.secret_api.secret_exists(key) @@ -76,6 +76,6 @@ async def update_secret(self, key: str, secret: str) -> object: """Alias for put_secret for consistency with other clients""" return await self.put_secret(key, secret) - async def has_secret(self, key: str) -> object: + async def has_secret(self, key: str) -> bool: """Alias for secret_exists for consistency""" return await self.secret_exists(key) diff --git a/tests/unit/orkes/test_async_metadata_client.py b/tests/unit/orkes/test_async_metadata_client.py index 4b368f94..50d59101 100644 --- a/tests/unit/orkes/test_async_metadata_client.py +++ b/tests/unit/orkes/test_async_metadata_client.py @@ -6,7 +6,7 @@ from conductor.asyncio_client.adapters.api.metadata_resource_api import ( MetadataResourceApiAdapter, ) -from conductor.asyncio_client.adapters.api.tags_api import TagsApiAdapter +from conductor.asyncio_client.adapters.api.tags_api import TagsApi from conductor.asyncio_client.adapters.models.extended_task_def_adapter import ( ExtendedTaskDefAdapter, ) @@ -90,7 +90,7 @@ def test_init(metadata_client): message = "metadata_api is not of type MetadataResourceApiAdapter" assert isinstance(metadata_client.metadata_api, MetadataResourceApiAdapter), message message = "tags_api is not of type TagsApi" - assert isinstance(metadata_client.tags_api, TagsApiAdapter), message + assert isinstance(metadata_client.tags_api, TagsApi), message @pytest.mark.asyncio From 7a6361cfd2a9342f5950b2e17b014ea349466f9b Mon Sep 17 00:00:00 2001 From: IgorChvyrov-sm Date: Wed, 29 Oct 2025 15:37:03 +0300 Subject: [PATCH 15/17] Revert "Fixed mypy using facade pattern on adapters level" This reverts commit 2563ffcb9bfc4ea4deb350c0a47dbf0540f091a5. --- .../adapters/api/group_resource_api.py | 199 +----------------- .../asyncio_client/adapters/utils.py | 36 ---- .../orkes/orkes_authorization_client.py | 5 +- 3 files changed, 10 insertions(+), 230 deletions(-) delete mode 100644 src/conductor/asyncio_client/adapters/utils.py diff --git a/src/conductor/asyncio_client/adapters/api/group_resource_api.py b/src/conductor/asyncio_client/adapters/api/group_resource_api.py index ced755cc..d4ef7193 100644 --- a/src/conductor/asyncio_client/adapters/api/group_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/group_resource_api.py @@ -4,24 +4,15 @@ from pydantic import Field, StrictFloat, StrictInt, StrictStr -from conductor.asyncio_client.adapters.models.granted_access_response_adapter import ( - GrantedAccessResponseAdapter, -) from conductor.asyncio_client.adapters.models.group_adapter import GroupAdapter from conductor.asyncio_client.adapters.models.upsert_group_request_adapter import ( UpsertGroupRequestAdapter, ) from conductor.asyncio_client.http.api import GroupResourceApi -from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter - -class GroupResourceApiAdapter: - """Adapter for GroupResourceApi that converts between generated models and adapters.""" - def __init__(self, api_client): - self._api = GroupResourceApi(api_client) - - async def list_groups( +class GroupResourceApiAdapter(GroupResourceApi): + async def list_groups( # type: ignore[override] self, _request_timeout: Union[ None, @@ -33,15 +24,14 @@ async def list_groups( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[GroupAdapter]: - """List all groups, returning GroupAdapter instances.""" - result = await self._api.list_groups( + result = await super().list_groups( _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return convert_list_to_adapter(result, GroupAdapter) + return result # type: ignore[return-value] async def get_group( self, @@ -56,8 +46,7 @@ async def get_group( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> GroupAdapter: - """Get a group by ID, returning a GroupAdapter instance.""" - result = await self._api.get_group( + result = await super().get_group( id, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -65,12 +54,12 @@ async def get_group( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, GroupAdapter) + return result # type: ignore[return-value] async def upsert_group( self, id: StrictStr, - upsert_group_request: UpsertGroupRequestAdapter, + upsert_group_request: UpsertGroupRequestAdapter, # type: ignore[override] _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -81,8 +70,7 @@ async def upsert_group( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> GroupAdapter: - """Create or update a group, returning a GroupAdapter instance.""" - result = await self._api.upsert_group( + result = await super().upsert_group( id, upsert_group_request, _request_timeout=_request_timeout, @@ -91,174 +79,5 @@ async def upsert_group( _headers=_headers, _host_index=_host_index, ) - return convert_to_adapter(result, GroupAdapter) - - async def delete_group( - self, - id: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Delete a group by ID.""" - await self._api.delete_group( - id, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - async def add_user_to_group( - self, - group_id: StrictStr, - user_id: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Add a user to a group.""" - return await self._api.add_user_to_group( - group_id, - user_id, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def remove_user_from_group( - self, - group_id: StrictStr, - user_id: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Remove a user from a group.""" - return await self._api.remove_user_from_group( - group_id, - user_id, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def add_users_to_group( - self, - group_id: StrictStr, - request_body: List[StrictStr], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Add multiple users to a group.""" - await self._api.add_users_to_group( - group_id, - request_body, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def remove_users_from_group( - self, - group_id: StrictStr, - request_body: List[StrictStr], - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> None: - """Remove multiple users from a group.""" - await self._api.remove_users_from_group( - group_id, - request_body, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def get_users_in_group( - self, - id: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> object: - """Get users in a group.""" - return await self._api.get_users_in_group( - id, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - - async def get_granted_permissions1( - self, - group_id: StrictStr, - _request_timeout: Union[ - None, - Annotated[StrictFloat, Field(gt=0)], - Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]], - ] = None, - _request_auth: Optional[Dict[StrictStr, Any]] = None, - _content_type: Optional[StrictStr] = None, - _headers: Optional[Dict[StrictStr, Any]] = None, - _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> GrantedAccessResponseAdapter: - """Get granted permissions for a group.""" - result = await self._api.get_granted_permissions1( - group_id, - _request_timeout=_request_timeout, - _request_auth=_request_auth, - _content_type=_content_type, - _headers=_headers, - _host_index=_host_index, - ) - return convert_to_adapter(result, GrantedAccessResponseAdapter) + return result # type: ignore[return-value] diff --git a/src/conductor/asyncio_client/adapters/utils.py b/src/conductor/asyncio_client/adapters/utils.py deleted file mode 100644 index 252df233..00000000 --- a/src/conductor/asyncio_client/adapters/utils.py +++ /dev/null @@ -1,36 +0,0 @@ -""" -Utility functions for converting between generated models and adapters. -""" - -from typing import List, TypeVar, Type, Any -from pydantic import BaseModel - -T = TypeVar("T", bound=BaseModel) - - -def convert_list_to_adapter(items: List[Any], adapter_class: Type[T]) -> List[T]: - """ - Convert a list of generated models to a list of adapters. - - Args: - items: List of generated model instances - adapter_class: The adapter class to convert to - - Returns: - List of adapter instances - """ - return [adapter_class.model_validate(item.model_dump()) for item in items] - - -def convert_to_adapter(item: Any, adapter_class: Type[T]) -> T: - """ - Convert a single generated model to an adapter. - - Args: - item: Generated model instance - adapter_class: The adapter class to convert to - - Returns: - Adapter instance - """ - return adapter_class.model_validate(item.model_dump()) diff --git a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py index a332ad08..33bdcedf 100644 --- a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py @@ -18,9 +18,6 @@ from conductor.asyncio_client.adapters.models.granted_access_adapter import ( GrantedAccessAdapter as GrantedAccess, ) -from conductor.asyncio_client.adapters.models.granted_access_response_adapter import ( - GrantedAccessResponseAdapter, -) from conductor.asyncio_client.adapters.models.group_adapter import GroupAdapter from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter from conductor.asyncio_client.adapters.models.target_ref_adapter import ( @@ -172,7 +169,7 @@ async def get_permissions(self, entity_type: str, entity_id: str) -> object: """Get permissions for a specific entity (user, group, or application)""" return await self.authorization_api.get_permissions(type=entity_type, id=entity_id) - async def get_group_permissions(self, group_id: str) -> GrantedAccessResponseAdapter: + async def get_group_permissions(self, group_id: str) -> object: """Get permissions granted to a group""" return await self.group_api.get_granted_permissions1(group_id=group_id) From 25c5f36538c0402693e5141c96e22a143cf51645 Mon Sep 17 00:00:00 2001 From: IgorChvyrov-sm Date: Wed, 29 Oct 2025 15:53:57 +0300 Subject: [PATCH 16/17] Moved type ignores into pyproject.toml --- pyproject.toml | 9 +++ .../adapters/api/application_resource_api.py | 64 +++++++++---------- .../adapters/api/group_resource_api.py | 10 +-- .../adapters/api/integration_resource_api.py | 58 ++++++++--------- .../adapters/api/metadata_resource_api.py | 22 +++---- .../adapters/api/prompt_resource_api.py | 22 +++---- .../adapters/api/scheduler_resource_api.py | 28 ++++---- .../adapters/api/schema_resource_api.py | 12 ++-- .../adapters/api/secret_resource_api.py | 20 +++--- .../asyncio_client/adapters/api/tags_api.py | 24 +++---- .../adapters/api/task_resource_api.py | 24 +++---- .../adapters/api/user_resource_api.py | 22 +++---- .../adapters/api/workflow_resource_api.py | 52 +++++++-------- .../adapters/models/conductor_user_adapter.py | 4 +- .../adapters/models/descriptor_adapter.py | 20 +++--- .../models/descriptor_proto_adapter.py | 36 +++++------ .../descriptor_proto_or_builder_adapter.py | 34 +++++----- .../models/enum_descriptor_adapter.py | 10 +-- .../models/enum_descriptor_proto_adapter.py | 16 ++--- ...num_descriptor_proto_or_builder_adapter.py | 18 +++--- .../adapters/models/enum_options_adapter.py | 14 ++-- .../models/enum_options_or_builder_adapter.py | 12 ++-- .../models/enum_value_options_adapter.py | 12 ++-- .../enum_value_options_or_builder_adapter.py | 12 ++-- .../models/environment_variable_adapter.py | 2 +- .../adapters/models/event_handler_adapter.py | 4 +- .../extended_conductor_application_adapter.py | 2 +- .../models/extended_secret_adapter.py | 2 +- .../models/extended_task_def_adapter.py | 10 +-- .../models/extended_workflow_def_adapter.py | 12 ++-- .../models/extension_range_options_adapter.py | 14 ++-- ...ension_range_options_or_builder_adapter.py | 18 +++--- .../adapters/models/field_options_adapter.py | 16 ++--- .../field_options_or_builder_adapter.py | 18 +++--- .../models/file_descriptor_adapter.py | 18 +++--- .../models/file_descriptor_proto_adapter.py | 30 ++++----- .../adapters/models/file_options_adapter.py | 12 ++-- .../models/file_options_or_builder_adapter.py | 14 ++-- .../models/granted_access_response_adapter.py | 2 +- .../adapters/models/group_adapter.py | 2 +- .../adapters/models/integration_adapter.py | 4 +- .../models/integration_api_adapter.py | 2 +- .../models/integration_def_adapter.py | 2 +- .../integration_def_form_field_adapter.py | 4 +- .../models/message_options_adapter.py | 12 ++-- .../message_options_or_builder_adapter.py | 14 ++-- .../models/message_template_adapter.py | 2 +- .../adapters/models/method_options_adapter.py | 14 ++-- .../method_options_or_builder_adapter.py | 14 ++-- .../adapters/models/oneof_options_adapter.py | 14 ++-- .../oneof_options_or_builder_adapter.py | 14 ++-- .../adapters/models/role_adapter.py | 2 +- ..._search_result_workflow_summary_adapter.py | 2 +- ...h_result_handled_event_response_adapter.py | 2 +- .../search_result_task_summary_adapter.py | 2 +- ...rkflow_schedule_execution_model_adapter.py | 2 +- .../models/service_descriptor_adapter.py | 8 +-- .../service_descriptor_proto_adapter.py | 14 ++-- ...ice_descriptor_proto_or_builder_adapter.py | 14 ++-- .../models/service_options_adapter.py | 12 ++-- .../service_options_or_builder_adapter.py | 12 ++-- .../models/source_code_info_adapter.py | 10 +-- .../source_code_info_or_builder_adapter.py | 10 +-- .../adapters/models/task_def_adapter.py | 8 +-- .../adapters/models/task_result_adapter.py | 2 +- .../models/uninterpreted_option_adapter.py | 10 +-- ...uninterpreted_option_or_builder_adapter.py | 10 +-- .../adapters/models/webhook_config_adapter.py | 4 +- .../adapters/models/workflow_adapter.py | 6 +- .../adapters/models/workflow_def_adapter.py | 10 +-- .../adapters/models/workflow_run_adapter.py | 10 +-- .../models/workflow_schedule_adapter.py | 4 +- .../models/workflow_schedule_model_adapter.py | 4 +- .../adapters/models/workflow_task_adapter.py | 16 ++--- .../models/workflow_test_request_adapter.py | 6 +- .../configuration/configuration.py | 14 ++-- .../asyncio_client/event/event_client.py | 2 +- .../orkes/orkes_authorization_client.py | 18 +++--- .../orkes/orkes_workflow_client.py | 2 +- src/conductor/asyncio_client/worker/worker.py | 8 +-- .../workflow/task/dynamic_fork_task.py | 2 +- .../asyncio_client/workflow/task/fork_task.py | 2 +- .../task/llm_tasks/llm_index_documents.py | 2 +- .../workflow/task/switch_task.py | 4 +- .../asyncio_client/workflow/task/task.py | 2 +- .../api/application_resource_api_adapter.py | 32 +++++----- src/conductor/client/adapters/rest_adapter.py | 2 +- .../client/configuration/configuration.py | 2 +- .../client/orkes/orkes_integration_client.py | 6 +- .../client/orkes/orkes_prompt_client.py | 4 +- .../client/orkes/orkes_workflow_client.py | 8 +-- src/conductor/client/worker/worker.py | 2 +- .../client/workflow/task/dynamic_fork_task.py | 2 +- .../client/workflow/task/fork_task.py | 2 +- .../client/workflow/task/javascript_task.py | 2 +- .../task/llm_tasks/llm_index_documents.py | 2 +- .../client/workflow/task/switch_task.py | 6 +- src/conductor/shared/automator/utils.py | 2 +- 98 files changed, 572 insertions(+), 563 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 01919908..fec59935 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -214,6 +214,15 @@ follow_imports = "silent" plugins = [ "pydantic.mypy" ] +disable_error_code = [ + "no-redef", + "return-value", + "var-annotated", + "assignment", + "call-arg", + "arg-type", + "override", +] [[tool.mypy.overrides]] module = [ diff --git a/src/conductor/asyncio_client/adapters/api/application_resource_api.py b/src/conductor/asyncio_client/adapters/api/application_resource_api.py index e7b9a56c..47ff4ba2 100644 --- a/src/conductor/asyncio_client/adapters/api/application_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/application_resource_api.py @@ -29,7 +29,7 @@ async def create_access_key( _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ): if not id: - id = None # type: ignore[assignment] + id = None return await super().create_access_key( id, _request_timeout=_request_timeout, @@ -54,9 +54,9 @@ async def add_role_to_application_user( _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ): if not application_id: - application_id = None # type: ignore[assignment] + application_id = None if not role: - role = None # type: ignore[assignment] + role = None return await super().add_role_to_application_user( application_id, role, @@ -65,7 +65,7 @@ async def add_role_to_application_user( _content_type=_content_type, _headers=_headers, _host_index=_host_index, - ) # type: ignore[arg-type] + ) async def delete_access_key( self, @@ -82,9 +82,9 @@ async def delete_access_key( _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ): if not application_id: - application_id = None # type: ignore[assignment] + application_id = None if not key_id: - key_id = None # type: ignore[assignment] + key_id = None return await super().delete_access_key( application_id, key_id, @@ -110,9 +110,9 @@ async def remove_role_from_application_user( _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ): if not application_id: - application_id = None # type: ignore[assignment] + application_id = None if not role: - role = None # type: ignore[assignment] + role = None return await super().remove_role_from_application_user( application_id, role, @@ -123,7 +123,7 @@ async def remove_role_from_application_user( _host_index=_host_index, ) - async def get_app_by_access_key_id( # type: ignore[override] + async def get_app_by_access_key_id( self, access_key_id: StrictStr, _request_timeout: Union[ @@ -137,7 +137,7 @@ async def get_app_by_access_key_id( # type: ignore[override] _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> Optional[ExtendedConductorApplicationAdapter]: if not access_key_id: - access_key_id = None # type: ignore[assignment] + access_key_id = None result = await super().get_app_by_access_key_id( access_key_id, _request_timeout=_request_timeout, @@ -146,7 +146,7 @@ async def get_app_by_access_key_id( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def get_access_keys( self, @@ -162,7 +162,7 @@ async def get_access_keys( _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ): if not id: - id = None # type: ignore[assignment] + id = None return await super().get_access_keys( id, _request_timeout=_request_timeout, @@ -187,9 +187,9 @@ async def toggle_access_key_status( _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ): if not application_id: - application_id = None # type: ignore[assignment] + application_id = None if not key_id: - key_id = None # type: ignore[assignment] + key_id = None return await super().toggle_access_key_status( application_id, key_id, @@ -200,7 +200,7 @@ async def toggle_access_key_status( _host_index=_host_index, ) - async def get_tags_for_application( # type: ignore[override] + async def get_tags_for_application( self, id: StrictStr, _request_timeout: Union[ @@ -214,7 +214,7 @@ async def get_tags_for_application( # type: ignore[override] _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> List[TagAdapter]: if not id: - id = None # type: ignore[assignment] + id = None result = await super().get_tags_for_application( id, _request_timeout=_request_timeout, @@ -223,12 +223,12 @@ async def get_tags_for_application( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def put_tag_for_application( self, id: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -240,12 +240,12 @@ async def put_tag_for_application( _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: if not id: - id = None # type: ignore[assignment] + id = None if not tag: - tag = None # type: ignore[assignment] + tag = None return await super().put_tag_for_application( id, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -256,7 +256,7 @@ async def put_tag_for_application( async def delete_tag_for_application( self, id: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -268,12 +268,12 @@ async def delete_tag_for_application( _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: if not id: - id = None # type: ignore[assignment] + id = None if not tag: - tag = None # type: ignore[assignment] + tag = None return await super().delete_tag_for_application( id, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -281,7 +281,7 @@ async def delete_tag_for_application( _host_index=_host_index, ) - async def create_application( # type: ignore[override] + async def create_application( self, create_or_update_application_request: CreateOrUpdateApplicationRequestAdapter, _request_timeout: Union[ @@ -302,9 +302,9 @@ async def create_application( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def update_application( # type: ignore[override] + async def update_application( self, id: StrictStr, create_or_update_application_request: CreateOrUpdateApplicationRequestAdapter, @@ -327,7 +327,7 @@ async def update_application( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def get_application( self, @@ -350,9 +350,9 @@ async def get_application( _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def list_applications( # type: ignore[override] + async def list_applications( self, _request_timeout: Union[ None, @@ -371,4 +371,4 @@ async def list_applications( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result diff --git a/src/conductor/asyncio_client/adapters/api/group_resource_api.py b/src/conductor/asyncio_client/adapters/api/group_resource_api.py index d4ef7193..0f07e506 100644 --- a/src/conductor/asyncio_client/adapters/api/group_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/group_resource_api.py @@ -12,7 +12,7 @@ class GroupResourceApiAdapter(GroupResourceApi): - async def list_groups( # type: ignore[override] + async def list_groups( self, _request_timeout: Union[ None, @@ -31,7 +31,7 @@ async def list_groups( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def get_group( self, @@ -54,12 +54,12 @@ async def get_group( _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def upsert_group( self, id: StrictStr, - upsert_group_request: UpsertGroupRequestAdapter, # type: ignore[override] + upsert_group_request: UpsertGroupRequestAdapter, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -80,4 +80,4 @@ async def upsert_group( _host_index=_host_index, ) - return result # type: ignore[return-value] + return result diff --git a/src/conductor/asyncio_client/adapters/api/integration_resource_api.py b/src/conductor/asyncio_client/adapters/api/integration_resource_api.py index 59f09776..eb8b3785 100644 --- a/src/conductor/asyncio_client/adapters/api/integration_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/integration_resource_api.py @@ -35,9 +35,9 @@ async def get_integration_provider( _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def get_integration_providers( # type: ignore[override] + async def get_integration_providers( self, category: Optional[StrictStr] = None, active_only: Optional[StrictBool] = None, @@ -60,9 +60,9 @@ async def get_integration_providers( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def get_integration_provider_defs( # type: ignore[override] + async def get_integration_provider_defs( self, _request_timeout: Union[ None, @@ -81,7 +81,7 @@ async def get_integration_provider_defs( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def get_integration_api( self, @@ -106,9 +106,9 @@ async def get_integration_api( _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def get_integration_apis( # type: ignore[override] + async def get_integration_apis( self, name: StrictStr, active_only: Optional[StrictBool] = None, @@ -132,7 +132,7 @@ async def get_integration_apis( # type: ignore[override] _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def get_integration_available_apis( self, @@ -156,11 +156,11 @@ async def get_integration_available_apis( _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def save_all_integrations( self, - integration: List[IntegrationAdapter], # type: ignore[override] + integration: List[IntegrationAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -172,7 +172,7 @@ async def save_all_integrations( _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: return await super().save_all_integrations( - integration, # type: ignore[arg-type] + integration, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -180,7 +180,7 @@ async def save_all_integrations( _host_index=_host_index, ) - async def get_all_integrations( # type: ignore[override] + async def get_all_integrations( self, category: Optional[StrictStr] = None, active_only: Optional[StrictBool] = None, @@ -204,7 +204,7 @@ async def get_all_integrations( # type: ignore[override] _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def get_providers_and_integrations( self, @@ -234,7 +234,7 @@ async def put_tag_for_integration( self, name: StrictStr, integration_name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -248,7 +248,7 @@ async def put_tag_for_integration( return await super().put_tag_for_integration( name, integration_name, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -256,7 +256,7 @@ async def put_tag_for_integration( _host_index=_host_index, ) - async def get_tags_for_integration( # type: ignore[override] + async def get_tags_for_integration( self, name: StrictStr, integration_name: StrictStr, @@ -280,13 +280,13 @@ async def get_tags_for_integration( # type: ignore[override] _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def delete_tag_for_integration( self, name: StrictStr, integration_name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -300,7 +300,7 @@ async def delete_tag_for_integration( return await super().delete_tag_for_integration( name, integration_name, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -311,7 +311,7 @@ async def delete_tag_for_integration( async def put_tag_for_integration_provider( self, name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -324,7 +324,7 @@ async def put_tag_for_integration_provider( ) -> None: return await super().put_tag_for_integration_provider( name, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -332,7 +332,7 @@ async def put_tag_for_integration_provider( _host_index=_host_index, ) - async def get_tags_for_integration_provider( # type: ignore[override] + async def get_tags_for_integration_provider( self, name: StrictStr, _request_timeout: Union[ @@ -353,12 +353,12 @@ async def get_tags_for_integration_provider( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def delete_tag_for_integration_provider( self, name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -371,7 +371,7 @@ async def delete_tag_for_integration_provider( ) -> None: return await super().delete_tag_for_integration_provider( name, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -401,7 +401,7 @@ async def get_token_usage_for_integration_provider( _host_index=_host_index, ) - async def get_prompts_with_integration( # type: ignore[override] + async def get_prompts_with_integration( self, integration_provider: StrictStr, integration_name: StrictStr, @@ -424,12 +424,12 @@ async def get_prompts_with_integration( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def record_event_stats( self, type: StrictStr, - event_log: List[EventLogAdapter], # type: ignore[override] + event_log: List[EventLogAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -442,7 +442,7 @@ async def record_event_stats( ) -> None: return await super().record_event_stats( type, - event_log, # type: ignore[arg-type] + event_log, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, diff --git a/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py b/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py index 292e242f..e8be4451 100644 --- a/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/metadata_resource_api.py @@ -13,7 +13,7 @@ class MetadataResourceApiAdapter(MetadataResourceApi): - async def get_task_def( # type: ignore[override] + async def get_task_def( self, tasktype: StrictStr, metadata: Optional[StrictBool] = None, @@ -36,9 +36,9 @@ async def get_task_def( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def get_task_defs( # type: ignore[override] + async def get_task_defs( self, access: Optional[StrictStr] = None, metadata: Optional[StrictBool] = None, @@ -65,11 +65,11 @@ async def get_task_defs( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def update( self, - extended_workflow_def: List[ExtendedWorkflowDefAdapter], # type: ignore[override] + extended_workflow_def: List[ExtendedWorkflowDefAdapter], overwrite: Optional[StrictBool] = None, new_version: Optional[StrictBool] = None, _request_timeout: Union[ @@ -83,7 +83,7 @@ async def update( _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> object: result = await super().update( - extended_workflow_def, # type: ignore[arg-type] + extended_workflow_def, overwrite, new_version, _request_timeout=_request_timeout, @@ -92,9 +92,9 @@ async def update( _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def get( # type: ignore[override] + async def get( self, name: StrictStr, version: Optional[StrictInt] = None, @@ -119,9 +119,9 @@ async def get( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def get_workflow_defs( # type: ignore[override] + async def get_workflow_defs( self, access: Optional[StrictStr] = None, metadata: Optional[StrictBool] = None, @@ -152,4 +152,4 @@ async def get_workflow_defs( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result diff --git a/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py b/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py index 9776dd5d..14bb9eb9 100644 --- a/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/prompt_resource_api.py @@ -33,9 +33,9 @@ async def get_message_template( _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def get_message_templates( # type: ignore[override] + async def get_message_templates( self, _request_timeout: Union[ None, @@ -54,11 +54,11 @@ async def get_message_templates( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def create_message_templates( self, - message_template: List[MessageTemplateAdapter], # type: ignore[override] + message_template: List[MessageTemplateAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -70,7 +70,7 @@ async def create_message_templates( _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: return await super().create_message_templates( - message_template, # type: ignore[arg-type] + message_template, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -81,7 +81,7 @@ async def create_message_templates( async def put_tag_for_prompt_template( self, name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -94,7 +94,7 @@ async def put_tag_for_prompt_template( ) -> None: return await super().put_tag_for_prompt_template( name, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -102,7 +102,7 @@ async def put_tag_for_prompt_template( _host_index=_host_index, ) - async def get_tags_for_prompt_template( # type: ignore[override] + async def get_tags_for_prompt_template( self, name: StrictStr, _request_timeout: Union[ @@ -123,12 +123,12 @@ async def get_tags_for_prompt_template( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def delete_tag_for_prompt_template( self, name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -141,7 +141,7 @@ async def delete_tag_for_prompt_template( ) -> None: return await super().delete_tag_for_prompt_template( name, - tag, # type: ignore[arg-type] + tag, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, diff --git a/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py b/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py index a94af4a8..f12a351f 100644 --- a/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/scheduler_resource_api.py @@ -18,7 +18,7 @@ class SchedulerResourceApiAdapter(SchedulerResourceApi): - async def get_schedule( # type: ignore[override] + async def get_schedule( self, name: StrictStr, _request_timeout: Union[ @@ -39,9 +39,9 @@ async def get_schedule( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def get_all_schedules( # type: ignore[override] + async def get_all_schedules( self, workflow_name: Optional[StrictStr] = None, _request_timeout: Union[ @@ -62,9 +62,9 @@ async def get_all_schedules( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def search_v2( # type: ignore[override] + async def search_v2( self, start: Optional[StrictInt] = None, size: Optional[StrictInt] = None, @@ -93,9 +93,9 @@ async def search_v2( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def get_schedules_by_tag( # type: ignore[override] + async def get_schedules_by_tag( self, tag: StrictStr, _request_timeout: Union[ @@ -116,12 +116,12 @@ async def get_schedules_by_tag( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def put_tag_for_schedule( self, name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -134,7 +134,7 @@ async def put_tag_for_schedule( ) -> None: return await super().put_tag_for_schedule( name, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -142,7 +142,7 @@ async def put_tag_for_schedule( _host_index=_host_index, ) - async def get_tags_for_schedule( # type: ignore[override] + async def get_tags_for_schedule( self, name: StrictStr, _request_timeout: Union[ @@ -163,12 +163,12 @@ async def get_tags_for_schedule( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def delete_tag_for_schedule( self, name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -181,7 +181,7 @@ async def delete_tag_for_schedule( ) -> None: return await super().delete_tag_for_schedule( name, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, diff --git a/src/conductor/asyncio_client/adapters/api/schema_resource_api.py b/src/conductor/asyncio_client/adapters/api/schema_resource_api.py index 9ec0cc72..54642b57 100644 --- a/src/conductor/asyncio_client/adapters/api/schema_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/schema_resource_api.py @@ -11,7 +11,7 @@ class SchemaResourceApiAdapter(SchemaResourceApi): async def save( self, - schema_def: List[SchemaDefAdapter], # type: ignore[override] + schema_def: List[SchemaDefAdapter], new_version: Optional[StrictBool] = None, _request_timeout: Union[ None, @@ -24,7 +24,7 @@ async def save( _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: return await super().save( - schema_def, # type: ignore[arg-type] + schema_def, new_version, _request_timeout=_request_timeout, _request_auth=_request_auth, @@ -33,7 +33,7 @@ async def save( _host_index=_host_index, ) - async def get_schema_by_name_and_version( # type: ignore[override] + async def get_schema_by_name_and_version( self, name: StrictStr, version: StrictInt, @@ -56,9 +56,9 @@ async def get_schema_by_name_and_version( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def get_all_schemas( # type: ignore[override] + async def get_all_schemas( self, _request_timeout: Union[ None, @@ -77,4 +77,4 @@ async def get_all_schemas( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result diff --git a/src/conductor/asyncio_client/adapters/api/secret_resource_api.py b/src/conductor/asyncio_client/adapters/api/secret_resource_api.py index cf5b6475..dc23eb90 100644 --- a/src/conductor/asyncio_client/adapters/api/secret_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/secret_resource_api.py @@ -10,7 +10,7 @@ class SecretResourceApiAdapter(SecretResourceApi): - async def secret_exists( # type: ignore[override] + async def secret_exists( self, key: Annotated[str, Field(strict=True)], _request_timeout: Union[ @@ -31,7 +31,7 @@ async def secret_exists( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def list_all_secret_names( self, @@ -53,7 +53,7 @@ async def list_all_secret_names( _host_index=_host_index, ) - async def list_secrets_with_tags_that_user_can_grant_access_to( # type: ignore[override] + async def list_secrets_with_tags_that_user_can_grant_access_to( self, _request_timeout: Union[ None, @@ -72,12 +72,12 @@ async def list_secrets_with_tags_that_user_can_grant_access_to( # type: ignore[ _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def put_tag_for_secret( self, key: Annotated[str, Field(strict=True)], - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -90,7 +90,7 @@ async def put_tag_for_secret( ) -> None: return await super().put_tag_for_secret( key, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -98,7 +98,7 @@ async def put_tag_for_secret( _host_index=_host_index, ) - async def get_tags( # type: ignore[override] + async def get_tags( self, key: Annotated[str, Field(strict=True)], _request_timeout: Union[ @@ -119,12 +119,12 @@ async def get_tags( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def delete_tag_for_secret( self, key: Annotated[str, Field(strict=True)], - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -137,7 +137,7 @@ async def delete_tag_for_secret( ) -> None: return await super().delete_tag_for_secret( key, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, diff --git a/src/conductor/asyncio_client/adapters/api/tags_api.py b/src/conductor/asyncio_client/adapters/api/tags_api.py index fc0c94d2..90d9c05b 100644 --- a/src/conductor/asyncio_client/adapters/api/tags_api.py +++ b/src/conductor/asyncio_client/adapters/api/tags_api.py @@ -9,7 +9,7 @@ class TagsApiAdapter(TagsApi): - async def get_workflow_tags( # type: ignore[override] + async def get_workflow_tags( self, name: StrictStr, _request_timeout: Union[ @@ -30,12 +30,12 @@ async def get_workflow_tags( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def set_workflow_tags( # type: ignore[override] + async def set_workflow_tags( self, name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -48,16 +48,16 @@ async def set_workflow_tags( # type: ignore[override] ) -> object: result = await super().set_workflow_tags( name, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def get_task_tags( # type: ignore[override] + async def get_task_tags( self, task_name: StrictStr, _request_timeout: Union[ @@ -78,12 +78,12 @@ async def get_task_tags( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def set_task_tags( # type: ignore[override] + async def set_task_tags( self, task_name: StrictStr, - tag: List[TagAdapter], # type: ignore[override] + tag: List[TagAdapter], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -96,11 +96,11 @@ async def set_task_tags( # type: ignore[override] ) -> object: result = await super().set_task_tags( task_name, - tag, # type: ignore[arg-type] + tag, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result diff --git a/src/conductor/asyncio_client/adapters/api/task_resource_api.py b/src/conductor/asyncio_client/adapters/api/task_resource_api.py index e0351ebd..52cc2c36 100644 --- a/src/conductor/asyncio_client/adapters/api/task_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/task_resource_api.py @@ -15,7 +15,7 @@ class TaskResourceApiAdapter(TaskResourceApi): - async def poll( # type: ignore[override] + async def poll( self, tasktype: StrictStr, workerid: Optional[StrictStr] = None, @@ -40,9 +40,9 @@ async def poll( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def batch_poll( # type: ignore[override] + async def batch_poll( self, tasktype: StrictStr, workerid: Optional[StrictStr] = None, @@ -71,9 +71,9 @@ async def batch_poll( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def get_task( # type: ignore[override] + async def get_task( self, task_id: StrictStr, _request_timeout: Union[ @@ -94,9 +94,9 @@ async def get_task( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def get_poll_data( # type: ignore[override] + async def get_poll_data( self, task_type: StrictStr, _request_timeout: Union[ @@ -117,9 +117,9 @@ async def get_poll_data( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def get_task_logs( # type: ignore[override] + async def get_task_logs( self, task_id: StrictStr, _request_timeout: Union[ @@ -140,9 +140,9 @@ async def get_task_logs( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def search1( # type: ignore[override] + async def search1( self, start: Optional[StrictInt] = None, size: Optional[StrictInt] = None, @@ -171,7 +171,7 @@ async def search1( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result @validate_call async def update_task_sync( diff --git a/src/conductor/asyncio_client/adapters/api/user_resource_api.py b/src/conductor/asyncio_client/adapters/api/user_resource_api.py index 3a880d8d..ae25ccb9 100644 --- a/src/conductor/asyncio_client/adapters/api/user_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/user_resource_api.py @@ -25,7 +25,7 @@ async def get_granted_permissions( ) -> object: # Convert empty user_id to None to prevent sending invalid data to server if not user_id: - user_id = None # type: ignore[assignment] + user_id = None return await super().get_granted_permissions( user_id, _request_timeout=_request_timeout, @@ -35,7 +35,7 @@ async def get_granted_permissions( _host_index=_host_index, ) - async def get_user( # type: ignore[override] + async def get_user( self, id: StrictStr, _request_timeout: Union[ @@ -50,7 +50,7 @@ async def get_user( # type: ignore[override] ) -> ConductorUserAdapter: # Convert empty user id to None to prevent sending invalid data to server if not id: - id = None # type: ignore[assignment] + id = None result = await super().get_user( id, _request_timeout=_request_timeout, @@ -59,12 +59,12 @@ async def get_user( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def upsert_user( # type: ignore[override] + async def upsert_user( self, id: StrictStr, - upsert_user_request: UpsertUserRequest, # type: ignore[override] + upsert_user_request: UpsertUserRequest, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -77,7 +77,7 @@ async def upsert_user( # type: ignore[override] ) -> ConductorUserAdapter: # Convert empty user id to None to prevent sending invalid data to server if not id: - id = None # type: ignore[assignment] + id = None result = await super().upsert_user( id, upsert_user_request, @@ -87,9 +87,9 @@ async def upsert_user( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def list_users( # type: ignore[override] + async def list_users( self, apps: Optional[StrictBool] = None, _request_timeout: Union[ @@ -110,7 +110,7 @@ async def list_users( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def delete_user( self, @@ -127,7 +127,7 @@ async def delete_user( ) -> object: # Convert empty user id to None to prevent sending invalid data to server if not id: - id = None # type: ignore[assignment] + id = None return await super().delete_user( id, _request_timeout=_request_timeout, diff --git a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py index 67a80fdb..bce7a7f2 100644 --- a/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py +++ b/src/conductor/asyncio_client/adapters/api/workflow_resource_api.py @@ -29,12 +29,12 @@ class WorkflowResourceApiAdapter(WorkflowResourceApi): - async def execute_workflow( # type: ignore[override] + async def execute_workflow( self, name: StrictStr, version: StrictInt, request_id: StrictStr, - start_workflow_request: StartWorkflowRequestAdapter, # type: ignore[override] + start_workflow_request: StartWorkflowRequestAdapter, wait_until_task_ref: Optional[StrictStr] = None, wait_for_seconds: Optional[StrictInt] = None, _request_timeout: Union[ @@ -51,7 +51,7 @@ async def execute_workflow( # type: ignore[override] name, version, request_id, - start_workflow_request, # type: ignore[override] + start_workflow_request, wait_until_task_ref, wait_for_seconds, _request_timeout=_request_timeout, @@ -60,9 +60,9 @@ async def execute_workflow( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def get_execution_status( # type: ignore[override] + async def get_execution_status( self, workflow_id: StrictStr, include_tasks: Optional[StrictBool] = None, @@ -87,9 +87,9 @@ async def get_execution_status( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def get_workflow_status_summary( # type: ignore[override] + async def get_workflow_status_summary( self, workflow_id: StrictStr, include_output: Optional[StrictBool] = None, @@ -103,7 +103,7 @@ async def get_workflow_status_summary( # type: ignore[override] _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> WorkflowStatusAdapter: # type: ignore[override] + ) -> WorkflowStatusAdapter: result = await super().get_workflow_status_summary( workflow_id, include_output, @@ -114,7 +114,7 @@ async def get_workflow_status_summary( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def get_running_workflow( self, @@ -144,7 +144,7 @@ async def get_running_workflow( _host_index=_host_index, ) - async def get_workflows( # type: ignore[override] + async def get_workflows( self, name: StrictStr, request_body: List[StrictStr], @@ -171,11 +171,11 @@ async def get_workflows( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def get_workflows1( # type: ignore[override] + async def get_workflows1( self, - correlation_ids_search_request: CorrelationIdsSearchRequestAdapter, # type: ignore[override] + correlation_ids_search_request: CorrelationIdsSearchRequestAdapter, include_closed: Optional[StrictBool] = None, include_tasks: Optional[StrictBool] = None, _request_timeout: Union[ @@ -198,9 +198,9 @@ async def get_workflows1( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def search( # type: ignore[override] + async def search( self, start: Optional[StrictInt] = None, size: Optional[StrictInt] = None, @@ -231,12 +231,12 @@ async def search( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result async def rerun( self, workflow_id: StrictStr, - rerun_workflow_request: RerunWorkflowRequestAdapter, # type: ignore[override] + rerun_workflow_request: RerunWorkflowRequestAdapter, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -249,7 +249,7 @@ async def rerun( ) -> str: return await super().rerun( workflow_id, - rerun_workflow_request, # type: ignore[override] + rerun_workflow_request, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, @@ -281,11 +281,11 @@ async def restart( _host_index=_host_index, ) - async def update_workflow_and_task_state( # type: ignore[override] + async def update_workflow_and_task_state( self, workflow_id: StrictStr, request_id: StrictStr, - workflow_state_update: WorkflowStateUpdateAdapter, # type: ignore[override] + workflow_state_update: WorkflowStateUpdateAdapter, wait_until_task_ref: Optional[StrictStr] = None, wait_for_seconds: Optional[StrictInt] = None, _request_timeout: Union[ @@ -301,7 +301,7 @@ async def update_workflow_and_task_state( # type: ignore[override] result = await super().update_workflow_and_task_state( workflow_id, request_id, - workflow_state_update, # type: ignore[override] + workflow_state_update, wait_until_task_ref, wait_for_seconds, _request_timeout=_request_timeout, @@ -310,11 +310,11 @@ async def update_workflow_and_task_state( # type: ignore[override] _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result - async def test_workflow( # type: ignore[override] + async def test_workflow( self, - workflow_test_request: WorkflowTestRequestAdapter, # type: ignore[override] + workflow_test_request: WorkflowTestRequestAdapter, _request_timeout: Union[ # noqa: PT019 None, Annotated[StrictFloat, Field(gt=0)], @@ -326,14 +326,14 @@ async def test_workflow( # type: ignore[override] _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, # noqa: PT019 ) -> WorkflowAdapter: result = await super().test_workflow( - workflow_test_request, # type: ignore[override] + workflow_test_request, _request_timeout=_request_timeout, _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, _host_index=_host_index, ) - return result # type: ignore[return-value] + return result @validate_call async def update_workflow_state( diff --git a/src/conductor/asyncio_client/adapters/models/conductor_user_adapter.py b/src/conductor/asyncio_client/adapters/models/conductor_user_adapter.py index 0ff15a50..e9d06ae3 100644 --- a/src/conductor/asyncio_client/adapters/models/conductor_user_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/conductor_user_adapter.py @@ -9,8 +9,8 @@ class ConductorUserAdapter(ConductorUser): - groups: Optional[List["GroupAdapter"]] = None # type: ignore[assignment] - roles: Optional[List["RoleAdapter"]] = None # type: ignore[assignment] + groups: Optional[List["GroupAdapter"]] = None + roles: Optional[List["RoleAdapter"]] = None orkes_app: Optional[StrictBool] = Field(default=None, alias="orkesApp") orkes_api_gateway: Optional[StrictBool] = Field(default=None, alias="orkesApiGateway") contact_information: Optional[Dict[Any, str]] = Field(default=None, alias="contactInformation") diff --git a/src/conductor/asyncio_client/adapters/models/descriptor_adapter.py b/src/conductor/asyncio_client/adapters/models/descriptor_adapter.py index 1e657346..748edbfa 100644 --- a/src/conductor/asyncio_client/adapters/models/descriptor_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/descriptor_adapter.py @@ -9,16 +9,16 @@ class DescriptorAdapter(Descriptor): - containing_type: Optional["DescriptorAdapter"] = Field(default=None, alias="containingType") # type: ignore[assignment] - enum_types: Optional[List["EnumDescriptorAdapter"]] = Field(default=None, alias="enumTypes") # type: ignore[assignment] - extensions: Optional[List["FieldDescriptorAdapter"]] = None # type: ignore[assignment] - fields: Optional[List["FieldDescriptorAdapter"]] = None # type: ignore[assignment] - file: Optional["FileDescriptorAdapter"] = None # type: ignore[assignment] - nested_types: Optional[List["DescriptorAdapter"]] = Field(default=None, alias="nestedTypes") # type: ignore[assignment] - oneofs: Optional[List["OneofDescriptorAdapter"]] = None # type: ignore[assignment] - options: Optional["MessageOptionsAdapter"] = None # type: ignore[assignment] - proto: Optional["DescriptorProtoAdapter"] = None # type: ignore[assignment] - real_oneofs: Optional[List["OneofDescriptorAdapter"]] = Field(default=None, alias="realOneofs") # type: ignore[assignment] + containing_type: Optional["DescriptorAdapter"] = Field(default=None, alias="containingType") + enum_types: Optional[List["EnumDescriptorAdapter"]] = Field(default=None, alias="enumTypes") + extensions: Optional[List["FieldDescriptorAdapter"]] = None + fields: Optional[List["FieldDescriptorAdapter"]] = None + file: Optional["FileDescriptorAdapter"] = None + nested_types: Optional[List["DescriptorAdapter"]] = Field(default=None, alias="nestedTypes") + oneofs: Optional[List["OneofDescriptorAdapter"]] = None + options: Optional["MessageOptionsAdapter"] = None + proto: Optional["DescriptorProtoAdapter"] = None + real_oneofs: Optional[List["OneofDescriptorAdapter"]] = Field(default=None, alias="realOneofs") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/descriptor_proto_adapter.py b/src/conductor/asyncio_client/adapters/models/descriptor_proto_adapter.py index 4c52abb0..7f8761f0 100644 --- a/src/conductor/asyncio_client/adapters/models/descriptor_proto_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/descriptor_proto_adapter.py @@ -10,59 +10,59 @@ class DescriptorProtoAdapter(DescriptorProto): all_fields: Optional[Dict[str, Dict[str, Any]]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["DescriptorProto"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["DescriptorProto"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( default=None, alias="enumTypeList" ) - enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="enumTypeOrBuilderList" ) - extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( default=None, alias="extensionList" ) - extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="extensionOrBuilderList" ) - extension_range_list: Optional[List["ExtensionRangeAdapter"]] = Field( # type: ignore[assignment] + extension_range_list: Optional[List["ExtensionRangeAdapter"]] = Field( default=None, alias="extensionRangeList" ) - extension_range_or_builder_list: Optional[List["ExtensionRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] + extension_range_or_builder_list: Optional[List["ExtensionRangeOrBuilderAdapter"]] = Field( default=None, alias="extensionRangeOrBuilderList" ) - field_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + field_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( default=None, alias="fieldList" ) - field_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + field_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="fieldOrBuilderList" ) - nested_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + nested_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( default=None, alias="nestedTypeList" ) - nested_type_or_builder_list: Optional[List["DescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + nested_type_or_builder_list: Optional[List["DescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="nestedTypeOrBuilderList" ) - oneof_decl_list: Optional[List["OneofDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + oneof_decl_list: Optional[List["OneofDescriptorProtoAdapter"]] = Field( default=None, alias="oneofDeclList" ) - oneof_decl_or_builder_list: Optional[List["OneofDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + oneof_decl_or_builder_list: Optional[List["OneofDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="oneofDeclOrBuilderList" ) options: Optional["MessageOptionsAdapter"] = None - options_or_builder: Optional["MessageOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] + options_or_builder: Optional["MessageOptionsOrBuilderAdapter"] = Field( default=None, alias="optionsOrBuilder" ) - reserved_range_list: Optional[List["ReservedRangeAdapter"]] = Field( # type: ignore[assignment] + reserved_range_list: Optional[List["ReservedRangeAdapter"]] = Field( default=None, alias="reservedRangeList" ) - reserved_range_or_builder_list: Optional[List["ReservedRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] + reserved_range_or_builder_list: Optional[List["ReservedRangeOrBuilderAdapter"]] = Field( default=None, alias="reservedRangeOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py index e25ae689..91d4fbf9 100644 --- a/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/descriptor_proto_or_builder_adapter.py @@ -10,55 +10,55 @@ class DescriptorProtoOrBuilderAdapter(DescriptorProtoOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( default=None, alias="enumTypeList" ) - enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="enumTypeOrBuilderList" ) - extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( default=None, alias="extensionList" ) - extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="extensionOrBuilderList" ) - extension_range_list: Optional[List["ExtensionRangeAdapter"]] = Field( # type: ignore[assignment] + extension_range_list: Optional[List["ExtensionRangeAdapter"]] = Field( default=None, alias="extensionRangeList" ) - extension_range_or_builder_list: Optional[List["ExtensionRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] + extension_range_or_builder_list: Optional[List["ExtensionRangeOrBuilderAdapter"]] = Field( default=None, alias="extensionRangeOrBuilderList" ) - field_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + field_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( default=None, alias="fieldList" ) - field_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + field_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="fieldOrBuilderList" ) - nested_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + nested_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( default=None, alias="nestedTypeList" ) - oneof_decl_list: Optional[List["OneofDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + oneof_decl_list: Optional[List["OneofDescriptorProtoAdapter"]] = Field( default=None, alias="oneofDeclList" ) - oneof_decl_or_builder_list: Optional[List["OneofDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + oneof_decl_or_builder_list: Optional[List["OneofDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="oneofDeclOrBuilderList" ) - options_or_builder: Optional["MessageOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] + options_or_builder: Optional["MessageOptionsOrBuilderAdapter"] = Field( default=None, alias="optionsOrBuilder" ) - reserved_range_list: Optional[List["ReservedRangeAdapter"]] = Field( # type: ignore[assignment] + reserved_range_list: Optional[List["ReservedRangeAdapter"]] = Field( default=None, alias="reservedRangeList" ) - reserved_range_or_builder_list: Optional[List["ReservedRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] + reserved_range_or_builder_list: Optional[List["ReservedRangeOrBuilderAdapter"]] = Field( default=None, alias="reservedRangeOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_descriptor_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_descriptor_adapter.py index f142c07e..4f265294 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_descriptor_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_descriptor_adapter.py @@ -9,11 +9,11 @@ class EnumDescriptorAdapter(EnumDescriptor): - containing_type: Optional["DescriptorAdapter"] = Field(default=None, alias="containingType") # type: ignore[assignment] - file: Optional["FileDescriptorAdapter"] = None # type: ignore[assignment] - options: Optional["EnumOptionsAdapter"] = None # type: ignore[assignment] - proto: Optional["EnumDescriptorProtoAdapter"] = None # type: ignore[assignment] - values: Optional[List["EnumValueDescriptorAdapter"]] = None # type: ignore[assignment] + containing_type: Optional["DescriptorAdapter"] = Field(default=None, alias="containingType") + file: Optional["FileDescriptorAdapter"] = None + options: Optional["EnumOptionsAdapter"] = None + proto: Optional["EnumDescriptorProtoAdapter"] = None + values: Optional[List["EnumValueDescriptorAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_adapter.py index a74d690f..e1c446b5 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_adapter.py @@ -10,27 +10,27 @@ class EnumDescriptorProtoAdapter(EnumDescriptorProto): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["EnumDescriptorProtoAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["EnumDescriptorProtoAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) options: Optional["EnumOptionsAdapter"] = None - options_or_builder: Optional["EnumOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] + options_or_builder: Optional["EnumOptionsOrBuilderAdapter"] = Field( default=None, alias="optionsOrBuilder" ) - reserved_range_list: Optional[List["EnumReservedRangeAdapter"]] = Field( # type: ignore[assignment] + reserved_range_list: Optional[List["EnumReservedRangeAdapter"]] = Field( default=None, alias="reservedRangeList" ) - reserved_range_or_builder_list: Optional[List["EnumReservedRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] + reserved_range_or_builder_list: Optional[List["EnumReservedRangeOrBuilderAdapter"]] = Field( default=None, alias="reservedRangeOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] - value_list: Optional[List["EnumValueDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + value_list: Optional[List["EnumValueDescriptorProtoAdapter"]] = Field( default=None, alias="valueList" ) - value_or_builder_list: Optional[List["EnumValueDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + value_or_builder_list: Optional[List["EnumValueDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="valueOrBuilderList" ) diff --git a/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_or_builder_adapter.py index c5a3a57b..ab658411 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_descriptor_proto_or_builder_adapter.py @@ -10,27 +10,27 @@ class EnumDescriptorProtoOrBuilderAdapter(EnumDescriptorProtoOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - options: Optional["EnumOptionsAdapter"] = None # type: ignore[assignment] - options_or_builder: Optional["EnumOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] + options: Optional["EnumOptionsAdapter"] = None + options_or_builder: Optional["EnumOptionsOrBuilderAdapter"] = Field( default=None, alias="optionsOrBuilder" ) - reserved_range_list: Optional[List["EnumReservedRangeAdapter"]] = Field( # type: ignore[assignment] + reserved_range_list: Optional[List["EnumReservedRangeAdapter"]] = Field( default=None, alias="reservedRangeList" ) - reserved_range_or_builder_list: Optional[List["EnumReservedRangeOrBuilderAdapter"]] = Field( # type: ignore[assignment] + reserved_range_or_builder_list: Optional[List["EnumReservedRangeOrBuilderAdapter"]] = Field( default=None, alias="reservedRangeOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] - value_list: Optional[List["EnumValueDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") + value_list: Optional[List["EnumValueDescriptorProtoAdapter"]] = Field( default=None, alias="valueList" ) - value_or_builder_list: Optional[List["EnumValueDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + value_or_builder_list: Optional[List["EnumValueDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="valueOrBuilderList" ) diff --git a/src/conductor/asyncio_client/adapters/models/enum_options_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_options_adapter.py index 858d506f..0b3a3ca9 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_options_adapter.py @@ -11,23 +11,23 @@ class EnumOptionsAdapter(EnumOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["EnumOptionsAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["EnumOptionsAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features: Optional["FeatureSetAdapter"] = None + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_options_or_builder_adapter.py index 5ce6490b..7c8495f0 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class EnumOptionsOrBuilderAdapter(EnumOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_value_options_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_value_options_adapter.py index 6de7507c..05d9d6c7 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_value_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_value_options_adapter.py @@ -11,23 +11,23 @@ class EnumValueOptionsAdapter(EnumValueOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["EnumValueOptionsAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["EnumValueOptionsAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/enum_value_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/enum_value_options_or_builder_adapter.py index 54ccbd01..c3369653 100644 --- a/src/conductor/asyncio_client/adapters/models/enum_value_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/enum_value_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class EnumValueOptionsOrBuilderAdapter(EnumValueOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/environment_variable_adapter.py b/src/conductor/asyncio_client/adapters/models/environment_variable_adapter.py index 07028025..c969d951 100644 --- a/src/conductor/asyncio_client/adapters/models/environment_variable_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/environment_variable_adapter.py @@ -8,7 +8,7 @@ class EnvironmentVariableAdapter(EnvironmentVariable): - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/event_handler_adapter.py b/src/conductor/asyncio_client/adapters/models/event_handler_adapter.py index b98ac1a4..bfea7e00 100644 --- a/src/conductor/asyncio_client/adapters/models/event_handler_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/event_handler_adapter.py @@ -8,8 +8,8 @@ class EventHandlerAdapter(EventHandler): - actions: Optional[List["ActionAdapter"]] = None # type: ignore[assignment] - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + actions: Optional[List["ActionAdapter"]] = None + tags: Optional[List["TagAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extended_conductor_application_adapter.py b/src/conductor/asyncio_client/adapters/models/extended_conductor_application_adapter.py index a5b4b924..82fa4eed 100644 --- a/src/conductor/asyncio_client/adapters/models/extended_conductor_application_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extended_conductor_application_adapter.py @@ -8,7 +8,7 @@ class ExtendedConductorApplicationAdapter(ExtendedConductorApplication): - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extended_secret_adapter.py b/src/conductor/asyncio_client/adapters/models/extended_secret_adapter.py index 09b20b5a..ae4dc880 100644 --- a/src/conductor/asyncio_client/adapters/models/extended_secret_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extended_secret_adapter.py @@ -8,7 +8,7 @@ class ExtendedSecretAdapter(ExtendedSecret): - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extended_task_def_adapter.py b/src/conductor/asyncio_client/adapters/models/extended_task_def_adapter.py index c549579a..640b01f3 100644 --- a/src/conductor/asyncio_client/adapters/models/extended_task_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extended_task_def_adapter.py @@ -9,12 +9,12 @@ class ExtendedTaskDefAdapter(ExtendedTaskDef): - input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") # type: ignore[assignment] + input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") input_template: Optional[Dict[str, Any]] = Field(default=None, alias="inputTemplate") - output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") # type: ignore[assignment] - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] - timeout_seconds: Optional[int] = Field(alias="timeoutSeconds", default=None) # type: ignore[assignment] - total_timeout_seconds: Optional[int] = Field(alias="totalTimeoutSeconds", default=None) # type: ignore[assignment] + output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") + tags: Optional[List["TagAdapter"]] = None + timeout_seconds: Optional[int] = Field(alias="timeoutSeconds", default=None) + total_timeout_seconds: Optional[int] = Field(alias="totalTimeoutSeconds", default=None) @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extended_workflow_def_adapter.py b/src/conductor/asyncio_client/adapters/models/extended_workflow_def_adapter.py index 63828f05..e7f51742 100644 --- a/src/conductor/asyncio_client/adapters/models/extended_workflow_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extended_workflow_def_adapter.py @@ -9,17 +9,17 @@ class ExtendedWorkflowDefAdapter(ExtendedWorkflowDef): - input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") # type: ignore[assignment] + input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") input_template: Optional[Dict[str, Any]] = Field(default=None, alias="inputTemplate") output_parameters: Optional[Dict[str, Any]] = Field(default=None, alias="outputParameters") - output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") # type: ignore[assignment] - rate_limit_config: Optional["RateLimitConfigAdapter"] = Field( # type: ignore[assignment] + output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") + rate_limit_config: Optional["RateLimitConfigAdapter"] = Field( default=None, alias="rateLimitConfig" ) - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] - tasks: List["WorkflowTaskAdapter"] # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None + tasks: List["WorkflowTaskAdapter"] variables: Optional[Dict[str, Any]] = None - timeout_seconds: Optional[int] = Field(default=None, alias="timeoutSeconds") # type: ignore[assignment] + timeout_seconds: Optional[int] = Field(default=None, alias="timeoutSeconds") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extension_range_options_adapter.py b/src/conductor/asyncio_client/adapters/models/extension_range_options_adapter.py index 9fcda2a1..5b4b1e96 100644 --- a/src/conductor/asyncio_client/adapters/models/extension_range_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extension_range_options_adapter.py @@ -11,26 +11,26 @@ class ExtensionRangeOptionsAdapter(ExtensionRangeOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - declaration_or_builder_list: Optional[List["DeclarationOrBuilderAdapter"]] = Field( # type: ignore[assignment] + declaration_or_builder_list: Optional[List["DeclarationOrBuilderAdapter"]] = Field( default=None, alias="declarationOrBuilderList" ) - default_instance_for_type: Optional["ExtensionRangeOptionsAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["ExtensionRangeOptionsAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/extension_range_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/extension_range_options_or_builder_adapter.py index 1859be85..23e6411b 100644 --- a/src/conductor/asyncio_client/adapters/models/extension_range_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/extension_range_options_or_builder_adapter.py @@ -10,29 +10,29 @@ class ExtensionRangeOptionsOrBuilderAdapter(ExtensionRangeOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - declaration_list: Optional[List["DeclarationAdapter"]] = Field( # type: ignore[assignment] + declaration_list: Optional[List["DeclarationAdapter"]] = Field( default=None, alias="declarationList" ) - declaration_or_builder_list: Optional[List["DeclarationOrBuilderAdapter"]] = Field( # type: ignore[assignment] + declaration_or_builder_list: Optional[List["DeclarationOrBuilderAdapter"]] = Field( default=None, alias="declarationOrBuilderList" ) - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features: Optional["FeatureSetAdapter"] = None + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/field_options_adapter.py b/src/conductor/asyncio_client/adapters/models/field_options_adapter.py index 89fe5202..a3227776 100644 --- a/src/conductor/asyncio_client/adapters/models/field_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/field_options_adapter.py @@ -11,29 +11,29 @@ class FieldOptionsAdapter(FieldOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["FieldOptionsAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["FieldOptionsAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - edition_defaults_list: Optional[List["EditionDefaultAdapter"]] = Field( # type: ignore[assignment] + edition_defaults_list: Optional[List["EditionDefaultAdapter"]] = Field( default=None, alias="editionDefaultsList" ) - edition_defaults_or_builder_list: Optional[List["EditionDefaultOrBuilderAdapter"]] = Field( # type: ignore[assignment] + edition_defaults_or_builder_list: Optional[List["EditionDefaultOrBuilderAdapter"]] = Field( default=None, alias="editionDefaultsOrBuilderList" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/field_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/field_options_or_builder_adapter.py index 3fc8fc51..df899eba 100644 --- a/src/conductor/asyncio_client/adapters/models/field_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/field_options_or_builder_adapter.py @@ -10,29 +10,29 @@ class FieldOptionsOrBuilderAdapter(FieldOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - edition_defaults_list: Optional[List["EditionDefaultAdapter"]] = Field( # type: ignore[assignment] + edition_defaults_list: Optional[List["EditionDefaultAdapter"]] = Field( default=None, alias="editionDefaultsList" ) - edition_defaults_or_builder_list: Optional[List["EditionDefaultOrBuilderAdapter"]] = Field( # type: ignore[assignment] + edition_defaults_or_builder_list: Optional[List["EditionDefaultOrBuilderAdapter"]] = Field( default=None, alias="editionDefaultsOrBuilderList" ) - features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features: Optional["FeatureSetAdapter"] = None + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/file_descriptor_adapter.py b/src/conductor/asyncio_client/adapters/models/file_descriptor_adapter.py index e42265ef..381f3ef9 100644 --- a/src/conductor/asyncio_client/adapters/models/file_descriptor_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/file_descriptor_adapter.py @@ -9,17 +9,17 @@ class FileDescriptorAdapter(FileDescriptor): - dependencies: Optional[List["FileDescriptorAdapter"]] = None # type: ignore[assignment] - enum_types: Optional[List["EnumDescriptorAdapter"]] = Field(default=None, alias="enumTypes") # type: ignore[assignment] - extensions: Optional[List["FieldDescriptorAdapter"]] = None # type: ignore[assignment] - file: Optional["FileDescriptorAdapter"] = None # type: ignore[assignment] - message_types: Optional[List["DescriptorAdapter"]] = Field(default=None, alias="messageTypes") # type: ignore[assignment] - options: Optional["FileOptionsAdapter"] = None # type: ignore[assignment] - proto: Optional["FileDescriptorProtoAdapter"] = None # type: ignore[assignment] - public_dependencies: Optional[List["FileDescriptorAdapter"]] = Field( # type: ignore[assignment] + dependencies: Optional[List["FileDescriptorAdapter"]] = None + enum_types: Optional[List["EnumDescriptorAdapter"]] = Field(default=None, alias="enumTypes") + extensions: Optional[List["FieldDescriptorAdapter"]] = None + file: Optional["FileDescriptorAdapter"] = None + message_types: Optional[List["DescriptorAdapter"]] = Field(default=None, alias="messageTypes") + options: Optional["FileOptionsAdapter"] = None + proto: Optional["FileDescriptorProtoAdapter"] = None + public_dependencies: Optional[List["FileDescriptorAdapter"]] = Field( default=None, alias="publicDependencies" ) - services: Optional[List["ServiceDescriptorAdapter"]] = None # type: ignore[assignment] + services: Optional[List["ServiceDescriptorAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/file_descriptor_proto_adapter.py b/src/conductor/asyncio_client/adapters/models/file_descriptor_proto_adapter.py index 201a4372..c27c7ab9 100644 --- a/src/conductor/asyncio_client/adapters/models/file_descriptor_proto_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/file_descriptor_proto_adapter.py @@ -10,47 +10,47 @@ class FileDescriptorProtoAdapter(FileDescriptorProto): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["FileDescriptorProtoAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["FileDescriptorProtoAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + enum_type_list: Optional[List["EnumDescriptorProtoAdapter"]] = Field( default=None, alias="enumTypeList" ) - enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + enum_type_or_builder_list: Optional[List["EnumDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="enumTypeOrBuilderList" ) - extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + extension_list: Optional[List["FieldDescriptorProtoAdapter"]] = Field( default=None, alias="extensionList" ) - extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + extension_or_builder_list: Optional[List["FieldDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="extensionOrBuilderList" ) - message_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + message_type_list: Optional[List["DescriptorProtoAdapter"]] = Field( default=None, alias="messageTypeList" ) - message_type_or_builder_list: Optional[List["DescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + message_type_or_builder_list: Optional[List["DescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="messageTypeOrBuilderList" ) - options: Optional["FileOptionsAdapter"] = None # type: ignore[assignment] - options_or_builder: Optional["FileOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] + options: Optional["FileOptionsAdapter"] = None + options_or_builder: Optional["FileOptionsOrBuilderAdapter"] = Field( default=None, alias="optionsOrBuilder" ) - service_list: Optional[List["ServiceDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + service_list: Optional[List["ServiceDescriptorProtoAdapter"]] = Field( default=None, alias="serviceList" ) - service_or_builder_list: Optional[List["ServiceDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + service_or_builder_list: Optional[List["ServiceDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="serviceOrBuilderList" ) - source_code_info: Optional["SourceCodeInfoAdapter"] = Field( # type: ignore[assignment] + source_code_info: Optional["SourceCodeInfoAdapter"] = Field( default=None, alias="sourceCodeInfo" ) - source_code_info_or_builder: Optional["SourceCodeInfoOrBuilderAdapter"] = Field( # type: ignore[assignment] + source_code_info_or_builder: Optional["SourceCodeInfoOrBuilderAdapter"] = Field( default=None, alias="sourceCodeInfoOrBuilder" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/file_options_adapter.py b/src/conductor/asyncio_client/adapters/models/file_options_adapter.py index 9f9c21c9..211a7619 100644 --- a/src/conductor/asyncio_client/adapters/models/file_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/file_options_adapter.py @@ -11,23 +11,23 @@ class FileOptionsAdapter(FileOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["FileOptionsAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["FileOptionsAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/file_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/file_options_or_builder_adapter.py index e5c7e680..d7d7bad2 100644 --- a/src/conductor/asyncio_client/adapters/models/file_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/file_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class FileOptionsOrBuilderAdapter(FileOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features: Optional["FeatureSetAdapter"] = None + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/granted_access_response_adapter.py b/src/conductor/asyncio_client/adapters/models/granted_access_response_adapter.py index d954f0cc..08526c8c 100644 --- a/src/conductor/asyncio_client/adapters/models/granted_access_response_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/granted_access_response_adapter.py @@ -9,7 +9,7 @@ class GrantedAccessResponseAdapter(GrantedAccessResponse): - granted_access: Optional[List["GrantedAccessAdapter"]] = Field( # type: ignore[assignment] + granted_access: Optional[List["GrantedAccessAdapter"]] = Field( default=None, alias="grantedAccess" ) diff --git a/src/conductor/asyncio_client/adapters/models/group_adapter.py b/src/conductor/asyncio_client/adapters/models/group_adapter.py index f7c19fda..e378a20d 100644 --- a/src/conductor/asyncio_client/adapters/models/group_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/group_adapter.py @@ -9,7 +9,7 @@ class GroupAdapter(Group): - roles: Optional[List["RoleAdapter"]] = None # type: ignore[assignment] + roles: Optional[List["RoleAdapter"]] = None @field_validator("default_access") def default_access_validate_enum(cls, value): diff --git a/src/conductor/asyncio_client/adapters/models/integration_adapter.py b/src/conductor/asyncio_client/adapters/models/integration_adapter.py index 53291829..c10b1b34 100644 --- a/src/conductor/asyncio_client/adapters/models/integration_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/integration_adapter.py @@ -9,9 +9,9 @@ class IntegrationAdapter(Integration): - apis: Optional[List["IntegrationApiAdapter"]] = None # type: ignore[assignment] + apis: Optional[List["IntegrationApiAdapter"]] = None configuration: Optional[Dict[str, Any]] = None - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None @field_validator("category") def category_validate_enum(cls, value): diff --git a/src/conductor/asyncio_client/adapters/models/integration_api_adapter.py b/src/conductor/asyncio_client/adapters/models/integration_api_adapter.py index f0bab337..c39911b5 100644 --- a/src/conductor/asyncio_client/adapters/models/integration_api_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/integration_api_adapter.py @@ -9,7 +9,7 @@ class IntegrationApiAdapter(IntegrationApi): configuration: Optional[Dict[str, Any]] = None - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/integration_def_adapter.py b/src/conductor/asyncio_client/adapters/models/integration_def_adapter.py index 7c862be4..192cacbe 100644 --- a/src/conductor/asyncio_client/adapters/models/integration_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/integration_def_adapter.py @@ -9,7 +9,7 @@ class IntegrationDefAdapter(IntegrationDef): - configuration: Optional[List["IntegrationDefFormFieldAdapter"]] = None # type: ignore[assignment] + configuration: Optional[List["IntegrationDefFormFieldAdapter"]] = None @field_validator("category") def category_validate_enum(cls, value): diff --git a/src/conductor/asyncio_client/adapters/models/integration_def_form_field_adapter.py b/src/conductor/asyncio_client/adapters/models/integration_def_form_field_adapter.py index c8976c2b..d10cf6cd 100644 --- a/src/conductor/asyncio_client/adapters/models/integration_def_form_field_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/integration_def_form_field_adapter.py @@ -9,8 +9,8 @@ class IntegrationDefFormFieldAdapter(IntegrationDefFormField): - value_options: Optional[List["OptionAdapter"]] = Field(default=None, alias="valueOptions") # type: ignore[assignment] - depends_on: Optional[List["IntegrationDefFormFieldAdapter"]] = Field( # type: ignore[assignment] + value_options: Optional[List["OptionAdapter"]] = Field(default=None, alias="valueOptions") + depends_on: Optional[List["IntegrationDefFormFieldAdapter"]] = Field( default=None, alias="dependsOn" ) __properties: ClassVar[List[str]] = [ diff --git a/src/conductor/asyncio_client/adapters/models/message_options_adapter.py b/src/conductor/asyncio_client/adapters/models/message_options_adapter.py index 8becbfb1..ad6a528b 100644 --- a/src/conductor/asyncio_client/adapters/models/message_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/message_options_adapter.py @@ -11,23 +11,23 @@ class MessageOptionsAdapter(MessageOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["MessageOptionsAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageOptionsAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/message_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/message_options_or_builder_adapter.py index 926883bb..1f4872b8 100644 --- a/src/conductor/asyncio_client/adapters/models/message_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/message_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class MessageOptionsOrBuilderAdapter(MessageOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features: Optional["FeatureSetAdapter"] = None + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/message_template_adapter.py b/src/conductor/asyncio_client/adapters/models/message_template_adapter.py index a7574c12..9e281cd3 100644 --- a/src/conductor/asyncio_client/adapters/models/message_template_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/message_template_adapter.py @@ -8,7 +8,7 @@ class MessageTemplateAdapter(MessageTemplate): - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/method_options_adapter.py b/src/conductor/asyncio_client/adapters/models/method_options_adapter.py index 7d8c6b25..e58fa3b6 100644 --- a/src/conductor/asyncio_client/adapters/models/method_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/method_options_adapter.py @@ -11,23 +11,23 @@ class MethodOptionsAdapter(MethodOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["MethodOptionsAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MethodOptionsAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features: Optional["FeatureSetAdapter"] = None + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/method_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/method_options_or_builder_adapter.py index bf138329..10d73e46 100644 --- a/src/conductor/asyncio_client/adapters/models/method_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/method_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class MethodOptionsOrBuilderAdapter(MethodOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features: Optional["FeatureSetAdapter"] = None + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/oneof_options_adapter.py b/src/conductor/asyncio_client/adapters/models/oneof_options_adapter.py index cd7c36b1..63779f55 100644 --- a/src/conductor/asyncio_client/adapters/models/oneof_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/oneof_options_adapter.py @@ -11,23 +11,23 @@ class OneofOptionsAdapter(OneofOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["OneofOptionsAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["OneofOptionsAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features: Optional["FeatureSetAdapter"] = None + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/oneof_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/oneof_options_or_builder_adapter.py index e106b69c..172a7759 100644 --- a/src/conductor/asyncio_client/adapters/models/oneof_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/oneof_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class OneofOptionsOrBuilderAdapter(OneofOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - features: Optional["FeatureSetAdapter"] = None # type: ignore[assignment] - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features: Optional["FeatureSetAdapter"] = None + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/role_adapter.py b/src/conductor/asyncio_client/adapters/models/role_adapter.py index 6870ea85..a9d30cce 100644 --- a/src/conductor/asyncio_client/adapters/models/role_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/role_adapter.py @@ -8,7 +8,7 @@ class RoleAdapter(Role): - permissions: Optional[List["PermissionAdapter"]] = None # type: ignore[assignment] + permissions: Optional[List["PermissionAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/scrollable_search_result_workflow_summary_adapter.py b/src/conductor/asyncio_client/adapters/models/scrollable_search_result_workflow_summary_adapter.py index 349a0654..49351bb4 100644 --- a/src/conductor/asyncio_client/adapters/models/scrollable_search_result_workflow_summary_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/scrollable_search_result_workflow_summary_adapter.py @@ -8,7 +8,7 @@ class ScrollableSearchResultWorkflowSummaryAdapter(ScrollableSearchResultWorkflowSummary): - results: Optional[List["WorkflowSummaryAdapter"]] = None # type: ignore[assignment] + results: Optional[List["WorkflowSummaryAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/search_result_handled_event_response_adapter.py b/src/conductor/asyncio_client/adapters/models/search_result_handled_event_response_adapter.py index fde3d631..c2c012ed 100644 --- a/src/conductor/asyncio_client/adapters/models/search_result_handled_event_response_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/search_result_handled_event_response_adapter.py @@ -8,7 +8,7 @@ class SearchResultHandledEventResponseAdapter(SearchResultHandledEventResponse): - results: Optional[List["HandledEventResponseAdapter"]] = None # type: ignore[assignment] + results: Optional[List["HandledEventResponseAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/search_result_task_summary_adapter.py b/src/conductor/asyncio_client/adapters/models/search_result_task_summary_adapter.py index 82078cef..3629ba0c 100644 --- a/src/conductor/asyncio_client/adapters/models/search_result_task_summary_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/search_result_task_summary_adapter.py @@ -8,7 +8,7 @@ class SearchResultTaskSummaryAdapter(SearchResultTaskSummary): - results: Optional[List["TaskSummaryAdapter"]] = None # type: ignore[assignment] + results: Optional[List["TaskSummaryAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/search_result_workflow_schedule_execution_model_adapter.py b/src/conductor/asyncio_client/adapters/models/search_result_workflow_schedule_execution_model_adapter.py index a81255f8..6a174a11 100644 --- a/src/conductor/asyncio_client/adapters/models/search_result_workflow_schedule_execution_model_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/search_result_workflow_schedule_execution_model_adapter.py @@ -10,7 +10,7 @@ class SearchResultWorkflowScheduleExecutionModelAdapter(SearchResultWorkflowScheduleExecutionModel): - results: Optional[List["WorkflowScheduleExecutionModelAdapter"]] = None # type: ignore[assignment] + results: Optional[List["WorkflowScheduleExecutionModelAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py b/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py index 600f9524..c58e6aba 100644 --- a/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_descriptor_adapter.py @@ -8,10 +8,10 @@ class ServiceDescriptorAdapter(ServiceDescriptor): - file: Optional["FileDescriptorAdapter"] = None # type: ignore[assignment] - methods: Optional[List["MethodDescriptorAdapter"]] = None # type: ignore[assignment] - options: Optional["ServiceOptionsAdapter"] = None # type: ignore[assignment] - proto: Optional["ServiceDescriptorProtoAdapter"] = None # type: ignore[assignment] + file: Optional["FileDescriptorAdapter"] = None + methods: Optional[List["MethodDescriptorAdapter"]] = None + options: Optional["ServiceOptionsAdapter"] = None + proto: Optional["ServiceDescriptorProtoAdapter"] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_adapter.py b/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_adapter.py index d8f2981c..808e1526 100644 --- a/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_adapter.py @@ -10,23 +10,23 @@ class ServiceDescriptorProtoAdapter(ServiceDescriptorProto): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["ServiceDescriptorProtoAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["ServiceDescriptorProtoAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - method_list: Optional[List["MethodDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + method_list: Optional[List["MethodDescriptorProtoAdapter"]] = Field( default=None, alias="methodList" ) - method_or_builder_list: Optional[List["MethodDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + method_or_builder_list: Optional[List["MethodDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="methodOrBuilderList" ) - options: Optional["ServiceOptionsAdapter"] = None # type: ignore[assignment] - options_or_builder: Optional["ServiceOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] + options: Optional["ServiceOptionsAdapter"] = None + options_or_builder: Optional["ServiceOptionsOrBuilderAdapter"] = Field( default=None, alias="optionsOrBuilder" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_or_builder_adapter.py index a2d9f855..ffe2a434 100644 --- a/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_descriptor_proto_or_builder_adapter.py @@ -10,23 +10,23 @@ class ServiceDescriptorProtoOrBuilderAdapter(ServiceDescriptorProtoOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - method_list: Optional[List["MethodDescriptorProtoAdapter"]] = Field( # type: ignore[assignment] + method_list: Optional[List["MethodDescriptorProtoAdapter"]] = Field( default=None, alias="methodList" ) - method_or_builder_list: Optional[List["MethodDescriptorProtoOrBuilderAdapter"]] = Field( # type: ignore[assignment] + method_or_builder_list: Optional[List["MethodDescriptorProtoOrBuilderAdapter"]] = Field( default=None, alias="methodOrBuilderList" ) - options: Optional["ServiceOptionsAdapter"] = None # type: ignore[assignment] - options_or_builder: Optional["ServiceOptionsOrBuilderAdapter"] = Field( # type: ignore[assignment] + options: Optional["ServiceOptionsAdapter"] = None + options_or_builder: Optional["ServiceOptionsOrBuilderAdapter"] = Field( default=None, alias="optionsOrBuilder" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_options_adapter.py b/src/conductor/asyncio_client/adapters/models/service_options_adapter.py index 6afe75a7..41197a45 100644 --- a/src/conductor/asyncio_client/adapters/models/service_options_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_options_adapter.py @@ -11,23 +11,23 @@ class ServiceOptionsAdapter(ServiceOptions): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") all_fields_raw: Optional[Dict[str, Any]] = Field(default=None, alias="allFieldsRaw") - default_instance_for_type: Optional["ServiceOptionsAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["ServiceOptionsAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/service_options_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/service_options_or_builder_adapter.py index c72fe67c..8fe0569b 100644 --- a/src/conductor/asyncio_client/adapters/models/service_options_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/service_options_or_builder_adapter.py @@ -10,23 +10,23 @@ class ServiceOptionsOrBuilderAdapter(ServiceOptionsOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) features: Optional["FeatureSetAdapter"] = None - features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( # type: ignore[assignment] + features_or_builder: Optional["FeatureSetOrBuilderAdapter"] = Field( default=None, alias="featuresOrBuilder" ) - uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( # type: ignore[assignment] + uninterpreted_option_list: Optional[List["UninterpretedOptionAdapter"]] = Field( default=None, alias="uninterpretedOptionList" ) uninterpreted_option_or_builder_list: Optional[List["UninterpretedOptionOrBuilderAdapter"]] = ( - Field(default=None, alias="uninterpretedOptionOrBuilderList") # type: ignore[assignment] + Field(default=None, alias="uninterpretedOptionOrBuilderList") ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/source_code_info_adapter.py b/src/conductor/asyncio_client/adapters/models/source_code_info_adapter.py index 181d8f22..4025cdd1 100644 --- a/src/conductor/asyncio_client/adapters/models/source_code_info_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/source_code_info_adapter.py @@ -10,17 +10,17 @@ class SourceCodeInfoAdapter(SourceCodeInfo): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["SourceCodeInfoAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["SourceCodeInfoAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - location_list: Optional[List["LocationAdapter"]] = Field(default=None, alias="locationList") # type: ignore[assignment] - location_or_builder_list: Optional[List["LocationOrBuilderAdapter"]] = Field( # type: ignore[assignment] + location_list: Optional[List["LocationAdapter"]] = Field(default=None, alias="locationList") + location_or_builder_list: Optional[List["LocationOrBuilderAdapter"]] = Field( default=None, alias="locationOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/source_code_info_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/source_code_info_or_builder_adapter.py index d7b9b98f..e2d2c6fa 100644 --- a/src/conductor/asyncio_client/adapters/models/source_code_info_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/source_code_info_or_builder_adapter.py @@ -10,17 +10,17 @@ class SourceCodeInfoOrBuilderAdapter(SourceCodeInfoOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - location_list: Optional[List["LocationAdapter"]] = Field(default=None, alias="locationList") # type: ignore[assignment] - location_or_builder_list: Optional[List["LocationOrBuilderAdapter"]] = Field( # type: ignore[assignment] + location_list: Optional[List["LocationAdapter"]] = Field(default=None, alias="locationList") + location_or_builder_list: Optional[List["LocationOrBuilderAdapter"]] = Field( default=None, alias="locationOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/task_def_adapter.py b/src/conductor/asyncio_client/adapters/models/task_def_adapter.py index 915ff1db..71afa28e 100644 --- a/src/conductor/asyncio_client/adapters/models/task_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/task_def_adapter.py @@ -9,11 +9,11 @@ class TaskDefAdapter(TaskDef): - input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") # type: ignore[assignment] + input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") input_template: Optional[Dict[str, Any]] = Field(default=None, alias="inputTemplate") - output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") # type: ignore[assignment] - timeout_seconds: Optional[int] = Field(alias="timeoutSeconds", default=None) # type: ignore[assignment] - total_timeout_seconds: Optional[int] = Field(alias="totalTimeoutSeconds", default=None) # type: ignore[assignment] + output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") + timeout_seconds: Optional[int] = Field(alias="timeoutSeconds", default=None) + total_timeout_seconds: Optional[int] = Field(alias="totalTimeoutSeconds", default=None) @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/task_result_adapter.py b/src/conductor/asyncio_client/adapters/models/task_result_adapter.py index 286aba85..c2816664 100644 --- a/src/conductor/asyncio_client/adapters/models/task_result_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/task_result_adapter.py @@ -9,7 +9,7 @@ class TaskResultAdapter(TaskResult): - logs: Optional[List["TaskExecLogAdapter"]] = None # type: ignore[assignment] + logs: Optional[List["TaskExecLogAdapter"]] = None output_data: Optional[Dict[str, Any]] = Field(default=None, alias="outputData") @classmethod diff --git a/src/conductor/asyncio_client/adapters/models/uninterpreted_option_adapter.py b/src/conductor/asyncio_client/adapters/models/uninterpreted_option_adapter.py index da41ccab..c767d5f0 100644 --- a/src/conductor/asyncio_client/adapters/models/uninterpreted_option_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/uninterpreted_option_adapter.py @@ -10,17 +10,17 @@ class UninterpretedOptionAdapter(UninterpretedOption): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["UninterpretedOptionAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["UninterpretedOptionAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - name_list: Optional[List["NamePartAdapter"]] = Field(default=None, alias="nameList") # type: ignore[assignment] - name_or_builder_list: Optional[List["NamePartOrBuilderAdapter"]] = Field( # type: ignore[assignment] + name_list: Optional[List["NamePartAdapter"]] = Field(default=None, alias="nameList") + name_or_builder_list: Optional[List["NamePartOrBuilderAdapter"]] = Field( default=None, alias="nameOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/uninterpreted_option_or_builder_adapter.py b/src/conductor/asyncio_client/adapters/models/uninterpreted_option_or_builder_adapter.py index 68ed98d2..5ab915d8 100644 --- a/src/conductor/asyncio_client/adapters/models/uninterpreted_option_or_builder_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/uninterpreted_option_or_builder_adapter.py @@ -10,17 +10,17 @@ class UninterpretedOptionOrBuilderAdapter(UninterpretedOptionOrBuilder): all_fields: Optional[Dict[str, Any]] = Field(default=None, alias="allFields") - default_instance_for_type: Optional["MessageAdapter"] = Field( # type: ignore[assignment] + default_instance_for_type: Optional["MessageAdapter"] = Field( default=None, alias="defaultInstanceForType" ) - descriptor_for_type: Optional["DescriptorAdapter"] = Field( # type: ignore[assignment] + descriptor_for_type: Optional["DescriptorAdapter"] = Field( default=None, alias="descriptorForType" ) - name_list: Optional[List["NamePartAdapter"]] = Field(default=None, alias="nameList") # type: ignore[assignment] - name_or_builder_list: Optional[List["NamePartOrBuilderAdapter"]] = Field( # type: ignore[assignment] + name_list: Optional[List["NamePartAdapter"]] = Field(default=None, alias="nameList") + name_or_builder_list: Optional[List["NamePartOrBuilderAdapter"]] = Field( default=None, alias="nameOrBuilderList" ) - unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") # type: ignore[assignment] + unknown_fields: Optional["UnknownFieldSetAdapter"] = Field(default=None, alias="unknownFields") @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/webhook_config_adapter.py b/src/conductor/asyncio_client/adapters/models/webhook_config_adapter.py index 58bb8077..48831d7a 100644 --- a/src/conductor/asyncio_client/adapters/models/webhook_config_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/webhook_config_adapter.py @@ -9,8 +9,8 @@ class WebhookConfigAdapter(WebhookConfig): - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] - webhook_execution_history: Optional[List["WebhookExecutionHistoryAdapter"]] = Field( # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None + webhook_execution_history: Optional[List["WebhookExecutionHistoryAdapter"]] = Field( default=None, alias="webhookExecutionHistory" ) workflows_to_start: Optional[Dict[str, Any]] = Field(default=None, alias="workflowsToStart") diff --git a/src/conductor/asyncio_client/adapters/models/workflow_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_adapter.py index f59230e2..c2afe942 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_adapter.py @@ -15,11 +15,11 @@ class WorkflowAdapter(Workflow): input: Optional[Dict[str, Any]] = None output: Optional[Dict[str, Any]] = None variables: Optional[Dict[str, Any]] = None - workflow_definition: Optional["WorkflowDefAdapter"] = Field( # type: ignore[assignment] + workflow_definition: Optional["WorkflowDefAdapter"] = Field( default=None, alias="workflowDefinition" ) - tasks: Optional[List["TaskAdapter"]] = None # type: ignore[assignment] - history: Optional[List["WorkflowAdapter"]] = None # type: ignore[assignment] + tasks: Optional[List["TaskAdapter"]] = None + history: Optional[List["WorkflowAdapter"]] = None def is_completed(self) -> bool: """Checks if the workflow has completed diff --git a/src/conductor/asyncio_client/adapters/models/workflow_def_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_def_adapter.py index 672e74a2..89e91aef 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_def_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_def_adapter.py @@ -13,14 +13,14 @@ class WorkflowDefAdapter(WorkflowDef): output_parameters: Optional[Dict[str, Any]] = Field(default=None, alias="outputParameters") variables: Optional[Dict[str, Any]] = None metadata: Optional[Dict[str, Any]] = None - tasks: List["WorkflowTaskAdapter"] # type: ignore[assignment] + tasks: List["WorkflowTaskAdapter"] schema_version: Optional[int] = Field(default=None, alias="schemaVersion") - output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") # type: ignore[assignment] - input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") # type: ignore[assignment] - rate_limit_config: Optional["RateLimitConfigAdapter"] = Field( # type: ignore[assignment] + output_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="outputSchema") + input_schema: Optional["SchemaDefAdapter"] = Field(default=None, alias="inputSchema") + rate_limit_config: Optional["RateLimitConfigAdapter"] = Field( default=None, alias="rateLimitConfig" ) - timeout_seconds: Optional[int] = Field(default=None, alias="timeoutSeconds") # type: ignore[assignment] + timeout_seconds: Optional[int] = Field(default=None, alias="timeoutSeconds") __properties: ClassVar[List[str]] = [ "createTime", diff --git a/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py index 80fecc01..8381c841 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py @@ -10,20 +10,20 @@ class WorkflowRunAdapter(WorkflowRun): input: Optional[Dict[str, Any]] = None output: Optional[Dict[str, Any]] = None - tasks: Optional[List["TaskAdapter"]] = None # type: ignore[assignment] + tasks: Optional[List["TaskAdapter"]] = None variables: Optional[Dict[str, Any]] = None @property - def current_task(self) -> TaskAdapter: # type: ignore[override] + def current_task(self) -> TaskAdapter: current = None for task in self.tasks: # type: ignore[union-attr] if task.status in ("SCHEDULED", "IN_PROGRESS"): current = task - return current # type: ignore[return-value] + return current def get_task( self, name: Optional[str] = None, task_reference_name: Optional[str] = None - ) -> TaskAdapter: # type: ignore[override] + ) -> TaskAdapter: if name is None and task_reference_name is None: raise Exception( "ONLY one of name or task_reference_name MUST be provided. None were provided" @@ -40,7 +40,7 @@ def get_task( or task.workflow_task.task_reference_name == task_reference_name # type: ignore[union-attr] ): current = task - return current # type: ignore[return-value] + return current @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/workflow_schedule_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_schedule_adapter.py index 06662bf8..941b6cf5 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_schedule_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_schedule_adapter.py @@ -9,10 +9,10 @@ class WorkflowScheduleAdapter(WorkflowSchedule): - start_workflow_request: Optional["StartWorkflowRequestAdapter"] = Field( # type: ignore[override] + start_workflow_request: Optional["StartWorkflowRequestAdapter"] = Field( default=None, alias="startWorkflowRequest" ) - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/workflow_schedule_model_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_schedule_model_adapter.py index 2d588eb4..e0d3963f 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_schedule_model_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_schedule_model_adapter.py @@ -9,10 +9,10 @@ class WorkflowScheduleModelAdapter(WorkflowScheduleModel): - start_workflow_request: Optional["StartWorkflowRequestAdapter"] = Field( # type: ignore[override] + start_workflow_request: Optional["StartWorkflowRequestAdapter"] = Field( default=None, alias="startWorkflowRequest" ) - tags: Optional[List["TagAdapter"]] = None # type: ignore[assignment] + tags: Optional[List["TagAdapter"]] = None @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: diff --git a/src/conductor/asyncio_client/adapters/models/workflow_task_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_task_adapter.py index 69eaa56b..c7460229 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_task_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_task_adapter.py @@ -9,19 +9,19 @@ class WorkflowTaskAdapter(WorkflowTask): - cache_config: Optional["CacheConfigAdapter"] = Field(default=None, alias="cacheConfig") # type: ignore[assignment] - default_case: Optional[List["WorkflowTaskAdapter"]] = Field(default=None, alias="defaultCase") # type: ignore[assignment] - fork_tasks: Optional[List[List["WorkflowTaskAdapter"]]] = Field(default=None, alias="forkTasks") # type: ignore[assignment] + cache_config: Optional["CacheConfigAdapter"] = Field(default=None, alias="cacheConfig") + default_case: Optional[List["WorkflowTaskAdapter"]] = Field(default=None, alias="defaultCase") + fork_tasks: Optional[List[List["WorkflowTaskAdapter"]]] = Field(default=None, alias="forkTasks") input_parameters: Optional[Dict[str, Any]] = Field(default=None, alias="inputParameters") - loop_over: Optional[List["WorkflowTaskAdapter"]] = Field(default=None, alias="loopOver") # type: ignore[assignment] - on_state_change: Optional[Dict[str, List["StateChangeEventAdapter"]]] = Field( # type: ignore[assignment] + loop_over: Optional[List["WorkflowTaskAdapter"]] = Field(default=None, alias="loopOver") + on_state_change: Optional[Dict[str, List["StateChangeEventAdapter"]]] = Field( default=None, alias="onStateChange" ) - sub_workflow_param: Optional["SubWorkflowParamsAdapter"] = Field( # type: ignore[assignment] + sub_workflow_param: Optional["SubWorkflowParamsAdapter"] = Field( default=None, alias="subWorkflowParam" ) - task_definition: Optional["TaskDefAdapter"] = Field(default=None, alias="taskDefinition") # type: ignore[assignment] - decision_cases: Optional[Dict[str, List["WorkflowTaskAdapter"]]] = Field( # type: ignore[assignment] + task_definition: Optional["TaskDefAdapter"] = Field(default=None, alias="taskDefinition") + decision_cases: Optional[Dict[str, List["WorkflowTaskAdapter"]]] = Field( default=None, alias="decisionCases" ) diff --git a/src/conductor/asyncio_client/adapters/models/workflow_test_request_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_test_request_adapter.py index 823ff8b8..f76939f5 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_test_request_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_test_request_adapter.py @@ -10,13 +10,13 @@ class WorkflowTestRequestAdapter(WorkflowTestRequest): input: Optional[Dict[str, Any]] = None - sub_workflow_test_request: Optional[Dict[str, "WorkflowTestRequestAdapter"]] = Field( # type: ignore[assignment] + sub_workflow_test_request: Optional[Dict[str, "WorkflowTestRequestAdapter"]] = Field( default=None, alias="subWorkflowTestRequest" ) - task_ref_to_mock_output: Optional[Dict[str, List["TaskMockAdapter"]]] = Field( # type: ignore[assignment] + task_ref_to_mock_output: Optional[Dict[str, List["TaskMockAdapter"]]] = Field( default=None, alias="taskRefToMockOutput" ) - workflow_def: Optional["WorkflowDefAdapter"] = Field(default=None, alias="workflowDef") # type: ignore[assignment] + workflow_def: Optional["WorkflowDefAdapter"] = Field(default=None, alias="workflowDef") priority: Optional[int] = Field(default=None, alias="priority") @classmethod diff --git a/src/conductor/asyncio_client/configuration/configuration.py b/src/conductor/asyncio_client/configuration/configuration.py index aec13db3..5532560f 100644 --- a/src/conductor/asyncio_client/configuration/configuration.py +++ b/src/conductor/asyncio_client/configuration/configuration.py @@ -134,7 +134,7 @@ def __init__( if server_url is not None: self.server_url = server_url else: - self.server_url = os.getenv("CONDUCTOR_SERVER_URL") # type: ignore[assignment] + self.server_url = os.getenv("CONDUCTOR_SERVER_URL") if self.server_url is None or self.server_url == "": self.server_url = "http://localhost:8080/api" @@ -143,12 +143,12 @@ def __init__( if auth_key is not None: self.auth_key = auth_key else: - self.auth_key = os.getenv("CONDUCTOR_AUTH_KEY") # type: ignore[assignment] + self.auth_key = os.getenv("CONDUCTOR_AUTH_KEY") if auth_secret is not None: self.auth_secret = auth_secret else: - self.auth_secret = os.getenv("CONDUCTOR_AUTH_SECRET") # type: ignore[assignment] + self.auth_secret = os.getenv("CONDUCTOR_AUTH_SECRET") # Additional worker properties with environment variable fallback self.polling_interval = polling_interval or self._get_env_int( @@ -176,7 +176,7 @@ def __init__( self.proxy_headers: Optional[Dict[str, Any]] = proxy_headers if not self.proxy_headers and os.getenv("CONDUCTOR_PROXY_HEADERS"): try: - self.proxy_headers = json.loads(os.getenv("CONDUCTOR_PROXY_HEADERS")) # type: ignore[arg-type] + self.proxy_headers = json.loads(os.getenv("CONDUCTOR_PROXY_HEADERS")) except (json.JSONDecodeError, TypeError): # If JSON parsing fails, treat as a single header value self.proxy_headers = {"Authorization": os.getenv("CONDUCTOR_PROXY_HEADERS")} @@ -213,19 +213,19 @@ def __init__( http_config_kwargs["verify_ssl"] = self._get_env_bool("CONDUCTOR_VERIFY_SSL", True) http_config_kwargs.update(kwargs) - self._http_config = HttpConfiguration(**http_config_kwargs) # type: ignore[arg-type] + self._http_config = HttpConfiguration(**http_config_kwargs) # Set proxy configuration on the HTTP config if self.proxy: self._http_config.proxy = self.proxy if self.proxy_headers: - self._http_config.proxy_headers = self.proxy_headers # type: ignore[assignment] + self._http_config.proxy_headers = self.proxy_headers # Set proxy configuration on the HTTP config if self.proxy: self._http_config.proxy = self.proxy if self.proxy_headers: - self._http_config.proxy_headers = self.proxy_headers # type: ignore[assignment] + self._http_config.proxy_headers = self.proxy_headers # Debug switch and logging setup self.__debug = debug diff --git a/src/conductor/asyncio_client/event/event_client.py b/src/conductor/asyncio_client/event/event_client.py index cf9e5856..f9e2379b 100644 --- a/src/conductor/asyncio_client/event/event_client.py +++ b/src/conductor/asyncio_client/event/event_client.py @@ -26,7 +26,7 @@ async def get_queue_configuration(self, queue_type: str, queue_name: str): async def put_queue_configuration(self, queue_configuration: QueueConfiguration): return await self.client.put_queue_config( - body=queue_configuration.get_worker_configuration(), # type: ignore[arg-type] + body=queue_configuration.get_worker_configuration(), queue_name=queue_configuration.queue_name, queue_type=queue_configuration.queue_type, ) diff --git a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py index 33bdcedf..b06e915d 100644 --- a/src/conductor/asyncio_client/orkes/orkes_authorization_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_authorization_client.py @@ -54,7 +54,7 @@ async def update_user( async def get_user(self, user_id: str) -> Optional[ConductorUserAdapter]: """Get user by ID""" result = await self.user_api.get_user(id=user_id) - return ConductorUserAdapter.from_dict(result) # type: ignore[arg-type] + return ConductorUserAdapter.from_dict(result) async def delete_user(self, user_id: str) -> None: """Delete user by ID""" @@ -72,7 +72,7 @@ async def create_application( result = await self.application_api.create_application( create_or_update_application_request=application ) - return ExtendedConductorApplicationAdapter.from_dict(result) # type: ignore[arg-type] + return ExtendedConductorApplicationAdapter.from_dict(result) async def update_application( self, application_id: str, application: CreateOrUpdateApplicationRequestAdapter @@ -81,14 +81,14 @@ async def update_application( result = await self.application_api.update_application( id=application_id, create_or_update_application_request=application ) - return ExtendedConductorApplicationAdapter.from_dict(result) # type: ignore[arg-type] + return ExtendedConductorApplicationAdapter.from_dict(result) async def get_application( self, application_id: str ) -> Optional[ExtendedConductorApplicationAdapter]: """Get application by ID""" result = await self.application_api.get_application(id=application_id) - return ExtendedConductorApplicationAdapter.from_dict(result) # type: ignore[arg-type] + return ExtendedConductorApplicationAdapter.from_dict(result) async def delete_application(self, application_id: str) -> None: """Delete application by ID""" @@ -114,12 +114,12 @@ async def update_group( result = await self.group_api.upsert_group( id=group_id, upsert_group_request=upsert_group_request ) - return GroupAdapter.from_dict(result) # type: ignore[arg-type] + return GroupAdapter.from_dict(result) async def get_group(self, group_id: str) -> Optional[GroupAdapter]: """Get group by ID""" result = await self.group_api.get_group(id=group_id) - return GroupAdapter.from_dict(result) # type: ignore[arg-type] + return GroupAdapter.from_dict(result) async def delete_group(self, group_id: str) -> None: """Delete group by ID""" @@ -179,14 +179,14 @@ async def upsert_user( ) -> Optional[ConductorUserAdapter]: """Alias for create_user/update_user""" result = await self.create_user(user_id, upsert_user_request) - return ConductorUserAdapter.from_dict(result) # type: ignore[arg-type] + return ConductorUserAdapter.from_dict(result) async def upsert_group( self, group_id: str, upsert_group_request: UpsertGroupRequest ) -> Optional[GroupAdapter]: """Alias for create_group/update_group""" result = await self.create_group(group_id, upsert_group_request) - return GroupAdapter.from_dict(result) # type: ignore[arg-type] + return GroupAdapter.from_dict(result) async def set_application_tags(self, tags: List[TagAdapter], application_id: str): await self.application_api.put_tag_for_application(application_id, tags) @@ -250,4 +250,4 @@ async def get_app_by_access_key_id( self, access_key_id: str, *args, **kwargs ) -> Optional[ExtendedConductorApplicationAdapter]: result = await self.application_api.get_app_by_access_key_id(access_key_id, *args, **kwargs) - return ExtendedConductorApplicationAdapter.from_dict(result) # type: ignore[arg-type] + return ExtendedConductorApplicationAdapter.from_dict(result) diff --git a/src/conductor/asyncio_client/orkes/orkes_workflow_client.py b/src/conductor/asyncio_client/orkes/orkes_workflow_client.py index 6ab444c6..b0f16f33 100644 --- a/src/conductor/asyncio_client/orkes/orkes_workflow_client.py +++ b/src/conductor/asyncio_client/orkes/orkes_workflow_client.py @@ -234,7 +234,7 @@ async def skip_task_from_workflow( await self.workflow_api.skip_task_from_workflow( workflow_id=workflow_id, task_reference_name=task_reference_name, - skip_task_request=skip_task_request, # type: ignore[arg-type] + skip_task_request=skip_task_request, ) async def jump_to_task( diff --git a/src/conductor/asyncio_client/worker/worker.py b/src/conductor/asyncio_client/worker/worker.py index 6068a5a1..864af7d4 100644 --- a/src/conductor/asyncio_client/worker/worker.py +++ b/src/conductor/asyncio_client/worker/worker.py @@ -87,11 +87,11 @@ def execute(self, task: TaskAdapter) -> TaskResultAdapter: task_input[input_name] = default_value else: task_input[input_name] = None - task_output = self.execute_function(**task_input) # type: ignore[call-arg] + task_output = self.execute_function(**task_input) if isinstance(task_output, TaskResultAdapter): - task_output.task_id = task.task_id # type: ignore[assignment] - task_output.workflow_instance_id = task.workflow_instance_id # type: ignore[assignment] + task_output.task_id = task.task_id + task_output.workflow_instance_id = task.workflow_instance_id return task_output else: task_result.status = TaskResultStatus.COMPLETED @@ -122,7 +122,7 @@ def execute(self, task: TaskAdapter) -> TaskResultAdapter: if dataclasses.is_dataclass(type(task_result.output_data)): task_output = dataclasses.asdict(task_result.output_data) # type: ignore[call-overload] - task_result.output_data = task_output # type: ignore[assignment] + task_result.output_data = task_output return task_result if not isinstance(task_result.output_data, dict): task_output = task_result.output_data diff --git a/src/conductor/asyncio_client/workflow/task/dynamic_fork_task.py b/src/conductor/asyncio_client/workflow/task/dynamic_fork_task.py index 002b8a3f..85c685c2 100644 --- a/src/conductor/asyncio_client/workflow/task/dynamic_fork_task.py +++ b/src/conductor/asyncio_client/workflow/task/dynamic_fork_task.py @@ -25,7 +25,7 @@ def __init__( self.tasks_input_param_name = tasks_input_param_name self._join_task = deepcopy(join_task) if join_task else None - def to_workflow_task(self) -> List[WorkflowTaskAdapter]: # type: ignore[override] + def to_workflow_task(self) -> List[WorkflowTaskAdapter]: wf_task = super().to_workflow_task() wf_task.dynamic_fork_join_tasks_param = self.tasks_param wf_task.dynamic_fork_tasks_input_param_name = self.tasks_input_param_name diff --git a/src/conductor/asyncio_client/workflow/task/fork_task.py b/src/conductor/asyncio_client/workflow/task/fork_task.py index 30a1f113..43fb8311 100644 --- a/src/conductor/asyncio_client/workflow/task/fork_task.py +++ b/src/conductor/asyncio_client/workflow/task/fork_task.py @@ -26,7 +26,7 @@ def __init__( self._forked_tasks = forked_tasks self._join_on = join_on - def to_workflow_task( # type: ignore[override] + def to_workflow_task( self, ) -> Union[WorkflowTaskAdapter, List[WorkflowTaskAdapter]]: workflow_task = super().to_workflow_task() diff --git a/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_index_documents.py b/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_index_documents.py index 73ad8e71..264ef75b 100644 --- a/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_index_documents.py +++ b/src/conductor/asyncio_client/workflow/task/llm_tasks/llm_index_documents.py @@ -63,7 +63,7 @@ def __init__( if doc_id is not None: optional_input_params.update({"docId": doc_id}) - input_params.update(optional_input_params) # type: ignore[arg-type] + input_params.update(optional_input_params) if task_name is None: task_name = "llm_index_document" diff --git a/src/conductor/asyncio_client/workflow/task/switch_task.py b/src/conductor/asyncio_client/workflow/task/switch_task.py index 5edb67de..83362985 100644 --- a/src/conductor/asyncio_client/workflow/task/switch_task.py +++ b/src/conductor/asyncio_client/workflow/task/switch_task.py @@ -31,7 +31,7 @@ def switch_case(self, case_name: str, tasks: List[TaskInterface]): def default_case(self, tasks: List[TaskInterface]): if isinstance(tasks, List): - self._default_case = deepcopy(tasks) # type: ignore[assignment] + self._default_case = deepcopy(tasks) else: self._default_case = [deepcopy(tasks)] return self @@ -51,6 +51,6 @@ def to_workflow_task(self) -> WorkflowTaskAdapter: *tasks, ) if self._default_case is None: - self._default_case = [] # type: ignore[assignment] + self._default_case = [] workflow.default_case = get_task_interface_list_as_workflow_task_list(*self._default_case) # type: ignore[misc] return workflow diff --git a/src/conductor/asyncio_client/workflow/task/task.py b/src/conductor/asyncio_client/workflow/task/task.py index 84a83c2c..163a5b38 100644 --- a/src/conductor/asyncio_client/workflow/task/task.py +++ b/src/conductor/asyncio_client/workflow/task/task.py @@ -127,7 +127,7 @@ def input_parameters(self, input_parameters: Dict[str, Any]) -> None: except AttributeError as err: raise ValueError(f"Invalid type: {type(input_parameters)}") from err - self._input_parameters: Dict[str, Any] = deepcopy(input_parameters) # type: ignore[no-redef] + self._input_parameters: Dict[str, Any] = deepcopy(input_parameters) def input_parameter(self, key: str, value: Any): if not isinstance(key, str): diff --git a/src/conductor/client/adapters/api/application_resource_api_adapter.py b/src/conductor/client/adapters/api/application_resource_api_adapter.py index b4c28a4d..4e92b1bb 100644 --- a/src/conductor/client/adapters/api/application_resource_api_adapter.py +++ b/src/conductor/client/adapters/api/application_resource_api_adapter.py @@ -9,31 +9,31 @@ class ApplicationResourceApiAdapter(ApplicationResourceApi): def create_access_key(self, id: str, **kwargs): # Convert empty application id to None to prevent sending invalid data to server if not id: - id = None # type: ignore[assignment] + id = None return super().create_access_key(id, **kwargs) def add_role_to_application_user(self, application_id: str, role: str, **kwargs): # Convert empty application_id and role to None to prevent sending invalid data to server if not application_id: - application_id = None # type: ignore[assignment] + application_id = None if not role: - role = None # type: ignore[assignment] + role = None return super().add_role_to_application_user(application_id, role, **kwargs) def delete_access_key(self, application_id: str, key_id: str, **kwargs): # Convert empty application_id and key_id to None to prevent sending invalid data to server if not application_id: - application_id = None # type: ignore[assignment] + application_id = None if not key_id: - key_id = None # type: ignore[assignment] + key_id = None return super().delete_access_key(application_id, key_id, **kwargs) def remove_role_from_application_user(self, application_id: str, role: str, **kwargs): # Convert empty application_id and role to None to prevent sending invalid data to server if not application_id: - application_id = None # type: ignore[assignment] + application_id = None if not role: - role = None # type: ignore[assignment] + role = None return super().remove_role_from_application_user(application_id, role, **kwargs) def get_app_by_access_key_id( @@ -41,33 +41,33 @@ def get_app_by_access_key_id( ) -> ExtendedConductorApplication: # Convert empty access_key_id to None to prevent sending invalid data to server if not access_key_id: - access_key_id = None # type: ignore[assignment] + access_key_id = None return super().get_app_by_access_key_id(access_key_id, **kwargs) def get_access_keys(self, id: str, **kwargs): # Convert empty application id to None to prevent sending invalid data to server if not id: - id = None # type: ignore[assignment] + id = None return super().get_access_keys(id=id, **kwargs) def toggle_access_key_status(self, application_id: str, key_id: str, **kwargs): # Convert empty application_id and key_id to None to prevent sending invalid data to server if not application_id: - application_id = None # type: ignore[assignment] + application_id = None if not key_id: - key_id = None # type: ignore[assignment] + key_id = None return super().toggle_access_key_status(application_id, key_id, **kwargs) - def get_tags_for_application(self, application_id: str, **kwargs) -> List[MetadataTag]: # type: ignore[override] + def get_tags_for_application(self, application_id: str, **kwargs) -> List[MetadataTag]: # Convert empty application_id to None to prevent sending invalid data to server if not application_id: - application_id = None # type: ignore[assignment] + application_id = None return super().get_tags_for_application(application_id, **kwargs) - def delete_tag_for_application(self, tag: List[MetadataTag], id: str, **kwargs) -> None: # type: ignore[override] + def delete_tag_for_application(self, tag: List[MetadataTag], id: str, **kwargs) -> None: # Convert empty application id and tag list to None to prevent sending invalid data to server if not id: - id = None # type: ignore[assignment] + id = None if not tag: - tag = None # type: ignore[assignment] + tag = None return super().delete_tag_for_application(tag, id, **kwargs) diff --git a/src/conductor/client/adapters/rest_adapter.py b/src/conductor/client/adapters/rest_adapter.py index 7eefbd95..a5e430a7 100644 --- a/src/conductor/client/adapters/rest_adapter.py +++ b/src/conductor/client/adapters/rest_adapter.py @@ -106,7 +106,7 @@ def __init__(self, connection: Optional[httpx.Client] = None, configuration=None client_kwargs["verify"] = ssl_context - self.connection = httpx.Client(**client_kwargs) # type: ignore[arg-type] + self.connection = httpx.Client(**client_kwargs) def close(self): """Close the HTTP client connection.""" diff --git a/src/conductor/client/configuration/configuration.py b/src/conductor/client/configuration/configuration.py index 463623e4..4241ad96 100644 --- a/src/conductor/client/configuration/configuration.py +++ b/src/conductor/client/configuration/configuration.py @@ -135,7 +135,7 @@ def __init__( if key is not None and secret is not None: self.authentication_settings = AuthenticationSettings(key_id=key, key_secret=secret) else: - self.authentication_settings = None # type: ignore[assignment] + self.authentication_settings = None # Debug switch self.debug = debug diff --git a/src/conductor/client/orkes/orkes_integration_client.py b/src/conductor/client/orkes/orkes_integration_client.py index c4c1e6db..7fd82ea6 100644 --- a/src/conductor/client/orkes/orkes_integration_client.py +++ b/src/conductor/client/orkes/orkes_integration_client.py @@ -70,7 +70,7 @@ def get_integration_providers( if category is not None: kwargs["category"] = category if active_only is not None: - kwargs["active_only"] = active_only # type: ignore[assignment] + kwargs["active_only"] = active_only return self.integrationApi.get_integration_providers(**kwargs) def get_integration_provider_defs(self) -> List[IntegrationDef]: @@ -151,7 +151,7 @@ def get_all_integrations( if category is not None: kwargs["category"] = category if active_only is not None: - kwargs["active_only"] = active_only # type: ignore[assignment] + kwargs["active_only"] = active_only return self.integrationApi.get_all_integrations(**kwargs) def get_providers_and_integrations( @@ -162,5 +162,5 @@ def get_providers_and_integrations( if integration_type is not None: kwargs["type"] = integration_type if active_only is not None: - kwargs["active_only"] = active_only # type: ignore[assignment] + kwargs["active_only"] = active_only return self.integrationApi.get_providers_and_integrations(**kwargs) diff --git a/src/conductor/client/orkes/orkes_prompt_client.py b/src/conductor/client/orkes/orkes_prompt_client.py index 41dade79..7ad8499a 100644 --- a/src/conductor/client/orkes/orkes_prompt_client.py +++ b/src/conductor/client/orkes/orkes_prompt_client.py @@ -18,9 +18,9 @@ def __init__(self, configuration: Configuration): def save_prompt(self, prompt_name: str, description: str, prompt_template: str): self.promptApi.save_message_template(prompt_template, description, prompt_name) - def get_prompt(self, prompt_name: str) -> Optional[PromptTemplate]: # type: ignore[override] + def get_prompt(self, prompt_name: str) -> Optional[PromptTemplate]: try: - return self.promptApi.get_message_template(prompt_name) # type: ignore[return-value] + return self.promptApi.get_message_template(prompt_name) except ApiException as e: if e.is_not_found(): return None diff --git a/src/conductor/client/orkes/orkes_workflow_client.py b/src/conductor/client/orkes/orkes_workflow_client.py index d87c1b06..7bef73dc 100644 --- a/src/conductor/client/orkes/orkes_workflow_client.py +++ b/src/conductor/client/orkes/orkes_workflow_client.py @@ -127,7 +127,7 @@ def terminate_workflow( if reason: kwargs["reason"] = reason if trigger_failure_workflow: - kwargs["trigger_failure_workflow"] = trigger_failure_workflow # type: ignore[assignment] + kwargs["trigger_failure_workflow"] = trigger_failure_workflow self.workflowResourceApi.terminate1(workflow_id, **kwargs) def get_workflow(self, workflow_id: str, include_tasks: Optional[bool] = True) -> Workflow: @@ -191,9 +191,9 @@ def get_by_correlation_ids_in_batch( kwargs["body"] = batch_request if include_tasks: - kwargs["include_tasks"] = include_tasks # type: ignore[assignment] + kwargs["include_tasks"] = include_tasks if include_completed: - kwargs["include_closed"] = include_completed # type: ignore[assignment] + kwargs["include_closed"] = include_completed return self.workflowResourceApi.get_workflows1(**kwargs) def get_by_correlation_ids( @@ -235,7 +235,7 @@ def update_state( if wait_until_task_ref_names is not None: kwargs["wait_until_task_ref"] = ",".join(wait_until_task_ref_names) if wait_for_seconds is not None: - kwargs["wait_for_seconds"] = wait_for_seconds # type: ignore[assignment] + kwargs["wait_for_seconds"] = wait_for_seconds return self.workflowResourceApi.update_workflow_and_task_state( body=update_request, workflow_id=workflow_id, request_id=request_id, **kwargs diff --git a/src/conductor/client/worker/worker.py b/src/conductor/client/worker/worker.py index ee0536cf..083fb214 100644 --- a/src/conductor/client/worker/worker.py +++ b/src/conductor/client/worker/worker.py @@ -88,7 +88,7 @@ def execute(self, task: Task) -> TaskResult: task_input[input_name] = default_value else: task_input[input_name] = None - task_output = self.execute_function(**task_input) # type: ignore[call-arg] + task_output = self.execute_function(**task_input) if isinstance(task_output, TaskResult): task_output.task_id = task.task_id diff --git a/src/conductor/client/workflow/task/dynamic_fork_task.py b/src/conductor/client/workflow/task/dynamic_fork_task.py index 6867ca8d..d38438c8 100644 --- a/src/conductor/client/workflow/task/dynamic_fork_task.py +++ b/src/conductor/client/workflow/task/dynamic_fork_task.py @@ -22,7 +22,7 @@ def __init__( self.tasks_input_param_name = tasks_input_param_name self._join_task = deepcopy(join_task) - def to_workflow_task(self) -> List[WorkflowTask]: # type: ignore[override] + def to_workflow_task(self) -> List[WorkflowTask]: wf_task = super().to_workflow_task() wf_task.dynamic_fork_join_tasks_param = self.tasks_param wf_task.dynamic_fork_tasks_input_param_name = self.tasks_input_param_name diff --git a/src/conductor/client/workflow/task/fork_task.py b/src/conductor/client/workflow/task/fork_task.py index 96f2eba0..13f05f95 100644 --- a/src/conductor/client/workflow/task/fork_task.py +++ b/src/conductor/client/workflow/task/fork_task.py @@ -24,7 +24,7 @@ def __init__( self._forked_tasks = deepcopy(forked_tasks) self._join_on = join_on - def to_workflow_task(self) -> Union[WorkflowTask, List[WorkflowTask]]: # type: ignore[override] + def to_workflow_task(self) -> Union[WorkflowTask, List[WorkflowTask]]: tasks = [] workflow_task = super().to_workflow_task() workflow_task.fork_tasks = [] diff --git a/src/conductor/client/workflow/task/javascript_task.py b/src/conductor/client/workflow/task/javascript_task.py index 7cc6c8c1..2136011f 100644 --- a/src/conductor/client/workflow/task/javascript_task.py +++ b/src/conductor/client/workflow/task/javascript_task.py @@ -28,5 +28,5 @@ def output(self, json_path: Optional[str] = None) -> str: return "${" + f"{self.task_reference_name}.output.result.{json_path}" + "}" @TaskInterface.evaluator_type.setter # type: ignore[attr-defined] - def evaluator_type(self, evaluator_type: str) -> None: # type: ignore[override] + def evaluator_type(self, evaluator_type: str) -> None: self.input_parameters["evaluatorType"] = evaluator_type diff --git a/src/conductor/client/workflow/task/llm_tasks/llm_index_documents.py b/src/conductor/client/workflow/task/llm_tasks/llm_index_documents.py index a1c98650..0d9248cd 100644 --- a/src/conductor/client/workflow/task/llm_tasks/llm_index_documents.py +++ b/src/conductor/client/workflow/task/llm_tasks/llm_index_documents.py @@ -63,7 +63,7 @@ def __init__( if doc_id is not None: optional_input_params.update({"docId": doc_id}) - input_params.update(optional_input_params) # type: ignore[arg-type] + input_params.update(optional_input_params) if task_name is None: task_name = "llm_index_document" diff --git a/src/conductor/client/workflow/task/switch_task.py b/src/conductor/client/workflow/task/switch_task.py index 4f411f42..dfae2e98 100644 --- a/src/conductor/client/workflow/task/switch_task.py +++ b/src/conductor/client/workflow/task/switch_task.py @@ -30,7 +30,7 @@ def __init__( ) self._default_case: Optional[TaskInterface] = None self._decision_cases: Dict[str, List[TaskInterface]] = {} - self._expression = deepcopy(case_expression) # type: ignore[assignment] + self._expression = deepcopy(case_expression) self._use_javascript = deepcopy(use_javascript) def switch_case(self, case_name: str, tasks: List[TaskInterface]) -> Self: @@ -42,7 +42,7 @@ def switch_case(self, case_name: str, tasks: List[TaskInterface]) -> Self: def default_case(self, tasks: List[TaskInterface]) -> Self: if isinstance(tasks, List): - self._default_case = deepcopy(tasks) # type: ignore[assignment] + self._default_case = deepcopy(tasks) else: self._default_case = [deepcopy(tasks)] return self @@ -62,6 +62,6 @@ def to_workflow_task(self) -> WorkflowTask: *tasks, ) if self._default_case is None: - self._default_case = [] # type: ignore[assignment] + self._default_case = [] workflow.default_case = get_task_interface_list_as_workflow_task_list(*self._default_case) # type: ignore[misc] return workflow diff --git a/src/conductor/shared/automator/utils.py b/src/conductor/shared/automator/utils.py index a3913726..3cf7f859 100644 --- a/src/conductor/shared/automator/utils.py +++ b/src/conductor/shared/automator/utils.py @@ -84,7 +84,7 @@ def convert_from_dict(cls: type, data: dict) -> object: or typ is dict or str(typ).startswith("OrderedDict[") ): - values = {} # type: ignore[assignment] + values = {} generic_type = object if len(generic_types) > 1: generic_type = generic_types[1] From 87eddf676baf07eb46aa7e72613c71264af6c325 Mon Sep 17 00:00:00 2001 From: IgorChvyrov-sm Date: Wed, 29 Oct 2025 16:04:14 +0300 Subject: [PATCH 17/17] Moved type ignores into pyproject.toml --- pyproject.toml | 8 ++++++++ .../asyncio_client/adapters/models/any_adapter.py | 2 +- .../adapters/models/workflow_run_adapter.py | 6 +++--- src/conductor/asyncio_client/worker/worker.py | 8 ++++---- .../asyncio_client/workflow/task/javascript_task.py | 2 +- src/conductor/asyncio_client/workflow/task/switch_task.py | 4 ++-- .../client/adapters/models/bulk_response_adapter.py | 4 ++-- .../client/adapters/models/conductor_user_adapter.py | 4 ++-- .../client/adapters/models/integration_adapter.py | 6 +++--- .../client/adapters/models/integration_api_adapter.py | 4 ++-- .../client/adapters/models/integration_def_adapter.py | 6 +++--- .../adapters/models/integration_def_form_field_adapter.py | 2 +- .../client/adapters/models/integration_update_adapter.py | 2 +- .../adapters/models/save_schedule_request_adapter.py | 2 +- .../client/adapters/models/schema_def_adapter.py | 6 +++--- .../adapters/models/start_workflow_request_adapter.py | 2 +- .../client/adapters/models/state_change_event_adapter.py | 4 ++-- .../client/adapters/models/sub_workflow_params_adapter.py | 2 +- .../client/adapters/models/target_ref_adapter.py | 4 ++-- src/conductor/client/adapters/models/task_def_adapter.py | 4 ++-- .../client/adapters/models/task_result_adapter.py | 2 +- .../client/adapters/models/task_summary_adapter.py | 4 ++-- .../adapters/models/upsert_group_request_adapter.py | 4 ++-- .../client/adapters/models/upsert_user_request_adapter.py | 2 +- .../client/adapters/models/workflow_def_adapter.py | 2 +- .../client/adapters/models/workflow_task_adapter.py | 4 ++-- src/conductor/client/helpers/helper.py | 2 +- src/conductor/client/orkes/orkes_metadata_client.py | 8 ++++---- src/conductor/client/orkes/orkes_scheduler_client.py | 6 +++--- src/conductor/client/orkes/orkes_task_client.py | 4 ++-- src/conductor/client/orkes/orkes_workflow_client.py | 2 +- src/conductor/client/workflow/task/javascript_task.py | 2 +- src/conductor/client/workflow/task/switch_task.py | 2 +- src/conductor/shared/automator/utils.py | 4 ++-- 34 files changed, 69 insertions(+), 61 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fec59935..718c71d3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -222,6 +222,14 @@ disable_error_code = [ "call-arg", "arg-type", "override", + "dict-item", + "index", + "operator", + "call-overload", + "misc", + "attr-defined", + "union-attr", + "name-defined", ] [[tool.mypy.overrides]] diff --git a/src/conductor/asyncio_client/adapters/models/any_adapter.py b/src/conductor/asyncio_client/adapters/models/any_adapter.py index d3eca3e3..f71c95a4 100644 --- a/src/conductor/asyncio_client/adapters/models/any_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/any_adapter.py @@ -28,7 +28,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: { "allFields": obj.get("allFields"), "defaultInstanceForType": ( - Any.from_dict(obj["defaultInstanceForType"]) # type: ignore[attr-defined] + Any.from_dict(obj["defaultInstanceForType"]) if obj.get("defaultInstanceForType") is not None else None ), diff --git a/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py b/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py index 8381c841..b72c78af 100644 --- a/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py +++ b/src/conductor/asyncio_client/adapters/models/workflow_run_adapter.py @@ -16,7 +16,7 @@ class WorkflowRunAdapter(WorkflowRun): @property def current_task(self) -> TaskAdapter: current = None - for task in self.tasks: # type: ignore[union-attr] + for task in self.tasks: if task.status in ("SCHEDULED", "IN_PROGRESS"): current = task return current @@ -34,10 +34,10 @@ def get_task( ) current = None - for task in self.tasks: # type: ignore[union-attr] + for task in self.tasks: if ( task.task_def_name == name - or task.workflow_task.task_reference_name == task_reference_name # type: ignore[union-attr] + or task.workflow_task.task_reference_name == task_reference_name ): current = task return current diff --git a/src/conductor/asyncio_client/worker/worker.py b/src/conductor/asyncio_client/worker/worker.py index 864af7d4..8db00c83 100644 --- a/src/conductor/asyncio_client/worker/worker.py +++ b/src/conductor/asyncio_client/worker/worker.py @@ -75,13 +75,13 @@ def execute(self, task: TaskAdapter) -> TaskResultAdapter: for input_name in params: typ = params[input_name].annotation default_value = params[input_name].default - if input_name in task.input_data: # type: ignore[operator] + if input_name in task.input_data: if typ in utils.simple_types: - task_input[input_name] = task.input_data[input_name] # type: ignore[index] + task_input[input_name] = task.input_data[input_name] else: task_input[input_name] = convert_from_dict_or_list( typ, - task.input_data[input_name], # type: ignore[index] + task.input_data[input_name], ) elif default_value is not inspect.Parameter.empty: task_input[input_name] = default_value @@ -121,7 +121,7 @@ def execute(self, task: TaskAdapter) -> TaskResultAdapter: task_result.reason_for_incompletion = ne.args[0] if dataclasses.is_dataclass(type(task_result.output_data)): - task_output = dataclasses.asdict(task_result.output_data) # type: ignore[call-overload] + task_output = dataclasses.asdict(task_result.output_data) task_result.output_data = task_output return task_result if not isinstance(task_result.output_data, dict): diff --git a/src/conductor/asyncio_client/workflow/task/javascript_task.py b/src/conductor/asyncio_client/workflow/task/javascript_task.py index 604b5786..6dedac7a 100644 --- a/src/conductor/asyncio_client/workflow/task/javascript_task.py +++ b/src/conductor/asyncio_client/workflow/task/javascript_task.py @@ -28,6 +28,6 @@ def output(self, json_path: Optional[str] = None) -> str: base_path = f"{self.task_reference_name}.output.result" return f"${{{base_path if json_path is None else f'{base_path}.{json_path}'}}}" - @TaskInterface.evaluator_type.setter # type: ignore[attr-defined] + @TaskInterface.evaluator_type.setter def evaluator_type(self, evaluator_type: str) -> None: self.input_parameters["evaluatorType"] = evaluator_type diff --git a/src/conductor/asyncio_client/workflow/task/switch_task.py b/src/conductor/asyncio_client/workflow/task/switch_task.py index 83362985..b64d621f 100644 --- a/src/conductor/asyncio_client/workflow/task/switch_task.py +++ b/src/conductor/asyncio_client/workflow/task/switch_task.py @@ -43,7 +43,7 @@ def to_workflow_task(self) -> WorkflowTaskAdapter: workflow.expression = self._expression else: workflow.evaluator_type = EvaluatorType.VALUE_PARAM - workflow.input_parameters["switchCaseValue"] = self._expression # type: ignore[index] + workflow.input_parameters["switchCaseValue"] = self._expression workflow.expression = "switchCaseValue" workflow.decision_cases = {} for case_value, tasks in self._decision_cases.items(): @@ -52,5 +52,5 @@ def to_workflow_task(self) -> WorkflowTaskAdapter: ) if self._default_case is None: self._default_case = [] - workflow.default_case = get_task_interface_list_as_workflow_task_list(*self._default_case) # type: ignore[misc] + workflow.default_case = get_task_interface_list_as_workflow_task_list(*self._default_case) return workflow diff --git a/src/conductor/client/adapters/models/bulk_response_adapter.py b/src/conductor/client/adapters/models/bulk_response_adapter.py index 2f057f5f..7e40d3f3 100644 --- a/src/conductor/client/adapters/models/bulk_response_adapter.py +++ b/src/conductor/client/adapters/models/bulk_response_adapter.py @@ -4,13 +4,13 @@ class BulkResponseAdapter(BulkResponse): - swagger_types: ClassVar[Dict[str, str]] = { # type: ignore[misc] + swagger_types: ClassVar[Dict[str, str]] = { **BulkResponse.swagger_types, "bulk_successful_results": "list[str]", "message": "str", } - attribute_map: ClassVar[Dict[str, str]] = { # type: ignore[misc] + attribute_map: ClassVar[Dict[str, str]] = { **BulkResponse.attribute_map, "message": "message", } diff --git a/src/conductor/client/adapters/models/conductor_user_adapter.py b/src/conductor/client/adapters/models/conductor_user_adapter.py index b3d71742..4c81fc97 100644 --- a/src/conductor/client/adapters/models/conductor_user_adapter.py +++ b/src/conductor/client/adapters/models/conductor_user_adapter.py @@ -4,14 +4,14 @@ class ConductorUserAdapter(ConductorUser): - swagger_types: ClassVar[Dict[str, str]] = { # type: ignore[misc] + swagger_types: ClassVar[Dict[str, str]] = { **ConductorUser.swagger_types, "orkes_app": "bool", "orkes_api_gateway": "bool", "contact_information": "dict(str, str)", } - attribute_map: ClassVar[Dict[str, str]] = { # type: ignore[misc] + attribute_map: ClassVar[Dict[str, str]] = { **ConductorUser.attribute_map, "orkes_app": "orkesApp", "orkes_api_gateway": "orkesApiGateway", diff --git a/src/conductor/client/adapters/models/integration_adapter.py b/src/conductor/client/adapters/models/integration_adapter.py index 8648b72f..d3eee9f8 100644 --- a/src/conductor/client/adapters/models/integration_adapter.py +++ b/src/conductor/client/adapters/models/integration_adapter.py @@ -6,13 +6,13 @@ class IntegrationAdapter(Integration): - swagger_types: ClassVar[Dict[str, str]] = { # type: ignore[misc] + swagger_types: ClassVar[Dict[str, str]] = { **Integration.swagger_types, "created_on": "int", "updated_on": "int", } - attribute_map: ClassVar[Dict[str, str]] = { # type: ignore[misc] + attribute_map: ClassVar[Dict[str, str]] = { **Integration.attribute_map, "created_on": "createdOn", "updated_on": "updatedOn", @@ -105,7 +105,7 @@ def updated_on(self, update_time): self._update_time = update_time self._updated_on = update_time - @Integration.category.setter # type: ignore[attr-defined] + @Integration.category.setter def category(self, category): allowed_values = [ "API", diff --git a/src/conductor/client/adapters/models/integration_api_adapter.py b/src/conductor/client/adapters/models/integration_api_adapter.py index d59f3d08..534b7920 100644 --- a/src/conductor/client/adapters/models/integration_api_adapter.py +++ b/src/conductor/client/adapters/models/integration_api_adapter.py @@ -6,13 +6,13 @@ class IntegrationApiAdapter(IntegrationApi): - swagger_types: ClassVar[Dict[str, str]] = { # type: ignore[misc] + swagger_types: ClassVar[Dict[str, str]] = { **IntegrationApi.swagger_types, "created_on": "int", "updated_on": "int", } - attribute_map: ClassVar[Dict[str, str]] = { # type: ignore[misc] + attribute_map: ClassVar[Dict[str, str]] = { **IntegrationApi.attribute_map, "created_on": "createdOn", "updated_on": "updatedOn", diff --git a/src/conductor/client/adapters/models/integration_def_adapter.py b/src/conductor/client/adapters/models/integration_def_adapter.py index e343ebbd..7fbce214 100644 --- a/src/conductor/client/adapters/models/integration_def_adapter.py +++ b/src/conductor/client/adapters/models/integration_def_adapter.py @@ -6,12 +6,12 @@ class IntegrationDefAdapter(IntegrationDef): - swagger_types: ClassVar[Dict[str, str]] = { # type: ignore[misc] + swagger_types: ClassVar[Dict[str, str]] = { **IntegrationDef.swagger_types, "apis": "list[IntegrationDefApi]", } - attribute_map: ClassVar[Dict[str, str]] = { # type: ignore[misc] + attribute_map: ClassVar[Dict[str, str]] = { **IntegrationDef.attribute_map, "apis": "apis", } @@ -69,7 +69,7 @@ def apis(self): def apis(self, apis): self._apis = apis - @IntegrationDef.category.setter # type: ignore[attr-defined] + @IntegrationDef.category.setter def category(self, category): """Sets the category of this IntegrationUpdate. diff --git a/src/conductor/client/adapters/models/integration_def_form_field_adapter.py b/src/conductor/client/adapters/models/integration_def_form_field_adapter.py index 874169e3..e232a82b 100644 --- a/src/conductor/client/adapters/models/integration_def_form_field_adapter.py +++ b/src/conductor/client/adapters/models/integration_def_form_field_adapter.py @@ -2,7 +2,7 @@ class IntegrationDefFormFieldAdapter(IntegrationDefFormField): - @IntegrationDefFormField.field_name.setter # type: ignore[attr-defined] + @IntegrationDefFormField.field_name.setter def field_name(self, field_name): """Sets the field_name of this IntegrationDefFormField. diff --git a/src/conductor/client/adapters/models/integration_update_adapter.py b/src/conductor/client/adapters/models/integration_update_adapter.py index 5bdfc3b1..0d3b03b4 100644 --- a/src/conductor/client/adapters/models/integration_update_adapter.py +++ b/src/conductor/client/adapters/models/integration_update_adapter.py @@ -2,7 +2,7 @@ class IntegrationUpdateAdapter(IntegrationUpdate): - @IntegrationUpdate.category.setter # type: ignore[attr-defined] + @IntegrationUpdate.category.setter def category(self, category): allowed_values = [ "API", diff --git a/src/conductor/client/adapters/models/save_schedule_request_adapter.py b/src/conductor/client/adapters/models/save_schedule_request_adapter.py index 2c3f9f6f..c9569b53 100644 --- a/src/conductor/client/adapters/models/save_schedule_request_adapter.py +++ b/src/conductor/client/adapters/models/save_schedule_request_adapter.py @@ -2,7 +2,7 @@ class SaveScheduleRequestAdapter(SaveScheduleRequest): - @SaveScheduleRequest.start_workflow_request.setter # type: ignore[attr-defined] + @SaveScheduleRequest.start_workflow_request.setter def start_workflow_request(self, start_workflow_request): """Sets the start_workflow_request of this SaveScheduleRequest. diff --git a/src/conductor/client/adapters/models/schema_def_adapter.py b/src/conductor/client/adapters/models/schema_def_adapter.py index 59aa5342..2e2ce0b3 100644 --- a/src/conductor/client/adapters/models/schema_def_adapter.py +++ b/src/conductor/client/adapters/models/schema_def_adapter.py @@ -57,7 +57,7 @@ def __init__( if version is not None: self.version = version - @SchemaDef.type.setter # type: ignore[attr-defined] + @SchemaDef.type.setter def type(self, type): """Sets the type of this SchemaDef. @@ -67,7 +67,7 @@ def type(self, type): """ self._type = type - @SchemaDef.name.setter # type: ignore[attr-defined] + @SchemaDef.name.setter def name(self, name): """Sets the name of this SchemaDef. @@ -77,7 +77,7 @@ def name(self, name): """ self._name = name - @SchemaDef.version.setter # type: ignore[attr-defined] + @SchemaDef.version.setter def version(self, version): """Sets the data of this SchemaDef. diff --git a/src/conductor/client/adapters/models/start_workflow_request_adapter.py b/src/conductor/client/adapters/models/start_workflow_request_adapter.py index b625499c..e33dbe6d 100644 --- a/src/conductor/client/adapters/models/start_workflow_request_adapter.py +++ b/src/conductor/client/adapters/models/start_workflow_request_adapter.py @@ -61,7 +61,7 @@ def __init__( if workflow_def is not None: self.workflow_def = workflow_def - @StartWorkflowRequest.name.setter # type: ignore[attr-defined] + @StartWorkflowRequest.name.setter def name(self, name): """Sets the name of this StartWorkflowRequest. diff --git a/src/conductor/client/adapters/models/state_change_event_adapter.py b/src/conductor/client/adapters/models/state_change_event_adapter.py index 84562c43..a1ec35bc 100644 --- a/src/conductor/client/adapters/models/state_change_event_adapter.py +++ b/src/conductor/client/adapters/models/state_change_event_adapter.py @@ -98,7 +98,7 @@ def __init__(self, payload=None, type=None): self.payload = payload self.type = type - @StateChangeEvent.payload.setter # type: ignore[attr-defined] + @StateChangeEvent.payload.setter def payload(self, payload): """Sets the payload of this StateChangeEvent. @@ -111,7 +111,7 @@ def payload(self, payload): self._payload = payload - @StateChangeEvent.type.setter # type: ignore[attr-defined] + @StateChangeEvent.type.setter def type(self, type): """Sets the type of this StateChangeEvent. diff --git a/src/conductor/client/adapters/models/sub_workflow_params_adapter.py b/src/conductor/client/adapters/models/sub_workflow_params_adapter.py index eb2955b9..26b4ddd9 100644 --- a/src/conductor/client/adapters/models/sub_workflow_params_adapter.py +++ b/src/conductor/client/adapters/models/sub_workflow_params_adapter.py @@ -2,7 +2,7 @@ class SubWorkflowParamsAdapter(SubWorkflowParams): - @SubWorkflowParams.idempotency_strategy.setter # type: ignore[attr-defined] + @SubWorkflowParams.idempotency_strategy.setter def idempotency_strategy(self, idempotency_strategy): """Sets the idempotency_strategy of this SubWorkflowParams. diff --git a/src/conductor/client/adapters/models/target_ref_adapter.py b/src/conductor/client/adapters/models/target_ref_adapter.py index e2fcf51a..e54308f3 100644 --- a/src/conductor/client/adapters/models/target_ref_adapter.py +++ b/src/conductor/client/adapters/models/target_ref_adapter.py @@ -2,7 +2,7 @@ class TargetRefAdapter(TargetRef): - @TargetRef.id.setter # type: ignore[attr-defined] + @TargetRef.id.setter def id(self, id): """Sets the id of this TargetRef. @@ -12,7 +12,7 @@ def id(self, id): """ self._id = id - @TargetRef.type.setter # type: ignore[attr-defined] + @TargetRef.type.setter def type(self, type): """Sets the type of this TargetRef. diff --git a/src/conductor/client/adapters/models/task_def_adapter.py b/src/conductor/client/adapters/models/task_def_adapter.py index 7f826efe..875b7884 100644 --- a/src/conductor/client/adapters/models/task_def_adapter.py +++ b/src/conductor/client/adapters/models/task_def_adapter.py @@ -2,7 +2,7 @@ class TaskDefAdapter(TaskDef): - @TaskDef.total_timeout_seconds.setter # type: ignore[attr-defined] + @TaskDef.total_timeout_seconds.setter def total_timeout_seconds(self, total_timeout_seconds): """Sets the total_timeout_seconds of this TaskDef. @@ -12,7 +12,7 @@ def total_timeout_seconds(self, total_timeout_seconds): """ self._total_timeout_seconds = total_timeout_seconds - @TaskDef.timeout_seconds.setter # type: ignore[attr-defined] + @TaskDef.timeout_seconds.setter def timeout_seconds(self, timeout_seconds): """Sets the timeout_seconds of this TaskDef. diff --git a/src/conductor/client/adapters/models/task_result_adapter.py b/src/conductor/client/adapters/models/task_result_adapter.py index cbb76638..6e061ec3 100644 --- a/src/conductor/client/adapters/models/task_result_adapter.py +++ b/src/conductor/client/adapters/models/task_result_adapter.py @@ -4,7 +4,7 @@ class TaskResultAdapter(TaskResult): - @TaskResult.status.setter # type: ignore[attr-defined] + @TaskResult.status.setter def status(self, status): """Sets the status of this TaskResult. diff --git a/src/conductor/client/adapters/models/task_summary_adapter.py b/src/conductor/client/adapters/models/task_summary_adapter.py index 2de82c31..41a9a48f 100644 --- a/src/conductor/client/adapters/models/task_summary_adapter.py +++ b/src/conductor/client/adapters/models/task_summary_adapter.py @@ -6,12 +6,12 @@ class TaskSummaryAdapter(TaskSummary): - swagger_types: ClassVar[Dict[str, str]] = { # type: ignore[misc] + swagger_types: ClassVar[Dict[str, str]] = { **TaskSummary.swagger_types, "domain": "str", } - attribute_map: ClassVar[Dict[str, str]] = { # type: ignore[misc] + attribute_map: ClassVar[Dict[str, str]] = { **TaskSummary.attribute_map, "domain": "domain", } diff --git a/src/conductor/client/adapters/models/upsert_group_request_adapter.py b/src/conductor/client/adapters/models/upsert_group_request_adapter.py index 97b15ab7..d0498c6e 100644 --- a/src/conductor/client/adapters/models/upsert_group_request_adapter.py +++ b/src/conductor/client/adapters/models/upsert_group_request_adapter.py @@ -2,7 +2,7 @@ class UpsertGroupRequestAdapter(UpsertGroupRequest): - @UpsertGroupRequest.roles.setter # type: ignore[attr-defined] + @UpsertGroupRequest.roles.setter def roles(self, roles): """Sets the roles of this UpsertGroupRequest. @@ -27,7 +27,7 @@ def roles(self, roles): self._roles = roles - @UpsertGroupRequest.default_access.setter # type: ignore[attr-defined] + @UpsertGroupRequest.default_access.setter def default_access(self, default_access): """Sets the default_access of this UpsertGroupRequest. diff --git a/src/conductor/client/adapters/models/upsert_user_request_adapter.py b/src/conductor/client/adapters/models/upsert_user_request_adapter.py index f74b97e7..98036b01 100644 --- a/src/conductor/client/adapters/models/upsert_user_request_adapter.py +++ b/src/conductor/client/adapters/models/upsert_user_request_adapter.py @@ -12,7 +12,7 @@ class RolesEnum(str, Enum): class UpsertUserRequestAdapter(UpsertUserRequest): - @UpsertUserRequest.roles.setter # type: ignore[attr-defined] + @UpsertUserRequest.roles.setter def roles(self, roles): """Sets the roles of this UpsertUserRequest. diff --git a/src/conductor/client/adapters/models/workflow_def_adapter.py b/src/conductor/client/adapters/models/workflow_def_adapter.py index 7a28915b..629f4fe6 100644 --- a/src/conductor/client/adapters/models/workflow_def_adapter.py +++ b/src/conductor/client/adapters/models/workflow_def_adapter.py @@ -146,7 +146,7 @@ def tasks(self, tasks): """ self._tasks = tasks - @WorkflowDef.timeout_seconds.setter # type: ignore[attr-defined] + @WorkflowDef.timeout_seconds.setter def timeout_seconds(self, timeout_seconds): """Sets the timeout_seconds of this WorkflowDef. diff --git a/src/conductor/client/adapters/models/workflow_task_adapter.py b/src/conductor/client/adapters/models/workflow_task_adapter.py index ad4c2576..3f7d4543 100644 --- a/src/conductor/client/adapters/models/workflow_task_adapter.py +++ b/src/conductor/client/adapters/models/workflow_task_adapter.py @@ -6,7 +6,7 @@ class WorkflowTaskAdapter(WorkflowTask): - @WorkflowTask.workflow_task_type.setter # type: ignore[attr-defined] + @WorkflowTask.workflow_task_type.setter def workflow_task_type(self, workflow_task_type): """Sets the workflow_task_type of this WorkflowTask. @@ -16,7 +16,7 @@ def workflow_task_type(self, workflow_task_type): """ self._workflow_task_type = workflow_task_type - @WorkflowTask.on_state_change.setter # type: ignore[attr-defined] + @WorkflowTask.on_state_change.setter def on_state_change(self, state_change): """Sets the on_state_change of this WorkflowTask. diff --git a/src/conductor/client/helpers/helper.py b/src/conductor/client/helpers/helper.py index 11aee302..f7ed1a70 100644 --- a/src/conductor/client/helpers/helper.py +++ b/src/conductor/client/helpers/helper.py @@ -17,7 +17,7 @@ class ObjectMapper(object): PRIMITIVE_TYPES: ClassVar[Tuple] = (float, bool, bytes, six.text_type, *six.integer_types) NATIVE_TYPES_MAPPING: ClassVar[Dict] = { "int": int, - "long": int if six.PY3 else long, # type: ignore[name-defined] # noqa: F821, YTT202 + "long": int if six.PY3 else long, # noqa: F821, YTT202 "float": float, "str": str, "bool": bool, diff --git a/src/conductor/client/orkes/orkes_metadata_client.py b/src/conductor/client/orkes/orkes_metadata_client.py index f16c65a4..e206eb9d 100644 --- a/src/conductor/client/orkes/orkes_metadata_client.py +++ b/src/conductor/client/orkes/orkes_metadata_client.py @@ -56,7 +56,7 @@ def add_workflow_tag(self, tag: MetadataTag, workflow_name: str): self.tagsApi.add_workflow_tag(tag, workflow_name) def delete_workflow_tag(self, tag: MetadataTag, workflow_name: str): - tagStr = TagString(tag.key, tag.type, tag.value) # type: ignore[attr-defined] + tagStr = TagString(tag.key, tag.type, tag.value) self.tagsApi.delete_workflow_tag(tagStr, workflow_name) def get_workflow_tags(self, workflow_name: str) -> List[MetadataTag]: @@ -69,7 +69,7 @@ def addTaskTag(self, tag: MetadataTag, taskName: str): self.tagsApi.add_task_tag(tag, taskName) def deleteTaskTag(self, tag: MetadataTag, taskName: str): - tagStr = TagString(tag.key, tag.type, tag.value) # type: ignore[attr-defined] + tagStr = TagString(tag.key, tag.type, tag.value) self.tagsApi.delete_task_tag(tagStr, taskName) def getTaskTags(self, taskName: str) -> List[MetadataTag]: @@ -86,8 +86,8 @@ def setWorkflowRateLimit(self, rateLimit: int, workflowName: str): def getWorkflowRateLimit(self, workflowName: str) -> Optional[int]: tags = self.tagsApi.get_workflow_tags(workflowName) for tag in tags: - if tag.type == "RATE_LIMIT" and tag.key == workflowName: # type: ignore[attr-defined] - return tag.value # type: ignore[attr-defined, return-value] + if tag.type == "RATE_LIMIT" and tag.key == workflowName: + return tag.value return None diff --git a/src/conductor/client/orkes/orkes_scheduler_client.py b/src/conductor/client/orkes/orkes_scheduler_client.py index 6e309433..1178a7d9 100644 --- a/src/conductor/client/orkes/orkes_scheduler_client.py +++ b/src/conductor/client/orkes/orkes_scheduler_client.py @@ -75,11 +75,11 @@ def search_schedule_executions( if size: kwargs.update({"size": size}) if sort: - kwargs.update({"sort": sort}) # type: ignore[dict-item] + kwargs.update({"sort": sort}) if free_text: - kwargs.update({"free_text": free_text}) # type: ignore[dict-item] + kwargs.update({"free_text": free_text}) if query: - kwargs.update({"query": query}) # type: ignore[dict-item] + kwargs.update({"query": query}) return self.schedulerResourceApi.search_v2(**kwargs) def requeue_all_execution_records(self): diff --git a/src/conductor/client/orkes/orkes_task_client.py b/src/conductor/client/orkes/orkes_task_client.py index 86a08d2d..a1245b0c 100644 --- a/src/conductor/client/orkes/orkes_task_client.py +++ b/src/conductor/client/orkes/orkes_task_client.py @@ -39,9 +39,9 @@ def batch_poll_tasks( if worker_id: kwargs.update({"workerid": worker_id}) if count: - kwargs.update({"count": count}) # type: ignore[dict-item] + kwargs.update({"count": count}) if timeout_in_millisecond: - kwargs.update({"timeout": timeout_in_millisecond}) # type: ignore[dict-item] + kwargs.update({"timeout": timeout_in_millisecond}) if domain: kwargs.update({"domain": domain}) diff --git a/src/conductor/client/orkes/orkes_workflow_client.py b/src/conductor/client/orkes/orkes_workflow_client.py index 7bef73dc..aa08003e 100644 --- a/src/conductor/client/orkes/orkes_workflow_client.py +++ b/src/conductor/client/orkes/orkes_workflow_client.py @@ -37,7 +37,7 @@ def start_workflow_by_name( if version: kwargs.update({"version": version}) if correlationId: - kwargs.update({"correlation_id": correlationId}) # type: ignore[dict-item] + kwargs.update({"correlation_id": correlationId}) if priority: kwargs.update({"priority": priority}) diff --git a/src/conductor/client/workflow/task/javascript_task.py b/src/conductor/client/workflow/task/javascript_task.py index 2136011f..3b512277 100644 --- a/src/conductor/client/workflow/task/javascript_task.py +++ b/src/conductor/client/workflow/task/javascript_task.py @@ -27,6 +27,6 @@ def output(self, json_path: Optional[str] = None) -> str: else: return "${" + f"{self.task_reference_name}.output.result.{json_path}" + "}" - @TaskInterface.evaluator_type.setter # type: ignore[attr-defined] + @TaskInterface.evaluator_type.setter def evaluator_type(self, evaluator_type: str) -> None: self.input_parameters["evaluatorType"] = evaluator_type diff --git a/src/conductor/client/workflow/task/switch_task.py b/src/conductor/client/workflow/task/switch_task.py index dfae2e98..12a54098 100644 --- a/src/conductor/client/workflow/task/switch_task.py +++ b/src/conductor/client/workflow/task/switch_task.py @@ -63,5 +63,5 @@ def to_workflow_task(self) -> WorkflowTask: ) if self._default_case is None: self._default_case = [] - workflow.default_case = get_task_interface_list_as_workflow_task_list(*self._default_case) # type: ignore[misc] + workflow.default_case = get_task_interface_list_as_workflow_task_list(*self._default_case) return workflow diff --git a/src/conductor/shared/automator/utils.py b/src/conductor/shared/automator/utils.py index 3cf7f859..cc6284c5 100644 --- a/src/conductor/shared/automator/utils.py +++ b/src/conductor/shared/automator/utils.py @@ -51,7 +51,7 @@ def convert_from_dict(cls: type, data: dict) -> object: ): data = {} - members = inspect.signature(cls.__init__).parameters # type: ignore[misc] + members = inspect.signature(cls.__init__).parameters kwargs = {} for member in members: @@ -128,7 +128,7 @@ def get_value(typ: type, val: Any) -> Any: values = {} for k in val: v = val[k] - values[k] = get_value(object, v) # type: ignore[call-overload] + values[k] = get_value(object, v) return values else: return convert_from_dict(typ, val)