Replace | with Union to be compatible with versions of python < 3.10.0

This commit is contained in:
Jim Myers 2023-04-08 16:48:44 -04:00
parent 1c58c6b791
commit cb4f7c438c
7 changed files with 20 additions and 14 deletions

View File

@ -1,4 +1,4 @@
from typing import Any, Dict, Optional
from typing import Any, Dict, Optional, Union
from pydantic import BaseModel
@ -8,5 +8,5 @@ from .rpc_error import RpcError
class RpcResponse(BaseModel):
jsonrpc: str
id: int
result: Optional[Dict[str, Any]] | None
result: Union[Optional[Dict[str, Any]], None]
error: Optional[RpcError]

View File

@ -1,4 +1,4 @@
from typing import Any, Dict, List
from typing import Any, Dict, List, Union
from pydantic import BaseModel
@ -33,4 +33,4 @@ class CreateQueryRunRpcResult(BaseModel):
class CreateQueryRunRpcResponse(RpcResponse):
result: CreateQueryRunRpcResult | None
result: Union[CreateQueryRunRpcResult, None]

View File

@ -1,4 +1,4 @@
from typing import Dict, List, Optional
from typing import Dict, List, Optional, Union
from pydantic import BaseModel
@ -25,4 +25,4 @@ class GetQueryRunRpcResult(BaseModel):
class GetQueryRunRpcResponse(RpcResponse):
result: GetQueryRunRpcResult | None
result: Union[GetQueryRunRpcResult, None]

View File

@ -1,4 +1,4 @@
from typing import Any, Dict, List, Optional
from typing import Any, Dict, List, Optional, Union
from pydantic import BaseModel
@ -35,8 +35,8 @@ class SortBy(BaseModel):
class GetQueryRunResultsRpcParams(BaseModel):
queryRunId: str
format: ResultFormat
filters: Optional[List[Filter | None]] = []
sortBy: Optional[List[SortBy] | None] = []
filters: Optional[Union[List[Filter], None]] = []
sortBy: Optional[Union[List[SortBy], None]] = []
page: Page
@ -54,8 +54,8 @@ class GetQueryRunResultsRpcResult(BaseModel):
sql: str
format: ResultFormat
originalQueryRun: QueryRun
redirectedToQueryRun: QueryRun | None
redirectedToQueryRun: Union[QueryRun, None]
class GetQueryRunResultsRpcResponse(RpcResponse):
result: GetQueryRunResultsRpcResult | None
result: Union[GetQueryRunResultsRpcResult, None]

View File

@ -1,10 +1,12 @@
from typing import Union
from shroomdk.models.compass.core.rpc_error import RpcError
from shroomdk.models.query_status import QueryStatus
def create_query_run_response(
status: str = QueryStatus.Ready,
error: RpcError | None = None,
error: Union[RpcError, None] = None,
result_null: bool = False,
):
base = {

View File

@ -1,9 +1,11 @@
from typing import Union
from shroomdk.models.compass.core.rpc_error import RpcError
from shroomdk.models.query_status import QueryStatus
def get_query_results_response(
status: str = QueryStatus.Success, error: RpcError | None = None
status: str = QueryStatus.Success, error: Union[RpcError, None] = None
):
base = {
"jsonrpc": "2.0",

View File

@ -1,9 +1,11 @@
from typing import Union
from shroomdk.models.compass.core.rpc_error import RpcError
from shroomdk.models.query_status import QueryStatus
def get_query_run_response(
status: str = QueryStatus.Ready, error: RpcError | None = None
status: str = QueryStatus.Ready, error: Union[RpcError, None] = None
):
base = {
"jsonrpc": "2.0",