Skip to content
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
55ee32e
add initial rpc endpoints for celery
bisgaard-itis Jul 2, 2025
0db7aa2
follow-up
bisgaard-itis Jul 2, 2025
b26466d
cleanups
bisgaard-itis Jul 2, 2025
10fbffd
start adding unit tests
bisgaard-itis Jul 2, 2025
8d3b509
first test
bisgaard-itis Jul 2, 2025
b397f97
ensure operations match google api guideline
bisgaard-itis Jul 2, 2025
fa701a9
fix unit test of get status endpoint
bisgaard-itis Jul 2, 2025
ec6e408
cleanup
bisgaard-itis Jul 2, 2025
5cd3085
add unit tests for additional endpoints
bisgaard-itis Jul 2, 2025
f93631d
inital implementation of rpc client to convert exceptions
bisgaard-itis Jul 2, 2025
b18792d
further improvements
bisgaard-itis Jul 2, 2025
bc7ce89
clean up error mapping
bisgaard-itis Jul 3, 2025
9542bc2
cover exceptions in tests
bisgaard-itis Jul 3, 2025
2ae921b
add status codes to openapi specs
bisgaard-itis Jul 3, 2025
56f01ff
update openapi specs
bisgaard-itis Jul 3, 2025
97345ab
@giancarloromeo absolute import -> relative import
bisgaard-itis Jul 3, 2025
c539146
Merge branch 'master' into 114-expose-function-job-logs-via-api-server
bisgaard-itis Jul 3, 2025
c5809c2
pylint
bisgaard-itis Jul 3, 2025
3c0d2a3
fix indirect import
bisgaard-itis Jul 3, 2025
cdd7f2f
pylint
bisgaard-itis Jul 3, 2025
9e947a4
Merge branch 'master' into 114-expose-function-job-logs-via-api-server
bisgaard-itis Jul 4, 2025
c607e35
@pcrespov add support_id to error model
bisgaard-itis Jul 4, 2025
21d8b1a
add support_id to error model in api-server
bisgaard-itis Jul 4, 2025
5c8c1cd
services/api-server version: 0.9.0 → 0.9.1
bisgaard-itis Jul 4, 2025
77d3283
update openapi specs
bisgaard-itis Jul 4, 2025
5222258
hide task endpoints from api
bisgaard-itis Jul 4, 2025
aaac3a2
update openapi specs
bisgaard-itis Jul 4, 2025
fa695f2
fix import
bisgaard-itis Jul 4, 2025
8d9ba17
fix typecheck
bisgaard-itis Jul 4, 2025
8ffe3fe
Merge branch 'master' into 114-expose-function-job-logs-via-api-server
bisgaard-itis Jul 4, 2025
7d11165
@pcrespov remove default values
bisgaard-itis Jul 4, 2025
088ad73
use BaseBackendError as type hint
bisgaard-itis Jul 4, 2025
fc20bab
fix typecheck
bisgaard-itis Jul 7, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class BaseAsyncjobRpcError(OsparcErrorMixin, RuntimeError):


class JobSchedulerError(BaseAsyncjobRpcError):
msg_template: str = "Celery exception: {exc}"
msg_template: str = "Async job scheduler exception: {exc}"


class JobMissingError(BaseAsyncjobRpcError):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
from dataclasses import dataclass

from models_library.api_schemas_rpc_async_jobs.async_jobs import (
AsyncJobGet,
AsyncJobId,
AsyncJobNameData,
AsyncJobResult,
AsyncJobStatus,
)
from models_library.api_schemas_rpc_async_jobs.exceptions import BaseAsyncjobRpcError
from models_library.progress_bar import ProgressReport
from models_library.rabbitmq_basic_types import RPCNamespace
from pydantic import validate_call
from pytest_mock import MockType
from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient


@dataclass
class AsyncJobSideEffects:
exception: BaseAsyncjobRpcError | None = None

@validate_call(config={"arbitrary_types_allowed": True})
async def cancel(
self,
rabbitmq_rpc_client: RabbitMQRPCClient | MockType,
*,
rpc_namespace: RPCNamespace,
job_id: AsyncJobId,
job_id_data: AsyncJobNameData,
) -> None:
if self.exception is not None:
raise self.exception
return None

@validate_call(config={"arbitrary_types_allowed": True})
async def status(
self,
rabbitmq_rpc_client: RabbitMQRPCClient | MockType,
*,
rpc_namespace: RPCNamespace,
job_id: AsyncJobId,
job_id_data: AsyncJobNameData,
) -> AsyncJobStatus:
if self.exception is not None:
raise self.exception

return AsyncJobStatus(
job_id=job_id,
progress=ProgressReport(
actual_value=50.0,
total=100.0,
attempt=1,
),
done=False,
)

@validate_call(config={"arbitrary_types_allowed": True})
async def result(
self,
rabbitmq_rpc_client: RabbitMQRPCClient | MockType,
*,
rpc_namespace: RPCNamespace,
job_id: AsyncJobId,
job_id_data: AsyncJobNameData,
) -> AsyncJobResult:
if self.exception is not None:
raise self.exception
return AsyncJobResult(result="Success")

@validate_call(config={"arbitrary_types_allowed": True})
async def list_jobs(
self,
rabbitmq_rpc_client: RabbitMQRPCClient | MockType,
*,
rpc_namespace: RPCNamespace,
job_id_data: AsyncJobNameData,
filter_: str = "",
) -> list[AsyncJobGet]:
if self.exception is not None:
raise self.exception
return [
AsyncJobGet(
job_id=AsyncJobId("123e4567-e89b-12d3-a456-426614174000"),
job_name="Example Job",
)
]
Loading
Loading