Skip to content

Commit 1f4c0d1

Browse files
committed
finished api
1 parent f476a88 commit 1f4c0d1

File tree

8 files changed

+107
-18
lines changed

8 files changed

+107
-18
lines changed
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import nest_asyncio
22
from ._version import __version__ as __version__
3-
from ._exceptions import * # noqa: F403
3+
4+
# APIs
5+
from .exceptions import * # noqa: F403
6+
from .models import * # noqa: F403
47
from .api import * # noqa: F403
58

9+
610
nest_asyncio.apply() # allow to run coroutines via asyncio.run(coro)

clients/python/src/osparc/_api_files_api.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,28 @@
1212

1313
import httpx
1414
from httpx import Response
15-
from osparc_client.models import (
15+
from osparc_client.api.files_api import FilesApi as _FilesApi
16+
from tqdm.asyncio import tqdm
17+
from tqdm.contrib.logging import logging_redirect_tqdm
18+
19+
from ._api_client import ApiClient
20+
from ._http_client import AsyncHttpClient
21+
from .models import (
1622
BodyAbortMultipartUploadV0FilesFileIdAbortPost,
1723
BodyCompleteMultipartUploadV0FilesFileIdCompletePost,
1824
ClientFile,
1925
ClientFileUploadData,
20-
)
21-
from osparc_client.api.files_api import FilesApi as _FilesApi
22-
from osparc_client.models import (
26+
File,
2327
FileUploadCompletionBody,
2428
FileUploadData,
2529
UploadedPart,
26-
File,
2730
)
28-
from tqdm.asyncio import tqdm
29-
from tqdm.contrib.logging import logging_redirect_tqdm
30-
31-
from ._api_client import ApiClient
32-
from ._http_client import AsyncHttpClient
3331
from ._utils import (
3432
DEFAULT_TIMEOUT_SECONDS,
3533
PaginationGenerator,
3634
compute_sha256,
37-
file_chunk_generator,
3835
dev_features_enabled,
36+
file_chunk_generator,
3937
)
4038

4139
_logger = logging.getLogger(__name__)

clients/python/src/osparc/_api_solvers_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import httpx
66
from osparc_client.api.solvers_api import SolversApi as _SolversApi
7-
from osparc_client.models import JobInputs, OnePageSolverPort, SolverPort
7+
from .models import JobInputs, OnePageSolverPort, SolverPort
88

99
from ._api_client import ApiClient
1010
from ._settings import ParentProjectInfo

clients/python/src/osparc/_api_studies_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from typing import Any, Optional
88

99
import httpx
10-
from osparc_client.models import JobInputs, JobLogsMap, PageStudy
10+
from .models import JobInputs, JobLogsMap, PageStudy
1111
from osparc_client.api.studies_api import StudiesApi as _StudiesApi
1212
from tqdm.asyncio import tqdm_asyncio
1313

clients/python/src/osparc/_exceptions.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44

55
from httpx import HTTPStatusError
66

7-
from osparc_client.exceptions import OpenApiException as OpenApiException
8-
from osparc_client.exceptions import ApiTypeError as ApiTypeError
9-
from osparc_client.exceptions import ApiValueError as ApiValueError
10-
from osparc_client.exceptions import ApiKeyError as ApiKeyError
7+
118
from osparc_client.exceptions import ApiException as ApiException
129

1310

clients/python/src/osparc/api.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
# pylint: disable=unused-import
22

3+
# NOTE: Now includes Configuration, ApiClient
4+
# NOTE: this is an interface. Keep it clean!
5+
6+
7+
from osparc_client.configuration import Configuration as Configuration
8+
from ._api_client import ApiClient as ApiClient
9+
10+
311
from osparc_client.api.credits_api import CreditsApi as CreditsApi
412
from osparc_client.api.meta_api import MetaApi as MetaApi
513
from osparc_client.api.users_api import UsersApi as UsersApi
614
from osparc_client.api.wallets_api import WalletsApi as WalletsApi
715

16+
817
from ._api_solvers_api import SolversApi as SolversApi
918
from ._api_studies_api import StudiesApi as StudiesApi
1019
from ._api_files_api import FilesApi as FilesApi
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# pylint: disable=unused-import
2+
3+
from osparc_client.exceptions import OpenApiException as OpenApiException
4+
from osparc_client.exceptions import ApiTypeError as ApiTypeError
5+
from osparc_client.exceptions import ApiValueError as ApiValueError
6+
from osparc_client.exceptions import ApiKeyError as ApiKeyError
7+
from osparc_client.exceptions import ApiException as ApiException
8+
9+
from ._exceptions import RequestError as RequestError
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# wraps osparc_client.models
2+
# NOTE: this is an interface. Keep it clean!
3+
4+
from osparc_client.models.body_abort_multipart_upload_v0_files_file_id_abort_post import (
5+
BodyAbortMultipartUploadV0FilesFileIdAbortPost as BodyAbortMultipartUploadV0FilesFileIdAbortPost,
6+
)
7+
from osparc_client.models.body_complete_multipart_upload_v0_files_file_id_complete_post import (
8+
BodyCompleteMultipartUploadV0FilesFileIdCompletePost as BodyCompleteMultipartUploadV0FilesFileIdCompletePost,
9+
)
10+
from osparc_client.models.body_upload_file_v0_files_content_put import (
11+
BodyUploadFileV0FilesContentPut as BodyUploadFileV0FilesContentPut,
12+
)
13+
from osparc_client.models.client_file import ClientFile as ClientFile
14+
from osparc_client.models.client_file_upload_data import (
15+
ClientFileUploadData as ClientFileUploadData,
16+
)
17+
from osparc_client.models.error_get import ErrorGet as ErrorGet
18+
from osparc_client.models.file import File as File
19+
from osparc_client.models.file_upload_completion_body import (
20+
FileUploadCompletionBody as FileUploadCompletionBody,
21+
)
22+
from osparc_client.models.file_upload_data import FileUploadData as FileUploadData
23+
from osparc_client.models.get_credit_price import GetCreditPrice as GetCreditPrice
24+
from osparc_client.models.groups import Groups as Groups
25+
from osparc_client.models.http_validation_error import (
26+
HTTPValidationError as HTTPValidationError,
27+
)
28+
from osparc_client.models.job import Job as Job
29+
from osparc_client.models.job_inputs import JobInputs as JobInputs
30+
from osparc_client.models.job_log import JobLog as JobLog
31+
from osparc_client.models.job_logs_map import JobLogsMap as JobLogsMap
32+
from osparc_client.models.job_metadata import JobMetadata as JobMetadata
33+
from osparc_client.models.job_metadata_update import (
34+
JobMetadataUpdate as JobMetadataUpdate,
35+
)
36+
from osparc_client.models.job_outputs import JobOutputs as JobOutputs
37+
from osparc_client.models.job_status import JobStatus as JobStatus
38+
from osparc_client.models.links import Links as Links
39+
from osparc_client.models.log_link import LogLink as LogLink
40+
from osparc_client.models.meta import Meta as Meta
41+
from osparc_client.models.one_page_solver_port import (
42+
OnePageSolverPort as OnePageSolverPort,
43+
)
44+
from osparc_client.models.one_page_study_port import (
45+
OnePageStudyPort as OnePageStudyPort,
46+
)
47+
from osparc_client.models.page_file import PageFile as PageFile
48+
from osparc_client.models.page_job import PageJob as PageJob
49+
from osparc_client.models.page_study import PageStudy as PageStudy
50+
from osparc_client.models.pricing_plan_classification import (
51+
PricingPlanClassification as PricingPlanClassification,
52+
)
53+
from osparc_client.models.pricing_unit_get import PricingUnitGet as PricingUnitGet
54+
from osparc_client.models.profile import Profile as Profile
55+
from osparc_client.models.profile_update import ProfileUpdate as ProfileUpdate
56+
from osparc_client.models.running_state import RunningState as RunningState
57+
from osparc_client.models.service_pricing_plan_get import (
58+
ServicePricingPlanGet as ServicePricingPlanGet,
59+
)
60+
from osparc_client.models.solver import Solver as Solver
61+
from osparc_client.models.solver_port import SolverPort as SolverPort
62+
from osparc_client.models.study import Study as Study
63+
from osparc_client.models.study_port import StudyPort as StudyPort
64+
from osparc_client.models.upload_links import UploadLinks as UploadLinks
65+
from osparc_client.models.uploaded_part import UploadedPart as UploadedPart
66+
from osparc_client.models.user_role_enum import UserRoleEnum as UserRoleEnum
67+
from osparc_client.models.users_group import UsersGroup as UsersGroup
68+
from osparc_client.models.validation_error import ValidationError as ValidationError
69+
from osparc_client.models.wallet_get_with_available_credits import (
70+
WalletGetWithAvailableCredits as WalletGetWithAvailableCredits,
71+
)
72+
from osparc_client.models.wallet_status import WalletStatus as WalletStatus

0 commit comments

Comments
 (0)