Fix build and release for 0.1.2

longquanzheng · longquanzheng · commit acd2b4a48e19 · 2023-09-13T21:08:17.000-07:00
diff --git a/iwf/command_request.py b/iwf/command_request.py
@@ -3,15 +3,15 @@
 from datetime import timedelta
 from typing import Optional, Union
 
-from iwf.iwf_api.iwf_api.models import CommandWaitingType
-from iwf.iwf_api.iwf_api.models.command_request import (
+from iwf.iwf_api.models import CommandWaitingType
+from iwf.iwf_api.models.command_request import (
     CommandRequest as IdlCommandRequest,
 )
-from iwf.iwf_api.iwf_api.models.inter_state_channel_command import (
+from iwf.iwf_api.models.inter_state_channel_command import (
     InterStateChannelCommand as IdlInternalChannelCommand,
 )
-from iwf.iwf_api.iwf_api.models.signal_command import SignalCommand as IdlSignalCommand
-from iwf.iwf_api.iwf_api.models.timer_command import TimerCommand as IdlTimerCommand
+from iwf.iwf_api.models.signal_command import SignalCommand as IdlSignalCommand
+from iwf.iwf_api.models.timer_command import TimerCommand as IdlTimerCommand
 
 
 @dataclass
diff --git a/iwf/command_results.py b/iwf/command_results.py
@@ -2,12 +2,12 @@
 from dataclasses import dataclass
 from typing import Any, Union
 
-from iwf.iwf_api.iwf_api.models import (
+from iwf.iwf_api.models import (
     ChannelRequestStatus,
     CommandResults as IdlCommandResults,
     TimerStatus,
 )
-from iwf.iwf_api.iwf_api.types import Unset
+from iwf.iwf_api.types import Unset
 from iwf.object_encoder import ObjectEncoder
 
 
diff --git a/iwf/communication.py b/iwf/communication.py
@@ -1,7 +1,7 @@
 from typing import Any, Optional, Union
 
 from iwf.errors import WorkflowDefinitionError
-from iwf.iwf_api.iwf_api.models import EncodedObject, InterStateChannelPublishing
+from iwf.iwf_api.models import EncodedObject, InterStateChannelPublishing
 from iwf.object_encoder import ObjectEncoder
 from iwf.state_movement import StateMovement
 
diff --git a/iwf/errors.py b/iwf/errors.py
@@ -2,7 +2,7 @@
 
 from httpx._utils import guess_json_utf
 
-from iwf.iwf_api.iwf_api.models import (
+from iwf.iwf_api.models import (
     ErrorResponse,
     ErrorSubStatus,
     WorkflowGetResponse,
diff --git a/iwf/object_encoder.py b/iwf/object_encoder.py
@@ -32,8 +32,8 @@
 
 from typing_extensions import Literal
 
-from iwf.iwf_api.iwf_api.models import EncodedObject
-from iwf.iwf_api.iwf_api.types import Unset
+from iwf.iwf_api.models import EncodedObject
+from iwf.iwf_api.types import Unset
 
 # StrEnum is available in 3.11+
 if sys.version_info >= (3, 11):
diff --git a/iwf/persistence.py b/iwf/persistence.py
@@ -1,7 +1,7 @@
 from typing import Any, Optional, Union
 
 from iwf.errors import WorkflowDefinitionError
-from iwf.iwf_api.iwf_api.models import EncodedObject
+from iwf.iwf_api.models import EncodedObject
 from iwf.object_encoder import ObjectEncoder
 
 
diff --git a/iwf/reset_workflow_type_and_options.py b/iwf/reset_workflow_type_and_options.py
@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Optional
 
-from iwf.iwf_api.iwf_api.models import WorkflowResetType
+from iwf.iwf_api.models import WorkflowResetType
 
 
 @dataclass
diff --git a/iwf/rpc.py b/iwf/rpc.py
@@ -4,7 +4,7 @@
 from typing import Callable, Optional
 
 from iwf.errors import WorkflowDefinitionError
-from iwf.iwf_api.iwf_api.models import PersistenceLoadingPolicy, PersistenceLoadingType
+from iwf.iwf_api.models import PersistenceLoadingPolicy, PersistenceLoadingType
 
 
 @dataclass
diff --git a/iwf/state_decision.py b/iwf/state_decision.py
@@ -9,7 +9,7 @@
 from dataclasses import dataclass
 from typing import Any, List, Union
 
-from iwf.iwf_api.iwf_api.models.state_decision import StateDecision as IdlStateDecision
+from iwf.iwf_api.models.state_decision import StateDecision as IdlStateDecision
 
 from iwf.object_encoder import ObjectEncoder
 
diff --git a/iwf/state_movement.py b/iwf/state_movement.py
@@ -14,7 +14,7 @@
 from dataclasses import dataclass
 from typing import Any
 
-from iwf.iwf_api.iwf_api.models.state_movement import StateMovement as IdlStateMovement
+from iwf.iwf_api.models.state_movement import StateMovement as IdlStateMovement
 
 from iwf.object_encoder import ObjectEncoder
 
diff --git a/iwf/stop_workflow_options.py b/iwf/stop_workflow_options.py
@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 
-from iwf.iwf_api.iwf_api.models import WorkflowStopType
+from iwf.iwf_api.models import WorkflowStopType
 
 
 @dataclass
diff --git a/iwf/tests/test_internal_channel.py b/iwf/tests/test_internal_channel.py
@@ -6,7 +6,7 @@
 from iwf.command_results import CommandResults, InternalChannelCommandResult
 from iwf.communication import Communication
 from iwf.communication_schema import CommunicationMethod, CommunicationSchema
-from iwf.iwf_api.iwf_api.models import ChannelRequestStatus
+from iwf.iwf_api.models import ChannelRequestStatus
 from iwf.persistence import Persistence
 from iwf.state_decision import StateDecision
 from iwf.state_schema import StateSchema
diff --git a/iwf/tests/test_signal.py b/iwf/tests/test_signal.py
@@ -10,7 +10,7 @@
 from iwf.command_results import CommandResults, SignalChannelCommandResult
 from iwf.communication import Communication
 from iwf.communication_schema import CommunicationMethod, CommunicationSchema
-from iwf.iwf_api.iwf_api.models import ChannelRequestStatus
+from iwf.iwf_api.models import ChannelRequestStatus
 from iwf.persistence import Persistence
 from iwf.state_decision import StateDecision
 from iwf.state_schema import StateSchema
diff --git a/iwf/tests/test_state_failure_recovery.py b/iwf/tests/test_state_failure_recovery.py
@@ -5,7 +5,7 @@
 from iwf.client import Client
 from iwf.command_results import CommandResults
 from iwf.communication import Communication
-from iwf.iwf_api.iwf_api.models import RetryPolicy
+from iwf.iwf_api.models import RetryPolicy
 from iwf.persistence import Persistence
 from iwf.state_decision import StateDecision
 from iwf.state_schema import StateSchema
diff --git a/iwf/tests/test_workflow_errors.py b/iwf/tests/test_workflow_errors.py
@@ -15,7 +15,7 @@
     WorkflowTerminated,
     WorkflowTimeout,
 )
-from iwf.iwf_api.iwf_api.models import WorkflowStopType
+from iwf.iwf_api.models import WorkflowStopType
 from iwf.persistence import Persistence
 from iwf.state_decision import StateDecision
 from iwf.state_schema import StateSchema
diff --git a/iwf/tests/test_workflow_state_options.py b/iwf/tests/test_workflow_state_options.py
@@ -1,4 +1,4 @@
-from iwf.iwf_api.iwf_api.models import (
+from iwf.iwf_api.models import (
     PersistenceLoadingPolicy,
     PersistenceLoadingType,
     WorkflowStateOptions as IdlWorkflowStateOptions,
diff --git a/iwf/tests/worker_server.py b/iwf/tests/worker_server.py
@@ -3,7 +3,7 @@
 
 from flask import Flask, request
 
-from iwf.iwf_api.iwf_api.models import (
+from iwf.iwf_api.models import (
     WorkflowStateExecuteRequest,
     WorkflowStateWaitUntilRequest,
     WorkflowWorkerRpcRequest,
diff --git a/iwf/unregistered_client.py b/iwf/unregistered_client.py
@@ -13,8 +13,8 @@
     process_http_error,
     process_workflow_abnormal_exit_error,
 )
-from iwf.iwf_api.iwf_api import Client, errors
-from iwf.iwf_api.iwf_api.api.default import (
+from iwf.iwf_api import Client, errors
+from iwf.iwf_api.api.default import (
     post_api_v1_workflow_dataobjects_get,
     post_api_v1_workflow_reset,
     post_api_v1_workflow_rpc,
@@ -26,7 +26,7 @@
     post_api_v1_workflow_timer_skip,
     post_api_v_1_workflow_get_with_wait,
 )
-from iwf.iwf_api.iwf_api.models import (
+from iwf.iwf_api.models import (
     EncodedObject,
     ErrorResponse,
     IDReusePolicy,
@@ -53,7 +53,7 @@
     WorkflowStatus,
     WorkflowStopRequest,
 )
-from iwf.iwf_api.iwf_api.types import Response
+from iwf.iwf_api.types import Response
 from iwf.reset_workflow_type_and_options import ResetWorkflowTypeAndOptions
 from iwf.stop_workflow_options import StopWorkflowOptions
 
diff --git a/iwf/utils/iwf_typing.py b/iwf/utils/iwf_typing.py
@@ -1,6 +1,6 @@
 from typing import Optional, TypeVar, Union
 
-from iwf.iwf_api.iwf_api.types import Unset
+from iwf.iwf_api.types import Unset
 
 T = TypeVar("T")
 
diff --git a/iwf/worker_service.py b/iwf/worker_service.py
@@ -4,7 +4,7 @@
 from iwf.command_request import _to_idl_command_request
 from iwf.command_results import from_idl_command_results
 from iwf.communication import Communication
-from iwf.iwf_api.iwf_api.models import (
+from iwf.iwf_api.models import (
     EncodedObject,
     KeyValue,
     WorkflowStateExecuteRequest,
@@ -14,7 +14,7 @@
     WorkflowWorkerRpcRequest,
     WorkflowWorkerRpcResponse,
 )
-from iwf.iwf_api.iwf_api.types import Unset
+from iwf.iwf_api.types import Unset
 from iwf.object_encoder import ObjectEncoder
 from iwf.persistence import Persistence
 from iwf.registry import Registry
diff --git a/iwf/workflow_context.py b/iwf/workflow_context.py
@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Optional
 
-from iwf.iwf_api.iwf_api.models.context import Context
+from iwf.iwf_api.models.context import Context
 from iwf.utils.iwf_typing import unset_to_none
 
 
diff --git a/iwf/workflow_options.py b/iwf/workflow_options.py
@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Optional
 
-from iwf.iwf_api.iwf_api.models import IDReusePolicy, WorkflowRetryPolicy
+from iwf.iwf_api.models import IDReusePolicy, WorkflowRetryPolicy
 
 
 @dataclass
diff --git a/iwf/workflow_state_options.py b/iwf/workflow_state_options.py
@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Any, Optional
 
-from iwf.iwf_api.iwf_api.models import (
+from iwf.iwf_api.models import (
     ExecuteApiFailurePolicy,
     PersistenceLoadingPolicy,
     RetryPolicy,
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "iwf-python-sdk"
-version = "0.1.1"
+version = "0.1.2"
 description = ""
 authors = ["Indeed Engineering"]
 readme = "README.md"
